diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d0a6189313d..24b3e178651 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,12 +211,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 0
+          BUILD_NAME: 'package_release'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -250,12 +250,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 8
+          BUILD_NAME: 'binary_release'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -289,12 +289,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 3
+          BUILD_NAME: 'package_asan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -328,12 +328,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 4
+          BUILD_NAME: 'package_ubsan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -367,12 +367,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 5
+          BUILD_NAME: 'package_tsan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -406,12 +406,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 6
+          BUILD_NAME: 'package_msan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -445,12 +445,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 7
+          BUILD_NAME: 'package_debug'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -486,13 +486,13 @@ jobs:
           IMAGES_PATH: ${{runner.temp}}/images_path
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
-          CHECK_NAME: 'ClickHouse special build check (actions)'
-          BUILD_NUMBER: 1
+          CHECK_NAME: 'ClickHouse build check (actions)'
+          BUILD_NAME: 'binary_splitted'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 9a0da9c3172..18969eeedd1 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -84,7 +84,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 compatibility_check.py 0
+          cd $REPO_COPY/tests/ci && python3 compatibility_check.py
       - name: Cleanup
         if: always()
         run: |
@@ -142,12 +142,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 0
+          BUILD_NAME: 'package_release'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -181,12 +181,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 8
+          BUILD_NAME: 'binary_release'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -219,12 +219,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 3
+          BUILD_NAME: 'package_asan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -257,12 +257,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 4
+          BUILD_NAME: 'package_ubsan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -295,12 +295,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 5
+          BUILD_NAME: 'package_tsan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -333,12 +333,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 6
+          BUILD_NAME: 'package_msan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -371,12 +371,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 7
+          BUILD_NAME: 'package_debug'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -412,13 +412,13 @@ jobs:
           IMAGES_PATH: ${{runner.temp}}/images_path
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
-          CHECK_NAME: 'ClickHouse special build check (actions)'
-          BUILD_NUMBER: 1
+          CHECK_NAME: 'ClickHouse build check (actions)'
+          BUILD_NAME: 'binary_splitted'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index e279ae91588..988db77e62a 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -41,7 +41,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 compatibility_check.py 0
+          cd $REPO_COPY/tests/ci && python3 compatibility_check.py
       - name: Cleanup
         if: always()
         run: |
@@ -72,12 +72,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 0
+          BUILD_NAME: 'package_release'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -110,12 +110,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 3
+          BUILD_NAME: 'package_asan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -148,12 +148,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 4
+          BUILD_NAME: 'package_ubsan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -186,12 +186,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 5
+          BUILD_NAME: 'package_tsan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -224,12 +224,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 6
+          BUILD_NAME: 'package_msan'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
@@ -262,12 +262,12 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 7
+          BUILD_NAME: 'package_debug'
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NAME
       - name: Upload build URLs to artifacts
         uses: actions/upload-artifact@v2
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1192c747347..6df7b24abb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,9 +169,7 @@ endif ()
 include (cmake/check_flags.cmake)
 include (cmake/add_warning.cmake)
 
-if (NOT MSVC)
-    set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall")    # -Werror and many more is also added inside cmake/warnings.cmake
-endif ()
+set (COMMON_WARNING_FLAGS "${COMMON_WARNING_FLAGS} -Wall")    # -Werror and many more is also added inside cmake/warnings.cmake
 
 if (COMPILER_CLANG)
     # clang: warning: argument unused during compilation: '-specs=/usr/share/dpkg/no-pie-compile.specs' [-Wunused-command-line-argument]
@@ -219,30 +217,6 @@ endif()
 # Make sure the final executable has symbols exported
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
 
-find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-13" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
-
-if (NOT OBJCOPY_PATH AND OS_DARWIN)
-    find_program (BREW_PATH NAMES "brew")
-    if (BREW_PATH)
-        execute_process (COMMAND ${BREW_PATH} --prefix llvm ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE LLVM_PREFIX)
-        if (LLVM_PREFIX)
-            find_program (OBJCOPY_PATH NAMES "llvm-objcopy" PATHS "${LLVM_PREFIX}/bin" NO_DEFAULT_PATH)
-        endif ()
-        if (NOT OBJCOPY_PATH)
-            execute_process (COMMAND ${BREW_PATH} --prefix binutils ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BINUTILS_PREFIX)
-            if (BINUTILS_PREFIX)
-                find_program (OBJCOPY_PATH NAMES "objcopy" PATHS "${BINUTILS_PREFIX}/bin" NO_DEFAULT_PATH)
-            endif ()
-        endif ()
-    endif ()
-endif ()
-
-if (OBJCOPY_PATH)
-    message (STATUS "Using objcopy: ${OBJCOPY_PATH}")
-else ()
-    message (FATAL_ERROR "Cannot find objcopy.")
-endif ()
-
 if (OS_DARWIN)
     # The `-all_load` flag forces loading of all symbols from all libraries,
     # and leads to multiply-defined symbols. This flag allows force loading
@@ -278,6 +252,13 @@ if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
     endif ()
 endif()
 
+if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
+    set(USE_DEBUG_HELPERS ON)
+else ()
+    set(USE_DEBUG_HELPERS ON)
+endif()
+option(USE_DEBUG_HELPERS "Enable debug helpers" ${USE_DEBUG_HELPERS})
+
 # Create BuildID when using lld. For other linkers it is created by default.
 if (LINKER_NAME MATCHES "lld$")
     # SHA1 is not cryptographically secure but it is the best what lld is offering.
@@ -312,6 +293,10 @@ include(cmake/cpu_features.cmake)
 # Enable it explicitly.
 set (COMPILER_FLAGS "${COMPILER_FLAGS} -fasynchronous-unwind-tables")
 
+# Reproducible builds
+set (COMPILER_FLAGS "${COMPILER_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+
 if (${CMAKE_VERSION} VERSION_LESS "3.12.4")
     # CMake < 3.12 doesn't support setting 20 as a C++ standard version.
     # We will add C++ standard controlling flag in CMAKE_CXX_FLAGS manually for now.
@@ -411,25 +396,6 @@ if (COMPILER_CLANG)
         message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot enable ThinLTO")
     endif ()
 
-    # Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
-
-    if (LLVM_AR_PATH)
-        message(STATUS "Using llvm-ar: ${LLVM_AR_PATH}.")
-        set (CMAKE_AR ${LLVM_AR_PATH})
-    else ()
-        message(WARNING "Cannot find llvm-ar. System ar will be used instead. It does not work with ThinLTO.")
-    endif ()
-
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
-
-    if (LLVM_RANLIB_PATH)
-        message(STATUS "Using llvm-ranlib: ${LLVM_RANLIB_PATH}.")
-        set (CMAKE_RANLIB ${LLVM_RANLIB_PATH})
-    else ()
-        message(WARNING "Cannot find llvm-ranlib. System ranlib will be used instead. It does not work with ThinLTO.")
-    endif ()
-
 elseif (ENABLE_THINLTO)
     message (${RECONFIGURE_MESSAGE_LEVEL} "ThinLTO is only available with CLang")
 endif ()
@@ -483,19 +449,6 @@ else ()
     set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif ()
 
-# https://github.com/include-what-you-use/include-what-you-use
-option (USE_INCLUDE_WHAT_YOU_USE "Automatically reduce unneeded includes in source code (external tool)" OFF)
-
-if (USE_INCLUDE_WHAT_YOU_USE)
-    find_program(IWYU_PATH NAMES include-what-you-use iwyu)
-    if (NOT IWYU_PATH)
-        message(FATAL_ERROR "Could not find the program include-what-you-use")
-    endif()
-    if (${CMAKE_VERSION} VERSION_LESS "3.3.0")
-        message(FATAL_ERROR "include-what-you-use requires CMake version at least 3.3.")
-    endif()
-endif ()
-
 if (ENABLE_TESTS)
     message (STATUS "Unit tests are enabled")
 else()
@@ -595,8 +548,6 @@ include (cmake/find/mysqlclient.cmake)
 
 # When testing for memory leaks with Valgrind, don't link tcmalloc or jemalloc.
 
-include (cmake/print_flags.cmake)
-
 if (TARGET global-group)
     install (EXPORT global DESTINATION cmake)
 endif ()
@@ -648,6 +599,7 @@ include_directories(${ConfigIncludePath})
 
 # Add as many warnings as possible for our own code.
 include (cmake/warnings.cmake)
+include (cmake/print_flags.cmake)
 
 add_subdirectory (base)
 add_subdirectory (src)
diff --git a/base/base/CMakeLists.txt b/base/base/CMakeLists.txt
index 281374b7121..000233738f7 100644
--- a/base/base/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@@ -29,7 +29,8 @@ elseif (ENABLE_READLINE)
 endif ()
 
 if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-include \"${ClickHouse_SOURCE_DIR}/base/base/iostream_debug_helpers.h\"")
+    get_target_property(MAGIC_ENUM_INCLUDE_DIR magic_enum INTERFACE_INCLUDE_DIRECTORIES)
+    set (INCLUDE_DEBUG_HELPERS "-I\"${MAGIC_ENUM_INCLUDE_DIR}\" -include \"${ClickHouse_SOURCE_DIR}/base/base/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
diff --git a/base/base/CachedFn.h b/base/base/CachedFn.h
index ed1dbdbd48c..19b2a8ce2c0 100644
--- a/base/base/CachedFn.h
+++ b/base/base/CachedFn.h
@@ -18,8 +18,8 @@ struct CachedFn
 {
 private:
     using Traits = FnTraits<decltype(Func)>;
-    using DecayedArgs = TLMap<std::decay_t, typename Traits::Args>;
-    using Key = TLChangeRoot<std::tuple, DecayedArgs>;
+    using DecayedArgs = TypeListMap<std::decay_t, typename Traits::Args>;
+    using Key = TypeListChangeRoot<std::tuple, DecayedArgs>;
     using Result = typename Traits::Ret;
 
     std::map<Key, Result> cache; // Can't use hashmap as tuples are unhashable by default
diff --git a/base/base/FnTraits.h b/base/base/FnTraits.h
index 6b8dc7cd0d2..78e1fa62ebb 100644
--- a/base/base/FnTraits.h
+++ b/base/base/FnTraits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Typelist.h"
+#include "TypeList.h"
 
 namespace detail
 {
@@ -14,7 +14,7 @@ struct FnTraits<R(A...)>
     static constexpr bool value = std::is_invocable_r_v<R, F, A...>;
 
     using Ret = R;
-    using Args = Typelist<A...>;
+    using Args = TypeList<A...>;
 };
 
 template <class R, class ...A>
diff --git a/base/base/TypeList.h b/base/base/TypeList.h
new file mode 100644
index 00000000000..244403b1c6b
--- /dev/null
+++ b/base/base/TypeList.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <cstddef>
+#include <type_traits>
+#include <utility>
+#include "defines.h"
+#include "TypePair.h"
+
+/// General-purpose typelist. Easy on compilation times as it does not use recursion.
+template <typename ...Args>
+struct TypeList { static constexpr size_t size = sizeof...(Args); };
+
+namespace TypeListUtils /// In some contexts it's more handy to use functions instead of aliases
+{
+    template <typename ...LArgs, typename ...RArgs>
+    constexpr TypeList<LArgs..., RArgs...> concat(TypeList<LArgs...>, TypeList<RArgs...>) { return {}; }
+
+    template <typename T, typename ...Args>
+    constexpr TypeList<T, Args...> prepend(TypeList<Args...>) { return {}; }
+
+    template <typename T, typename ...Args>
+    constexpr TypeList<Args..., T> append(TypeList<Args...>) { return {}; }
+
+    template <template <typename> typename F, typename ...Args>
+    constexpr TypeList<F<Args>...> map(TypeList<Args...>) { return {}; }
+
+    template <template <typename...> typename Root, typename ...Args>
+    constexpr Root<Args...> changeRoot(TypeList<Args...>) { return {}; }
+
+    template <typename F, typename ...Args>
+    constexpr void forEach(TypeList<Args...>, F && f) { (std::forward<F>(f)(Id<Args>{}), ...); }
+}
+
+template <typename TypeListLeft, typename TypeListRight>
+using TypeListConcat = decltype(TypeListUtils::concat(TypeListLeft{}, TypeListRight{}));
+
+template <typename T, typename List> using TypeListPrepend = decltype(TypeListUtils::prepend<T>(List{}));
+template <typename T, typename List> using TypeListAppend = decltype(TypeListUtils::append<T>(List{}));
+
+template <template <typename> typename F, typename List>
+using TypeListMap = decltype(TypeListUtils::map<F>(List{}));
+
+template <template <typename...> typename Root, typename List>
+using TypeListChangeRoot = decltype(TypeListUtils::changeRoot<Root>(List{}));
diff --git a/base/base/TypeLists.h b/base/base/TypeLists.h
new file mode 100644
index 00000000000..6c1283d054c
--- /dev/null
+++ b/base/base/TypeLists.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "TypeList.h"
+#include "extended_types.h"
+#include "Decimal.h"
+#include "UUID.h"
+
+namespace DB
+{
+
+using TypeListNativeInt = TypeList<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64>;
+using TypeListFloat = TypeList<Float32, Float64>;
+using TypeListNativeNumber = TypeListConcat<TypeListNativeInt, TypeListFloat>;
+using TypeListWideInt = TypeList<UInt128, Int128, UInt256, Int256>;
+using TypeListInt = TypeListConcat<TypeListNativeInt, TypeListWideInt>;
+using TypeListIntAndFloat = TypeListConcat<TypeListInt, TypeListFloat>;
+using TypeListDecimal = TypeList<Decimal32, Decimal64, Decimal128, Decimal256>;
+using TypeListNumber = TypeListConcat<TypeListIntAndFloat, TypeListDecimal>;
+using TypeListNumberWithUUID = TypeListAppend<UUID, TypeListNumber>;
+
+}
diff --git a/base/base/TypePair.h b/base/base/TypePair.h
index 54f31831241..8c2f380618c 100644
--- a/base/base/TypePair.h
+++ b/base/base/TypePair.h
@@ -1,4 +1,4 @@
 #pragma once
 
-template <class T, class V> struct TypePair { };
-template <class T> struct Id { };
+template <typename T, typename V> struct TypePair {};
+template <typename T> struct Id {};
diff --git a/base/base/Typelist.h b/base/base/Typelist.h
deleted file mode 100644
index 74abaf9e388..00000000000
--- a/base/base/Typelist.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <type_traits>
-#include <utility>
-#include "defines.h"
-#include "TypePair.h"
-
-/// General-purpose typelist. Easy on compilation times as it does not use recursion.
-template <class ...Args>
-struct Typelist { static constexpr size_t size = sizeof...(Args); };
-
-namespace TLUtils /// In some contexts it's more handy to use functions instead of aliases
-{
-template <class ...LArgs, class ...RArgs>
-constexpr Typelist<LArgs..., RArgs...> concat(Typelist<LArgs...>, Typelist<RArgs...>) { return {}; }
-
-template <class T, class ...Args>
-constexpr Typelist<T, Args...> prepend(Typelist<Args...>) { return {}; }
-
-template <class T, class ...Args>
-constexpr Typelist<Args..., T> append(Typelist<Args...>) { return {}; }
-
-template <template<class> class F, class ...Args>
-constexpr Typelist<F<Args>...> map(Typelist<Args...>) { return {}; }
-
-template <template<class...> class Root, class ...Args>
-constexpr Root<Args...> changeRoot(Typelist<Args...>) { return {}; }
-
-template <class F, class ...Args>
-constexpr void forEach(Typelist<Args...>, F && f) { (std::forward<F>(f)(Id<Args>{}), ...); }
-}
-
-template <class TLLeft, class TLRight>
-using TLConcat = decltype(TLUtils::concat(TLLeft{}, TLRight{}));
-
-template <class T, class Typelist> using TLPrepend = decltype(TLUtils::prepend<T>(Typelist{}));
-template <class T, class Typelist> using TLAppend = decltype(TLUtils::append<T>(Typelist{}));
-
-template <template<class> class F, class Typelist>
-using TLMap = decltype(TLUtils::map<F>(Typelist{}));
-
-template <template<class...> class Root, class Typelist>
-using TLChangeRoot = decltype(TLUtils::changeRoot<Root>(Typelist{}));
diff --git a/base/base/Typelists.h b/base/base/Typelists.h
deleted file mode 100644
index d5d58be96cc..00000000000
--- a/base/base/Typelists.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "Typelist.h"
-#include "extended_types.h"
-#include "Decimal.h"
-#include "UUID.h"
-
-namespace DB
-{
-using TLIntegral = Typelist<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64>;
-using TLExtendedIntegral = Typelist<UInt128, Int128, UInt256, Int256>;
-using TLDecimals = Typelist<Decimal32, Decimal64, Decimal128, Decimal256>;
-
-using TLIntegralWithExtended = TLConcat<TLIntegral, TLExtendedIntegral>;
-
-using TLNumbers = TLConcat<TLIntegralWithExtended, TLDecimals>;
-using TLNumbersWithUUID = TLAppend<UUID, TLNumbers>;
-}
diff --git a/base/base/UUID.h b/base/base/UUID.h
index 8b1ed16ea2f..d6982b55faa 100644
--- a/base/base/UUID.h
+++ b/base/base/UUID.h
@@ -5,5 +5,5 @@
 
 namespace DB
 {
-using UUID = StrongTypedef<UInt128, struct UUIDTag>;
+    using UUID = StrongTypedef<UInt128, struct UUIDTag>;
 }
diff --git a/base/base/iostream_debug_helpers.h b/base/base/iostream_debug_helpers.h
index 4362d832970..3a3f1a741ad 100644
--- a/base/base/iostream_debug_helpers.h
+++ b/base/base/iostream_debug_helpers.h
@@ -6,6 +6,7 @@
 #include <tuple>
 #include <iomanip>
 #include <iostream>
+#include <magic_enum.hpp>
 
 /** Usage:
   *
@@ -61,6 +62,13 @@ std::enable_if_t<priority == 2, Out> & dumpImpl(Out & out, T && x, std::decay_t<
 }
 
 
+template <int priority, typename Out, typename T>
+std::enable_if_t<priority == 3 && std::is_enum_v<std::decay_t<T>>, Out> &
+dumpImpl(Out & out, T && x)
+{
+    return out << magic_enum::enum_name(x);
+}
+
 /// string and const char * - output not as container or pointer.
 
 template <int priority, typename Out, typename T>
@@ -131,15 +139,26 @@ Out & dumpValue(Out & out, T && x)
 template <typename Out, typename T>
 Out & dump(Out & out, const char * name, T && x)
 {
+    // Dumping string literal, printing name and demangled type is irrelevant.
+    if constexpr (std::is_same_v<const char *, std::decay_t<std::remove_reference_t<T>>>)
+    {
+         const auto name_len = strlen(name);
+         const auto value_len = strlen(x);
+         // `name` is the same as quoted `x`
+         if (name_len > 2 && value_len > 0 && name[0] == '"' && name[name_len - 1] == '"'
+                 && strncmp(name + 1, x, std::min(value_len, name_len) - 1) == 0)
+             return out << x;
+    }
+
     out << demangle(typeid(x).name()) << " " << name << " = ";
-    return dumpValue(out, x);
+    return dumpValue(out, x) << "; ";
 }
 
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
 #endif
 
-#define DUMPVAR(VAR) ::dump(std::cerr, #VAR, (VAR)); std::cerr << "; ";
+#define DUMPVAR(VAR) ::dump(std::cerr, #VAR, (VAR));
 #define DUMPHEAD std::cerr << __FILE__ << ':' << __LINE__ << " [ " << getThreadId() << " ] ";
 #define DUMPTAIL std::cerr << '\n';
 
diff --git a/cmake/freebsd/toolchain-aarch64.cmake b/cmake/freebsd/toolchain-aarch64.cmake
index 3eba7be1eb5..eeec635cc06 100644
--- a/cmake/freebsd/toolchain-aarch64.cmake
+++ b/cmake/freebsd/toolchain-aarch64.cmake
@@ -7,13 +7,9 @@ set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-aarc
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
 
-set (CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "/usr/bin/ranlib" CACHE FILEPATH "" FORCE)
-
-set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
-
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
 
 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/freebsd/toolchain-x86_64.cmake b/cmake/freebsd/toolchain-x86_64.cmake
index 42866ac9972..80cbeba549f 100644
--- a/cmake/freebsd/toolchain-x86_64.cmake
+++ b/cmake/freebsd/toolchain-x86_64.cmake
@@ -7,13 +7,9 @@ set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_
 
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
 
-set (CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "/usr/bin/ranlib" CACHE FILEPATH "" FORCE)
-
-set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
-
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
 
 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/linux/toolchain-aarch64.cmake b/cmake/linux/toolchain-aarch64.cmake
index fa814d8d59b..5b1e41dc871 100644
--- a/cmake/linux/toolchain-aarch64.cmake
+++ b/cmake/linux/toolchain-aarch64.cmake
@@ -6,25 +6,18 @@ set (CMAKE_C_COMPILER_TARGET "aarch64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "aarch64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "aarch64-linux-gnu")
 
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
+
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-aarch64")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/aarch64-linux-gnu/libc")
 
-find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
-find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
-
-set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
-
 set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
-
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-
 set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
 set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
 
diff --git a/cmake/linux/toolchain-ppc64le.cmake b/cmake/linux/toolchain-ppc64le.cmake
index cf85fc20fc4..70915401046 100644
--- a/cmake/linux/toolchain-ppc64le.cmake
+++ b/cmake/linux/toolchain-ppc64le.cmake
@@ -6,25 +6,18 @@ set (CMAKE_C_COMPILER_TARGET "ppc64le-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "ppc64le-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "ppc64le-linux-gnu")
 
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
+
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-powerpc64le")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/powerpc64le-linux-gnu/libc")
 
-find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
-find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
-
-set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
-
 set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
-
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-
 set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
 set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
 
diff --git a/cmake/linux/toolchain-riscv64.cmake b/cmake/linux/toolchain-riscv64.cmake
index 6ae279f4716..7ce6ff43a49 100644
--- a/cmake/linux/toolchain-riscv64.cmake
+++ b/cmake/linux/toolchain-riscv64.cmake
@@ -6,22 +6,18 @@ set (CMAKE_C_COMPILER_TARGET "riscv64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "riscv64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "riscv64-linux-gnu")
 
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
+
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-riscv64")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
 
-find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
-find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
-
-set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
-
 set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (LINKER_NAME "riscv64-linux-gnu-ld.bfd" CACHE STRING "" FORCE)
-
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=bfd")
 
diff --git a/cmake/linux/toolchain-x86_64-musl.cmake b/cmake/linux/toolchain-x86_64-musl.cmake
index 0406b5de0ba..14dba6843b9 100644
--- a/cmake/linux/toolchain-x86_64-musl.cmake
+++ b/cmake/linux/toolchain-x86_64-musl.cmake
@@ -6,25 +6,18 @@ set (CMAKE_C_COMPILER_TARGET "x86_64-linux-musl")
 set (CMAKE_CXX_COMPILER_TARGET "x86_64-linux-musl")
 set (CMAKE_ASM_COMPILER_TARGET "x86_64-linux-musl")
 
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
+
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-x86_64-musl")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
 
-find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
-find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
-
-set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
-
 set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
-
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-
 set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
 set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
 
diff --git a/cmake/linux/toolchain-x86_64.cmake b/cmake/linux/toolchain-x86_64.cmake
index 1e139cec062..879f35feb83 100644
--- a/cmake/linux/toolchain-x86_64.cmake
+++ b/cmake/linux/toolchain-x86_64.cmake
@@ -6,25 +6,18 @@ set (CMAKE_C_COMPILER_TARGET "x86_64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "x86_64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "x86_64-linux-gnu")
 
+# Will be changed later, but somehow needed to be set here.
+set (CMAKE_AR "ar")
+set (CMAKE_RANLIB "ranlib")
+
 set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-x86_64")
 
 set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/x86_64-linux-gnu/libc")
 
-find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
-find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
-
-set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
-
 set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 
-set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
-
-set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-
 set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
 set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
 
diff --git a/cmake/print_flags.cmake b/cmake/print_flags.cmake
index ad6bca21933..66f2a8bfbc7 100644
--- a/cmake/print_flags.cmake
+++ b/cmake/print_flags.cmake
@@ -1,6 +1,12 @@
 set (FULL_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
 set (FULL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
 set (FULL_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
+
 message (STATUS "compiler C   = ${CMAKE_C_COMPILER} ${FULL_C_FLAGS}")
 message (STATUS "compiler CXX = ${CMAKE_CXX_COMPILER} ${FULL_CXX_FLAGS}")
 message (STATUS "LINKER_FLAGS = ${FULL_EXE_LINKER_FLAGS}")
+
+# Reproducible builds
+string (REPLACE "${CMAKE_SOURCE_DIR}" "." FULL_C_FLAGS_NORMALIZED "${FULL_C_FLAGS}")
+string (REPLACE "${CMAKE_SOURCE_DIR}" "." FULL_CXX_FLAGS_NORMALIZED "${FULL_CXX_FLAGS}")
+string (REPLACE "${CMAKE_SOURCE_DIR}" "." FULL_EXE_LINKER_FLAGS_NORMALIZED "${FULL_EXE_LINKER_FLAGS}")
diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index f60f7431389..f052948e731 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -78,6 +78,15 @@ if (SANITIZE)
 
     elseif (SANITIZE STREQUAL "undefined")
         set (UBSAN_FLAGS "-fsanitize=undefined -fno-sanitize-recover=all -fno-sanitize=float-divide-by-zero")
+        if (ENABLE_FUZZING)
+            # Unsigned integer overflow is well defined behaviour from a perspective of C++ standard,
+            # compilers or CPU. We use in hash functions like SipHash and many other places in our codebase.
+            # This flag is needed only because fuzzers are run inside oss-fuzz infrastructure
+            # and they have a bunch of flags not halt the program if UIO happend and even to silence that warnings.
+            # But for unknown reason that flags don't work with ClickHouse or we don't understand how to properly use them,
+            # that's why we often receive reports about UIO. The simplest way to avoid this is just  set this flag here.
+            set(UBSAN_FLAGS "${SAN_FLAGS} -fno-sanitize=unsigned-integer-overflow")
+        endif()
         if (COMPILER_CLANG)
             set (UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/ubsan_suppressions.txt")
         else()
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 7a6e3672d17..c87887ddddd 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -1,3 +1,5 @@
+# Compiler
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set (COMPILER_GCC 1)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
@@ -6,6 +8,8 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set (COMPILER_CLANG 1)
 endif ()
 
+execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version)
+
 if (COMPILER_GCC)
     # Require minimum version of gcc
     set (GCC_MINIMUM_VERSION 11)
@@ -44,8 +48,10 @@ else ()
     message (WARNING "You are using an unsupported compiler. Compilation has only been tested with Clang and GCC.")
 endif ()
 
-STRING(REGEX MATCHALL "[0-9]+" COMPILER_VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
-LIST(GET COMPILER_VERSION_LIST 0 COMPILER_VERSION_MAJOR)
+string (REGEX MATCHALL "[0-9]+" COMPILER_VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})
+list (GET COMPILER_VERSION_LIST 0 COMPILER_VERSION_MAJOR)
+
+# Linker
 
 # Example values: `lld-10`, `gold`.
 option (LINKER_NAME "Linker name or full path")
@@ -93,3 +99,69 @@ if (LINKER_NAME)
 
     message(STATUS "Using custom linker by name: ${LINKER_NAME}")
 endif ()
+
+# Archiver
+
+if (COMPILER_GCC)
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11")
+else ()
+    find_program (LLVM_AR_PATH NAMES "llvm-ar-${COMPILER_VERSION_MAJOR}" "llvm-ar")
+endif ()
+
+if (LLVM_AR_PATH)
+    set (CMAKE_AR "${LLVM_AR_PATH}")
+endif ()
+
+# Ranlib
+
+if (COMPILER_GCC)
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11")
+else ()
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib-${COMPILER_VERSION_MAJOR}" "llvm-ranlib")
+endif ()
+
+if (LLVM_RANLIB_PATH)
+    set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}")
+endif ()
+
+# Install Name Tool
+
+if (COMPILER_GCC)
+    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool" "llvm-install-name-tool-13" "llvm-install-name-tool-12" "llvm-install-name-tool-11")
+else ()
+    find_program (LLVM_INSTALL_NAME_TOOL_PATH NAMES "llvm-install-name-tool-${COMPILER_VERSION_MAJOR}" "llvm-install-name-tool")
+endif ()
+
+if (LLVM_INSTALL_NAME_TOOL_PATH)
+    set (CMAKE_INSTALL_NAME_TOOL "${LLVM_INSTALL_NAME_TOOL_PATH}")
+endif ()
+
+# Objcopy
+
+if (COMPILER_GCC)
+    find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-13" "llvm-objcopy-12" "llvm-objcopy-11" "objcopy")
+else ()
+    find_program (OBJCOPY_PATH NAMES "llvm-objcopy-${COMPILER_VERSION_MAJOR}" "llvm-objcopy" "objcopy")
+endif ()
+
+if (NOT OBJCOPY_PATH AND OS_DARWIN)
+    find_program (BREW_PATH NAMES "brew")
+    if (BREW_PATH)
+        execute_process (COMMAND ${BREW_PATH} --prefix llvm ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE LLVM_PREFIX)
+        if (LLVM_PREFIX)
+            find_program (OBJCOPY_PATH NAMES "llvm-objcopy" PATHS "${LLVM_PREFIX}/bin" NO_DEFAULT_PATH)
+        endif ()
+        if (NOT OBJCOPY_PATH)
+            execute_process (COMMAND ${BREW_PATH} --prefix binutils ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BINUTILS_PREFIX)
+            if (BINUTILS_PREFIX)
+                find_program (OBJCOPY_PATH NAMES "objcopy" PATHS "${BINUTILS_PREFIX}/bin" NO_DEFAULT_PATH)
+            endif ()
+        endif ()
+    endif ()
+endif ()
+
+if (OBJCOPY_PATH)
+    message (STATUS "Using objcopy: ${OBJCOPY_PATH}")
+else ()
+    message (FATAL_ERROR "Cannot find objcopy.")
+endif ()
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index ae24675acc1..ecc31529dc4 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -26,46 +26,6 @@ if (COMPILER_CLANG)
     no_warning(zero-length-array)
     no_warning(c11-extensions)
 
-    add_warning(comma)
-    add_warning(conditional-uninitialized)
-    add_warning(covered-switch-default)
-    add_warning(deprecated)
-    add_warning(embedded-directive)
-    add_warning(empty-init-stmt) # linux-only
-    add_warning(extra-semi-stmt) # linux-only
-    add_warning(extra-semi)
-    add_warning(gnu-case-range)
-    add_warning(inconsistent-missing-destructor-override)
-    add_warning(newline-eof)
-    add_warning(old-style-cast)
-    add_warning(range-loop-analysis)
-    add_warning(redundant-parens)
-    add_warning(reserved-id-macro)
-    add_warning(shadow-field)
-    add_warning(shadow-uncaptured-local)
-    add_warning(shadow)
-    add_warning(string-plus-int)
-    add_warning(undef)
-    add_warning(unreachable-code-return)
-    add_warning(unreachable-code)
-    add_warning(unused-exception-parameter)
-    add_warning(unused-macros)
-    add_warning(unused-member-function)
-    add_warning(unneeded-internal-declaration)
-    add_warning(implicit-int-float-conversion)
-    add_warning(no-delete-null-pointer-checks)
-    add_warning(anon-enum-enum-conversion)
-    add_warning(assign-enum)
-    add_warning(bitwise-op-parentheses)
-    add_warning(int-in-bool-context)
-    add_warning(sometimes-uninitialized)
-    add_warning(tautological-bitwise-compare)
-
-    # XXX: libstdc++ has some of these for 3way compare
-    if (USE_LIBCXX)
-        add_warning(zero-as-null-pointer-constant)
-    endif()
-
     if (WEVERYTHING)
         add_warning(everything)
         no_warning(c++98-compat-pedantic)
@@ -101,6 +61,47 @@ if (COMPILER_CLANG)
         endif()
 
         # TODO Enable conversion, sign-conversion, double-promotion warnings.
+    else ()
+        add_warning(comma)
+        add_warning(conditional-uninitialized)
+        add_warning(covered-switch-default)
+        add_warning(deprecated)
+        add_warning(embedded-directive)
+        add_warning(empty-init-stmt) # linux-only
+        add_warning(extra-semi-stmt) # linux-only
+        add_warning(extra-semi)
+        add_warning(gnu-case-range)
+        add_warning(inconsistent-missing-destructor-override)
+        add_warning(newline-eof)
+        add_warning(old-style-cast)
+        add_warning(range-loop-analysis)
+        add_warning(redundant-parens)
+        add_warning(reserved-id-macro)
+        add_warning(shadow-field)
+        add_warning(shadow-uncaptured-local)
+        add_warning(shadow)
+        add_warning(string-plus-int)
+        add_warning(undef)
+        add_warning(unreachable-code-return)
+        add_warning(unreachable-code)
+        add_warning(unused-exception-parameter)
+        add_warning(unused-macros)
+        add_warning(unused-member-function)
+        add_warning(unneeded-internal-declaration)
+        add_warning(implicit-int-float-conversion)
+        add_warning(no-delete-null-pointer-checks)
+        add_warning(anon-enum-enum-conversion)
+        add_warning(assign-enum)
+        add_warning(bitwise-op-parentheses)
+        add_warning(int-in-bool-context)
+        add_warning(sometimes-uninitialized)
+        add_warning(tautological-bitwise-compare)
+
+        # XXX: libstdc++ has some of these for 3way compare
+        if (USE_LIBCXX)
+            add_warning(zero-as-null-pointer-constant)
+        endif()
+
     endif ()
 elseif (COMPILER_GCC)
     # Add compiler options only to c++ compiler
diff --git a/contrib/cctz-cmake/CMakeLists.txt b/contrib/cctz-cmake/CMakeLists.txt
index 4ce24646480..f0f5c103631 100644
--- a/contrib/cctz-cmake/CMakeLists.txt
+++ b/contrib/cctz-cmake/CMakeLists.txt
@@ -82,7 +82,7 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
 
     # each file in that dir (except of tab and localtime) store the info about timezone
     execute_process(COMMAND
-        bash -c "cd ${TZDIR} && find * -type f -and ! -name '*.tab' -and ! -name 'localtime' | sort | paste -sd ';' -"
+        bash -c "cd ${TZDIR} && find * -type f -and ! -name '*.tab' -and ! -name 'localtime' | LC_ALL=C sort | paste -sd ';' -"
         OUTPUT_STRIP_TRAILING_WHITESPACE
         OUTPUT_VARIABLE TIMEZONES)
 
diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
index 5a998ffbe3e..49c40d576e7 100644
--- a/docker/builder/Dockerfile
+++ b/docker/builder/Dockerfile
@@ -1,8 +1,10 @@
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 6f9a957852e..e84cb601c0f 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -1,10 +1,12 @@
 FROM ubuntu:18.04
 
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
+
 ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/"
 ARG version=21.12.1.*
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
-
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
         apt-transport-https \
diff --git a/docker/docs/builder/Dockerfile b/docker/docs/builder/Dockerfile
index 8afddefa41a..50e3fadf9ac 100644
--- a/docker/docs/builder/Dockerfile
+++ b/docker/docs/builder/Dockerfile
@@ -1,9 +1,11 @@
 # docker build -t clickhouse/docs-build .
 FROM ubuntu:20.04
 
-ENV LANG=C.UTF-8
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+ENV LANG=C.UTF-8
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 6f654e44190..6a6d0e7212c 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,9 +1,11 @@
 #  docker build -t clickhouse/binary-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN apt-get update \
     && apt-get install \
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index a3a4c2c554d..873edfe4afc 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -1,9 +1,11 @@
 # docker build -t clickhouse/deb-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/packager/packager b/docker/packager/packager
index b0bc05a7fd5..9cce12be949 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -63,7 +63,7 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     PPC_SUFFIX = '-ppc64le'
 
     result = []
-    cmake_flags = ['$CMAKE_FLAGS', '-DADD_GDB_INDEX_FOR_GOLD=1']
+    cmake_flags = ['$CMAKE_FLAGS']
 
     is_clang = compiler.startswith(CLANG_PREFIX)
     is_cross_darwin = compiler.endswith(DARWIN_SUFFIX)
@@ -73,11 +73,6 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     is_cross_freebsd = compiler.endswith(FREEBSD_SUFFIX)
     is_cross_compile = is_cross_darwin or is_cross_darwin_arm or is_cross_arm or is_cross_freebsd or is_cross_ppc
 
-    # Explicitly use LLD with Clang by default.
-    # Don't force linker for cross-compilation.
-    if is_clang and not is_cross_compile:
-        cmake_flags.append("-DLINKER_NAME=ld.lld")
-
     if is_cross_darwin:
         cc = compiler[:-len(DARWIN_SUFFIX)]
         cmake_flags.append("-DCMAKE_AR:FILEPATH=/cctools/bin/x86_64-apple-darwin-ar")
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 04842e7a3de..96e7e73af33 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:20.04
 
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
+
 ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/"
 ARG version=21.12.1.*
 ARG gosu_ver=1.10
@@ -26,8 +30,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
-
 RUN groupadd -r clickhouse --gid=101 \
     && useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
     && apt-get update \
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index daacbe2bbfb..a661f8875a2 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -1,9 +1,11 @@
 # docker build -t clickhouse/test-base .
 FROM clickhouse/test-util
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index 94aa321252b..25fabca67b5 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -2,7 +2,9 @@
 # docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output clickhouse/codebrowser
 FROM clickhouse/binary-builder
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update && apt-get --yes --allow-unauthenticated install clang-9 libllvm9 libclang-9-dev
 
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 798910fb952..6fa5b0aa9db 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -1,9 +1,11 @@
 #  docker build -t clickhouse/fasttest .
 FROM clickhouse/test-util
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/test/fuzzer/Dockerfile b/docker/test/fuzzer/Dockerfile
index 6444e745c47..c602cba50aa 100644
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@@ -1,12 +1,14 @@
 # docker build -t clickhouse/fuzzer .
 FROM clickhouse/test-base
 
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
+
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
-
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
             ca-certificates \
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index 58c77d285d9..5695be70b9a 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -1,7 +1,9 @@
 # docker build -t clickhouse/integration-tests-runner .
 FROM ubuntu:20.04
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update \
     && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index 73d9454ab7f..eddaf969f33 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -1,12 +1,14 @@
 # docker build -t clickhouse/performance-comparison .
 FROM ubuntu:18.04
 
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
+
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
-
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
             bash \
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index e73fd03fb6d..0821d516e23 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -1,7 +1,9 @@
 # docker build -t clickhouse/sqlancer-test .
 FROM ubuntu:20.04
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git default-jdk maven python3 --yes --no-install-recommends
 RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index 39d7bb8a9e6..824af0de022 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -1,7 +1,9 @@
 # docker build -t clickhouse/style-test .
 FROM ubuntu:20.04
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     shellcheck \
diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile
index 91d0eb844d9..8ea3cd46973 100644
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@@ -1,7 +1,9 @@
 # docker build -t clickhouse/testflows-runner .
 FROM ubuntu:20.04
 
-RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+# ARG for quick switch to a given ubuntu mirror
+ARG apt_archive="http://archive.ubuntu.com"
+RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update \
     && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index 879e919e823..b39de0a5958 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -192,6 +192,6 @@ Example:
 **See Also**
 
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
--   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
+-   [background_message_broker_schedule_pool_size](../../../operations/settings/settings.md#background_message_broker_schedule_pool_size)
 
 [Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/) <!--hide-->
diff --git a/docs/en/operations/utilities/clickhouse-format.md b/docs/en/operations/utilities/clickhouse-format.md
index edba55689e7..333f127e125 100644
--- a/docs/en/operations/utilities/clickhouse-format.md
+++ b/docs/en/operations/utilities/clickhouse-format.md
@@ -1,98 +1,114 @@
----
-toc_priority: 65
-toc_title: clickhouse-format
----
-
-# clickhouse-format {#clickhouse-format}
-
-Allows formatting input queries.
-
-Keys:
-
-- `--help` or`-h` — Produce help message.
-- `--hilite` — Add syntax highlight with ANSI terminal escape sequences.
-- `--oneline` — Format in single line.
-- `--quiet` or `-q` — Just check syntax, no output on success.
-- `--multiquery` or `-n` — Allow multiple queries in the same file.
-- `--obfuscate` — Obfuscate instead of formatting.
-- `--seed <string>` — Seed arbitrary string that determines the result of obfuscation.
-- `--backslash` — Add a backslash at the end of each line of the formatted query. Can be useful when you copy a query from web or somewhere else with multiple lines, and want to execute it in command line.
-
-## Examples {#examples}
-
-1. Highlighting and single line:
-
-```bash
-$ clickhouse-format --oneline --hilite <<< "SELECT sum(number) FROM numbers(5);"
-```
-
-Result:
-
-```sql
-SELECT sum(number) FROM numbers(5)
-```
-
-2. Multiqueries:
-
-```bash
-$ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
-```
-
-Result:
-
-```text
-SELECT *
-FROM
-(
-    SELECT 1 AS x
-    UNION ALL
-    SELECT 1
-    UNION DISTINCT
-    SELECT 3
-)
-;
-```
-
-3. Obfuscating:
-
-```bash
-$ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
-```
-
-Result:
-
-```text
-SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
-```
-
-Same query and another seed string:
-
-```bash
-$ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
-```
-
-Result:
-
-```text
-SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
-```
-
-4. Adding backslash:
-
-```bash
-$ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
-```
-
-Result:
-
-```text
-SELECT * \
-FROM  \
-( \
-    SELECT 1 AS x \
-    UNION ALL \
-    SELECT 1 \
-    UNION DISTINCT \
-    SELECT 3 \
-)
-```
+---
+toc_priority: 65
+toc_title: clickhouse-format
+---
+
+# clickhouse-format {#clickhouse-format}
+
+Allows formatting input queries.
+
+Keys:
+
+- `--help` or`-h` — Produce help message.
+- `--query` — Format queries of any length and complexity.
+- `--hilite` — Add syntax highlight with ANSI terminal escape sequences.
+- `--oneline` — Format in single line.
+- `--quiet` or `-q` — Just check syntax, no output on success.
+- `--multiquery` or `-n` — Allow multiple queries in the same file.
+- `--obfuscate` — Obfuscate instead of formatting.
+- `--seed <string>` — Seed arbitrary string that determines the result of obfuscation.
+- `--backslash` — Add a backslash at the end of each line of the formatted query. Can be useful when you copy a query from web or somewhere else with multiple lines, and want to execute it in command line.
+
+## Examples {#examples}
+
+1. Formatting a query:
+
+```bash
+$ clickhouse-format --query "select number from numbers(10) where number%2 order by number desc;"
+```
+
+Result:
+
+```text
+SELECT number
+FROM numbers(10)
+WHERE number % 2
+ORDER BY number DESC
+```
+
+2. Highlighting and single line:
+
+```bash
+$ clickhouse-format --oneline --hilite <<< "SELECT sum(number) FROM numbers(5);"
+```
+
+Result:
+
+```sql
+SELECT sum(number) FROM numbers(5)
+```
+
+3. Multiqueries:
+
+```bash
+$ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+
+Result:
+
+```text
+SELECT *
+FROM
+(
+    SELECT 1 AS x
+    UNION ALL
+    SELECT 1
+    UNION DISTINCT
+    SELECT 3
+)
+;
+```
+
+4. Obfuscating:
+
+```bash
+$ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+
+Result:
+
+```text
+SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
+```
+
+Same query and another seed string:
+
+```bash
+$ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+
+Result:
+
+```text
+SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
+```
+
+5. Adding backslash:
+
+```bash
+$ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+
+Result:
+
+```text
+SELECT * \
+FROM  \
+( \
+    SELECT 1 AS x \
+    UNION ALL \
+    SELECT 1 \
+    UNION DISTINCT \
+    SELECT 3 \
+)
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md b/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
new file mode 100644
index 00000000000..cfc9b6cd58e
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
@@ -0,0 +1,148 @@
+---
+toc_priority: 108
+---
+
+## exponentialMovingAverage {#exponential-moving-average}
+
+Сalculates the exponential moving average of values for the determined time. 
+
+**Syntax**
+
+```sql
+exponentialMovingAverage(x)(value, timestamp)
+```
+
+Each `value` corresponds to the determinate `timestamp`. The half-life `x` is the time lag at which the exponential weights decay by one-half. The function returns a weighted average: the older the time point, the less weight the corresponding value is considered to be.
+
+**Arguments**
+
+-   `value` — Value. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `timestamp` — Timestamp. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Parameters**
+
+-   `x` — Half-life period. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) or [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Returned values**
+
+- Returnes an [exponentially smoothed moving average](https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average) of the values for the past `x` time at the latest point of time.
+
+Type: [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+
+**Examples**
+
+Input table:
+
+``` text
+┌──temperature─┬─timestamp──┐
+│          95  │         1  │
+│          95  │         2  │
+│          95  │         3  │
+│          96  │         4  │
+│          96  │         5  │
+│          96  │         6  │
+│          96  │         7  │
+│          97  │         8  │
+│          97  │         9  │
+│          97  │        10  │
+│          97  │        11  │
+│          98  │        12  │
+│          98  │        13  │
+│          98  │        14  │
+│          98  │        15  │
+│          99  │        16  │
+│          99  │        17  │
+│          99  │        18  │
+│         100  │        19  │
+│         100  │        20  │
+└──────────────┴────────────┘
+```
+
+Query: 
+
+```sql
+SELECT exponentialMovingAverage(5)(temperature, timestamp);
+```
+
+Result:
+
+``` text
+┌──exponentialMovingAverage(5)(temperature, timestamp)──┐
+│                                    92.25779635374204  │
+└───────────────────────────────────────────────────────┘
+```
+
+Query: 
+
+```sql
+SELECT
+    value,
+    time,
+    round(exp_smooth, 3),
+    bar(exp_smooth, 0, 1, 50) AS bar
+FROM
+(
+    SELECT
+        (number = 0) OR (number >= 25) AS value,
+        number AS time,
+        exponentialMovingAverage(10)(value, time) OVER (Rows BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth
+    FROM numbers(50)
+)
+```
+
+Result:
+
+``` text
+┌─value─┬─time─┬─round(exp_smooth, 3)─┬─bar────────────────────────────────────────┐
+│     1 │    0 │                0.067 │ ███▎                                      │
+│     0 │    1 │                0.062 │ ███                                        │
+│     0 │    2 │                0.058 │ ██▊                                       │
+│     0 │    3 │                0.054 │ ██▋                                       │
+│     0 │    4 │                0.051 │ ██▌                                        │
+│     0 │    5 │                0.047 │ ██▎                                       │
+│     0 │    6 │                0.044 │ ██▏                                       │
+│     0 │    7 │                0.041 │ ██                                         │
+│     0 │    8 │                0.038 │ █▊                                        │
+│     0 │    9 │                0.036 │ █▋                                        │
+│     0 │   10 │                0.033 │ █▋                                        │
+│     0 │   11 │                0.031 │ █▌                                         │
+│     0 │   12 │                0.029 │ █▍                                        │
+│     0 │   13 │                0.027 │ █▎                                        │
+│     0 │   14 │                0.025 │ █▎                                        │
+│     0 │   15 │                0.024 │ █▏                                        │
+│     0 │   16 │                0.022 │ █                                          │
+│     0 │   17 │                0.021 │ █                                          │
+│     0 │   18 │                0.019 │ ▊                                         │
+│     0 │   19 │                0.018 │ ▊                                         │
+│     0 │   20 │                0.017 │ ▋                                         │
+│     0 │   21 │                0.016 │ ▋                                         │
+│     0 │   22 │                0.015 │ ▋                                         │
+│     0 │   23 │                0.014 │ ▋                                         │
+│     0 │   24 │                0.013 │ ▋                                         │
+│     1 │   25 │                0.079 │ ███▊                                      │
+│     1 │   26 │                 0.14 │ ███████                                    │
+│     1 │   27 │                0.198 │ █████████▊                                │
+│     1 │   28 │                0.252 │ ████████████▌                              │
+│     1 │   29 │                0.302 │ ███████████████                            │
+│     1 │   30 │                0.349 │ █████████████████▍                        │
+│     1 │   31 │                0.392 │ ███████████████████▌                       │
+│     1 │   32 │                0.433 │ █████████████████████▋                    │
+│     1 │   33 │                0.471 │ ███████████████████████▌                   │
+│     1 │   34 │                0.506 │ █████████████████████████▎                │
+│     1 │   35 │                0.539 │ ██████████████████████████▊               │
+│     1 │   36 │                 0.57 │ ████████████████████████████▌              │
+│     1 │   37 │                0.599 │ █████████████████████████████▊            │
+│     1 │   38 │                0.626 │ ███████████████████████████████▎          │
+│     1 │   39 │                0.651 │ ████████████████████████████████▌          │
+│     1 │   40 │                0.674 │ █████████████████████████████████▋        │
+│     1 │   41 │                0.696 │ ██████████████████████████████████▋       │
+│     1 │   42 │                0.716 │ ███████████████████████████████████▋      │
+│     1 │   43 │                0.735 │ ████████████████████████████████████▋     │
+│     1 │   44 │                0.753 │ █████████████████████████████████████▋    │
+│     1 │   45 │                 0.77 │ ██████████████████████████████████████▍   │
+│     1 │   46 │                0.785 │ ███████████████████████████████████████▎  │
+│     1 │   47 │                  0.8 │ ███████████████████████████████████████▊  │
+│     1 │   48 │                0.813 │ ████████████████████████████████████████▋ │
+│     1 │   49 │                0.825 │ █████████████████████████████████████████▎│
+└───────┴──────┴──────────────────────┴────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 21ed8d33098..573e47ead54 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -89,9 +89,39 @@ SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00
 
 ## sipHash128 {#hash_functions-siphash128}
 
-Calculates SipHash from a string.
-Accepts a String-type argument. Returns FixedString(16).
-Differs from sipHash64 in that the final xor-folding state is only done up to 128 bits.
+Produces a 128-bit [SipHash](https://131002.net/siphash/) hash value. Differs from [sipHash64](#hash_functions-siphash64) in that the final xor-folding state is done up to 128 bits.
+
+**Syntax**
+
+``` sql
+sipHash128(par1,...)
+```
+
+**Arguments**
+
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md).
+
+**Returned value**
+
+A 128-bit `SipHash` hash value.
+
+Type: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT hex(sipHash128('foo', '\x01', 3));
+```
+
+Result:
+
+``` text
+┌─hex(sipHash128('foo', '', 3))────┐
+│ 9DE516A64A414D4B1B609415E4523F24 │
+└──────────────────────────────────┘
+```
 
 ## cityHash64 {#cityhash64}
 
@@ -459,28 +489,36 @@ SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:
 
 Produces a 128-bit [MurmurHash3](https://github.com/aappleby/smhasher) hash value.
 
+**Syntax**
+
 ``` sql
-murmurHash3_128( expr )
+murmurHash3_128(expr)
 ```
 
 **Arguments**
 
--   `expr` — [Expressions](../../sql-reference/syntax.md#syntax-expressions) returning a [String](../../sql-reference/data-types/string.md)-type value.
+-   `expr` — A list of [expressions](../../sql-reference/syntax.md#syntax-expressions). [String](../../sql-reference/data-types/string.md).
 
-**Returned Value**
+**Returned value**
 
-A [FixedString(16)](../../sql-reference/data-types/fixedstring.md) data type hash value.
+A 128-bit `MurmurHash3` hash value.
+
+Type: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
 
 **Example**
 
+Query:
+
 ``` sql
-SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
+SELECT hex(murmurHash3_128('foo', 'foo', 'foo'));
 ```
 
+Result:
+
 ``` text
-┌─MurmurHash3──────────────────────┬─type───┐
-│ 368A1A311CB7342253354B548E7E7E71 │ String │
-└──────────────────────────────────┴────────┘
+┌─hex(murmurHash3_128('foo', 'foo', 'foo'))─┐
+│ F8F7AD9B6CD4CF117A71E277E2EC2931          │
+└───────────────────────────────────────────┘
 ```
 
 ## xxHash32, xxHash64 {#hash-functions-xxhash32}
diff --git a/docs/ru/operations/utilities/clickhouse-format.md b/docs/ru/operations/utilities/clickhouse-format.md
index 876c741e0ac..0c8132caf77 100644
--- a/docs/ru/operations/utilities/clickhouse-format.md
+++ b/docs/ru/operations/utilities/clickhouse-format.md
@@ -1,98 +1,114 @@
----
-toc_priority: 65
-toc_title: clickhouse-format
----
-
-# clickhouse-format {#clickhouse-format}
-
-Позволяет форматировать входящие запросы.
-
-Ключи:
-
-- `--help` или`-h` — выводит описание ключей.
-- `--hilite` — добавляет подсветку синтаксиса с экранированием символов.
-- `--oneline` — форматирование в одну строку.
-- `--quiet` или `-q` — проверяет синтаксис без вывода результата.
-- `--multiquery` or `-n` — поддерживает несколько запросов в одной строке.
-- `--obfuscate` — обфусцирует вместо форматирования.
-- `--seed <строка>` — задает строку, которая определяет результат обфускации.
-- `--backslash` — добавляет обратный слеш в конце каждой строки отформатированного запроса. Удобно использовать если многострочный запрос скопирован из интернета или другого источника и его нужно выполнить из командной строки.
-
-## Примеры {#examples}
-
-1. Подсветка синтаксиса и форматирование в одну строку:
-
-```bash
-$ clickhouse-format --oneline --hilite <<< "SELECT sum(number) FROM numbers(5);"
-```
-
-Результат:
-
-```sql
-SELECT sum(number) FROM numbers(5)
-```
-
-2. Несколько запросов в одной строке:
-
-```bash
-$ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
-```
-
-Результат:
-
-```text
-SELECT *
-FROM
-(
-    SELECT 1 AS x
-    UNION ALL
-    SELECT 1
-    UNION DISTINCT
-    SELECT 3
-)
-;
-```
-
-3. Обфускация:
-
-```bash
-$ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
-```
-
-Результат:
-
-```text
-SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
-```
-
-Тот же запрос с другой инициализацией обфускатора:
-
-```bash
-$ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
-```
-
-Результат:
-
-```text
-SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
-```
-
-4. Добавление обратного слеша:
-
-```bash
-$ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
-```
-
-Результат:
-
-```text
-SELECT * \
-FROM  \
-( \
-    SELECT 1 AS x \
-    UNION ALL \
-    SELECT 1 \
-    UNION DISTINCT \
-    SELECT 3 \
-)
-```
+---
+toc_priority: 65
+toc_title: clickhouse-format
+---
+
+# clickhouse-format {#clickhouse-format}
+
+Позволяет форматировать входящие запросы.
+
+Ключи:
+
+- `--help` или`-h` — выводит описание ключей.
+- `--query` — форматирует запрос любой длины и сложности.
+- `--hilite` — добавляет подсветку синтаксиса с экранированием символов.
+- `--oneline` — форматирование в одну строку.
+- `--quiet` или `-q` — проверяет синтаксис без вывода результата.
+- `--multiquery` or `-n` — поддерживает несколько запросов в одной строке.
+- `--obfuscate` — обфусцирует вместо форматирования.
+- `--seed <строка>` — задает строку, которая определяет результат обфускации.
+- `--backslash` — добавляет обратный слеш в конце каждой строки отформатированного запроса. Удобно использовать если многострочный запрос скопирован из интернета или другого источника и его нужно выполнить из командной строки.
+
+## Примеры {#examples}
+
+1. Форматирование запроса:
+
+```bash
+$ clickhouse-format --query "select number from numbers(10) where number%2 order by number desc;"
+```
+
+Результат:
+
+```text
+SELECT number
+FROM numbers(10)
+WHERE number % 2
+ORDER BY number DESC
+```
+
+2. Подсветка синтаксиса и форматирование в одну строку:
+
+```bash
+$ clickhouse-format --oneline --hilite <<< "SELECT sum(number) FROM numbers(5);"
+```
+
+Результат:
+
+```sql
+SELECT sum(number) FROM numbers(5)
+```
+
+3. Несколько запросов в одной строке:
+
+```bash
+$ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+
+Результат:
+
+```text
+SELECT *
+FROM
+(
+    SELECT 1 AS x
+    UNION ALL
+    SELECT 1
+    UNION DISTINCT
+    SELECT 3
+)
+;
+```
+
+4. Обфускация:
+
+```bash
+$ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+
+Результат:
+
+```text
+SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
+```
+
+Тот же запрос с другой инициализацией обфускатора:
+
+```bash
+$ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+
+Результат:
+
+```text
+SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
+```
+
+5. Добавление обратного слеша:
+
+```bash
+$ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+
+Результат:
+
+```text
+SELECT * \
+FROM  \
+( \
+    SELECT 1 AS x \
+    UNION ALL \
+    SELECT 1 \
+    UNION DISTINCT \
+    SELECT 3 \
+)
+```
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md b/docs/ru/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
new file mode 100644
index 00000000000..40ec14b6182
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/exponentialmovingaverage.md
@@ -0,0 +1,148 @@
+---
+toc_priority: 108
+---
+
+## exponentialMovingAverage {#exponential-moving-average}
+
+Вычисляет экспоненциальное скользящее среднее за определенный промежуток времени.
+
+**Синтакис:**
+
+```sql
+exponentialMovingAverage(x)(value, timestamp)
+```
+
+Каждой точке `timestamp` на временном отрезке соответствует определенное значение `value`. Период полураспада — временной интервал `х`, через который вес значений уменьшается в 2 раза. Функция возвращает взвешенное среднее: чем старше временная точка, тем c меньшим весом считается соответствующее ей значение.
+
+**Аргументы**
+
+-   `value` — входные значения. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) или [Decimal](../../../sql-reference/data-types/decimal.md).
+-   `timestamp` — параметр для упорядочивания значений. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) или [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Параметры**
+
+-   `x` — период полураспада. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md) или [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Возвращаемые значения**
+
+-   Возвращает [экспоненциальное скользящее среднее](https://ru.wikipedia.org/wiki/Скользящая_средняя#Экспоненциально_взвешенное_скользящее_среднее) за прошедшее время `x` в последний момент времени.
+
+Тип: [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+
+**Пример**
+
+Исходная таблица:
+
+``` text
+┌──temperature─┬─timestamp──┐
+│          95  │         1  │
+│          95  │         2  │
+│          95  │         3  │
+│          96  │         4  │
+│          96  │         5  │
+│          96  │         6  │
+│          96  │         7  │
+│          97  │         8  │
+│          97  │         9  │
+│          97  │        10  │
+│          97  │        11  │
+│          98  │        12  │
+│          98  │        13  │
+│          98  │        14  │
+│          98  │        15  │
+│          99  │        16  │
+│          99  │        17  │
+│          99  │        18  │
+│         100  │        19  │
+│         100  │        20  │
+└──────────────┴────────────┘
+```
+
+Запрос: 
+
+```sql
+SELECT exponentialMovingAverage(5)(temperature, timestamp);
+```
+
+Результат:
+
+``` text
+┌──exponentialMovingAverage(5)(temperature, timestamp)──┐
+│                                    92.25779635374204  │
+└───────────────────────────────────────────────────────┘
+```
+
+Запрос: 
+
+```sql
+SELECT
+    value,
+    time,
+    round(exp_smooth, 3),
+    bar(exp_smooth, 0, 1, 50) AS bar
+FROM
+(
+    SELECT
+        (number = 0) OR (number >= 25) AS value,
+        number AS time,
+        exponentialMovingAverage(10)(value, time) OVER (Rows BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth
+    FROM numbers(50)
+)
+```
+
+Результат:
+
+``` text
+┌─value─┬─time─┬─round(exp_smooth, 3)─┬─bar────────────────────────────────────────┐
+│     1 │    0 │                0.067 │ ███▎                                      │
+│     0 │    1 │                0.062 │ ███                                        │
+│     0 │    2 │                0.058 │ ██▊                                       │
+│     0 │    3 │                0.054 │ ██▋                                       │
+│     0 │    4 │                0.051 │ ██▌                                        │
+│     0 │    5 │                0.047 │ ██▎                                       │
+│     0 │    6 │                0.044 │ ██▏                                       │
+│     0 │    7 │                0.041 │ ██                                         │
+│     0 │    8 │                0.038 │ █▊                                        │
+│     0 │    9 │                0.036 │ █▋                                        │
+│     0 │   10 │                0.033 │ █▋                                        │
+│     0 │   11 │                0.031 │ █▌                                         │
+│     0 │   12 │                0.029 │ █▍                                        │
+│     0 │   13 │                0.027 │ █▎                                        │
+│     0 │   14 │                0.025 │ █▎                                        │
+│     0 │   15 │                0.024 │ █▏                                        │
+│     0 │   16 │                0.022 │ █                                          │
+│     0 │   17 │                0.021 │ █                                          │
+│     0 │   18 │                0.019 │ ▊                                         │
+│     0 │   19 │                0.018 │ ▊                                         │
+│     0 │   20 │                0.017 │ ▋                                         │
+│     0 │   21 │                0.016 │ ▋                                         │
+│     0 │   22 │                0.015 │ ▋                                         │
+│     0 │   23 │                0.014 │ ▋                                         │
+│     0 │   24 │                0.013 │ ▋                                         │
+│     1 │   25 │                0.079 │ ███▊                                      │
+│     1 │   26 │                 0.14 │ ███████                                    │
+│     1 │   27 │                0.198 │ █████████▊                                │
+│     1 │   28 │                0.252 │ ████████████▌                              │
+│     1 │   29 │                0.302 │ ███████████████                            │
+│     1 │   30 │                0.349 │ █████████████████▍                        │
+│     1 │   31 │                0.392 │ ███████████████████▌                       │
+│     1 │   32 │                0.433 │ █████████████████████▋                    │
+│     1 │   33 │                0.471 │ ███████████████████████▌                   │
+│     1 │   34 │                0.506 │ █████████████████████████▎                │
+│     1 │   35 │                0.539 │ ██████████████████████████▊               │
+│     1 │   36 │                 0.57 │ ████████████████████████████▌              │
+│     1 │   37 │                0.599 │ █████████████████████████████▊            │
+│     1 │   38 │                0.626 │ ███████████████████████████████▎          │
+│     1 │   39 │                0.651 │ ████████████████████████████████▌          │
+│     1 │   40 │                0.674 │ █████████████████████████████████▋        │
+│     1 │   41 │                0.696 │ ██████████████████████████████████▋       │
+│     1 │   42 │                0.716 │ ███████████████████████████████████▋      │
+│     1 │   43 │                0.735 │ ████████████████████████████████████▋     │
+│     1 │   44 │                0.753 │ █████████████████████████████████████▋    │
+│     1 │   45 │                 0.77 │ ██████████████████████████████████████▍   │
+│     1 │   46 │                0.785 │ ███████████████████████████████████████▎  │
+│     1 │   47 │                  0.8 │ ███████████████████████████████████████▊  │
+│     1 │   48 │                0.813 │ ████████████████████████████████████████▋ │
+│     1 │   49 │                0.825 │ █████████████████████████████████████████▎│
+└───────┴──────┴──────────────────────┴────────────────────────────────────────────┘
+```
\ No newline at end of file
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 3baef3f5ba7..f25ce4c203d 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
@@ -748,7 +748,7 @@ SOURCE(REDIS(
 !!! info "Примечание"
     Поля `column_family` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `column_family` или `query`.
 
-### PosgreSQL {#dicts-external_dicts_dict_sources-postgresql}
+### PostgreSQL {#dicts-external_dicts_dict_sources-postgresql}
 
 Пример настройки:
 
diff --git a/docs/ru/sql-reference/functions/hash-functions.md b/docs/ru/sql-reference/functions/hash-functions.md
index c7a738acd04..06e97181be0 100644
--- a/docs/ru/sql-reference/functions/hash-functions.md
+++ b/docs/ru/sql-reference/functions/hash-functions.md
@@ -89,9 +89,39 @@ SELECT sipHash64(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00
 
 ## sipHash128 {#hash_functions-siphash128}
 
-Вычисляет SipHash от строки.
-Принимает аргумент типа String. Возвращает FixedString(16).
-Отличается от sipHash64 тем, что финальный xor-folding состояния делается только до 128 бит.
+Генерирует 128-битное хеш-значение [SipHash](https://131002.net/siphash/). Отличается от [sipHash64](#hash_functions-siphash64) тем, что финальный xor-folding состояния делается до 128 бит.
+
+**Синтаксис**
+
+``` sql
+sipHash128(par1,...)
+```
+
+**Аргументы**
+
+Функция принимает переменное число входных параметров. Аргументы могут быть любого [поддерживаемого типа данных](../../sql-reference/functions/hash-functions.md).
+
+**Возвращаемое значение**
+
+128-битное хеш-значение `SipHash`.
+
+Тип: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT hex(sipHash128('foo', '\x01', 3));
+```
+
+Результат:
+
+``` text
+┌─hex(sipHash128('foo', '', 3))────┐
+│ 9DE516A64A414D4B1B609415E4523F24 │
+└──────────────────────────────────┘
+```
 
 ## cityHash64 {#cityhash64}
 
@@ -459,30 +489,38 @@ SELECT murmurHash3_32(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:
 
 ## murmurHash3_128 {#murmurhash3-128}
 
-Генерирует значение [MurmurHash3](https://github.com/aappleby/smhasher).
+Генерирует 128-битное хеш-значение [MurmurHash3](https://github.com/aappleby/smhasher).
+
+**Синтаксис**
 
 ``` sql
-murmurHash3_128( expr )
+murmurHash3_128(expr)
 ```
 
 **Аргументы**
 
--   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа [String](../../sql-reference/functions/hash-functions.md).
+-   `expr` — список [выражений](../../sql-reference/syntax.md#syntax-expressions). [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
 
-Хэш-значение типа [FixedString(16)](../../sql-reference/functions/hash-functions.md).
+128-битное значение хеш-значение `MurmurHash3`.
+
+Тип: [FixedString(16)](../../sql-reference/data-types/fixedstring.md).
 
 **Пример**
 
+Запрос:
+
 ``` sql
-SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
+SELECT hex(murmurHash3_128('foo', 'foo', 'foo'));
 ```
 
+Результат:
+
 ``` text
-┌─MurmurHash3──────────────────────┬─type───┐
-│ 368A1A311CB7342253354B548E7E7E71 │ String │
-└──────────────────────────────────┴────────┘
+┌─hex(murmurHash3_128('foo', 'foo', 'foo'))─┐
+│ F8F7AD9B6CD4CF117A71E277E2EC2931          │
+└───────────────────────────────────────────┘
 ```
 
 ## xxHash32, xxHash64 {#hash-functions-xxhash32-xxhash64}
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index 141a6d4f911..536bb37199d 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -8,6 +8,7 @@
 #include <Common/setThreadName.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Parsers/ASTFunction.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <QueryPipeline/Chain.h>
diff --git a/programs/copier/Internals.cpp b/programs/copier/Internals.cpp
index 6fc69361c90..61bba214d5b 100644
--- a/programs/copier/Internals.cpp
+++ b/programs/copier/Internals.cpp
@@ -1,8 +1,10 @@
 #include "Internals.h"
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/extractKeyExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/Transforms/SquashingChunksTransform.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/extractKeyExpressionList.h>
 
 namespace DB
 {
diff --git a/programs/copier/TaskTableAndShard.h b/programs/copier/TaskTableAndShard.h
index 16696a1bd23..cef9b669971 100644
--- a/programs/copier/TaskTableAndShard.h
+++ b/programs/copier/TaskTableAndShard.h
@@ -5,6 +5,7 @@
 #include "ClusterPartition.h"
 
 #include <Core/Defines.h>
+#include <Parsers/ASTFunction.h>
 
 #include <base/map.h>
 #include <boost/algorithm/string/join.hpp>
diff --git a/programs/keeper/keeper_config.xml b/programs/keeper/keeper_config.xml
index 02d5be70563..8b4d4274e6a 100644
--- a/programs/keeper/keeper_config.xml
+++ b/programs/keeper/keeper_config.xml
@@ -49,7 +49,7 @@
 
                     <!-- Internal port and hostname -->
                     <hostname>localhost</hostname>
-                    <port>44444</port>
+                    <port>9234</port>
                 </server>
 
                 <!-- Add more servers here -->
diff --git a/programs/keeper/keeper_embedded.xml b/programs/keeper/keeper_embedded.xml
index 9d08a3ce910..d887b95a735 100644
--- a/programs/keeper/keeper_embedded.xml
+++ b/programs/keeper/keeper_embedded.xml
@@ -14,7 +14,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/src/Access/AccessEntityIO.cpp b/src/Access/AccessEntityIO.cpp
index 86aed1b5ad4..e944dc71114 100644
--- a/src/Access/AccessEntityIO.cpp
+++ b/src/Access/AccessEntityIO.cpp
@@ -7,6 +7,7 @@
 #include <Access/SettingsProfile.h>
 #include <Access/User.h>
 #include <Core/Defines.h>
+#include <IO/WriteHelpers.h>
 #include <Interpreters/Access/InterpreterCreateQuotaQuery.h>
 #include <Interpreters/Access/InterpreterCreateRoleQuery.h>
 #include <Interpreters/Access/InterpreterCreateRowPolicyQuery.h>
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index 022789cc96c..1567bda5e79 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -203,6 +203,21 @@ public:
         data(place).count += !assert_cast<const ColumnNullable &>(*columns[0]).isNullAt(row_num);
     }
 
+    void addBatchSinglePlace(
+        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena *, ssize_t if_argument_pos) const override
+    {
+        auto & nc = assert_cast<const ColumnNullable &>(*columns[0]);
+        if (if_argument_pos >= 0)
+        {
+            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            data(place).count += countBytesInFilterWithNull(flags, nc.getNullMapData().data());
+        }
+        else
+        {
+            data(place).count += batch_size - countBytesInFilter(nc.getNullMapData().data(), batch_size);
+        }
+    }
+
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
         data(place).count += data(rhs).count;
diff --git a/src/AggregateFunctions/parseAggregateFunctionParameters.cpp b/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
index 64eb0932de9..1ed0f0cc78a 100644
--- a/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
+++ b/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
@@ -1,6 +1,6 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 
-#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
 
diff --git a/src/AggregateFunctions/parseAggregateFunctionParameters.h b/src/AggregateFunctions/parseAggregateFunctionParameters.h
index 033e92714dd..a67bc081303 100644
--- a/src/AggregateFunctions/parseAggregateFunctionParameters.h
+++ b/src/AggregateFunctions/parseAggregateFunctionParameters.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTExpressionList.h>
 #include <Interpreters/Context_fwd.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/IAST_fwd.h>
 
 
 namespace DB
diff --git a/src/Backups/renameInCreateQuery.cpp b/src/Backups/renameInCreateQuery.cpp
index 7a94a755f67..5b2492b3be4 100644
--- a/src/Backups/renameInCreateQuery.cpp
+++ b/src/Backups/renameInCreateQuery.cpp
@@ -1,12 +1,13 @@
-#include <Backups/renameInCreateQuery.h>
 #include <Backups/BackupRenamingConfig.h>
+#include <Backups/renameInCreateQuery.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/evaluateConstantExpression.h>
 
 
 namespace DB
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 031c849bef1..b098a478c9e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,8 @@ configure_file (Common/config_version.h.in ${CONFIG_VERSION})
 configure_file (Core/config_core.h.in "${CMAKE_CURRENT_BINARY_DIR}/Core/include/config_core.h")
 
 if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-I\"${ClickHouse_SOURCE_DIR}/base\" -include \"${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h\"")
+    get_target_property(MAGIC_ENUM_INCLUDE_DIR magic_enum INTERFACE_INCLUDE_DIRECTORIES)
+    set (INCLUDE_DEBUG_HELPERS "-I\"${ClickHouse_SOURCE_DIR}/base\" -I\"${MAGIC_ENUM_INCLUDE_DIR}\" -include \"${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index d274b673091..c23592393c5 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -40,7 +40,6 @@
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTUseQuery.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTQueryWithOutput.h>
 #include <Parsers/ASTLiteral.h>
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index d22f6e1574b..97ddda1ea30 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -165,7 +165,7 @@ protected:
     std::function<void()> fatal_error_callback;
 
     /// It is used to avoid enabling the query profiler when you have multiple ThreadStatus in the same thread
-    bool query_profiled_enabled = true;
+    bool query_profiler_enabled = true;
 
     /// Requires access to query_id.
     friend class MemoryTrackerThreadSwitcher;
@@ -207,7 +207,8 @@ public:
 
     void disableProfiling()
     {
-        query_profiled_enabled = false;
+        assert(!query_profiler_real && !query_profiler_cpu);
+        query_profiler_enabled = false;
     }
 
     /// Starts new query and create new thread group for it, current thread becomes master thread of the query
diff --git a/src/Common/Visitor.h b/src/Common/Visitor.h
index 53603130b2a..d14f737ac77 100644
--- a/src/Common/Visitor.h
+++ b/src/Common/Visitor.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <base/demangle.h>
-#include <base/Typelist.h>
+#include <base/TypeList.h>
 #include <Common/Exception.h>
 
 /* Generic utils which are intended for visitor pattern implementation.
@@ -64,7 +64,7 @@ template <>
 class Visitor<>
 {
 public:
-    using List = Typelist<>;
+    using List = TypeList<>;
 
 protected:
     ~Visitor() = default;
@@ -74,7 +74,7 @@ template <typename Type>
 class Visitor<Type> : public Visitor<>
 {
 public:
-    using List = Typelist<Type>;
+    using List = TypeList<Type>;
 
     virtual void visit(Type &) = 0;
 
@@ -86,7 +86,7 @@ template <typename Type, typename ... Types>
 class Visitor<Type, Types ...> : public Visitor<Types ...>
 {
 public:
-    using List = Typelist<Type, Types ...>;
+    using List = TypeList<Type, Types ...>;
     using Visitor<Types ...>::visit;
 
     virtual void visit(Type &) = 0;
@@ -145,10 +145,10 @@ protected:
 
 template <typename Derived, typename VisitorBase>
 class VisitorImpl : public
-    TLChangeRoot<
+    TypeListChangeRoot<
         VisitorImplHelper,
-        TLConcat<
-            Typelist<Derived, VisitorBase>,
+        TypeListConcat<
+            TypeList<Derived, VisitorBase>,
             typename VisitorBase::List
         >
     >
diff --git a/src/Compression/CachedCompressedReadBuffer.cpp b/src/Compression/CachedCompressedReadBuffer.cpp
index c19e854dd45..f942f81f5e9 100644
--- a/src/Compression/CachedCompressedReadBuffer.cpp
+++ b/src/Compression/CachedCompressedReadBuffer.cpp
@@ -87,7 +87,7 @@ CachedCompressedReadBuffer::CachedCompressedReadBuffer(
 void CachedCompressedReadBuffer::seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block)
 {
     /// Nothing to do if we already at required position
-    if (file_pos == offset_in_compressed_file
+    if (!owned_cell && file_pos == offset_in_compressed_file
         && (offset() == offset_in_decompressed_block ||
             nextimpl_working_buffer_offset == offset_in_decompressed_block))
         return;
@@ -106,6 +106,8 @@ void CachedCompressedReadBuffer::seek(size_t offset_in_compressed_file, size_t o
         bytes += offset();
         /// No data, everything discarded
         pos = working_buffer.end();
+        owned_cell.reset();
+
         /// Remember required offset in decompressed block which will be set in
         /// the next ReadBuffer::next() call
         nextimpl_working_buffer_offset = offset_in_decompressed_block;
diff --git a/src/Compression/CompressedReadBufferFromFile.h b/src/Compression/CompressedReadBufferFromFile.h
index 2be8ce372c2..3119873db4f 100644
--- a/src/Compression/CompressedReadBufferFromFile.h
+++ b/src/Compression/CompressedReadBufferFromFile.h
@@ -49,7 +49,7 @@ public:
     explicit CompressedReadBufferFromFile(std::unique_ptr<ReadBufferFromFileBase> buf, bool allow_different_codecs_ = false);
 
     /// Seek is lazy in some sense. We move position in compressed file_in to offset_in_compressed_file, but don't
-    /// read data into working_buffer and don't shit our position to offset_in_decompressed_block. Instead
+    /// read data into working_buffer and don't shift our position to offset_in_decompressed_block. Instead
     /// we store this offset inside nextimpl_working_buffer_offset.
     void seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block);
 
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index c3f14fe1449..6cb3874f808 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -7,11 +7,9 @@
 #include <Compression/CompressionCodecEncrypted.h>
 #include <Poco/Logger.h>
 #include <base/logger_useful.h>
-#include <Common/ErrorCodes.h>
 
 // This depends on BoringSSL-specific API, notably <openssl/aead.h>.
 #if USE_SSL && USE_INTERNAL_SSL_LIBRARY
-#include <Parsers/ASTLiteral.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>
 #include <boost/algorithm/hex.hpp>
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 8ddb2086ebf..cf3947cc9b5 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -7,7 +7,6 @@
 #include <Compression/CompressionFactory.h>
 #include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTIdentifier.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/BitHelpers.h>
diff --git a/src/Compression/CompressionCodecNone.cpp b/src/Compression/CompressionCodecNone.cpp
index 84bcb5bd841..ff1e68366c1 100644
--- a/src/Compression/CompressionCodecNone.cpp
+++ b/src/Compression/CompressionCodecNone.cpp
@@ -1,7 +1,6 @@
 #include <Compression/CompressionCodecNone.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <Parsers/ASTIdentifier.h>
 
 
 namespace DB
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index 66e9082dc4a..3bff8474c2e 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -5,7 +5,6 @@
 #include <base/unaligned.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Core/Types.h>
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index 5c4b94ad823..bcaa3d95b6b 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -15,8 +15,8 @@
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
 
 
 namespace DB
diff --git a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
index dc0411331e6..efcab212094 100644
--- a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
@@ -8,8 +8,9 @@
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 
 #include <boost/algorithm/string/join.hpp>
 
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 6357ead0978..a618bfe3ed4 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -6,7 +6,7 @@
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
 #include <Core/Field.h>
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeFactory.h>
@@ -53,7 +53,7 @@ namespace
         {
         }
 
-        template <class T>
+        template <typename T>
         void operator()(Id<T>)
         {
             if (typeid_cast<const DataTypeNumber<T> *>(&keys_type))
@@ -89,7 +89,7 @@ MutableColumnUniquePtr DataTypeLowCardinality::createColumnUniqueImpl(const IDat
     else if (which.isInt() || which.isUInt() || which.isFloat())
     {
         MutableColumnUniquePtr column;
-        TLUtils::forEach(TLIntegral{}, CreateColumnVector(column, *type, creator));
+        TypeListUtils::forEach(TypeListIntAndFloat{}, CreateColumnVector(column, *type, creator));
 
         if (!column)
             throw Exception("Unexpected numeric type: " + type->getName(), ErrorCodes::LOGICAL_ERROR);
diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index d11a2a2211a..1b5e20bddce 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -5,7 +5,6 @@
 #include <Core/MultiEnum.h>
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/IAST.h>
 #include "DataTypeDate.h"
 #include "DataTypeDateTime.h"
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
index e439a58ecf2..09d3752b180 100644
--- a/src/Databases/DDLDependencyVisitor.cpp
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -1,10 +1,11 @@
 #include <Databases/DDLDependencyVisitor.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Dictionaries/getDictionaryConfigurationFromAST.h>
 #include <Interpreters/Context.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Poco/String.h>
 
 namespace DB
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index e5fdff97c86..ca48e2847ed 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -11,9 +11,7 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/formatAST.h>
 #include <Parsers/queryToString.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Common/Macros.h>
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index 8128bb8378e..50e56885743 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -5,6 +5,7 @@
 #include <Databases/DDLDependencyVisitor.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
 #include <Storages/IStorage.h>
 #include <filesystem>
 
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index d62ef2f206e..e9944b592ed 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index 89d1f96857e..84d2edd1bb1 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -18,6 +18,7 @@
 #include <base/getFQDNOrHostName.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
diff --git a/src/Databases/DatabasesCommon.cpp b/src/Databases/DatabasesCommon.cpp
index 523b657b065..ffb39f5b113 100644
--- a/src/Databases/DatabasesCommon.cpp
+++ b/src/Databases/DatabasesCommon.cpp
@@ -2,6 +2,7 @@
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/formatAST.h>
 #include <Storages/StorageDictionary.h>
diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h
index fe9cf5198f0..dbed4dbeaf1 100644
--- a/src/Databases/DatabasesCommon.h
+++ b/src/Databases/DatabasesCommon.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <base/types.h>
-#include <Parsers/ASTFunction.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>
 #include <Databases/IDatabase.h>
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index d333e476069..fede4319230 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -1,5 +1,7 @@
 #include <Databases/PostgreSQL/DatabasePostgreSQL.h>
 
+#include <Parsers/ASTIdentifier.h>
+
 #if USE_LIBPQXX
 
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index ec15ca90b9a..f4dab8a91a8 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -8,6 +8,7 @@
 #include <Databases/SQLite/fetchSQLiteTableStructure.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTColumnDeclaration.h>
+#include <Parsers/ASTFunction.h>
 #include <Interpreters/Context.h>
 #include <Storages/StorageSQLite.h>
 #include <Databases/SQLite/SQLiteUtils.h>
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index f031e8ff038..36a462c533e 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -9,6 +9,7 @@
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
 #include <Core/Names.h>
 #include <Common/FieldVisitorToString.h>
 #include <Parsers/ASTFunctionWithKeyValueArguments.h>
diff --git a/src/Functions/EmptyImpl.h b/src/Functions/EmptyImpl.h
index c3117e0e52d..60daa66ea03 100644
--- a/src/Functions/EmptyImpl.h
+++ b/src/Functions/EmptyImpl.h
@@ -58,7 +58,7 @@ struct EmptyImpl
     static void uuid(const ColumnUUID::Container & container, size_t n, PaddedPODArray<UInt8> & res)
     {
         for (size_t i = 0; i < n; ++i)
-            res[i] = negative ^ (container.data()->toUnderType() == 0);
+            res[i] = negative ^ (container[i].toUnderType() == 0);
     }
 };
 
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 5d87347d8b5..69d65bfcf66 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -36,7 +36,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <base/Typelist.h>
+#include <base/TypeList.h>
 #include <base/map.h>
 
 #include <Common/config.h>
@@ -625,17 +625,17 @@ class FunctionBinaryArithmetic : public IFunction
 
     static bool castType(const IDataType * type, auto && f)
     {
-        using Types = Typelist<
+        using Types = TypeList<
             DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,
             DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
             DataTypeDecimal32, DataTypeDecimal64, DataTypeDecimal128, DataTypeDecimal256,
             DataTypeDate, DataTypeDateTime,
             DataTypeFixedString, DataTypeString>;
 
-        using Floats = Typelist<DataTypeFloat32, DataTypeFloat64>;
+        using Floats = TypeList<DataTypeFloat32, DataTypeFloat64>;
 
         using ValidTypes = std::conditional_t<valid_on_float_arguments,
-            TLConcat<Types, Floats>,
+            TypeListConcat<Types, Floats>,
             Types>;
 
         return castTypeToEither(ValidTypes{}, type, std::forward<decltype(f)>(f));
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index 58a7947a135..d3796081f18 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -279,37 +279,33 @@ private:
             // That may lead later to reading unallocated data from underlying PaddedPODArray
             // due to assumption that it is safe to read up to 15 bytes past end.
             const auto pad_to_next_block = block_size == 1 ? 0 : 1;
-            for (size_t r = 0; r < input_rows_count; ++r)
+            for (size_t row_idx = 0; row_idx < input_rows_count; ++row_idx)
             {
-                resulting_size += (input_column->getDataAt(r).size / block_size + pad_to_next_block) * block_size + 1;
+                resulting_size += (input_column->getDataAt(row_idx).size / block_size + pad_to_next_block) * block_size + 1;
                 if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM)
                     resulting_size += tag_size;
             }
-#if defined(MEMORY_SANITIZER)
-            encrypted_result_column_data.resize_fill(resulting_size, 0xFF);
-#else
             encrypted_result_column_data.resize(resulting_size);
-#endif
         }
 
         auto * encrypted = encrypted_result_column_data.data();
 
         KeyHolder<mode> key_holder;
 
-        for (size_t r = 0; r < input_rows_count; ++r)
+        for (size_t row_idx = 0; row_idx < input_rows_count; ++row_idx)
         {
-            const auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r));
+            const auto key_value = key_holder.setKey(key_size, key_column->getDataAt(row_idx));
             auto iv_value = StringRef{};
             if (iv_column)
             {
-                iv_value = iv_column->getDataAt(r);
+                iv_value = iv_column->getDataAt(row_idx);
 
                 /// If the length is zero (empty string is passed) it should be treat as no IV.
                 if (iv_value.size == 0)
                     iv_value.data = nullptr;
             }
 
-            const StringRef input_value = input_column->getDataAt(r);
+            const StringRef input_value = input_column->getDataAt(row_idx);
 
             if constexpr (mode != CipherMode::MySQLCompatibility)
             {
@@ -348,7 +344,7 @@ private:
                     // 1.a.2 Set AAD
                     if (aad_column)
                     {
-                        const auto aad_data = aad_column->getDataAt(r);
+                        const auto aad_data = aad_column->getDataAt(row_idx);
                         int tmp_len = 0;
                         if (aad_data.size != 0 && EVP_EncryptUpdate(evp_ctx, nullptr, &tmp_len,
                                 reinterpret_cast<const unsigned char *>(aad_data.data), aad_data.size) != 1)
@@ -408,7 +404,7 @@ private:
 };
 
 
-/// AES_decrypt(string, key, block_mode[, init_vector])
+/// decrypt(string, key, block_mode[, init_vector])
 template <typename Impl>
 class FunctionDecrypt : public IFunction
 {
@@ -471,7 +467,9 @@ private:
 
         ColumnPtr result_column;
         if (arguments.size() <= 3)
+        {
             result_column = doDecrypt(evp_cipher, input_rows_count, input_column, key_column, nullptr, nullptr);
+        }
         else
         {
             const auto iv_column = arguments[3].column;
@@ -548,59 +546,58 @@ private:
 
         {
             size_t resulting_size = 0;
-            for (size_t r = 0; r < input_rows_count; ++r)
+            for (size_t row_idx = 0; row_idx < input_rows_count; ++row_idx)
             {
-                size_t string_size = input_column->getDataAt(r).size;
+                size_t string_size = input_column->getDataAt(row_idx).size;
                 resulting_size += string_size + 1;  /// With terminating zero.
 
                 if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM)
                 {
-                    if (string_size < tag_size)
-                        throw Exception("Encrypted data is smaller than the size of additional data for AEAD mode, cannot decrypt.",
-                            ErrorCodes::BAD_ARGUMENTS);
+                    if (string_size > 0)
+                    {
+                        if (string_size < tag_size)
+                            throw Exception("Encrypted data is smaller than the size of additional data for AEAD mode, cannot decrypt.",
+                                ErrorCodes::BAD_ARGUMENTS);
 
-                    resulting_size -= tag_size;
+                        resulting_size -= tag_size;
+                    }
                 }
             }
 
-#if defined(MEMORY_SANITIZER)
-            // Pre-fill result column with values to prevent MSAN from dropping dead on
-            // aes-X-ecb mode with "WARNING: MemorySanitizer: use-of-uninitialized-value".
-            // This is most likely to be caused by the underlying assembler implementation:
-            // see crypto/aes/aesni-x86_64.s, function aesni_ecb_encrypt
-            // which msan seems to fail instrument correctly.
-            decrypted_result_column_data.resize_fill(resulting_size, 0xFF);
-#else
             decrypted_result_column_data.resize(resulting_size);
-#endif
         }
 
         auto * decrypted = decrypted_result_column_data.data();
 
         KeyHolder<mode> key_holder;
-        for (size_t r = 0; r < input_rows_count; ++r)
+        for (size_t row_idx = 0; row_idx < input_rows_count; ++row_idx)
         {
             // 0: prepare key if required
-            auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r));
+            auto key_value = key_holder.setKey(key_size, key_column->getDataAt(row_idx));
             auto iv_value = StringRef{};
             if (iv_column)
             {
-                iv_value = iv_column->getDataAt(r);
+                iv_value = iv_column->getDataAt(row_idx);
 
                 /// If the length is zero (empty string is passed) it should be treat as no IV.
                 if (iv_value.size == 0)
                     iv_value.data = nullptr;
             }
 
-            auto input_value = input_column->getDataAt(r);
+            auto input_value = input_column->getDataAt(row_idx);
+
             if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM)
             {
-                // empty plaintext results in empty ciphertext + tag, means there should be at least tag_size bytes.
-                if (input_value.size < tag_size)
-                    throw Exception(fmt::format("Encrypted data is too short: only {} bytes, "
-                            "should contain at least {} bytes of a tag.",
-                            input_value.size, block_size, tag_size), ErrorCodes::BAD_ARGUMENTS);
-                input_value.size -= tag_size;
+                if (input_value.size > 0)
+                {
+                    // empty plaintext results in empty ciphertext + tag, means there should be at least tag_size bytes.
+                    if (input_value.size < tag_size)
+                        throw Exception(fmt::format("Encrypted data is too short: only {} bytes, "
+                                "should contain at least {} bytes of a tag.",
+                                input_value.size, block_size, tag_size), ErrorCodes::BAD_ARGUMENTS);
+
+                    input_value.size -= tag_size;
+                }
             }
 
             if constexpr (mode != CipherMode::MySQLCompatibility)
@@ -619,8 +616,9 @@ private:
                 }
             }
 
-            // Avoid extra work on empty ciphertext/plaintext for some ciphers
-            if (!(input_value.size == 0 && block_size == 1 && mode != CipherMode::RFC5116_AEAD_AES_GCM))
+            /// Avoid extra work on empty ciphertext/plaintext. Always decrypt empty to empty.
+            /// This makes sense for default implementation for NULLs.
+            if (input_value.size > 0)
             {
                 // 1: Init CTX
                 if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM)
@@ -641,7 +639,7 @@ private:
                     // 1.a.2: Set AAD if present
                     if (aad_column)
                     {
-                        StringRef aad_data = aad_column->getDataAt(r);
+                        StringRef aad_data = aad_column->getDataAt(row_idx);
                         int tmp_len = 0;
                         if (aad_data.size != 0 && EVP_DecryptUpdate(evp_ctx, nullptr, &tmp_len,
                                 reinterpret_cast<const unsigned char *>(aad_data.data), aad_data.size) != 1)
diff --git a/src/Functions/GatherUtils/ArraySinkVisitor.h b/src/Functions/GatherUtils/ArraySinkVisitor.h
index 245c5d4451d..46c8a38ec8d 100644
--- a/src/Functions/GatherUtils/ArraySinkVisitor.h
+++ b/src/Functions/GatherUtils/ArraySinkVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Common/Visitor.h>
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 
 namespace DB::GatherUtils
 {
@@ -14,12 +14,12 @@ struct GenericArraySink;
 template <typename ArraySink>
 struct NullableArraySink;
 
-using NumericArraySinks = TLMap<NumericArraySink, TLNumbersWithUUID>;
-using BasicArraySinks = TLAppend<GenericArraySink, NumericArraySinks>;
-using NullableArraySinks = TLMap<NullableArraySink, BasicArraySinks>;
-using TLArraySinks = TLConcat<BasicArraySinks, NullableArraySinks>;
+using NumericArraySinks = TypeListMap<NumericArraySink, TypeListNumberWithUUID>;
+using BasicArraySinks = TypeListAppend<GenericArraySink, NumericArraySinks>;
+using NullableArraySinks = TypeListMap<NullableArraySink, BasicArraySinks>;
+using TLArraySinks = TypeListConcat<BasicArraySinks, NullableArraySinks>;
 
-class ArraySinkVisitor : public TLChangeRoot<Visitor, TLArraySinks>
+class ArraySinkVisitor : public TypeListChangeRoot<Visitor, TLArraySinks>
 {
 protected:
     ~ArraySinkVisitor() = default;
diff --git a/src/Functions/GatherUtils/ArraySourceVisitor.h b/src/Functions/GatherUtils/ArraySourceVisitor.h
index 707503f35e8..f2e40aac262 100644
--- a/src/Functions/GatherUtils/ArraySourceVisitor.h
+++ b/src/Functions/GatherUtils/ArraySourceVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Common/Visitor.h>
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 
 namespace DB::GatherUtils
 {
@@ -17,10 +17,10 @@ struct NullableArraySource;
 template <typename Base>
 struct ConstSource;
 
-using NumericArraySources = TLMap<NumericArraySource, TLNumbersWithUUID>;
-using BasicArraySources = TLAppend<GenericArraySource, NumericArraySources>;
+using NumericArraySources = TypeListMap<NumericArraySource, TypeListNumberWithUUID>;
+using BasicArraySources = TypeListAppend<GenericArraySource, NumericArraySources>;
 
-class ArraySourceVisitor : public TLChangeRoot<Visitor, BasicArraySources>
+class ArraySourceVisitor : public TypeListChangeRoot<Visitor, BasicArraySources>
 {
 protected:
     ~ArraySourceVisitor() = default;
diff --git a/src/Functions/GatherUtils/ValueSourceVisitor.h b/src/Functions/GatherUtils/ValueSourceVisitor.h
index 6577afd5616..5fd4ba1a57e 100644
--- a/src/Functions/GatherUtils/ValueSourceVisitor.h
+++ b/src/Functions/GatherUtils/ValueSourceVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Common/Visitor.h>
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 
 namespace DB::GatherUtils
 {
@@ -17,14 +17,14 @@ struct NullableValueSource;
 template <typename Base>
 struct ConstSource;
 
-using NumericValueSources = TLMap<NumericValueSource, TLNumbersWithUUID>;
-using BasicValueSources = TLAppend<GenericValueSource, NumericValueSources>;
-using NullableValueSources = TLMap<NullableValueSource, BasicValueSources>;
-using BasicAndNullableValueSources = TLConcat<BasicValueSources, NullableValueSources>;
-using ConstValueSources = TLMap<ConstSource, BasicAndNullableValueSources>;
-using TypeListValueSources = TLConcat<BasicAndNullableValueSources, ConstValueSources>;
+using NumericValueSources = TypeListMap<NumericValueSource, TypeListNumberWithUUID>;
+using BasicValueSources = TypeListAppend<GenericValueSource, NumericValueSources>;
+using NullableValueSources = TypeListMap<NullableValueSource, BasicValueSources>;
+using BasicAndNullableValueSources = TypeListConcat<BasicValueSources, NullableValueSources>;
+using ConstValueSources = TypeListMap<ConstSource, BasicAndNullableValueSources>;
+using TypeListValueSources = TypeListConcat<BasicAndNullableValueSources, ConstValueSources>;
 
-class ValueSourceVisitor : public TLChangeRoot<Visitor, TypeListValueSources>
+class ValueSourceVisitor : public TypeListChangeRoot<Visitor, TypeListValueSources>
 {
 protected:
     ~ValueSourceVisitor() = default;
diff --git a/src/Functions/GatherUtils/createArraySink.cpp b/src/Functions/GatherUtils/createArraySink.cpp
index f461790baf7..a47ca312955 100644
--- a/src/Functions/GatherUtils/createArraySink.cpp
+++ b/src/Functions/GatherUtils/createArraySink.cpp
@@ -1,7 +1,7 @@
 #include "GatherUtils.h"
 #include "Sinks.h"
 #include "Sources.h"
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 
 namespace DB::GatherUtils
 {
@@ -55,7 +55,7 @@ struct ArraySinkCreator<>
 
 std::unique_ptr<IArraySink> createArraySink(ColumnArray & col, size_t column_size)
 {
-    using Creator = TLChangeRoot<ArraySinkCreator, TLNumbersWithUUID>;
+    using Creator = TypeListChangeRoot<ArraySinkCreator, TypeListNumberWithUUID>;
     return Creator::create(col.getData(), col.getOffsets(), column_size);
 }
 }
diff --git a/src/Functions/GatherUtils/createArraySource.cpp b/src/Functions/GatherUtils/createArraySource.cpp
index 605b2057e53..500af6a2cc7 100644
--- a/src/Functions/GatherUtils/createArraySource.cpp
+++ b/src/Functions/GatherUtils/createArraySource.cpp
@@ -1,7 +1,7 @@
 #include "GatherUtils.h"
 #include "Sinks.h"
 #include "Sources.h"
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 
 namespace DB::GatherUtils
 {
@@ -58,7 +58,7 @@ struct ArraySourceCreator<>
 
 std::unique_ptr<IArraySource> createArraySource(const ColumnArray & col, bool is_const, size_t total_rows)
 {
-    using Creator = TLChangeRoot<ArraySourceCreator, TLNumbersWithUUID>;
+    using Creator = TypeListChangeRoot<ArraySourceCreator, TypeListNumberWithUUID>;
     if (const auto * column_nullable = typeid_cast<const ColumnNullable *>(&col.getData()))
     {
         auto column = ColumnArray::create(column_nullable->getNestedColumnPtr(), col.getOffsetsPtr());
diff --git a/src/Functions/GatherUtils/createValueSource.cpp b/src/Functions/GatherUtils/createValueSource.cpp
index 53cd26ffdd7..074c1f8bff0 100644
--- a/src/Functions/GatherUtils/createValueSource.cpp
+++ b/src/Functions/GatherUtils/createValueSource.cpp
@@ -1,7 +1,7 @@
 #include "GatherUtils.h"
 #include "Sinks.h"
 #include "Sources.h"
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 
 namespace DB::GatherUtils
 {
@@ -58,7 +58,7 @@ struct ValueSourceCreator<>
 
 std::unique_ptr<IValueSource> createValueSource(const IColumn & col, bool is_const, size_t total_rows)
 {
-    using Creator = TLChangeRoot<ValueSourceCreator, TLNumbersWithUUID>;
+    using Creator = TypeListChangeRoot<ValueSourceCreator, TypeListNumberWithUUID>;
     if (const auto * column_nullable = typeid_cast<const ColumnNullable *>(&col))
     {
         return Creator::create(column_nullable->getNestedColumn(), &column_nullable->getNullMapData(), is_const, total_rows);
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
index 0ea3bfbd013..f0ed178e1c2 100644
--- a/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
@@ -1,7 +1,7 @@
 #include <Functions/JSONPath/ASTs/ASTJSONPathMemberAccess.h>
 #include <Functions/JSONPath/Parsers/ParserJSONPathMemberAccess.h>
 
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/Lexer.h>
 
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index 0f9b84344e6..1a340c517dc 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -2,7 +2,7 @@
 
 #include <base/types.h>
 #include <Core/Defines.h>
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
 #include <Common/typeid_cast.h>
@@ -604,7 +604,7 @@ struct CallPointInPolygon<Type, Types ...>
     template <typename PointInPolygonImpl>
     static ColumnPtr call(const IColumn & x, const IColumn & y, PointInPolygonImpl && impl)
     {
-        using Impl = TLChangeRoot<CallPointInPolygon, TLIntegral>;
+        using Impl = TypeListChangeRoot<CallPointInPolygon, TypeListIntAndFloat>;
         if (auto column = typeid_cast<const ColumnVector<Type> *>(&x))
             return Impl::template call<Type>(*column, y, impl);
         return CallPointInPolygon<Types ...>::call(x, y, impl);
@@ -630,7 +630,7 @@ struct CallPointInPolygon<>
 template <typename PointInPolygonImpl>
 NO_INLINE ColumnPtr pointInPolygon(const IColumn & x, const IColumn & y, PointInPolygonImpl && impl)
 {
-    using Impl = TLChangeRoot<CallPointInPolygon, TLIntegral>;
+    using Impl = TypeListChangeRoot<CallPointInPolygon, TypeListIntAndFloat>;
     return Impl::call(x, y, impl);
 }
 
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 7df14fd9981..f2779a2fe58 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -20,7 +20,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/assert_cast.h>
-#include <base/Typelists.h>
+#include <base/TypeLists.h>
 #include <Interpreters/castColumn.h>
 #include <base/range.h>
 
@@ -403,8 +403,8 @@ ColumnPtr FunctionArrayIntersect::executeImpl(const ColumnsWithTypeAndName & arg
 
     ColumnPtr result_column;
     auto not_nullable_nested_return_type = removeNullable(nested_return_type);
-    TLUtils::forEach(TLIntegral{}, NumberExecutor(arrays, not_nullable_nested_return_type, result_column));
-    TLUtils::forEach(TLDecimals{}, DecimalExecutor(arrays, not_nullable_nested_return_type, result_column));
+    TypeListUtils::forEach(TypeListIntAndFloat{}, NumberExecutor(arrays, not_nullable_nested_return_type, result_column));
+    TypeListUtils::forEach(TypeListDecimal{}, DecimalExecutor(arrays, not_nullable_nested_return_type, result_column));
 
     using DateMap = ClearableHashMapWithStackMemory<DataTypeDate::FieldType,
         size_t, DefaultHash<DataTypeDate::FieldType>, INITIAL_SIZE_DEGREE>;
diff --git a/src/Functions/castTypeToEither.h b/src/Functions/castTypeToEither.h
index c55336adb5a..f5ee9779451 100644
--- a/src/Functions/castTypeToEither.h
+++ b/src/Functions/castTypeToEither.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/typeid_cast.h>
-#include <base/Typelist.h>
+#include <base/TypeList.h>
 
 namespace DB
 {
@@ -13,7 +13,7 @@ static bool castTypeToEither(const T * type, F && f)
 }
 
 template <class ...Args>
-constexpr bool castTypeToEither(Typelist<Args...>, const auto * type, auto && f)
+constexpr bool castTypeToEither(TypeList<Args...>, const auto * type, auto && f)
 {
     return (
         (typeid_cast<const Args *>(type) != nullptr
diff --git a/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h b/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h
index 80a804ff76c..ab01cc6a0b6 100644
--- a/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h
+++ b/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h
@@ -4,8 +4,6 @@
 #include <IO/WriteHelpers.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/IAST.h>
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.cpp b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
index 11157410501..6378bd6fdb2 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.cpp
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
@@ -3,7 +3,9 @@
 #include <Interpreters/StorageID.h>
 #include <Interpreters/misc.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTWithElement.h>
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.cpp b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
index 9715af01a0a..1c87138e1e3 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.cpp
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
@@ -1,3 +1,4 @@
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/queryToString.h>
 
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
diff --git a/src/Interpreters/ComparisonGraph.h b/src/Interpreters/ComparisonGraph.h
index 60cc97e68a3..20d6f135a0d 100644
--- a/src/Interpreters/ComparisonGraph.h
+++ b/src/Interpreters/ComparisonGraph.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTLiteral.h>
 #include <Interpreters/TreeCNFConverter.h>
 #include <unordered_map>
 #include <map>
diff --git a/src/Interpreters/DuplicateOrderByVisitor.cpp b/src/Interpreters/DuplicateOrderByVisitor.cpp
index df063fc849e..b3573af9f8c 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.cpp
+++ b/src/Interpreters/DuplicateOrderByVisitor.cpp
@@ -1,9 +1,7 @@
 #include <Interpreters/DuplicateOrderByVisitor.h>
 #include <Functions/FunctionFactory.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <IO/WriteHelpers.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
diff --git a/src/Interpreters/ExtractExpressionInfoVisitor.cpp b/src/Interpreters/ExtractExpressionInfoVisitor.cpp
index 2d46fe08e95..9b283175481 100644
--- a/src/Interpreters/ExtractExpressionInfoVisitor.cpp
+++ b/src/Interpreters/ExtractExpressionInfoVisitor.cpp
@@ -2,6 +2,8 @@
 #include <Functions/FunctionFactory.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSubquery.h>
 
 
diff --git a/src/Interpreters/ExtractExpressionInfoVisitor.h b/src/Interpreters/ExtractExpressionInfoVisitor.h
index c84e243ce2e..a8cc3a39f89 100644
--- a/src/Interpreters/ExtractExpressionInfoVisitor.h
+++ b/src/Interpreters/ExtractExpressionInfoVisitor.h
@@ -3,13 +3,14 @@
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
+class ASTFunction;
+class ASTIdentifier;
+
 
 struct ExpressionInfoMatcher
 {
diff --git a/src/Interpreters/FunctionNameNormalizer.cpp b/src/Interpreters/FunctionNameNormalizer.cpp
index 255f4d8c6bb..d163bf3cba5 100644
--- a/src/Interpreters/FunctionNameNormalizer.cpp
+++ b/src/Interpreters/FunctionNameNormalizer.cpp
@@ -2,6 +2,7 @@
 
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/FunctionNameNormalizer.h b/src/Interpreters/FunctionNameNormalizer.h
index 3f22bb2f627..0eb85b53488 100644
--- a/src/Interpreters/FunctionNameNormalizer.h
+++ b/src/Interpreters/FunctionNameNormalizer.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <Parsers/IAST.h>
-#include <Parsers/ASTFunction.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.cpp b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
index b23daa2d648..93b35a3416a 100644
--- a/src/Interpreters/GatherFunctionQuantileVisitor.cpp
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
@@ -1,5 +1,6 @@
 #include <string>
 #include <Interpreters/GatherFunctionQuantileVisitor.h>
+#include <Parsers/ASTFunction.h>
 #include <Common/Exception.h>
 #include <base/types.h>
 
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.h b/src/Interpreters/GatherFunctionQuantileVisitor.h
index 19f092720af..d68cc8fe22e 100644
--- a/src/Interpreters/GatherFunctionQuantileVisitor.h
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <Parsers/ASTFunction.h>
-#include <Parsers/IAST.h>
-#include <Interpreters/InDepthNodeVisitor.h>
 #include <AggregateFunctions/AggregateFunctionQuantile.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
+class ASTFunction;
+
 /// Gather all the `quantile*` functions
 class GatherFunctionQuantileData
 {
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 70f7c0c0359..5d2df583b9e 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -10,7 +10,6 @@
 #include <Interpreters/interpretSubquery.h>
 #include <Interpreters/SubqueryForSet.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
diff --git a/src/Interpreters/GroupByFunctionKeysVisitor.h b/src/Interpreters/GroupByFunctionKeysVisitor.h
index 855723307d6..e21e71d7a72 100644
--- a/src/Interpreters/GroupByFunctionKeysVisitor.h
+++ b/src/Interpreters/GroupByFunctionKeysVisitor.h
@@ -4,8 +4,6 @@
 #include <IO/WriteHelpers.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Interpreters/IdentifierSemantic.cpp b/src/Interpreters/IdentifierSemantic.cpp
index 1112b5c3bda..edc087871f8 100644
--- a/src/Interpreters/IdentifierSemantic.cpp
+++ b/src/Interpreters/IdentifierSemantic.cpp
@@ -6,6 +6,8 @@
 #include <Interpreters/StorageID.h>
 
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/IdentifierSemantic.h b/src/Interpreters/IdentifierSemantic.h
index cabe755027c..5dc828c36ba 100644
--- a/src/Interpreters/IdentifierSemantic.h
+++ b/src/Interpreters/IdentifierSemantic.h
@@ -6,12 +6,13 @@
 #include <Interpreters/QueryAliasesVisitor.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Interpreters/getTableExpressions.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
 
+class ASTIdentifier;
+class ASTSelectQuery;
+
 struct IdentifierSemanticImpl
 {
     bool special = false;              /// for now it's 'not a column': tables, subselects and some special stuff like FORMAT
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 665d76625ef..e92844885e4 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTAssignment.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/LiveView/LiveViewCommands.h>
diff --git a/src/Interpreters/InterpreterCreateFunctionQuery.cpp b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
index d39e22f55f0..1c43da07628 100644
--- a/src/Interpreters/InterpreterCreateFunctionQuery.cpp
+++ b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
@@ -1,15 +1,16 @@
 #include <Interpreters/InterpreterCreateFunctionQuery.h>
 
 #include <Access/ContextAccess.h>
-#include <Parsers/ASTCreateFunctionQuery.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/FunctionNameNormalizer.h>
-#include <Interpreters/UserDefinedSQLObjectsLoader.h>
 #include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 
 
 namespace DB
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 3afb1e1fbb0..e3a6812124f 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -12,6 +12,7 @@
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTExplainQuery.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 
 #include <Storages/StorageView.h>
 #include <Processors/QueryPlan/QueryPlan.h>
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 99b68897549..8c0d3620dd6 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -297,7 +297,7 @@ BlockIO InterpreterInsertQuery::execute()
                 const auto & union_modes = select_query.list_of_modes;
 
                 /// ASTSelectWithUnionQuery is not normalized now, so it may pass some queries which can be Trivial select queries
-                const auto mode_is_all = [](const auto & mode) { return mode == ASTSelectWithUnionQuery::Mode::ALL; };
+                const auto mode_is_all = [](const auto & mode) { return mode == SelectUnionMode::ALL; };
 
                 is_trivial_insert_select =
                     std::all_of(union_modes.begin(), union_modes.end(), std::move(mode_is_all))
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index 3da7bf12805..6779093a53d 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -293,7 +293,7 @@ void InterpreterSelectWithUnionQuery::buildQueryPlan(QueryPlan & query_plan)
         query_plan.unitePlans(std::move(union_step), std::move(plans));
 
         const auto & query = query_ptr->as<ASTSelectWithUnionQuery &>();
-        if (query.union_mode == ASTSelectWithUnionQuery::Mode::DISTINCT)
+        if (query.union_mode == SelectUnionMode::DISTINCT)
         {
             /// Add distinct transform
             SizeLimits limits(settings.max_rows_in_distinct, settings.max_bytes_in_distinct, settings.distinct_overflow_mode);
diff --git a/src/Interpreters/MarkTableIdentifiersVisitor.cpp b/src/Interpreters/MarkTableIdentifiersVisitor.cpp
index 3010dbf57af..ce73fef8930 100644
--- a/src/Interpreters/MarkTableIdentifiersVisitor.cpp
+++ b/src/Interpreters/MarkTableIdentifiersVisitor.cpp
@@ -4,6 +4,7 @@
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/misc.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
diff --git a/src/Interpreters/MonotonicityCheckVisitor.h b/src/Interpreters/MonotonicityCheckVisitor.h
index a25fbf26420..00347388de2 100644
--- a/src/Interpreters/MonotonicityCheckVisitor.h
+++ b/src/Interpreters/MonotonicityCheckVisitor.h
@@ -9,7 +9,6 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTOrderByElement.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/IAST.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
index f2818bce0bf..364828e6126 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
@@ -1,6 +1,7 @@
 #include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTSelectIntersectExceptQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Common/typeid_cast.h>
 
 namespace DB
@@ -41,7 +42,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty list of selects for ASTSelectWithUnionQuery");
 
     /// Since nodes are traversed from bottom to top, we can also collect union modes from children up to parents.
-    ASTSelectWithUnionQuery::UnionModesSet current_set_of_modes;
+    SelectUnionModesSet current_set_of_modes;
     bool distinct_found = false;
 
     int i;
@@ -58,22 +59,22 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
             continue;
 
         /// Rewrite UNION Mode
-        if (union_modes[i] == ASTSelectWithUnionQuery::Mode::Unspecified)
+        if (union_modes[i] == SelectUnionMode::Unspecified)
         {
             if (data.union_default_mode == UnionMode::ALL)
-                union_modes[i] = ASTSelectWithUnionQuery::Mode::ALL;
+                union_modes[i] = SelectUnionMode::ALL;
             else if (data.union_default_mode == UnionMode::DISTINCT)
-                union_modes[i] = ASTSelectWithUnionQuery::Mode::DISTINCT;
+                union_modes[i] = SelectUnionMode::DISTINCT;
             else
                 throw Exception(
                     "Expected ALL or DISTINCT in SelectWithUnion query, because setting (union_default_mode) is empty",
                     DB::ErrorCodes::EXPECTED_ALL_OR_DISTINCT);
         }
 
-        if (union_modes[i] == ASTSelectWithUnionQuery::Mode::ALL)
+        if (union_modes[i] == SelectUnionMode::ALL)
         {
             if (auto * inner_union = select_list[i + 1]->as<ASTSelectWithUnionQuery>();
-                inner_union && inner_union->union_mode == ASTSelectWithUnionQuery::Mode::ALL)
+                inner_union && inner_union->union_mode == SelectUnionMode::ALL)
             {
                 /// Inner_union is an UNION ALL list, just lift up
                 for (auto child = inner_union->list_of_selects->children.rbegin(); child != inner_union->list_of_selects->children.rend();
@@ -84,7 +85,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
                 selects.push_back(select_list[i + 1]);
         }
         /// flatten all left nodes and current node to a UNION DISTINCT list
-        else if (union_modes[i] == ASTSelectWithUnionQuery::Mode::DISTINCT)
+        else if (union_modes[i] == SelectUnionMode::DISTINCT)
         {
             auto distinct_list = std::make_shared<ASTSelectWithUnionQuery>();
             distinct_list->list_of_selects = std::make_shared<ASTExpressionList>();
@@ -95,7 +96,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
                 getSelectsFromUnionListNode(select_list[j], distinct_list->list_of_selects->children);
             }
 
-            distinct_list->union_mode = ASTSelectWithUnionQuery::Mode::DISTINCT;
+            distinct_list->union_mode = SelectUnionMode::DISTINCT;
             distinct_list->is_normalized = true;
             selects.push_back(std::move(distinct_list));
             distinct_found = true;
@@ -112,7 +113,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
     if (!distinct_found)
     {
         if (auto * inner_union = select_list[0]->as<ASTSelectWithUnionQuery>();
-            inner_union && inner_union->union_mode == ASTSelectWithUnionQuery::Mode::ALL)
+            inner_union && inner_union->union_mode == SelectUnionMode::ALL)
         {
             /// Inner_union is an UNION ALL list, just lift it up
             for (auto child = inner_union->list_of_selects->children.rbegin(); child != inner_union->list_of_selects->children.rend();
@@ -135,7 +136,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
     std::reverse(selects.begin(), selects.end());
 
     ast.is_normalized = true;
-    ast.union_mode = ASTSelectWithUnionQuery::Mode::ALL;
+    ast.union_mode = SelectUnionMode::ALL;
     ast.set_of_modes = std::move(current_set_of_modes);
 
     ast.list_of_selects->children = std::move(selects);
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
index 3e6124dc2ce..d035e90f5a5 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
@@ -2,16 +2,16 @@
 
 #include <unordered_set>
 
-#include <Parsers/IAST.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST_fwd.h>
 
 #include <Core/Settings.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 
 namespace DB
 {
 
 class ASTFunction;
+class ASTSelectWithUnionQuery;
 
 class NormalizeSelectWithUnionQueryMatcher
 {
diff --git a/src/Interpreters/OptimizeIfChains.cpp b/src/Interpreters/OptimizeIfChains.cpp
index 27085fe3e53..5b0fab7793c 100644
--- a/src/Interpreters/OptimizeIfChains.cpp
+++ b/src/Interpreters/OptimizeIfChains.cpp
@@ -1,5 +1,4 @@
 #include <Common/typeid_cast.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Interpreters/OptimizeIfChains.h>
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.cpp b/src/Interpreters/PredicateExpressionsOptimizer.cpp
index adc164e0596..68dc8a0e311 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.cpp
+++ b/src/Interpreters/PredicateExpressionsOptimizer.cpp
@@ -1,13 +1,14 @@
 #include <Interpreters/PredicateExpressionsOptimizer.h>
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExtractExpressionInfoVisitor.h>
+#include <Interpreters/PredicateRewriteVisitor.h>
+#include <Interpreters/getTableExpressions.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/getTableExpressions.h>
-#include <Interpreters/PredicateRewriteVisitor.h>
-#include <Interpreters/ExtractExpressionInfoVisitor.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.h b/src/Interpreters/PredicateExpressionsOptimizer.h
index a31b9907da6..eece2355f46 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.h
+++ b/src/Interpreters/PredicateExpressionsOptimizer.h
@@ -2,11 +2,11 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
-#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
 
+class ASTSelectQuery;
 struct Settings;
 
 /** Predicate optimization based on rewriting ast rules
diff --git a/src/Interpreters/PredicateRewriteVisitor.cpp b/src/Interpreters/PredicateRewriteVisitor.cpp
index b3425750b56..74ecc247eb1 100644
--- a/src/Interpreters/PredicateRewriteVisitor.cpp
+++ b/src/Interpreters/PredicateRewriteVisitor.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/ASTColumnsMatcher.h>
 #include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ASTSelectIntersectExceptQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/InterpreterSelectQuery.h>
diff --git a/src/Interpreters/PredicateRewriteVisitor.h b/src/Interpreters/PredicateRewriteVisitor.h
index e7512711596..d2b9ece9306 100644
--- a/src/Interpreters/PredicateRewriteVisitor.h
+++ b/src/Interpreters/PredicateRewriteVisitor.h
@@ -3,14 +3,14 @@
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
-#include <Parsers/IAST.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
 class ASTSelectIntersectExceptQuery;
+class ASTSelectQuery;
+class ASTSelectWithUnionQuery;
 
 class PredicateRewriteVisitorData : WithContext
 {
diff --git a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
index f807849fb86..09362ea6be2 100644
--- a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
+++ b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
@@ -2,14 +2,14 @@
 
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTOrderByElement.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTExpressionList.h>
 
 namespace DB
 {
 
+class ASTIdentifier;
+
 class RedundantFunctionsInOrderByMatcher
 {
 public:
diff --git a/src/Interpreters/RenameColumnVisitor.cpp b/src/Interpreters/RenameColumnVisitor.cpp
index 22bbfc7a83f..c8027180547 100644
--- a/src/Interpreters/RenameColumnVisitor.cpp
+++ b/src/Interpreters/RenameColumnVisitor.cpp
@@ -1,5 +1,6 @@
-#include <Interpreters/RenameColumnVisitor.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/RenameColumnVisitor.h>
+#include <Parsers/ASTIdentifier.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/RenameColumnVisitor.h b/src/Interpreters/RenameColumnVisitor.h
index 653cda4f51f..bf0cc21c630 100644
--- a/src/Interpreters/RenameColumnVisitor.h
+++ b/src/Interpreters/RenameColumnVisitor.h
@@ -1,10 +1,12 @@
 #pragma once
 
 #include <Interpreters/InDepthNodeVisitor.h>
-#include <Parsers/ASTIdentifier.h>
 
 namespace DB
 {
+
+class ASTIdentifier;
+
 /// Data for RenameColumnVisitor which traverse tree and rename all columns with
 /// name column_name to rename_to
 struct RenameColumnData
diff --git a/src/Interpreters/RewriteAnyFunctionVisitor.cpp b/src/Interpreters/RewriteAnyFunctionVisitor.cpp
index f7c128a5749..eed6368ae54 100644
--- a/src/Interpreters/RewriteAnyFunctionVisitor.cpp
+++ b/src/Interpreters/RewriteAnyFunctionVisitor.cpp
@@ -1,11 +1,9 @@
 #include <Common/typeid_cast.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSubquery.h>
 #include <Interpreters/RewriteAnyFunctionVisitor.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <IO/WriteHelpers.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
 namespace DB
diff --git a/src/Interpreters/RewriteCountVariantsVisitor.cpp b/src/Interpreters/RewriteCountVariantsVisitor.cpp
index 63bf5fce2e8..7e7c5f14a91 100644
--- a/src/Interpreters/RewriteCountVariantsVisitor.cpp
+++ b/src/Interpreters/RewriteCountVariantsVisitor.cpp
@@ -1,6 +1,5 @@
 #include <Interpreters/RewriteCountVariantsVisitor.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
diff --git a/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp b/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp
index 5128bb136c3..842f61cbdd2 100644
--- a/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp
+++ b/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp
@@ -3,6 +3,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/RewriteFunctionToSubcolumnVisitor.h b/src/Interpreters/RewriteFunctionToSubcolumnVisitor.h
index e7b8385f710..4d064bdee10 100644
--- a/src/Interpreters/RewriteFunctionToSubcolumnVisitor.h
+++ b/src/Interpreters/RewriteFunctionToSubcolumnVisitor.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include <Parsers/ASTFunction.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
 namespace DB
 {
 
+class ASTFunction;
+
 /// Rewrites functions to subcolumns, if possible, to reduce amount of read data.
 /// E.g. 'length(arr)' -> 'arr.size0', 'col IS NULL' -> 'col.null'
 class RewriteFunctionToSubcolumnData
diff --git a/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp b/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp
index e26c4371591..4d695263f26 100644
--- a/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp
+++ b/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/SelectIntersectExceptQueryVisitor.h>
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Common/typeid_cast.h>
 
 
@@ -43,16 +44,16 @@ void SelectIntersectExceptQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Dat
 
     ASTs children = {selects.back()};
     selects.pop_back();
-    ASTSelectWithUnionQuery::UnionModes modes;
+    SelectUnionModes modes;
 
     for (const auto & mode : union_modes)
     {
         switch (mode)
         {
-            case ASTSelectWithUnionQuery::Mode::EXCEPT:
+            case SelectUnionMode::EXCEPT:
             {
                 auto left = std::make_shared<ASTSelectWithUnionQuery>();
-                left->union_mode = ASTSelectWithUnionQuery::Mode::ALL;
+                left->union_mode = SelectUnionMode::ALL;
 
                 left->list_of_selects = std::make_shared<ASTExpressionList>();
                 left->children.push_back(left->list_of_selects);
@@ -71,7 +72,7 @@ void SelectIntersectExceptQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Dat
                 children = {except_node};
                 break;
             }
-            case ASTSelectWithUnionQuery::Mode::INTERSECT:
+            case SelectUnionMode::INTERSECT:
             {
                 bool from_except = false;
                 const auto * except_ast = typeid_cast<const ASTSelectIntersectExceptQuery *>(children.back().get());
@@ -121,7 +122,7 @@ void SelectIntersectExceptQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Dat
         children.emplace_back(std::move(right));
     }
 
-    ast.union_mode = ASTSelectWithUnionQuery::Mode::Unspecified;
+    ast.union_mode = SelectUnionMode::Unspecified;
     ast.list_of_selects->children = std::move(children);
     ast.list_of_modes = std::move(modes);
 }
diff --git a/src/Interpreters/SelectIntersectExceptQueryVisitor.h b/src/Interpreters/SelectIntersectExceptQueryVisitor.h
index 07a6ad606a1..5aeb15f70bb 100644
--- a/src/Interpreters/SelectIntersectExceptQueryVisitor.h
+++ b/src/Interpreters/SelectIntersectExceptQueryVisitor.h
@@ -6,13 +6,13 @@
 #include <Interpreters/InDepthNodeVisitor.h>
 
 #include <Parsers/ASTSelectIntersectExceptQuery.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 
 
 namespace DB
 {
 
 class ASTFunction;
+class ASTSelectWithUnionQuery;
 
 class SelectIntersectExceptQueryMatcher
 {
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index e796c2b85a1..fc6aa15a1e8 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -310,7 +310,7 @@ void ThreadStatus::resetPerformanceCountersLastUsage()
 
 void ThreadStatus::initQueryProfiler()
 {
-    if (!query_profiled_enabled)
+    if (!query_profiler_enabled)
         return;
 
     /// query profilers are useless without trace collector
@@ -326,11 +326,11 @@ void ThreadStatus::initQueryProfiler()
     {
         if (settings.query_profiler_real_time_period_ns > 0)
             query_profiler_real = std::make_unique<QueryProfilerReal>(thread_id,
-                /* period */ static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
+                /* period= */ static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
 
         if (settings.query_profiler_cpu_time_period_ns > 0)
             query_profiler_cpu = std::make_unique<QueryProfilerCPU>(thread_id,
-                /* period */ static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
+                /* period= */ static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
     }
     catch (...)
     {
diff --git a/src/Interpreters/TreeCNFConverter.cpp b/src/Interpreters/TreeCNFConverter.cpp
index a6b46c46589..a55bacee5fa 100644
--- a/src/Interpreters/TreeCNFConverter.cpp
+++ b/src/Interpreters/TreeCNFConverter.cpp
@@ -208,7 +208,7 @@ void traverseCNF(const ASTPtr & node, CNFQuery::AndGroup & result)
 }
 
 std::optional<CNFQuery> TreeCNFConverter::tryConvertToCNF(
-    const ASTPtr & query, size_t max_growth_multipler)
+    const ASTPtr & query, size_t max_growth_multiplier)
 {
     auto cnf = query->clone();
     size_t num_atoms = countAtoms(cnf);
@@ -216,8 +216,8 @@ std::optional<CNFQuery> TreeCNFConverter::tryConvertToCNF(
     splitMultiLogic(cnf);
     traversePushNot(cnf, false);
 
-    size_t max_atoms = max_growth_multipler
-        ? std::max(MAX_ATOMS_WITHOUT_CHECK, num_atoms * max_growth_multipler)
+    size_t max_atoms = max_growth_multiplier
+        ? std::max(MAX_ATOMS_WITHOUT_CHECK, num_atoms * max_growth_multiplier)
         : 0;
 
     if (!traversePushOr(cnf, num_atoms, max_atoms))
@@ -232,13 +232,13 @@ std::optional<CNFQuery> TreeCNFConverter::tryConvertToCNF(
 }
 
 CNFQuery TreeCNFConverter::toCNF(
-    const ASTPtr & query, size_t max_growth_multipler)
+    const ASTPtr & query, size_t max_growth_multiplier)
 {
-    auto cnf = tryConvertToCNF(query, max_growth_multipler);
+    auto cnf = tryConvertToCNF(query, max_growth_multiplier);
     if (!cnf)
         throw Exception(ErrorCodes::TOO_MANY_TEMPORARY_COLUMNS,
-            "Cannot expression '{}' to CNF, because it produces to many clauses."
-            "Size of formula inCNF can be exponential of size of source formula.");
+            "Cannot convert expression '{}' to CNF, because it produces to many clauses."
+            "Size of boolean formula in CNF can be exponential of size of source formula.");
 
     return *cnf;
 }
diff --git a/src/Interpreters/TreeCNFConverter.h b/src/Interpreters/TreeCNFConverter.h
index 22ec2969096..7ea5fa54680 100644
--- a/src/Interpreters/TreeCNFConverter.h
+++ b/src/Interpreters/TreeCNFConverter.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTLiteral.h>
-#include <vector>
 #include <set>
 #include <unordered_map>
+#include <vector>
+#include <IO/Operators.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
@@ -148,16 +149,16 @@ public:
     static constexpr size_t DEFAULT_MAX_GROWTH_MULTIPLIER = 20;
     static constexpr size_t MAX_ATOMS_WITHOUT_CHECK = 200;
 
-    /// @max_growth_multipler means that it's allowed to grow size of formula only
+    /// @max_growth_multiplier means that it's allowed to grow size of formula only
     /// in that amount of times. It's needed to avoid exponential explosion of formula.
     /// CNF of boolean formula with N clauses can have 2^N clauses.
     /// If amount of atomic formulas will be exceeded nullopt will be returned.
     /// 0 - means unlimited.
     static std::optional<CNFQuery> tryConvertToCNF(
-        const ASTPtr & query, size_t max_growth_multipler = DEFAULT_MAX_GROWTH_MULTIPLIER);
+        const ASTPtr & query, size_t max_growth_multiplier = DEFAULT_MAX_GROWTH_MULTIPLIER);
 
     static CNFQuery toCNF(
-        const ASTPtr & query, size_t max_growth_multipler = DEFAULT_MAX_GROWTH_MULTIPLIER);
+        const ASTPtr & query, size_t max_growth_multiplier = DEFAULT_MAX_GROWTH_MULTIPLIER);
 
     static ASTPtr fromCNF(const CNFQuery & cnf);
 };
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index ef8446eb4b9..d864bb54b2e 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -28,10 +28,11 @@
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/queryToString.h>
-#include <Parsers/ASTLiteral.h>
 
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/Interpreters/WhereConstraintsOptimizer.h b/src/Interpreters/WhereConstraintsOptimizer.h
index 01cee91fca5..80ee6a3e4bd 100644
--- a/src/Interpreters/WhereConstraintsOptimizer.h
+++ b/src/Interpreters/WhereConstraintsOptimizer.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
 
+class ASTSelectQuery;
 struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 
diff --git a/src/Interpreters/evaluateConstantExpression.h b/src/Interpreters/evaluateConstantExpression.h
index b95982f5b99..cf01e834fcd 100644
--- a/src/Interpreters/evaluateConstantExpression.h
+++ b/src/Interpreters/evaluateConstantExpression.h
@@ -4,7 +4,6 @@
 #include <Core/Field.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST.h>
-#include <Parsers/IParser.h>
 
 #include <memory>
 #include <optional>
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 46ec6f776ee..d3a9bcbe1e4 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -6,6 +6,7 @@
 #include <Parsers/ASTQueryWithOutput.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/queryToString.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Access/ContextAccess.h>
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index 1510b477725..69b7b7d833f 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -3,6 +3,8 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Storages/IStorage.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index 4c7768517b1..2d6b425ac93 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -4,8 +4,6 @@
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ASTDictionary.h>
 #include <Parsers/ASTDictionaryAttributeDeclaration.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Interpreters/StorageID.h>
 
 namespace DB
@@ -13,6 +11,7 @@ namespace DB
 
 class ASTFunction;
 class ASTSetQuery;
+class ASTSelectWithUnionQuery;
 
 class ASTStorage : public IAST
 {
diff --git a/src/Parsers/ASTDictionary.h b/src/Parsers/ASTDictionary.h
index e8420463c92..3611621b8ad 100644
--- a/src/Parsers/ASTDictionary.h
+++ b/src/Parsers/ASTDictionary.h
@@ -2,7 +2,6 @@
 
 #include <Parsers/IAST.h>
 #include <Parsers/ASTFunctionWithKeyValueArguments.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTExpressionList.h>
 
 #include <Parsers/ASTSetQuery.h>
@@ -12,6 +11,8 @@
 namespace DB
 {
 
+class ASTLiteral;
+
 /// AST for external dictionary lifetime:
 /// lifetime(min 10 max 100)
 class ASTDictionaryLifetime : public IAST
diff --git a/src/Parsers/ASTExternalDDLQuery.h b/src/Parsers/ASTExternalDDLQuery.h
index d659c5c0bb8..4ec68aa8b9f 100644
--- a/src/Parsers/ASTExternalDDLQuery.h
+++ b/src/Parsers/ASTExternalDDLQuery.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <IO/Operators.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index ef1ede28e33..36731a3acd0 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -6,14 +6,11 @@
 #include <Common/FieldVisitorToString.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
-#include <DataTypes/IDataType.h>
-#include <DataTypes/NumberTraits.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTWithAlias.h>
 #include <Parsers/queryToString.h>
diff --git a/src/Parsers/ASTFunction.h b/src/Parsers/ASTFunction.h
index ec49ee180ba..6efbe512cf4 100644
--- a/src/Parsers/ASTFunction.h
+++ b/src/Parsers/ASTFunction.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <Parsers/ASTWithAlias.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTIdentifier_fwd.h>
+#include <Parsers/ASTWithAlias.h>
 
 
 namespace DB
 {
 
-class ASTIdentifier;
+class ASTSelectWithUnionQuery;
 
 /** AST for function application or operator.
   */
diff --git a/src/Parsers/ASTIdentifier.h b/src/Parsers/ASTIdentifier.h
index 048b32e438d..14e2fcef39d 100644
--- a/src/Parsers/ASTIdentifier.h
+++ b/src/Parsers/ASTIdentifier.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <Core/UUID.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTQueryParameter.h>
 #include <Parsers/ASTWithAlias.h>
 
-#include <optional>
-
 
 namespace DB
 {
@@ -93,17 +92,4 @@ public:
     void updateTreeHashImpl(SipHash & hash_state) const override;
 };
 
-
-/// ASTIdentifier Helpers: hide casts and semantic.
-
-void setIdentifierSpecial(ASTPtr & ast);
-
-String getIdentifierName(const IAST * ast);
-std::optional<String> tryGetIdentifierName(const IAST * ast);
-bool tryGetIdentifierNameInto(const IAST * ast, String & name);
-
-inline String getIdentifierName(const ASTPtr & ast) { return getIdentifierName(ast.get()); }
-inline std::optional<String> tryGetIdentifierName(const ASTPtr & ast) { return tryGetIdentifierName(ast.get()); }
-inline bool tryGetIdentifierNameInto(const ASTPtr & ast, String & name) { return tryGetIdentifierNameInto(ast.get(), name); }
-
 }
diff --git a/src/Parsers/ASTIdentifier_fwd.h b/src/Parsers/ASTIdentifier_fwd.h
new file mode 100644
index 00000000000..c4434477fdb
--- /dev/null
+++ b/src/Parsers/ASTIdentifier_fwd.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <Parsers/IAST_fwd.h>
+#include <base/types.h>
+
+#include <optional>
+#include <vector>
+
+namespace DB
+{
+
+class ASTIdentifier;
+class ASTTableIdentifier;
+
+/// ASTIdentifier Helpers: hide casts and semantic.
+
+void setIdentifierSpecial(ASTPtr & ast);
+
+String getIdentifierName(const IAST * ast);
+std::optional<String> tryGetIdentifierName(const IAST * ast);
+bool tryGetIdentifierNameInto(const IAST * ast, String & name);
+
+inline String getIdentifierName(const ASTPtr & ast)
+{
+    return getIdentifierName(ast.get());
+}
+inline std::optional<String> tryGetIdentifierName(const ASTPtr & ast)
+{
+    return tryGetIdentifierName(ast.get());
+}
+inline bool tryGetIdentifierNameInto(const ASTPtr & ast, String & name)
+{
+    return tryGetIdentifierNameInto(ast.get(), name);
+}
+
+}
diff --git a/src/Parsers/ASTProjectionDeclaration.cpp b/src/Parsers/ASTProjectionDeclaration.cpp
index 3692b1a2013..740a2fe3efd 100644
--- a/src/Parsers/ASTProjectionDeclaration.cpp
+++ b/src/Parsers/ASTProjectionDeclaration.cpp
@@ -1,7 +1,7 @@
+#include <IO/Operators.h>
 #include <Parsers/ASTProjectionDeclaration.h>
 #include <Common/quoteString.h>
 
-
 namespace DB
 {
 
diff --git a/src/Parsers/ASTProjectionDeclaration.h b/src/Parsers/ASTProjectionDeclaration.h
index 9d6c953a52b..53c681c3ec1 100644
--- a/src/Parsers/ASTProjectionDeclaration.h
+++ b/src/Parsers/ASTProjectionDeclaration.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Parsers/ASTFunction.h>
 #include <Parsers/IAST.h>
 
 
diff --git a/src/Parsers/ASTProjectionSelectQuery.cpp b/src/Parsers/ASTProjectionSelectQuery.cpp
index 31a306bc011..7a855eb2be2 100644
--- a/src/Parsers/ASTProjectionSelectQuery.cpp
+++ b/src/Parsers/ASTProjectionSelectQuery.cpp
@@ -1,3 +1,4 @@
+#include <IO/Operators.h>
 #include <Interpreters/StorageID.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Parsers/ASTSelectWithUnionQuery.cpp b/src/Parsers/ASTSelectWithUnionQuery.cpp
index a0b213f528f..7718b2dc2de 100644
--- a/src/Parsers/ASTSelectWithUnionQuery.cpp
+++ b/src/Parsers/ASTSelectWithUnionQuery.cpp
@@ -1,4 +1,3 @@
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Common/typeid_cast.h>
@@ -33,13 +32,13 @@ void ASTSelectWithUnionQuery::formatQueryImpl(const FormatSettings & settings, F
 
     auto mode_to_str = [&](auto mode)
     {
-        if (mode == Mode::ALL)
+        if (mode == SelectUnionMode::ALL)
             return "UNION ALL";
-        else if (mode == Mode::DISTINCT)
+        else if (mode == SelectUnionMode::DISTINCT)
             return "UNION DISTINCT";
-        else if (mode == Mode::INTERSECT)
+        else if (mode == SelectUnionMode::INTERSECT)
             return "INTERSECT";
-        else if (mode == Mode::EXCEPT)
+        else if (mode == SelectUnionMode::EXCEPT)
             return "EXCEPT";
         return "";
     };
@@ -78,7 +77,8 @@ void ASTSelectWithUnionQuery::formatQueryImpl(const FormatSettings & settings, F
 
 bool ASTSelectWithUnionQuery::hasNonDefaultUnionMode() const
 {
-    return set_of_modes.contains(Mode::DISTINCT) || set_of_modes.contains(Mode::INTERSECT) || set_of_modes.contains(Mode::EXCEPT);
+    return set_of_modes.contains(SelectUnionMode::DISTINCT) || set_of_modes.contains(SelectUnionMode::INTERSECT)
+        || set_of_modes.contains(SelectUnionMode::EXCEPT);
 }
 
 }
diff --git a/src/Parsers/ASTSelectWithUnionQuery.h b/src/Parsers/ASTSelectWithUnionQuery.h
index 66143bfef97..3fc8f9171c0 100644
--- a/src/Parsers/ASTSelectWithUnionQuery.h
+++ b/src/Parsers/ASTSelectWithUnionQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Parsers/ASTQueryWithOutput.h>
-
+#include <Parsers/SelectUnionMode.h>
 
 namespace DB
 {
@@ -19,27 +19,15 @@ public:
 
     const char * getQueryKindString() const override { return "Select"; }
 
-    enum class Mode
-    {
-        Unspecified,
-        ALL,
-        DISTINCT,
-        EXCEPT,
-        INTERSECT
-    };
+    SelectUnionMode union_mode;
 
-    using UnionModes = std::vector<Mode>;
-    using UnionModesSet = std::unordered_set<Mode>;
-
-    Mode union_mode;
-
-    UnionModes list_of_modes;
+    SelectUnionModes list_of_modes;
 
     bool is_normalized = false;
 
     ASTPtr list_of_selects;
 
-    UnionModesSet set_of_modes;
+    SelectUnionModesSet set_of_modes;
 
     /// Consider any mode other than ALL as non-default.
     bool hasNonDefaultUnionMode() const;
diff --git a/src/Parsers/Access/ASTUserNameWithHost.h b/src/Parsers/Access/ASTUserNameWithHost.h
index 00b1570e062..ada9bfb0673 100644
--- a/src/Parsers/Access/ASTUserNameWithHost.h
+++ b/src/Parsers/Access/ASTUserNameWithHost.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Parsers/IParser.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/src/Parsers/Access/ParserCreateQuotaQuery.cpp b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
index a06464913b7..b86f0a6a572 100644
--- a/src/Parsers/Access/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
@@ -2,7 +2,7 @@
 #include <Parsers/Access/ASTCreateQuotaQuery.h>
 #include <Parsers/Access/ASTRolesOrUsersSet.h>
 #include <Parsers/Access/ParserRolesOrUsersSet.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
diff --git a/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp b/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp
index dd01f7d024d..731564a14c7 100644
--- a/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp
+++ b/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp
@@ -4,7 +4,6 @@
 #include <Parsers/Access/ASTRowPolicyName.h>
 #include <Parsers/Access/ParserRolesOrUsersSet.h>
 #include <Parsers/Access/ParserRowPolicyName.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/parseDatabaseAndTableName.h>
diff --git a/src/Parsers/Access/ParserGrantQuery.cpp b/src/Parsers/Access/ParserGrantQuery.cpp
index 8dd3e171237..9f7e8535a14 100644
--- a/src/Parsers/Access/ParserGrantQuery.cpp
+++ b/src/Parsers/Access/ParserGrantQuery.cpp
@@ -1,9 +1,9 @@
-#include <Parsers/Access/ParserGrantQuery.h>
+#include <Parsers/ASTIdentifier_fwd.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/Access/ASTGrantQuery.h>
 #include <Parsers/Access/ASTRolesOrUsersSet.h>
+#include <Parsers/Access/ParserGrantQuery.h>
 #include <Parsers/Access/ParserRolesOrUsersSet.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseDatabaseAndTableName.h>
diff --git a/src/Parsers/Access/ParserSettingsProfileElement.cpp b/src/Parsers/Access/ParserSettingsProfileElement.cpp
index 2c58bd0e623..f4ca52dea2a 100644
--- a/src/Parsers/Access/ParserSettingsProfileElement.cpp
+++ b/src/Parsers/Access/ParserSettingsProfileElement.cpp
@@ -1,10 +1,10 @@
-#include <Parsers/Access/ParserSettingsProfileElement.h>
-#include <Parsers/Access/ASTSettingsProfileElement.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/Access/ASTSettingsProfileElement.h>
+#include <Parsers/Access/ParserSettingsProfileElement.h>
 #include <Parsers/CommonParsers.h>
-#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/Parsers/Access/parseUserName.cpp b/src/Parsers/Access/parseUserName.cpp
index fb20d4d1e6c..a4c5c7e8946 100644
--- a/src/Parsers/Access/parseUserName.cpp
+++ b/src/Parsers/Access/parseUserName.cpp
@@ -1,4 +1,5 @@
 #include <Parsers/Access/parseUserName.h>
+
 #include <Parsers/Access/ASTUserNameWithHost.h>
 #include <Parsers/Access/ParserUserNameWithHost.h>
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/Access/parseUserName.h b/src/Parsers/Access/parseUserName.h
index c1ad36c936e..fbad78e7bce 100644
--- a/src/Parsers/Access/parseUserName.h
+++ b/src/Parsers/Access/parseUserName.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Types.h>
 #include <Parsers/IParser.h>
 
 
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index 9ac58f2f2ed..58fac2341cf 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -2,6 +2,8 @@
 
 #include <Parsers/IParserBase.h>
 
+#include <cassert>
+
 namespace DB
 {
 
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index e16a7605afc..b6adbf83ce8 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -18,7 +18,6 @@
 #include <Parsers/ASTOrderByElement.h>
 #include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ASTQueryParameter.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTTLElement.h>
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index b6e80d83777..485df2d3662 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -6,12 +6,15 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTFunctionWithKeyValueArguments.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ParserCreateQuery.h>
-#include <Parsers/parseIntervalKind.h>
 #include <Parsers/ParserUnionQueryElement.h>
+#include <Parsers/parseIntervalKind.h>
 #include <Common/StringUtils/StringUtils.h>
 
 using namespace std::literals;
@@ -142,28 +145,28 @@ bool ParserUnionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             // SELECT ... UNION ALL SELECT ...
             if (s_all_parser.check(pos, expected))
             {
-                union_modes.push_back(ASTSelectWithUnionQuery::Mode::ALL);
+                union_modes.push_back(SelectUnionMode::ALL);
             }
             // SELECT ... UNION DISTINCT SELECT ...
             else if (s_distinct_parser.check(pos, expected))
             {
-                union_modes.push_back(ASTSelectWithUnionQuery::Mode::DISTINCT);
+                union_modes.push_back(SelectUnionMode::DISTINCT);
             }
             // SELECT ... UNION SELECT ...
             else
             {
-                union_modes.push_back(ASTSelectWithUnionQuery::Mode::Unspecified);
+                union_modes.push_back(SelectUnionMode::Unspecified);
             }
             return true;
         }
         else if (s_except_parser.check(pos, expected))
         {
-            union_modes.push_back(ASTSelectWithUnionQuery::Mode::EXCEPT);
+            union_modes.push_back(SelectUnionMode::EXCEPT);
             return true;
         }
         else if (s_intersect_parser.check(pos, expected))
         {
-            union_modes.push_back(ASTSelectWithUnionQuery::Mode::INTERSECT);
+            union_modes.push_back(SelectUnionMode::INTERSECT);
             return true;
         }
         return false;
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index 17deec4e9e4..e9389f15bbb 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -5,8 +5,8 @@
 #include <Parsers/IParserBase.h>
 #include <Parsers/CommonParsers.h>
 
-#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/SelectUnionMode.h>
 #include <Common/IntervalKind.h>
 
 namespace DB
@@ -108,7 +108,7 @@ protected:
     const char * getName() const override { return "list of union elements"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 private:
-    ASTSelectWithUnionQuery::UnionModes union_modes;
+    SelectUnionModes union_modes;
 };
 
 /** An expression with an infix binary left-associative operator.
diff --git a/src/Parsers/IParser.h b/src/Parsers/IParser.h
index 08c3f86538d..65b4b6df7f2 100644
--- a/src/Parsers/IParser.h
+++ b/src/Parsers/IParser.h
@@ -4,10 +4,10 @@
 #include <memory>
 
 #include <Core/Defines.h>
-#include <base/types.h>
-#include <IO/WriteHelpers.h>
-#include <Parsers/IAST.h>
+#include <Parsers/IAST_fwd.h>
 #include <Parsers/TokenIterator.h>
+#include <base/types.h>
+#include <Common/Exception.h>
 
 
 namespace DB
@@ -64,7 +64,9 @@ public:
         {
             ++depth;
             if (max_depth > 0 && depth > max_depth)
-                throw Exception("Maximum parse depth (" + toString(max_depth) + ") exceeded. Consider rising max_parser_depth parameter.", ErrorCodes::TOO_DEEP_RECURSION);
+                throw Exception(
+                    "Maximum parse depth (" + std::to_string(max_depth) + ") exceeded. Consider rising max_parser_depth parameter.",
+                    ErrorCodes::TOO_DEEP_RECURSION);
         }
 
         void decreaseDepth()
diff --git a/src/Parsers/MySQL/ASTDeclareColumn.cpp b/src/Parsers/MySQL/ASTDeclareColumn.cpp
index 3913c828ec3..89085ef989d 100644
--- a/src/Parsers/MySQL/ASTDeclareColumn.cpp
+++ b/src/Parsers/MySQL/ASTDeclareColumn.cpp
@@ -1,12 +1,12 @@
 #include <Parsers/MySQL/ASTDeclareColumn.h>
 
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ParserDataType.h>
-#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/MySQL/ASTDeclareConstraint.h>
 #include <Parsers/MySQL/ASTDeclareOption.h>
 #include <Parsers/MySQL/ASTDeclareReference.h>
-#include <Parsers/MySQL/ASTDeclareConstraint.h>
+#include <Parsers/ParserDataType.h>
 
 namespace DB
 {
diff --git a/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp b/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp
index e680ba0f411..199a5e2dd26 100644
--- a/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp
+++ b/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp
@@ -1,9 +1,10 @@
 #include <Parsers/MySQL/ASTDeclarePartitionOptions.h>
 
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/CommonParsers.h>
-#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/MySQL/ASTDeclarePartition.h>
 
 namespace DB
diff --git a/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp b/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp
index ba8f90f2427..ab838cdbc53 100644
--- a/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp
@@ -2,7 +2,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/MySQL/ASTAlterCommand.h>
 #include <Parsers/MySQL/ASTDeclareOption.h>
 
diff --git a/src/Parsers/ParserBackupQuery.cpp b/src/Parsers/ParserBackupQuery.cpp
index c8d915d5b2c..666600b58de 100644
--- a/src/Parsers/ParserBackupQuery.cpp
+++ b/src/Parsers/ParserBackupQuery.cpp
@@ -1,7 +1,6 @@
 #include <Parsers/ParserBackupQuery.h>
 #include <Parsers/ASTBackupQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>
diff --git a/src/Parsers/ParserCheckQuery.cpp b/src/Parsers/ParserCheckQuery.cpp
index a89416ab253..505b95bda8e 100644
--- a/src/Parsers/ParserCheckQuery.cpp
+++ b/src/Parsers/ParserCheckQuery.cpp
@@ -1,6 +1,5 @@
 #include <Parsers/ParserCheckQuery.h>
 #include <Parsers/CommonParsers.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ParserPartition.h>
diff --git a/src/Parsers/ParserCreateQuery.cpp b/src/Parsers/ParserCreateQuery.cpp
index 13b38c4f0a7..b57991e6d00 100644
--- a/src/Parsers/ParserCreateQuery.cpp
+++ b/src/Parsers/ParserCreateQuery.cpp
@@ -5,6 +5,7 @@
 #include <Parsers/ASTProjectionDeclaration.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ExpressionListParsers.h>
diff --git a/src/Parsers/ParserCreateQuery.h b/src/Parsers/ParserCreateQuery.h
index 2c9a7870ff0..537eb0f7d74 100644
--- a/src/Parsers/ParserCreateQuery.h
+++ b/src/Parsers/ParserCreateQuery.h
@@ -5,8 +5,7 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ASTNameTypePair.h>
 #include <Parsers/ASTColumnDeclaration.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ParserDataType.h>
 #include <Poco/String.h>
diff --git a/src/Parsers/ParserDataType.cpp b/src/Parsers/ParserDataType.cpp
index dd495fe6d53..63a73ff4d1c 100644
--- a/src/Parsers/ParserDataType.cpp
+++ b/src/Parsers/ParserDataType.cpp
@@ -1,7 +1,7 @@
 #include <Parsers/ParserDataType.h>
 
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/src/Parsers/ParserDictionary.cpp b/src/Parsers/ParserDictionary.cpp
index 77cd480d595..399dda08911 100644
--- a/src/Parsers/ParserDictionary.cpp
+++ b/src/Parsers/ParserDictionary.cpp
@@ -1,12 +1,13 @@
 #include <Parsers/ParserDictionary.h>
 
-#include <Parsers/ExpressionListParsers.h>
-#include <Parsers/ExpressionElementParsers.h>
-#include <Parsers/ASTFunctionWithKeyValueArguments.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTDictionary.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTDictionary.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunctionWithKeyValueArguments.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ParserDictionaryAttributeDeclaration.h>
 
 #include <Poco/String.h>
diff --git a/src/Parsers/ParserDictionary.h b/src/Parsers/ParserDictionary.h
index 795a2c618db..a38fd18dbcd 100644
--- a/src/Parsers/ParserDictionary.h
+++ b/src/Parsers/ParserDictionary.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Parsers/IParser.h>
 #include <Parsers/IParserBase.h>
 
 #include <Parsers/ParserSetQuery.h>
diff --git a/src/Parsers/ParserDictionaryAttributeDeclaration.cpp b/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
index 2099618588e..a248c9def07 100644
--- a/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
+++ b/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
@@ -1,5 +1,6 @@
 #include <Parsers/ParserDictionaryAttributeDeclaration.h>
 
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ParserDataType.h>
diff --git a/src/Parsers/ParserDictionaryAttributeDeclaration.h b/src/Parsers/ParserDictionaryAttributeDeclaration.h
index ff4b145aa03..46d48ca454d 100644
--- a/src/Parsers/ParserDictionaryAttributeDeclaration.h
+++ b/src/Parsers/ParserDictionaryAttributeDeclaration.h
@@ -4,7 +4,6 @@
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ASTDictionaryAttributeDeclaration.h>
-#include <Parsers/ASTIdentifier.h>
 
 
 namespace DB
diff --git a/src/Parsers/ParserDropQuery.cpp b/src/Parsers/ParserDropQuery.cpp
index 211c7699723..e7263aa47f5 100644
--- a/src/Parsers/ParserDropQuery.cpp
+++ b/src/Parsers/ParserDropQuery.cpp
@@ -1,4 +1,3 @@
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTDropQuery.h>
 
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/ParserExternalDDLQuery.cpp b/src/Parsers/ParserExternalDDLQuery.cpp
index 9a87de9c2b1..87630777fa6 100644
--- a/src/Parsers/ParserExternalDDLQuery.cpp
+++ b/src/Parsers/ParserExternalDDLQuery.cpp
@@ -1,10 +1,11 @@
 #include "config_core.h"
 
 #include <Parsers/ASTExternalDDLQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
-#include <Parsers/ParserExternalDDLQuery.h>
 #include <Parsers/ParserDropQuery.h>
+#include <Parsers/ParserExternalDDLQuery.h>
 #include <Parsers/ParserRenameQuery.h>
 
 #if USE_MYSQL
diff --git a/src/Parsers/ParserInsertQuery.cpp b/src/Parsers/ParserInsertQuery.cpp
index 8925de4cf55..f2f8226c818 100644
--- a/src/Parsers/ParserInsertQuery.cpp
+++ b/src/Parsers/ParserInsertQuery.cpp
@@ -1,6 +1,6 @@
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
diff --git a/src/Parsers/ParserOptimizeQuery.cpp b/src/Parsers/ParserOptimizeQuery.cpp
index b1bfd43936b..826fbf38b36 100644
--- a/src/Parsers/ParserOptimizeQuery.cpp
+++ b/src/Parsers/ParserOptimizeQuery.cpp
@@ -3,7 +3,6 @@
 #include <Parsers/CommonParsers.h>
 
 #include <Parsers/ASTOptimizeQuery.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ExpressionListParsers.h>
 
 
diff --git a/src/Parsers/ParserRenameQuery.cpp b/src/Parsers/ParserRenameQuery.cpp
index 59813140b7c..e180d998df4 100644
--- a/src/Parsers/ParserRenameQuery.cpp
+++ b/src/Parsers/ParserRenameQuery.cpp
@@ -1,4 +1,4 @@
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTRenameQuery.h>
 
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/ParserSetQuery.cpp b/src/Parsers/ParserSetQuery.cpp
index aac3a191a10..d50de5f700d 100644
--- a/src/Parsers/ParserSetQuery.cpp
+++ b/src/Parsers/ParserSetQuery.cpp
@@ -1,4 +1,4 @@
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSetQuery.h>
 
diff --git a/src/Parsers/ParserShowTablesQuery.cpp b/src/Parsers/ParserShowTablesQuery.cpp
index e8cf732d092..b5c8687321e 100644
--- a/src/Parsers/ParserShowTablesQuery.cpp
+++ b/src/Parsers/ParserShowTablesQuery.cpp
@@ -1,5 +1,5 @@
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTShowTablesQuery.h>
 
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/ParserTablePropertiesQuery.cpp b/src/Parsers/ParserTablePropertiesQuery.cpp
index bf3ff399f61..84f12f97ea1 100644
--- a/src/Parsers/ParserTablePropertiesQuery.cpp
+++ b/src/Parsers/ParserTablePropertiesQuery.cpp
@@ -1,4 +1,3 @@
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
 
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/ParserUseQuery.cpp b/src/Parsers/ParserUseQuery.cpp
index a71fa17ab78..40511d8c142 100644
--- a/src/Parsers/ParserUseQuery.cpp
+++ b/src/Parsers/ParserUseQuery.cpp
@@ -1,5 +1,5 @@
 #include <Parsers/ParserUseQuery.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ASTUseQuery.h>
diff --git a/src/Parsers/ParserWatchQuery.cpp b/src/Parsers/ParserWatchQuery.cpp
index 40d2c47bd4f..913d9c4ff3f 100644
--- a/src/Parsers/ParserWatchQuery.cpp
+++ b/src/Parsers/ParserWatchQuery.cpp
@@ -9,8 +9,6 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTWatchQuery.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ParserWatchQuery.h>
diff --git a/src/Parsers/ParserWithElement.cpp b/src/Parsers/ParserWithElement.cpp
index b8d9fe28c5f..a882af19dd9 100644
--- a/src/Parsers/ParserWithElement.cpp
+++ b/src/Parsers/ParserWithElement.cpp
@@ -1,5 +1,5 @@
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTWithElement.h>
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/SelectUnionMode.h b/src/Parsers/SelectUnionMode.h
new file mode 100644
index 00000000000..f4ca858d043
--- /dev/null
+++ b/src/Parsers/SelectUnionMode.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <unordered_set>
+#include <vector>
+
+namespace DB
+{
+enum class SelectUnionMode
+{
+    Unspecified,
+    ALL,
+    DISTINCT,
+    EXCEPT,
+    INTERSECT
+};
+
+using SelectUnionModes = std::vector<SelectUnionMode>;
+using SelectUnionModesSet = std::unordered_set<SelectUnionMode>;
+
+}
diff --git a/src/Parsers/parseDatabaseAndTableName.cpp b/src/Parsers/parseDatabaseAndTableName.cpp
index 48f47dbb68c..81660bc4600 100644
--- a/src/Parsers/parseDatabaseAndTableName.cpp
+++ b/src/Parsers/parseDatabaseAndTableName.cpp
@@ -1,7 +1,7 @@
 #include "parseDatabaseAndTableName.h"
-#include <Parsers/ExpressionElementParsers.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 
 namespace DB
diff --git a/src/Parsers/parseIdentifierOrStringLiteral.cpp b/src/Parsers/parseIdentifierOrStringLiteral.cpp
index e1444eb2d5a..3f2bd8ac8ad 100644
--- a/src/Parsers/parseIdentifierOrStringLiteral.cpp
+++ b/src/Parsers/parseIdentifierOrStringLiteral.cpp
@@ -1,8 +1,8 @@
 #include "parseIdentifierOrStringLiteral.h"
 
-#include "ExpressionElementParsers.h"
-#include "ASTLiteral.h"
-#include "ASTIdentifier.h"
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Parsers/parseIdentifierOrStringLiteral.h b/src/Parsers/parseIdentifierOrStringLiteral.h
index 0174c481704..d029c0c1371 100644
--- a/src/Parsers/parseIdentifierOrStringLiteral.h
+++ b/src/Parsers/parseIdentifierOrStringLiteral.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Types.h>
 #include <Parsers/IParser.h>
 
 namespace DB
diff --git a/src/Parsers/parseQuery.h b/src/Parsers/parseQuery.h
index e6a6b26a462..d8d7426872b 100644
--- a/src/Parsers/parseQuery.h
+++ b/src/Parsers/parseQuery.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <Parsers/IParser.h>
-
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
+class IParser;
+
 /// Parse query or set 'out_error_message'.
 ASTPtr tryParseQuery(
     IParser & parser,
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index 25f48fc27c8..fa824a1807a 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -1,14 +1,16 @@
-#include <base/types.h>
+#include <IO/WriteBufferFromString.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/DumpASTNode.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserDropQuery.h>
+#include <Parsers/ParserTablePropertiesQuery.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
-#include <Parsers/DumpASTNode.h>
-#include <Parsers/TablePropertiesQueriesASTs.h>
-#include <Parsers/ParserTablePropertiesQuery.h>
-#include <IO/WriteBufferFromString.h>
+#include <base/types.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/Processors/Formats/IOutputFormat.cpp b/src/Processors/Formats/IOutputFormat.cpp
index d8273878717..3c4e6861151 100644
--- a/src/Processors/Formats/IOutputFormat.cpp
+++ b/src/Processors/Formats/IOutputFormat.cpp
@@ -72,7 +72,7 @@ void IOutputFormat::work()
         if (rows_before_limit_counter && rows_before_limit_counter->hasAppliedLimit())
             setRowsBeforeLimit(rows_before_limit_counter->get());
 
-        finalizeImpl();
+        finalize();
         finalized = true;
         return;
     }
@@ -85,10 +85,15 @@ void IOutputFormat::work()
             consume(std::move(current_chunk));
             break;
         case Totals:
+            writeSuffixIfNot();
             if (auto totals = prepareTotals(std::move(current_chunk)))
+            {
                 consumeTotals(std::move(totals));
+                are_totals_written = true;
+            }
             break;
         case Extremes:
+            writeSuffixIfNot();
             consumeExtremes(std::move(current_chunk));
             break;
     }
@@ -116,6 +121,7 @@ void IOutputFormat::write(const Block & block)
 void IOutputFormat::finalize()
 {
     writePrefixIfNot();
+    writeSuffixIfNot();
     finalizeImpl();
 }
 
diff --git a/src/Processors/Formats/IOutputFormat.h b/src/Processors/Formats/IOutputFormat.h
index 40dcaf75b53..1f21537c6c6 100644
--- a/src/Processors/Formats/IOutputFormat.h
+++ b/src/Processors/Formats/IOutputFormat.h
@@ -4,7 +4,7 @@
 #include <Processors/IProcessor.h>
 #include <Processors/RowsBeforeLimitCounter.h>
 #include <IO/Progress.h>
-
+#include <Common/Stopwatch.h>
 
 namespace DB
 {
@@ -59,8 +59,17 @@ public:
 
     virtual bool expectMaterializedColumns() const { return true; }
 
-    void setTotals(const Block & totals) { consumeTotals(Chunk(totals.getColumns(), totals.rows())); }
-    void setExtremes(const Block & extremes) { consumeExtremes(Chunk(extremes.getColumns(), extremes.rows())); }
+    void setTotals(const Block & totals)
+    {
+        writeSuffixIfNot();
+        consumeTotals(Chunk(totals.getColumns(), totals.rows()));
+        are_totals_written = true;
+    }
+    void setExtremes(const Block & extremes)
+    {
+        writeSuffixIfNot();
+        consumeExtremes(Chunk(extremes.getColumns(), extremes.rows()));
+    }
 
     size_t getResultRows() const { return result_rows; }
     size_t getResultBytes() const { return result_bytes; }
@@ -75,6 +84,7 @@ protected:
     virtual void consumeExtremes(Chunk) {}
     virtual void finalizeImpl() {}
     virtual void writePrefix() {}
+    virtual void writeSuffix() {}
 
     void writePrefixIfNot()
     {
@@ -85,6 +95,56 @@ protected:
         }
     }
 
+    void writeSuffixIfNot()
+    {
+        if (need_write_suffix)
+        {
+            writeSuffix();
+            need_write_suffix = false;
+        }
+    }
+
+    /// Methods-helpers for parallel formatting.
+
+    /// Set the number of rows that was already read in
+    /// parallel formatting before creating this formatter.
+    void setRowsReadBefore(size_t first_row_number_)
+    {
+        rows_read_before = first_row_number_;
+        onRowsReadBeforeUpdate();
+    }
+
+    size_t getRowsReadBefore() const { return rows_read_before; }
+
+    /// Update state according to new rows_read_before.
+    virtual void onRowsReadBeforeUpdate() {}
+
+    /// Some formats outputs some statistics after the data,
+    /// in parallel formatting we collect these statistics outside the
+    /// underling format and then set it to format before finalizing.
+    struct Statistics
+    {
+        Stopwatch watch;
+        Progress progress;
+        bool applied_limit = false;
+        size_t rows_before_limit = 0;
+        Chunk totals;
+        Chunk extremes;
+    };
+
+    void setOutsideStatistics(Statistics statistics_) { statistics = std::make_shared<Statistics>(std::move(statistics_)); }
+    std::shared_ptr<Statistics> getOutsideStatistics() const { return statistics; }
+
+    /// In some formats the way we print extremes depends on
+    /// were totals printed or not. In this case in parallel formatting
+    /// we should notify underling format if totals were printed.
+    void setTotalsAreWritten() { are_totals_written = true; }
+    bool areTotalsWritten() const { return are_totals_written; }
+
+    /// Return true if format saves totals and extremes in consumeTotals/consumeExtremes and
+    /// outputs them in finalize() method.
+    virtual bool areTotalsAndExtremesUsedInFinalize() const { return false; }
+
     WriteBuffer & out;
 
     Chunk current_chunk;
@@ -95,11 +155,17 @@ protected:
 
     /// Flush data on each consumed chunk. This is intended for interactive applications to output data as soon as it's ready.
     bool auto_flush = false;
+
     bool need_write_prefix  = true;
+    bool need_write_suffix = true;
 
     RowsBeforeLimitCounterPtr rows_before_limit_counter;
 
 private:
+    size_t rows_read_before = 0;
+    std::shared_ptr<Statistics> statistics = nullptr;
+    bool are_totals_written = false;
+
     /// Counters for consumed chunks. Are used for QueryLog.
     size_t result_rows = 0;
     size_t result_bytes = 0;
diff --git a/src/Processors/Formats/IRowOutputFormat.cpp b/src/Processors/Formats/IRowOutputFormat.cpp
index 299c6c35fad..33777bed519 100644
--- a/src/Processors/Formats/IRowOutputFormat.cpp
+++ b/src/Processors/Formats/IRowOutputFormat.cpp
@@ -27,7 +27,7 @@ void IRowOutputFormat::consume(DB::Chunk chunk)
 
     for (size_t row = 0; row < num_rows; ++row)
     {
-        if (!first_row)
+        if (!first_row || getRowsReadBefore() != 0)
             writeRowBetweenDelimiter();
 
         write(columns, row);
@@ -41,8 +41,6 @@ void IRowOutputFormat::consume(DB::Chunk chunk)
 
 void IRowOutputFormat::consumeTotals(DB::Chunk chunk)
 {
-    writeSuffixIfNot();
-
     auto num_rows = chunk.getNumRows();
     if (num_rows != 1)
         throw Exception("Got " + toString(num_rows) + " in totals chunk, expected 1", ErrorCodes::LOGICAL_ERROR);
@@ -56,8 +54,6 @@ void IRowOutputFormat::consumeTotals(DB::Chunk chunk)
 
 void IRowOutputFormat::consumeExtremes(DB::Chunk chunk)
 {
-    writeSuffixIfNot();
-
     auto num_rows = chunk.getNumRows();
     const auto & columns = chunk.getColumns();
     if (num_rows != 2)
@@ -70,12 +66,6 @@ void IRowOutputFormat::consumeExtremes(DB::Chunk chunk)
     writeAfterExtremes();
 }
 
-void IRowOutputFormat::finalizeImpl()
-{
-    writeSuffixIfNot();
-    writeLastSuffix();
-}
-
 void IRowOutputFormat::write(const Columns & columns, size_t row_num)
 {
     size_t num_columns = columns.size();
diff --git a/src/Processors/Formats/IRowOutputFormat.h b/src/Processors/Formats/IRowOutputFormat.h
index 11e690c33ee..7f00313ce2d 100644
--- a/src/Processors/Formats/IRowOutputFormat.h
+++ b/src/Processors/Formats/IRowOutputFormat.h
@@ -31,7 +31,6 @@ protected:
     void consume(Chunk chunk) override;
     void consumeTotals(Chunk chunk) override;
     void consumeExtremes(Chunk chunk) override;
-    void finalizeImpl() override;
 
     /** Write a row.
       * Default implementation calls methods to write single values and delimiters
@@ -51,29 +50,18 @@ protected:
     virtual void writeRowEndDelimiter() {}      /// delimiter after each row
     virtual void writeRowBetweenDelimiter() {}  /// delimiter between rows
     virtual void writePrefix() override {}      /// delimiter before resultset
-    virtual void writeSuffix() {}               /// delimiter after resultset
+    virtual void writeSuffix() override {}      /// delimiter after resultset
     virtual void writeBeforeTotals() {}
     virtual void writeAfterTotals() {}
     virtual void writeBeforeExtremes() {}
     virtual void writeAfterExtremes() {}
-    virtual void writeLastSuffix() {}  /// Write something after resultset, totals end extremes.
+    virtual void finalizeImpl() override {}  /// Write something after resultset, totals end extremes.
 
     DataTypes types;
     Serializations serializations;
     Params params;
 
     bool first_row = true;
-
-private:
-    void writeSuffixIfNot()
-    {
-        if (!suffix_written)
-            writeSuffix();
-
-        suffix_written = true;
-    }
-
-    bool suffix_written = false;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
index 02c4aee5e4e..60b722569a2 100644
--- a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
@@ -60,6 +60,7 @@ void registerOutputFormatRowBinary(FormatFactory & factory)
         {
             return std::make_shared<BinaryRowOutputFormat>(buf, sample, with_names, with_types, params);
         });
+        factory.markOutputFormatSupportsParallelFormatting(format_name);
     };
 
     registerWithNamesAndTypes("RowBinary", register_func);
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowOutputFormat.cpp b/src/Processors/Formats/Impl/CustomSeparatedRowOutputFormat.cpp
index 5c9664f2daf..21cb549d4cb 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowOutputFormat.cpp
@@ -89,6 +89,8 @@ void registerOutputFormatCustomSeparated(FormatFactory & factory)
         {
             return std::make_shared<CustomSeparatedRowOutputFormat>(sample, buf, params, settings, with_names, with_types);
         });
+
+        factory.markOutputFormatSupportsParallelFormatting(format_name);
     };
 
     registerWithNamesAndTypes("CustomSeparated", register_func);
diff --git a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
index f4887b66968..b31c04b4554 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
@@ -99,6 +99,8 @@ void registerOutputFormatJSONCompact(FormatFactory & factory)
         return std::make_shared<JSONCompactRowOutputFormat>(buf, sample, params, format_settings, false);
     });
 
+    factory.markOutputFormatSupportsParallelFormatting("JSONCompact");
+
     factory.registerOutputFormat("JSONCompactStrings", [](
         WriteBuffer & buf,
         const Block & sample,
@@ -107,6 +109,8 @@ void registerOutputFormatJSONCompact(FormatFactory & factory)
     {
         return std::make_shared<JSONCompactRowOutputFormat>(buf, sample, params, format_settings, true);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("JSONCompactStrings");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
index f867a0bc49b..8e2b2617c4c 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
@@ -217,12 +217,16 @@ void JSONRowOutputFormat::writeAfterExtremes()
     writeCString("\t}", *ostr);
 }
 
-void JSONRowOutputFormat::writeLastSuffix()
+void JSONRowOutputFormat::finalizeImpl()
 {
     writeCString(",\n\n", *ostr);
     writeCString("\t\"rows\": ", *ostr);
     writeIntText(row_count, *ostr);
 
+    auto outside_statistics = getOutsideStatistics();
+    if (outside_statistics)
+        statistics = std::move(*outside_statistics);
+
     writeRowsBeforeLimitAtLeast();
 
     if (settings.write_statistics)
@@ -235,11 +239,11 @@ void JSONRowOutputFormat::writeLastSuffix()
 
 void JSONRowOutputFormat::writeRowsBeforeLimitAtLeast()
 {
-    if (applied_limit)
+    if (statistics.applied_limit)
     {
         writeCString(",\n\n", *ostr);
         writeCString("\t\"rows_before_limit_at_least\": ", *ostr);
-        writeIntText(rows_before_limit, *ostr);
+        writeIntText(statistics.rows_before_limit, *ostr);
     }
 }
 
@@ -250,13 +254,13 @@ void JSONRowOutputFormat::writeStatistics()
     writeCString("\t{\n", *ostr);
 
     writeCString("\t\t\"elapsed\": ", *ostr);
-    writeText(watch.elapsedSeconds(), *ostr);
+    writeText(statistics.watch.elapsedSeconds(), *ostr);
     writeCString(",\n", *ostr);
     writeCString("\t\t\"rows_read\": ", *ostr);
-    writeText(progress.read_rows.load(), *ostr);
+    writeText(statistics.progress.read_rows.load(), *ostr);
     writeCString(",\n", *ostr);
     writeCString("\t\t\"bytes_read\": ", *ostr);
-    writeText(progress.read_bytes.load(), *ostr);
+    writeText(statistics.progress.read_bytes.load(), *ostr);
     writeChar('\n', *ostr);
 
     writeCString("\t}", *ostr);
@@ -264,7 +268,7 @@ void JSONRowOutputFormat::writeStatistics()
 
 void JSONRowOutputFormat::onProgress(const Progress & value)
 {
-    progress.incrementPiecewiseAtomically(value);
+    statistics.progress.incrementPiecewiseAtomically(value);
 }
 
 
@@ -279,6 +283,8 @@ void registerOutputFormatJSON(FormatFactory & factory)
         return std::make_shared<JSONRowOutputFormat>(buf, sample, params, format_settings, false);
     });
 
+    factory.markOutputFormatSupportsParallelFormatting("JSON");
+
     factory.registerOutputFormat("JSONStrings", [](
         WriteBuffer & buf,
         const Block & sample,
@@ -287,6 +293,8 @@ void registerOutputFormatJSON(FormatFactory & factory)
     {
         return std::make_shared<JSONRowOutputFormat>(buf, sample, params, format_settings, true);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("JSONStrings");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.h b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
index 757cdf01a35..8561f5b4870 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
@@ -39,8 +39,8 @@ public:
 
     void setRowsBeforeLimit(size_t rows_before_limit_) override
     {
-        applied_limit = true;
-        rows_before_limit = rows_before_limit_;
+        statistics.applied_limit = true;
+        statistics.rows_before_limit = rows_before_limit_;
     }
 
 protected:
@@ -61,7 +61,7 @@ protected:
     void writeBeforeExtremes() override;
     void writeAfterExtremes() override;
 
-    void writeLastSuffix() override;
+    void finalizeImpl() override;
 
     virtual void writeTotalsField(const IColumn & column, const ISerialization & serialization, size_t row_num);
     virtual void writeExtremesElement(const char * title, const Columns & columns, size_t row_num);
@@ -70,17 +70,16 @@ protected:
     void writeRowsBeforeLimitAtLeast();
     void writeStatistics();
 
+    void onRowsReadBeforeUpdate() override { row_count = getRowsReadBefore(); }
+
     std::unique_ptr<WriteBuffer> validating_ostr;    /// Validates UTF-8 sequences, replaces bad sequences with replacement character.
     WriteBuffer * ostr;
 
     size_t field_number = 0;
     size_t row_count = 0;
-    bool applied_limit = false;
-    size_t rows_before_limit = 0;
     NamesAndTypes fields;
 
-    Progress progress;
-    Stopwatch watch;
+    Statistics statistics;
     FormatSettings settings;
 
     bool yield_strings;
diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
index 40fe5a77d62..044740d31dd 100644
--- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
@@ -65,6 +65,8 @@ void registerOutputFormatMarkdown(FormatFactory & factory)
     {
         return std::make_shared<MarkdownRowOutputFormat>(buf, sample, params, settings);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("Markdown");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
index 30bfae4972d..26be258a34f 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.cpp
@@ -53,9 +53,17 @@ namespace DB
         unit.segment.resize(0);
         unit.status = READY_TO_FORMAT;
         unit.type = type;
+        if (type == ProcessingUnitType::FINALIZE)
+        {
+            std::lock_guard lock(statistics_mutex);
+            unit.statistics = std::move(statistics);
+        }
 
-        scheduleFormatterThreadForUnitWithNumber(current_unit_number);
+        size_t first_row_num = rows_consumed;
+        if (unit.type == ProcessingUnitType::PLAIN)
+            rows_consumed += unit.chunk.getNumRows();
 
+        scheduleFormatterThreadForUnitWithNumber(current_unit_number, first_row_num);
         ++writer_unit_number;
     }
 
@@ -144,7 +152,7 @@ namespace DB
     }
 
 
-    void ParallelFormattingOutputFormat::formatterThreadFunction(size_t current_unit_number, const ThreadGroupStatusPtr & thread_group)
+    void ParallelFormattingOutputFormat::formatterThreadFunction(size_t current_unit_number, size_t first_row_num, const ThreadGroupStatusPtr & thread_group)
     {
         setThreadName("Formatter");
         if (thread_group)
@@ -166,6 +174,7 @@ namespace DB
             unit.segment.resize(0);
 
             auto formatter = internal_formatter_creator(out_buffer);
+            formatter->setRowsReadBefore(first_row_num);
 
             switch (unit.type)
             {
@@ -179,6 +188,11 @@ namespace DB
                     formatter->consume(std::move(unit.chunk));
                     break;
                 }
+                case ProcessingUnitType::PLAIN_FINISH :
+                {
+                    formatter->writeSuffix();
+                    break;
+                }
                 case ProcessingUnitType::TOTALS :
                 {
                     formatter->consumeTotals(std::move(unit.chunk));
@@ -186,11 +200,14 @@ namespace DB
                 }
                 case ProcessingUnitType::EXTREMES :
                 {
+                    if (are_totals_written)
+                        formatter->setTotalsAreWritten();
                     formatter->consumeExtremes(std::move(unit.chunk));
                     break;
                 }
                 case ProcessingUnitType::FINALIZE :
                 {
+                    formatter->setOutsideStatistics(std::move(unit.statistics));
                     formatter->finalizeImpl();
                     break;
                 }
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index f56efc520e5..f35dcc342b4 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -4,6 +4,7 @@
 
 #include <Common/Arena.h>
 #include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
 #include <base/logger_useful.h>
 #include <Common/Exception.h>
 #include "IO/WriteBufferFromString.h"
@@ -11,6 +12,7 @@
 #include <Poco/Event.h>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/WriteBuffer.h>
+#include <IO/NullWriteBuffer.h>
 
 #include <deque>
 #include <atomic>
@@ -79,6 +81,10 @@ public:
         {
             collectorThreadFunction(thread_group);
         });
+
+        NullWriteBuffer buf;
+        save_totals_and_extremes_in_statistics = internal_formatter_creator(buf)->areTotalsAndExtremesUsedInFinalize();
+
         LOG_TRACE(&Poco::Logger::get("ParallelFormattingOutputFormat"), "Parallel formatting is being used");
     }
 
@@ -104,8 +110,16 @@ public:
         finishAndWait();
     }
 
-    /// There are no formats which support parallel formatting and progress writing at the same time
-    void onProgress(const Progress &) override {}
+    void onProgress(const Progress & value) override
+    {
+        std::lock_guard lock(statistics_mutex);
+        statistics.progress.incrementPiecewiseAtomically(value);
+    }
+
+    void writeSuffix() override
+    {
+        addChunk(Chunk{}, ProcessingUnitType::PLAIN_FINISH, /*can_throw_exception*/ true);
+    }
 
     String getContentType() const override
     {
@@ -121,12 +135,29 @@ private:
 
     void consumeTotals(Chunk totals) override
     {
-        addChunk(std::move(totals), ProcessingUnitType::TOTALS, /*can_throw_exception*/ true);
+        if (save_totals_and_extremes_in_statistics)
+        {
+            std::lock_guard lock(statistics_mutex);
+            statistics.totals = std::move(totals);
+        }
+        else
+        {
+            addChunk(std::move(totals), ProcessingUnitType::TOTALS, /*can_throw_exception*/ true);
+            are_totals_written = true;
+        }
     }
 
     void consumeExtremes(Chunk extremes) override
     {
-        addChunk(std::move(extremes), ProcessingUnitType::EXTREMES, /*can_throw_exception*/ true);
+        if (save_totals_and_extremes_in_statistics)
+        {
+            std::lock_guard lock(statistics_mutex);
+            statistics.extremes = std::move(extremes);
+        }
+        else
+        {
+            addChunk(std::move(extremes), ProcessingUnitType::EXTREMES, /*can_throw_exception*/ true);
+        }
     }
 
     void finalizeImpl() override;
@@ -146,9 +177,10 @@ private:
     {
         START,
         PLAIN,
+        PLAIN_FINISH,
         TOTALS,
         EXTREMES,
-        FINALIZE
+        FINALIZE,
     };
 
     void addChunk(Chunk chunk, ProcessingUnitType type, bool can_throw_exception);
@@ -160,6 +192,7 @@ private:
         Chunk chunk;
         Memory<> segment;
         size_t actual_memory_size{0};
+        Statistics statistics;
     };
 
     Poco::Event collector_finished{};
@@ -186,6 +219,14 @@ private:
     std::condition_variable collector_condvar;
     std::condition_variable writer_condvar;
 
+    size_t rows_consumed = 0;
+    std::atomic_bool are_totals_written = false;
+
+    Statistics statistics;
+    /// We change statistics in onProgress() which can be called from different threads.
+    std::mutex statistics_mutex;
+    bool save_totals_and_extremes_in_statistics;
+
     void finishAndWait();
 
     void onBackgroundException()
@@ -200,11 +241,11 @@ private:
         collector_condvar.notify_all();
     }
 
-    void scheduleFormatterThreadForUnitWithNumber(size_t ticket_number)
+    void scheduleFormatterThreadForUnitWithNumber(size_t ticket_number, size_t first_row_num)
     {
-        pool.scheduleOrThrowOnError([this, thread_group = CurrentThread::getGroup(), ticket_number]
+        pool.scheduleOrThrowOnError([this, thread_group = CurrentThread::getGroup(), ticket_number, first_row_num]
         {
-            formatterThreadFunction(ticket_number, thread_group);
+            formatterThreadFunction(ticket_number, first_row_num, thread_group);
         });
     }
 
@@ -212,7 +253,14 @@ private:
     void collectorThreadFunction(const ThreadGroupStatusPtr & thread_group);
 
     /// This function is executed in ThreadPool and the only purpose of it is to format one Chunk into a continuous buffer in memory.
-    void formatterThreadFunction(size_t current_unit_number, const ThreadGroupStatusPtr & thread_group);
+    void formatterThreadFunction(size_t current_unit_number, size_t first_row_num, const ThreadGroupStatusPtr & thread_group);
+
+    void setRowsBeforeLimit(size_t rows_before_limit) override
+    {
+        std::lock_guard lock(statistics_mutex);
+        statistics.rows_before_limit = rows_before_limit;
+        statistics.applied_limit = true;
+    }
 };
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 66ddaa616cd..961eb63f4e5 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -377,7 +377,6 @@ void PrettyBlockOutputFormat::consume(Chunk chunk)
 void PrettyBlockOutputFormat::consumeTotals(Chunk chunk)
 {
     total_rows = 0;
-    writeSuffixIfNot();
     writeCString("\nTotals:\n", out);
     write(chunk, PortKind::Totals);
 }
@@ -385,7 +384,6 @@ void PrettyBlockOutputFormat::consumeTotals(Chunk chunk)
 void PrettyBlockOutputFormat::consumeExtremes(Chunk chunk)
 {
     total_rows = 0;
-    writeSuffixIfNot();
     writeCString("\nExtremes:\n", out);
     write(chunk, PortKind::Extremes);
 }
@@ -401,11 +399,6 @@ void PrettyBlockOutputFormat::writeSuffix()
     }
 }
 
-void PrettyBlockOutputFormat::finalizeImpl()
-{
-    writeSuffixIfNot();
-}
-
 
 void registerOutputFormatPretty(FormatFactory & factory)
 {
@@ -418,6 +411,8 @@ void registerOutputFormatPretty(FormatFactory & factory)
         return std::make_shared<PrettyBlockOutputFormat>(buf, sample, format_settings);
     });
 
+    factory.markOutputFormatSupportsParallelFormatting("Pretty");
+
     factory.registerOutputFormat("PrettyNoEscapes", [](
         WriteBuffer & buf,
         const Block & sample,
@@ -428,6 +423,8 @@ void registerOutputFormatPretty(FormatFactory & factory)
         changed_settings.pretty.color = false;
         return std::make_shared<PrettyBlockOutputFormat>(buf, sample, changed_settings);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("PrettyNoEscapes");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index 597c82e8166..091010f9131 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -27,11 +27,8 @@ protected:
     void consumeTotals(Chunk) override;
     void consumeExtremes(Chunk) override;
 
-    void finalizeImpl() override;
-
     size_t total_rows = 0;
     size_t terminal_width = 0;
-    bool suffix_written = false;
 
     size_t row_number_width = 7; // "10000. "
 
@@ -41,16 +38,9 @@ protected:
     using WidthsPerColumn = std::vector<Widths>;
 
     virtual void write(const Chunk & chunk, PortKind port_kind);
-    virtual void writeSuffix();
+    void writeSuffix() override;
 
-
-    virtual void writeSuffixIfNot()
-    {
-        if (!suffix_written)
-            writeSuffix();
-
-        suffix_written = true;
-    }
+    void onRowsReadBeforeUpdate() override { total_rows = getRowsReadBefore(); }
 
     void calculateWidths(
         const Block & header, const Chunk & chunk,
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
index 9ae7ccbd240..be8751cde13 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
@@ -54,7 +54,7 @@ PrettyCompactBlockOutputFormat::PrettyCompactBlockOutputFormat(WriteBuffer & out
 {
 }
 
-void PrettyCompactBlockOutputFormat::writeSuffixIfNot()
+void PrettyCompactBlockOutputFormat::writeSuffix()
 {
     if (mono_chunk)
     {
@@ -62,7 +62,7 @@ void PrettyCompactBlockOutputFormat::writeSuffixIfNot()
         mono_chunk.clear();
     }
 
-    PrettyBlockOutputFormat::writeSuffixIfNot();
+    PrettyBlockOutputFormat::writeSuffix();
 }
 
 void PrettyCompactBlockOutputFormat::writeHeader(
@@ -218,7 +218,7 @@ void PrettyCompactBlockOutputFormat::write(const Chunk & chunk, PortKind port_ki
         }
         else
         {
-            /// Should be written from writeSuffixIfNot()
+            /// Should be written from writeSuffix()
             assert(!mono_chunk);
         }
     }
@@ -269,6 +269,8 @@ void registerOutputFormatPrettyCompact(FormatFactory & factory)
         });
     }
 
+    factory.markOutputFormatSupportsParallelFormatting("PrettyCompact");
+
     factory.registerOutputFormat("PrettyCompactNoEscapes", [](
         WriteBuffer & buf,
         const Block & sample,
@@ -279,6 +281,7 @@ void registerOutputFormatPrettyCompact(FormatFactory & factory)
         changed_settings.pretty.color = false;
         return std::make_shared<PrettyCompactBlockOutputFormat>(buf, sample, changed_settings, false /* mono_block */);
     });
+    factory.markOutputFormatSupportsParallelFormatting("PrettyCompactNoEscapes");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
index 1779a20e122..a52ffe3d70a 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
@@ -33,7 +33,7 @@ private:
     Chunk mono_chunk;
 
     void writeChunk(const Chunk & chunk, PortKind port_kind);
-    void writeSuffixIfNot() override;
+    void writeSuffix() override;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index d317a21b769..cf47a26efc7 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -124,6 +124,8 @@ void registerOutputFormatPrettySpace(FormatFactory & factory)
         return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, format_settings);
     });
 
+    factory.markOutputFormatSupportsParallelFormatting("PrettySpace");
+
     factory.registerOutputFormat("PrettySpaceNoEscapes", [](
         WriteBuffer & buf,
         const Block & sample,
@@ -134,6 +136,8 @@ void registerOutputFormatPrettySpace(FormatFactory & factory)
         changed_settings.pretty.color = false;
         return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, changed_settings);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("PrettySpaceNoEscapes");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
index e94503f06f5..d981b92e1dd 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
@@ -144,6 +144,9 @@ void TemplateBlockOutputFormat::finalizeImpl()
         return;
 
     size_t parts = format.format_idx_to_column_idx.size();
+    auto outside_statistics = getOutsideStatistics();
+    if (outside_statistics)
+        statistics = std::move(*outside_statistics);
 
     for (size_t i = 0; i < parts; ++i)
     {
@@ -152,36 +155,36 @@ void TemplateBlockOutputFormat::finalizeImpl()
         switch (static_cast<ResultsetPart>(*format.format_idx_to_column_idx[i]))
         {
             case ResultsetPart::Totals:
-                if (!totals || !totals.hasRows())
+                if (!statistics.totals || !statistics.totals.hasRows())
                     format.throwInvalidFormat("Cannot print totals for this request", i);
-                writeRow(totals, 0);
+                writeRow(statistics.totals, 0);
                 break;
             case ResultsetPart::ExtremesMin:
-                if (!extremes)
+                if (!statistics.extremes)
                     format.throwInvalidFormat("Cannot print extremes for this request", i);
-                writeRow(extremes, 0);
+                writeRow(statistics.extremes, 0);
                 break;
             case ResultsetPart::ExtremesMax:
-                if (!extremes)
+                if (!statistics.extremes)
                     format.throwInvalidFormat("Cannot print extremes for this request", i);
-                writeRow(extremes, 1);
+                writeRow(statistics.extremes, 1);
                 break;
             case ResultsetPart::Rows:
                 writeValue<size_t, DataTypeUInt64>(row_count, format.escaping_rules[i]);
                 break;
             case ResultsetPart::RowsBeforeLimit:
-                if (!rows_before_limit_set)
+                if (!statistics.applied_limit)
                     format.throwInvalidFormat("Cannot print rows_before_limit for this request", i);
-                writeValue<size_t, DataTypeUInt64>(rows_before_limit, format.escaping_rules[i]);
+                writeValue<size_t, DataTypeUInt64>(statistics.rows_before_limit, format.escaping_rules[i]);
                 break;
             case ResultsetPart::TimeElapsed:
-                writeValue<double, DataTypeFloat64>(watch.elapsedSeconds(), format.escaping_rules[i]);
+                writeValue<double, DataTypeFloat64>(statistics.watch.elapsedSeconds(), format.escaping_rules[i]);
                 break;
             case ResultsetPart::RowsRead:
-                writeValue<size_t, DataTypeUInt64>(progress.read_rows.load(), format.escaping_rules[i]);
+                writeValue<size_t, DataTypeUInt64>(statistics.progress.read_rows.load(), format.escaping_rules[i]);
                 break;
             case ResultsetPart::BytesRead:
-                writeValue<size_t, DataTypeUInt64>(progress.read_bytes.load(), format.escaping_rules[i]);
+                writeValue<size_t, DataTypeUInt64>(statistics.progress.read_bytes.load(), format.escaping_rules[i]);
                 break;
             default:
                 break;
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
index 5fb340bdb4d..419fcac37c1 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.h
@@ -20,8 +20,8 @@ public:
 
     String getName() const override { return "TemplateBlockOutputFormat"; }
 
-    void setRowsBeforeLimit(size_t rows_before_limit_) override { rows_before_limit = rows_before_limit_; rows_before_limit_set = true; }
-    void onProgress(const Progress & progress_) override { progress.incrementPiecewiseAtomically(progress_); }
+    void setRowsBeforeLimit(size_t rows_before_limit_) override { statistics.rows_before_limit = rows_before_limit_; statistics.applied_limit = true; }
+    void onProgress(const Progress & progress_) override { statistics.progress.incrementPiecewiseAtomically(progress_); }
 
     enum class ResultsetPart : size_t
     {
@@ -41,25 +41,23 @@ public:
 private:
     void writePrefix() override;
     void consume(Chunk chunk) override;
-    void consumeTotals(Chunk chunk) override { totals = std::move(chunk); }
-    void consumeExtremes(Chunk chunk) override { extremes = std::move(chunk); }
+    void consumeTotals(Chunk chunk) override { statistics.totals = std::move(chunk); }
+    void consumeExtremes(Chunk chunk) override { statistics.extremes = std::move(chunk); }
     void finalizeImpl() override;
 
     void writeRow(const Chunk & chunk, size_t row_num);
     template <typename U, typename V> void writeValue(U value, EscapingRule escaping_rule);
 
+    void onRowsReadBeforeUpdate() override { row_count = getRowsReadBefore(); }
+    bool areTotalsAndExtremesUsedInFinalize() const override { return true; }
+
     const FormatSettings settings;
     Serializations serializations;
 
     ParsedTemplateFormatString format;
     ParsedTemplateFormatString row_format;
 
-    size_t rows_before_limit = 0;
-    bool rows_before_limit_set = false;
-    Chunk totals;
-    Chunk extremes;
-    Progress progress;
-    Stopwatch watch;
+    Statistics statistics;
 
     size_t row_count = 0;
 
diff --git a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
index f63483c1f90..275bbad9e66 100644
--- a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
@@ -51,6 +51,8 @@ void registerOutputFormatValues(FormatFactory & factory)
     {
         return std::make_shared<ValuesRowOutputFormat>(buf, sample, params, settings);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("Values");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
index c30cb2ccbbb..0905e4243cd 100644
--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
@@ -115,7 +115,7 @@ void VerticalRowOutputFormat::writeBeforeTotals()
 
 void VerticalRowOutputFormat::writeBeforeExtremes()
 {
-    if (!was_totals_written)
+    if (!areTotalsWritten())
         writeCString("\n", out);
 
     writeCString("\n", out);
@@ -134,7 +134,6 @@ void VerticalRowOutputFormat::writeMaxExtreme(const Columns & columns, size_t ro
 void VerticalRowOutputFormat::writeTotals(const Columns & columns, size_t row_num)
 {
     writeSpecialRow(columns, row_num, "Totals");
-    was_totals_written = true;
 }
 
 void VerticalRowOutputFormat::writeSpecialRow(const Columns & columns, size_t row_num, const char * title)
@@ -153,12 +152,7 @@ void VerticalRowOutputFormat::writeSpecialRow(const Columns & columns, size_t ro
     writeChar('\n', out);
 
     for (size_t i = 0; i < num_columns; ++i)
-    {
-        if (i != 0)
-            writeFieldDelimiter();
-
         writeField(*columns[i], *serializations[i], row_num);
-    }
 }
 
 void registerOutputFormatVertical(FormatFactory & factory)
@@ -171,6 +165,8 @@ void registerOutputFormatVertical(FormatFactory & factory)
     {
         return std::make_shared<VerticalRowOutputFormat>(buf, sample, params, settings);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("Vertical");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.h b/src/Processors/Formats/Impl/VerticalRowOutputFormat.h
index 075c943cd76..037aa183659 100644
--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.h
@@ -37,13 +37,14 @@ private:
 
     void writeValue(const IColumn & column, const ISerialization & serialization, size_t row_num) const;
 
+    void onRowsReadBeforeUpdate() override { row_number = getRowsReadBefore(); }
+
     /// For totals and extremes.
     void writeSpecialRow(const Columns & columns, size_t row_num, const char * title);
 
     const FormatSettings format_settings;
     size_t field_number = 0;
     size_t row_number = 0;
-    bool was_totals_written = false;
 
     using NamesAndPaddings = std::vector<String>;
     NamesAndPaddings names_and_paddings;
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
index 8ddc2ca4bbe..d96981fc091 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
@@ -195,16 +195,20 @@ void XMLRowOutputFormat::writeExtremesElement(const char * title, const Columns
 
 void XMLRowOutputFormat::onProgress(const Progress & value)
 {
-    progress.incrementPiecewiseAtomically(value);
+    statistics.progress.incrementPiecewiseAtomically(value);
 }
 
-void XMLRowOutputFormat::writeLastSuffix()
+void XMLRowOutputFormat::finalizeImpl()
 {
 
     writeCString("\t<rows>", *ostr);
     writeIntText(row_count, *ostr);
     writeCString("</rows>\n", *ostr);
 
+    auto outside_statistics = getOutsideStatistics();
+    if (outside_statistics)
+        statistics = std::move(*outside_statistics);
+
     writeRowsBeforeLimitAtLeast();
 
     if (format_settings.write_statistics)
@@ -216,10 +220,10 @@ void XMLRowOutputFormat::writeLastSuffix()
 
 void XMLRowOutputFormat::writeRowsBeforeLimitAtLeast()
 {
-    if (applied_limit)
+    if (statistics.applied_limit)
     {
         writeCString("\t<rows_before_limit_at_least>", *ostr);
-        writeIntText(rows_before_limit, *ostr);
+        writeIntText(statistics.rows_before_limit, *ostr);
         writeCString("</rows_before_limit_at_least>\n", *ostr);
     }
 }
@@ -228,13 +232,13 @@ void XMLRowOutputFormat::writeStatistics()
 {
     writeCString("\t<statistics>\n", *ostr);
     writeCString("\t\t<elapsed>", *ostr);
-    writeText(watch.elapsedSeconds(), *ostr);
+    writeText(statistics.watch.elapsedSeconds(), *ostr);
     writeCString("</elapsed>\n", *ostr);
     writeCString("\t\t<rows_read>", *ostr);
-    writeText(progress.read_rows.load(), *ostr);
+    writeText(statistics.progress.read_rows.load(), *ostr);
     writeCString("</rows_read>\n", *ostr);
     writeCString("\t\t<bytes_read>", *ostr);
-    writeText(progress.read_bytes.load(), *ostr);
+    writeText(statistics.progress.read_bytes.load(), *ostr);
     writeCString("</bytes_read>\n", *ostr);
     writeCString("\t</statistics>\n", *ostr);
 }
@@ -250,6 +254,8 @@ void registerOutputFormatXML(FormatFactory & factory)
     {
         return std::make_shared<XMLRowOutputFormat>(buf, sample, params, settings);
     });
+
+    factory.markOutputFormatSupportsParallelFormatting("XML");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.h b/src/Processors/Formats/Impl/XMLRowOutputFormat.h
index 7f08fc12bd1..04d81f0c2e1 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.h
@@ -26,7 +26,7 @@ private:
     void writeRowEndDelimiter() override;
     void writePrefix() override;
     void writeSuffix() override;
-    void writeLastSuffix() override;
+    void finalizeImpl() override;
 
     void writeMinExtreme(const Columns & columns, size_t row_num) override;
     void writeMaxExtreme(const Columns & columns, size_t row_num) override;
@@ -47,10 +47,12 @@ private:
 
     void setRowsBeforeLimit(size_t rows_before_limit_) override
     {
-        applied_limit = true;
-        rows_before_limit = rows_before_limit_;
+        statistics.applied_limit = true;
+        statistics.rows_before_limit = rows_before_limit_;
     }
 
+    void onRowsReadBeforeUpdate() override { row_count = getRowsReadBefore(); }
+
     void onProgress(const Progress & value) override;
 
     String getContentType() const override { return "application/xml; charset=UTF-8"; }
@@ -64,13 +66,10 @@ private:
 
     size_t field_number = 0;
     size_t row_count = 0;
-    bool applied_limit = false;
-    size_t rows_before_limit = 0;
     NamesAndTypes fields;
     Names field_tag_names;
 
-    Progress progress;
-    Stopwatch watch;
+    Statistics statistics;
     const FormatSettings format_settings;
 };
 
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index f358db3aa1c..67ca6d3d8e0 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -1,3 +1,5 @@
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/ConcatProcessor.h>
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index b10961975f6..096194455b1 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -20,7 +20,7 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <Parsers/parseQuery.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTQueryWithOutput.h>
 #include <Parsers/ParserQuery.h>
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 6478ece1536..67abd6db13a 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -208,8 +208,14 @@ KeeperTCPHandler::KeeperTCPHandler(IServer & server_, const Poco::Net::StreamSoc
     , log(&Poco::Logger::get("KeeperTCPHandler"))
     , global_context(Context::createCopy(server.context()))
     , keeper_dispatcher(global_context->getKeeperDispatcher())
-    , operation_timeout(0, global_context->getConfigRef().getUInt("keeper_server.operation_timeout_ms", Coordination::DEFAULT_OPERATION_TIMEOUT_MS) * 1000)
-    , session_timeout(0, global_context->getConfigRef().getUInt("keeper_server.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
+    , operation_timeout(
+          0,
+          global_context->getConfigRef().getUInt(
+              "keeper_server.coordination_settings.operation_timeout_ms", Coordination::DEFAULT_OPERATION_TIMEOUT_MS) * 1000)
+    , session_timeout(
+          0,
+          global_context->getConfigRef().getUInt(
+              "keeper_server.coordination_settings.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
     , poll_wrapper(std::make_unique<SocketInterruptablePollWrapper>(socket_))
     , responses(std::make_unique<ThreadSafeResponseQueue>(std::numeric_limits<size_t>::max()))
     , last_op(std::make_unique<LastOp>(EMPTY_LAST_OP))
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 52825c4fb43..90e10abfa92 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -17,7 +17,6 @@
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTConstraintDeclaration.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTProjectionDeclaration.h>
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index 16a6c6b8d2a..be0d2ea90db 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -4,6 +4,7 @@
 #include <Storages/StorageDistributed.h>
 #include <Disks/StoragePolicy.h>
 
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/queryToString.h>
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
index ec45e60644e..8389c432db2 100644
--- a/src/Storages/ExternalDataSourceConfiguration.cpp
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -5,6 +5,7 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <IO/WriteBufferFromString.h>
 
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
index 178bb5049f2..b214caa9a12 100644
--- a/src/Storages/ExternalDataSourceConfiguration.h
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Parsers/ASTIdentifier.h>
 #include <Interpreters/Context.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
diff --git a/src/Storages/IndicesDescription.cpp b/src/Storages/IndicesDescription.cpp
index 3147ad70696..9cdf9695172 100644
--- a/src/Storages/IndicesDescription.cpp
+++ b/src/Storages/IndicesDescription.cpp
@@ -4,8 +4,9 @@
 
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIndexDeclaration.h>
-#include <Parsers/formatAST.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ParserCreateQuery.h>
+#include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Storages/extractKeyExpressionList.h>
 
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index 5be28519558..b03e33d3acf 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -12,6 +12,7 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index f8f6bfff0ae..555472ac7d3 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -18,9 +18,10 @@
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/Set.h>
 #include <Parsers/queryToString.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Storages/KeyDescription.h>
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index f3b63025c75..dee46ae52ce 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -5,14 +5,13 @@
 #include <Interpreters/Set.h>
 #include <Core/SortDescription.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTFunction.h>
 #include <Storages/SelectQueryInfo.h>
 
 
 namespace DB
 {
 
+class ASTFunction;
 class Context;
 class IFunction;
 using FunctionBasePtr = std::shared_ptr<IFunctionBase>;
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index da66506dd44..4292655dddc 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -4,16 +4,11 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <base/types.h>
 #include <base/bit_cast.h>
-#include <Parsers/ASTLiteral.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h>
-#include <Parsers/queryToString.h>
 #include <Columns/ColumnConst.h>
-#include <Columns/ColumnLowCardinality.h>
 #include <Interpreters/BloomFilterHash.h>
+#include <Parsers/ASTFunction.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp b/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp
index 58629b63cda..30995a162dc 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesis.cpp
@@ -5,11 +5,6 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-
-
 namespace DB
 {
 namespace ErrorCodes
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp b/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp
index 2fa0b98bc30..6900ae1e69b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesisMergedCondition.cpp
@@ -6,6 +6,7 @@
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index c065b00fc9a..16d11fb7e33 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -4,6 +4,8 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 
+#include <Parsers/ASTFunction.h>
+
 #include <Poco/Logger.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index a08ae4499f2..6a5151d0d2b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -4,9 +4,10 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
 
 
 namespace DB
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index 2c678574eb6..28dfe488869 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -2,20 +2,16 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <Parsers/formatAST.h>
-#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTAssignment.h>
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
 #include <Common/typeid_cast.h>
 #include <Common/quoteString.h>
 #include <Core/Defines.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <Parsers/queryToString.h>
-#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/PartitionCommands.cpp b/src/Storages/PartitionCommands.cpp
index fa36588513b..9a54f6cc04b 100644
--- a/src/Storages/PartitionCommands.cpp
+++ b/src/Storages/PartitionCommands.cpp
@@ -2,7 +2,6 @@
 #include <Storages/IStorage.h>
 #include <Storages/DataDestinationType.h>
 #include <Parsers/ASTAlterQuery.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <DataTypes/DataTypeString.h>
 #include <Processors/Chunk.h>
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
index 947c0bbe932..1947cb65d0a 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Common/SettingsChanges.h>
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index 84afe740091..599ae294ea8 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -13,6 +13,8 @@
 #include <Formats/FormatFactory.h>
 #include <Formats/FormatSettings.h>
 #include <Processors/Transforms/FilterTransform.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <QueryPipeline/Pipe.h>
 #include <Interpreters/executeQuery.h>
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
index cebb3b89f8e..f2cc0947b2f 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
@@ -7,9 +7,6 @@
 #include "MaterializedPostgreSQLSettings.h"
 
 #include <Parsers/IAST.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Interpreters/evaluateConstantExpression.h>
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index c7d242476a1..f1a0372a07d 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -2,15 +2,16 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Storages/ProjectionsDescription.h>
 
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTProjectionDeclaration.h>
+#include <Parsers/ASTProjectionSelectQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 
 #include <Core/Defines.h>
 #include <Interpreters/InterpreterSelectQuery.h>
-#include <Parsers/ASTProjectionSelectQuery.h>
-#include <Parsers/ASTSubquery.h>
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Transforms/SquashingChunksTransform.h>
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index bb7b8d9547d..5980cf22107 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -1,15 +1,11 @@
 #include <amqpcpp.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
-#include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTInsertQuery.h>
-#include <Parsers/ASTLiteral.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -21,17 +17,13 @@
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
-#include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
-#include <Common/config_version.h>
 #include <Common/parseAddress.h>
 #include <Common/quoteString.h>
 #include <Common/setThreadName.h>
-#include <Common/typeid_cast.h>
 #include <base/logger_useful.h>
 
 namespace DB
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 91d54f0d24a..a45afd847e6 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -26,10 +26,12 @@
 
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 540ae413f19..06fa8905639 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -8,7 +8,6 @@
 #include <Common/SimpleIncrement.h>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
-#include <Parsers/ASTFunction.h>
 #include <base/logger_useful.h>
 #include <Common/ActionBlocker.h>
 #include <Interpreters/Cluster.h>
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 36201ad6c7d..6eb2ce1d298 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -5,9 +5,9 @@
 #include <Interpreters/evaluateConstantExpression.h>
 
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTLiteral.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 8ac341661bf..6c903b22846 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Core/ColumnNumbers.h>
 #include <DataTypes/NestedUtils.h>
 #include <Interpreters/joinDispatch.h>
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index 39db1a6bb79..5f0bd240f64 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -18,10 +18,7 @@
 
 #include <DataTypes/NestedUtils.h>
 
-#include <Columns/ColumnArray.h>
-
 #include <Interpreters/Context.h>
-#include <Parsers/ASTLiteral.h>
 #include "StorageLogSettings.h"
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/SourceWithProgress.h>
diff --git a/src/Storages/StorageMaterializedMySQL.cpp b/src/Storages/StorageMaterializedMySQL.cpp
index 922dff2faf7..07817aa634e 100644
--- a/src/Storages/StorageMaterializedMySQL.cpp
+++ b/src/Storages/StorageMaterializedMySQL.cpp
@@ -4,18 +4,11 @@
 
 #include <Storages/StorageMaterializedMySQL.h>
 
-#include <Core/Settings.h>
-#include <Interpreters/Context.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
-
 #include <QueryPipeline/Pipe.h>
 #include <Processors/Transforms/FilterTransform.h>
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index 210e6548465..60d5a4a07d1 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -1,6 +1,5 @@
 #include <Storages/StorageMaterializedView.h>
 
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index 105f3f25533..69b6f0c8c55 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -3,7 +3,6 @@
 #include <base/shared_ptr_helper.h>
 
 #include <Parsers/IAST_fwd.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/StorageInMemoryMetadata.h>
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 23fd129e157..f82f9d21217 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -13,6 +13,7 @@
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Interpreters/addTypeConversionToAST.h>
 #include <Interpreters/replaceAliasColumnsInQuery.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 00c6863ab63..16b85364c5c 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <Poco/MongoDB/Connection.h>
+
 #include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
 
-#include <Poco/MongoDB/Connection.h>
-
 
 namespace DB
 {
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 60b576d8eac..8443e262465 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -39,6 +39,7 @@
 
 #include <Parsers/formatAST.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTOptimizeQuery.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/queryToString.h>
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index e234eaf45f7..533ed6913af 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -14,7 +14,6 @@
 #include <Interpreters/Context.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTLiteral.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 9ffea587b97..dcf664db6fe 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -4,9 +4,11 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 
 #include <Storages/StorageView.h>
 #include <Storages/StorageFactory.h>
diff --git a/src/Storages/System/CMakeLists.txt b/src/Storages/System/CMakeLists.txt
index 2e909c03f5d..96c05a59173 100644
--- a/src/Storages/System/CMakeLists.txt
+++ b/src/Storages/System/CMakeLists.txt
@@ -6,7 +6,6 @@ include(${ClickHouse_SOURCE_DIR}/cmake/embed_binary.cmake)
 
 set (CONFIG_BUILD "${CMAKE_CURRENT_BINARY_DIR}/StorageSystemBuildOptions.generated.cpp")
 get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
-get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
 
 get_property(TZDATA_VERSION GLOBAL PROPERTY TZDATA_VERSION_PROP)
 
@@ -49,7 +48,8 @@ clickhouse_embed_binaries(
         RESOURCES schemata.sql tables.sql views.sql columns.sql
 )
 
-add_library(clickhouse_storages_system ${storages_system_headers} ${storages_system_sources})
+list (SORT storages_system_sources) # Reproducible build
+add_library(clickhouse_storages_system ${storages_system_sources})
 
 add_dependencies(clickhouse_storages_system information_schema_metadata)
 
diff --git a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
index bade59af12f..da563cc245b 100644
--- a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
@@ -17,11 +17,10 @@ const char * auto_config_build[]
     "C_COMPILER_VERSION", "@CMAKE_C_COMPILER_VERSION@",
     "CXX_COMPILER", "@CMAKE_CXX_COMPILER@",
     "CXX_COMPILER_VERSION", "@CMAKE_CXX_COMPILER_VERSION@",
-    "C_FLAGS", "@FULL_C_FLAGS@",
-    "CXX_FLAGS", "@FULL_CXX_FLAGS@",
-    "LINK_FLAGS", "@CMAKE_EXE_LINKER_FLAGS@",
+    "C_FLAGS", "@FULL_C_FLAGS_NORMALIZED@",
+    "CXX_FLAGS", "@FULL_CXX_FLAGS_NORMALIZED@",
+    "LINK_FLAGS", "@CMAKE_EXE_LINKER_FLAGS_NORMALIZED@",
     "BUILD_COMPILE_DEFINITIONS", "@BUILD_COMPILE_DEFINITIONS@",
-    "BUILD_INCLUDE_DIRECTORIES", "@BUILD_INCLUDE_DIRECTORIES@",
     "STATIC", "@USE_STATIC_LIBRARIES@",
     "SPLIT_BINARY", "@CLICKHOUSE_SPLIT_BINARY@",
     "USE_EMBEDDED_COMPILER", "@USE_EMBEDDED_COMPILER@",
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index cefc5587014..25634ad3aa4 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -9,7 +9,6 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Parsers/queryToString.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Access/ContextAccess.h>
 #include <Databases/IDatabase.h>
 #include <Processors/Sources/NullSource.h>
diff --git a/src/Storages/System/StorageSystemContributors.sh b/src/Storages/System/StorageSystemContributors.sh
index e34bf8ee7c8..9b714a94207 100755
--- a/src/Storages/System/StorageSystemContributors.sh
+++ b/src/Storages/System/StorageSystemContributors.sh
@@ -2,8 +2,6 @@
 
 set -x
 
-LC_ALL=C
-
 # doesn't actually cd to directory, but return absolute path
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # cd to directory
@@ -12,7 +10,7 @@ cd $CUR_DIR
 CONTRIBUTORS_FILE=${CONTRIBUTORS_FILE=$CUR_DIR/StorageSystemContributors.generated.cpp}
 
 # if you don't specify HEAD here, without terminal `git shortlog` would expect input from stdin
-git shortlog HEAD --summary | perl -lnE 's/^\s+\d+\s+(.+)/    "$1",/; next unless $1; say $_' | sort > $CONTRIBUTORS_FILE.tmp
+git shortlog HEAD --summary | perl -lnE 's/^\s+\d+\s+(.+)/    "$1",/; next unless $1; say $_' | LC_ALL=C sort > $CONTRIBUTORS_FILE.tmp
 
 # If git history not available - dont make target file
 if [ ! -s $CONTRIBUTORS_FILE.tmp ]; then
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 4daf0a68f1d..ac52f0afb32 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -1,5 +1,4 @@
 #include <Columns/ColumnString.h>
-#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -10,6 +9,7 @@
 #include <Access/ContextAccess.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/queryToString.h>
 #include <Common/typeid_cast.h>
 #include <Common/StringUtils/StringUtils.h>
diff --git a/src/Storages/TTLDescription.cpp b/src/Storages/TTLDescription.cpp
index 9bb7d0c22f2..bd5cc9e2f9d 100644
--- a/src/Storages/TTLDescription.cpp
+++ b/src/Storages/TTLDescription.cpp
@@ -6,17 +6,13 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/addTypeConversionToAST.h>
-#include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTTTLElement.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTAssignment.h>
-#include <Parsers/ASTLiteral.h>
 #include <Storages/ColumnsDescription.h>
 #include <Interpreters/Context.h>
 
-#include <Parsers/queryToString.h>
-
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 
diff --git a/src/TableFunctions/TableFunctionExecutable.cpp b/src/TableFunctions/TableFunctionExecutable.cpp
index 7b40e3d09d0..9edb75b0a69 100644
--- a/src/TableFunctions/TableFunctionExecutable.cpp
+++ b/src/TableFunctions/TableFunctionExecutable.cpp
@@ -5,6 +5,7 @@
 #include <TableFunctions/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Storages/StorageExecutable.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Interpreters/evaluateConstantExpression.h>
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index b7c6ee8803e..a9cecb11a1c 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -1,17 +1,11 @@
 #include "config_core.h"
 
 #if USE_MYSQL
-#include <Core/Defines.h>
 #include <Databases/MySQL/FetchTablesColumnsList.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/convertMySQLDataType.h>
 #include <Processors/Sources/MySQLSource.h>
-#include <IO/Operators.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
 #include <Storages/StorageMySQL.h>
 #include <Storages/MySQL/MySQLSettings.h>
 #include <TableFunctions/ITableFunction.h>
diff --git a/src/TableFunctions/TableFunctionNumbers.cpp b/src/TableFunctions/TableFunctionNumbers.cpp
index fcec85cc1d8..38ac0238362 100644
--- a/src/TableFunctions/TableFunctionNumbers.cpp
+++ b/src/TableFunctions/TableFunctionNumbers.cpp
@@ -2,7 +2,6 @@
 #include <TableFunctions/TableFunctionNumbers.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
 #include <Common/typeid_cast.h>
 #include <Common/FieldVisitorToString.h>
 #include <Storages/System/StorageSystemNumbers.h>
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index d929c62237c..bcfe8d5444c 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -6,13 +6,10 @@
 
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/Exception.h>
-#include <Common/parseAddress.h>
 #include "registerTableFunctions.h"
-#include <Common/quoteString.h>
 #include <Common/parseRemoteDescription.h>
 
 
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index ca13b7277ce..f7af6bee7d9 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -2,7 +2,7 @@
 
 #include <Storages/getStructureOfRemoteTable.h>
 #include <Storages/StorageDistributed.h>
-#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTExpressionList.h>
diff --git a/tests/ci/ast_fuzzer_check.py b/tests/ci/ast_fuzzer_check.py
index d842d484841..02c81a4db31 100644
--- a/tests/ci/ast_fuzzer_check.py
+++ b/tests/ci/ast_fuzzer_check.py
@@ -11,8 +11,7 @@ from github import Github
 from s3_helper import S3Helper
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
-from ci_config import build_config_to_string
-from build_download_helper import get_build_config_for_check, get_build_urls
+from build_download_helper import get_build_name_for_check, get_build_urls
 from docker_pull_helper import get_image_with_version
 from commit_status_helper import post_commit_status
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
@@ -54,11 +53,9 @@ if __name__ == "__main__":
 
     docker_image = get_image_with_version(temp_path, IMAGE_NAME)
 
-    build_config = get_build_config_for_check(check_name)
-    print(build_config)
-    build_config_str = build_config_to_string(build_config)
-    print(build_config_str)
-    urls = get_build_urls(build_config_str, reports_path)
+    build_name = get_build_name_for_check(check_name)
+    print(build_name)
+    urls = get_build_urls(build_name, reports_path)
     if not urls:
         raise Exception("No build URLs found")
 
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index 573a5cf82b4..0adad71d8d9 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -12,19 +12,17 @@ from pr_info import PRInfo
 from get_robot_token import get_best_robot_token
 from version_helper import get_version_from_repo, update_version_local
 from ccache_utils import get_ccache_if_not_exists, upload_ccache
-from ci_config import build_config_to_string, CI_CONFIG
+from ci_config import CI_CONFIG
 from docker_pull_helper import get_image_with_version
 
 
-def get_build_config(build_check_name, build_number):
+def get_build_config(build_check_name, build_name):
     if build_check_name == 'ClickHouse build check (actions)':
         build_config_name = 'build_config'
-    elif build_check_name == 'ClickHouse special build check (actions)':
-        build_config_name = 'special_build_config'
     else:
         raise Exception(f"Unknown build check name {build_check_name}")
 
-    return CI_CONFIG[build_config_name][build_number]
+    return CI_CONFIG[build_config_name][build_name]
 
 
 def _can_export_binaries(build_config):
@@ -94,9 +92,9 @@ if __name__ == "__main__":
     caches_path = os.getenv("CACHES_PATH", temp_path)
 
     build_check_name = sys.argv[1]
-    build_number = int(sys.argv[2])
+    build_name = sys.argv[2]
 
-    build_config = get_build_config(build_check_name, build_number)
+    build_config = get_build_config(build_check_name, build_name)
 
     if not os.path.exists(temp_path):
         os.makedirs(temp_path)
@@ -125,7 +123,6 @@ if __name__ == "__main__":
 
     logging.info("Updated local files with version")
 
-    build_name = build_config_to_string(build_config)
     logging.info("Build short name %s", build_name)
     subprocess.check_call(f"echo 'BUILD_NAME=build_urls_{build_name}' >> $GITHUB_ENV", shell=True)
 
@@ -161,7 +158,12 @@ if __name__ == "__main__":
     logging.info("Will upload cache")
     upload_ccache(ccache_path, s3_helper, pr_info.number, temp_path)
 
-    s3_path_prefix = str(pr_info.number) + "/" + pr_info.sha + "/" + build_check_name.lower().replace(' ', '_') + "/" + build_name
+    # for release pull requests we use branch names prefixes, not pr numbers
+    if 'release' in pr_info.labels or 'release-lts' in pr_info.labels:
+        s3_path_prefix = pr_info.head_ref + "/" + pr_info.sha + "/" + build_name
+    else:
+        s3_path_prefix = str(pr_info.number) + "/" + pr_info.sha + "/" + build_name
+
     if os.path.exists(log_path):
         log_url = s3_helper.upload_build_file_to_s3(log_path, s3_path_prefix + "/" + os.path.basename(log_path))
         logging.info("Log url %s", log_url)
diff --git a/tests/ci/build_download_helper.py b/tests/ci/build_download_helper.py
index 2770b737041..5ce54423e19 100644
--- a/tests/ci/build_download_helper.py
+++ b/tests/ci/build_download_helper.py
@@ -8,17 +8,17 @@ import time
 
 import requests
 
-from ci_config import CI_CONFIG, build_config_to_string
+from ci_config import CI_CONFIG
 
 DOWNLOAD_RETRIES_COUNT = 5
 
-def get_build_config_for_check(check_name):
-    return CI_CONFIG["tests_config"][check_name]['required_build_properties']
+def get_build_name_for_check(check_name):
+    return CI_CONFIG['tests_config'][check_name]['required_build']
 
-def get_build_urls(build_config_str, reports_path):
+def get_build_urls(build_name, reports_path):
     for root, _, files in os.walk(reports_path):
         for f in files:
-            if build_config_str in f :
+            if build_name in f :
                 logging.info("Found build report json %s", f)
                 with open(os.path.join(root, f), 'r', encoding='utf-8') as file_handler:
                     build_report = json.load(file_handler)
@@ -72,11 +72,8 @@ def download_builds(result_path, build_urls, filter_fn):
             dowload_build_with_progress(url, os.path.join(result_path, fname))
 
 def download_builds_filter(check_name, reports_path, result_path, filter_fn=lambda _: True):
-    build_config = get_build_config_for_check(check_name)
-    print(build_config)
-    build_config_str = build_config_to_string(build_config)
-    print(build_config_str)
-    urls = get_build_urls(build_config_str, reports_path)
+    build_name = get_build_name_for_check(check_name)
+    urls = get_build_urls(build_name, reports_path)
     print(urls)
 
     if not urls:
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 161f50fed20..57a873aa35f 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
 CI_CONFIG = {
-    "build_config": [
-        {
+    "build_config": {
+        "package_release": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "",
@@ -13,7 +13,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "performance": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "",
@@ -23,7 +23,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_gcc": {
             "compiler": "gcc-11",
             "build_type": "",
             "sanitizer": "",
@@ -33,7 +33,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "package_asan": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "address",
@@ -43,7 +43,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "package_ubsan": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "undefined",
@@ -53,7 +53,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "package_tsan": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "thread",
@@ -63,7 +63,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "package_msan": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "memory",
@@ -73,7 +73,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "package_debug": {
             "compiler": "clang-13",
             "build_type": "debug",
             "sanitizer": "",
@@ -83,7 +83,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_release": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "",
@@ -92,10 +92,8 @@ CI_CONFIG = {
             "splitted": "unsplitted",
             "tidy": "disable",
             "with_coverage": False
-        }
-    ],
-    "special_build_config": [
-        {
+        },
+        "package_tidy": {
             "compiler": "clang-13",
             "build_type": "debug",
             "sanitizer": "",
@@ -105,7 +103,7 @@ CI_CONFIG = {
             "tidy": "enable",
             "with_coverage": False
         },
-        {
+        "binary_splitted": {
             "compiler": "clang-13",
             "build_type": "",
             "sanitizer": "",
@@ -115,7 +113,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_darwin": {
             "compiler": "clang-13-darwin",
             "build_type": "",
             "sanitizer": "",
@@ -125,7 +123,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_aarch64": {
             "compiler": "clang-13-aarch64",
             "build_type": "",
             "sanitizer": "",
@@ -135,7 +133,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_freebsd": {
             "compiler": "clang-13-freebsd",
             "build_type": "",
             "sanitizer": "",
@@ -145,7 +143,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_darwin_aarch64": {
             "compiler": "clang-13-darwin-aarch64",
             "build_type": "",
             "sanitizer": "",
@@ -155,7 +153,7 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         },
-        {
+        "binary_ppc64le": {
             "compiler": "clang-13-ppc64le",
             "build_type": "",
             "sanitizer": "",
@@ -165,550 +163,139 @@ CI_CONFIG = {
             "tidy": "disable",
             "with_coverage": False
         }
-    ],
+    },
     "tests_config": {
         "Stateful tests (address, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "Stateful tests (thread, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "thread",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_tsan",
         },
         "Stateful tests (memory, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "memory",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_msan",
         },
         "Stateful tests (ubsan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "undefined",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_ubsan",
         },
         "Stateful tests (debug, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "debug",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_debug",
         },
         "Stateful tests (release, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateful tests (release, DatabaseOrdinary, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateful tests (release, DatabaseReplicated, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateless tests (address, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "Stateless tests (thread, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "thread",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_tsan",
         },
         "Stateless tests (memory, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "memory",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_msan",
         },
         "Stateless tests (ubsan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "undefined",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_ubsan",
         },
         "Stateless tests (debug, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "debug",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_debug",
         },
         "Stateless tests (release, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateless tests (release, wide parts enabled, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateless tests (release, DatabaseOrdinary, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateless tests (release, DatabaseReplicated, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stress test (address, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "Stress test (thread, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "thread",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_tsan",
         },
         "Stress test (undefined, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "undefined",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_ubsan",
         },
         "Stress test (memory, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "memory",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_msan",
         },
         "Stress test (debug, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "debug",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_debug",
         },
         "Integration tests (asan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "Integration tests (thread, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "thread",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_tsan",
         },
         "Integration tests (release, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Integration tests (memory, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "memory",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_msan",
         },
         "Integration tests flaky check (asan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "Compatibility check (actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Split build smoke test (actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "binary",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "splitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "binary_splitted",
         },
         "Testflows check (actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Unit tests (release-gcc, actions)": {
-            "required_build_properties": {
-                "compiler": "gcc-11",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "binary_gcc",
         },
         "Unit tests (release-clang, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "binary",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "binary_release",
         },
         "Unit tests (asan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "Unit tests (msan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "memory",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_msan",
         },
         "Unit tests (tsan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "thread",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_tsan",
         },
         "Unit tests (ubsan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "undefined",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_ubsan",
         },
         "AST fuzzer (debug, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "debug",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_debug",
         },
         "AST fuzzer (ASan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "AST fuzzer (MSan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "memory",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_msan",
         },
         "AST fuzzer (TSan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "thread",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_tsan",
         },
         "AST fuzzer (UBSan, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "undefined",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_ubsan",
         },
         "Release (actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_release",
         },
         "Stateless tests flaky check (address, actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "deb",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "address",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "package_asan",
         },
         "ClickHouse Keeper Jepsen (actions)": {
-            "required_build_properties": {
-                "compiler": "clang-13",
-                "package_type": "binary",
-                "build_type": "relwithdebuginfo",
-                "sanitizer": "none",
-                "bundled": "bundled",
-                "splitted": "unsplitted",
-                "clang_tidy": "disable",
-                "with_coverage": False
-            }
+            "required_build": "binary_release",
         }
     }
 }
-
-def build_config_to_string(build_config):
-    if build_config["package_type"] == "performance":
-        return "performance"
-
-    return "_".join([
-        build_config['compiler'],
-        build_config['build_type'] if build_config['build_type'] else "relwithdebuginfo",
-        build_config['sanitizer'] if build_config['sanitizer'] else "none",
-        build_config['bundled'],
-        build_config['splitted'],
-        'tidy' if 'tidy' in build_config and build_config['tidy'] == 'enable' else 'notidy',
-        'with_coverage' if 'with_coverage' in build_config and build_config['with_coverage'] else 'without_coverage',
-        build_config['package_type'],
-    ])
diff --git a/tests/ci/metrics_lambda/app.py b/tests/ci/metrics_lambda/app.py
index 4bf967a51e1..d776aa2be49 100644
--- a/tests/ci/metrics_lambda/app.py
+++ b/tests/ci/metrics_lambda/app.py
@@ -163,7 +163,7 @@ def main(github_secret_key, github_app_id, push_to_cloudwatch, delete_offline_ru
     if delete_offline_runners:
         print("Going to delete offline runners")
         for runner in runners:
-            if runner.offline:
+            if runner.offline and not runner.busy:
                 print("Deleting runner", runner)
                 delete_runner(access_token, runner)
 
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index c10bf0f6ecd..a445fef0ab2 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -6,7 +6,7 @@ import requests
 from unidiff import PatchSet
 
 
-DIFF_IN_DOCUMENTATION_EXT = [".html", ".md", ".yml", ".txt", ".css", ".js", ".xml", ".ico", ".conf", ".svg", ".png", ".jpg", ".py", ".sh"]
+DIFF_IN_DOCUMENTATION_EXT = [".html", ".md", ".yml", ".txt", ".css", ".js", ".xml", ".ico", ".conf", ".svg", ".png", ".jpg", ".py", ".sh", ".json"]
 
 def get_pr_for_commit(sha, ref):
     try_get_pr_url = f"https://api.github.com/repos/{os.getenv('GITHUB_REPOSITORY', 'ClickHouse/ClickHouse')}/commits/{sha}/pulls"
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
index 1ad43b9880a..3fea87c4fd1 100644
--- a/tests/config/config.d/database_replicated.xml
+++ b/tests/config/config.d/database_replicated.xml
@@ -34,14 +34,14 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>localhost</hostname>
-                <port>44445</port>
+                <port>9235</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -49,7 +49,7 @@
             <server>
                 <id>3</id>
                 <hostname>localhost</hostname>
-                <port>44446</port>
+                <port>9236</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/config/config.d/keeper_port.xml b/tests/config/config.d/keeper_port.xml
index 85d4bc0f04f..21163ece190 100644
--- a/tests/config/config.d/keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -22,7 +22,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml b/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
index cee4d338231..aada51c50b5 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
@@ -16,7 +16,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml b/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml
index 91723bc372f..3019e530e84 100644
--- a/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml
@@ -11,5 +11,5 @@ keeper_server:
     server:
       id: 1
       hostname: localhost
-      port: 44444
+      port: 9234
 
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
index cee4d338231..aada51c50b5 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
@@ -16,7 +16,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml b/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml
index 91723bc372f..3019e530e84 100644
--- a/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml
@@ -11,5 +11,5 @@ keeper_server:
     server:
       id: 1
       hostname: localhost
-      port: 44444
+      port: 9234
 
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
index cee4d338231..aada51c50b5 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
@@ -16,7 +16,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_auth/configs/keeper_config.xml b/tests/integration/test_keeper_auth/configs/keeper_config.xml
index 1a01b79cebd..926cdd3a0f9 100644
--- a/tests/integration/test_keeper_auth/configs/keeper_config.xml
+++ b/tests/integration/test_keeper_auth/configs/keeper_config.xml
@@ -21,7 +21,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml b/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
index 30a56c6e1e1..9649117e4b1 100644
--- a/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
+++ b/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
@@ -20,7 +20,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_clickhouse_hard_restart/configs/enable_keeper.xml b/tests/integration/test_keeper_clickhouse_hard_restart/configs/enable_keeper.xml
new file mode 100644
index 00000000000..c1d38a1de52
--- /dev/null
+++ b/tests/integration/test_keeper_clickhouse_hard_restart/configs/enable_keeper.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_clickhouse_hard_restart/configs/keeper_conf.xml b/tests/integration/test_keeper_clickhouse_hard_restart/configs/keeper_conf.xml
new file mode 100644
index 00000000000..ebb0d98ddf4
--- /dev/null
+++ b/tests/integration/test_keeper_clickhouse_hard_restart/configs/keeper_conf.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml b/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml
index 258e58b558e..fcb3553bb98 100644
--- a/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/enable_keeper1.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>false</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>false</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml b/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml
index f49fb819256..65011cd2637 100644
--- a/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/enable_keeper2.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>false</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>false</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml b/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml
index 4606dce367f..a0d8c99f3d8 100644
--- a/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/enable_keeper3.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>false</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>false</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list.xml b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list.xml
index 4263cdb38c9..a0c735fd5db 100644
--- a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list.xml
@@ -7,17 +7,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list_all.xml b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list_all.xml
index 635afa70b85..2aa58b25130 100644
--- a/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list_all.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/keeper_config_with_white_list_all.xml
@@ -7,17 +7,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_white_list.xml b/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_white_list.xml
index 084b9a63654..697acaebe58 100644
--- a/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_white_list.xml
+++ b/tests/integration/test_keeper_four_word_command/configs/keeper_config_without_white_list.xml
@@ -6,17 +6,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
index 039d864711c..986b503ebe3 100644
--- a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
index a3c20e095f3..652b1992f46 100644
--- a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
index 867c48ba250..6507f97473b 100644
--- a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
index 9acc30f02fa..17455ed12f5 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -31,7 +31,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
index 9f8c0806ee0..03a23984cc2 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -31,7 +31,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
index e0efa3a8d1e..a3196ac3061 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -31,7 +31,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
index 9acc30f02fa..17455ed12f5 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -31,7 +31,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
index 9f8c0806ee0..03a23984cc2 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -31,7 +31,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
index e0efa3a8d1e..a3196ac3061 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -31,7 +31,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
index bd695389fa6..c1d38a1de52 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
@@ -15,7 +15,7 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
index 510424715c4..d2717283a8d 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
index 264601d8c98..5924ee1c2dc 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
index 7f9775939bb..d261e4f67f3 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
index 3f6baf1ccc7..697986638d7 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
@@ -15,12 +15,12 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
index 61c9a00ffd6..967940e1e2b 100644
--- a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
@@ -15,12 +15,12 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml
index a8a1a17b831..1e57d42016d 100644
--- a/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml
index 7820158680c..98422b41c9b 100644
--- a/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml
index cd76b0d216e..43800bd2dfb 100644
--- a/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml
index d99502e2959..0d7544f9a5b 100644
--- a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>4</id>
                 <hostname>node4</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml
index 04d8776782f..65feae85e3e 100644
--- a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>4</id>
                 <hostname>node4</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml
index 10abf71b9f6..2499de4fe86 100644
--- a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>4</id>
                 <hostname>node4</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml
index a8a1a17b831..1e57d42016d 100644
--- a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml
index 7820158680c..98422b41c9b 100644
--- a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml
index cd76b0d216e..43800bd2dfb 100644
--- a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml
@@ -15,18 +15,18 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <start_as_follower>true</start_as_follower>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml
index 3f6baf1ccc7..697986638d7 100644
--- a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml
@@ -15,12 +15,12 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml
index 61c9a00ffd6..967940e1e2b 100644
--- a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml
@@ -15,12 +15,12 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml
index bd695389fa6..c1d38a1de52 100644
--- a/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml
@@ -15,7 +15,7 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml b/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
index e302b857666..d6166a83d2f 100644
--- a/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
+++ b/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
@@ -15,7 +15,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
index 2ee38419581..06b70c1b5d0 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
@@ -15,14 +15,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -30,7 +30,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
index 018fa284896..f13f8b902b4 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
@@ -15,14 +15,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -30,7 +30,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
index 77a1d720b69..a69cabf8c54 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
@@ -15,14 +15,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -30,7 +30,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_remove_leader/configs/enable_keeper1.xml b/tests/integration/test_keeper_remove_leader/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..1e57d42016d
--- /dev/null
+++ b/tests/integration/test_keeper_remove_leader/configs/enable_keeper1.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_leader/configs/enable_keeper2.xml b/tests/integration/test_keeper_remove_leader/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..98422b41c9b
--- /dev/null
+++ b/tests/integration/test_keeper_remove_leader/configs/enable_keeper2.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_leader/configs/enable_keeper3.xml b/tests/integration/test_keeper_remove_leader/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..43800bd2dfb
--- /dev/null
+++ b/tests/integration/test_keeper_remove_leader/configs/enable_keeper3.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_1.xml b/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_1.xml
new file mode 100644
index 00000000000..d51e420f733
--- /dev/null
+++ b/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_1.xml
@@ -0,0 +1,28 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_2.xml b/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_2.xml
new file mode 100644
index 00000000000..3f1ee1e01a8
--- /dev/null
+++ b/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_2.xml
@@ -0,0 +1,28 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_3.xml b/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_3.xml
new file mode 100644
index 00000000000..a99bd5d5296
--- /dev/null
+++ b/tests/integration/test_keeper_remove_leader/configs/enable_keeper_two_nodes_3.xml
@@ -0,0 +1,28 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
index 6e838ed2a96..4ea543e6f31 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
@@ -18,14 +18,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>70</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>20</priority>
@@ -33,7 +33,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>10</priority>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
index 1ff565044e8..4bf3083c1fa 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
@@ -18,14 +18,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>70</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>20</priority>
@@ -33,7 +33,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>10</priority>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
index 8f022c22c3c..b9e2a2d0422 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
@@ -18,14 +18,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>70</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>20</priority>
@@ -33,7 +33,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>10</priority>
diff --git a/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
index b8ef730c6ed..2c144269bcc 100644
--- a/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
+++ b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
@@ -17,7 +17,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml
index 1e9bea6c606..ed5909d01eb 100644
--- a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml
@@ -17,19 +17,19 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>2</priority>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>1</priority>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml
index 4fc00055ff1..896853a3713 100644
--- a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml
@@ -17,19 +17,19 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>2</priority>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>1</priority>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml
index 89134440aa3..8d1d5c73dd8 100644
--- a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml
@@ -17,19 +17,19 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>2</priority>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <priority>1</priority>
             </server>
         </raft_configuration>
diff --git a/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml b/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
index 15db48f4f37..a3217b34501 100644
--- a/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
+++ b/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
@@ -22,7 +22,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
index 759d3e7415b..27d0d38f596 100644
--- a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
index d4b2296d54d..dedbd312544 100644
--- a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
index 37fa4e8b3b7..fd36458b5eb 100644
--- a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
@@ -17,14 +17,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
@@ -32,7 +32,7 @@
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>1</priority>
diff --git a/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper1.xml b/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..1e57d42016d
--- /dev/null
+++ b/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper1.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper2.xml b/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..98422b41c9b
--- /dev/null
+++ b/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper2.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper3.xml b/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..43800bd2dfb
--- /dev/null
+++ b/tests/integration/test_keeper_start_as_follower_multinode/configs/enable_keeper3.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>9234</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>9234</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml
index bc62d817074..d2159348588 100644
--- a/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>non_existing_node</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml
index a6c476fb449..0d9aeb191d9 100644
--- a/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>non_existing_node</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml
index 510424715c4..d2717283a8d 100644
--- a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml
index 264601d8c98..5924ee1c2dc 100644
--- a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml
index 7f9775939bb..d261e4f67f3 100644
--- a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml
@@ -15,17 +15,17 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
             <server>
                 <id>3</id>
                 <hostname>node3</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml
index 70626b33130..7c2e283e89f 100644
--- a/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
diff --git a/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml
index 96068de33a9..618e6a04aec 100644
--- a/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml
@@ -16,14 +16,14 @@
             <server>
                 <id>1</id>
                 <hostname>node1</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <priority>3</priority>
             </server>
             <server>
                 <id>2</id>
                 <hostname>node2</hostname>
-                <port>44444</port>
+                <port>9234</port>
                 <can_become_leader>true</can_become_leader>
                 <start_as_follower>true</start_as_follower>
                 <priority>2</priority>
diff --git a/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml b/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
index 612cb979bb7..9b50f2c6c41 100644
--- a/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
+++ b/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
@@ -16,7 +16,7 @@
             <server>
                 <id>1</id>
                 <hostname>localhost</hostname>
-                <port>44444</port>
+                <port>9234</port>
             </server>
         </raft_configuration>
     </keeper_server>
diff --git a/tests/performance/count.xml b/tests/performance/count.xml
index b75fd4e4df5..bd9ef2baf80 100644
--- a/tests/performance/count.xml
+++ b/tests/performance/count.xml
@@ -4,6 +4,8 @@
     <fill_query>INSERT INTO data SELECT number, 1 from numbers(10000000)</fill_query>
 
     <query tag='count_10M' short='1'>SELECT count() FROM data</query>
+    <query>SELECT count(k) FROM (SELECT k FROM data, numbers(20) _a)</query>
+    <query>SELECT count(k) FROM (SELECT toNullable(k) as k FROM data, numbers(20) _a)</query>
 
     <drop_query>DROP TABLE IF EXISTS data</drop_query>
 </test>
diff --git a/tests/performance/countIf.xml b/tests/performance/countIf.xml
index a2209d5ed22..87616235226 100644
--- a/tests/performance/countIf.xml
+++ b/tests/performance/countIf.xml
@@ -1,3 +1,21 @@
 <test>
     <query>SELECT countIf(number % 2) FROM numbers(100000000)</query>
+
+    <query>
+        SELECT countIf(key IS NOT NULL)
+        FROM
+        (
+            SELECT materialize(toNullable(1)) AS key
+            FROM numbers(100000000)
+        )
+    </query>
+
+    <query>
+        SELECT countIf(key IS NOT NULL)
+        FROM
+        (
+            SELECT materialize(CAST(NULL, 'Nullable(Int8)')) AS key
+            FROM numbers(100000000)
+        )
+    </query>
 </test>
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
index 28f44ffa3f7..0b672cbddbf 100644
--- a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
@@ -48,8 +48,8 @@ DROP DATABASE test_01155_ordinary;
 USE default;
 
 INSERT INTO test_01155_atomic.src(s) VALUES ('after moving tables');
---SELECT materialize(2), substr(_table, 1, 10), s FROM merge('test_01155_atomic', '') ORDER BY _table, s; -- { serverError 81 }
---SELECT dictGet('test_01155_ordinary.dict', 'x', 'after moving tables'); -- { serverError 36 }
+SELECT materialize(2), substr(_table, 1, 10), s FROM merge('test_01155_atomic', '') ORDER BY _table, s; -- { serverError 81 }
+SELECT dictGet('test_01155_ordinary.dict', 'x', 'after moving tables'); -- { serverError 36 }
 
 RENAME DATABASE test_01155_atomic TO test_01155_ordinary;
 USE test_01155_ordinary;
diff --git a/tests/queries/0_stateless/02116_global_in_time_limit.sh b/tests/queries/0_stateless/02116_global_in_time_limit.sh
index b413974b996..4af042684dd 100755
--- a/tests/queries/0_stateless/02116_global_in_time_limit.sh
+++ b/tests/queries/0_stateless/02116_global_in_time_limit.sh
@@ -13,4 +13,4 @@ function run
 }
 
 export -f run
-timeout 6 bash -c run
+timeout 10 bash -c run
diff --git a/tests/queries/0_stateless/02122_parallel_formatting.reference b/tests/queries/0_stateless/02122_parallel_formatting.reference
new file mode 100644
index 00000000000..f65fd1a1305
--- /dev/null
+++ b/tests/queries/0_stateless/02122_parallel_formatting.reference
@@ -0,0 +1,68 @@
+RowBinary-1
+RowBinary-2
+RowBinaryWithNames-1
+RowBinaryWithNames-2
+RowBinaryWithNamesAndTypes-1
+RowBinaryWithNamesAndTypes-2
+XML-1
+XML-2
+Markdown-1
+Markdown-2
+Vertical-1
+Vertical-2
+Values-1
+Values-2
+JSONEachRow-1
+JSONEachRow-2
+JSONStringsEachRow-1
+JSONStringsEachRow-2
+TSKV-1
+TSKV-2
+Pretty-1
+Pretty-2
+PrettyNoEscapes-1
+PrettyNoEscapes-2
+JSON-1
+JSON-2
+JSONStrings-1
+JSONStrings-2
+JSONCompact-1
+JSONCompact-2
+JSONCompactStrings-1
+JSONCompactStrings-2
+PrettyCompact-1
+PrettyCompact-2
+PrettyCompactNoEscapes-1
+PrettyCompactNoEscapes-2
+PrettySpace-1
+PrettySpace-2
+PrettySpaceNoEscapes-1
+PrettySpaceNoEscapes-2
+TSV-1
+TSV-2
+TSVWithNames-1
+TSVWithNames-2
+TSVWithNamesAndTypes-1
+TSVWithNamesAndTypes-2
+CSV-1
+CSV-2
+CSVWithNames-1
+CSVWithNames-2
+CSVWithNamesAndTypes-1
+CSVWithNamesAndTypes-2
+JSONCompactEachRow-1
+JSONCompactEachRow-2
+JSONCompactEachRowWithNames-1
+JSONCompactEachRowWithNames-2
+JSONCompactEachRowWithNamesAndTypes-1
+JSONCompactEachRowWithNamesAndTypes-2
+JSONCompactStringsEachRow-1
+JSONCompactStringsEachRow-2
+JSONCompactStringsEachRowWithNames-1
+JSONCompactStringsEachRowWithNames-2
+JSONCompactStringsEachRowWithNamesAndTypes-1
+JSONCompactStringsEachRowWithNamesAndTypes-2
+CustomSeparated-1
+CustomSeparated-2
+Template-1
+Template-2
diff --git a/tests/queries/0_stateless/02122_parallel_formatting.sh b/tests/queries/0_stateless/02122_parallel_formatting.sh
new file mode 100755
index 00000000000..8061cbe58b2
--- /dev/null
+++ b/tests/queries/0_stateless/02122_parallel_formatting.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+parallel_file=$CUR_DIR/$CLICKHOUSE_TEST_UNIQUE_NAME"_parallel"
+non_parallel_file=$CUR_DIR/$CLICKHOUSE_TEST_UNIQUE_NAME"_non_parallel"
+
+formats="RowBinary RowBinaryWithNames RowBinaryWithNamesAndTypes XML Markdown Vertical Values JSONEachRow JSONStringsEachRow TSKV Pretty PrettyNoEscapes JSON JSONStrings JSONCompact JSONCompactStrings PrettyCompact PrettyCompactNoEscapes PrettySpace PrettySpaceNoEscapes TSV TSVWithNames TSVWithNamesAndTypes CSV CSVWithNames CSVWithNamesAndTypes JSONCompactEachRow JSONCompactEachRowWithNames JSONCompactEachRowWithNamesAndTypes JSONCompactStringsEachRow JSONCompactStringsEachRowWithNames JSONCompactStringsEachRowWithNamesAndTypes"
+
+for format in ${formats}; do
+    echo $format-1
+    $CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) format $format" --output_format_parallel_formatting=0 --output_format_pretty_max_rows=1000000 | grep -v "elapsed" > $non_parallel_file
+    $CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) format $format" --output_format_parallel_formatting=1 --output_format_pretty_max_rows=1000000 | grep -v "elapsed" > $parallel_file
+
+    diff $non_parallel_file $parallel_file
+
+    echo $format-2
+    $CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) group by number with totals limit 190000 format $format" --extremes=1 --output_format_parallel_formatting=0 --output_format_pretty_max_rows=1000000 | grep -v "elapsed" > $non_parallel_file
+    $CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) group by number with totals limit 190000 format $format" --extremes=1 --output_format_parallel_formatting=1 --output_format_pretty_max_rows=1000000 | grep -v "elapsed" > $parallel_file
+
+    diff $non_parallel_file $parallel_file
+done
+
+CUSTOM_SETTINGS="SETTINGS format_custom_row_before_delimiter='<row_before_delimiter>', format_custom_row_after_delimiter='<row_after_delimieter>\n', format_custom_row_between_delimiter='<row_between_delimiter>\n', format_custom_result_before_delimiter='<result_before_delimiter>\n', format_custom_result_after_delimiter='<result_after_delimiter>\n', format_custom_field_delimiter='<field_delimiter>', format_custom_escaping_rule='CSV'"
+
+echo "CustomSeparated-1"
+$CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) format CustomSeparated $CUSTOM_SETTINGS" --output_format_parallel_formatting=0 > $non_parallel_file
+$CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) format CustomSeparated $CUSTOM_SETTINGS" --output_format_parallel_formatting=1 > $parallel_file
+
+diff $non_parallel_file $parallel_file
+
+echo "CustomSeparated-2"
+$CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) group by number with totals limit 190000 format CustomSeparated $CUSTOM_SETTINGS" --output_format_parallel_formatting=0 --extremes=1 > $non_parallel_file
+$CLICKHOUSE_CLIENT -q "select number, number + 1, concat('string: ', toString(number)) from numbers(200000) group by number with totals limit 190000 format CustomSeparated $CUSTOM_SETTINGS" --output_format_parallel_formatting=1 --extremes=1 > $parallel_file
+
+diff $non_parallel_file $parallel_file
+
+echo -ne '{prefix} \n${data}\n $$ suffix $$\n' > "$CUR_DIR"/02122_template_format_resultset.tmp
+echo -ne 'x:${x:Quoted}, y:${y:Quoted}, s:${s:Quoted}' > "$CUR_DIR"/02122_template_format_row.tmp
+
+TEMPLATE_SETTINGS="SETTINGS format_template_resultset = '$CUR_DIR/02122_template_format_resultset.tmp', format_template_row = '$CUR_DIR/02122_template_format_row.tmp', format_template_rows_between_delimiter = ';\n'"
+
+echo "Template-1"
+$CLICKHOUSE_CLIENT -q "select number as x, number + 1 as y, concat('string: ', toString(number)) as s from numbers(200000) format Template $TEMPLATE_SETTINGS" --output_format_parallel_formatting=0 > $non_parallel_file
+$CLICKHOUSE_CLIENT -q "select number as x, number + 1 as y, concat('string: ', toString(number)) as s from numbers(200000) format Template $TEMPLATE_SETTINGS" --output_format_parallel_formatting=1 > $parallel_file
+
+diff $non_parallel_file $parallel_file
+
+echo -ne '{prefix} \n${data}\n $$ suffix $$\n${totals}\n${min}\n${max}\n${rows:Quoted}\n${rows_before_limit:Quoted}\n${rows_read:Quoted}\n${bytes_read:Quoted}\n' > "$CUR_DIR"/02122_template_format_resultset.tmp
+
+echo "Template-2"
+$CLICKHOUSE_CLIENT -q "select number as x, number + 1 as y, concat('string: ', toString(number)) as s from numbers(200000) group by number with totals limit 190000 format Template $TEMPLATE_SETTINGS" --output_format_parallel_formatting=0 --extremes=1 > $non_parallel_file
+$CLICKHOUSE_CLIENT -q "select number as x, number + 1 as y, concat('string: ', toString(number)) as s from numbers(200000) group by number with totals limit 190000 format Template $TEMPLATE_SETTINGS" --output_format_parallel_formatting=1 --extremes=1 > $parallel_file
+
+diff $non_parallel_file $parallel_file
+
+rm $non_parallel_file $parallel_file
+rm "$CUR_DIR"/02122_template_format_resultset.tmp "$CUR_DIR"/02122_template_format_row.tmp
+
diff --git a/tests/queries/0_stateless/02124_empty_uuid.reference b/tests/queries/0_stateless/02124_empty_uuid.reference
new file mode 100644
index 00000000000..31c1ccfc7ca
--- /dev/null
+++ b/tests/queries/0_stateless/02124_empty_uuid.reference
@@ -0,0 +1,4 @@
+00000000-0000-0000-0000-000000000000	1
+992f6910-42b2-43cd-98bc-c812fbf9b683	0
+992f6910-42b2-43cd-98bc-c812fbf9b683	0
+00000000-0000-0000-0000-000000000000	1
diff --git a/tests/queries/0_stateless/02124_empty_uuid.sql b/tests/queries/0_stateless/02124_empty_uuid.sql
new file mode 100644
index 00000000000..8dbfa3bae27
--- /dev/null
+++ b/tests/queries/0_stateless/02124_empty_uuid.sql
@@ -0,0 +1,7 @@
+SELECT
+    arrayJoin([toUUID('00000000-0000-0000-0000-000000000000'), toUUID('992f6910-42b2-43cd-98bc-c812fbf9b683')]) AS x,
+    empty(x) AS emp;
+
+SELECT
+    arrayJoin([toUUID('992f6910-42b2-43cd-98bc-c812fbf9b683'), toUUID('00000000-0000-0000-0000-000000000000')]) AS x,
+    empty(x) AS emp;
diff --git a/tests/queries/0_stateless/02124_encrypt_decrypt_nullable.reference b/tests/queries/0_stateless/02124_encrypt_decrypt_nullable.reference
new file mode 100644
index 00000000000..5a3daa6efb8
--- /dev/null
+++ b/tests/queries/0_stateless/02124_encrypt_decrypt_nullable.reference
@@ -0,0 +1,16 @@
+aes_encrypt_mysql
+\N
+D1B43643E1D0E9390E39BA4EAE150851
+aes_decrypt_mysql
+\N
+48656C6C6F20576F726C6421
+encrypt
+aes-256-ecb	\N
+aes-256-gcm	\N
+aes-256-ecb	D1B43643E1D0E9390E39BA4EAE150851
+aes-256-gcm	219E6478A1A3BB5B686DA4BAD70323F192EFEDCCBBD6F49E78A7E2F6
+decrypt
+aes-256-ecb	\N
+aes-256-gcm	\N
+aes-256-ecb	Hello World!
+aes-256-gcm	Hello World!
diff --git a/tests/queries/0_stateless/02124_encrypt_decrypt_nullable.sql b/tests/queries/0_stateless/02124_encrypt_decrypt_nullable.sql
new file mode 100644
index 00000000000..a029b4afaaf
--- /dev/null
+++ b/tests/queries/0_stateless/02124_encrypt_decrypt_nullable.sql
@@ -0,0 +1,57 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
+-------------------------------------------------------------------------------
+-- Validate that encrypt/decrypt (and mysql versions) work against Nullable(String).
+-- null gets encrypted/decrypted as null, non-null encrypted/decrypted as usual.
+-------------------------------------------------------------------------------
+-- using nullIf since that is the easiest way to produce `Nullable(String)` with a `null` value
+
+-----------------------------------------------------------------------------------------------------------------------------------
+-- MySQL compatibility
+SELECT 'aes_encrypt_mysql';
+
+SELECT aes_encrypt_mysql('aes-256-ecb', CAST(null as Nullable(String)), 'test_key________________________');
+
+WITH 'aes-256-ecb' as mode, 'Hello World!' as plaintext, 'test_key________________________' as key
+SELECT hex(aes_encrypt_mysql(mode, toNullable(plaintext), key));
+
+SELECT 'aes_decrypt_mysql';
+
+SELECT aes_decrypt_mysql('aes-256-ecb', CAST(null as Nullable(String)), 'test_key________________________');
+
+WITH 'aes-256-ecb' as mode, unhex('D1B43643E1D0E9390E39BA4EAE150851') as ciphertext, 'test_key________________________' as key
+SELECT hex(aes_decrypt_mysql(mode, toNullable(ciphertext), key));
+
+-----------------------------------------------------------------------------------------------------------------------------------
+-- encrypt both non-null and null values of Nullable(String)
+SELECT 'encrypt';
+
+WITH 'aes-256-ecb' as mode, 'test_key________________________' as key
+SELECT mode, encrypt(mode, CAST(null as Nullable(String)), key);
+
+WITH 'aes-256-gcm' as mode, 'test_key________________________' as key, 'test_iv_____' as iv
+SELECT mode, encrypt(mode, CAST(null as Nullable(String)), key, iv);
+
+WITH 'aes-256-ecb' as mode, 'test_key________________________' as key
+SELECT mode, hex(encrypt(mode, toNullable('Hello World!'), key));
+
+WITH 'aes-256-gcm' as mode, 'test_key________________________' as key, 'test_iv_____' as iv
+SELECT mode, hex(encrypt(mode, toNullable('Hello World!'), key, iv));
+
+-----------------------------------------------------------------------------------------------------------------------------------
+-- decrypt both non-null and null values of Nullable(String)
+
+SELECT 'decrypt';
+
+WITH 'aes-256-ecb' as mode, 'test_key________________________' as key
+SELECT mode, decrypt(mode, CAST(null as Nullable(String)), key);
+
+WITH 'aes-256-gcm' as mode, 'test_key________________________' as key, 'test_iv_____' as iv
+SELECT mode, decrypt(mode, CAST(null as Nullable(String)), key, iv);
+
+WITH 'aes-256-ecb' as mode, unhex('D1B43643E1D0E9390E39BA4EAE150851') as ciphertext, 'test_key________________________' as key
+SELECT mode, decrypt(mode, toNullable(ciphertext), key);
+
+WITH 'aes-256-gcm' as mode, unhex('219E6478A1A3BB5B686DA4BAD70323F192EFEDCCBBD6F49E78A7E2F6') as ciphertext, 'test_key________________________' as key, 'test_iv_____' as iv
+SELECT mode, decrypt(mode, toNullable(ciphertext), key, iv);
diff --git a/tests/queries/0_stateless/02124_uncompressed_cache.reference b/tests/queries/0_stateless/02124_uncompressed_cache.reference
new file mode 100644
index 00000000000..79957a23f0b
--- /dev/null
+++ b/tests/queries/0_stateless/02124_uncompressed_cache.reference
@@ -0,0 +1,2 @@
+105	3
+105	3
diff --git a/tests/queries/0_stateless/02124_uncompressed_cache.sql b/tests/queries/0_stateless/02124_uncompressed_cache.sql
new file mode 100644
index 00000000000..60b616b456a
--- /dev/null
+++ b/tests/queries/0_stateless/02124_uncompressed_cache.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS t_uncompressed_cache;
+
+CREATE TABLE t_uncompressed_cache(id UInt32, n UInt32)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0,
+min_compress_block_size = 12, max_compress_block_size = 12,
+index_granularity = 4;
+
+INSERT INTO t_uncompressed_cache SELECT number, number FROM numbers(200);
+
+SET max_threads = 1;
+
+SELECT sum(n), count() FROM t_uncompressed_cache PREWHERE id = 0 OR id = 5 OR id = 100 SETTINGS use_uncompressed_cache = 0;
+SELECT sum(n), count() FROM t_uncompressed_cache PREWHERE id = 0 OR id = 5 OR id = 100 SETTINGS use_uncompressed_cache = 1;
+
+DROP TABLE t_uncompressed_cache;
diff --git a/tests/queries/0_stateless/02125_low_cardinality_int256.reference b/tests/queries/0_stateless/02125_low_cardinality_int256.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02125_low_cardinality_int256.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02125_low_cardinality_int256.sql b/tests/queries/0_stateless/02125_low_cardinality_int256.sql
new file mode 100644
index 00000000000..c52d0ff2c0c
--- /dev/null
+++ b/tests/queries/0_stateless/02125_low_cardinality_int256.sql
@@ -0,0 +1 @@
+SELECT toLowCardinality(toInt256(1));
diff --git a/tests/queries/0_stateless/02125_query_views_log.reference b/tests/queries/0_stateless/02125_query_views_log.reference
new file mode 100644
index 00000000000..3ae4af9b4d0
--- /dev/null
+++ b/tests/queries/0_stateless/02125_query_views_log.reference
@@ -0,0 +1,24 @@
+-- { echo }
+select view_name, read_rows, read_bytes, written_rows, written_bytes from system.query_views_log where startsWith(view_name, currentDatabase() || '.mv') order by view_name format Vertical;
+Row 1:
+──────
+view_name:     default.mv1
+read_rows:     1000000
+read_bytes:    4000000
+written_rows:  1000000
+written_bytes: 4000000
+
+Row 2:
+──────
+view_name:     default.mv2
+read_rows:     1000000
+read_bytes:    4000000
+written_rows:  1000000
+written_bytes: 4000000
+select read_rows, read_bytes, written_rows, written_bytes from system.query_log where type = 'QueryFinish' and query_kind = 'Insert' and current_database = currentDatabase() format Vertical;
+Row 1:
+──────
+read_rows:     1000000
+read_bytes:    8000000
+written_rows:  3000000
+written_bytes: 12000000
diff --git a/tests/queries/0_stateless/02125_query_views_log.sql b/tests/queries/0_stateless/02125_query_views_log.sql
new file mode 100644
index 00000000000..d2d19b76a1f
--- /dev/null
+++ b/tests/queries/0_stateless/02125_query_views_log.sql
@@ -0,0 +1,16 @@
+drop table if exists src;
+drop table if exists dst;
+drop table if exists mv1;
+drop table if exists mv2;
+
+create table src (key Int) engine=Null();
+create table dst (key Int) engine=Null();
+create materialized view mv1 to dst as select * from src;
+create materialized view mv2 to dst as select * from src;
+
+insert into src select * from numbers(1e6) settings log_queries=1, max_untracked_memory=0, parallel_view_processing=1;
+system flush logs;
+
+-- { echo }
+select view_name, read_rows, read_bytes, written_rows, written_bytes from system.query_views_log where startsWith(view_name, currentDatabase() || '.mv') order by view_name format Vertical;
+select read_rows, read_bytes, written_rows, written_bytes from system.query_log where type = 'QueryFinish' and query_kind = 'Insert' and current_database = currentDatabase() format Vertical;
diff --git a/utils/list-licenses/list-licenses.sh b/utils/list-licenses/list-licenses.sh
index cdb3e3983ff..ee79ffac26f 100755
--- a/utils/list-licenses/list-licenses.sh
+++ b/utils/list-licenses/list-licenses.sh
@@ -2,14 +2,13 @@
 
 ROOT_PATH="$(git rev-parse --show-toplevel)"
 LIBS_PATH="${ROOT_PATH}/contrib"
-LC_ALL=C
 
-ls -1 -d ${LIBS_PATH}/*/ | grep -F -v -- '-cmake' | sort | while read LIB; do
+ls -1 -d ${LIBS_PATH}/*/ | grep -F -v -- '-cmake' | LC_ALL=C sort | while read LIB; do
     LIB_NAME=$(basename $LIB)
 
     LIB_LICENSE=$(
         LC_ALL=C find "$LIB" -type f -and '(' -iname 'LICENSE*' -or -iname 'COPYING*' -or -iname 'COPYRIGHT*' ')' -and -not '(' -iname '*.html' -or -iname '*.htm' -or -iname '*.rtf' -or -name '*.cpp' -or -name '*.h' -or -iname '*.json' ')' -printf "%d\t%p\n" |
-            awk '
+            LC_ALL=C sort | LC_ALL=C awk '
                 BEGIN { IGNORECASE=1; min_depth = 0 }
                 /LICENSE/ { if (!min_depth || $1 <= min_depth) { min_depth = $1; license = $2 } }
                 /COPY/    { if (!min_depth || $1 <= min_depth) { min_depth = $1; copying = $2 } }
diff --git a/website/benchmark/hardware/results/aws_c5a_24xlarge.json b/website/benchmark/hardware/results/aws_c5a_24xlarge.json
new file mode 100644
index 00000000000..a2c4c8945ef
--- /dev/null
+++ b/website/benchmark/hardware/results/aws_c5a_24xlarge.json
@@ -0,0 +1,106 @@
+[
+    {
+        "system":       "AWS c5a.24xlarge",
+        "system_full":  "AWS c5a.24xlarge 96vCPU 192GiB 200GB gp2 EBS, AMD EPYC 7R32, Amazon Linux",
+        "time":         "2021-11-27 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.001, 0.001, 0.002],
+[0.040, 0.009, 0.008],
+[0.034, 0.013, 0.012],
+[0.091, 0.018, 0.017],
+[0.447, 0.064, 0.063],
+[1.068, 0.123, 0.118],
+[0.020, 0.010, 0.010],
+[0.037, 0.008, 0.008],
+[0.406, 0.141, 0.139],
+[0.882, 0.158, 0.152],
+[0.411, 0.077, 0.093],
+[0.570, 0.079, 0.073],
+[1.107, 0.196, 0.185],
+[1.670, 0.258, 0.244],
+[0.788, 0.239, 0.226],
+[0.260, 0.236, 0.248],
+[1.758, 0.693, 0.686],
+[1.271, 0.435, 0.413],
+[3.411, 1.279, 1.270],
+[0.098, 0.035, 0.029],
+[9.300, 0.313, 0.280],
+[10.168, 0.287, 0.248],
+[19.590, 0.617, 0.558],
+[15.743, 0.410, 0.367],
+[1.965, 0.086, 0.082],
+[0.986, 0.075, 0.067],
+[2.481, 0.080, 0.080],
+[9.411, 0.270, 0.253],
+[7.447, 0.373, 0.339],
+[0.878, 0.866, 0.866],
+[1.294, 0.168, 0.154],
+[4.710, 0.240, 0.223],
+[3.982, 1.787, 1.804],
+[9.229, 1.079, 1.019],
+[9.220, 1.066, 1.023],
+[0.407, 0.349, 0.331],
+[0.172, 0.149, 0.152],
+[0.077, 0.061, 0.061],
+[0.078, 0.056, 0.055],
+[0.397, 0.342, 0.347],
+[0.046, 0.025, 0.025],
+[0.032, 0.014, 0.014],
+[0.007, 0.010, 0.003]
+        ]
+    },
+    {
+        "system":       "AWS c5a.24xlarge",
+        "system_full":  "AWS c5a.24xlarge 96vCPU 192GiB 200GB gp2 EBS, AMD EPYC 7R32, Ubuntu 20.04",
+        "time":         "2021-11-27 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.001, 0.001, 0.002],
+[0.030, 0.010, 0.009],
+[0.031, 0.013, 0.013],
+[0.089, 0.017, 0.016],
+[0.495, 0.064, 0.064],
+[1.087, 0.126, 0.124],
+[0.018, 0.011, 0.011],
+[0.036, 0.009, 0.009],
+[0.452, 0.138, 0.137],
+[0.904, 0.158, 0.160],
+[0.452, 0.087, 0.083],
+[0.580, 0.088, 0.086],
+[1.114, 0.208, 0.197],
+[1.642, 0.264, 0.256],
+[0.785, 0.256, 0.247],
+[0.274, 0.258, 0.262],
+[1.726, 0.734, 0.709],
+[1.251, 0.450, 0.420],
+[3.392, 1.346, 1.288],
+[0.096, 0.038, 0.031],
+[9.311, 0.301, 0.271],
+[10.161, 0.281, 0.255],
+[19.575, 0.615, 0.582],
+[15.841, 0.376, 0.350],
+[1.923, 0.083, 0.079],
+[1.005, 0.077, 0.073],
+[2.488, 0.085, 0.080],
+[9.397, 0.274, 0.257],
+[7.437, 0.388, 0.363],
+[0.873, 0.870, 0.870],
+[1.297, 0.184, 0.167],
+[4.685, 0.251, 0.233],
+[3.992, 1.809, 1.870],
+[9.235, 1.211, 1.063],
+[9.217, 1.117, 1.050],
+[0.399, 0.329, 0.340],
+[0.183, 0.163, 0.166],
+[0.080, 0.069, 0.070],
+[0.086, 0.060, 0.059],
+[0.436, 0.366, 0.376],
+[0.050, 0.025, 0.032],
+[0.024, 0.023, 0.014],
+[0.016, 0.004, 0.021]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/aws_c6i_32xlarge.json b/website/benchmark/hardware/results/aws_c6i_32xlarge.json
new file mode 100644
index 00000000000..5ff4bb5bfa8
--- /dev/null
+++ b/website/benchmark/hardware/results/aws_c6i_32xlarge.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "AWS c6i.32xlarge",
+        "system_full":  "AWS c6i.32xlarge 128vCPU 256GiB 200GB gp2 EBS, Xeon(R) Platinum 8375C CPU @ 2.90GHz, Amazon Linux",
+        "time":         "2021-11-27 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.002, 0.001, 0.001],
+[0.034, 0.006, 0.005],
+[0.031, 0.008, 0.008],
+[0.079, 0.013, 0.012],
+[0.495, 0.070, 0.070],
+[1.063, 0.122, 0.124],
+[0.015, 0.007, 0.007],
+[0.042, 0.006, 0.006],
+[0.397, 0.143, 0.140],
+[0.870, 0.151, 0.147],
+[0.404, 0.072, 0.074],
+[0.663, 0.069, 0.067],
+[1.052, 0.186, 0.174],
+[1.688, 0.225, 0.213],
+[0.836, 0.206, 0.207],
+[0.315, 0.202, 0.201],
+[1.812, 0.514, 0.502],
+[1.282, 0.303, 0.312],
+[3.392, 1.072, 1.051],
+[0.078, 0.052, 0.028],
+[9.317, 0.324, 0.259],
+[10.195, 0.246, 0.210],
+[19.674, 0.493, 0.490],
+[15.990, 0.304, 0.308],
+[2.081, 0.062, 0.061],
+[1.022, 0.054, 0.052],
+[2.507, 0.076, 0.062],
+[9.436, 0.239, 0.241],
+[7.490, 0.273, 0.260],
+[0.440, 0.408, 0.413],
+[1.283, 0.142, 0.139],
+[4.740, 0.214, 0.204],
+[3.855, 0.947, 0.892],
+[9.066, 0.734, 0.725],
+[9.062, 0.749, 0.681],
+[0.273, 0.244, 0.244],
+[0.171, 0.132, 0.138],
+[0.074, 0.059, 0.055],
+[0.088, 0.055, 0.053],
+[0.406, 0.312, 0.316],
+[0.054, 0.022, 0.015],
+[0.034, 0.017, 0.012],
+[0.005, 0.008, 0.002]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/gcp_c2.json b/website/benchmark/hardware/results/gcp_c2.json
new file mode 100644
index 00000000000..d9e6e1e4c90
--- /dev/null
+++ b/website/benchmark/hardware/results/gcp_c2.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "GCP c2-standard-30",
+        "system_full":  "GCP c2-standard-30, 128 GiB RAM",
+        "time":         "2021-11-25 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.001, 0.001, 0.002],
+[0.050, 0.007, 0.006],
+[0.140, 0.019, 0.018],
+[0.426, 0.026, 0.026],
+[0.348, 0.072, 0.071],
+[0.610, 0.197, 0.197],
+[0.074, 0.013, 0.013],
+[0.030, 0.007, 0.007],
+[0.542, 0.278, 0.284],
+[0.617, 0.331, 0.312],
+[0.429, 0.109, 0.110],
+[0.431, 0.130, 0.130],
+[0.651, 0.401, 0.402],
+[1.031, 0.499, 0.520],
+[0.787, 0.512, 0.518],
+[0.583, 0.451, 0.446],
+[1.579, 1.349, 1.289],
+[0.980, 0.745, 0.766],
+[3.189, 2.722, 2.722],
+[0.336, 0.037, 0.032],
+[4.048, 0.494, 0.499],
+[4.609, 0.593, 0.572],
+[8.568, 1.306, 1.303],
+[8.766, 0.842, 0.586],
+[1.142, 0.152, 0.161],
+[0.540, 0.138, 0.137],
+[1.144, 0.157, 0.161],
+[4.062, 0.518, 0.513],
+[3.470, 0.812, 0.797],
+[1.095, 1.086, 1.073],
+[1.042, 0.387, 0.391],
+[2.361, 0.545, 0.532],
+[3.121, 2.727, 2.749],
+[4.681, 1.981, 1.953],
+[4.635, 1.943, 1.902],
+[0.799, 0.766, 0.774],
+[0.187, 0.171, 0.187],
+[0.073, 0.063, 0.063],
+[0.071, 0.059, 0.059],
+[0.404, 0.390, 0.354],
+[0.039, 0.022, 0.025],
+[0.025, 0.015, 0.019],
+[0.016, 0.004, 0.003]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/gcp_n2.json b/website/benchmark/hardware/results/gcp_n2.json
new file mode 100644
index 00000000000..e99bdc41b82
--- /dev/null
+++ b/website/benchmark/hardware/results/gcp_n2.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "GCP n2-highmem-32",
+        "system_full":  "GCP n2-highmem-32, 256 GiB RAM",
+        "time":         "2021-11-25 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.002, 0.002, 0.001],
+[0.097, 0.010, 0.010],
+[0.218, 0.020, 0.020],
+[0.373, 0.031, 0.032],
+[0.186, 0.093, 0.088],
+[0.390, 0.209, 0.216],
+[0.076, 0.016, 0.015],
+[0.034, 0.011, 0.010],
+[0.433, 0.291, 0.286],
+[0.501, 0.355, 0.325],
+[0.328, 0.123, 0.117],
+[0.309, 0.139, 0.139],
+[0.496, 0.374, 0.392],
+[0.656, 0.487, 0.488],
+[0.790, 0.586, 0.570],
+[0.556, 0.493, 0.543],
+[1.814, 1.515, 1.511],
+[0.931, 0.773, 0.757],
+[3.767, 3.250, 3.531],
+[0.168, 0.036, 0.031],
+[2.036, 0.544, 0.496],
+[2.315, 0.593, 0.557],
+[4.409, 1.429, 1.388],
+[4.968, 0.771, 0.665],
+[0.591, 0.185, 0.171],
+[0.285, 0.164, 0.158],
+[0.595, 0.183, 0.177],
+[2.044, 0.585, 0.521],
+[1.778, 0.802, 0.753],
+[0.773, 0.742, 0.753],
+[0.691, 0.429, 0.421],
+[1.333, 0.594, 0.540],
+[3.207, 2.846, 2.940],
+[2.842, 2.141, 2.024],
+[2.730, 1.886, 1.833],
+[0.782, 0.736, 0.759],
+[0.209, 0.200, 0.193],
+[0.083, 0.079, 0.078],
+[0.081, 0.071, 0.072],
+[0.435, 0.454, 0.422],
+[0.046, 0.034, 0.024],
+[0.046, 0.032, 0.017],
+[0.006, 0.004, 0.003]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/linode_cloud_amd_epyc_7601.json b/website/benchmark/hardware/results/linode_cloud_amd_epyc_7601.json
new file mode 100644
index 00000000000..78bc423d860
--- /dev/null
+++ b/website/benchmark/hardware/results/linode_cloud_amd_epyc_7601.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "Linode 16GB",
+        "system_full":  "Linode Cloud 16GB RAM, 6 AMD EPYC 7601 CPU Cores 2200 MHz, 320GB Storage, CentOS Linux release 7.9.2009 kernel 3.10.0-1160, KVM",
+        "time":         "2021-11-05 18:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.003, 0.002, 0.002],
+[0.348, 0.017, 0.024],
+[0.258, 0.060, 0.066],
+[1.178, 0.091, 0.088],
+[0.308, 0.192, 0.186],
+[2.037, 0.604, 0.602],
+[0.359, 0.037, 0.035],
+[0.129, 0.025, 0.022],
+[1.435, 1.026, 1.034],
+[1.395, 1.159, 1.147],
+[0.586, 0.405, 0.413],
+[0.648, 0.472, 0.465],
+[2.223, 1.604, 1.588],
+[2.264, 2.140, 2.170],
+[2.344, 1.802, 1.768],
+[1.959, 1.873, 1.805],
+[5.687, 5.096, 5.146],
+[3.179, 3.017, 2.994],
+[12.036, 11.416, 11.191],
+[0.403, 0.114, 0.129],
+[9.107, 1.949, 1.902],
+[4.205, 2.061, 2.035],
+[9.822, 4.721, 4.627],
+[23.501, 3.074, 2.504],
+[1.249, 0.586, 0.567],
+[0.648, 0.489, 0.494],
+[1.199, 0.599, 0.562],
+[3.706, 2.056, 1.885],
+[8.797, 3.413, 3.266],
+[3.787, 3.730, 3.541],
+[1.834, 1.373, 1.443],
+[4.264, 2.227, 2.081],
+[11.448, 10.761, 10.775],
+[11.334, 7.668, 7.630],
+[9.125, 7.593, 7.642],
+[3.179, 3.042, 3.070],
+[0.511, 0.311, 0.308],
+[0.155, 0.133, 0.116],
+[0.197, 0.113, 0.096],
+[0.729, 0.566, 0.530],
+[0.235, 0.028, 0.024],
+[0.094, 0.028, 0.019],
+[0.050, 0.040, 0.010]
+        ]
+    }
+]