diff --git a/.github/workflows/docs_release.yml b/.github/workflows/docs_release.yml
index aed691844da..e0fdb0c2f7b 100644
--- a/.github/workflows/docs_release.yml
+++ b/.github/workflows/docs_release.yml
@@ -13,7 +13,6 @@ concurrency:
       - master
     paths:
       - '.github/**'
-      - 'benchmark/**'
       - 'docker/docs/release/**'
       - 'docs/**'
       - 'utils/list-versions/version_date.tsv'
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 162c03a37d5..2acc1468328 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -151,8 +151,8 @@ jobs:
           # shellcheck disable=SC2046
           docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
-  SplitBuildSmokeTest:
-    needs: [BuilderDebSplitted]
+  SharedBuildSmokeTest:
+    needs: [BuilderDebShared]
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Set envs
@@ -171,7 +171,7 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           path: ${{ env.REPORTS_PATH }}
-      - name: Split build check
+      - name: Shared build check
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
@@ -598,7 +598,7 @@ jobs:
 ##########################################################################################
 ##################################### SPECIAL BUILDS #####################################
 ##########################################################################################
-  BuilderDebSplitted:
+  BuilderDebShared:
     needs: [DockerHubPush]
     runs-on: [self-hosted, builder]
     steps:
@@ -609,7 +609,7 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          BUILD_NAME=binary_splitted
+          BUILD_NAME=binary_shared
           EOF
       - name: Download changed images
         uses: actions/download-artifact@v2
@@ -1012,7 +1012,7 @@ jobs:
       # - BuilderBinGCC
       - BuilderBinPPC64
       - BuilderBinClangTidy
-      - BuilderDebSplitted
+      - BuilderDebShared
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Set envs
@@ -1126,6 +1126,84 @@ jobs:
           # shellcheck disable=SC2046
           docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseDatabaseReplicated0:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_database_replicated
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, DatabaseReplicated)
+          REPO_COPY=${{runner.temp}}/stateless_database_replicated/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=0
+          RUN_BY_HASH_TOTAL=2
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          # shellcheck disable=SC2046
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
+          sudo rm -fr "$TEMP_PATH"
+  FunctionalStatelessTestReleaseDatabaseReplicated1:
+    needs: [BuilderDebRelease]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          TEMP_PATH=${{runner.temp}}/stateless_database_replicated
+          REPORTS_PATH=${{runner.temp}}/reports_dir
+          CHECK_NAME=Stateless tests (release, DatabaseReplicated)
+          REPO_COPY=${{runner.temp}}/stateless_database_replicated/ClickHouse
+          KILL_TIMEOUT=10800
+          RUN_BY_HASH_NUM=1
+          RUN_BY_HASH_TOTAL=2
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{ env.REPORTS_PATH }}
+      - name: Clear repository
+        run: |
+          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Functional test
+        run: |
+          sudo rm -fr "$TEMP_PATH"
+          mkdir -p "$TEMP_PATH"
+          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
+          cd "$REPO_COPY/tests/ci"
+          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
+      - name: Cleanup
+        if: always()
+        run: |
+          # shellcheck disable=SC2046
+          docker kill $(docker ps -q) ||:
+          # shellcheck disable=SC2046
+          docker rm -f $(docker ps -a -q) ||:
+          sudo rm -fr "$TEMP_PATH"
   FunctionalStatelessTestReleaseS3:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, func-tester]
@@ -1706,43 +1784,6 @@ jobs:
           # shellcheck disable=SC2046
           docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
-  FunctionalStatefulTestReleaseDatabaseOrdinary:
-    needs: [BuilderDebRelease]
-    runs-on: [self-hosted, func-tester]
-    steps:
-      - name: Set envs
-        run: |
-          cat >> "$GITHUB_ENV" << 'EOF'
-          TEMP_PATH=${{runner.temp}}/stateful_release_database_ordinary
-          REPORTS_PATH=${{runner.temp}}/reports_dir
-          CHECK_NAME=Stateful tests (release, DatabaseOrdinary)
-          REPO_COPY=${{runner.temp}}/stateful_release_database_ordinary/ClickHouse
-          KILL_TIMEOUT=3600
-          EOF
-      - name: Download json reports
-        uses: actions/download-artifact@v2
-        with:
-          path: ${{ env.REPORTS_PATH }}
-      - name: Clear repository
-        run: |
-          sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Functional test
-        run: |
-          sudo rm -fr "$TEMP_PATH"
-          mkdir -p "$TEMP_PATH"
-          cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
-          cd "$REPO_COPY/tests/ci"
-          python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-      - name: Cleanup
-        if: always()
-        run: |
-          # shellcheck disable=SC2046
-          docker kill $(docker ps -q) ||:
-          # shellcheck disable=SC2046
-          docker rm -f $(docker ps -a -q) ||:
-          sudo rm -fr "$TEMP_PATH"
   FunctionalStatefulTestAarch64:
     needs: [BuilderDebAarch64]
     runs-on: [self-hosted, func-tester-aarch64]
@@ -3063,6 +3104,8 @@ jobs:
       - FunctionalStatelessTestDebug2
       - FunctionalStatelessTestRelease
       - FunctionalStatelessTestReleaseDatabaseOrdinary
+      - FunctionalStatelessTestReleaseDatabaseReplicated0
+      - FunctionalStatelessTestReleaseDatabaseReplicated1
       - FunctionalStatelessTestAarch64
       - FunctionalStatelessTestAsan0
       - FunctionalStatelessTestAsan1
@@ -3075,7 +3118,6 @@ jobs:
       - FunctionalStatelessTestUBsan
       - FunctionalStatefulTestDebug
       - FunctionalStatefulTestRelease
-      - FunctionalStatefulTestReleaseDatabaseOrdinary
       - FunctionalStatelessTestReleaseS3
       - FunctionalStatefulTestAarch64
       - FunctionalStatefulTestAsan
@@ -3111,7 +3153,7 @@ jobs:
       - UnitTestsMsan
       - UnitTestsUBsan
       - UnitTestsReleaseClang
-      - SplitBuildSmokeTest
+      - SharedBuildSmokeTest
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Clear repository
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 26726302beb..513df8487c4 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -216,8 +216,8 @@ jobs:
           # shellcheck disable=SC2046
           docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr "$TEMP_PATH"
-  SplitBuildSmokeTest:
-    needs: [BuilderDebSplitted]
+  SharedBuildSmokeTest:
+    needs: [BuilderDebShared]
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Set envs
@@ -236,7 +236,7 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           path: ${{ env.REPORTS_PATH }}
-      - name: Split build check
+      - name: Shared build check
         run: |
           sudo rm -fr "$TEMP_PATH"
           mkdir -p "$TEMP_PATH"
@@ -620,7 +620,7 @@ jobs:
 ##########################################################################################
 ##################################### SPECIAL BUILDS #####################################
 ##########################################################################################
-  BuilderDebSplitted:
+  BuilderDebShared:
     needs: [DockerHubPush, FastTest, StyleCheck]
     runs-on: [self-hosted, builder]
     steps:
@@ -631,7 +631,7 @@ jobs:
           IMAGES_PATH=${{runner.temp}}/images_path
           REPO_COPY=${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH=${{runner.temp}}/../ccaches
-          BUILD_NAME=binary_splitted
+          BUILD_NAME=binary_shared
           EOF
       - name: Download changed images
         uses: actions/download-artifact@v2
@@ -1024,7 +1024,7 @@ jobs:
       # - BuilderBinGCC
       - BuilderBinPPC64
       - BuilderBinClangTidy
-      - BuilderDebSplitted
+      - BuilderDebShared
     runs-on: [self-hosted, style-checker]
     if: ${{ success() || failure() }}
     steps:
@@ -3348,6 +3348,10 @@ jobs:
 ###################################### JEPSEN TESTS #########################################
 #############################################################################################
   Jepsen:
+    # This is special test NOT INCLUDED in FinishCheck
+    # When it's skipped, all dependent tasks will be skipped too.
+    # DO NOT add it there
+    if: contains(github.event.pull_request.labels.*.name, 'jepsen-test')
     needs: [BuilderBinRelease]
     uses: ./.github/workflows/jepsen.yml
 
@@ -3416,10 +3420,9 @@ jobs:
       - UnitTestsMsan
       - UnitTestsUBsan
       - UnitTestsReleaseClang
-      - SplitBuildSmokeTest
+      - SharedBuildSmokeTest
       - CompatibilityCheck
       - IntegrationTestsFlakyCheck
-      - Jepsen
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Clear repository
diff --git a/.github/workflows/tags_stable.yml b/.github/workflows/tags_stable.yml
index 0e0eefb4a35..9711f7688cb 100644
--- a/.github/workflows/tags_stable.yml
+++ b/.github/workflows/tags_stable.yml
@@ -13,13 +13,24 @@ on: # yamllint disable-line rule:truthy
     - 'v*-prestable'
     - 'v*-stable'
     - 'v*-lts'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Test tag'
+        required: true
+        type: string
 
 
 jobs:
   UpdateVersions:
     runs-on: [self-hosted, style-checker]
     steps:
+    - name: Set test tag
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        echo "GITHUB_TAG=${{ github.event.inputs.tag }}" >> "$GITHUB_ENV"
     - name: Get tag name
+      if: github.event_name != 'workflow_dispatch'
       run: |
         echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"
     - name: Check out repository code
@@ -29,25 +40,28 @@ jobs:
         fetch-depth: 0
     - name: Generate versions
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
       run: |
         ./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
         GID=$(id -g "${UID}")
         docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 \
             --volume="${GITHUB_WORKSPACE}:/ClickHouse" clickhouse/style-test \
-                /ClickHouse/utils/changelog/changelog.py -vv --gh-user-or-token="$GITHUB_TOKEN" \
-                --output="/ClickHouse/docs/changelogs/${GITHUB_TAG}.md" --jobs=5 "${GITHUB_TAG}"
+                /ClickHouse/utils/changelog/changelog.py -v --debug-helpers \
+                --gh-user-or-token="$GITHUB_TOKEN" --jobs=5 \
+                --output="/ClickHouse/docs/changelogs/${GITHUB_TAG}.md" "${GITHUB_TAG}"
         git add "./docs/changelogs/${GITHUB_TAG}.md"
         git diff HEAD
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v3
       with:
         author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
+        token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
         committer: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
         commit-message: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
         branch: auto/${{ env.GITHUB_TAG }}
         delete-branch: true
         title: Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
+        labels: do not test
         body: |
           Update version_date.tsv and changelogs after ${{ env.GITHUB_TAG }}
 
diff --git a/.gitmodules b/.gitmodules
index 3f7b1aaffca..f372a309cad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -201,7 +201,7 @@
 [submodule "contrib/boringssl"]
 	path = contrib/boringssl
 	url = https://github.com/ClickHouse/boringssl.git
-	branch = MergeWithUpstream
+	branch = unknown_branch_from_artur
 [submodule "contrib/NuRaft"]
 	path = contrib/NuRaft
 	url = https://github.com/ClickHouse/NuRaft.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7e2684380c..7a8abd0e534 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### Table of Contents
+**[ClickHouse release v22.8, 2022-08-18](#228)**<br/>
 **[ClickHouse release v22.7, 2022-07-21](#227)**<br/>
 **[ClickHouse release v22.6, 2022-06-16](#226)**<br/>
 **[ClickHouse release v22.5, 2022-05-19](#225)**<br/>
@@ -8,6 +9,148 @@
 **[ClickHouse release v22.1, 2022-01-18](#221)**<br/>
 **[Changelog for 2021](https://clickhouse.com/docs/en/whats-new/changelog/2021/)**<br/>
 
+
+### <a id="228"></a> ClickHouse release 22.8, 2022-08-18
+
+#### Backward Incompatible Change
+* Extended range of `Date32` and `DateTime64` to support dates from the year 1900 to 2299. In previous versions, the supported interval was only from the year 1925 to 2283. The implementation is using the proleptic Gregorian calendar (which is conformant with [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601):2004 (clause 3.2.1 The Gregorian calendar)) instead of accounting for historical transitions from the Julian to the Gregorian calendar. This change affects implementation-specific behavior for out-of-range arguments. E.g. if in previous versions the value of `1899-01-01` was clamped to `1925-01-01`, in the new version it will be clamped to `1900-01-01`. It changes the behavior of rounding with `toStartOfInterval` if you pass `INTERVAL 3 QUARTER` up to one quarter because the intervals are counted from an implementation-specific point of time. Closes [#28216](https://github.com/ClickHouse/ClickHouse/issues/28216), improves [#38393](https://github.com/ClickHouse/ClickHouse/issues/38393). [#39425](https://github.com/ClickHouse/ClickHouse/pull/39425) ([Roman Vasin](https://github.com/rvasin)).
+* Now, all relevant dictionary sources respect `remote_url_allow_hosts` setting. It was already done for HTTP, Cassandra, Redis. Added ClickHouse, MongoDB, MySQL, PostgreSQL. Host is checked only for dictionaries created from DDL. [#39184](https://github.com/ClickHouse/ClickHouse/pull/39184) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Prebuilt ClickHouse x86 binaries now require support for AVX instructions, i.e. a CPU not older than Intel Sandy Bridge / AMD Bulldozer, both released in 2011. [#39000](https://github.com/ClickHouse/ClickHouse/pull/39000) ([Robert Schulze](https://github.com/rschu1ze)).
+* Make the remote filesystem cache composable, allow not to evict certain files (regarding idx, mrk, ..), delete old cache version. Now it is possible to configure cache over Azure blob storage disk, over Local disk, over StaticWeb disk, etc. This PR is marked backward incompatible because cache configuration changes and in order for cache to work need to update the config file. Old cache will still be used with new configuration. The server will startup fine with the old cache configuration. Closes https://github.com/ClickHouse/ClickHouse/issues/36140. Closes https://github.com/ClickHouse/ClickHouse/issues/37889. ([Kseniia Sumarokova](https://github.com/kssenii)). [#36171](https://github.com/ClickHouse/ClickHouse/pull/36171))
+
+#### New Feature
+* Support SQL standard DELETE FROM syntax on merge tree tables and lightweight delete implementation for merge tree families. [#37893](https://github.com/ClickHouse/ClickHouse/pull/37893) ([Jianmei Zhang](https://github.com/zhangjmruc)) ([Alexander Gololobov](https://github.com/davenger)). Note: this new feature does not make ClickHouse an HTAP DBMS.
+* Query parameters can be set in interactive mode as `SET param_abc = 'def'` and transferred via the native protocol as settings. [#39906](https://github.com/ClickHouse/ClickHouse/pull/39906) ([Nikita Taranov](https://github.com/nickitat)).
+* Quota key can be set in the native protocol ([Yakov Olkhovsky](https://github.com/ClickHouse/ClickHouse/pull/39874)).
+* Added a setting `exact_rows_before_limit` (0/1). When enabled, ClickHouse will provide exact value for `rows_before_limit_at_least` statistic, but with the cost that the data before limit will have to be read completely. This closes [#6613](https://github.com/ClickHouse/ClickHouse/issues/6613). [#25333](https://github.com/ClickHouse/ClickHouse/pull/25333) ([kevin wan](https://github.com/MaxWk)).
+* Added support for parallel distributed insert select with `s3Cluster` table function into tables with `Distributed` and `Replicated` engine [#34670](https://github.com/ClickHouse/ClickHouse/issues/34670). [#39107](https://github.com/ClickHouse/ClickHouse/pull/39107) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add new settings to control schema inference from text formats: - `input_format_try_infer_dates` - try infer dates from strings. - `input_format_try_infer_datetimes` - try infer datetimes from strings. - `input_format_try_infer_integers` - try infer `Int64` instead of `Float64`. - `input_format_json_try_infer_numbers_from_strings` - try infer numbers from json strings in JSON formats. [#39186](https://github.com/ClickHouse/ClickHouse/pull/39186) ([Kruglov Pavel](https://github.com/Avogar)).
+* An option to provide JSON formatted log output. The purpose is to allow easier ingestion and query in log analysis tools. [#39277](https://github.com/ClickHouse/ClickHouse/pull/39277) ([Mallik Hassan](https://github.com/SadiHassan)).
+* Add function `nowInBlock` which allows getting the current time during long-running and continuous queries. Closes [#39522](https://github.com/ClickHouse/ClickHouse/issues/39522). Notes: there are no functions `now64InBlock` neither `todayInBlock`. [#39533](https://github.com/ClickHouse/ClickHouse/pull/39533) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add ability to specify settings for an `executable()` table function. [#39681](https://github.com/ClickHouse/ClickHouse/pull/39681) ([Constantine Peresypkin](https://github.com/pkit)).
+* Implemented automatic conversion of database engine from `Ordinary` to `Atomic`. Create empty `convert_ordinary_to_atomic` file in `flags` directory and all `Ordinary` databases will be converted automatically on next server start. Resolves [#39546](https://github.com/ClickHouse/ClickHouse/issues/39546). [#39933](https://github.com/ClickHouse/ClickHouse/pull/39933) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Support `SELECT ... INTO OUTFILE '...' AND STDOUT`. [#37490](https://github.com/ClickHouse/ClickHouse/issues/37490). [#39054](https://github.com/ClickHouse/ClickHouse/pull/39054) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Add formats `PrettyMonoBlock`, `PrettyNoEscapesMonoBlock`, `PrettyCompactNoEscapes`, `PrettyCompactNoEscapesMonoBlock`, `PrettySpaceNoEscapes`, `PrettySpaceMonoBlock`, `PrettySpaceNoEscapesMonoBlock`. [#39646](https://github.com/ClickHouse/ClickHouse/pull/39646) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add new setting schema_inference_hints that allows to specify structure hints in schema inference for specific columns. Closes [#39569](https://github.com/ClickHouse/ClickHouse/issues/39569). [#40068](https://github.com/ClickHouse/ClickHouse/pull/40068) ([Kruglov Pavel](https://github.com/Avogar)).
+
+
+#### Performance Improvement
+* Improved memory usage during memory efficient merging of aggregation results. [#39429](https://github.com/ClickHouse/ClickHouse/pull/39429) ([Nikita Taranov](https://github.com/nickitat)).
+* Added concurrency control logic to limit total number of concurrent threads created by queries. [#37558](https://github.com/ClickHouse/ClickHouse/pull/37558) ([Sergei Trifonov](https://github.com/serxa)). Add `concurrent_threads_soft_limit parameter` to increase performance in case of high QPS by means of limiting total number of threads for all queries. [#37285](https://github.com/ClickHouse/ClickHouse/pull/37285) ([Roman Vasin](https://github.com/rvasin)).
+* Add `SLRU` cache policy for uncompressed cache and marks cache. ([Kseniia Sumarokova](https://github.com/kssenii)). [#34651](https://github.com/ClickHouse/ClickHouse/pull/34651) ([alexX512](https://github.com/alexX512)). Decoupling local cache function and cache algorithm [#38048](https://github.com/ClickHouse/ClickHouse/pull/38048) ([Han Shukai](https://github.com/KinderRiven)). 
+* Intel® In-Memory Analytics Accelerator (Intel® IAA) is a hardware accelerator available in the upcoming generation of Intel® Xeon® Scalable processors ("Sapphire Rapids"). Its goal is to speed up common operations in analytics like data (de)compression and filtering. ClickHouse gained the new "DeflateQpl" compression codec which utilizes the Intel® IAA offloading technology to provide a high-performance DEFLATE implementation. The codec uses the [Intel® Query Processing Library (QPL)](https://github.com/intel/qpl) which abstracts access to the hardware accelerator, respectively to a software fallback in case the hardware accelerator is not available. DEFLATE provides in general higher compression rates than ClickHouse's LZ4 default codec, and as a result, offers less disk I/O and lower main memory consumption. [#36654](https://github.com/ClickHouse/ClickHouse/pull/36654) ([jasperzhu](https://github.com/jinjunzh)). [#39494](https://github.com/ClickHouse/ClickHouse/pull/39494) ([Robert Schulze](https://github.com/rschu1ze)).
+* `DISTINCT` in order with `ORDER BY`: Deduce way to sort based on input stream sort description. Skip sorting if input stream is already sorted. [#38719](https://github.com/ClickHouse/ClickHouse/pull/38719) ([Igor Nikonov](https://github.com/devcrafter)). Improve memory usage (significantly) and query execution time + use `DistinctSortedChunkTransform` for final distinct when `DISTINCT` columns match `ORDER BY` columns, but rename to `DistinctSortedStreamTransform` in `EXPLAIN PIPELINE` → this improves memory usage significantly + remove unnecessary allocations in hot loop in `DistinctSortedChunkTransform`. [#39432](https://github.com/ClickHouse/ClickHouse/pull/39432) ([Igor Nikonov](https://github.com/devcrafter)). Use `DistinctSortedTransform` only when sort description is applicable to DISTINCT columns, otherwise fall back to ordinary DISTINCT implementation + it allows making less checks during `DistinctSortedTransform` execution. [#39528](https://github.com/ClickHouse/ClickHouse/pull/39528) ([Igor Nikonov](https://github.com/devcrafter)). Fix: `DistinctSortedTransform` didn't take advantage of sorting. It never cleared HashSet since clearing_columns were detected incorrectly (always empty). So, it basically worked as ordinary `DISTINCT` (`DistinctTransform`). The fix reduces memory usage significantly. [#39538](https://github.com/ClickHouse/ClickHouse/pull/39538) ([Igor Nikonov](https://github.com/devcrafter)).
+* Use local node as first priority to get structure of remote table when executing `cluster` and similar table functions. [#39440](https://github.com/ClickHouse/ClickHouse/pull/39440) ([Mingliang Pan](https://github.com/liangliangpan)).
+* Optimize filtering by numeric columns with AVX512VBMI2 compress store. [#39633](https://github.com/ClickHouse/ClickHouse/pull/39633) ([Guo Wangyang](https://github.com/guowangy)). For systems with AVX512 VBMI2, this PR improves performance by ca. 6% for SSB benchmark queries queries 3.1, 3.2 and 3.3 (SF=100). Tested on Intel Icelake Xeon 8380 * 2 socket. [#40033](https://github.com/ClickHouse/ClickHouse/pull/40033) ([Robert Schulze](https://github.com/rschu1ze)).
+* Optimize index analysis with functional expressions in multi-thread scenario. [#39812](https://github.com/ClickHouse/ClickHouse/pull/39812) ([Guo Wangyang](https://github.com/guowangy)).
+* Optimizations for complex queries: Don't visit the AST for UDFs if none are registered. [#40069](https://github.com/ClickHouse/ClickHouse/pull/40069) ([Raúl Marín](https://github.com/Algunenano)). Optimize CurrentMemoryTracker alloc and free. [#40078](https://github.com/ClickHouse/ClickHouse/pull/40078) ([Raúl Marín](https://github.com/Algunenano)).
+* Improved Base58 encoding/decoding. [#39292](https://github.com/ClickHouse/ClickHouse/pull/39292) ([Andrey Zvonov](https://github.com/zvonand)).
+* Improve bytes to bits mask transform for SSE/AVX/AVX512. [#39586](https://github.com/ClickHouse/ClickHouse/pull/39586) ([Guo Wangyang](https://github.com/guowangy)).
+
+#### Improvement
+* Normalize `AggregateFunction` types and state representations because optimizations like [#35788](https://github.com/ClickHouse/ClickHouse/pull/35788) will treat `count(not null columns)` as `count()`, which might confuses distributed interpreters with the following error : `Conversion from AggregateFunction(count) to AggregateFunction(count, Int64) is not supported`. [#39420](https://github.com/ClickHouse/ClickHouse/pull/39420) ([Amos Bird](https://github.com/amosbird)). The functions with identical states can be used in materialized views interchangeably.
+* Rework and simplify the `system.backups` table, remove the `internal` column, allow user to set the ID of operation, add columns `num_files`, `uncompressed_size`, `compressed_size`, `start_time`, `end_time`. [#39503](https://github.com/ClickHouse/ClickHouse/pull/39503) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Improved structure of DDL query result table for `Replicated` database (separate columns with shard and replica name, more clear status) - `CREATE TABLE ... ON CLUSTER` queries can be normalized on initiator first if `distributed_ddl_entry_format_version` is set to 3 (default value). It means that `ON CLUSTER` queries may not work if initiator does not belong to the cluster that specified in query. Fixes [#37318](https://github.com/ClickHouse/ClickHouse/issues/37318), [#39500](https://github.com/ClickHouse/ClickHouse/issues/39500) - Ignore `ON CLUSTER` clause if database is `Replicated` and cluster name equals to database name. Related to [#35570](https://github.com/ClickHouse/ClickHouse/issues/35570) - Miscellaneous minor fixes for `Replicated` database engine - Check metadata consistency when starting up `Replicated` database, start replica recovery in case of mismatch of local metadata and metadata in Keeper. Resolves [#24880](https://github.com/ClickHouse/ClickHouse/issues/24880). [#37198](https://github.com/ClickHouse/ClickHouse/pull/37198) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add result_rows and result_bytes to progress reports (`X-ClickHouse-Summary`). [#39567](https://github.com/ClickHouse/ClickHouse/pull/39567) ([Raúl Marín](https://github.com/Algunenano)).
+* Improve primary key analysis for MergeTree. [#25563](https://github.com/ClickHouse/ClickHouse/pull/25563) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* `timeSlots` now works with DateTime64; subsecond duration and slot size available when working with DateTime64. [#37951](https://github.com/ClickHouse/ClickHouse/pull/37951) ([Andrey Zvonov](https://github.com/zvonand)).
+* Added support of `LEFT SEMI` and `LEFT ANTI` direct join with `EmbeddedRocksDB` tables. [#38956](https://github.com/ClickHouse/ClickHouse/pull/38956) ([Vladimir C](https://github.com/vdimir)).
+* Add profile events for fsync operations. [#39179](https://github.com/ClickHouse/ClickHouse/pull/39179) ([Azat Khuzhin](https://github.com/azat)).
+* Add the second argument to the ordinary function `file(path[, default])`, which function returns in the case when a file does not exists. [#39218](https://github.com/ClickHouse/ClickHouse/pull/39218) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Some small fixes for reading via http, allow to retry partial content in case if 200 OK. [#39244](https://github.com/ClickHouse/ClickHouse/pull/39244) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support queries `CREATE TEMPORARY TABLE ... (<list of columns>) AS ...`. [#39462](https://github.com/ClickHouse/ClickHouse/pull/39462) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support of `!`/`*` (exclamation/asterisk) in custom TLDs (`cutToFirstSignificantSubdomainCustom()`/`cutToFirstSignificantSubdomainCustomWithWWW()`/`firstSignificantSubdomainCustom()`). [#39496](https://github.com/ClickHouse/ClickHouse/pull/39496) ([Azat Khuzhin](https://github.com/azat)).
+* Add support for TLS connections to NATS. Implements [#39525](https://github.com/ClickHouse/ClickHouse/issues/39525). [#39527](https://github.com/ClickHouse/ClickHouse/pull/39527) ([Constantine Peresypkin](https://github.com/pkit)).
+* `clickhouse-obfuscator` (a tool for database obfuscation for testing and load generation) now has the new `--save` and `--load` parameters to work with pre-trained models. This closes [#39534](https://github.com/ClickHouse/ClickHouse/issues/39534). [#39541](https://github.com/ClickHouse/ClickHouse/pull/39541) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix incorrect behavior of log rotation during restart. [#39558](https://github.com/ClickHouse/ClickHouse/pull/39558) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix building aggregate projections when external aggregation is on. Mark as improvement because the case is rare and there exists easy workaround to fix it via changing settings. This fixes [#39667](https://github.com/ClickHouse/ClickHouse/issues/39667) . [#39671](https://github.com/ClickHouse/ClickHouse/pull/39671) ([Amos Bird](https://github.com/amosbird)).
+* Allow to execute hash functions with arguments of type `Map`. [#39685](https://github.com/ClickHouse/ClickHouse/pull/39685) ([Anton Popov](https://github.com/CurtizJ)).
+* Add a configuration parameter to hide addresses in stack traces. It may improve security a little but generally, it is harmful and should not be used. [#39690](https://github.com/ClickHouse/ClickHouse/pull/39690) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Change the prefix size of AggregateFunctionDistinct to make sure nested function data memory segment is aligned. [#39696](https://github.com/ClickHouse/ClickHouse/pull/39696) ([Pxl](https://github.com/BiteTheDDDDt)).
+* Properly escape credentials passed to the `clickhouse-diagnostic` tool. [#39707](https://github.com/ClickHouse/ClickHouse/pull/39707) ([Dale McDiarmid](https://github.com/gingerwizard)).
+* ClickHouse Keeper improvement: create a snapshot on exit. It can be controlled with the config `keeper_server.create_snapshot_on_exit`, `true` by default. [#39755](https://github.com/ClickHouse/ClickHouse/pull/39755) ([Antonio Andelic](https://github.com/antonio2368)).
+* Support primary key analysis for `row_policy_filter` and `additional_filter`. It also helps fix issues like [#37454](https://github.com/ClickHouse/ClickHouse/issues/37454) . [#39826](https://github.com/ClickHouse/ClickHouse/pull/39826) ([Amos Bird](https://github.com/amosbird)).
+* Fix two usability issues in Play UI: - it was non-pixel-perfect on iPad due to parasitic border radius and margins; - the progress indication did not display after the first query. This closes [#39957](https://github.com/ClickHouse/ClickHouse/issues/39957). This closes [#39960](https://github.com/ClickHouse/ClickHouse/issues/39960). [#39961](https://github.com/ClickHouse/ClickHouse/pull/39961) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Play UI: add row numbers; add cell selection on click; add hysteresis for table cells. [#39962](https://github.com/ClickHouse/ClickHouse/pull/39962) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Play UI: recognize tab key in textarea, but at the same time don't mess up with tab navigation. [#40053](https://github.com/ClickHouse/ClickHouse/pull/40053) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The client will show server-side elapsed time. This is important for the performance comparison of ClickHouse services in remote datacenters. This closes [#38070](https://github.com/ClickHouse/ClickHouse/issues/38070). See also [this](https://github.com/ClickHouse/ClickBench/blob/main/hardware/benchmark-cloud.sh#L37) for motivation. [#39968](https://github.com/ClickHouse/ClickHouse/pull/39968) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Adds `parseDateTime64BestEffortUS`, `parseDateTime64BestEffortUSOrNull`, `parseDateTime64BestEffortUSOrZero` functions, closing [#37492](https://github.com/ClickHouse/ClickHouse/issues/37492). [#40015](https://github.com/ClickHouse/ClickHouse/pull/40015) ([Tanya Bragin](https://github.com/tbragin)).
+* Extend the `system.processors_profile_log` with more information such as input rows. [#40121](https://github.com/ClickHouse/ClickHouse/pull/40121) ([Amos Bird](https://github.com/amosbird)).
+* Display server-side time in `clickhouse-benchmark` by default if it is available (since ClickHouse version 22.8). This is needed to correctly compare the performance of clouds. This behavior can be changed with the new `--client-side-time` command line option. Change the `--randomize` command line option from `--randomize 1` to the form without argument. [#40193](https://github.com/ClickHouse/ClickHouse/pull/40193) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add counters (ProfileEvents) for cases when query complexity limitation has been set and has reached (a separate counter for `overflow_mode` = `break` and `throw`). For example, if you have set up `max_rows_to_read` with `read_overflow_mode = 'break'`, looking at the value of `OverflowBreak` counter will allow distinguishing incomplete results. [#40205](https://github.com/ClickHouse/ClickHouse/pull/40205) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix memory accounting in case of "Memory limit exceeded" errors (previously [peak] memory usage was takes failed allocations into account). [#40249](https://github.com/ClickHouse/ClickHouse/pull/40249) ([Azat Khuzhin](https://github.com/azat)).
+* Add metrics for filesystem cache: `FilesystemCacheSize` and `FilesystemCacheElements`. [#40260](https://github.com/ClickHouse/ClickHouse/pull/40260) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support hadoop secure RPC transfer (hadoop.rpc.protection=privacy and hadoop.rpc.protection=integrity). [#39411](https://github.com/ClickHouse/ClickHouse/pull/39411) ([michael1589](https://github.com/michael1589)).
+* Avoid continuously growing memory consumption of pattern cache when using functions multi(Fuzzy)Match(Any|AllIndices|AnyIndex)(). [#40264](https://github.com/ClickHouse/ClickHouse/pull/40264) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add cache for schema inference for file/s3/hdfs/url table functions. Now, schema inference will be performed only on the first query to the file, all subsequent queries to the same file will use the schema from cache if data wasn't changed. Add system table system.schema_inference_cache with all current schemas in cache and system queries SYSTEM DROP SCHEMA CACHE [FOR FILE/S3/HDFS/URL] to drop schemas from cache. [#38286](https://github.com/ClickHouse/ClickHouse/pull/38286) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for LARGE_BINARY/LARGE_STRING with Arrow (Closes [#32401](https://github.com/ClickHouse/ClickHouse/issues/32401)). [#40293](https://github.com/ClickHouse/ClickHouse/pull/40293) ([Josh Taylor](https://github.com/joshuataylor)).
+
+#### Build/Testing/Packaging Improvement
+* [ClickFiddle](https://fiddle.clickhouse.com/): A new tool for testing ClickHouse versions in read/write mode (**Igor Baliuk**).
+* ClickHouse binary is made self-extracting [#35775](https://github.com/ClickHouse/ClickHouse/pull/35775) ([Yakov Olkhovskiy, Arthur Filatenkov](https://github.com/yakov-olkhovskiy)).
+* Update tzdata to 2022b to support the new timezone changes. See https://github.com/google/cctz/pull/226. Chile's 2022 DST start is delayed from September 4 to September 11. Iran plans to stop observing DST permanently, after it falls back on 2022-09-21. There are corrections of the historical time zone of Asia/Tehran in the year 1977: Iran adopted standard time in 1935, not 1946. In 1977 it observed DST from 03-21 23:00 to 10-20 24:00; its 1978 transitions were on 03-24 and 08-05, not 03-20 and 10-20; and its spring 1979 transition was on 05-27, not 03-21 (https://data.iana.org/time-zones/tzdb/NEWS). ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Ensure LSan is effective. [#39430](https://github.com/ClickHouse/ClickHouse/pull/39430) ([Azat Khuzhin](https://github.com/azat)).
+* TSAN has issues with clang-14 (https://github.com/google/sanitizers/issues/1552, https://github.com/google/sanitizers/issues/1540), so here we build the TSAN binaries with clang-15. [#39450](https://github.com/ClickHouse/ClickHouse/pull/39450) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Remove the option to build ClickHouse tools as separate executable programs. This fixes [#37847](https://github.com/ClickHouse/ClickHouse/issues/37847). [#39520](https://github.com/ClickHouse/ClickHouse/pull/39520) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Small preparations for build on s390x (which is big-endian). [#39627](https://github.com/ClickHouse/ClickHouse/pull/39627) ([Harry Lee](https://github.com/HarryLeeIBM)). [#39656](https://github.com/ClickHouse/ClickHouse/pull/39656) ([Harry Lee](https://github.com/HarryLeeIBM)). Fixed Endian issue in BitHelpers for s390x. [#39656](https://github.com/ClickHouse/ClickHouse/pull/39656) ([Harry Lee](https://github.com/HarryLeeIBM)). Implement a piece of code related to SipHash for s390x architecture (which is not supported by ClickHouse). [#39732](https://github.com/ClickHouse/ClickHouse/pull/39732) ([Harry Lee](https://github.com/HarryLeeIBM)). Fixed an Endian issue in Coordination snapshot code for s390x architecture (which is not supported by ClickHouse). [#39931](https://github.com/ClickHouse/ClickHouse/pull/39931) ([Harry Lee](https://github.com/HarryLeeIBM)). Fixed Endian issues in Codec code for s390x architecture (which is not supported by ClickHouse). [#40008](https://github.com/ClickHouse/ClickHouse/pull/40008) ([Harry Lee](https://github.com/HarryLeeIBM)). Fixed Endian issues in reading/writing BigEndian binary data in ReadHelpers and WriteHelpers code for s390x architecture (which is not supported by ClickHouse). [#40179](https://github.com/ClickHouse/ClickHouse/pull/40179) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Support build with `clang-16` (trunk). This closes [#39949](https://github.com/ClickHouse/ClickHouse/issues/39949). [#40181](https://github.com/ClickHouse/ClickHouse/pull/40181) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Prepare RISC-V 64 build to run in CI. This is for [#40141](https://github.com/ClickHouse/ClickHouse/issues/40141). [#40197](https://github.com/ClickHouse/ClickHouse/pull/40197) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Simplified function registration macro interface (`FUNCTION_REGISTER*`) to eliminate the step to add and call an extern function in the registerFunctions.cpp, it also makes incremental builds of a new function faster. [#38615](https://github.com/ClickHouse/ClickHouse/pull/38615) ([Li Yin](https://github.com/liyinsg)).
+* Docker: Now entrypoint.sh in docker image creates and executes chown for all folders it found in config for multidisk setup [#17717](https://github.com/ClickHouse/ClickHouse/issues/17717). [#39121](https://github.com/ClickHouse/ClickHouse/pull/39121) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### Bug Fix
+* Fix possible segfault in `CapnProto` input format. This bug was found and send through ClickHouse bug-bounty [program](https://github.com/ClickHouse/ClickHouse/issues/38986) by *kiojj*. [#40241](https://github.com/ClickHouse/ClickHouse/pull/40241) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix a very rare case of incorrect behavior of array subscript operator. This closes [#28720](https://github.com/ClickHouse/ClickHouse/issues/28720). [#40185](https://github.com/ClickHouse/ClickHouse/pull/40185) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix insufficient argument check for encryption functions (found by query fuzzer). This closes [#39987](https://github.com/ClickHouse/ClickHouse/issues/39987). [#40194](https://github.com/ClickHouse/ClickHouse/pull/40194) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix the case when the order of columns can be incorrect if the `IN` operator is used with a table with `ENGINE = Set` containing multiple columns. This fixes [#13014](https://github.com/ClickHouse/ClickHouse/issues/13014). [#40225](https://github.com/ClickHouse/ClickHouse/pull/40225) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix duplicate columns in join plan. Finally, solve [#26809](https://github.com/ClickHouse/ClickHouse/issues/26809). [#40009](https://github.com/ClickHouse/ClickHouse/pull/40009) ([Vladimir C](https://github.com/vdimir)).
+* Fixed query hanging for SELECT with ORDER BY WITH FILL with different date/time types. [#37849](https://github.com/ClickHouse/ClickHouse/pull/37849) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix ORDER BY that matches projections ORDER BY (before it simply returns unsorted result). [#38725](https://github.com/ClickHouse/ClickHouse/pull/38725) ([Azat Khuzhin](https://github.com/azat)).
+* Do not optimise functions in GROUP BY statements if they shadow one of the table columns or expressions. Fixes [#37032](https://github.com/ClickHouse/ClickHouse/issues/37032). [#39103](https://github.com/ClickHouse/ClickHouse/pull/39103) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Fix wrong table name in logs after RENAME TABLE. This fixes [#38018](https://github.com/ClickHouse/ClickHouse/issues/38018). [#39227](https://github.com/ClickHouse/ClickHouse/pull/39227) ([Amos Bird](https://github.com/amosbird)).
+* Fix positional arguments in case of columns pruning when optimising the query. Closes [#38433](https://github.com/ClickHouse/ClickHouse/issues/38433). [#39293](https://github.com/ClickHouse/ClickHouse/pull/39293) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug in schema inference in case of empty messages in Protobuf/CapnProto formats that allowed to create column with empty `Tuple` type. Closes [#39051](https://github.com/ClickHouse/ClickHouse/issues/39051) Add 2 new settings `input_format_{protobuf/capnproto}_skip_fields_with_unsupported_types_in_schema_inference` that allow to skip fields with unsupported types while schema inference for Protobuf and CapnProto formats. [#39357](https://github.com/ClickHouse/ClickHouse/pull/39357) ([Kruglov Pavel](https://github.com/Avogar)).
+* (Window View is an experimental feature) Fix segmentation fault on `CREATE WINDOW VIEW .. ON CLUSTER ... INNER`. Closes [#39363](https://github.com/ClickHouse/ClickHouse/issues/39363). [#39384](https://github.com/ClickHouse/ClickHouse/pull/39384) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix WriteBuffer finalize when cancelling insert into function (in previous versions it may leat to std::terminate). [#39458](https://github.com/ClickHouse/ClickHouse/pull/39458) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix storing of columns of type `Object` in sparse serialization. [#39464](https://github.com/ClickHouse/ClickHouse/pull/39464) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible "Not found column in block" exception when using projections. This closes [#39469](https://github.com/ClickHouse/ClickHouse/issues/39469). [#39470](https://github.com/ClickHouse/ClickHouse/pull/39470) ([小路](https://github.com/nicelulu)).
+* Fix exception on race between DROP and INSERT with materialized views. [#39477](https://github.com/ClickHouse/ClickHouse/pull/39477) ([Azat Khuzhin](https://github.com/azat)).
+* A bug in Apache Avro library: fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix rare bug in asynchronous reading (with setting `local_filesystem_read_method='pread_threadpool'`) with enabled `O_DIRECT` (enabled by setting `min_bytes_to_use_direct_io`). [#39506](https://github.com/ClickHouse/ClickHouse/pull/39506) ([Anton Popov](https://github.com/CurtizJ)).
+* (only on FreeBSD) Fixes "Code: 49. DB::Exception: FunctionFactory: the function name '' is not unique. (LOGICAL_ERROR)" observed on FreeBSD when starting clickhouse. [#39551](https://github.com/ClickHouse/ClickHouse/pull/39551) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix bug with the recently introduced "maxsplit" argument for `splitByChar`, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Fix bug in ASOF JOIN with `enable_optimize_predicate_expression`, close [#37813](https://github.com/ClickHouse/ClickHouse/issues/37813). [#39556](https://github.com/ClickHouse/ClickHouse/pull/39556) ([Vladimir C](https://github.com/vdimir)).
+* Fixed `CREATE/DROP INDEX` query with `ON CLUSTER` or `Replicated` database and `ReplicatedMergeTree`. It used to be executed on all replicas (causing error or DDL queue stuck). Fixes [#39511](https://github.com/ClickHouse/ClickHouse/issues/39511). [#39565](https://github.com/ClickHouse/ClickHouse/pull/39565) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix "column not found" error for push down with join, close [#39505](https://github.com/ClickHouse/ClickHouse/issues/39505). [#39575](https://github.com/ClickHouse/ClickHouse/pull/39575) ([Vladimir C](https://github.com/vdimir)).
+* Fix the wrong `REGEXP_REPLACE` alias. This fixes https://github.com/ClickHouse/ClickBench/issues/9. [#39592](https://github.com/ClickHouse/ClickHouse/pull/39592) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fixed point of origin for exponential decay window functions to the last value in window. Previously, decay was calculated by formula `exp((t - curr_row_t) / decay_length)`, which is incorrect when right boundary of window is not `CURRENT ROW`. It was changed to: `exp((t - last_row_t) / decay_length)`. There is no change in results for windows with `ROWS BETWEEN (smth) AND CURRENT ROW`. [#39593](https://github.com/ClickHouse/ClickHouse/pull/39593) ([Vladimir Chebotaryov](https://github.com/quickhouse)).
+* Fix Decimal division overflow, which can be detected based on operands scale. [#39600](https://github.com/ClickHouse/ClickHouse/pull/39600) ([Andrey Zvonov](https://github.com/zvonand)).
+* Fix settings `output_format_arrow_string_as_string` and `output_format_arrow_low_cardinality_as_dictionary` work in combination. Closes [#39624](https://github.com/ClickHouse/ClickHouse/issues/39624). [#39647](https://github.com/ClickHouse/ClickHouse/pull/39647) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed a bug in default database resolution in distributed table reads. [#39674](https://github.com/ClickHouse/ClickHouse/pull/39674) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* (Only with the obsolete Ordinary databases) Select might read data of dropped table if cache for mmap IO is used and database engine is Ordinary and new tables was created with the same name as dropped one had. It's fixed. [#39708](https://github.com/ClickHouse/ClickHouse/pull/39708) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix possible error `Invalid column type for ColumnUnique::insertRangeFrom. Expected String, got ColumnLowCardinality` Fixes [#38460](https://github.com/ClickHouse/ClickHouse/issues/38460). [#39716](https://github.com/ClickHouse/ClickHouse/pull/39716) ([Arthur Passos](https://github.com/arthurpassos)).
+* Field names in the `meta` section of JSON format were erroneously double escaped. This closes [#39693](https://github.com/ClickHouse/ClickHouse/issues/39693). [#39747](https://github.com/ClickHouse/ClickHouse/pull/39747) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix `EmbeddedRocksDB` tables filtering by key using params. [#39757](https://github.com/ClickHouse/ClickHouse/pull/39757) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix error `Invalid number of columns in chunk pushed to OutputPort` which was caused by ARRAY JOIN optimization. Fixes [#39164](https://github.com/ClickHouse/ClickHouse/issues/39164). [#39799](https://github.com/ClickHouse/ClickHouse/pull/39799) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* A workaround for a bug in Linux kernel. Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+* (Only on NFS) Fix broken NFS mkdir for root-squashed volumes. [#39898](https://github.com/ClickHouse/ClickHouse/pull/39898) ([Constantine Peresypkin](https://github.com/pkit)).
+* Remove dictionaries from prometheus metrics on DETACH/DROP. [#39926](https://github.com/ClickHouse/ClickHouse/pull/39926) ([Azat Khuzhin](https://github.com/azat)).
+* Fix read of StorageFile with virtual columns. Closes [#39907](https://github.com/ClickHouse/ClickHouse/issues/39907). [#39943](https://github.com/ClickHouse/ClickHouse/pull/39943) ([flynn](https://github.com/ucasfl)).
+* Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* (experimental feature) Fix `hashId` crash and salt parameter not being used. [#40002](https://github.com/ClickHouse/ClickHouse/pull/40002) ([Raúl Marín](https://github.com/Algunenano)).
+* `EXCEPT` and `INTERSECT` operators may lead to crash if a specific combination of constant and non-constant columns were used. [#40020](https://github.com/ClickHouse/ClickHouse/pull/40020) ([Duc Canh Le](https://github.com/canhld94)).
+* Fixed "Part directory doesn't exist" and "`tmp_<part_name>` ... No such file or directory" errors during too slow INSERT or too long merge/mutation. Also fixed issue that may cause some replication queue entries to stuck without any errors or warnings in logs if previous attempt to fetch part failed, but `tmp-fetch_<part_name>` directory was not cleaned up. [#40031](https://github.com/ClickHouse/ClickHouse/pull/40031) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix rare cases of parsing of arrays of tuples in format `Values`. [#40034](https://github.com/ClickHouse/ClickHouse/pull/40034) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixes ArrowColumn format Dictionary(X) & Dictionary(Nullable(X)) conversion to ClickHouse LowCardinality(X) & LowCardinality(Nullable(X)) respectively. [#40037](https://github.com/ClickHouse/ClickHouse/pull/40037) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix potential deadlock in writing to S3 during task scheduling failure. [#40070](https://github.com/ClickHouse/ClickHouse/pull/40070) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix bug in collectFilesToSkip() by adding correct file extension (.idx or idx2) for indexes to be recalculated, avoid wrong hard links. Fixed [#39896](https://github.com/ClickHouse/ClickHouse/issues/39896). [#40095](https://github.com/ClickHouse/ClickHouse/pull/40095) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* A fix for reverse DNS resolution. [#40134](https://github.com/ClickHouse/ClickHouse/pull/40134) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix unexpected result `arrayDifference` of `Array(UInt32). [#40211](https://github.com/ClickHouse/ClickHouse/pull/40211) ([Duc Canh Le](https://github.com/canhld94)).
+
+
 ### <a id="227"></a> ClickHouse release 22.7, 2022-07-21
 
 #### Upgrade Notes
@@ -258,7 +401,7 @@
 * Allows providing `NULL`/`NOT NULL` right after type in column declaration. [#37337](https://github.com/ClickHouse/ClickHouse/pull/37337) ([Igor Nikonov](https://github.com/devcrafter)).
 * optimize file segment PARTIALLY_DOWNLOADED get read buffer. [#37338](https://github.com/ClickHouse/ClickHouse/pull/37338) ([xiedeyantu](https://github.com/xiedeyantu)).
 * Try to improve short circuit functions processing to fix problems with stress tests. [#37384](https://github.com/ClickHouse/ClickHouse/pull/37384) ([Kruglov Pavel](https://github.com/Avogar)).
-* Closes [#37395](https://github.com/ClickHouse/ClickHouse/issues/37395). [#37415](https://github.com/ClickHouse/ClickHouse/pull/37415) ([Memo](https://github.com/Joeywzr)).
+* Generate multiple columns with UUID (generateUUIDv4(1), generateUUIDv4(2)) [#37395](https://github.com/ClickHouse/ClickHouse/issues/37395). [#37415](https://github.com/ClickHouse/ClickHouse/pull/37415) ([Memo](https://github.com/Joeywzr)).
 * Fix extremely rare deadlock during part fetch in zero-copy replication. Fixes [#37423](https://github.com/ClickHouse/ClickHouse/issues/37423). [#37424](https://github.com/ClickHouse/ClickHouse/pull/37424) ([metahys](https://github.com/metahys)).
 * Don't allow to create storage with unknown data format. [#37450](https://github.com/ClickHouse/ClickHouse/pull/37450) ([Kruglov Pavel](https://github.com/Avogar)).
 * Set `global_memory_usage_overcommit_max_wait_microseconds` default value to 5 seconds. Add info about `OvercommitTracker` to OOM exception message. Add `MemoryOvercommitWaitTimeMicroseconds` profile event. [#37460](https://github.com/ClickHouse/ClickHouse/pull/37460) ([Dmitry Novik](https://github.com/novikd)).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a93449495c..e3eff050015 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,10 +77,9 @@ option(USE_STATIC_LIBRARIES "Disable to use shared libraries" ON)
 # DEVELOPER ONLY.
 # Faster linking if turned on.
 option(SPLIT_SHARED_LIBRARIES "Keep all internal libraries as separate .so files" OFF)
-option(CLICKHOUSE_SPLIT_BINARY "Make several binaries (clickhouse-server, clickhouse-client etc.) instead of one bundled" OFF)
 
-if (USE_STATIC_LIBRARIES AND (SPLIT_SHARED_LIBRARIES OR CLICKHOUSE_SPLIT_BINARY))
-    message(FATAL_ERROR "SPLIT_SHARED_LIBRARIES=1 or CLICKHOUSE_SPLIT_BINARY=1 must not be used together with USE_STATIC_LIBRARIES=1")
+if (USE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
+    message(FATAL_ERROR "SPLIT_SHARED_LIBRARIES=1 must not be used together with USE_STATIC_LIBRARIES=1")
 endif()
 
 if (NOT USE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
@@ -154,6 +153,8 @@ if (COMPILER_CLANG)
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
         endif()
     endif()
+
+    no_warning(enum-constexpr-conversion) # breaks Protobuf in clang-16
 endif ()
 
 # If compiler has support for -Wreserved-identifier. It is difficult to detect by clang version,
@@ -502,7 +503,7 @@ endif ()
 message (STATUS
     "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE} ;
     USE_STATIC_LIBRARIES=${USE_STATIC_LIBRARIES}
-    SPLIT_SHARED=${SPLIT_SHARED_LIBRARIES}")
+    SPLIT_SHARED_LIBRARIES=${SPLIT_SHARED_LIBRARIES}")
 
 include (GNUInstallDirs)
 
@@ -607,4 +608,3 @@ if (NATIVE_BUILD_TARGETS
         COMMAND ${CMAKE_COMMAND} --build "${NATIVE_BUILD_DIR}" --target ${NATIVE_BUILD_TARGETS}
         COMMAND_ECHO STDOUT)
 endif ()
-
diff --git a/README.md b/README.md
index 1d0146582a6..b173add94e3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/ClickHouse/raw/master/website/images/logo-400x240.png)](https://clickhouse.com)
+[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/clickhouse-presentations/raw/master/images/logo-400x240.png)](https://clickhouse.com)
 
 ClickHouse® is an open-source column-oriented database management system that allows generating analytical data reports in real-time.
 
@@ -12,11 +12,7 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [Blog](https://clickhouse.com/blog/en/) contains various ClickHouse-related articles, as well as announcements and reports about events.
 * [Code Browser (Woboq)](https://clickhouse.com/codebrowser/ClickHouse/index.html) with syntax highlight and navigation.
 * [Code Browser (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlight, powered by github.dev.
-* [Contacts](https://clickhouse.com/company/#contact) can help to get your questions answered if there are any.
+* [Contacts](https://clickhouse.com/company/contact) can help to get your questions answered if there are any.
 
 ## Upcoming events
-* [v22.7 Release Webinar](https://clickhouse.com/company/events/v22-7-release-webinar/) Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release, provide live demos, and share vision into what is coming in the roadmap.
-* [ClickHouse Meetup at the Cloudflare office in London](https://www.meetup.com/clickhouse-london-user-group/events/286891586/) ClickHouse meetup at the Cloudflare office space in central London
-* [ClickHouse Meetup at the Metoda office in Munich](https://www.meetup.com/clickhouse-meetup-munich/events/286891667/) ClickHouse meetup at the Metoda office in Munich
-
-
+* [**v22.8 Release Webinar**](https://clickhouse.com/company/events/v22-8-release-webinar) Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release, provide live demos, and share vision into what is coming in the roadmap.
diff --git a/SECURITY.md b/SECURITY.md
index 81d2fd18fb2..fb6caa92cb8 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,9 +10,11 @@ The following versions of ClickHouse server are currently being supported with s
 
 | Version | Supported |
 |:-|:-|
+| 22.8 | ✔️ |
+| 22.7 | ✔️ |
 | 22.6 | ✔️ |
-| 22.5 | ✔️ |
-| 22.4 | ✔️ |
+| 22.5 | ❌ |
+| 22.4 | ❌ |
 | 22.3 | ✔️ |
 | 22.2 | ❌ |
 | 22.1 | ❌ |
@@ -20,7 +22,7 @@ The following versions of ClickHouse server are currently being supported with s
 | 21.11 | ❌ |
 | 21.10 | ❌ |
 | 21.9 | ❌ |
-| 21.8 | ✔️ |
+| 21.8 | ❌ |
 | 21.7 | ❌ |
 | 21.6 | ❌ |
 | 21.5 | ❌ |
@@ -57,5 +59,5 @@ As the security issue moves from triage, to identified fix, to release planning
 
 ## Public Disclosure Timing
 
-A public disclosure date is negotiated by the ClickHouse maintainers and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to 90 days. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days. 
+A public disclosure date is negotiated by the ClickHouse maintainers and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to 90 days. For a vulnerability with a straightforward mitigation, we expect the report date to disclosure date to be on the order of 7 days. 
 
diff --git a/base/base/unaligned.h b/base/base/unaligned.h
index 013aa5274e9..fcaaa38f2fe 100644
--- a/base/base/unaligned.h
+++ b/base/base/unaligned.h
@@ -2,8 +2,47 @@
 
 #include <cstring>
 #include <type_traits>
+#include <bit>
 
 
+inline void reverseMemcpy(void * dst, const void * src, size_t size)
+{
+    uint8_t * uint_dst = reinterpret_cast<uint8_t *>(dst);
+    const uint8_t * uint_src = reinterpret_cast<const uint8_t *>(src);
+
+    uint_dst += size;
+    while (size)
+    {
+        --uint_dst;
+        *uint_dst = *uint_src;
+        ++uint_src;
+        --size;
+    }
+}
+
+template <typename T>
+inline T unalignedLoadLE(const void * address)
+{
+    T res {};
+    if constexpr (std::endian::native == std::endian::little)
+        memcpy(&res, address, sizeof(res));
+    else
+        reverseMemcpy(&res, address, sizeof(res));
+    return res;
+}
+
+
+template <typename T>
+inline void unalignedStoreLE(void * address,
+                           const typename std::enable_if<true, T>::type & src)
+{
+    static_assert(std::is_trivially_copyable_v<T>);
+    if constexpr (std::endian::native == std::endian::little)
+        memcpy(address, &src, sizeof(src));
+    else
+        reverseMemcpy(address, &src, sizeof(src));
+}
+
 template <typename T>
 inline T unalignedLoad(const void * address)
 {
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index edc7805150b..5999a089331 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -2,11 +2,11 @@
 
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54465)
+SET(VERSION_REVISION 54466)
 SET(VERSION_MAJOR 22)
-SET(VERSION_MINOR 8)
+SET(VERSION_MINOR 9)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH f4f05ec786a8b8966dd0ea2a2d7e39a8c7db24f4)
-SET(VERSION_DESCRIBE v22.8.1.1-testing)
-SET(VERSION_STRING 22.8.1.1)
+SET(VERSION_GITHASH 09a2ff88435f79e5279745bbe1dc0e5e401df38d)
+SET(VERSION_DESCRIBE v22.9.1.1-testing)
+SET(VERSION_STRING 22.9.1.1)
 # end of autochange
diff --git a/cmake/cpu_features.cmake b/cmake/cpu_features.cmake
index 1fc3c2db804..f1f6dfb9a9c 100644
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@@ -16,7 +16,7 @@ option (ENABLE_SSE41 "Use SSE4.1 instructions on x86_64" 1)
 option (ENABLE_SSE42 "Use SSE4.2 instructions on x86_64" 1)
 option (ENABLE_PCLMULQDQ "Use pclmulqdq instructions on x86_64" 1)
 option (ENABLE_POPCNT "Use popcnt instructions on x86_64" 1)
-option (ENABLE_AVX "Use AVX instructions on x86_64" 0)
+option (ENABLE_AVX "Use AVX instructions on x86_64" 1)
 option (ENABLE_AVX2 "Use AVX2 instructions on x86_64" 0)
 option (ENABLE_AVX512 "Use AVX512 instructions on x86_64" 0)
 option (ENABLE_AVX512_VBMI "Use AVX512_VBMI instruction on x86_64 (depends on ENABLE_AVX512)" 0)
diff --git a/cmake/limit_jobs.cmake b/cmake/limit_jobs.cmake
index 96c6b75bc43..a8f105b8987 100644
--- a/cmake/limit_jobs.cmake
+++ b/cmake/limit_jobs.cmake
@@ -3,7 +3,7 @@
 # set (MAX_LINKER_MEMORY 3500 CACHE INTERNAL "")
 # include (cmake/limit_jobs.cmake)
 
-cmake_host_system_information(RESULT AVAILABLE_PHYSICAL_MEMORY QUERY AVAILABLE_PHYSICAL_MEMORY) # Not available under freebsd
+cmake_host_system_information(RESULT TOTAL_PHYSICAL_MEMORY QUERY TOTAL_PHYSICAL_MEMORY) # Not available under freebsd
 cmake_host_system_information(RESULT NUMBER_OF_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES)
 
 # 1 if not set
@@ -12,8 +12,8 @@ option(PARALLEL_COMPILE_JOBS "Maximum number of concurrent compilation jobs" "")
 # 1 if not set
 option(PARALLEL_LINK_JOBS "Maximum number of concurrent link jobs" "")
 
-if (NOT PARALLEL_COMPILE_JOBS AND AVAILABLE_PHYSICAL_MEMORY AND MAX_COMPILER_MEMORY)
-    math(EXPR PARALLEL_COMPILE_JOBS ${AVAILABLE_PHYSICAL_MEMORY}/${MAX_COMPILER_MEMORY})
+if (NOT PARALLEL_COMPILE_JOBS AND TOTAL_PHYSICAL_MEMORY AND MAX_COMPILER_MEMORY)
+    math(EXPR PARALLEL_COMPILE_JOBS ${TOTAL_PHYSICAL_MEMORY}/${MAX_COMPILER_MEMORY})
 
     if (NOT PARALLEL_COMPILE_JOBS)
         set (PARALLEL_COMPILE_JOBS 1)
@@ -27,8 +27,8 @@ if (PARALLEL_COMPILE_JOBS AND (NOT NUMBER_OF_LOGICAL_CORES OR PARALLEL_COMPILE_J
 endif ()
 
 
-if (NOT PARALLEL_LINK_JOBS AND AVAILABLE_PHYSICAL_MEMORY AND MAX_LINKER_MEMORY)
-    math(EXPR PARALLEL_LINK_JOBS ${AVAILABLE_PHYSICAL_MEMORY}/${MAX_LINKER_MEMORY})
+if (NOT PARALLEL_LINK_JOBS AND TOTAL_PHYSICAL_MEMORY AND MAX_LINKER_MEMORY)
+    math(EXPR PARALLEL_LINK_JOBS ${TOTAL_PHYSICAL_MEMORY}/${MAX_LINKER_MEMORY})
 
     if (NOT PARALLEL_LINK_JOBS)
         set (PARALLEL_LINK_JOBS 1)
@@ -54,6 +54,6 @@ endif ()
 
 if (PARALLEL_COMPILE_JOBS OR PARALLEL_LINK_JOBS)
     message(STATUS
-        "${CMAKE_CURRENT_SOURCE_DIR}: Have ${AVAILABLE_PHYSICAL_MEMORY} megabytes of memory.
+        "${CMAKE_CURRENT_SOURCE_DIR}: Have ${TOTAL_PHYSICAL_MEMORY} megabytes of memory.
         Limiting concurrent linkers jobs to ${PARALLEL_LINK_JOBS} and compiler jobs to ${PARALLEL_COMPILE_JOBS} (system has ${NUMBER_OF_LOGICAL_CORES} logical cores)")
 endif ()
diff --git a/cmake/linux/toolchain-riscv64.cmake b/cmake/linux/toolchain-riscv64.cmake
index cb0a9482a72..02c3d0c97fc 100644
--- a/cmake/linux/toolchain-riscv64.cmake
+++ b/cmake/linux/toolchain-riscv64.cmake
@@ -21,6 +21,11 @@ set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=bfd")
 
+# Currently, lld does not work with the error:
+# ld.lld: error: section size decrease is too large
+# But GNU BinUtils work.
+set (LINKER_NAME "riscv64-linux-gnu-ld.bfd" CACHE STRING "Linker name" FORCE)
+
 set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
 set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
 
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 994f14c6149..042935a835f 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -23,6 +23,7 @@ if (COMPILER_CLANG)
     no_warning(zero-length-array)
     no_warning(c++98-compat-pedantic)
     no_warning(c++98-compat)
+    no_warning(c++20-compat) # Use constinit in C++20 without warnings
     no_warning(conversion)
     no_warning(ctad-maybe-unsupported) # clang 9+, linux-only
     no_warning(disabled-macro-expansion)
@@ -41,6 +42,7 @@ if (COMPILER_CLANG)
     no_warning(weak-template-vtables)
     no_warning(weak-vtables)
     no_warning(thread-safety-negative) # experimental flag, too many false positives
+    no_warning(enum-constexpr-conversion) # breaks magic-enum library in clang-16
     # TODO Enable conversion, sign-conversion, double-promotion warnings.
 elseif (COMPILER_GCC)
     # Add compiler options only to c++ compiler
diff --git a/contrib/NuRaft b/contrib/NuRaft
index 1334b9ae725..1b0af760b35 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit 1334b9ae72576821a698d657d08838861cf33007
+Subproject commit 1b0af760b3506b8e35b50cb7df098cbad5064ff2
diff --git a/contrib/arrow b/contrib/arrow
index efdcd015cfd..450a5638704 160000
--- a/contrib/arrow
+++ b/contrib/arrow
@@ -1 +1 @@
-Subproject commit efdcd015cfdee1b6aa349c9ca227ca12c3d697f5
+Subproject commit 450a5638704386356f8e520080468fc9bc8bcaf8
diff --git a/contrib/azure b/contrib/azure
index ac4b763d4ca..ef75afc075f 160000
--- a/contrib/azure
+++ b/contrib/azure
@@ -1 +1 @@
-Subproject commit ac4b763d4ca40122275f1497cbdc5451337461d9
+Subproject commit ef75afc075fc71fbcd8fe28dcda3794ae265fd1c
diff --git a/contrib/azure-cmake/CMakeLists.txt b/contrib/azure-cmake/CMakeLists.txt
index 19f2940cbf0..1e2a4c97824 100644
--- a/contrib/azure-cmake/CMakeLists.txt
+++ b/contrib/azure-cmake/CMakeLists.txt
@@ -1,6 +1,6 @@
 option (ENABLE_AZURE_BLOB_STORAGE "Enable Azure blob storage" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_AZURE_BLOB_STORAGE)
+if (NOT ENABLE_AZURE_BLOB_STORAGE OR BUILD_STANDALONE_KEEPER OR OS_FREEBSD)
     message(STATUS "Not using Azure blob storage")
     return()
 endif()
diff --git a/contrib/boost b/contrib/boost
index c0807e83f28..03d9ec9cd15 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit c0807e83f2824e8dd67a15b355496a9b784cdcd5
+Subproject commit 03d9ec9cd159d14bd0b17c05138098451a1ea606
diff --git a/contrib/boringssl b/contrib/boringssl
index c1e01a441d6..8061ac62d67 160000
--- a/contrib/boringssl
+++ b/contrib/boringssl
@@ -1 +1 @@
-Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1
+Subproject commit 8061ac62d67953e61b793042e33baf1352e67510
diff --git a/contrib/cctz b/contrib/cctz
index 8c71d74bdf7..49c656c62fb 160000
--- a/contrib/cctz
+++ b/contrib/cctz
@@ -1 +1 @@
-Subproject commit 8c71d74bdf76c3fa401da845089ae60a6c0aeefa
+Subproject commit 49c656c62fbd36a1bc20d64c476853bdb7cf7bb9
diff --git a/contrib/curl-cmake/curl_config.h b/contrib/curl-cmake/curl_config.h
index 1efdd88600f..f56ba3eccd5 100644
--- a/contrib/curl-cmake/curl_config.h
+++ b/contrib/curl-cmake/curl_config.h
@@ -44,6 +44,8 @@
 #define HAVE_SETJMP_H
 #define HAVE_SYS_STAT_H
 #define HAVE_UNISTD_H
+#define HAVE_POLL_H
+#define HAVE_PTHREAD_H
 
 #define ENABLE_IPV6
 #define USE_OPENSSL
diff --git a/contrib/krb5 b/contrib/krb5
index 5149dea4e2b..d879821c7a4 160000
--- a/contrib/krb5
+++ b/contrib/krb5
@@ -1 +1 @@
-Subproject commit 5149dea4e2be0f67707383d2682b897c14631374
+Subproject commit d879821c7a4c70b0c3ad739d9951d1a2b1903df7
diff --git a/contrib/libgsasl b/contrib/libgsasl
index 383ee28e82f..0324680f13f 160000
--- a/contrib/libgsasl
+++ b/contrib/libgsasl
@@ -1 +1 @@
-Subproject commit 383ee28e82f69fa16ed43b48bd9c8ee5b313ab84
+Subproject commit 0324680f13f22bb43df5353a08e26453d7d640ac
diff --git a/contrib/librdkafka b/contrib/librdkafka
index 6062e711a91..ff32b4e9eea 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 6062e711a919fb3b669b243b7dceabd045d0e4a2
+Subproject commit ff32b4e9eeafd0b276f010ee969179e4e9e6d0b2
diff --git a/contrib/nats-io b/contrib/nats-io
index 6b2227f3675..1e2597c5461 160000
--- a/contrib/nats-io
+++ b/contrib/nats-io
@@ -1 +1 @@
-Subproject commit 6b2227f36757da090321e2d317569d2bd42c4cc1
+Subproject commit 1e2597c54616015077e53a26d56b6bac448eb1b6
diff --git a/contrib/nats-io-cmake/CMakeLists.txt b/contrib/nats-io-cmake/CMakeLists.txt
index 5588d5750c4..579bf6f8ae4 100644
--- a/contrib/nats-io-cmake/CMakeLists.txt
+++ b/contrib/nats-io-cmake/CMakeLists.txt
@@ -18,6 +18,8 @@ elseif(WIN32)
     set(NATS_PLATFORM_INCLUDE "apple")
 endif()
 
+add_definitions(-DNATS_HAS_TLS)
+
 file(GLOB PS_SOURCES "${NATS_IO_SOURCE_DIR}/${NATS_PLATFORM_INCLUDE}/*.c")
 set(SRCS
     "${NATS_IO_SOURCE_DIR}/asynccb.c"
diff --git a/docker/images.json b/docker/images.json
index 181452f17bc..8339205b52f 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -29,6 +29,7 @@
     "docker/test/util": {
         "name": "clickhouse/test-util",
         "dependent": [
+            "docker/packager/binary",
             "docker/test/base",
             "docker/test/fasttest"
         ]
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 91d1354a10c..74919bb2100 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,62 +1,7 @@
 # rebuild in #33610
 # docker build -t clickhouse/binary-builder .
-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
-
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=14
-
-RUN apt-get update \
-    && apt-get install \
-        apt-transport-https \
-        apt-utils \
-        ca-certificates \
-        dnsutils \
-        gnupg \
-        iputils-ping \
-        lsb-release \
-        wget \
-        --yes --no-install-recommends --verbose-versions \
-    && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
-    && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
-    && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
-    && apt-key add /tmp/llvm-snapshot.gpg.key \
-    && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
-    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
-        /etc/apt/sources.list \
-    && apt-get clean
-
-# initial packages
-RUN apt-get update \
-    && apt-get install \
-        bash \
-        build-essential \
-        ccache \
-        clang-${LLVM_VERSION} \
-        clang-tidy-${LLVM_VERSION} \
-        cmake \
-        curl \
-        fakeroot \
-        gdb \
-        git \
-        gperf \
-        lld-${LLVM_VERSION} \
-        llvm-${LLVM_VERSION} \
-        llvm-${LLVM_VERSION}-dev \
-        moreutils \
-        ninja-build \
-        pigz \
-        rename \
-        software-properties-common \
-        tzdata \
-        nasm \
-        --yes --no-install-recommends \
-    && apt-get clean
-
-# This symlink required by gcc to find lld compiler
-RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
+ARG FROM_TAG=latest
+FROM clickhouse/test-util:$FROM_TAG
 
 ENV CC=clang-${LLVM_VERSION}
 ENV CXX=clang++-${LLVM_VERSION}
@@ -96,6 +41,9 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
     && apt-get install gcc-11 g++-11 --yes \
     && apt-get clean
 
+# A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
+RUN apt-get install binutils-riscv64-linux-gnu
+
 # Architecture of the image when BuildKit/buildx is used
 ARG TARGETARCH
 ARG NFPM_VERSION=2.16.0
@@ -119,18 +67,18 @@ ENV GOCACHE=/workdir/
 RUN mkdir /workdir && chmod 777 /workdir
 WORKDIR /workdir
 
-# FIXME: thread sanitizer is broken in clang-14, we have to build it with clang-13
+# NOTE: thread sanitizer is broken in clang-14, we have to build it with clang-15
 # https://github.com/ClickHouse/ClickHouse/pull/39450
 # https://github.com/google/sanitizers/issues/1540
 # https://github.com/google/sanitizers/issues/1552
 
 RUN export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
-    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-13 main" >> \
+    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-15 main" >> \
         /etc/apt/sources.list.d/clang.list \
     && apt-get update \
     && apt-get install \
-        clang-13 \
-        clang-tidy-13 \
+        clang-15 \
+        clang-tidy-15 \
         --yes --no-install-recommends \
     && apt-get clean
 
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index 87f98df2ad8..c2de0e33d82 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -3,7 +3,7 @@ set -x -e
 
 exec &> >(ts)
 
-cache_status () {
+ccache_status () {
     ccache --show-config ||:
     ccache --show-stats ||:
 }
@@ -48,14 +48,14 @@ if [ -n "$MAKE_DEB" ]; then
 fi
 
 
-cache_status
+ccache_status
 # clear cache stats
 ccache --zero-stats ||:
 
 if [ "$BUILD_MUSL_KEEPER" == "1" ]
 then
     # build keeper with musl separately
-    cmake --debug-trycompile --verbose=1 -DBUILD_STANDALONE_KEEPER=1 -DENABLE_CLICKHOUSE_KEEPER=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DUSE_MUSL=1 -LA -DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-x86_64-musl.cmake "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
+    cmake --debug-trycompile -DBUILD_STANDALONE_KEEPER=1 -DENABLE_CLICKHOUSE_KEEPER=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DUSE_MUSL=1 -LA -DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-x86_64-musl.cmake "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
     # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
     ninja $NINJA_FLAGS clickhouse-keeper
 
@@ -70,10 +70,10 @@ then
     rm -f CMakeCache.txt
 
     # Build the rest of binaries
-    cmake --debug-trycompile --verbose=1 -DBUILD_STANDALONE_KEEPER=0 -DCREATE_KEEPER_SYMLINK=0 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
+    cmake --debug-trycompile -DBUILD_STANDALONE_KEEPER=0 -DCREATE_KEEPER_SYMLINK=0 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
 else
     # Build everything
-    cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
+    cmake --debug-trycompile -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
 fi
 
 if [ "coverity" == "$COMBINED_OUTPUT" ]
@@ -88,11 +88,11 @@ fi
 
 # No quotes because I want it to expand to nothing if empty.
 # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
-$SCAN_WRAPPER ninja $NINJA_FLAGS clickhouse-bundle
+$SCAN_WRAPPER ninja $NINJA_FLAGS $BUILD_TARGET
 
 ls -la ./programs
 
-cache_status
+ccache_status
 
 if [ -n "$MAKE_DEB" ]; then
   # No quotes because I want it to expand to nothing if empty.
@@ -104,6 +104,7 @@ if [ -n "$MAKE_DEB" ]; then
 fi
 
 mv ./programs/clickhouse* /output
+[ -x ./programs/self-extracting/clickhouse ] && mv ./programs/self-extracting/clickhouse /output
 mv ./src/unit_tests_dbms /output ||: # may not exist for some binary builds
 find . -name '*.so' -print -exec mv '{}' /output \;
 find . -name '*.so.*' -print -exec mv '{}' /output \;
@@ -178,7 +179,8 @@ then
     mv "coverity-scan.tgz" /output
 fi
 
-cache_status
+ccache_status
+ccache --evict-older-than 1d
 
 if [ "${CCACHE_DEBUG:-}" == "1" ]
 then
diff --git a/docker/packager/packager b/docker/packager/packager
index 0b00bc4e9c0..66eb568d460 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -62,7 +62,7 @@ def pre_build(repo_path: str, env_variables: List[str]):
                 f"git -C {repo_path} fetch --no-recurse-submodules "
                 "--no-tags origin master:master"
             )
-            logging.info("Getting master branch for performance artifact: ''%s'", cmd)
+            logging.info("Getting master branch for performance artifact: '%s'", cmd)
             subprocess.check_call(cmd, shell=True)
 
 
@@ -100,12 +100,12 @@ def run_docker_image_with_env(
     subprocess.check_call(cmd, shell=True)
 
 
-def is_release_build(build_type, package_type, sanitizer, split_binary):
+def is_release_build(build_type, package_type, sanitizer, shared_libraries):
     return (
         build_type == ""
         and package_type == "deb"
         and sanitizer == ""
-        and not split_binary
+        and not shared_libraries
     )
 
 
@@ -116,7 +116,7 @@ def parse_env_variables(
     package_type,
     cache,
     distcc_hosts,
-    split_binary,
+    shared_libraries,
     clang_tidy,
     version,
     author,
@@ -134,6 +134,7 @@ def parse_env_variables(
     result = []
     result.append("OUTPUT_DIR=/output")
     cmake_flags = ["$CMAKE_FLAGS"]
+    build_target = "clickhouse-bundle"
 
     is_cross_darwin = compiler.endswith(DARWIN_SUFFIX)
     is_cross_darwin_arm = compiler.endswith(DARWIN_ARM_SUFFIX)
@@ -201,7 +202,7 @@ def parse_env_variables(
         cmake_flags.append("-DCMAKE_INSTALL_PREFIX=/usr")
         cmake_flags.append("-DCMAKE_INSTALL_SYSCONFDIR=/etc")
         cmake_flags.append("-DCMAKE_INSTALL_LOCALSTATEDIR=/var")
-        if is_release_build(build_type, package_type, sanitizer, split_binary):
+        if is_release_build(build_type, package_type, sanitizer, shared_libraries):
             cmake_flags.append("-DSPLIT_DEBUG_SYMBOLS=ON")
             result.append("WITH_PERFORMANCE=1")
             if is_cross_arm:
@@ -214,11 +215,11 @@ def parse_env_variables(
     cmake_flags.append(f"-DCMAKE_C_COMPILER={cc}")
     cmake_flags.append(f"-DCMAKE_CXX_COMPILER={cxx}")
 
-    # Create combined output archive for split build and for performance tests.
+    # Create combined output archive for shared library build and for performance tests.
     if package_type == "coverity":
         result.append("COMBINED_OUTPUT=coverity")
         result.append('COVERITY_TOKEN="$COVERITY_TOKEN"')
-    elif split_binary:
+    elif shared_libraries:
         result.append("COMBINED_OUTPUT=shared_build")
 
     if sanitizer:
@@ -233,11 +234,15 @@ def parse_env_variables(
 
     if cache:
         result.append("CCACHE_DIR=/ccache")
+        result.append("CCACHE_COMPRESSLEVEL=5")
         result.append("CCACHE_BASEDIR=/build")
         result.append("CCACHE_NOHASHDIR=true")
         result.append("CCACHE_COMPILERCHECK=content")
-        result.append("CCACHE_MAXSIZE=15G")
-        # result.append("CCACHE_UMASK=777")
+        cache_maxsize = "15G"
+        if clang_tidy:
+            # 15G is not enough for tidy build
+            cache_maxsize = "25G"
+        result.append(f"CCACHE_MAXSIZE={cache_maxsize}")
 
     if distcc_hosts:
         hosts_with_params = [f"{host}/24,lzo" for host in distcc_hosts] + [
@@ -259,24 +264,28 @@ def parse_env_variables(
         result.append("BINARY_OUTPUT=tests")
         cmake_flags.append("-DENABLE_TESTS=1")
 
-    if split_binary:
+    if shared_libraries:
         cmake_flags.append(
-            "-DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 "
-            "-DCLICKHOUSE_SPLIT_BINARY=1"
+            "-DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1"
         )
         # We can't always build utils because it requires too much space, but
-        # we have to build them at least in some way in CI. The split build is
-        # probably the least heavy disk-wise.
+        # we have to build them at least in some way in CI. The shared library
+        # build is probably the least heavy disk-wise.
         cmake_flags.append("-DENABLE_UTILS=1")
+        # utils are not included into clickhouse-bundle, so build everything
+        build_target = "all"
 
     if clang_tidy:
         cmake_flags.append("-DENABLE_CLANG_TIDY=1")
-        cmake_flags.append("-DENABLE_UTILS=1")
         cmake_flags.append("-DENABLE_TESTS=1")
         cmake_flags.append("-DENABLE_EXAMPLES=1")
         # Don't stop on first error to find more clang-tidy errors in one run.
         result.append("NINJA_FLAGS=-k0")
 
+        cmake_flags.append("-DENABLE_UTILS=1")
+        # utils are not included into clickhouse-bundle, so build everything
+        build_target = "all"
+
     if with_coverage:
         cmake_flags.append("-DWITH_COVERAGE=1")
 
@@ -290,6 +299,7 @@ def parse_env_variables(
         cmake_flags.append("-DCLICKHOUSE_OFFICIAL_BUILD=1")
 
     result.append('CMAKE_FLAGS="' + " ".join(cmake_flags) + '"')
+    result.append(f"BUILD_TARGET={build_target}")
 
     return result
 
@@ -323,7 +333,7 @@ if __name__ == "__main__":
     parser.add_argument(
         "--compiler",
         choices=(
-            "clang-13",  # For TSAN builds, see #39450
+            "clang-15",  # For TSAN builds, see #39450
             "clang-14",
             "clang-14-darwin",
             "clang-14-darwin-aarch64",
@@ -341,7 +351,7 @@ if __name__ == "__main__":
         default="",
     )
 
-    parser.add_argument("--split-binary", action="store_true")
+    parser.add_argument("--shared-libraries", action="store_true")
     parser.add_argument("--clang-tidy", action="store_true")
     parser.add_argument("--cache", choices=("ccache", "distcc", ""), default="")
     parser.add_argument(
@@ -394,7 +404,7 @@ if __name__ == "__main__":
         args.package_type,
         args.cache,
         args.distcc_hosts,
-        args.split_binary,
+        args.shared_libraries,
         args.clang_tidy,
         args.version,
         args.author,
diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index e0a730e5547..d4da5f0f38c 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -38,6 +38,7 @@ FORMAT_SCHEMA_PATH="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_
 
 # There could be many disks declared in config
 readarray -t FILESYSTEM_CACHE_PATHS < <(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key='storage_configuration.disks.*.data_cache_path' || true)
+readarray -t DISKS_PATHS < <(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key='storage_configuration.disks.*.path' || true)
 
 CLICKHOUSE_USER="${CLICKHOUSE_USER:-default}"
 CLICKHOUSE_PASSWORD="${CLICKHOUSE_PASSWORD:-}"
@@ -50,12 +51,21 @@ for dir in "$DATA_DIR" \
   "$TMP_DIR" \
   "$USER_PATH" \
   "$FORMAT_SCHEMA_PATH" \
-  "${FILESYSTEM_CACHE_PATHS[@]}"
+  "${FILESYSTEM_CACHE_PATHS[@]}" \
+  "${DISKS_PATHS[@]}"
 do
     # check if variable not empty
     [ -z "$dir" ] && continue
     # ensure directories exist
-    if ! mkdir -p "$dir"; then
+    if [ "$DO_CHOWN" = "1" ]; then
+        mkdir="mkdir"
+    else
+        # if DO_CHOWN=0 it means that the system does not map root user to "admin" permissions
+        # it mainly happens on NFS mounts where root==nobody for security reasons
+        # thus mkdir MUST run with user id/gid and not from nobody that has zero permissions
+        mkdir="/usr/bin/clickhouse su "${USER}:${GROUP}" mkdir"
+    fi
+    if ! $mkdir -p "$dir"; then
         echo "Couldn't create necessary directory: $dir"
         exit 1
     fi
@@ -97,6 +107,13 @@ fi
 if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
     # port is needed to check if clickhouse-server is ready for connections
     HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port)"
+    HTTPS_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=https_port)"
+    
+    if [ -n "$HTTP_PORT" ]; then
+        URL="http://127.0.0.1:$HTTP_PORT/ping"
+    else
+        URL="https://127.0.0.1:$HTTPS_PORT/ping"
+    fi
 
     # Listen only on localhost until the initialization is done
     /usr/bin/clickhouse su "${USER}:${GROUP}" /usr/bin/clickhouse-server --config-file="$CLICKHOUSE_CONFIG" -- --listen_host=127.0.0.1 &
@@ -105,7 +122,7 @@ if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
     # check if clickhouse is ready to accept connections
     # will try to send ping clickhouse via http_port (max 12 retries by default, with 1 sec timeout and 1 sec delay between retries)
     tries=${CLICKHOUSE_INIT_TIMEOUT:-12}
-    while ! wget --spider -T 1 -q "http://127.0.0.1:$HTTP_PORT/ping" 2>/dev/null; do
+    while ! wget --spider --no-check-certificate -T 1 -q "$URL" 2>/dev/null; do
         if [ "$tries" -le "0" ]; then
             echo >&2 'ClickHouse init process failed.'
             exit 1
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index a1ae77343cb..43cfca1fdfc 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -3,59 +3,12 @@
 ARG FROM_TAG=latest
 FROM clickhouse/test-util:$FROM_TAG
 
-# 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 DEBIAN_FRONTEND=noninteractive LLVM_VERSION=14
-
-RUN apt-get update \
-    && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
-        --yes --no-install-recommends --verbose-versions \
-    && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
-    && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
-    && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
-    && apt-key add /tmp/llvm-snapshot.gpg.key \
-    && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
-    && echo "deb [trusted=yes] http://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
-        /etc/apt/sources.list
-
-# initial packages
 RUN apt-get update \
     && apt-get install \
-        bash \
-        fakeroot \
-        ccache \
-        curl \
-        software-properties-common \
-        --yes --no-install-recommends
-
-# Architecture of the image when BuildKit/buildx is used
-ARG TARGETARCH
-
-# Special dpkg-deb (https://github.com/ClickHouse-Extras/dpkg) version which is able
-# to compress files using pigz (https://zlib.net/pigz/) instead of gzip.
-# Significantly increase deb packaging speed and compatible with old systems
-RUN arch=${TARGETARCH:-amd64} \
-  && curl -Lo /usr/bin/dpkg-deb https://github.com/ClickHouse-Extras/dpkg/releases/download/1.21.1-clickhouse/dpkg-deb-${arch}
-
-RUN apt-get update \
-    && apt-get install \
-        clang-${LLVM_VERSION} \
-        debhelper \
-        devscripts \
-        gdb  \
-        git \
-        gperf \
         lcov \
-        llvm-${LLVM_VERSION} \
-        moreutils \
+        netbase \
         perl \
-        pigz \
-        pkg-config \
-        tzdata \
         pv \
-        nasm \
         --yes --no-install-recommends
 
 # Sanitizer options for services (clickhouse-server)
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 699e2c7ceb9..7f7a8008d4e 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -3,83 +3,24 @@
 ARG FROM_TAG=latest
 FROM clickhouse/test-util:$FROM_TAG
 
-# 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 DEBIAN_FRONTEND=noninteractive LLVM_VERSION=14
-
-RUN apt-get update \
-    && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
-        --yes --no-install-recommends --verbose-versions \
-    && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
-    && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
-    && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
-    && apt-key add /tmp/llvm-snapshot.gpg.key \
-    && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
-    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
-        /etc/apt/sources.list
-
-# initial packages
 RUN apt-get update \
     && apt-get install \
-        bash \
-        fakeroot \
-        ccache \
-        curl \
-        software-properties-common \
-        --yes --no-install-recommends
-
-# Architecture of the image when BuildKit/buildx is used
-ARG TARGETARCH
-
-# Special dpkg-deb (https://github.com/ClickHouse-Extras/dpkg) version which is able
-# to compress files using pigz (https://zlib.net/pigz/) instead of gzip.
-# Significantly increase deb packaging speed and compatible with old systems
-RUN arch=${TARGETARCH:-amd64} \
-  && curl -Lo /usr/bin/dpkg-deb https://github.com/ClickHouse-Extras/dpkg/releases/download/1.21.1-clickhouse/dpkg-deb-${arch}
-
-RUN apt-get update \
-    && apt-get install \
-        apt-transport-https \
-        bash \
         brotli \
-        build-essential \
-        ca-certificates \
-        ccache \
-        clang-${LLVM_VERSION} \
-        clang-tidy-${LLVM_VERSION} \
-        cmake \
-        curl \
         expect \
-        fakeroot \
-        gdb \
-        git \
-        gperf \
-        lld-${LLVM_VERSION} \
-        llvm-${LLVM_VERSION} \
+        file \
         lsof \
-        moreutils \
-        ninja-build \
         psmisc \
         python3 \
         python3-lxml \
         python3-pip \
         python3-requests \
         python3-termcolor \
-        rename \
-        software-properties-common \
-        tzdata \
         unixodbc \
-        file \
-        nasm \
-       --yes --no-install-recommends
+        pv \
+    --yes --no-install-recommends
 
 RUN pip3 install numpy scipy pandas Jinja2
 
-# This symlink required by gcc to find lld compiler
-RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
-
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
 RUN mkdir -p /tmp/clickhouse-odbc-tmp \
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 6b8109a15b2..377b816b2b6 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -160,9 +160,8 @@ function run_cmake
         "-DENABLE_REPLXX=1"
     )
 
-    # TODO remove this? we don't use ccache anyway. An option would be to download it
-    # from S3 simultaneously with cloning.
     export CCACHE_DIR="$FASTTEST_WORKSPACE/ccache"
+    export CCACHE_COMPRESSLEVEL=5
     export CCACHE_BASEDIR="$FASTTEST_SOURCE"
     export CCACHE_NOHASHDIR=true
     export CCACHE_COMPILERCHECK=content
@@ -191,6 +190,7 @@ function build
             gzip "$FASTTEST_OUTPUT/clickhouse-stripped"
         fi
         ccache --show-stats ||:
+        ccache --evict-older-than 1d ||:
     )
 }
 
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index f74760e3339..392d8110576 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -69,6 +69,8 @@ function download
     wget_with_retry "$BINARY_URL_TO_DOWNLOAD"
 
     chmod +x clickhouse
+    # clickhouse may be compressed - run once to decompress
+    ./clickhouse ||:
     ln -s ./clickhouse ./clickhouse-server
     ln -s ./clickhouse ./clickhouse-client
 
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index eaf0f01e36d..9b6318a5426 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -34,13 +34,14 @@ RUN apt-get update \
 ARG TARGETARCH
 
 # Install MySQL ODBC driver from RHEL rpm
+# For reference https://downloads.mysql.com/archives/c-odbc/ RHEL
 RUN arch=${TARGETARCH:-amd64} \
   && case $arch in \
       amd64) rarch=x86_64 ;; \
       arm64) rarch=aarch64 ;; \
     esac \
   && cd /tmp \
-  && curl -o mysql-odbc.rpm "https://cdn.mysql.com/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.27-1.el8.${rarch}.rpm" \
+  && curl -o mysql-odbc.rpm "https://cdn.mysql.com/archives/mysql-connector-odbc-8.0/mysql-connector-odbc-8.0.27-1.el8.${rarch}.rpm" \
   && rpm2archive mysql-odbc.rpm \
   && tar xf mysql-odbc.rpm.tgz -C / ./usr/lib64/ \
   && LINK_DIR=$(dpkg -L libodbc1 | grep '^/usr/lib/.*-linux-gnu/odbc$') \
diff --git a/docker/test/integration/runner/compose/docker_compose_nats.yml b/docker/test/integration/runner/compose/docker_compose_nats.yml
index 19ae4c162b1..2122f0f639f 100644
--- a/docker/test/integration/runner/compose/docker_compose_nats.yml
+++ b/docker/test/integration/runner/compose/docker_compose_nats.yml
@@ -4,4 +4,8 @@ services:
     image: nats
     ports:
       - "${NATS_EXTERNAL_PORT}:${NATS_INTERNAL_PORT}"
-    command: "-p 4444 --user click --pass house"
\ No newline at end of file
+    command: "-p 4444 --user click --pass house --tls --tlscert=/etc/certs/server-cert.pem --tlskey=/etc/certs/server-key.pem"
+    volumes:
+      - type: bind
+        source: "${NATS_CERT_DIR}/nats"
+        target: /etc/certs
diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index 3b0b7a4d95a..d3d7084f37f 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -284,13 +284,21 @@ function run_tests
         # Use awk because bash doesn't support floating point arithmetic.
         profile_seconds=$(awk "BEGIN { print ($profile_seconds_left > 0 ? 10 : 0) }")
 
+        if [ "$(grep -c $(basename $test) changed-test-definitions.txt)" -gt 0 ]
+        then
+          # Run all queries from changed test files to ensure that all new queries will be tested.
+          max_queries=0
+        else
+          max_queries=$CHPC_MAX_QUERIES
+        fi
+
         (
             set +x
             argv=(
                 --host localhost localhost
                 --port "$LEFT_SERVER_PORT" "$RIGHT_SERVER_PORT"
                 --runs "$CHPC_RUNS"
-                --max-queries "$CHPC_MAX_QUERIES"
+                --max-queries "$max_queries"
                 --profile-seconds "$profile_seconds"
 
                 "$test"
diff --git a/docker/test/performance-comparison/report.py b/docker/test/performance-comparison/report.py
index 4c1b6e1dd57..960f23be95c 100755
--- a/docker/test/performance-comparison/report.py
+++ b/docker/test/performance-comparison/report.py
@@ -41,24 +41,9 @@ color_good = "#b0d050"
 header_template = """
 <!DOCTYPE html>
 <html lang="en">
-<link rel="preload" as="font" href="https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2" type="font/woff2" crossorigin="anonymous"/>
 <style>
-@font-face {{
-    font-family:'Yandex Sans Display Web';
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot);
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot?#iefix) format('embedded-opentype'),
-            url(https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2) format('woff2'),
-            url(https://yastatic.net/adv-www/_/v2Sve_obH3rKm6rKrtSQpf-eB7U.woff) format('woff'),
-            url(https://yastatic.net/adv-www/_/PzD8hWLMunow5i3RfJ6WQJAL7aI.ttf) format('truetype'),
-            url(https://yastatic.net/adv-www/_/lF_KG5g4tpQNlYIgA0e77fBSZ5s.svg#YandexSansDisplayWeb-Regular) format('svg');
-    font-weight:400;
-    font-style:normal;
-    font-stretch:normal;
-    font-display: swap;
-}}
-
 body {{
-    font-family: "Yandex Sans Display Web", Arial, sans-serif;
+    font-family: "DejaVu Sans", "Noto Sans", Arial, sans-serif;
     background: #EEE;
 }}
 
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index ef375f8b206..234d0861f8b 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -7,6 +7,8 @@ RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get install --yes --no-install-recommends \
         python3-requests \
+        nodejs \
+        npm \
     && apt-get clean
 
 COPY s3downloader /s3downloader
@@ -14,5 +16,7 @@ COPY s3downloader /s3downloader
 ENV S3_URL="https://clickhouse-datasets.s3.amazonaws.com"
 ENV DATASETS="hits visits"
 
+RUN npm install -g azurite
+
 COPY run.sh /
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index d77978c904b..45a4601e028 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -17,6 +17,7 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
 # install test configs
 /usr/share/clickhouse-test/config/install.sh
 
+azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
 ./setup_minio.sh stateful
 
 function start()
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 9141e89d744..9a31c5bbb4c 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -17,6 +17,8 @@ RUN apt-get update -y \
             mysql-client=8.0* \
             ncdu \
             netcat-openbsd \
+            nodejs \
+            npm \
             openjdk-11-jre-headless \
             openssl \
             postgresql-client \
@@ -35,6 +37,7 @@ RUN apt-get update -y \
             wget \
             zstd \
             file \
+            pv \
     && apt-get clean
 
 
@@ -74,6 +77,8 @@ ENV MINIO_ROOT_USER="clickhouse"
 ENV MINIO_ROOT_PASSWORD="clickhouse"
 ENV EXPORT_S3_STORAGE_POLICIES=1
 
+RUN npm install -g azurite
+
 COPY run.sh /
 COPY setup_minio.sh /
 COPY setup_hdfs_minicluster.sh /
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 075f588cae3..4e7555ea3a4 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -18,6 +18,12 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
 # install test configs
 /usr/share/clickhouse-test/config/install.sh
 
+if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+    echo "Azure is disabled"
+else
+    azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
+fi
+
 ./setup_minio.sh stateless
 ./setup_hdfs_minicluster.sh
 
@@ -58,6 +64,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
     --mysql_port 19004 --postgresql_port 19005 \
     --keeper_server.tcp_port 19181 --keeper_server.server_id 2 \
+    --prometheus.port 19988 \
     --macros.replica r2   # It doesn't work :(
 
     mkdir -p /var/run/clickhouse-server2
@@ -69,6 +76,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
     --mysql_port 29004 --postgresql_port 29005 \
     --keeper_server.tcp_port 29181 --keeper_server.server_id 3 \
+    --prometheus.port 29988 \
     --macros.shard s2   # It doesn't work :(
 
     MAX_RUN_TIME=$((MAX_RUN_TIME < 9000 ? MAX_RUN_TIME : 9000))  # min(MAX_RUN_TIME, 2.5 hours)
@@ -84,13 +92,9 @@ function run_tests()
     # more idiologically correct.
     read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
 
-    # Skip these tests, because they fail when we rerun them multiple times
+    # Use random order in flaky check
     if [ "$NUM_TRIES" -gt "1" ]; then
         ADDITIONAL_OPTIONS+=('--order=random')
-        ADDITIONAL_OPTIONS+=('--skip')
-        ADDITIONAL_OPTIONS+=('00000_no_tests_to_skip')
-        # Note that flaky check must be ran in parallel, but for now we run
-        # everything in parallel except DatabaseReplicated. See below.
     fi
 
     if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TREE" -eq 1 ]]; then
@@ -129,6 +133,13 @@ function run_tests()
 
 export -f run_tests
 
+if [ "$NUM_TRIES" -gt "1" ]; then
+    # We don't run tests with Ordinary database in PRs, only in master.
+    # So run new/changed tests with Ordinary at least once in flaky check.
+    timeout "$MAX_RUN_TIME" bash -c 'NUM_TRIES=1; USE_DATABASE_ORDINARY=1; run_tests' \
+      | sed 's/All tests have finished//' | sed 's/No tests were run//' ||:
+fi
+
 timeout "$MAX_RUN_TIME" bash -c run_tests ||:
 
 echo "Files in current directory"
diff --git a/docker/test/stateless_pytest/Dockerfile b/docker/test/stateless_pytest/Dockerfile
deleted file mode 100644
index 789ee0e9b30..00000000000
--- a/docker/test/stateless_pytest/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# rebuild in #33610
-# docker build -t clickhouse/stateless-pytest .
-ARG FROM_TAG=latest
-FROM clickhouse/test-base:$FROM_TAG
-
-RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-        brotli \
-        netcat-openbsd \
-        postgresql-client \
-        zstd
-
-RUN python3 -m pip install \
-    wheel \
-    pytest \
-    pytest-html \
-    pytest-json \
-    pytest-randomly \
-    pytest-rerunfailures \
-    pytest-timeout \
-    pytest-xdist \
-    pandas \
-    numpy \
-    scipy
-
-CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
-    dpkg -i package_folder/clickhouse-common-static-dbg_*.deb; \
-    dpkg -i package_folder/clickhouse-server_*.deb;  \
-    dpkg -i package_folder/clickhouse-client_*.deb; \
-    python3 -m pytest /usr/share/clickhouse-test/queries -n $(nproc) --reruns=1 --timeout=600 --json=test_output/report.json --html=test_output/report.html --self-contained-html
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 33b60ae7ef9..5dc5ffa2f21 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -178,6 +178,7 @@ install_packages package_folder
 
 configure
 
+azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
 ./setup_minio.sh stateful  # to have a proper environment
 
 start
@@ -218,6 +219,12 @@ clickhouse-client --query "SELECT 'Server successfully started', 'OK'" >> /test_
                        || (echo -e 'Server failed to start (see application_errors.txt and clickhouse-server.clean.log)\tFAIL' >> /test_output/test_results.tsv \
                        && grep -a "<Error>.*Application" /var/log/clickhouse-server/clickhouse-server.log > /test_output/application_errors.txt)
 
+echo "Get previous release tag"
+previous_release_tag=$(clickhouse-client --query="SELECT version()" | get_previous_release_tag)
+echo $previous_release_tag
+
+stop
+
 [ -f /var/log/clickhouse-server/clickhouse-server.log ] || echo -e "Server log does not exist\tFAIL"
 [ -f /var/log/clickhouse-server/stderr.log ] || echo -e "Stderr log does not exist\tFAIL"
 
@@ -265,10 +272,6 @@ zgrep -Fa " received signal " /test_output/gdb.log > /dev/null \
 
 echo -e "Backward compatibility check\n"
 
-echo "Get previous release tag"
-previous_release_tag=$(clickhouse-client --query="SELECT version()" | get_previous_release_tag)
-echo $previous_release_tag
-
 echo "Clone previous release repository"
 git clone https://github.com/ClickHouse/ClickHouse.git --no-tags --progress --branch=$previous_release_tag --no-recurse-submodules --depth=1 previous_release_repository
 
@@ -278,7 +281,6 @@ mkdir previous_release_package_folder
 echo $previous_release_tag | download_release_packets && echo -e 'Download script exit code\tOK' >> /test_output/test_results.tsv \
     || echo -e 'Download script failed\tFAIL' >> /test_output/test_results.tsv
 
-stop
 mv /var/log/clickhouse-server/clickhouse-server.log /var/log/clickhouse-server/clickhouse-server.clean.log
 
 # Check if we cloned previous release repository successfully
@@ -314,6 +316,13 @@ else
     # Avoid "Setting allow_deprecated_database_ordinary is neither a builtin setting..."
     rm -f /etc/clickhouse-server/users.d/database_ordinary.xml ||:
 
+    # Remove s3 related configs to avoid "there is no disk type `cache`"
+    rm -f /etc/clickhouse-server/config.d/storage_conf.xml ||:
+    rm -f /etc/clickhouse-server/config.d/azure_storage_conf.xml ||:
+
+    # Disable aggressive cleanup of tmp dirs (it worked incorrectly before 22.8)
+    rm -f /etc/clickhouse-server/config.d/merge_tree_old_dirs_cleanup.xml ||:
+
     start
 
     clickhouse-client --query="SELECT 'Server version: ', version()"
@@ -378,6 +387,7 @@ else
                -e "TABLE_IS_READ_ONLY" \
                -e "Code: 1000, e.code() = 111, Connection refused" \
                -e "UNFINISHED" \
+               -e "NETLINK_ERROR" \
                -e "Renaming unexpected part" \
                -e "PART_IS_TEMPORARILY_LOCKED" \
                -e "and a merge is impossible: we didn't find" \
@@ -390,6 +400,7 @@ else
                -e "Missing columns: 'v3' while processing query: 'v3, k, v1, v2, p'" \
                -e "This engine is deprecated and is not supported in transactions" \
                -e "[Queue = DB::MergeMutateRuntimeQueue]: Code: 235. DB::Exception: Part" \
+               -e "The set of parts restored in place of" \
         /var/log/clickhouse-server/clickhouse-server.backward.clean.log | zgrep -Fa "<Error>" > /test_output/bc_check_error_messages.txt \
         && echo -e 'Backward compatibility check: Error message in clickhouse-server.log (see bc_check_error_messages.txt)\tFAIL' >> /test_output/test_results.tsv \
         || echo -e 'Backward compatibility check: No Error messages in clickhouse-server.log\tOK' >> /test_output/test_results.tsv
@@ -455,3 +466,5 @@ for core in core.*; do
     pigz $core
     mv $core.gz /test_output/
 done
+
+dmesg -T > /test_output/dmesg.log
diff --git a/docker/test/stress/stress b/docker/test/stress/stress
index 6d90b9d5437..64cca4beb3a 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -77,7 +77,7 @@ def run_func_test(
     pipes = []
     for i in range(0, len(output_paths)):
         f = open(output_paths[i], "w")
-        full_command = "{} {} {} {} {}".format(
+        full_command = "{} {} {} {} {} --stress".format(
             cmd,
             get_options(i, backward_compatibility_check),
             global_time_limit_option,
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
index d9827260acb..b891b71492c 100644
--- a/docker/test/util/Dockerfile
+++ b/docker/test/util/Dockerfile
@@ -1,5 +1,82 @@
-# rebuild in #33610
 # docker build -t clickhouse/test-util .
-
 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
+
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=14
+
+RUN apt-get update \
+    && apt-get install \
+        apt-transport-https \
+        apt-utils \
+        ca-certificates \
+        dnsutils \
+        gnupg \
+        iputils-ping \
+        lsb-release \
+        wget \
+        --yes --no-install-recommends --verbose-versions \
+    && export LLVM_PUBKEY_HASH="bda960a8da687a275a2078d43c111d66b1c6a893a3275271beedf266c1ff4a0cdecb429c7a5cccf9f486ea7aa43fd27f" \
+    && wget -nv -O /tmp/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key \
+    && echo "${LLVM_PUBKEY_HASH} /tmp/llvm-snapshot.gpg.key" | sha384sum -c \
+    && apt-key add /tmp/llvm-snapshot.gpg.key \
+    && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
+    && echo "deb [trusted=yes] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
+        /etc/apt/sources.list \
+    && apt-get clean
+
+# initial packages
+RUN apt-get update \
+    && apt-get install \
+        bash \
+        bsdmainutils \
+        build-essential \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
+        cmake \
+        curl \
+        fakeroot \
+        gdb \
+        git \
+        gperf \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
+        moreutils \
+        nasm \
+        ninja-build \
+        pigz \
+        rename \
+        software-properties-common \
+        tzdata \
+        --yes --no-install-recommends \
+    && apt-get clean
+
+# This symlink required by gcc to find lld compiler
+RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
+
+ARG CCACHE_VERSION=4.6.1
+RUN mkdir /tmp/ccache \
+    && cd /tmp/ccache \
+    && curl -L \
+        -O https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz \
+        -O https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz.asc \
+    && gpg --recv-keys --keyserver hkps://keyserver.ubuntu.com 5A939A71A46792CF57866A51996DDA075594ADB8 \
+    && gpg --verify ccache-4.6.1.tar.xz.asc \
+    && tar xf ccache-$CCACHE_VERSION.tar.xz \
+    && cd /tmp/ccache/ccache-$CCACHE_VERSION \
+    && cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=None \
+        -DZSTD_FROM_INTERNET=ON \
+        -DREDIS_STORAGE_BACKEND=OFF \
+        -Wno-dev \
+        -B build \
+        -S . \
+    && make VERBOSE=1 -C build \
+    && make install -C build \
+    && cd / \
+    && rm -rf /tmp/ccache
+
 COPY process_functional_tests_result.py /
diff --git a/docker/test/util/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
index 647989e8421..28f3e211157 100755
--- a/docker/test/util/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -86,7 +86,7 @@ def process_test_log(log_path):
                 test_end = True
 
     test_results = [
-        (test[0], test[1], test[2], "".join(test[3]))[:4096] for test in test_results
+        (test[0], test[1], test[2], "".join(test[3])[:4096]) for test in test_results
     ]
 
     return (
diff --git a/docs/_description_templates/template-data-type.md b/docs/_description_templates/template-data-type.md
deleted file mode 100644
index 239edb2808b..00000000000
--- a/docs/_description_templates/template-data-type.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-toc_priority:
-toc_title:
----
-
-# data_type_name {#data_type-name}
-
-Description.
-
-**Parameters** (Optional)
-
--   `x` — Description. [Type name](relative/path/to/type/dscr.md#type).
--   `y` — Description. [Type name](relative/path/to/type/dscr.md#type).
-
-**Examples**
-
-```sql
-
-```
-
-## Additional Info {#additional-info} (Optional)
-
-The name of an additional section can be any, for example, **Usage**.
-
-**See Also** (Optional)
-
--   [link](#)
-
-[Original article](https://clickhouse.com/docs/en/data-types/<data-type-name>/) <!--hide-->
diff --git a/docs/_description_templates/template-engine.md b/docs/_description_templates/template-engine.md
deleted file mode 100644
index 392bc59ed33..00000000000
--- a/docs/_description_templates/template-engine.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# EngineName {#enginename}
-
--   What the Database/Table engine does.
--   Relations with other engines if they exist.
-
-## Creating a Database {#creating-a-database}
-``` sql
-    CREATE DATABASE ...
-```
-or
-
-## Creating a Table {#creating-a-table}
-``` sql
-    CREATE TABLE ...
-```
-
-**Engine Parameters**
-
-**Query Clauses** (for Table engines only)
-
-## Virtual columns {#virtual-columns} (for Table engines only)
-
-List and virtual columns with description, if they exist.
-
-## Data Types Support {#data_types-support} (for Database engines only)
-
-|  EngineName           | ClickHouse                         |
-|-----------------------|------------------------------------|
-| NativeDataTypeName    | [ClickHouseDataTypeName](link#)    |
-
-
-## Specifics and recommendations {#specifics-and-recommendations}
-
-Algorithms
-Specifics of read and write processes
-Examples of tasks
-Recommendations for usage
-Specifics of data storage
-
-## Usage Example {#usage-example}
-
-The example must show usage and use cases. The following text contains the recommended parts of this section.
-
-Input table:
-
-``` text
-```
-
-Query:
-
-``` sql
-```
-
-Result:
-
-``` text
-```
-
-Follow up with any text to clarify the example.
-
-**See Also**
-
--   [link](#)
diff --git a/docs/_description_templates/template-function.md b/docs/_description_templates/template-function.md
deleted file mode 100644
index 6bdc764c449..00000000000
--- a/docs/_description_templates/template-function.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## functionName {#functionname-in-lower-case}
-
-Short description.
-
-**Syntax** (without SELECT)
-
-``` sql
-<function syntax>
-```
-
-Alias: `<alias name>`. (Optional)
-
-More text (Optional).
-
-**Arguments** (Optional)
-
--   `x` — Description. Optional (only for optional arguments). Possible values: <values list>. Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
--   `y` — Description. Optional (only for optional arguments). Possible values: <values list>.Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
-
-**Parameters** (Optional, only for parametric aggregate functions)
-
--   `z` — Description. Optional (only for optional parameters). Possible values: <values list>. Default value: <value>. [Type name](relative/path/to/type/dscr.md#type).
-
-**Returned value(s)**
-
--   Returned values list.
-
-Type: [Type name](relative/path/to/type/dscr.md#type).
-
-**Example**
-
-The example must show usage and/or a use cases. The following text contains recommended parts of an example.
-
-Input table (Optional):
-
-``` text
-```
-
-Query:
-
-``` sql
-```
-
-Result:
-
-``` text
-```
-
-**See Also** (Optional)
-
--   [link](#)
diff --git a/docs/_description_templates/template-server-setting.md b/docs/_description_templates/template-server-setting.md
deleted file mode 100644
index 0b37d46cf41..00000000000
--- a/docs/_description_templates/template-server-setting.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## server_setting_name {#server_setting_name}
-
-Description.
-
-Describe what is configured in this section of settings.
-
-Possible value: ...
-
-Default value: ...
-
-**Settings** (Optional)
-
-If the section contains several settings, list them here. Specify possible values and default values:
-
--   setting_1 — Description.
--   setting_2 — Description.
-
-**Example**
-
-```xml
-<server_setting_name>
-    <setting_1> ... </setting_1>
-    <setting_2> ... </setting_2>
-</server_setting_name>
-```
-
-**Additional Info** (Optional)
-
-The name of an additional section can be any, for example, **Usage**.
-
-**See Also** (Optional)
-
--   [link](#)
diff --git a/docs/_description_templates/template-setting.md b/docs/_description_templates/template-setting.md
deleted file mode 100644
index fc912aba3e1..00000000000
--- a/docs/_description_templates/template-setting.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## setting_name {#setting_name}
-
-Description.
-
-For the switch setting, use the typical phrase: “Enables or disables something …”.
-
-Possible values:
-
-*For switcher setting:*
-
--   0 — Disabled.
--   1 — Enabled.
-
-*For another setting (typical phrases):*
-
--   Positive integer.
--   0 — Disabled or unlimited or something else.
-
-Default value: `value`.
-
-**Additional Info** (Optional)
-
-The name of an additional section can be any, for example, **Usage**.
-
-**See Also** (Optional)
-
--   [link](#)
diff --git a/docs/_description_templates/template-statement.md b/docs/_description_templates/template-statement.md
deleted file mode 100644
index 238570c2217..00000000000
--- a/docs/_description_templates/template-statement.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Statement name (for example, SHOW USER) {#statement-name-in-lower-case}
-
-Brief description of what the statement does.
-
-**Syntax**
-
-```sql
-Syntax of the statement.
-```
-
-## Other necessary sections of the description (Optional) {#anchor}
-
-Examples of descriptions with a complicated structure:
-
-- https://clickhouse.com/docs/en/sql-reference/statements/grant/
-- https://clickhouse.com/docs/en/sql-reference/statements/revoke/
-- https://clickhouse.com/docs/en/sql-reference/statements/select/join/
-
-
-**See Also** (Optional)
-
-Links to related topics as a list.
-
--   [link](#)
diff --git a/docs/_description_templates/template-system-table.md b/docs/_description_templates/template-system-table.md
deleted file mode 100644
index f2decc4bb6d..00000000000
--- a/docs/_description_templates/template-system-table.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# system.table_name {#system-tables_table-name}
-
-Description.
-
-Columns:
-
--   `column_name` ([data_type_name](path/to/data_type.md)) — Description.
-
-**Example**
-
-Query:
-
-``` sql
-SELECT * FROM system.table_name
-```
-
-Result:
-
-``` text
-Some output. It shouldn't be too long.
-```
-
-**See Also**
-
--   [Article name](path/to/article_name.md) — Some words about referenced information.
diff --git a/docs/changelogs/v22.3.1.1262-prestable.md b/docs/changelogs/v22.3.1.1262-prestable.md
index 0058396d634..6c16a92ed26 100644
--- a/docs/changelogs/v22.3.1.1262-prestable.md
+++ b/docs/changelogs/v22.3.1.1262-prestable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.1.1262-prestable FIXME as compared to v22.2.1.2139-prestable
+### ClickHouse release v22.3.1.1262-prestable (92ab33f560e) FIXME as compared to v22.2.1.2139-prestable (75366fc95e5)
 
 #### Backward Incompatible Change
 * Improvement the toDatetime function overflows. When the date string is very large, it will be converted to 1970. [#32898](https://github.com/ClickHouse/ClickHouse/pull/32898) ([HaiBo Li](https://github.com/marising)).
diff --git a/docs/changelogs/v22.3.10.22-lts.md b/docs/changelogs/v22.3.10.22-lts.md
new file mode 100644
index 00000000000..48009cb4f67
--- /dev/null
+++ b/docs/changelogs/v22.3.10.22-lts.md
@@ -0,0 +1,30 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.10.22-lts (25886f517d4) FIXME as compared to v22.3.9.19-lts (7976930b82e)
+
+#### Bug Fix
+* Backported in [#39761](https://github.com/ClickHouse/ClickHouse/issues/39761): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39206](https://github.com/ClickHouse/ClickHouse/issues/39206): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39381](https://github.com/ClickHouse/ClickHouse/issues/39381): Fixed error `Not found column Type in block` in selects with `PREWHERE` and read-in-order optimizations. [#39157](https://github.com/ClickHouse/ClickHouse/pull/39157) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#39588](https://github.com/ClickHouse/ClickHouse/issues/39588): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39610](https://github.com/ClickHouse/ClickHouse/issues/39610): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39834](https://github.com/ClickHouse/ClickHouse/issues/39834): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#39238](https://github.com/ClickHouse/ClickHouse/issues/39238): Fix performance regression of scalar query optimization. [#35986](https://github.com/ClickHouse/ClickHouse/pull/35986) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#39531](https://github.com/ClickHouse/ClickHouse/issues/39531): Fix some issues with async reads from remote filesystem which happened when reading low cardinality. [#36763](https://github.com/ClickHouse/ClickHouse/pull/36763) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.3.11.12-lts.md b/docs/changelogs/v22.3.11.12-lts.md
new file mode 100644
index 00000000000..b10de69e234
--- /dev/null
+++ b/docs/changelogs/v22.3.11.12-lts.md
@@ -0,0 +1,20 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.11.12-lts (137c5f72657) FIXME as compared to v22.3.10.22-lts (25886f517d4)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39881](https://github.com/ClickHouse/ClickHouse/issues/39881): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39336](https://github.com/ClickHouse/ClickHouse/issues/39336): Fix `parallel_view_processing=1` with `optimize_trivial_insert_select=1`. Fix `max_insert_threads` while pushing to views. [#38731](https://github.com/ClickHouse/ClickHouse/pull/38731) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Backport [#39687](https://github.com/ClickHouse/ClickHouse/issues/39687) to 22.3: Fix seeking while reading from encrypted disk"'. [#40052](https://github.com/ClickHouse/ClickHouse/pull/40052) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
diff --git a/docs/changelogs/v22.3.2.2-lts.md b/docs/changelogs/v22.3.2.2-lts.md
index b755db300c8..b873926e068 100644
--- a/docs/changelogs/v22.3.2.2-lts.md
+++ b/docs/changelogs/v22.3.2.2-lts.md
@@ -5,5 +5,5 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.2.2-lts FIXME as compared to v22.3.1.1262-prestable
+### ClickHouse release v22.3.2.2-lts (89a621679c6) FIXME as compared to v22.3.1.1262-prestable (92ab33f560e)
 
diff --git a/docs/changelogs/v22.3.3.44-lts.md b/docs/changelogs/v22.3.3.44-lts.md
index 4cd48eefa5a..d0da3397d1d 100644
--- a/docs/changelogs/v22.3.3.44-lts.md
+++ b/docs/changelogs/v22.3.3.44-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.3.44-lts FIXME as compared to v22.3.2.2-lts
+### ClickHouse release v22.3.3.44-lts (abb756d3ca2) FIXME as compared to v22.3.2.2-lts (89a621679c6)
 
 #### Bug Fix
 * Backported in [#35928](https://github.com/ClickHouse/ClickHouse/issues/35928): Added settings `input_format_ipv4_default_on_conversion_error`, `input_format_ipv6_default_on_conversion_error` to allow insert of invalid ip address values as default into tables. Closes [#35726](https://github.com/ClickHouse/ClickHouse/issues/35726). [#35733](https://github.com/ClickHouse/ClickHouse/pull/35733) ([Maksim Kita](https://github.com/kitaisreal)).
diff --git a/docs/changelogs/v22.3.4.20-lts.md b/docs/changelogs/v22.3.4.20-lts.md
index d820adbdbec..34a8cd8c25a 100644
--- a/docs/changelogs/v22.3.4.20-lts.md
+++ b/docs/changelogs/v22.3.4.20-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.4.20-lts FIXME as compared to v22.3.3.44-lts
+### ClickHouse release v22.3.4.20-lts (ecbaf001f49) FIXME as compared to v22.3.3.44-lts (abb756d3ca2)
 
 #### Build/Testing/Packaging Improvement
 * - Add `_le_` method for ClickHouseVersion - Fix auto_version for existing tag - docker_server now support getting version from tags - Add python unit tests to backport workflow. [#36028](https://github.com/ClickHouse/ClickHouse/pull/36028) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.3.5.5-lts.md b/docs/changelogs/v22.3.5.5-lts.md
index 7deff1be416..fc1332b68c6 100644
--- a/docs/changelogs/v22.3.5.5-lts.md
+++ b/docs/changelogs/v22.3.5.5-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.5.5-lts FIXME as compared to v22.3.4.20-lts
+### ClickHouse release v22.3.5.5-lts (438b4a81f77) FIXME as compared to v22.3.4.20-lts (ecbaf001f49)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.3.6.5-lts.md b/docs/changelogs/v22.3.6.5-lts.md
index 4b4772c611a..535fa0e7ad3 100644
--- a/docs/changelogs/v22.3.6.5-lts.md
+++ b/docs/changelogs/v22.3.6.5-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.6.5-lts FIXME as compared to v22.3.5.5-lts
+### ClickHouse release v22.3.6.5-lts (3e44e824cff) FIXME as compared to v22.3.5.5-lts (438b4a81f77)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.3.7.28-lts.md b/docs/changelogs/v22.3.7.28-lts.md
index 14cb8628f09..5a6900e7fa4 100644
--- a/docs/changelogs/v22.3.7.28-lts.md
+++ b/docs/changelogs/v22.3.7.28-lts.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.3.7.28-lts FIXME as compared to v22.3.6.5-lts
+### ClickHouse release v22.3.7.28-lts (420bdfa2751) FIXME as compared to v22.3.6.5-lts (3e44e824cff)
 
 #### Bug Fix (user-visible misbehavior in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.3.8.39-lts.md b/docs/changelogs/v22.3.8.39-lts.md
new file mode 100644
index 00000000000..893e8762e9c
--- /dev/null
+++ b/docs/changelogs/v22.3.8.39-lts.md
@@ -0,0 +1,32 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.8.39-lts (6bcf982f58b) FIXME as compared to v22.3.7.28-lts (420bdfa2751)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#38826](https://github.com/ClickHouse/ClickHouse/issues/38826): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#38453](https://github.com/ClickHouse/ClickHouse/issues/38453): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#38710](https://github.com/ClickHouse/ClickHouse/issues/38710): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38689](https://github.com/ClickHouse/ClickHouse/issues/38689): Now it's possible to start a clickhouse-server and attach/detach tables even for tables with the incorrect values of IPv4/IPv6 representation. Proper fix for issue [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#38590](https://github.com/ClickHouse/ClickHouse/pull/38590) ([alesapin](https://github.com/alesapin)).
+* Backported in [#38776](https://github.com/ClickHouse/ClickHouse/issues/38776): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#38780](https://github.com/ClickHouse/ClickHouse/issues/38780): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#36818](https://github.com/ClickHouse/ClickHouse/issues/36818): Fix projection analysis which might lead to wrong query result when IN subquery is used. This fixes [#35336](https://github.com/ClickHouse/ClickHouse/issues/35336). [#35631](https://github.com/ClickHouse/ClickHouse/pull/35631) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#38467](https://github.com/ClickHouse/ClickHouse/issues/38467): - Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Try to fix some trash [#37303](https://github.com/ClickHouse/ClickHouse/pull/37303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update docker-compose to try get rid of v1 errors [#38394](https://github.com/ClickHouse/ClickHouse/pull/38394) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Trying backport useful features for CI [#38510](https://github.com/ClickHouse/ClickHouse/pull/38510) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix backports diff [#38703](https://github.com/ClickHouse/ClickHouse/pull/38703) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.3.9.19-lts.md b/docs/changelogs/v22.3.9.19-lts.md
new file mode 100644
index 00000000000..c00b9bfc8eb
--- /dev/null
+++ b/docs/changelogs/v22.3.9.19-lts.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.3.9.19-lts (7976930b82e) FIXME as compared to v22.3.8.39-lts (6bcf982f58b)
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39097](https://github.com/ClickHouse/ClickHouse/issues/39097): Any allocations inside OvercommitTracker may lead to deadlock. Logging was not very informative so it's easier just to remove logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794). [#39030](https://github.com/ClickHouse/ClickHouse/pull/39030) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#39080](https://github.com/ClickHouse/ClickHouse/issues/39080): Fix bug in filesystem cache that could happen in some corner case which coincided with cache capacity hitting the limit. Closes [#39066](https://github.com/ClickHouse/ClickHouse/issues/39066). [#39070](https://github.com/ClickHouse/ClickHouse/pull/39070) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#39149](https://github.com/ClickHouse/ClickHouse/issues/39149): Fix error `Block structure mismatch` which could happen for INSERT into table with attached MATERIALIZED VIEW and enabled setting `extremes = 1`. Closes [#29759](https://github.com/ClickHouse/ClickHouse/issues/29759) and [#38729](https://github.com/ClickHouse/ClickHouse/issues/38729). [#39125](https://github.com/ClickHouse/ClickHouse/pull/39125) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#39372](https://github.com/ClickHouse/ClickHouse/issues/39372): Declare RabbitMQ queue without default arguments `x-max-length` and `x-overflow`. [#39259](https://github.com/ClickHouse/ClickHouse/pull/39259) ([rnbondarenko](https://github.com/rnbondarenko)).
+* Backported in [#39379](https://github.com/ClickHouse/ClickHouse/issues/39379): Fix segmentation fault in MaterializedPostgreSQL database engine, which could happen if some exception occurred at replication initialisation. Closes [#36939](https://github.com/ClickHouse/ClickHouse/issues/36939). [#39272](https://github.com/ClickHouse/ClickHouse/pull/39272) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#39351](https://github.com/ClickHouse/ClickHouse/issues/39351): Fix incorrect fetch postgresql tables query fro PostgreSQL database engine. Closes [#33502](https://github.com/ClickHouse/ClickHouse/issues/33502). [#39283](https://github.com/ClickHouse/ClickHouse/pull/39283) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Reproduce and a little bit better fix for LC dict right offset. [#36856](https://github.com/ClickHouse/ClickHouse/pull/36856) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Retry docker buildx commands with progressive sleep in between [#38898](https://github.com/ClickHouse/ClickHouse/pull/38898) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add docker_server.py running to backport and release CIs [#39011](https://github.com/ClickHouse/ClickHouse/pull/39011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.4.1.2305-prestable.md b/docs/changelogs/v22.4.1.2305-prestable.md
index c202b0b9331..da1ba4a42bd 100644
--- a/docs/changelogs/v22.4.1.2305-prestable.md
+++ b/docs/changelogs/v22.4.1.2305-prestable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.1.2305-prestable FIXME as compared to v22.3.1.1262-prestable
+### ClickHouse release v22.4.1.2305-prestable (77a82cc090d) FIXME as compared to v22.3.1.1262-prestable (92ab33f560e)
 
 #### Backward Incompatible Change
 * Function `yandexConsistentHash` (consistent hashing algorithm by Konstantin "kostik" Oblakov) is renamed to `kostikConsistentHash`. The old name is left as an alias for compatibility. Although this change is backward compatible, we may remove the alias in subsequent releases, that's why it's recommended to update the usages of this function in your apps. [#35553](https://github.com/ClickHouse/ClickHouse/pull/35553) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -68,7 +68,7 @@ sidebar_label: 2022
 * For lts releases packages will be pushed to both lts and stable repos. [#35382](https://github.com/ClickHouse/ClickHouse/pull/35382) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Support uuid for postgres engines. Closes [#35384](https://github.com/ClickHouse/ClickHouse/issues/35384). [#35403](https://github.com/ClickHouse/ClickHouse/pull/35403) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Add arguments `--user`, `--password`, `--host`, `--port` for clickhouse-diagnostics. [#35422](https://github.com/ClickHouse/ClickHouse/pull/35422) ([李扬](https://github.com/taiyang-li)).
-* fix INSERT INTO table FROM INFILE does not display progress bar. [#35429](https://github.com/ClickHouse/ClickHouse/pull/35429) ([xiedeyantu](https://github.com/xiedeyantu)).
+* fix INSERT INTO table FROM INFILE does not display progress bar. [#35429](https://github.com/ClickHouse/ClickHouse/pull/35429) ([chen](https://github.com/xiedeyantu)).
 * Allow server to bind to low-numbered ports (e.g. 443). ClickHouse installation script will set `cap_net_bind_service` to the binary file. [#35451](https://github.com/ClickHouse/ClickHouse/pull/35451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add settings `input_format_orc_case_insensitive_column_matching`, `input_format_arrow_case_insensitive_column_matching`, and `input_format_parquet_case_insensitive_column_matching` which allows ClickHouse to use case insensitive matching of columns while reading data from ORC, Arrow or Parquet files. [#35459](https://github.com/ClickHouse/ClickHouse/pull/35459) ([Antonio Andelic](https://github.com/antonio2368)).
 * - Add explicit table info to the scan node of query plan and pipeline. [#35460](https://github.com/ClickHouse/ClickHouse/pull/35460) ([何李夫](https://github.com/helifu)).
@@ -106,7 +106,7 @@ sidebar_label: 2022
 * ASTPartition::formatImpl should output ALL while executing ALTER TABLE t DETACH PARTITION ALL. [#35987](https://github.com/ClickHouse/ClickHouse/pull/35987) ([awakeljw](https://github.com/awakeljw)).
 * `clickhouse-keeper` starts answering 4-letter commands before getting the quorum. [#35992](https://github.com/ClickHouse/ClickHouse/pull/35992) ([Antonio Andelic](https://github.com/antonio2368)).
 * Fix wrong assertion in replxx which happens when navigating back the history when the first line of input is a newline. Mark as improvement because it only affects debug build. This fixes [#34511](https://github.com/ClickHouse/ClickHouse/issues/34511). [#36007](https://github.com/ClickHouse/ClickHouse/pull/36007) ([Amos Bird](https://github.com/amosbird)).
-* If someone writes DEFAULT NULL in table definition, make data type Nullable. [#35887](https://github.com/ClickHouse/ClickHouse/issues/35887). [#36058](https://github.com/ClickHouse/ClickHouse/pull/36058) ([xiedeyantu](https://github.com/xiedeyantu)).
+* If someone writes DEFAULT NULL in table definition, make data type Nullable. [#35887](https://github.com/ClickHouse/ClickHouse/issues/35887). [#36058](https://github.com/ClickHouse/ClickHouse/pull/36058) ([chen](https://github.com/xiedeyantu)).
 * Added `thread_id` and `query_id` columns to `system.zookeeper_log` table. [#36074](https://github.com/ClickHouse/ClickHouse/pull/36074) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Auto assign numbers for Enum elements. [#36101](https://github.com/ClickHouse/ClickHouse/pull/36101) ([awakeljw](https://github.com/awakeljw)).
 * Reset thread name in `ThreadPool` to `ThreadPoolIdle` after job is done. This is to avoid displaying the old thread name for idle threads. This closes [#36114](https://github.com/ClickHouse/ClickHouse/issues/36114). [#36115](https://github.com/ClickHouse/ClickHouse/pull/36115) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
@@ -331,7 +331,7 @@ sidebar_label: 2022
 * ci: replace directory system log tables artifacts with tsv [#35773](https://github.com/ClickHouse/ClickHouse/pull/35773) ([Azat Khuzhin](https://github.com/azat)).
 * One more try to resurrect build hash [#35774](https://github.com/ClickHouse/ClickHouse/pull/35774) ([alesapin](https://github.com/alesapin)).
 * Refactoring QueryPipeline [#35789](https://github.com/ClickHouse/ClickHouse/pull/35789) ([Amos Bird](https://github.com/amosbird)).
-* Delete duplicate code [#35798](https://github.com/ClickHouse/ClickHouse/pull/35798) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Delete duplicate code [#35798](https://github.com/ClickHouse/ClickHouse/pull/35798) ([chen](https://github.com/xiedeyantu)).
 * remove unused variable [#35800](https://github.com/ClickHouse/ClickHouse/pull/35800) ([flynn](https://github.com/ucasfl)).
 * Make `SortDescription::column_name` always non-empty [#35805](https://github.com/ClickHouse/ClickHouse/pull/35805) ([Nikita Taranov](https://github.com/nickitat)).
 * Fix latest_error referenced before assignment [#35807](https://github.com/ClickHouse/ClickHouse/pull/35807) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
@@ -417,7 +417,7 @@ sidebar_label: 2022
 * Revert reverting "Fix crash in ParallelReadBuffer" [#36212](https://github.com/ClickHouse/ClickHouse/pull/36212) ([Kruglov Pavel](https://github.com/Avogar)).
 * Make stateless tests with s3 always green [#36214](https://github.com/ClickHouse/ClickHouse/pull/36214) ([Alexander Tokmakov](https://github.com/tavplubix)).
 * Add Tyler Hannan to contributors [#36216](https://github.com/ClickHouse/ClickHouse/pull/36216) ([Tyler Hannan](https://github.com/tylerhannan)).
-* Fix the repeated call of func to get the table when drop table [#36248](https://github.com/ClickHouse/ClickHouse/pull/36248) ([xiedeyantu](https://github.com/xiedeyantu)).
+* Fix the repeated call of func to get the table when drop table [#36248](https://github.com/ClickHouse/ClickHouse/pull/36248) ([chen](https://github.com/xiedeyantu)).
 * Split test 01675_data_type_coroutine into 2 tests to prevent possible timeouts [#36250](https://github.com/ClickHouse/ClickHouse/pull/36250) ([Kruglov Pavel](https://github.com/Avogar)).
 * Merge TRUSTED_CONTRIBUTORS in lambda and import in check [#36252](https://github.com/ClickHouse/ClickHouse/pull/36252) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Fix exception "File segment can be completed only by downloader" in tests [#36253](https://github.com/ClickHouse/ClickHouse/pull/36253) ([Kseniia Sumarokova](https://github.com/kssenii)).
diff --git a/docs/changelogs/v22.4.2.1-stable.md b/docs/changelogs/v22.4.2.1-stable.md
index fb77d3fee9b..2bd245e00e7 100644
--- a/docs/changelogs/v22.4.2.1-stable.md
+++ b/docs/changelogs/v22.4.2.1-stable.md
@@ -5,5 +5,5 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.2.1-stable FIXME as compared to v22.4.1.2305-prestable
+### ClickHouse release v22.4.2.1-stable (b34ebdc36ae) FIXME as compared to v22.4.1.2305-prestable (77a82cc090d)
 
diff --git a/docs/changelogs/v22.4.3.3-stable.md b/docs/changelogs/v22.4.3.3-stable.md
index 4baa63672ab..3b0f1e11cd5 100644
--- a/docs/changelogs/v22.4.3.3-stable.md
+++ b/docs/changelogs/v22.4.3.3-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.3.3-stable FIXME as compared to v22.4.2.1-stable
+### ClickHouse release v22.4.3.3-stable (def956d6299) FIXME as compared to v22.4.2.1-stable (b34ebdc36ae)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.4.4.7-stable.md b/docs/changelogs/v22.4.4.7-stable.md
index 71e077ac071..a0bc92db3e8 100644
--- a/docs/changelogs/v22.4.4.7-stable.md
+++ b/docs/changelogs/v22.4.4.7-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.4.7-stable FIXME as compared to v22.4.3.3-stable
+### ClickHouse release v22.4.4.7-stable (ba44414f9b3) FIXME as compared to v22.4.3.3-stable (def956d6299)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.4.5.9-stable.md b/docs/changelogs/v22.4.5.9-stable.md
index 636ad2ed3ac..a80dfd01a2b 100644
--- a/docs/changelogs/v22.4.5.9-stable.md
+++ b/docs/changelogs/v22.4.5.9-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.4.5.9-stable FIXME as compared to v22.4.4.7-stable
+### ClickHouse release v22.4.5.9-stable (059ef6cadcd) FIXME as compared to v22.4.4.7-stable (ba44414f9b3)
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
 
diff --git a/docs/changelogs/v22.4.6.53-stable.md b/docs/changelogs/v22.4.6.53-stable.md
new file mode 100644
index 00000000000..cdd4c885574
--- /dev/null
+++ b/docs/changelogs/v22.4.6.53-stable.md
@@ -0,0 +1,44 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.4.6.53-stable (0625731c940) FIXME as compared to v22.4.5.9-stable (059ef6cadcd)
+
+#### New Feature
+* Backported in [#38714](https://github.com/ClickHouse/ClickHouse/issues/38714): SALT is allowed for CREATE USER <user> IDENTIFIED WITH sha256_hash. [#37377](https://github.com/ClickHouse/ClickHouse/pull/37377) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#38828](https://github.com/ClickHouse/ClickHouse/issues/38828): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#37717](https://github.com/ClickHouse/ClickHouse/issues/37717): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
+* Backported in [#37512](https://github.com/ClickHouse/ClickHouse/issues/37512): Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#37941](https://github.com/ClickHouse/ClickHouse/issues/37941): Fix setting cast_ipv4_ipv6_default_on_conversion_error for internal cast function. Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#37761](https://github.com/ClickHouse/ClickHouse/pull/37761) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#38452](https://github.com/ClickHouse/ClickHouse/issues/38452): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#38711](https://github.com/ClickHouse/ClickHouse/issues/38711): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38593](https://github.com/ClickHouse/ClickHouse/issues/38593): Fix parts removal (will be left forever if they had not been removed on server shutdown) after incorrect server shutdown. [#38486](https://github.com/ClickHouse/ClickHouse/pull/38486) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#38596](https://github.com/ClickHouse/ClickHouse/issues/38596): Fix table creation to avoid replication issues with pre-22.4 replicas. [#38541](https://github.com/ClickHouse/ClickHouse/pull/38541) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38686](https://github.com/ClickHouse/ClickHouse/issues/38686): Now it's possible to start a clickhouse-server and attach/detach tables even for tables with the incorrect values of IPv4/IPv6 representation. Proper fix for issue [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#38590](https://github.com/ClickHouse/ClickHouse/pull/38590) ([alesapin](https://github.com/alesapin)).
+* Backported in [#38663](https://github.com/ClickHouse/ClickHouse/issues/38663): Adapt some more nodes to avoid issues with pre-22.4 replicas. [#38627](https://github.com/ClickHouse/ClickHouse/pull/38627) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38777](https://github.com/ClickHouse/ClickHouse/issues/38777): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#38781](https://github.com/ClickHouse/ClickHouse/issues/38781): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Bug Fix (user-visible misbehaviour in official stable or prestable release)
+
+* Backported in [#37456](https://github.com/ClickHouse/ClickHouse/issues/37456): Server might fail to start if it cannot resolve hostname of external ClickHouse dictionary. It's fixed. Fixes [#36451](https://github.com/ClickHouse/ClickHouse/issues/36451). [#36463](https://github.com/ClickHouse/ClickHouse/pull/36463) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Backported in [#38468](https://github.com/ClickHouse/ClickHouse/issues/38468): - Fix potential error with literals in `WHERE` for join queries. Close [#36279](https://github.com/ClickHouse/ClickHouse/issues/36279). [#36542](https://github.com/ClickHouse/ClickHouse/pull/36542) ([Vladimir C](https://github.com/vdimir)).
+* Backported in [#37363](https://github.com/ClickHouse/ClickHouse/issues/37363): Fixed problem with infs in `quantileTDigest`. Fixes [#32107](https://github.com/ClickHouse/ClickHouse/issues/32107). [#37021](https://github.com/ClickHouse/ClickHouse/pull/37021) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Integration tests [#36866](https://github.com/ClickHouse/ClickHouse/pull/36866) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Try to fix some trash [#37303](https://github.com/ClickHouse/ClickHouse/pull/37303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update protobuf files for kafka and rabbitmq [fix integration tests] [#37884](https://github.com/ClickHouse/ClickHouse/pull/37884) ([Nikita Taranov](https://github.com/nickitat)).
+* Try fix `test_grpc_protocol/test.py::test_progress` [#37908](https://github.com/ClickHouse/ClickHouse/pull/37908) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update docker-compose to try get rid of v1 errors [#38394](https://github.com/ClickHouse/ClickHouse/pull/38394) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix backports diff [#38703](https://github.com/ClickHouse/ClickHouse/pull/38703) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.5.1.2079-stable.md b/docs/changelogs/v22.5.1.2079-stable.md
index dfdcad64561..f6ca6fcc478 100644
--- a/docs/changelogs/v22.5.1.2079-stable.md
+++ b/docs/changelogs/v22.5.1.2079-stable.md
@@ -5,10 +5,10 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.5.1.2079-stable FIXME as compared to v22.4.1.2305-prestable
+### ClickHouse release v22.5.1.2079-stable (df0cb062098) FIXME as compared to v22.4.1.2305-prestable (77a82cc090d)
 
 #### Backward Incompatible Change
-* Updated the BoringSSL module to the official FIPS compliant version. This makes ClickHouse FIPS compliant. [#35914](https://github.com/ClickHouse/ClickHouse/pull/35914) ([Meena-Renganathan](https://github.com/Meena-Renganathan)).
+* Updated the BoringSSL module to the official FIPS compliant version. This makes ClickHouse FIPS compliant. [#35914](https://github.com/ClickHouse/ClickHouse/pull/35914) ([Deleted user](https://github.com/ghost)).
 * Now, background merges, mutations and `OPTIMIZE` will not increment `SelectedRows` and `SelectedBytes` metrics. They (still) will increment `MergedRows` and `MergedUncompressedBytes` as it was before. [#37040](https://github.com/ClickHouse/ClickHouse/pull/37040) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
 #### New Feature
@@ -20,7 +20,7 @@ sidebar_label: 2022
 * Parse collations in CREATE TABLE, throw exception or ignore. closes [#35892](https://github.com/ClickHouse/ClickHouse/issues/35892). [#36271](https://github.com/ClickHouse/ClickHouse/pull/36271) ([yuuch](https://github.com/yuuch)).
 * Add aliases JSONLines and NDJSON for JSONEachRow. Closes [#36303](https://github.com/ClickHouse/ClickHouse/issues/36303). [#36327](https://github.com/ClickHouse/ClickHouse/pull/36327) ([flynn](https://github.com/ucasfl)).
 * Set parts_to_delay_insert and parts_to_throw_insert as query-level settings. If they are defined, they can override table-level settings. [#36371](https://github.com/ClickHouse/ClickHouse/pull/36371) ([Memo](https://github.com/Joeywzr)).
-* temporary table can show total rows and total bytes. [#36401](https://github.com/ClickHouse/ClickHouse/issues/36401). [#36439](https://github.com/ClickHouse/ClickHouse/pull/36439) ([xiedeyantu](https://github.com/xiedeyantu)).
+* temporary table can show total rows and total bytes. [#36401](https://github.com/ClickHouse/ClickHouse/issues/36401). [#36439](https://github.com/ClickHouse/ClickHouse/pull/36439) ([chen](https://github.com/xiedeyantu)).
 * Added new hash function - wyHash64. [#36467](https://github.com/ClickHouse/ClickHouse/pull/36467) ([olevino](https://github.com/olevino)).
 * Window function nth_value was added. [#36601](https://github.com/ClickHouse/ClickHouse/pull/36601) ([Nikolay](https://github.com/ndchikin)).
 * Add MySQLDump input format. It reads all data from INSERT queries belonging to one table in dump. If there are more than one table, by default it reads data from the first one. [#36667](https://github.com/ClickHouse/ClickHouse/pull/36667) ([Kruglov Pavel](https://github.com/Avogar)).
@@ -212,7 +212,7 @@ sidebar_label: 2022
 * Update version after release [#36502](https://github.com/ClickHouse/ClickHouse/pull/36502) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Followup on [#36172](https://github.com/ClickHouse/ClickHouse/issues/36172) password hash salt feature [#36510](https://github.com/ClickHouse/ClickHouse/pull/36510) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Update version_date.tsv after v22.4.2.1-stable [#36533](https://github.com/ClickHouse/ClickHouse/pull/36533) ([github-actions[bot]](https://github.com/apps/github-actions)).
-* fix log should print 'from' path [#36535](https://github.com/ClickHouse/ClickHouse/pull/36535) ([xiedeyantu](https://github.com/xiedeyantu)).
+* fix log should print 'from' path [#36535](https://github.com/ClickHouse/ClickHouse/pull/36535) ([chen](https://github.com/xiedeyantu)).
 * Add function bin tests for Int/UInt128/UInt256 [#36537](https://github.com/ClickHouse/ClickHouse/pull/36537) ([Memo](https://github.com/Joeywzr)).
 * Fix 01161_all_system_tables [#36539](https://github.com/ClickHouse/ClickHouse/pull/36539) ([Antonio Andelic](https://github.com/antonio2368)).
 * Update PULL_REQUEST_TEMPLATE.md [#36543](https://github.com/ClickHouse/ClickHouse/pull/36543) ([Ivan Blinkov](https://github.com/blinkov)).
diff --git a/docs/changelogs/v22.5.2.53-stable.md b/docs/changelogs/v22.5.2.53-stable.md
new file mode 100644
index 00000000000..10b64632680
--- /dev/null
+++ b/docs/changelogs/v22.5.2.53-stable.md
@@ -0,0 +1,40 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.5.2.53-stable (5fd600fda9e) FIXME as compared to v22.5.1.2079-stable (df0cb062098)
+
+#### New Feature
+* Backported in [#38713](https://github.com/ClickHouse/ClickHouse/issues/38713): SALT is allowed for CREATE USER <user> IDENTIFIED WITH sha256_hash. [#37377](https://github.com/ClickHouse/ClickHouse/pull/37377) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#38827](https://github.com/ClickHouse/ClickHouse/issues/38827): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#37716](https://github.com/ClickHouse/ClickHouse/issues/37716): Fix unexpected errors with a clash of constant strings in aggregate function, prewhere and join. Close [#36891](https://github.com/ClickHouse/ClickHouse/issues/36891). [#37336](https://github.com/ClickHouse/ClickHouse/pull/37336) ([Vladimir C](https://github.com/vdimir)).
+* Backported in [#37408](https://github.com/ClickHouse/ClickHouse/issues/37408): Throw an exception when GROUPING SETS used with ROLLUP or CUBE. [#37367](https://github.com/ClickHouse/ClickHouse/pull/37367) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#37513](https://github.com/ClickHouse/ClickHouse/issues/37513): Fix logical error in normalizeUTF8 functions. Closes [#37298](https://github.com/ClickHouse/ClickHouse/issues/37298). [#37443](https://github.com/ClickHouse/ClickHouse/pull/37443) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#37942](https://github.com/ClickHouse/ClickHouse/issues/37942): Fix setting cast_ipv4_ipv6_default_on_conversion_error for internal cast function. Closes [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#37761](https://github.com/ClickHouse/ClickHouse/pull/37761) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#38451](https://github.com/ClickHouse/ClickHouse/issues/38451): Fix bug with nested short-circuit functions that led to execution of arguments even if condition is false. Closes [#38040](https://github.com/ClickHouse/ClickHouse/issues/38040). [#38173](https://github.com/ClickHouse/ClickHouse/pull/38173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#38544](https://github.com/ClickHouse/ClickHouse/issues/38544): Do not allow recursive usage of OvercommitTracker during logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794) cc @tavplubix @davenger. [#38246](https://github.com/ClickHouse/ClickHouse/pull/38246) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#38708](https://github.com/ClickHouse/ClickHouse/issues/38708): Fix incorrect result of distributed queries with `DISTINCT` and `LIMIT`. Fixes [#38282](https://github.com/ClickHouse/ClickHouse/issues/38282). [#38371](https://github.com/ClickHouse/ClickHouse/pull/38371) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38595](https://github.com/ClickHouse/ClickHouse/issues/38595): Fix parts removal (will be left forever if they had not been removed on server shutdown) after incorrect server shutdown. [#38486](https://github.com/ClickHouse/ClickHouse/pull/38486) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#38598](https://github.com/ClickHouse/ClickHouse/issues/38598): Fix table creation to avoid replication issues with pre-22.4 replicas. [#38541](https://github.com/ClickHouse/ClickHouse/pull/38541) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38688](https://github.com/ClickHouse/ClickHouse/issues/38688): Now it's possible to start a clickhouse-server and attach/detach tables even for tables with the incorrect values of IPv4/IPv6 representation. Proper fix for issue [#35156](https://github.com/ClickHouse/ClickHouse/issues/35156). [#38590](https://github.com/ClickHouse/ClickHouse/pull/38590) ([alesapin](https://github.com/alesapin)).
+* Backported in [#38664](https://github.com/ClickHouse/ClickHouse/issues/38664): Adapt some more nodes to avoid issues with pre-22.4 replicas. [#38627](https://github.com/ClickHouse/ClickHouse/pull/38627) ([Raúl Marín](https://github.com/Algunenano)).
+* Backported in [#38779](https://github.com/ClickHouse/ClickHouse/issues/38779): `rankCorr` function will work correctly if some arguments are NaNs. This closes [#38396](https://github.com/ClickHouse/ClickHouse/issues/38396). [#38722](https://github.com/ClickHouse/ClickHouse/pull/38722) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Backported in [#38783](https://github.com/ClickHouse/ClickHouse/issues/38783): Fix use-after-free for Map combinator that leads to incorrect result. [#38748](https://github.com/ClickHouse/ClickHouse/pull/38748) ([Azat Khuzhin](https://github.com/azat)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Try to fix some trash [#37303](https://github.com/ClickHouse/ClickHouse/pull/37303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update protobuf files for kafka and rabbitmq [fix integration tests] [#37884](https://github.com/ClickHouse/ClickHouse/pull/37884) ([Nikita Taranov](https://github.com/nickitat)).
+* Try fix `test_grpc_protocol/test.py::test_progress` [#37908](https://github.com/ClickHouse/ClickHouse/pull/37908) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Try to fix BC check [#38178](https://github.com/ClickHouse/ClickHouse/pull/38178) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update docker-compose to try get rid of v1 errors [#38394](https://github.com/ClickHouse/ClickHouse/pull/38394) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix backports diff [#38703](https://github.com/ClickHouse/ClickHouse/pull/38703) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.5.3.21-stable.md b/docs/changelogs/v22.5.3.21-stable.md
new file mode 100644
index 00000000000..7c4717575d8
--- /dev/null
+++ b/docs/changelogs/v22.5.3.21-stable.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.5.3.21-stable (e03724efec5) FIXME as compared to v22.5.2.53-stable (5fd600fda9e)
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#38241](https://github.com/ClickHouse/ClickHouse/issues/38241): Fix possible crash in `Distributed` async insert in case of removing a replica from config. [#38029](https://github.com/ClickHouse/ClickHouse/pull/38029) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#39098](https://github.com/ClickHouse/ClickHouse/issues/39098): Any allocations inside OvercommitTracker may lead to deadlock. Logging was not very informative so it's easier just to remove logging. Fixes [#37794](https://github.com/ClickHouse/ClickHouse/issues/37794). [#39030](https://github.com/ClickHouse/ClickHouse/pull/39030) ([Dmitry Novik](https://github.com/novikd)).
+* Backported in [#39078](https://github.com/ClickHouse/ClickHouse/issues/39078): Fix bug in filesystem cache that could happen in some corner case which coincided with cache capacity hitting the limit. Closes [#39066](https://github.com/ClickHouse/ClickHouse/issues/39066). [#39070](https://github.com/ClickHouse/ClickHouse/pull/39070) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Backported in [#39152](https://github.com/ClickHouse/ClickHouse/issues/39152): Fix error `Block structure mismatch` which could happen for INSERT into table with attached MATERIALIZED VIEW and enabled setting `extremes = 1`. Closes [#29759](https://github.com/ClickHouse/ClickHouse/issues/29759) and [#38729](https://github.com/ClickHouse/ClickHouse/issues/38729). [#39125](https://github.com/ClickHouse/ClickHouse/pull/39125) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#39274](https://github.com/ClickHouse/ClickHouse/issues/39274): Fixed error `Not found column Type in block` in selects with `PREWHERE` and read-in-order optimizations. [#39157](https://github.com/ClickHouse/ClickHouse/pull/39157) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backported in [#39369](https://github.com/ClickHouse/ClickHouse/issues/39369): Declare RabbitMQ queue without default arguments `x-max-length` and `x-overflow`. [#39259](https://github.com/ClickHouse/ClickHouse/pull/39259) ([rnbondarenko](https://github.com/rnbondarenko)).
+* Backported in [#39350](https://github.com/ClickHouse/ClickHouse/issues/39350): Fix incorrect fetch postgresql tables query fro PostgreSQL database engine. Closes [#33502](https://github.com/ClickHouse/ClickHouse/issues/33502). [#39283](https://github.com/ClickHouse/ClickHouse/pull/39283) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Retry docker buildx commands with progressive sleep in between [#38898](https://github.com/ClickHouse/ClickHouse/pull/38898) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add docker_server.py running to backport and release CIs [#39011](https://github.com/ClickHouse/ClickHouse/pull/39011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.5.4.19-stable.md b/docs/changelogs/v22.5.4.19-stable.md
new file mode 100644
index 00000000000..05296a178eb
--- /dev/null
+++ b/docs/changelogs/v22.5.4.19-stable.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.5.4.19-stable (c893bba830e) FIXME as compared to v22.5.3.21-stable (e03724efec5)
+
+#### Bug Fix
+* Backported in [#39748](https://github.com/ClickHouse/ClickHouse/issues/39748): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39882](https://github.com/ClickHouse/ClickHouse/issues/39882): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39209](https://github.com/ClickHouse/ClickHouse/issues/39209): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39589](https://github.com/ClickHouse/ClickHouse/issues/39589): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39611](https://github.com/ClickHouse/ClickHouse/issues/39611): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39790](https://github.com/ClickHouse/ClickHouse/issues/39790): Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39835](https://github.com/ClickHouse/ClickHouse/issues/39835): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix reading from s3 in some corner cases [#38239](https://github.com/ClickHouse/ClickHouse/pull/38239) ([Anton Popov](https://github.com/CurtizJ)).
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.6.1.1985-stable.md b/docs/changelogs/v22.6.1.1985-stable.md
index eeb4078eb04..9d930b8a0bb 100644
--- a/docs/changelogs/v22.6.1.1985-stable.md
+++ b/docs/changelogs/v22.6.1.1985-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.1.1985-stable FIXME as compared to v22.5.1.2079-stable
+### ClickHouse release v22.6.1.1985-stable (7000c4e0033) FIXME as compared to v22.5.1.2079-stable (df0cb062098)
 
 #### Backward Incompatible Change
 * Changes how settings using `seconds` as type are parsed to support floating point values (for example: `max_execution_time=0.5`). Infinity or NaN values will throw an exception. [#37187](https://github.com/ClickHouse/ClickHouse/pull/37187) ([Raúl Marín](https://github.com/Algunenano)).
@@ -78,7 +78,7 @@ sidebar_label: 2022
 * Allow to use String type instead of Binary in Arrow/Parquet/ORC formats. This PR introduces 3 new settings for it: `output_format_arrow_string_as_string`, `output_format_parquet_string_as_string`, `output_format_orc_string_as_string`. Default value for all settings is `false`. [#37327](https://github.com/ClickHouse/ClickHouse/pull/37327) ([Kruglov Pavel](https://github.com/Avogar)).
 * Apply setting `input_format_max_rows_to_read_for_schema_inference` for all read rows in total from all files in globs. Previously setting `input_format_max_rows_to_read_for_schema_inference` was applied for each file in glob separately and in case of huge number of nulls we could read first `input_format_max_rows_to_read_for_schema_inference` rows from each file and get nothing. Also increase default value for this setting to 25000. [#37332](https://github.com/ClickHouse/ClickHouse/pull/37332) ([Kruglov Pavel](https://github.com/Avogar)).
 * allows providing `NULL`/`NOT NULL` right after type in column declaration. [#37337](https://github.com/ClickHouse/ClickHouse/pull/37337) ([Igor Nikonov](https://github.com/devcrafter)).
-* optimize file segment PARTIALLY_DOWNLOADED get read buffer. [#37338](https://github.com/ClickHouse/ClickHouse/pull/37338) ([xiedeyantu](https://github.com/xiedeyantu)).
+* optimize file segment PARTIALLY_DOWNLOADED get read buffer. [#37338](https://github.com/ClickHouse/ClickHouse/pull/37338) ([chen](https://github.com/xiedeyantu)).
 * Allow to prune the list of files via virtual columns such as `_file` and `_path` when reading from S3. This is for [#37174](https://github.com/ClickHouse/ClickHouse/issues/37174) , [#23494](https://github.com/ClickHouse/ClickHouse/issues/23494). [#37356](https://github.com/ClickHouse/ClickHouse/pull/37356) ([Amos Bird](https://github.com/amosbird)).
 * Try to improve short circuit functions processing to fix problems with stress tests. [#37384](https://github.com/ClickHouse/ClickHouse/pull/37384) ([Kruglov Pavel](https://github.com/Avogar)).
 * Closes [#37395](https://github.com/ClickHouse/ClickHouse/issues/37395). [#37415](https://github.com/ClickHouse/ClickHouse/pull/37415) ([Memo](https://github.com/Joeywzr)).
@@ -117,7 +117,7 @@ sidebar_label: 2022
 * Remove recursive submodules, because we don't need them and they can be confusing. Add style check to prevent recursive submodules. This closes [#32821](https://github.com/ClickHouse/ClickHouse/issues/32821). [#37616](https://github.com/ClickHouse/ClickHouse/pull/37616) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Add docs spellcheck to CI. [#37790](https://github.com/ClickHouse/ClickHouse/pull/37790) ([Vladimir C](https://github.com/vdimir)).
 * Fix overly aggressive stripping which removed the embedded hash required for checking the consistency of the executable. [#37993](https://github.com/ClickHouse/ClickHouse/pull/37993) ([Robert Schulze](https://github.com/rschu1ze)).
-* fix MacOS build compressor faild. [#38007](https://github.com/ClickHouse/ClickHouse/pull/38007) ([xiedeyantu](https://github.com/xiedeyantu)).
+* fix MacOS build compressor faild. [#38007](https://github.com/ClickHouse/ClickHouse/pull/38007) ([chen](https://github.com/xiedeyantu)).
 
 #### Bug Fix (user-visible misbehavior in official stable or prestable release)
 
@@ -166,7 +166,7 @@ sidebar_label: 2022
 * Fix possible incorrect result of `SELECT ... WITH FILL` in the case when `ORDER BY` should be applied after `WITH FILL` result (e.g. for outer query). Incorrect result was caused by optimization for `ORDER BY` expressions ([#35623](https://github.com/ClickHouse/ClickHouse/issues/35623)). Closes [#37904](https://github.com/ClickHouse/ClickHouse/issues/37904). [#37959](https://github.com/ClickHouse/ClickHouse/pull/37959) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 * Add missing default columns when pushing to the target table in WindowView, fix [#37815](https://github.com/ClickHouse/ClickHouse/issues/37815). [#37965](https://github.com/ClickHouse/ClickHouse/pull/37965) ([vxider](https://github.com/Vxider)).
 * Fixed a stack overflow issue that would cause compilation to fail. [#37996](https://github.com/ClickHouse/ClickHouse/pull/37996) ([Han Shukai](https://github.com/KinderRiven)).
-* when open enable_filesystem_query_cache_limit, throw Reserved cache size exceeds the remaining cache size. [#38004](https://github.com/ClickHouse/ClickHouse/pull/38004) ([xiedeyantu](https://github.com/xiedeyantu)).
+* when open enable_filesystem_query_cache_limit, throw Reserved cache size exceeds the remaining cache size. [#38004](https://github.com/ClickHouse/ClickHouse/pull/38004) ([chen](https://github.com/xiedeyantu)).
 * Query, containing ORDER BY ... WITH FILL, can generate extra rows when multiple WITH FILL columns are present. [#38074](https://github.com/ClickHouse/ClickHouse/pull/38074) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 
 #### Bug Fix (user-visible misbehaviour in official stable or prestable release)
diff --git a/docs/changelogs/v22.6.2.12-stable.md b/docs/changelogs/v22.6.2.12-stable.md
index 224367b994a..a97492ffe27 100644
--- a/docs/changelogs/v22.6.2.12-stable.md
+++ b/docs/changelogs/v22.6.2.12-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.2.12-stable FIXME as compared to v22.6.1.1985-stable
+### ClickHouse release v22.6.2.12-stable (1fc97f10cbf) FIXME as compared to v22.6.1.1985-stable (7000c4e0033)
 
 #### Improvement
 * Backported in [#38484](https://github.com/ClickHouse/ClickHouse/issues/38484): Improve the stability for hive storage integration test. Move the data prepare step into test.py. [#38260](https://github.com/ClickHouse/ClickHouse/pull/38260) ([lgbo](https://github.com/lgbo-ustc)).
diff --git a/docs/changelogs/v22.6.3.35-stable.md b/docs/changelogs/v22.6.3.35-stable.md
index 584aeafc48e..e3eee326915 100644
--- a/docs/changelogs/v22.6.3.35-stable.md
+++ b/docs/changelogs/v22.6.3.35-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.3.35-stable FIXME as compared to v22.6.2.12-stable
+### ClickHouse release v22.6.3.35-stable (d5566f2f2dd) FIXME as compared to v22.6.2.12-stable (1fc97f10cbf)
 
 #### Bug Fix
 * Backported in [#38812](https://github.com/ClickHouse/ClickHouse/issues/38812): Fix crash when executing GRANT ALL ON *.* with ON CLUSTER. It was broken in https://github.com/ClickHouse/ClickHouse/pull/35767. This closes [#38618](https://github.com/ClickHouse/ClickHouse/issues/38618). [#38674](https://github.com/ClickHouse/ClickHouse/pull/38674) ([Vitaly Baranov](https://github.com/vitlibar)).
diff --git a/docs/changelogs/v22.6.4.35-stable.md b/docs/changelogs/v22.6.4.35-stable.md
index d70d20d6134..b6c63d94eab 100644
--- a/docs/changelogs/v22.6.4.35-stable.md
+++ b/docs/changelogs/v22.6.4.35-stable.md
@@ -5,7 +5,7 @@ sidebar_label: 2022
 
 # 2022 Changelog
 
-### ClickHouse release v22.6.4.35-stable FIXME as compared to v22.6.3.35-stable
+### ClickHouse release v22.6.4.35-stable (b9202cae6f4) FIXME as compared to v22.6.3.35-stable (d5566f2f2dd)
 
 #### Build/Testing/Packaging Improvement
 * Backported in [#38822](https://github.com/ClickHouse/ClickHouse/issues/38822): - Change `all|noarch` packages to architecture-dependent - Fix some documentation for it - Push aarch64|arm64 packages to artifactory and release assets - Fixes [#36443](https://github.com/ClickHouse/ClickHouse/issues/36443). [#38580](https://github.com/ClickHouse/ClickHouse/pull/38580) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
diff --git a/docs/changelogs/v22.6.5.22-stable.md b/docs/changelogs/v22.6.5.22-stable.md
new file mode 100644
index 00000000000..9120463858e
--- /dev/null
+++ b/docs/changelogs/v22.6.5.22-stable.md
@@ -0,0 +1,30 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.6.5.22-stable (47ca5f14a34) FIXME as compared to v22.6.4.35-stable (b9202cae6f4)
+
+#### Bug Fix
+* Backported in [#39749](https://github.com/ClickHouse/ClickHouse/issues/39749): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39883](https://github.com/ClickHouse/ClickHouse/issues/39883): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39207](https://github.com/ClickHouse/ClickHouse/issues/39207): Fix reading of sparse columns from `MergeTree` tables that store their data in S3. [#37978](https://github.com/ClickHouse/ClickHouse/pull/37978) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#38932](https://github.com/ClickHouse/ClickHouse/issues/38932): Fix `parallel_view_processing=1` with `optimize_trivial_insert_select=1`. Fix `max_insert_threads` while pushing to views. [#38731](https://github.com/ClickHouse/ClickHouse/pull/38731) ([Azat Khuzhin](https://github.com/azat)).
+* Backported in [#39590](https://github.com/ClickHouse/ClickHouse/issues/39590): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39612](https://github.com/ClickHouse/ClickHouse/issues/39612): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39791](https://github.com/ClickHouse/ClickHouse/issues/39791): Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39836](https://github.com/ClickHouse/ClickHouse/issues/39836): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix reading from s3 in some corner cases [#38239](https://github.com/ClickHouse/ClickHouse/pull/38239) ([Anton Popov](https://github.com/CurtizJ)).
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.7.2.15-stable.md b/docs/changelogs/v22.7.2.15-stable.md
new file mode 100644
index 00000000000..a1c270041a4
--- /dev/null
+++ b/docs/changelogs/v22.7.2.15-stable.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.7.2.15-stable (f843089624e) FIXME as compared to v22.7.1.2484-stable (f4f05ec786a)
+
+#### Bug Fix
+* Backported in [#39750](https://github.com/ClickHouse/ClickHouse/issues/39750): Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#39591](https://github.com/ClickHouse/ClickHouse/issues/39591): Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Backported in [#39613](https://github.com/ClickHouse/ClickHouse/issues/39613): Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* Backported in [#39792](https://github.com/ClickHouse/ClickHouse/issues/39792): Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Backported in [#39837](https://github.com/ClickHouse/ClickHouse/issues/39837): Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v22.7.3.5-stable.md b/docs/changelogs/v22.7.3.5-stable.md
new file mode 100644
index 00000000000..92fe37e4821
--- /dev/null
+++ b/docs/changelogs/v22.7.3.5-stable.md
@@ -0,0 +1,18 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.7.3.5-stable (e140b8b5f3a) FIXME as compared to v22.7.2.15-stable (f843089624e)
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#39884](https://github.com/ClickHouse/ClickHouse/issues/39884): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#39884](https://github.com/ClickHouse/ClickHouse/issues/39884): Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Backported in [#40045](https://github.com/ClickHouse/ClickHouse/issues/40045): Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Backported in [#40045](https://github.com/ClickHouse/ClickHouse/issues/40045): Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
diff --git a/docs/changelogs/v22.8.1.2097-lts.md b/docs/changelogs/v22.8.1.2097-lts.md
new file mode 100644
index 00000000000..5ef2b5c00cc
--- /dev/null
+++ b/docs/changelogs/v22.8.1.2097-lts.md
@@ -0,0 +1,374 @@
+---
+sidebar_position: 1
+sidebar_label: 2022
+---
+
+# 2022 Changelog
+
+### ClickHouse release v22.8.1.2097-lts (09a2ff88435) FIXME as compared to v22.7.1.2484-stable (f4f05ec786a)
+
+#### Backward Incompatible Change
+* Make cache composable, allow not to evict certain files (regarding idx, mrk, ..), delete old cache version. Now it is possible to configure cache over Azure blob storage disk, over Local disk, over StaticWeb disk, etc. This PR is marked backward incompatible because cache configuration changes and in order for cache to work need to update the config file. Old cache will still be used with new configuration. The server will startup fine with the old cache configuration. Closes [#36140](https://github.com/ClickHouse/ClickHouse/issues/36140). Closes [#37889](https://github.com/ClickHouse/ClickHouse/issues/37889). [#36171](https://github.com/ClickHouse/ClickHouse/pull/36171) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Now, all relevant dictionary sources respect `remote_url_allow_hosts` setting. It was already done for HTTP, Cassandra, Redis. Added ClickHouse, MongoDB, MySQL, PostgreSQL. Host is checked only for dictionaries created from DDL. [#39184](https://github.com/ClickHouse/ClickHouse/pull/39184) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Extended range of Date32 and DateTime64 to support dates from the year 1900 to 2299. In previous versions, the supported interval was only from the year 1925 to 2283. The implementation is using the proleptic Gregorian calendar (which is conformant with [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601):2004 (clause 3.2.1 The Gregorian calendar)) instead of accounting for historical transitions from the Julian to the Gregorian calendar. This change affects implementation-specific behavior for out-of-range arguments. E.g. if in previous versions the value of `1899-01-01` was clamped to `1925-01-01`, in the new version it will be clamped to `1900-01-01`. It changes the behavior of rounding with `toStartOfInterval` if you pass `INTERVAL 3 QUARTER` up to one quarter because the intervals are counted from an implementation-specific point of time. Closes [#28216](https://github.com/ClickHouse/ClickHouse/issues/28216), improves [#38393](https://github.com/ClickHouse/ClickHouse/issues/38393). [#39425](https://github.com/ClickHouse/ClickHouse/pull/39425) ([Roman Vasin](https://github.com/rvasin)).
+
+#### New Feature
+* Added a setting `exact_rows_before_limit` (0/1). When enabled, ClickHouse will provide exact value for `rows_before_limit_at_least` statistic, but with the cost that the data before limit will have to be read completely. This closes [#6613](https://github.com/ClickHouse/ClickHouse/issues/6613). [#25333](https://github.com/ClickHouse/ClickHouse/pull/25333) ([kevin wan](https://github.com/MaxWk)).
+* Add SLRU cache policy for uncompressed cache and marks cache. [#34651](https://github.com/ClickHouse/ClickHouse/pull/34651) ([alexX512](https://github.com/alexX512)).
+* Intel® In-Memory Analytics Accelerator (Intel® IAA) is a hardware accelerator available in the upcoming generation of Intel® Xeon® Scalable processors ("Sapphire Rapids"). Its goal is to speed up common operations in analytics like data (de)compression and filtering. ClickHouse gained the new "DeflateQpl" compression codec which utilizes the Intel® IAA offloading technology to provide a high-performance DEFLATE implementation. The codec uses the [Intel® Query Processing Library (QPL)](https://github.com/intel/qpl) which abstracts access to the hardware accelerator, respectively to a software fallback in case the hardware accelerator is not available. DEFLATE provides in general higher compression rates than ClickHouse's LZ4 default codec, and as a result, offers less disk I/O and lower main memory consumption. [#36654](https://github.com/ClickHouse/ClickHouse/pull/36654) ([jasperzhu](https://github.com/jinjunzh)).
+* Add concurrent_threads_soft_limit parameter to increase performance in case of high RPS by means of limiting total number of threads for all queries. [#37285](https://github.com/ClickHouse/ClickHouse/pull/37285) ([Roman Vasin](https://github.com/rvasin)).
+* Added concurrency control logic to limit total number of concurrent threads created by queries. [#37558](https://github.com/ClickHouse/ClickHouse/pull/37558) ([Sergei Trifonov](https://github.com/serxa)).
+* Added support for parallel distributed insert select into tables with Distributed and Replicated engine [#34670](https://github.com/ClickHouse/ClickHouse/issues/34670). [#39107](https://github.com/ClickHouse/ClickHouse/pull/39107) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add new settings to control schema inference from text formats: - `input_format_try_infer_dates` - try infer dates from strings. - `input_format_try_infer_datetimes` - try infer datetimes from strings. - `input_format_try_infer_integers` - try infer `Int64` instead of `Float64`. - `input_format_json_try_infer_numbers_from_strings` - try infer numbers from json strings in JSON formats. [#39186](https://github.com/ClickHouse/ClickHouse/pull/39186) ([Kruglov Pavel](https://github.com/Avogar)).
+* This feature will provide JSON formatted log output in console. The purpose is to allow easier ingestion and query in log analysis tools. [#39277](https://github.com/ClickHouse/ClickHouse/pull/39277) ([Mallik Hassan](https://github.com/SadiHassan)).
+* Intel® In-Memory Analytics Accelerator (Intel® IAA) is a hardware accelerator available in the upcoming generation of Intel® Xeon® Scalable processors ("Sapphire Rapids"). Its goal is to speed up common operations in analytics like data (de)compression and filtering. ClickHouse gained the new "DeflateQpl" compression codec which utilizes the Intel® IAA offloading technology to provide a high-performance DEFLATE implementation. The codec uses the [Intel® Query Processing Library (QPL)](https://github.com/intel/qpl) which abstracts access to the hardware accelerator, respectively to a software fallback in case the hardware accelerator is not available. DEFLATE provides in general higher compression rates than ClickHouse's LZ4 default codec, and as a result, offers less disk I/O and lower main memory consumption. [#39494](https://github.com/ClickHouse/ClickHouse/pull/39494) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add function `nowInBlock` which allows getting the current time during long-running and continuous queries. Closes [#39522](https://github.com/ClickHouse/ClickHouse/issues/39522). Notes: there are no functions `now64InBlock` neither `todayInBlock`. [#39533](https://github.com/ClickHouse/ClickHouse/pull/39533) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* - Add result_rows and result_bytes to progress reports (`X-ClickHouse-Summary`). [#39567](https://github.com/ClickHouse/ClickHouse/pull/39567) ([Raúl Marín](https://github.com/Algunenano)).
+* adds ability to specify settings for an `executable()` table function. [#39681](https://github.com/ClickHouse/ClickHouse/pull/39681) ([Constantine Peresypkin](https://github.com/pkit)).
+* Implemented automatic conversion of database engine from `Ordinary` to `Atomic`. Create empty `convert_ordinary_to_atomic` file in `flags` directory and all `Ordinary` databases will be converted automatically on next server start. Resolves [#39546](https://github.com/ClickHouse/ClickHouse/issues/39546). [#39933](https://github.com/ClickHouse/ClickHouse/pull/39933) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add new setting `schema_inference_hints` that allows to specify structure hints in schema inference for specific columns. Closes [#39569](https://github.com/ClickHouse/ClickHouse/issues/39569). [#40068](https://github.com/ClickHouse/ClickHouse/pull/40068) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Performance Improvement
+* * Break on analyze stuck on complex query. [#38185](https://github.com/ClickHouse/ClickHouse/pull/38185) ([Vladimir C](https://github.com/vdimir)).
+* Deduce way to sort based on input stream sort description. Skip sorting if input stream is already sorted. [#38719](https://github.com/ClickHouse/ClickHouse/pull/38719) ([Igor Nikonov](https://github.com/devcrafter)).
+* `DISTINCT` in order with `ORDER BY` improves memory usage (significantly) and query execution time if `DISTINCT` columns match (or form a prefix of) `ORDER BY` columns. [#39432](https://github.com/ClickHouse/ClickHouse/pull/39432) ([Igor Nikonov](https://github.com/devcrafter)).
+* Use local node as first priority to get structure of remote table when executing `cluster` and similar table functions. [#39440](https://github.com/ClickHouse/ClickHouse/pull/39440) ([Mingliang Pan](https://github.com/liangliangpan)).
+* Use `DistinctSortedTransform` only when sort description is applicable to DISTINCT columns, otherwise fall back to ordinary DISTINCT implementation. It allows making less checks during `DistinctSortedTransform` execution. [#39528](https://github.com/ClickHouse/ClickHouse/pull/39528) ([Igor Nikonov](https://github.com/devcrafter)).
+* `DistinctSortedTransform` didn't take advantage of sorting, i.e. it worked like ordinary `DISTINCT` implementation. The fix reduces memory usage significantly. [#39538](https://github.com/ClickHouse/ClickHouse/pull/39538) ([Igor Nikonov](https://github.com/devcrafter)).
+* ColumnVector: optimize filter with AVX512VBMI2 compress store. [#39633](https://github.com/ClickHouse/ClickHouse/pull/39633) ([Guo Wangyang](https://github.com/guowangy)).
+* KeyCondition: optimize applyFunction in multi-thread scenario. [#39812](https://github.com/ClickHouse/ClickHouse/pull/39812) ([Guo Wangyang](https://github.com/guowangy)).
+* For systems with AVX512 VBMI2, this PR improves performance by ca. 6% for SSB benchmark queries queries 3.1, 3.2 and 3.3 (SF=100). Tested on Intel Icelake Xeon 8380 * 2 socket. [#40033](https://github.com/ClickHouse/ClickHouse/pull/40033) ([Robert Schulze](https://github.com/rschu1ze)).
+* - Don't visit the AST for UDFs if none are registered. [#40069](https://github.com/ClickHouse/ClickHouse/pull/40069) ([Raúl Marín](https://github.com/Algunenano)).
+* - Optimize CurrentMemoryTracker alloc and free. [#40078](https://github.com/ClickHouse/ClickHouse/pull/40078) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### Improvement
+* Change the way how PK is analyzed for MergeTree. [#25563](https://github.com/ClickHouse/ClickHouse/pull/25563) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* - Improved structure of DDL query result table for `Replicated` database (separate columns with shard and replica name, more clear status) - `CREATE TABLE ... ON CLUSTER` queries can be normalized on initiator first if `distributed_ddl_entry_format_version` is set to 3 (default value). It means that `ON CLUSTER` queries may not work if initiator does not belong to the cluster that specified in query. Fixes [#37318](https://github.com/ClickHouse/ClickHouse/issues/37318), [#39500](https://github.com/ClickHouse/ClickHouse/issues/39500) - Ignore `ON CLUSTER` clause if database is `Replicated` and cluster name equals to database name. Related to [#35570](https://github.com/ClickHouse/ClickHouse/issues/35570) - Miscellaneous minor fixes for `Replicated` database engine - Check metadata consistency when starting up `Replicated` database, start replica recovery in case of mismatch of local metadata and metadata in Keeper. Resolves [#24880](https://github.com/ClickHouse/ClickHouse/issues/24880). [#37198](https://github.com/ClickHouse/ClickHouse/pull/37198) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Support SQL standard DELETE FROM syntax on merge tree tables and lightweight delete implementation for merge tree families. [#37893](https://github.com/ClickHouse/ClickHouse/pull/37893) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* `timeSlots` now works with DateTime64; subsecond duration and slot size available when working with DateTime64. [#37951](https://github.com/ClickHouse/ClickHouse/pull/37951) ([Andrey Zvonov](https://github.com/zvonand)).
+* Add cache for schema inference for file/s3/hdfs/url table functions. Now, schema inference will be performed only on the first query to the file, all subsequent queries to the same file will use the schema from cache if data wasn't changed. Add system table `system.schema_inference_cache` with all current schemas in cache and system queries `SYSTEM DROP SCHEMA CACHE [FOR FILE/S3/HDFS/URL]` to drop schemas from cache. [#38286](https://github.com/ClickHouse/ClickHouse/pull/38286) ([Kruglov Pavel](https://github.com/Avogar)).
+* - Simplified function registration macro interface (`FUNCTION_REGISTER*`) to eliminate the step to add and call an extern function in the registerFunctions.cpp, it also makes incremental builds of a new function faster. [#38615](https://github.com/ClickHouse/ClickHouse/pull/38615) ([Li Yin](https://github.com/liyinsg)).
+* * Added support of `LEFT SEMI` and `LEFT ANTI` direct join with rocksdb. [#38956](https://github.com/ClickHouse/ClickHouse/pull/38956) ([Vladimir C](https://github.com/vdimir)).
+* resolves [#37490](https://github.com/ClickHouse/ClickHouse/issues/37490). [#39054](https://github.com/ClickHouse/ClickHouse/pull/39054) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Store Keeper API version inside a predefined path. [#39096](https://github.com/ClickHouse/ClickHouse/pull/39096) ([Antonio Andelic](https://github.com/antonio2368)).
+* Now entrypoint.sh in docker image creates and executes chown for all folders it found in config for multidisk setup [#17717](https://github.com/ClickHouse/ClickHouse/issues/17717). [#39121](https://github.com/ClickHouse/ClickHouse/pull/39121) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add profile events for fsync. [#39179](https://github.com/ClickHouse/ClickHouse/pull/39179) ([Azat Khuzhin](https://github.com/azat)).
+* Add the second argument to the ordinary function `file(path[, default])`, which function returns in the case when a file does not exists. [#39218](https://github.com/ClickHouse/ClickHouse/pull/39218) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Some small fixes for reading via http, allow to retry partial content in case if got 200OK. [#39244](https://github.com/ClickHouse/ClickHouse/pull/39244) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improved Base58 encoding/decoding. [#39292](https://github.com/ClickHouse/ClickHouse/pull/39292) ([Andrey Zvonov](https://github.com/zvonand)).
+* Normalize `AggregateFunction` types and state representations because optimizations like https://github.com/ClickHouse/ClickHouse/pull/35788 will treat `count(not null columns)` as `count()`, which might confuses distributed interpreters with the following error : `Conversion from AggregateFunction(count) to AggregateFunction(count, Int64) is not supported`. [#39420](https://github.com/ClickHouse/ClickHouse/pull/39420) ([Amos Bird](https://github.com/amosbird)).
+* Improved memory usage during memory efficient merging of aggregation results. [#39429](https://github.com/ClickHouse/ClickHouse/pull/39429) ([Nikita Taranov](https://github.com/nickitat)).
+* Support queries `CREATE TEMPORARY TABLE ... (<list of columns>) AS ...`. [#39462](https://github.com/ClickHouse/ClickHouse/pull/39462) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support of `!`/`*` (exclamation/asterisk) in custom TLDs (`cutToFirstSignificantSubdomainCustom()`/`cutToFirstSignificantSubdomainCustomWithWWW()`/`firstSignificantSubdomainCustom()`). [#39496](https://github.com/ClickHouse/ClickHouse/pull/39496) ([Azat Khuzhin](https://github.com/azat)).
+* Rework and simplify the `system.backups` table, remove the `internal` column, allow user to set ID of operation, add columns `num_files`, `uncompressed_size`, `compressed_size`, `start_time`, `end_time`. [#39503](https://github.com/ClickHouse/ClickHouse/pull/39503) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Refactored a little code, removed duplicate code. [#39509](https://github.com/ClickHouse/ClickHouse/pull/39509) ([Simon Liu](https://github.com/monadbobo)).
+* Add support for TLS connections to NATS. Implements [#39525](https://github.com/ClickHouse/ClickHouse/issues/39525). [#39527](https://github.com/ClickHouse/ClickHouse/pull/39527) ([Constantine Peresypkin](https://github.com/pkit)).
+* `clickhouse-obfuscator` (a tool for database obfuscation for testing and load generation) now has the new `--save` and `--load` parameters to work with pre-trained models. This closes [#39534](https://github.com/ClickHouse/ClickHouse/issues/39534). [#39541](https://github.com/ClickHouse/ClickHouse/pull/39541) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix incorrect behavior of log rotation during restart. [#39558](https://github.com/ClickHouse/ClickHouse/pull/39558) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Improve bytes to bits mask transform for SSE/AVX/AVX512. [#39586](https://github.com/ClickHouse/ClickHouse/pull/39586) ([Guo Wangyang](https://github.com/guowangy)).
+* Add formats `PrettyMonoBlock`, `PrettyNoEscapesMonoBlock`, `PrettyCompactNoEscapes`, `PrettyCompactNoEscapesMonoBlock`, `PrettySpaceNoEscapes`, `PrettySpaceMonoBlock`, `PrettySpaceNoEscapesMonoBlock`. [#39646](https://github.com/ClickHouse/ClickHouse/pull/39646) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix building aggregate projections when external aggregation is on. Mark as improvement because the case is rare and there exists easy workaround to fix it via changing settings. This fixes [#39667](https://github.com/ClickHouse/ClickHouse/issues/39667) . [#39671](https://github.com/ClickHouse/ClickHouse/pull/39671) ([Amos Bird](https://github.com/amosbird)).
+* Allow to execute hash functions with arguments of type `Map`. [#39685](https://github.com/ClickHouse/ClickHouse/pull/39685) ([Anton Popov](https://github.com/CurtizJ)).
+* Add a configuration parameter to hide addresses in stack traces. It may improve security a little but generally, it is harmful and should not be used. [#39690](https://github.com/ClickHouse/ClickHouse/pull/39690) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* change the prefix size of AggregateFunctionDistinct to make sure nested function data memory aligned. [#39696](https://github.com/ClickHouse/ClickHouse/pull/39696) ([Pxl](https://github.com/BiteTheDDDDt)).
+* Properly escape credentials passed to the `clickhouse-diagnostic` tool. [#39707](https://github.com/ClickHouse/ClickHouse/pull/39707) ([Dale McDiarmid](https://github.com/gingerwizard)).
+* keeper-improvement: create a snapshot on exit. It can be controlled with the config `keeper_server.create_snapshot_on_exit`, `true` by default. [#39755](https://github.com/ClickHouse/ClickHouse/pull/39755) ([Antonio Andelic](https://github.com/antonio2368)).
+* Support primary key analysis for `row_policy_filter` and `additional_filter`. It also helps fix issues like [#37454](https://github.com/ClickHouse/ClickHouse/issues/37454) . [#39826](https://github.com/ClickHouse/ClickHouse/pull/39826) ([Amos Bird](https://github.com/amosbird)).
+* Parameters are now transferred in `Query` packets right after the query text in the same serialisation format as the settings. [#39906](https://github.com/ClickHouse/ClickHouse/pull/39906) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix two usability issues in Play UI: - it was non-pixel-perfect on iPad due to parasitic border radius and margins; - the progress indication did not display after the first query. This closes [#39957](https://github.com/ClickHouse/ClickHouse/issues/39957). This closes [#39960](https://github.com/ClickHouse/ClickHouse/issues/39960). [#39961](https://github.com/ClickHouse/ClickHouse/pull/39961) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Play UI: add row numbers; add cell selection on click; add hysteresis for table cells. [#39962](https://github.com/ClickHouse/ClickHouse/pull/39962) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The client will show server-side elapsed time. This is important for the performance comparison of ClickHouse services in remote datacenters. This closes [#38070](https://github.com/ClickHouse/ClickHouse/issues/38070). See also [this](https://github.com/ClickHouse/ClickBench/blob/main/hardware/benchmark-cloud.sh#L37) for motivation. [#39968](https://github.com/ClickHouse/ClickHouse/pull/39968) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Adds `parseDateTime64BestEffortUS`, `parseDateTime64BestEffortUSOrNull`, `parseDateTime64BestEffortUSOrZero` functions, closing [#37492](https://github.com/ClickHouse/ClickHouse/issues/37492). [#40015](https://github.com/ClickHouse/ClickHouse/pull/40015) ([Tanya Bragin](https://github.com/tbragin)).
+* * Add observer mode to (zoo)keeper cluster discovery feature. In this mode node itself doesn't belong to cluster. [#40035](https://github.com/ClickHouse/ClickHouse/pull/40035) ([Vladimir C](https://github.com/vdimir)).
+* Play UI: recognize tab key in textarea, but at the same time don't mess up with tab navigation. [#40053](https://github.com/ClickHouse/ClickHouse/pull/40053) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Extend processors_profile_log with more information such as input rows. [#40121](https://github.com/ClickHouse/ClickHouse/pull/40121) ([Amos Bird](https://github.com/amosbird)).
+* Update tzdata to 2022b to support the new timezone changes. See https://github.com/google/cctz/pull/226. Chile's 2022 DST start is delayed from September 4 to September 11. Iran plans to stop observing DST permanently, after it falls back on 2022-09-21. There are corrections of the historical time zone of Asia/Tehran in the year 1977: Iran adopted standard time in 1935, not 1946. In 1977 it observed DST from 03-21 23:00 to 10-20 24:00; its 1978 transitions were on 03-24 and 08-05, not 03-20 and 10-20; and its spring 1979 transition was on 05-27, not 03-21 (https://data.iana.org/time-zones/tzdb/NEWS). [#40184](https://github.com/ClickHouse/ClickHouse/pull/40184) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Display server-side time in `clickhouse-benchmark` by default if it is available (since ClickHouse version 22.8). This is needed to correctly compare the performance of clouds. This behavior can be changed with the new `--client-side-time` command line option. Change the `--randomize` command line option from `--randomize 1` to the form without argument. [#40193](https://github.com/ClickHouse/ClickHouse/pull/40193) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add counters (ProfileEvents) for cases when query complexity limitation has been set and has reached (a separate counter for `overflow_mode` = `break` and `throw`). For example, if you have set up `max_rows_to_read` with `read_overflow_mode = 'break'`, looking at the value of `OverflowBreak` counter will allow distinguishing incomplete results. [#40205](https://github.com/ClickHouse/ClickHouse/pull/40205) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix memory accounting in case of MEMORY_LIMIT_EXCEEDED errors (previously [peak] memory usage was takes failed allocations into account). [#40249](https://github.com/ClickHouse/ClickHouse/pull/40249) ([Azat Khuzhin](https://github.com/azat)).
+* Add current metrics for fs cache: `FilesystemCacheSize` and `FilesystemCacheElements`. [#40260](https://github.com/ClickHouse/ClickHouse/pull/40260) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add support for LARGE_BINARY/LARGE_STRING with Arrow (Closes [#32401](https://github.com/ClickHouse/ClickHouse/issues/32401)). [#40293](https://github.com/ClickHouse/ClickHouse/pull/40293) ([Josh Taylor](https://github.com/joshuataylor)).
+
+#### Bug Fix
+* Support hadoop secure rpc transfer(hadoop.rpc.protection=privacy and hadoop.rpc.protection=integrity). [#39411](https://github.com/ClickHouse/ClickHouse/pull/39411) ([michael1589](https://github.com/michael1589)).
+* Fix seeking while reading from encrypted disk. This PR fixes [#38381](https://github.com/ClickHouse/ClickHouse/issues/38381). [#39687](https://github.com/ClickHouse/ClickHouse/pull/39687) ([Vitaly Baranov](https://github.com/vitlibar)).
+* * Fix duplicate columns in join plan. Finally, solve [#26809](https://github.com/ClickHouse/ClickHouse/issues/26809). [#40009](https://github.com/ClickHouse/ClickHouse/pull/40009) ([Vladimir C](https://github.com/vdimir)).
+
+#### Build/Testing/Packaging Improvement
+* Prebuild ClickHouse x86 binaries now require support for AVX instructions, i.e. a CPU not older than Intel Sandy Bridge / AMD Bulldozer, both released in 2011. [#39000](https://github.com/ClickHouse/ClickHouse/pull/39000) ([Robert Schulze](https://github.com/rschu1ze)).
+* Former packages used to install systemd.service file to `/etc`. The files there are marked as `conf` and are not cleaned out, and not updated automatically. This PR cleans them out. [#39323](https://github.com/ClickHouse/ClickHouse/pull/39323) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix LSan by fixing getauxval(). [#39430](https://github.com/ClickHouse/ClickHouse/pull/39430) ([Azat Khuzhin](https://github.com/azat)).
+* TSAN has issues with clang-14 (https://github.com/google/sanitizers/issues/1552, https://github.com/google/sanitizers/issues/1540), so here we temporary build the TSAN binaries with clang-13. [#39450](https://github.com/ClickHouse/ClickHouse/pull/39450) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Remove the option to build ClickHouse tools as separate executable programs. This fixes [#37847](https://github.com/ClickHouse/ClickHouse/issues/37847). [#39520](https://github.com/ClickHouse/ClickHouse/pull/39520) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fixed Unit tests for wide integers on s390x. [#39627](https://github.com/ClickHouse/ClickHouse/pull/39627) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Increase max cache size for clang-tidy builds. Try to avoid flushing it out between builds. [#39652](https://github.com/ClickHouse/ClickHouse/pull/39652) ([Nikita Taranov](https://github.com/nickitat)).
+* No need to use fixed IP when you are using cluster with SSL. Using the same fixed IP could trigger collision between tests. At this change the server's certificate is generated for a designated host name (see server-ext.cnf at each test). The client should check server's certificate against that name accordingly. [#40007](https://github.com/ClickHouse/ClickHouse/pull/40007) ([Sema Checherinda](https://github.com/CheSema)).
+* Support build with `clang-16` (trunk). This closes [#39949](https://github.com/ClickHouse/ClickHouse/issues/39949). [#40181](https://github.com/ClickHouse/ClickHouse/pull/40181) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Prepare RISC-V 64 build to run in CI. This is for [#40141](https://github.com/ClickHouse/ClickHouse/issues/40141). [#40197](https://github.com/ClickHouse/ClickHouse/pull/40197) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Bug Fix (user-visible misbehavior in official stable or prestable release)
+
+* Fixed query hanging for SELECT with ORDER BY WITH FILL with different date/time types. [#37849](https://github.com/ClickHouse/ClickHouse/pull/37849) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix ORDER BY that matches projections ORDER BY (before it simply returns unsorted result). [#38725](https://github.com/ClickHouse/ClickHouse/pull/38725) ([Azat Khuzhin](https://github.com/azat)).
+* Do not optimise functions in GROUP BY statements if they shadow one of the table columns or expressions. Fixes [#37032](https://github.com/ClickHouse/ClickHouse/issues/37032). [#39103](https://github.com/ClickHouse/ClickHouse/pull/39103) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Fix wrong table name in logs after RENAME TABLE. This fixes [#38018](https://github.com/ClickHouse/ClickHouse/issues/38018). [#39227](https://github.com/ClickHouse/ClickHouse/pull/39227) ([Amos Bird](https://github.com/amosbird)).
+* Fix positional arguments in case of columns pruning when optimising the query. Closes [#38433](https://github.com/ClickHouse/ClickHouse/issues/38433). [#39293](https://github.com/ClickHouse/ClickHouse/pull/39293) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bug in schema inference in case of empty messages in Protobuf/CapnProto formats that allowed to create column with empty `Tuple` type. Closes [#39051](https://github.com/ClickHouse/ClickHouse/issues/39051) Add 2 new settings `input_format_{protobuf/capnproto}_skip_fields_with_unsupported_types_in_schema_inference` that allow to skip fields with unsupported types while schema inference for Protobuf and CapnProto formats. [#39357](https://github.com/ClickHouse/ClickHouse/pull/39357) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix segmentation fault on `CREATE WINDOW VIEW .. ON CLUSTER ... INNER`. Closes [#39363](https://github.com/ClickHouse/ClickHouse/issues/39363). [#39384](https://github.com/ClickHouse/ClickHouse/pull/39384) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix WriteBuffer finalize when cancel insert into function. Proper version of https://github.com/ClickHouse/ClickHouse/pull/39396 that was reverted. [#39458](https://github.com/ClickHouse/ClickHouse/pull/39458) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix storing of columns of type `Object` in sparse serialization. [#39464](https://github.com/ClickHouse/ClickHouse/pull/39464) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible "Not found column in block" exception when using projections. This closes [#39469](https://github.com/ClickHouse/ClickHouse/issues/39469). [#39470](https://github.com/ClickHouse/ClickHouse/pull/39470) ([小路](https://github.com/nicelulu)).
+* Fix LOGICAL_ERROR on race between DROP and INSERT with materialized views. [#39477](https://github.com/ClickHouse/ClickHouse/pull/39477) ([Azat Khuzhin](https://github.com/azat)).
+* Fix data race and possible heap-buffer-overflow in Avro format. Closes [#39094](https://github.com/ClickHouse/ClickHouse/issues/39094) Closes [#33652](https://github.com/ClickHouse/ClickHouse/issues/33652). [#39498](https://github.com/ClickHouse/ClickHouse/pull/39498) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix rare bug in asynchronous reading (with setting `local_filesystem_read_method='pread_threadpool'`) with enabled `O_DIRECT` (enabled by setting `min_bytes_to_use_direct_io`). [#39506](https://github.com/ClickHouse/ClickHouse/pull/39506) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixes "Code: 49. DB::Exception: FunctionFactory: the function name '' is not unique. (LOGICAL_ERROR)" observed on FreeBSD when starting clickhouse. [#39551](https://github.com/ClickHouse/ClickHouse/pull/39551) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix bug with maxsplit argument for splitByChar, which was not working correctly. [#39552](https://github.com/ClickHouse/ClickHouse/pull/39552) ([filimonov](https://github.com/filimonov)).
+* * Fix bug in ASOF JOIN with `enable_optimize_predicate_expression`, close [#37813](https://github.com/ClickHouse/ClickHouse/issues/37813). [#39556](https://github.com/ClickHouse/ClickHouse/pull/39556) ([Vladimir C](https://github.com/vdimir)).
+* Fixed `CREATE/DROP INDEX` query with `ON CLUSTER` or `Replicated` database and `ReplicatedMergeTree`. It used to be executed on all replicas (causing error or DDL queue stuck). Fixes [#39511](https://github.com/ClickHouse/ClickHouse/issues/39511). [#39565](https://github.com/ClickHouse/ClickHouse/pull/39565) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix "column not found" error for push down with join, close [#39505](https://github.com/ClickHouse/ClickHouse/issues/39505). [#39575](https://github.com/ClickHouse/ClickHouse/pull/39575) ([Vladimir C](https://github.com/vdimir)).
+* Fix the wrong `REGEXP_REPLACE` alias. This fixes https://github.com/ClickHouse/ClickBench/issues/9. [#39592](https://github.com/ClickHouse/ClickHouse/pull/39592) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fixed point of origin for exponential decay window functions to the last value in window. Previously, decay was calculated by formula `exp((t - curr_row_t) / decay_length)`, which is incorrect when right boundary of window is not `CURRENT ROW`. It was changed to: `exp((t - last_row_t) / decay_length)`. There is no change in results for windows with `ROWS BETWEEN (smth) AND CURRENT ROW`. [#39593](https://github.com/ClickHouse/ClickHouse/pull/39593) ([Vladimir Chebotaryov](https://github.com/quickhouse)).
+* Fix Decimal division overflow, which can be detected based on operands scale. [#39600](https://github.com/ClickHouse/ClickHouse/pull/39600) ([Andrey Zvonov](https://github.com/zvonand)).
+* Fix settings `output_format_arrow_string_as_string` and `output_format_arrow_low_cardinality_as_dictionary` work in combination. Closes [#39624](https://github.com/ClickHouse/ClickHouse/issues/39624). [#39647](https://github.com/ClickHouse/ClickHouse/pull/39647) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fixed a bug in default database resolution in distributed table reads. [#39674](https://github.com/ClickHouse/ClickHouse/pull/39674) ([Anton Kozlov](https://github.com/tonickkozlov)).
+* Select might read data of dropped table if cache for mmap IO is used and database engine is Ordinary and new tables was created with the same name as dropped one had. It's fixed. [#39708](https://github.com/ClickHouse/ClickHouse/pull/39708) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix possible error `Invalid column type for ColumnUnique::insertRangeFrom. Expected String, got ColumnLowCardinality` Fixes [#38460](https://github.com/ClickHouse/ClickHouse/issues/38460). [#39716](https://github.com/ClickHouse/ClickHouse/pull/39716) ([Arthur Passos](https://github.com/arthurpassos)).
+* Field names in the `meta` section of JSON format were erroneously double escaped. This closes [#39693](https://github.com/ClickHouse/ClickHouse/issues/39693). [#39747](https://github.com/ClickHouse/ClickHouse/pull/39747) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong index analysis with tuples and operator `IN`, which could lead to wrong query result. [#39752](https://github.com/ClickHouse/ClickHouse/pull/39752) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix EmbeddedRocksDB filtering by key using params. [#39757](https://github.com/ClickHouse/ClickHouse/pull/39757) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix error `Invalid number of columns in chunk pushed to OutputPort` which was cause by ARRAY JOIN optimization. Fixes [#39164](https://github.com/ClickHouse/ClickHouse/issues/39164). [#39799](https://github.com/ClickHouse/ClickHouse/pull/39799) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `CANNOT_READ_ALL_DATA` exception with `local_filesystem_read_method=pread_threadpool`. This bug affected only Linux kernel version 5.9 and 5.10 according to [man](https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS). [#39800](https://github.com/ClickHouse/ClickHouse/pull/39800) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix quota_key application on connect. [#39874](https://github.com/ClickHouse/ClickHouse/pull/39874) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* we meeted query exceptions: DB::Exception: Cannot open file /media/ssd1/fordata/clickhouse/data/data/perf/perf_log_local_v3_1/20220618_17233_17238_1/namespace.dict.bin, errno: 24, strerror: Too many open files. [#39886](https://github.com/ClickHouse/ClickHouse/pull/39886) ([Fangyuan Deng](https://github.com/pzhdfy)).
+* fix broken NFS mkdir for root-squashed volumes. [#39898](https://github.com/ClickHouse/ClickHouse/pull/39898) ([Constantine Peresypkin](https://github.com/pkit)).
+* Remove dictionaries from prometheus metrics on DETACH/DROP. [#39926](https://github.com/ClickHouse/ClickHouse/pull/39926) ([Azat Khuzhin](https://github.com/azat)).
+* Fix read of StorageFile with virtual columns. Closes [#39907](https://github.com/ClickHouse/ClickHouse/issues/39907). [#39943](https://github.com/ClickHouse/ClickHouse/pull/39943) ([flynn](https://github.com/ucasfl)).
+* Fix big memory usage during fetches. Fixes [#39915](https://github.com/ClickHouse/ClickHouse/issues/39915). [#39990](https://github.com/ClickHouse/ClickHouse/pull/39990) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* - Fix hashId crash and salt parameter not being used. [#40002](https://github.com/ClickHouse/ClickHouse/pull/40002) ([Raúl Marín](https://github.com/Algunenano)).
+* fix HashMethodOneNumber get wrong key value when column is const. [#40020](https://github.com/ClickHouse/ClickHouse/pull/40020) ([Duc Canh Le](https://github.com/canhld94)).
+* Fixed "Part directory doesn't exist" and "`tmp_<part_name>` ... No such file or directory" errors during too slow INSERT or too long merge/mutation. Also fixed issue that may cause some replication queue entries to stuck without any errors or warnings in logs if previous attempt to fetch part failed, but `tmp-fetch_<part_name>` directory was not cleaned up. [#40031](https://github.com/ClickHouse/ClickHouse/pull/40031) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix rare cases of parsing of arrays of tuples in format `Values`. [#40034](https://github.com/ClickHouse/ClickHouse/pull/40034) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixes ArrowColumn format Dictionary(X) & Dictionary(Nullable(X)) conversion to ClickHouse LowCardinality(X) & LowCardinality(Nullable(X)) respectively. [#40037](https://github.com/ClickHouse/ClickHouse/pull/40037) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix potential deadlock in WriteBufferFromS3 during task scheduling failure. [#40070](https://github.com/ClickHouse/ClickHouse/pull/40070) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix bug in collectFilesToSkip() by adding correct file extension(.idx or idx2) for indexes to be recalculated, avoid wrong hard links. Fixed [#39896](https://github.com/ClickHouse/ClickHouse/issues/39896). [#40095](https://github.com/ClickHouse/ClickHouse/pull/40095) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* A segmentation fault that has CaresPTRResolver::resolve in the stack trace has been reported:. [#40134](https://github.com/ClickHouse/ClickHouse/pull/40134) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix a very rare case of incorrect behavior of array subscript operator. This closes [#28720](https://github.com/ClickHouse/ClickHouse/issues/28720). [#40185](https://github.com/ClickHouse/ClickHouse/pull/40185) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix insufficient argument check for encryption functions (found by query fuzzer). This closes [#39987](https://github.com/ClickHouse/ClickHouse/issues/39987). [#40194](https://github.com/ClickHouse/ClickHouse/pull/40194) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* - Fix unexpected result arrayDifference of Array(UInt32). [#40211](https://github.com/ClickHouse/ClickHouse/pull/40211) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix the case when the order of columns can be incorrect if the `IN` operator is used with a table with `ENGINE = Set` containing multiple columns. This fixes [#13014](https://github.com/ClickHouse/ClickHouse/issues/13014). [#40225](https://github.com/ClickHouse/ClickHouse/pull/40225) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix possible segfault in CapnProto input format. This bug was found and send through ClickHouse bug-bounty [program](https://github.com/ClickHouse/ClickHouse/issues/38986) by *kiojj*. [#40241](https://github.com/ClickHouse/ClickHouse/pull/40241) ([Kruglov Pavel](https://github.com/Avogar)).
+* - Avoid continuously growing memory consumption of pattern cache when using functions multi(Fuzzy)Match(Any|AllIndices|AnyIndex)(). [#40264](https://github.com/ClickHouse/ClickHouse/pull/40264) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Build
+
+* Fix build error: ``` [ 69%] Building CXX object src/CMakeFiles/clickhouse_common_io.dir/Common/waitForPid.cpp.o /CLionProjects/clickhouse-yandex/src/Common/waitForPid.cpp:112:5: error: identifier '__kevp__' is reserved because it starts with '__' [-Werror,-Wreserved-identifier] EV_SET(&change, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL); ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/event.h:108:17: note: expanded from macro 'EV_SET' struct kevent *__kevp__ = (kevp); \ ^ ```. [#39493](https://github.com/ClickHouse/ClickHouse/pull/39493) ([小路](https://github.com/nicelulu)).
+
+#### Build Improvement
+
+* Fixed Endian issue in BitHelpers for s390x. [#39656](https://github.com/ClickHouse/ClickHouse/pull/39656) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Implement a piece of code related to SipHash for s390x architecture (which is not supported by ClickHouse). [#39732](https://github.com/ClickHouse/ClickHouse/pull/39732) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed an Endian issue in Coordination snapshot code for s390x architecture (which is not supported by ClickHouse). [#39931](https://github.com/ClickHouse/ClickHouse/pull/39931) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed Endian issues in Codec code for s390x architecture (which is not supported by ClickHouse). [#40008](https://github.com/ClickHouse/ClickHouse/pull/40008) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fixed Endian issues in reading/writing BigEndian binary data in ReadHelpers and WriteHelpers code for s390x architecture (which is not supported by ClickHouse). [#40179](https://github.com/ClickHouse/ClickHouse/pull/40179) ([Harry Lee](https://github.com/HarryLeeIBM)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "tests: enable back 02232_dist_insert_send_logs_level_hung"'. [#39788](https://github.com/ClickHouse/ClickHouse/pull/39788) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Update arrow to fix possible data race"'. [#39804](https://github.com/ClickHouse/ClickHouse/pull/39804) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Revert "Update arrow to fix possible data race""'. [#39811](https://github.com/ClickHouse/ClickHouse/pull/39811) ([Kruglov Pavel](https://github.com/Avogar)).
+* NO CL ENTRY:  'Revert "Limit number of analyze for one query"'. [#39816](https://github.com/ClickHouse/ClickHouse/pull/39816) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Revert "tests: enable back 02232_dist_insert_send_logs_level_hung""'. [#39817](https://github.com/ClickHouse/ClickHouse/pull/39817) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Prepare library-bridge for catboost integration'. [#39904](https://github.com/ClickHouse/ClickHouse/pull/39904) ([Robert Schulze](https://github.com/rschu1ze)).
+* NO CL ENTRY:  'Revert "ColumnVector: optimize filter with AVX512VBMI2 compress store"'. [#39963](https://github.com/ClickHouse/ClickHouse/pull/39963) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "copy self-extracting to output"'. [#40005](https://github.com/ClickHouse/ClickHouse/pull/40005) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Use separate counter for RSS in global memory tracker."'. [#40199](https://github.com/ClickHouse/ClickHouse/pull/40199) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "tests/performance: cover sparse_hashed dictionary"'. [#40268](https://github.com/ClickHouse/ClickHouse/pull/40268) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Test/insert deduplication token materialized views [#34662](https://github.com/ClickHouse/ClickHouse/pull/34662) ([Denny Crane](https://github.com/den-crane)).
+* Merging [#34372](https://github.com/ClickHouse/ClickHouse/issues/34372) [#35968](https://github.com/ClickHouse/ClickHouse/pull/35968) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Decoupling local cache function and cache algorithm [#38048](https://github.com/ClickHouse/ClickHouse/pull/38048) ([Han Shukai](https://github.com/KinderRiven)).
+* Use separate counter for RSS in global memory tracker. [#38682](https://github.com/ClickHouse/ClickHouse/pull/38682) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Build self-extracting-executable utils [#38936](https://github.com/ClickHouse/ClickHouse/pull/38936) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Improvements in integration tests [#38978](https://github.com/ClickHouse/ClickHouse/pull/38978) ([Ilya Yatsishin](https://github.com/qoega)).
+* More readable regexp in `test_quota` [#39084](https://github.com/ClickHouse/ClickHouse/pull/39084) ([Vladimir Chebotaryov](https://github.com/quickhouse)).
+* Fixed regexp in `test_match_process_uid_against_data_owner` [#39085](https://github.com/ClickHouse/ClickHouse/pull/39085) ([Vladimir Chebotaryov](https://github.com/quickhouse)).
+* tests: enable back 02232_dist_insert_send_logs_level_hung [#39124](https://github.com/ClickHouse/ClickHouse/pull/39124) ([Azat Khuzhin](https://github.com/azat)).
+* Add connection info for Distributed sends log message [#39178](https://github.com/ClickHouse/ClickHouse/pull/39178) ([Azat Khuzhin](https://github.com/azat)).
+* Forbid defining non-default disk with default path from <path> [#39183](https://github.com/ClickHouse/ClickHouse/pull/39183) ([Azat Khuzhin](https://github.com/azat)).
+* Fix LZ4 decompression issue for s390x [#39195](https://github.com/ClickHouse/ClickHouse/pull/39195) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Do not report "Failed communicating with" on and on for parts exchange [#39222](https://github.com/ClickHouse/ClickHouse/pull/39222) ([Azat Khuzhin](https://github.com/azat)).
+* Improve logging around replicated merges [#39230](https://github.com/ClickHouse/ClickHouse/pull/39230) ([Raúl Marín](https://github.com/Algunenano)).
+* Cleanup logic around join_algorithm setting, add docs [#39271](https://github.com/ClickHouse/ClickHouse/pull/39271) ([Vladimir C](https://github.com/vdimir)).
+* Possible fix for flaky `test_keeper_force_recovery` [#39321](https://github.com/ClickHouse/ClickHouse/pull/39321) ([Antonio Andelic](https://github.com/antonio2368)).
+* tests/performance: improve parallel_mv test [#39325](https://github.com/ClickHouse/ClickHouse/pull/39325) ([Azat Khuzhin](https://github.com/azat)).
+* Update azure library (removed "harmful" function) [#39327](https://github.com/ClickHouse/ClickHouse/pull/39327) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Refactor PreparedSets/SubqueryForSet [#39343](https://github.com/ClickHouse/ClickHouse/pull/39343) ([Vladimir C](https://github.com/vdimir)).
+* Small doc updates [#39362](https://github.com/ClickHouse/ClickHouse/pull/39362) ([Robert Schulze](https://github.com/rschu1ze)).
+* Even less usage of StringRef [#39364](https://github.com/ClickHouse/ClickHouse/pull/39364) ([Robert Schulze](https://github.com/rschu1ze)).
+* Automatic fixes for black formatting for domestic repo PRs [#39390](https://github.com/ClickHouse/ClickHouse/pull/39390) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Clickhouse-local fixes [#39404](https://github.com/ClickHouse/ClickHouse/pull/39404) ([Heena Bansal](https://github.com/HeenaBansal2009)).
+* Uppercase `ROWS`, `GROUPS`, `RANGE` in queries with windows [#39410](https://github.com/ClickHouse/ClickHouse/pull/39410) ([Vladimir Chebotaryov](https://github.com/quickhouse)).
+* GitHub helper [#39421](https://github.com/ClickHouse/ClickHouse/pull/39421) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* ShellCommand wait pid refactoring [#39426](https://github.com/ClickHouse/ClickHouse/pull/39426) ([Maksim Kita](https://github.com/kitaisreal)).
+* Require clear style check to continue building [#39428](https://github.com/ClickHouse/ClickHouse/pull/39428) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* DirectDictionary improve performance of dictHas with duplicate keys [#39449](https://github.com/ClickHouse/ClickHouse/pull/39449) ([Maksim Kita](https://github.com/kitaisreal)).
+* Commit status names: remove "actions" [#39454](https://github.com/ClickHouse/ClickHouse/pull/39454) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Improve synchronization between hosts in distributed backup and fix locks [#39455](https://github.com/ClickHouse/ClickHouse/pull/39455) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Remove some dead and commented code [#39460](https://github.com/ClickHouse/ClickHouse/pull/39460) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add Build Check and Special Build Check to SimpleCheck [#39467](https://github.com/ClickHouse/ClickHouse/pull/39467) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Update version after release [#39474](https://github.com/ClickHouse/ClickHouse/pull/39474) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update version_date.tsv and changelogs after v22.7.1.2484-stable [#39475](https://github.com/ClickHouse/ClickHouse/pull/39475) ([github-actions[bot]](https://github.com/apps/github-actions)).
+* Update README.md [#39478](https://github.com/ClickHouse/ClickHouse/pull/39478) ([Dan Roscigno](https://github.com/DanRoscigno)).
+* Remove unused constructor [#39491](https://github.com/ClickHouse/ClickHouse/pull/39491) ([alesapin](https://github.com/alesapin)).
+* Mark new codec DEFLATE_QPL as experimental + cosmetics [#39495](https://github.com/ClickHouse/ClickHouse/pull/39495) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update arrow to fix possible data race [#39510](https://github.com/ClickHouse/ClickHouse/pull/39510) ([Kruglov Pavel](https://github.com/Avogar)).
+* fix `-DENABLE_EXAMPLES=1` in master [#39517](https://github.com/ClickHouse/ClickHouse/pull/39517) ([Constantine Peresypkin](https://github.com/pkit)).
+* LZ4_decompress_faster.cpp: remove endianness-dependent code [#39523](https://github.com/ClickHouse/ClickHouse/pull/39523) ([Ignat Loskutov](https://github.com/loskutov)).
+* Fix 02286_parallel_final [#39524](https://github.com/ClickHouse/ClickHouse/pull/39524) ([Nikita Taranov](https://github.com/nickitat)).
+* add Equinix metal N3 Xlarge [#39532](https://github.com/ClickHouse/ClickHouse/pull/39532) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Less usage of StringRef [#39535](https://github.com/ClickHouse/ClickHouse/pull/39535) ([Robert Schulze](https://github.com/rschu1ze)).
+* Follow up to [#37827](https://github.com/ClickHouse/ClickHouse/issues/37827) [#39557](https://github.com/ClickHouse/ClickHouse/pull/39557) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Temporarily disable all tests with MaterializedPostgreSQL [#39564](https://github.com/ClickHouse/ClickHouse/pull/39564) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update version_date.tsv after v22.3.9.19-lts [#39576](https://github.com/ClickHouse/ClickHouse/pull/39576) ([github-actions[bot]](https://github.com/apps/github-actions)).
+* free compression and decompression contexts [#39578](https://github.com/ClickHouse/ClickHouse/pull/39578) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Update version_date.tsv and changelogs after v22.6.4.35-stable [#39579](https://github.com/ClickHouse/ClickHouse/pull/39579) ([github-actions[bot]](https://github.com/apps/github-actions)).
+* Merge Woboq code browser page into "Getting Started" document [#39596](https://github.com/ClickHouse/ClickHouse/pull/39596) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix Chain::addSink [#39601](https://github.com/ClickHouse/ClickHouse/pull/39601) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update NuRaft to latest master [#39609](https://github.com/ClickHouse/ClickHouse/pull/39609) ([Antonio Andelic](https://github.com/antonio2368)).
+* copy self-extracting to output [#39617](https://github.com/ClickHouse/ClickHouse/pull/39617) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Replace MemoryTrackerBlockerInThread to LockMemoryExceptionInThread [#39619](https://github.com/ClickHouse/ClickHouse/pull/39619) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Combining sumIf->countIf and multiIf->if opt. [#39621](https://github.com/ClickHouse/ClickHouse/pull/39621) ([Amos Bird](https://github.com/amosbird)).
+* Update README.md [#39622](https://github.com/ClickHouse/ClickHouse/pull/39622) ([Ivan Blinkov](https://github.com/blinkov)).
+* Disable 02327_capnproto_protobuf_empty_messages with Ordinary [#39623](https://github.com/ClickHouse/ClickHouse/pull/39623) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* add Dell PowerEdge R740XD results [#39625](https://github.com/ClickHouse/ClickHouse/pull/39625) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Attempt to fix wrong workflow_run data for rerun [#39630](https://github.com/ClickHouse/ClickHouse/pull/39630) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Run tests with Replicated database in master [#39653](https://github.com/ClickHouse/ClickHouse/pull/39653) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Rollback request in Keeper if storing log fails [#39673](https://github.com/ClickHouse/ClickHouse/pull/39673) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix utils build on CI [#39679](https://github.com/ClickHouse/ClickHouse/pull/39679) ([Azat Khuzhin](https://github.com/azat)).
+* Add duration_ms into system.zookeeper_log [#39686](https://github.com/ClickHouse/ClickHouse/pull/39686) ([Azat Khuzhin](https://github.com/azat)).
+* Fix DISTINCT: handle all const columns case correctly [#39688](https://github.com/ClickHouse/ClickHouse/pull/39688) ([Igor Nikonov](https://github.com/devcrafter)).
+* Update README.md [#39692](https://github.com/ClickHouse/ClickHouse/pull/39692) ([Yuko Takagi](https://github.com/yukotakagi)).
+* Update Keeper version for digest [#39698](https://github.com/ClickHouse/ClickHouse/pull/39698) ([Antonio Andelic](https://github.com/antonio2368)).
+* Change mysql-odbc url [#39702](https://github.com/ClickHouse/ClickHouse/pull/39702) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Avoid recursive destruction of AST. [#39705](https://github.com/ClickHouse/ClickHouse/pull/39705) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update ccache to the latest available version [#39709](https://github.com/ClickHouse/ClickHouse/pull/39709) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Join enums refactoring [#39718](https://github.com/ClickHouse/ClickHouse/pull/39718) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix flaky test `02360_send_logs_level_colors` [#39720](https://github.com/ClickHouse/ClickHouse/pull/39720) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix cherry-pick for cases, when assignee is not set for PR [#39723](https://github.com/ClickHouse/ClickHouse/pull/39723) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Jepsen label [#39730](https://github.com/ClickHouse/ClickHouse/pull/39730) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix redirecting of logs to stdout in clickhouse-client [#39731](https://github.com/ClickHouse/ClickHouse/pull/39731) ([Anton Popov](https://github.com/CurtizJ)).
+* CI: refactor Simple Check, use statuses to make it stateful [#39735](https://github.com/ClickHouse/ClickHouse/pull/39735) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Use different root path for total-queue Jepsen test [#39738](https://github.com/ClickHouse/ClickHouse/pull/39738) ([Antonio Andelic](https://github.com/antonio2368)).
+* Simple refactoring: ordinary DISTINCT implementation [#39740](https://github.com/ClickHouse/ClickHouse/pull/39740) ([Igor Nikonov](https://github.com/devcrafter)).
+* Cleanup usages of `allow_experimental_projection_optimization` setting, part 1 [#39746](https://github.com/ClickHouse/ClickHouse/pull/39746) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Enable SQL function getOSKernelVersion() on all platforms [#39751](https://github.com/ClickHouse/ClickHouse/pull/39751) ([Robert Schulze](https://github.com/rschu1ze)).
+* Try clang-15 for build with tsan [#39758](https://github.com/ClickHouse/ClickHouse/pull/39758) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Rename "splitted build" to "shared libraries build" in CI tools [#39759](https://github.com/ClickHouse/ClickHouse/pull/39759) ([Robert Schulze](https://github.com/rschu1ze)).
+* Use std::popcount, ::countl_zero, ::countr_zero functions [#39760](https://github.com/ClickHouse/ClickHouse/pull/39760) ([Robert Schulze](https://github.com/rschu1ze)).
+* Self-extracting - run resulting executable with execvp [#39763](https://github.com/ClickHouse/ClickHouse/pull/39763) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix non-deterministic queries in distinct_in_order test [#39772](https://github.com/ClickHouse/ClickHouse/pull/39772) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix some flaky integration tests [#39775](https://github.com/ClickHouse/ClickHouse/pull/39775) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Retry inserts with ClickHouseHelper [#39780](https://github.com/ClickHouse/ClickHouse/pull/39780) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add cloudflare DNS as a fallback [#39795](https://github.com/ClickHouse/ClickHouse/pull/39795) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update README.md [#39796](https://github.com/ClickHouse/ClickHouse/pull/39796) ([Yuko Takagi](https://github.com/yukotakagi)).
+* Minor fix for Stress Tests [#39798](https://github.com/ClickHouse/ClickHouse/pull/39798) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Typos [#39813](https://github.com/ClickHouse/ClickHouse/pull/39813) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update settings changes history [#39839](https://github.com/ClickHouse/ClickHouse/pull/39839) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix post-build script for building utils/self-extracting-executable/compressor [#39843](https://github.com/ClickHouse/ClickHouse/pull/39843) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Add hasJoin method into ASTSelectQuery [#39850](https://github.com/ClickHouse/ClickHouse/pull/39850) ([Maksim Kita](https://github.com/kitaisreal)).
+* Update tweak on version part update [#39853](https://github.com/ClickHouse/ClickHouse/pull/39853) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update version_date.tsv and changelogs after v22.7.2.15-stable [#39854](https://github.com/ClickHouse/ClickHouse/pull/39854) ([github-actions[bot]](https://github.com/apps/github-actions)).
+* Fix typo and extra dots in exception messages from OverCommitTracker [#39858](https://github.com/ClickHouse/ClickHouse/pull/39858) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix flaky integration test test_async_backups_to_same_destination. [#39859](https://github.com/ClickHouse/ClickHouse/pull/39859) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Better total part size calculation on mutation [#39860](https://github.com/ClickHouse/ClickHouse/pull/39860) ([alesapin](https://github.com/alesapin)).
+* typo: PostgerSQL -> PostgreSQL [#39861](https://github.com/ClickHouse/ClickHouse/pull/39861) ([nathanbegbie](https://github.com/nathanbegbie)).
+* Remove prefer_localhost_replica from test [#39862](https://github.com/ClickHouse/ClickHouse/pull/39862) ([Igor Nikonov](https://github.com/devcrafter)).
+* Block memory tracker in Keeper during commit [#39867](https://github.com/ClickHouse/ClickHouse/pull/39867) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update version_date.tsv after v22.3.10.22-lts [#39868](https://github.com/ClickHouse/ClickHouse/pull/39868) ([github-actions[bot]](https://github.com/apps/github-actions)).
+* fix incorrect format for functions with settings [#39869](https://github.com/ClickHouse/ClickHouse/pull/39869) ([Constantine Peresypkin](https://github.com/pkit)).
+* Get api url from event, not from const/ENV [#39871](https://github.com/ClickHouse/ClickHouse/pull/39871) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Cleanup unused dirs from `store/` on all disks [#39872](https://github.com/ClickHouse/ClickHouse/pull/39872) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update 02354_distributed_with_external_aggregation_memory_usage.sql [#39893](https://github.com/ClickHouse/ClickHouse/pull/39893) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix the race between waitMutation and updating local queue from ZK [#39900](https://github.com/ClickHouse/ClickHouse/pull/39900) ([Alexander Gololobov](https://github.com/davenger)).
+* Improve 02354_distributed_with_external_aggregation_memory_usage [#39908](https://github.com/ClickHouse/ClickHouse/pull/39908) ([Nikita Taranov](https://github.com/nickitat)).
+* Move username and password from URL parameters to Basic Authentication [#39910](https://github.com/ClickHouse/ClickHouse/pull/39910) ([San](https://github.com/santrancisco)).
+* Remove cache flush from the Docs Check [#39911](https://github.com/ClickHouse/ClickHouse/pull/39911) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix flaky tests (`Tried to commit obsolete part`) [#39922](https://github.com/ClickHouse/ClickHouse/pull/39922) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add logging to debug flaky tests [#39925](https://github.com/ClickHouse/ClickHouse/pull/39925) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix flaky test `02360_send_logs_level_colors` [#39927](https://github.com/ClickHouse/ClickHouse/pull/39927) ([Anton Popov](https://github.com/CurtizJ)).
+* Don't create self-extracting clickhouse for split build [#39936](https://github.com/ClickHouse/ClickHouse/pull/39936) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* tests/stress: add dmesg output (to see OOM details) [#39939](https://github.com/ClickHouse/ClickHouse/pull/39939) ([Azat Khuzhin](https://github.com/azat)).
+* Create metadata directory on CREATE for FileLog engine [#39940](https://github.com/ClickHouse/ClickHouse/pull/39940) ([Azat Khuzhin](https://github.com/azat)).
+* tests: fix 02352_rwlock flakiness [#39941](https://github.com/ClickHouse/ClickHouse/pull/39941) ([Azat Khuzhin](https://github.com/azat)).
+* Remove old code from the website [#39947](https://github.com/ClickHouse/ClickHouse/pull/39947) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove debug trace from DistinctStep [#39955](https://github.com/ClickHouse/ClickHouse/pull/39955) ([Igor Nikonov](https://github.com/devcrafter)).
+* IAST destructor intrusive list [#39956](https://github.com/ClickHouse/ClickHouse/pull/39956) ([Maksim Kita](https://github.com/kitaisreal)).
+* Remove old code from the website (part 2) [#39959](https://github.com/ClickHouse/ClickHouse/pull/39959) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add Stateful tests (release), Stateless tests (release) to Mergeable Check [#39967](https://github.com/ClickHouse/ClickHouse/pull/39967) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Change font in CI reports [#39969](https://github.com/ClickHouse/ClickHouse/pull/39969) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add setting type to support special 'auto' value [#39974](https://github.com/ClickHouse/ClickHouse/pull/39974) ([Vladimir C](https://github.com/vdimir)).
+* Update 02354_distributed_with_external_aggregation_memory_usage.sql [#39979](https://github.com/ClickHouse/ClickHouse/pull/39979) ([Nikita Taranov](https://github.com/nickitat)).
+* tests/stress: fix dmesg reading [#39980](https://github.com/ClickHouse/ClickHouse/pull/39980) ([Azat Khuzhin](https://github.com/azat)).
+* Disable 02380_insert_mv_race.sh with Ordinary [#39985](https://github.com/ClickHouse/ClickHouse/pull/39985) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Mention how the build can be speed up by disabling self-extraction [#39988](https://github.com/ClickHouse/ClickHouse/pull/39988) ([Robert Schulze](https://github.com/rschu1ze)).
+* Use different root path for Jepsen Counter test [#39992](https://github.com/ClickHouse/ClickHouse/pull/39992) ([Antonio Andelic](https://github.com/antonio2368)).
+* ActionsDAG rename index to outputs [#39998](https://github.com/ClickHouse/ClickHouse/pull/39998) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added H literal for Hour IntervalKind [#39999](https://github.com/ClickHouse/ClickHouse/pull/39999) ([Heena Bansal](https://github.com/HeenaBansal2009)).
+* Try to avoid timeouts when checking for replication consistency [#40001](https://github.com/ClickHouse/ClickHouse/pull/40001) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* More generic check for MergeTree table family [#40004](https://github.com/ClickHouse/ClickHouse/pull/40004) ([Alexander Gololobov](https://github.com/davenger)).
+* Further preparation for catboost integration into library-bridge [#40010](https://github.com/ClickHouse/ClickHouse/pull/40010) ([Robert Schulze](https://github.com/rschu1ze)).
+* Self-extracting: decompressor, extract real path of executable instead of argv[0] [#40011](https://github.com/ClickHouse/ClickHouse/pull/40011) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* copy self-extracting to output [#40017](https://github.com/ClickHouse/ClickHouse/pull/40017) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Update 02354_distributed_with_external_aggregation_memory_usage.sql [#40024](https://github.com/ClickHouse/ClickHouse/pull/40024) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix segfault in `DataTypeAggregateFunction` [#40025](https://github.com/ClickHouse/ClickHouse/pull/40025) ([Anton Popov](https://github.com/CurtizJ)).
+* tests/performance: cover sparse_hashed dictionary [#40027](https://github.com/ClickHouse/ClickHouse/pull/40027) ([Azat Khuzhin](https://github.com/azat)).
+* Cleanup docs of parseDateTime*() function family [#40030](https://github.com/ClickHouse/ClickHouse/pull/40030) ([Robert Schulze](https://github.com/rschu1ze)).
+* Job url [#40032](https://github.com/ClickHouse/ClickHouse/pull/40032) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update version_date.tsv and changelogs after v22.6.5.22-stable [#40036](https://github.com/ClickHouse/ClickHouse/pull/40036) ([github-actions[bot]](https://github.com/apps/github-actions)).
+* Non-significant changes [#40038](https://github.com/ClickHouse/ClickHouse/pull/40038) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* tests: attempt to make 02293_part_log_has_merge_reason less flaky [#40047](https://github.com/ClickHouse/ClickHouse/pull/40047) ([Azat Khuzhin](https://github.com/azat)).
+* Remove documentation templates [#40048](https://github.com/ClickHouse/ClickHouse/pull/40048) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Move images to clickhouse-presentations repository. [#40049](https://github.com/ClickHouse/ClickHouse/pull/40049) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix broken image in test-visualizer [#40050](https://github.com/ClickHouse/ClickHouse/pull/40050) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for query parameters in HTTP POST [#40055](https://github.com/ClickHouse/ClickHouse/pull/40055) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix clickhouse-test hang in case of CREATE DATABASE fails [#40057](https://github.com/ClickHouse/ClickHouse/pull/40057) ([Azat Khuzhin](https://github.com/azat)).
+* tests: fix 02380_insert_mv_race for Ordinary database [#40058](https://github.com/ClickHouse/ClickHouse/pull/40058) ([Azat Khuzhin](https://github.com/azat)).
+* Skip newlines before Tags in clickhouse-test [#40061](https://github.com/ClickHouse/ClickHouse/pull/40061) ([Vladimir C](https://github.com/vdimir)).
+* Replace S3 URLs by parameter [#40066](https://github.com/ClickHouse/ClickHouse/pull/40066) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Finally fix `_csv.Error: field larger than field limit` [#40072](https://github.com/ClickHouse/ClickHouse/pull/40072) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* tests: fix 00926_adaptive_index_granularity_pk/00489_pk_subexpression flakiness [#40075](https://github.com/ClickHouse/ClickHouse/pull/40075) ([Azat Khuzhin](https://github.com/azat)).
+* Changelogs and versions [#40090](https://github.com/ClickHouse/ClickHouse/pull/40090) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* A test for counting resources in subqueries [#40104](https://github.com/ClickHouse/ClickHouse/pull/40104) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Use a job ID as ref text [#40112](https://github.com/ClickHouse/ClickHouse/pull/40112) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Delete files DictionaryJoinAdapter.h/cpp [#40113](https://github.com/ClickHouse/ClickHouse/pull/40113) ([Vladimir C](https://github.com/vdimir)).
+* Rework S3Helper a little bit [#40127](https://github.com/ClickHouse/ClickHouse/pull/40127) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* PODArray assign empty array fix [#40129](https://github.com/ClickHouse/ClickHouse/pull/40129) ([Maksim Kita](https://github.com/kitaisreal)).
+* Disable 02390_prometheus_ClickHouseStatusInfo_DictionaryStatus with Ordinary database [#40136](https://github.com/ClickHouse/ClickHouse/pull/40136) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add tests with Ordinary database to flaky check [#40137](https://github.com/ClickHouse/ClickHouse/pull/40137) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* fs cache: minor change [#40138](https://github.com/ClickHouse/ClickHouse/pull/40138) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix typo [#40139](https://github.com/ClickHouse/ClickHouse/pull/40139) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix keeper-bench in case of error during scheduling a thread [#40147](https://github.com/ClickHouse/ClickHouse/pull/40147) ([Azat Khuzhin](https://github.com/azat)).
+* Fix "Cannot quickly remove directory" [#40151](https://github.com/ClickHouse/ClickHouse/pull/40151) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Set sync_request_timeout to 10 to avoid reconnections in tests [#40158](https://github.com/ClickHouse/ClickHouse/pull/40158) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Disable zero-copy replication by default [#40175](https://github.com/ClickHouse/ClickHouse/pull/40175) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve assignment and logging for cherry-pick and backport steps [#40177](https://github.com/ClickHouse/ClickHouse/pull/40177) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* test for Decimal aggregateFunction normalization [#39420](https://github.com/ClickHouse/ClickHouse/issues/39420) [#40178](https://github.com/ClickHouse/ClickHouse/pull/40178) ([Denny Crane](https://github.com/den-crane)).
+* Minor build changes [#40182](https://github.com/ClickHouse/ClickHouse/pull/40182) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* clickhouse-test: enable ZooKeeper tests by default [#40191](https://github.com/ClickHouse/ClickHouse/pull/40191) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove old code [#40196](https://github.com/ClickHouse/ClickHouse/pull/40196) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update README.md [#40198](https://github.com/ClickHouse/ClickHouse/pull/40198) ([clickhouse-robot-curie](https://github.com/clickhouse-robot-curie)).
+* Fix a bug with symlinks detection [#40232](https://github.com/ClickHouse/ClickHouse/pull/40232) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Better error message when restoring covered parts [#40234](https://github.com/ClickHouse/ClickHouse/pull/40234) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Try to print stacktraces if query timeouts in integration tests [#40248](https://github.com/ClickHouse/ClickHouse/pull/40248) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add Unit tests to Mergeable [#40250](https://github.com/ClickHouse/ClickHouse/pull/40250) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Extract common KV storage logic [#40261](https://github.com/ClickHouse/ClickHouse/pull/40261) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add update_mergeable_check trigger for Unit tests [#40269](https://github.com/ClickHouse/ClickHouse/pull/40269) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* CVE-2021-3520: (negligible) rdkafka library: update lz4.c from upstream [#40272](https://github.com/ClickHouse/ClickHouse/pull/40272) ([Suzy Wang](https://github.com/SuzyWangIBMer)).
+* Fix build [#40297](https://github.com/ClickHouse/ClickHouse/pull/40297) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### Support cte statement for antlr4 syntax file
+
+* ... [#39814](https://github.com/ClickHouse/ClickHouse/pull/39814) ([qianmoQ](https://github.com/qianmoQ)).
+
diff --git a/docs/en/development/build-cross-riscv.md b/docs/en/development/build-cross-riscv.md
index a17063e7d8d..a0b31ff131a 100644
--- a/docs/en/development/build-cross-riscv.md
+++ b/docs/en/development/build-cross-riscv.md
@@ -23,7 +23,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ``` bash
 cd ClickHouse
 mkdir build-riscv64
-CC=clang-14 CXX=clang++-14 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DENABLE_ORC=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
+CC=clang-14 CXX=clang++-14 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
 ninja -C build-riscv64
 ```
 
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index e12884b61c4..cea6354094b 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -135,28 +135,6 @@ export PATH=/home/milovidov/work/cmake-3.22.2-linux-x86_64/bin/:${PATH}
 hash cmake
 ```
 
-## How to Build ClickHouse Debian Package {#how-to-build-clickhouse-debian-package}
-
-### Install Git {#install-git}
-
-``` bash
-sudo apt-get update
-sudo apt-get install git python debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
-```
-
-### Checkout ClickHouse Sources {#checkout-clickhouse-sources-1}
-
-``` bash
-git clone --recursive --branch master https://github.com/ClickHouse/ClickHouse.git
-cd ClickHouse
-```
-
-### Run Release Script {#run-release-script}
-
-``` bash
-./release
-```
-
 ## You Don’t Have to Build ClickHouse {#you-dont-have-to-build-clickhouse}
 
 ClickHouse is available in pre-built binaries and packages. Binaries are portable and can be run on any Linux flavour.
diff --git a/docs/en/development/continuous-integration.md b/docs/en/development/continuous-integration.md
index 7b2da4416d6..48a12474a51 100644
--- a/docs/en/development/continuous-integration.md
+++ b/docs/en/development/continuous-integration.md
@@ -171,11 +171,11 @@ concurrency-related errors. If it fails:
 
 ## Split Build Smoke Test
 
-Checks that the server build in [split build](../development/build.md#split-build)
+Checks that the server build in [split build](../development/developer-instruction.md#split-build)
 configuration can start and run simple queries.  If it fails:
 
     * Fix other test errors first;
-    * Build the server in [split build](../development/build.md#split-build) configuration
+    * Build the server in [split build](../development/developer-instruction.md#split-build) configuration
       locally and check whether it can start and run `select 1`.
 
 
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index ea2ed95fd27..945d5a2f62f 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -267,22 +267,27 @@ The system will prepare ClickHouse binary builds for your pull request individua
 
 Most probably some of the builds will fail at first times. This is due to the fact that we check builds both with gcc as well as with clang, with almost all of existing warnings (always with the `-Werror` flag) enabled for clang. On that same page, you can find all of the build logs so that you do not have to build ClickHouse in all of the possible ways.
 
+## Browse ClickHouse Source Code {#browse-clickhouse-source-code}
+
+You can use the **Woboq** online code browser available [here](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). It provides code navigation, semantic highlighting, search and indexing. The code snapshot is updated daily.
+
+Also, you can browse sources on [GitHub](https://github.com/ClickHouse/ClickHouse) as usual.
+
 ## Faster builds for development: Split build configuration {#split-build}
 
-ClickHouse is normally statically linked into a single static `clickhouse` binary with minimal dependencies. This is convenient for distribution, but it means that for every change the entire binary needs to be re-linked, which is slow and inconvenient for development. As an alternative, you can instead build dynamically linked shared libraries and separate binaries `clickhouse-server`, `clickhouse-client` etc., allowing for faster incremental builds. To use it, add the following flags to your `cmake` invocation:
+ClickHouse is normally statically linked into a single static `clickhouse` binary with minimal dependencies. This is convenient for distribution, but it means that for every change the entire binary needs to be re-linked, which is slow and inconvenient for development. As an alternative, you can instead build dynamically linked shared libraries, allowing for faster incremental builds. To use it, add the following flags to your `cmake` invocation:
 ```
--DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1
+-DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1
 ```
 
-Note that the split build has several drawbacks:
-* There is no single `clickhouse` binary, and you have to run `clickhouse-server`, `clickhouse-client`, etc.
-* Risk of segfault if you run any of the programs while rebuilding the project.
-* You cannot run the integration tests since they only work a single complete binary.
-* You can't easily copy the binaries elsewhere. Instead of moving a single binary you'll need to copy all binaries and libraries.
-
 If you are not interested in functionality provided by third-party libraries, you can further speed up the build using `cmake` options
 ```
 -DENABLE_LIBRARIES=0 -DENABLE_EMBEDDED_COMPILER=0
 ```
 
+Compressing the binary at the end of the build may take a while, disable the self-extraction feature via
+```
+-DENABLE_CLICKHOUSE_SELF_EXTRACTING=0
+```
+
 In case of problems with any of the development options, you are on your own!
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 4d85934f730..d4bf36b0026 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -192,7 +192,7 @@ ClickHouse fuzzing is implemented both using [libFuzzer](https://llvm.org/docs/L
 All the fuzz testing should be performed with sanitizers (Address and Undefined).
 
 LibFuzzer is used for isolated fuzz testing of library code. Fuzzers are implemented as part of test code and have “_fuzzer” name postfixes.
-Fuzzer example can be found at `src/Parsers/tests/lexer_fuzzer.cpp`. LibFuzzer-specific configs, dictionaries and corpus are stored at `tests/fuzz`.
+Fuzzer example can be found at `src/Parsers/fuzzers/lexer_fuzzer.cpp`. LibFuzzer-specific configs, dictionaries and corpus are stored at `tests/fuzz`.
 We encourage you to write fuzz tests for every functionality that handles user input.
 
 Fuzzers are not built by default. To build fuzzers both `-DENABLE_FUZZING=1` and `-DENABLE_TESTS=1` options should be set.
diff --git a/docs/en/engines/database-engines/postgresql.md b/docs/en/engines/database-engines/postgresql.md
index 969a326b701..5a430565d54 100644
--- a/docs/en/engines/database-engines/postgresql.md
+++ b/docs/en/engines/database-engines/postgresql.md
@@ -29,7 +29,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use
 
 ## Data Types Support {#data_types-support}
 
-| PostgerSQL       | ClickHouse                                                   |
+| PostgreSQL       | ClickHouse                                                   |
 |------------------|--------------------------------------------------------------|
 | DATE             | [Date](../../sql-reference/data-types/date.md)               |
 | TIMESTAMP        | [DateTime](../../sql-reference/data-types/datetime.md)       |
diff --git a/docs/en/engines/database-engines/replicated.md b/docs/en/engines/database-engines/replicated.md
index 8ddff32bb2c..110b799c6be 100644
--- a/docs/en/engines/database-engines/replicated.md
+++ b/docs/en/engines/database-engines/replicated.md
@@ -81,7 +81,7 @@ Creating a distributed table and inserting the data:
 
 ``` sql
 node2 :) CREATE TABLE r.d (n UInt64) ENGINE=Distributed('r','r','rmt', n % 2);
-node3 :) INSERT INTO r SELECT * FROM numbers(10);
+node3 :) INSERT INTO r.d SELECT * FROM numbers(10);
 node1 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY host;
 ```
 
@@ -120,4 +120,4 @@ node2 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY
 │ node2 │  [1,3,5,7,9]  │
 │ node4 │  [0,2,4,6,8]  │
 └───────┴───────────────┘
-```
\ No newline at end of file
+```
diff --git a/docs/en/engines/table-engines/integrations/hdfs.md b/docs/en/engines/table-engines/integrations/hdfs.md
index 9796fd73b1b..7d6a45554f8 100644
--- a/docs/en/engines/table-engines/integrations/hdfs.md
+++ b/docs/en/engines/table-engines/integrations/hdfs.md
@@ -51,10 +51,14 @@ SELECT * FROM hdfs_engine_table LIMIT 2
 ## Implementation Details {#implementation-details}
 
 -   Reads and writes can be parallel.
--   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is supported.
 -   Not supported:
     -   `ALTER` and `SELECT...SAMPLE` operations.
     -   Indexes.
+    -   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is possible, but not recommended.
+  
+  :::warning Zero-copy replication is not ready for production
+  Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
+  :::
 
 **Globs in path**
 
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 09566a08dd6..23c6e5365c0 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -50,10 +50,14 @@ For more information about virtual columns see [here](../../../engines/table-eng
 ## Implementation Details {#implementation-details}
 
 -   Reads and writes can be parallel
--   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is supported.
 -   Not supported:
     -   `ALTER` and `SELECT...SAMPLE` operations.
     -   Indexes.
+    -   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is possible, but not supported.
+
+  :::warning Zero-copy replication is not ready for production
+  Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
+  :::
 
 ## Wildcards In Path {#wildcards-in-path}
 
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 0cfe08df67a..dc9ac07fd2f 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -486,9 +486,11 @@ In addition to skip indices, there are also [Approximate Nearest Neighbor Search
 
 ## Projections {#projections}
 Projections are like [materialized views](../../../sql-reference/statements/create/view.md#materialized) but defined in part-level. It provides consistency guarantees along with automatic usage in queries.
-::: note
+
+:::note
 When you are implementing projections you should also consider the [force_optimize_projection](../../../operations/settings/settings.md#force-optimize-projection) setting.
 :::
+
 Projections are not supported in the `SELECT` statements with the [FINAL](../../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 ### Projection Query {#projection-query}
@@ -882,8 +884,6 @@ User can assign new big parts to different disks of a [JBOD](https://en.wikipedi
 
 `MergeTree` family table engines can store data to [S3](https://aws.amazon.com/s3/) using a disk with type `s3`.
 
-This feature is under development and not ready for production. There are known drawbacks such as very low performance.
-
 Configuration markup:
 ``` xml
 <storage_configuration>
@@ -1027,6 +1027,10 @@ Other parameters:
 
 Examples of working configurations can be found in integration tests directory (see e.g. [test_merge_tree_azure_blob_storage](https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/test_merge_tree_azure_blob_storage/configs/config.d/storage_conf.xml) or [test_azure_blob_storage_zero_copy_replication](https://github.com/ClickHouse/ClickHouse/blob/master/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml)).
 
+  :::warning Zero-copy replication is not ready for production
+  Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
+  :::
+
 ## Virtual Columns {#virtual-columns}
 
 -   `_part` — Name of a part.
diff --git a/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
index daa507cab66..fc94baa47e5 100644
--- a/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -39,10 +39,53 @@ Uniqueness of rows is determined by the `ORDER BY` table section, not `PRIMARY K
 
 `ver` — column with the version number. Type `UInt*`, `Date`, `DateTime` or `DateTime64`. Optional parameter.
 
-    When merging, `ReplacingMergeTree` from all the rows with the same sorting key leaves only one:
+When merging, `ReplacingMergeTree` from all the rows with the same sorting key leaves only one:
 
-    -   The last in the selection, if `ver` not set. A selection is a set of rows in a set of parts participating in the merge. The most recently created part (the last insert) will be the last one in the selection. Thus, after deduplication, the very last row from the most recent insert will remain for each unique sorting key.
-    -   With the maximum version, if `ver` specified. If `ver` is the same for several rows, then it will use "if `ver` is not specified" rule for them, i.e. the most recent inserted row will remain.
+   - The last in the selection, if `ver` not set. A selection is a set of rows in a set of parts participating in the merge. The most recently created part (the last insert) will be the last one in the selection. Thus, after deduplication, the very last row from the most recent insert will remain for each unique sorting key.
+   - With the maximum version, if `ver` specified. If `ver` is the same for several rows, then it will use "if `ver` is not specified" rule for them, i.e. the most recent inserted row will remain.
+
+Example: 
+
+```sql
+-- without ver - the last inserted 'wins'
+CREATE TABLE myFirstReplacingMT
+(
+    `key` Int64,
+    `someCol` String,
+    `eventTime` DateTime
+)
+ENGINE = ReplacingMergeTree
+ORDER BY key;
+
+INSERT INTO myFirstReplacingMT Values (1, 'first', '2020-01-01 01:01:01');
+INSERT INTO myFirstReplacingMT Values (1, 'second', '2020-01-01 00:00:00');
+
+SELECT * FROM myFirstReplacingMT FINAL;
+
+┌─key─┬─someCol─┬───────────eventTime─┐
+│   1 │ second  │ 2020-01-01 00:00:00 │
+└─────┴─────────┴─────────────────────┘
+
+
+-- with ver - the row with the biggest ver 'wins'
+CREATE TABLE mySecondReplacingMT
+(
+    `key` Int64,
+    `someCol` String,
+    `eventTime` DateTime
+)
+ENGINE = ReplacingMergeTree(eventTime)
+ORDER BY key;
+
+INSERT INTO mySecondReplacingMT Values (1, 'first', '2020-01-01 01:01:01');
+INSERT INTO mySecondReplacingMT Values (1, 'second', '2020-01-01 00:00:00');
+
+SELECT * FROM mySecondReplacingMT FINAL;
+
+┌─key─┬─someCol─┬───────────eventTime─┐
+│   1 │ first   │ 2020-01-01 01:01:01 │
+└─────┴─────────┴─────────────────────┘
+```
 
 ## Query clauses
 
diff --git a/docs/en/getting-started/example-datasets/uk-price-paid.md b/docs/en/getting-started/example-datasets/uk-price-paid.md
index b7a486fb057..04e853275ed 100644
--- a/docs/en/getting-started/example-datasets/uk-price-paid.md
+++ b/docs/en/getting-started/example-datasets/uk-price-paid.md
@@ -389,12 +389,6 @@ SETTINGS mutations_sync = 1;
 
 Let's run the same 3 queries.
 
-[Enable](../../operations/settings/settings.md#allow-experimental-projection-optimization) projections for selects:
-
-```sql
-SET allow_experimental_projection_optimization = 1;
-```
-
 ### Query 1. Average Price Per Year {#average-price-projections}
 
 Query:
diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index e0882d1f9e1..4fbeb5088ee 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -22,7 +22,9 @@ Connected to ClickHouse server version 20.13.1 revision 54442.
 
 Different client and server versions are compatible with one another, but some features may not be available in older clients. We recommend using the same version of the client as the server app. When you try to use a client of the older version, then the server, `clickhouse-client` displays the message:
 
-      ClickHouse client version is older than ClickHouse server. It may lack support for new features.
+```response
+ClickHouse client version is older than ClickHouse server. It may lack support for new features.
+```
 
 ## Usage {#cli_usage}
 
@@ -80,6 +82,13 @@ You can create a query with parameters and pass values to them from client appli
 $ clickhouse-client --param_parName="[1, 2]"  -q "SELECT * FROM table WHERE a = {parName:Array(UInt16)}"
 ```
 
+It is also possible to set parameters from within an interactive session:
+``` bash
+$ clickhouse-client -nq "
+  SET param_parName='[1, 2]';
+  SELECT {parName:Array(UInt16)}"
+```
+
 #### Query Syntax {#cli-queries-with-parameters-syntax}
 
 Format a query as usual, then place the values that you want to pass from the app parameters to the query in braces in the following format:
@@ -116,6 +125,7 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 -   `--port` – The port to connect to. Default value: 9000. Note that the HTTP interface and the native interface use different ports.
 -   `--user, -u` – The username. Default value: default.
 -   `--password` – The password. Default value: empty string.
+-   `--ask-password` - Prompt the user to enter a password.
 -   `--query, -q` – The query to process when using non-interactive mode. You must specify either `query` or `queries-file` option.
 -   `--queries-file` – file path with queries to execute. You must specify either `query` or `queries-file` option.
 -   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
@@ -182,6 +192,6 @@ This feature can be used to generate URLs to facilitate profiling of queries.
 
 If the configuration above is applied, the ID of a query is shown in the following format:
 
-``` text
+```response
 speedscope:http://speedscope-host/#profileURL=qp%3Fid%3Dc8ecc783-e753-4b38-97f1-42cddfb98b7d
 ```
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 6678af9036b..10a311d3aec 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -49,10 +49,17 @@ The supported formats are:
 | [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔    | ✔      |
 | [TSKV](#tskv)                                                                             | ✔    | ✔      |
 | [Pretty](#pretty)                                                                         | ✗    | ✔      |
-| [PrettyCompact](#prettycompact)                                                           | ✗    | ✔      |
-| [PrettyCompactMonoBlock](#prettycompactmonoblock)                                         | ✗    | ✔      |
 | [PrettyNoEscapes](#prettynoescapes)                                                       | ✗    | ✔      |
+| [PrettyMonoBlock](#prettymonoblock)                                                       | ✗    | ✔      |
+| [PrettyNoEscapesMonoBlock](#prettynoescapesmonoblock)                                     | ✗    | ✔      |
+| [PrettyCompact](#prettycompact)                                                           | ✗    | ✔      |
+| [PrettyCompactNoEscapes](#prettycompactnoescapes)                                         | ✗    | ✔      |
+| [PrettyCompactMonoBlock](#prettycompactmonoblock)                                         | ✗    | ✔      |
+| [PrettyCompactNoEscapesMonoBlock](#prettycompactnoescapesmonoblock)                       | ✗    | ✔      |
 | [PrettySpace](#prettyspace)                                                               | ✗    | ✔      |
+| [PrettySpaceNoEscapes](#prettyspacenoescapes)                                             | ✗    | ✔      |
+| [PrettySpaceMonoBlock](#prettyspacemonoblock)                                             | ✗    | ✔      |
+| [PrettySpaceNoEscapesMonoBlock](#prettyspacenoescapesmonoblock)                           | ✗    | ✔      |
 | [Prometheus](#prometheus)                                                                 | ✗    | ✔      |
 | [Protobuf](#protobuf)                                                                     | ✔    | ✔      |
 | [ProtobufSingle](#protobufsingle)                                                         | ✔    | ✔      |
@@ -1198,18 +1205,9 @@ Extremes:
 └────────────┴─────────┘
 ```
 
-## PrettyCompact {#prettycompact}
-
-Differs from [Pretty](#pretty) in that the grid is drawn between rows and the result is more compact.
-This format is used by default in the command-line client in interactive mode.
-
-## PrettyCompactMonoBlock {#prettycompactmonoblock}
-
-Differs from [PrettyCompact](#prettycompact) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
-
 ## PrettyNoEscapes {#prettynoescapes}
 
-Differs from Pretty in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
+Differs from [Pretty](#pretty) in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
 
 Example:
 
@@ -1219,19 +1217,49 @@ $ watch -n1 "clickhouse-client --query='SELECT event, value FROM system.events F
 
 You can use the HTTP interface for displaying in the browser.
 
-### PrettyCompactNoEscapes {#prettycompactnoescapes}
+## PrettyMonoBlock {#prettymonoblock}
 
-The same as the previous setting.
+Differs from [Pretty](#pretty) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
 
-### PrettySpaceNoEscapes {#prettyspacenoescapes}
+## PrettyNoEscapesMonoBlock {#prettynoescapesmonoblock}
 
-The same as the previous setting.
+Differs from [PrettyNoEscapes](#prettynoescapes) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+
+## PrettyCompact {#prettycompact}
+
+Differs from [Pretty](#pretty) in that the grid is drawn between rows and the result is more compact.
+This format is used by default in the command-line client in interactive mode.
+
+## PrettyCompactNoEscapes {#prettynoescapes}
+
+Differs from [PrettyCompact](#prettycompact) in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
+
+## PrettyCompactMonoBlock {#prettycompactmonoblock}
+
+Differs from [PrettyCompact](#prettycompact) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+## PrettyCompactNoEscapesMonoBlock {#prettycompactnoescapesmonoblock}
+
+Differs from [PrettyCompactNoEscapes](#prettycompactnoescapes) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
 
 ## PrettySpace {#prettyspace}
 
 Differs from [PrettyCompact](#prettycompact) in that whitespace (space characters) is used instead of the grid.
 
-### Pretty formats settings {#pretty-formats-settings}
+## PrettySpaceNoEscapes {#prettyspacenoescapes}
+
+Differs from [PrettySpace](#prettyspace) in that ANSI-escape sequences aren’t used. This is necessary for displaying this format in a browser, as well as for using the ‘watch’ command-line utility.
+
+## PrettySpaceMonoBlock {#prettyspacemonoblock}
+
+Differs from [PrettySpace](#prettyspace) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+## PrettySpaceNoEscapesMonoBlock {#prettyspacenoescapesmonoblock}
+
+Differs from [PrettySpaceNoEscapes](#prettyspacenoescapes) in that up to 10,000 rows are buffered, then output as a single table, not by blocks.
+
+## Pretty formats settings {#pretty-formats-settings}
 
 - [output_format_pretty_max_rows](../operations/settings/settings.md#output_format_pretty_max_rows) - rows limit for Pretty formats. Default value - `10000`.
 - [output_format_pretty_max_column_pad_width](../operations/settings/settings.md#output_format_pretty_max_column_pad_width) - maximum width to pad all values in a column in Pretty formats. Default value - `250`.
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index c5cc8c7c34b..7bcc8832da2 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -73,6 +73,18 @@ Features:
 
 ClickHouse datasource plugin provides a support for ClickHouse as a backend database.
 
+### qryn (#qryn)
+
+[qryn](https://metrico.in) is a polyglot, high-performance observability stack for ClickHouse _(formerly cLoki)_ with native Grafana integrations allowing users to ingest and analyze logs, metrics and telemetry traces from any agent supporting Loki/LogQL, Prometheus/PromQL, OTLP/Tempo, Elastic, InfluxDB and many more.
+
+Features:
+
+- Built in Explore UI and LogQL CLI for querying, extracting and visualizing data
+- Native Grafana APIs support for querying, processing, ingesting, tracing and alerting without plugins
+- Powerful pipeline to dynamically search, filter and extract data from logs, events, traces and beyond
+- Ingestion and PUSH APIs transparently compatible with LogQL, PromQL, InfluxDB, Elastic and many more
+- Ready to use with Agents such as Promtail, Grafana-Agent, Vector, Logstash, Telegraf and many others
+
 ### DBeaver {#dbeaver}
 
 [DBeaver](https://dbeaver.io/) - universal desktop database client with ClickHouse support.
@@ -149,7 +161,7 @@ Features:
 
 ### ClickCat {#clickcat}
 
-[ClickCat](https://github.com/open-botech/ClickCat) is a firendly user interface that lets you search, explore and visualize your ClickHouse Data.
+[ClickCat](https://github.com/clickcat-project/ClickCat) is a friendly user interface that lets you search, explore and visualize your ClickHouse Data.
 
 Features:
 
@@ -169,6 +181,22 @@ Features:
 - Supports alarm configuration
 - Support permission granularity to library and table permission configuration
 
+### ClickHouse-Mate {#clickmate}
+
+[ClickHouse-Mate](https://github.com/metrico/clickhouse-mate) is an angular web client + user interface to search and explore data in ClickHouse.
+
+Features:
+
+- ClickHouse SQL Query autocompletion
+- Fast Database and Table tree navigation
+- Advanced result Filtering and Sorting
+- Inline ClickHouse SQL documentation
+- Query Presets and History
+- 100% browser based, no server/backend
+
+The client is available for instant usage through github pages: https://metrico.github.io/clickhouse-mate/
+
+
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index 28ddb14a511..f2eb1e3ce5c 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -19,6 +19,7 @@ Additional cache types:
 - Compiled expressions cache.
 - [Avro format](../interfaces/formats.md#data-format-avro) schemas cache.
 - [Dictionaries](../sql-reference/dictionaries/index.md) data cache.
+- Schema inference cache.
 
 Indirectly used:
 
diff --git a/docs/en/operations/performance-test.md b/docs/en/operations/performance-test.md
index 5b2a772a009..09c5f5b023e 100644
--- a/docs/en/operations/performance-test.md
+++ b/docs/en/operations/performance-test.md
@@ -5,12 +5,12 @@ sidebar_label: Testing Hardware
 
 # How to Test Your Hardware with ClickHouse
 
-You can run basic ClickHouse performance test on any server without installation of ClickHouse packages.
+You can run a basic ClickHouse performance test on any server without installation of ClickHouse packages.
 
 
 ## Automated Run
 
-You can run benchmark with a single script.
+You can run the benchmark with a single script.
 
 1. Download the script.
 ```
@@ -26,58 +26,3 @@ chmod a+x ./hardware.sh
 3. Copy the output and send it to feedback@clickhouse.com
 
 All the results are published here: https://clickhouse.com/benchmark/hardware/
-
-
-## Manual Run
-
-Alternatively you can perform benchmark in the following steps.
-
-1.  ssh to the server and download the binary with wget:
-```bash
-# For amd64:
-wget https://builds.clickhouse.com/master/amd64/clickhouse
-# For aarch64:
-wget https://builds.clickhouse.com/master/aarch64/clickhouse
-# For powerpc64le:
-wget https://builds.clickhouse.com/master/powerpc64le/clickhouse
-# For freebsd:
-wget https://builds.clickhouse.com/master/freebsd/clickhouse
-# For freebsd-aarch64:
-wget https://builds.clickhouse.com/master/freebsd-aarch64/clickhouse
-# For freebsd-powerpc64le:
-wget https://builds.clickhouse.com/master/freebsd-powerpc64le/clickhouse
-# For macos:
-wget https://builds.clickhouse.com/master/macos/clickhouse
-# For macos-aarch64:
-wget https://builds.clickhouse.com/master/macos-aarch64/clickhouse
-# Then do:
-chmod a+x clickhouse
-```
-2.  Download benchmark files:
-```bash
-wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/hardware/benchmark-new.sh
-chmod a+x benchmark-new.sh
-wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/hardware/queries.sql
-```
-3.  Download the [web analytics dataset](../getting-started/example-datasets/metrica.md) (“hits” table containing 100 million rows).
-```bash
-wget https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz
-tar xvf hits_100m_obfuscated_v1.tar.xz -C .
-mv hits_100m_obfuscated_v1/* .
-```
-4.  Run the server:
-```bash
-./clickhouse server
-```
-5.  Check the data: ssh to the server in another terminal
-```bash
-./clickhouse client --query "SELECT count() FROM hits_100m_obfuscated"
-100000000
-```
-6.  Run the benchmark:
-```bash
-./benchmark-new.sh hits_100m_obfuscated
-```
-7.  Send the numbers and the info about your hardware configuration to feedback@clickhouse.com
-
-All the results are published here: https://clickhouse.com/benchmark/hardware/
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index fe4795d3798..147b5b9cf23 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -197,7 +197,7 @@ Default value: `480` (8 minute).
 
 Parameter of a task that cleans up garbage from `store/` directory.
 If some subdirectory is not used by clickhouse-server and this directory was not modified for last
-`database_catalog_unused_dir_hide_timeout_sec` seconds, the task will "hide" this directory by 
+`database_catalog_unused_dir_hide_timeout_sec` seconds, the task will "hide" this directory by
 removing all access rights. It also works for directories that clickhouse-server does not
 expect to see inside `store/`. Zero means "immediately".
 
@@ -206,10 +206,10 @@ Default value: `3600` (1 hour).
 ## database_catalog_unused_dir_rm_timeout_sec {#database_catalog_unused_dir_rm_timeout_sec}
 
 Parameter of a task that cleans up garbage from `store/` directory.
-If some subdirectory is not used by clickhouse-server and it was previousely "hidden" 
-(see [database_catalog_unused_dir_hide_timeout_sec](../../operations/server-configuration-parameters/settings.md#database_catalog_unused_dir_hide_timeout_sec)) 
+If some subdirectory is not used by clickhouse-server and it was previousely "hidden"
+(see [database_catalog_unused_dir_hide_timeout_sec](../../operations/server-configuration-parameters/settings.md#database_catalog_unused_dir_hide_timeout_sec))
 and this directory was not modified for last
-`database_catalog_unused_dir_rm_timeout_sec` seconds, the task will remove this directory. 
+`database_catalog_unused_dir_rm_timeout_sec` seconds, the task will remove this directory.
 It also works for directories that clickhouse-server does not
 expect to see inside `store/`. Zero means "never".
 
@@ -438,6 +438,18 @@ For more information, see the section “[Configuration files](../../operations/
 <include_from>/etc/metrica.xml</include_from>
 ```
 
+## interserver_listen_host {#interserver-listen-host}
+
+Restriction on hosts that can exchange data between ClickHouse servers.
+The default value equals to `listen_host` setting.
+
+Examples:
+
+``` xml
+<interserver_listen_host>::ffff:a00:1</interserver_listen_host>
+<interserver_listen_host>10.0.0.1</interserver_listen_host>
+```
+
 ## interserver_http_port {#interserver-http-port}
 
 Port for exchanging data between ClickHouse servers.
@@ -731,6 +743,27 @@ On hosts with low RAM and swap, you possibly need setting `max_server_memory_usa
 
 -   [max_server_memory_usage](#max_server_memory_usage)
 
+## concurrent_threads_soft_limit_num {#concurrent_threads_soft_limit_num}
+The maximum number of query processing threads, excluding threads for retrieving data from remote servers, allowed to run all queries. This is not a hard limit. In case if the limit is reached the query will still get at least one thread to run. Query can upscale to desired number of threads during execution if more threads become available.
+
+Possible values:
+
+-   Positive integer.
+-   0 — No limit.
+
+Default value: `0`.
+
+## concurrent_threads_soft_limit_ratio_to_cores {#concurrent_threads_soft_limit_ratio_to_cores}
+The maximum number of query processing threads as multiple of number of logical cores.
+More details: [concurrent_threads_soft_limit_num](#concurrent-threads-soft-limit-num).
+
+Possible values:
+
+-   Positive integer.
+-   0 — No limit.
+
+Default value: `0`.
+
 ## max_concurrent_queries {#max-concurrent-queries}
 
 The maximum number of simultaneously processed queries.
@@ -960,7 +993,7 @@ Default value: 2.
 **Example**
 
 ```xml
-<background_merges_mutations_concurrency_ratio>3</background_pbackground_merges_mutations_concurrency_ratio>
+<background_merges_mutations_concurrency_ratio>3</background_merges_mutations_concurrency_ratio>
 ```
 
 ## background_move_pool_size {#background_move_pool_size}
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index e72314d84a5..8735fc4dcde 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -218,6 +218,10 @@ Default value: 0 (seconds)
 
 When this setting has a value greater than than zero only a single replica starts the merge immediately if merged part on shared storage and `allow_remote_fs_zero_copy_replication` is enabled.
 
+:::warning Zero-copy replication is not ready for production
+Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
+:::
+
 Possible values:
 
 -   Any positive integer.
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 73ad5984b2d..ddd8d2846f7 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -747,7 +747,14 @@ Default value: 268435456.
 
 Disables lagging replicas for distributed queries. See [Replication](../../engines/table-engines/mergetree-family/replication.md).
 
-Sets the time in seconds. If a replica lags more than the set value, this replica is not used.
+Sets the time in seconds. If a replica's lag is greater than or equal to the set value, this replica is not used.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Replica lags are not checked.
+
+To prevent the use of any replica with a non-zero lag, set this parameter to 1.
 
 Default value: 300.
 
@@ -1289,14 +1296,14 @@ ENGINE = MergeTree
 ORDER BY A
 SETTINGS non_replicated_deduplication_window = 100;
 
-INSERT INTO test_table Values SETTINGS insert_deduplication_token = 'test' (1);
+INSERT INTO test_table SETTINGS insert_deduplication_token = 'test' VALUES (1);
 
 -- the next insert won't be deduplicated because insert_deduplication_token is different
-INSERT INTO test_table Values SETTINGS insert_deduplication_token = 'test1' (1);
+INSERT INTO test_table SETTINGS insert_deduplication_token = 'test1' VALUES (1);
 
 -- the next insert will be deduplicated because insert_deduplication_token
 -- is the same as one of the previous
-INSERT INTO test_table Values SETTINGS insert_deduplication_token = 'test' (2);
+INSERT INTO test_table SETTINGS insert_deduplication_token = 'test' VALUES (2);
 
 SELECT * FROM test_table
 
@@ -3095,14 +3102,14 @@ Exception: Total regexp lengths too large.
 
 ## enable_positional_arguments {#enable-positional-arguments}
 
-Enables or disables supporting positional arguments for [GROUP BY](../../sql-reference/statements/select/group-by.md), [LIMIT BY](../../sql-reference/statements/select/limit-by.md), [ORDER BY](../../sql-reference/statements/select/order-by.md) statements. When you want to use column numbers instead of column names in these clauses, set `enable_positional_arguments = 1`.
+Enables or disables supporting positional arguments for [GROUP BY](../../sql-reference/statements/select/group-by.md), [LIMIT BY](../../sql-reference/statements/select/limit-by.md), [ORDER BY](../../sql-reference/statements/select/order-by.md) statements.
 
 Possible values:
 
 -   0 — Positional arguments aren't supported.
 -   1 — Positional arguments are supported: column numbers can use instead of column names.
 
-Default value: `0`.
+Default value: `1`.
 
 **Example**
 
@@ -3113,8 +3120,6 @@ CREATE TABLE positional_arguments(one Int, two Int, three Int) ENGINE=Memory();
 
 INSERT INTO positional_arguments VALUES (10, 20, 30), (20, 20, 10), (30, 10, 20);
 
-SET enable_positional_arguments = 1;
-
 SELECT * FROM positional_arguments ORDER BY 2,3;
 ```
 
@@ -3302,7 +3307,7 @@ Possible values:
 
 Default value: `0`.
 
-## shutdown_wait_unfinished_queries
+## shutdown_wait_unfinished_queries {#shutdown_wait_unfinished_queries}
 
 Enables or disables waiting unfinished queries when shutdown server.
 
@@ -3313,13 +3318,13 @@ Possible values:
 
 Default value: 0.
 
-## shutdown_wait_unfinished
+## shutdown_wait_unfinished {#shutdown_wait_unfinished}
 
 The waiting time in seconds for currently handled connections when shutdown server.
 
 Default Value: 5.
 
-## memory_overcommit_ratio_denominator
+## memory_overcommit_ratio_denominator {#memory_overcommit_ratio_denominator}
 
 It represents soft memory limit in case when hard limit is reached on user level.
 This value is used to compute overcommit ratio for the query.
@@ -3328,7 +3333,7 @@ Read more about [memory overcommit](memory-overcommit.md).
 
 Default value: `1GiB`.
 
-## memory_usage_overcommit_max_wait_microseconds
+## memory_usage_overcommit_max_wait_microseconds {#memory_usage_overcommit_max_wait_microseconds}
 
 Maximum time thread will wait for memory to be freed in the case of memory overcommit on a user level.
 If the timeout is reached and memory is not freed, an exception is thrown.
@@ -3336,7 +3341,7 @@ Read more about [memory overcommit](memory-overcommit.md).
 
 Default value: `5000000`.
 
-## memory_overcommit_ratio_denominator_for_user
+## memory_overcommit_ratio_denominator_for_user {#memory_overcommit_ratio_denominator_for_user}
 
 It represents soft memory limit in case when hard limit is reached on global level.
 This value is used to compute overcommit ratio for the query.
@@ -3345,6 +3350,36 @@ Read more about [memory overcommit](memory-overcommit.md).
 
 Default value: `1GiB`.
 
+## schema_inference_use_cache_for_file {schema_inference_use_cache_for_file}
+
+Enable schemas cache for schema inference in `file` table function.
+
+Default value: `true`.
+
+## schema_inference_use_cache_for_s3 {schema_inference_use_cache_for_s3}
+
+Enable schemas cache for schema inference in `s3` table function.
+
+Default value: `true`.
+
+## schema_inference_use_cache_for_url {schema_inference_use_cache_for_url}
+
+Enable schemas cache for schema inference in `url` table function.
+
+Default value: `true`.
+
+## schema_inference_use_cache_for_hdfs {schema_inference_use_cache_for_hdfs}
+
+Enable schemas cache for schema inference in `hdfs` table function.
+
+Default value: `true`.
+
+## schema_inference_cache_require_modification_time_for_url {#schema_inference_cache_require_modification_time_for_url}
+
+Use schema from cache for URL with last modification time validation (for urls with Last-Modified header). If this setting is enabled and URL doesn't have Last-Modified header, schema from cache won't be used.
+
+Default value: `true`.
+
 ## compatibility {#compatibility}
 
 This setting changes other settings according to provided ClickHouse version.
@@ -3470,6 +3505,24 @@ Default value: `25'000`.
 
 The list of column names to use in schema inference for formats without column names. The format: 'column1,column2,column3,...'
 
+## schema_inference_hints {#schema_inference_hints}
+
+The list of column names and types to use as hints in schema inference for formats without schema.
+
+Example:
+
+Query:
+```sql
+desc format(JSONEachRow, '{"x" : 1, "y" : "String", "z" : "0.0.0.0" }') settings schema_inference_hints='x UInt8, z IPv4';
+```
+
+Result:
+```sql
+x	UInt8					
+y	Nullable(String)					
+z	IPv4
+```
+
 ## date_time_input_format {#date_time_input_format}
 
 Allows choosing a parser of the text representation of date and time.
diff --git a/docs/en/operations/storing-data.md b/docs/en/operations/storing-data.md
index 6afd5d4b726..ac8abbbed28 100644
--- a/docs/en/operations/storing-data.md
+++ b/docs/en/operations/storing-data.md
@@ -316,4 +316,8 @@ Use [http_max_single_read_retries](../operations/settings/settings.md#http-max-s
 
 ## Zero-copy Replication (not ready for production) {#zero-copy}
 
-ClickHouse supports zero-copy replication for `S3` and `HDFS` disks, which means that if the data is stored remotely on several machines and needs to be synchronized, then only the metadata is replicated (paths to the data parts), but not the data itself.
+Zero-copy replication is possible, but not recommended, with  `S3` and `HDFS` disks. Zero-copy replication means that if the data is stored remotely on several machines and needs to be synchronized, then only the metadata is replicated (paths to the data parts), but not the data itself.
+
+:::warning Zero-copy replication is not ready for production
+Zero-copy replication is disabled by default in ClickHouse version 22.8 and higher.  This feature is not recommended for production use.
+:::
\ No newline at end of file
diff --git a/docs/en/sql-reference/aggregate-functions/reference/any.md b/docs/en/sql-reference/aggregate-functions/reference/any.md
index 096f1415d11..c0af7a2a59e 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/any.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/any.md
@@ -4,7 +4,7 @@ sidebar_position: 6
 
 # any
 
-Selects the first encountered value.
+Selects the first encountered (non-NULL) value, unless all rows have NULL values in that column.
 The query can be executed in any order and even in a different order each time, so the result of this function is indeterminate.
 To get a determinate result, you can use the ‘min’ or ‘max’ function instead of ‘any’.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/anylast.md b/docs/en/sql-reference/aggregate-functions/reference/anylast.md
index 06d7603853f..44697359405 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/anylast.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/anylast.md
@@ -2,7 +2,7 @@
 sidebar_position: 104
 ---
 
-## anyLast
+# anyLast
 
 Selects the last value encountered.
 The result is just as indeterminate as for the [any](../../../sql-reference/aggregate-functions/reference/any.md) function.
diff --git a/docs/en/sql-reference/data-types/date32.md b/docs/en/sql-reference/data-types/date32.md
index e1d6e2363e8..b5a82128e69 100644
--- a/docs/en/sql-reference/data-types/date32.md
+++ b/docs/en/sql-reference/data-types/date32.md
@@ -5,7 +5,7 @@ sidebar_label: Date32
 
 # Date32
 
-A date. Supports the date range same with [Datetime64](../../sql-reference/data-types/datetime64.md). Stored in four bytes as the number of days since 1925-01-01. Allows storing values till 2283-11-11. 
+A date. Supports the date range same with [Datetime64](../../sql-reference/data-types/datetime64.md). Stored in four bytes as the number of days since 1900-01-01. Allows storing values till 2299-12-31.
 
 **Examples**
 
@@ -36,5 +36,5 @@ SELECT * FROM new;
 
 -   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
 -   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
--   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null) 
+-   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null)
 
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index ddc71e75e44..a5a520a978e 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -18,7 +18,7 @@ DateTime64(precision, [timezone])
 
 Internally, stores data as a number of ‘ticks’ since epoch start (1970-01-01 00:00:00 UTC) as Int64. The tick resolution is determined by the precision parameter. Additionally, the `DateTime64` type can store time zone that is the same for the entire column, that affects how the values of the `DateTime64` type values are displayed in text format and how the values specified as strings are parsed (‘2020-01-01 05:00:01.000’). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata. See details in [DateTime](../../sql-reference/data-types/datetime.md).
 
-Supported range of values: \[1925-01-01 00:00:00, 2283-11-11 23:59:59.99999999\] (Note: The precision of the maximum value is 8).
+Supported range of values: \[1900-01-01 00:00:00, 2299-12-31 23:59:59.99999999\] (Note: The precision of the maximum value is 8).
 
 ## Examples
 
diff --git a/docs/en/sql-reference/functions/arithmetic-functions.md b/docs/en/sql-reference/functions/arithmetic-functions.md
index b8d2f171bc8..45df5f7f227 100644
--- a/docs/en/sql-reference/functions/arithmetic-functions.md
+++ b/docs/en/sql-reference/functions/arithmetic-functions.md
@@ -55,9 +55,9 @@ Differs from ‘intDiv’ in that it returns zero when dividing by zero or when
 
 ## modulo(a, b), a % b operator
 
-Calculates the remainder after division.
-If arguments are floating-point numbers, they are pre-converted to integers by dropping the decimal portion.
-The remainder is taken in the same sense as in C++. Truncated division is used for negative numbers.
+Calculates the remainder when dividing `a` by `b`.
+The result type is an integer if both inputs are integers. If one of the inputs is a floating-point number, the result is a floating-point number.
+The remainder is computed like in C++. Truncated division is used for negative numbers.
 An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
 
 ## moduloOrZero(a, b)
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index 50a394e45fd..e76317b9e47 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -162,6 +162,10 @@ Creates an array from the function arguments.
 The arguments must be constants and have types that have the smallest common type. At least one argument must be passed, because otherwise it isn’t clear which type of array to create. That is, you can’t use this function to create an empty array (to do that, use the ‘emptyArray\*’ function described above).
 Returns an ‘Array(T)’ type result, where ‘T’ is the smallest common type out of the passed arguments.
 
+## arrayWithConstant(length, elem)
+
+Creates an array of length `length` filled with the constant `elem`.
+
 ## arrayConcat
 
 Combines arrays passed as arguments.
diff --git a/docs/en/sql-reference/functions/array-join.md b/docs/en/sql-reference/functions/array-join.md
index ed1199a45d8..0eb1d1b431e 100644
--- a/docs/en/sql-reference/functions/array-join.md
+++ b/docs/en/sql-reference/functions/array-join.md
@@ -9,15 +9,11 @@ This is a very unusual function.
 
 Normal functions do not change a set of rows, but just change the values in each row (map).
 Aggregate functions compress a set of rows (fold or reduce).
-The ‘arrayJoin’ function takes each row and generates a set of rows (unfold).
+The `arrayJoin` function takes each row and generates a set of rows (unfold).
 
 This function takes an array as an argument, and propagates the source row to multiple rows for the number of elements in the array.
 All the values in columns are simply copied, except the values in the column where this function is applied; it is replaced with the corresponding array value.
 
-A query can use multiple `arrayJoin` functions. In this case, the transformation is performed multiple times.
-
-Note the ARRAY JOIN syntax in the SELECT query, which provides broader possibilities.
-
 Example:
 
 ``` sql
@@ -32,3 +28,112 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
+The `arrayJoin` function affects all sections of the query, including the `WHERE` section. Notice the result 2, even though the subquery returned 1 row.
+
+Example:
+
+```sql
+SELECT sum(1) AS impressions
+FROM
+(
+    SELECT ['Istanbul', 'Berlin', 'Bobruisk'] AS cities
+)
+WHERE arrayJoin(cities) IN ['Istanbul', 'Berlin'];
+```
+
+``` text
+┌─impressions─┐
+│           2 │
+└─────────────┘
+```
+
+A query can use multiple `arrayJoin` functions. In this case, the transformation is performed multiple times and the rows are multiplied.
+
+Example:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    arrayJoin(cities) AS city,
+    arrayJoin(browsers) AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           2 │ Istanbul │ Chrome  │
+│           1 │ Istanbul │ Firefox │
+│           2 │ Berlin   │ Chrome  │
+│           1 │ Berlin   │ Firefox │
+│           2 │ Bobruisk │ Chrome  │
+│           1 │ Bobruisk │ Firefox │
+└─────────────┴──────────┴─────────┘
+```
+
+Note the [ARRAY JOIN](../statements/select/array-join.md) syntax in the SELECT query, which provides broader possibilities.
+`ARRAY JOIN` allows you to convert multiple arrays with the same number of elements at a time.
+
+Example:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    city,
+    browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+ARRAY JOIN
+    cities AS city,
+    browsers AS browser
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
+
+Or you can use [Tuple](../data-types/tuple.md)
+
+Example:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    (arrayJoin(arrayZip(cities, browsers)) AS t).1 AS city,
+    t.2 AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index d6ef387840a..df726c4828f 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -266,8 +266,8 @@ Result:
 └────────────────┘
 ```
 
-:::note    
-The return type `toStartOf*` functions described below is `Date` or `DateTime`. Though these functions can take `DateTime64` as an argument, passing them a `DateTime64` that is out of the normal range (years 1925 - 2283) will give an incorrect result.
+:::note
+The return type `toStartOf*` functions described below is `Date` or `DateTime`. Though these functions can take `DateTime64` as an argument, passing them a `DateTime64` that is out of the normal range (years 1900 - 2299) will give an incorrect result.
 :::
 
 ## toStartOfYear
@@ -291,7 +291,7 @@ Returns the date.
 Rounds down a date or date with time to the first day of the month.
 Returns the date.
 
-:::note    
+:::note
 The behavior of parsing incorrect dates is implementation specific. ClickHouse may return zero date, throw an exception or do “natural” overflow.
 :::
 
@@ -956,9 +956,28 @@ SELECT
 
 ## timeSlots(StartTime, Duration,\[, Size\])
 
-For a time interval starting at ‘StartTime’ and continuing for ‘Duration’ seconds, it returns an array of moments in time, consisting of points from this interval rounded down to the ‘Size’ in seconds. ‘Size’ is an optional parameter: a constant UInt32, set to 1800 by default.
-For example, `timeSlots(toDateTime('2012-01-01 12:20:00'), 600) = [toDateTime('2012-01-01 12:00:00'), toDateTime('2012-01-01 12:30:00')]`.
-This is necessary for searching for pageviews in the corresponding session.
+For a time interval starting at ‘StartTime’ and continuing for ‘Duration’ seconds, it returns an array of moments in time, consisting of points from this interval rounded down to the ‘Size’ in seconds. ‘Size’ is an optional parameter set to 1800 (30 minutes) by default.  
+This is necessary, for example, when searching for pageviews in the corresponding session.  
+Accepts DateTime and DateTime64 as ’StartTime’ argument. For DateTime, ’Duration’ and ’Size’ arguments must be `UInt32`. For ’DateTime64’ they must be `Decimal64`.  
+Returns an array of DateTime/DateTime64 (return type matches the type of ’StartTime’). For DateTime64, the return value's scale can differ from the scale of ’StartTime’ --- the highest scale among all given arguments is taken.
+
+Example:
+```sql
+SELECT timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600));
+SELECT timeSlots(toDateTime('1980-12-12 21:01:02', 'UTC'), toUInt32(600), 299);
+SELECT timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64(600.1, 1), toDecimal64(299, 0));
+``` 
+``` text
+┌─timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600))─┐
+│ ['2012-01-01 12:00:00','2012-01-01 12:30:00']               │
+└─────────────────────────────────────────────────────────────┘
+┌─timeSlots(toDateTime('1980-12-12 21:01:02', 'UTC'), toUInt32(600), 299)─┐
+│ ['1980-12-12 20:56:13','1980-12-12 21:01:12','1980-12-12 21:06:11']     │
+└─────────────────────────────────────────────────────────────────────────┘
+┌─timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64(600.1, 1), toDecimal64(299, 0))─┐
+│ ['1980-12-12 20:56:13.0000','1980-12-12 21:01:12.0000','1980-12-12 21:06:11.0000']                        │
+└───────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
 
 ## formatDateTime
 
@@ -1049,7 +1068,10 @@ Query:
 
 ```sql
 WITH toDateTime('2021-04-14 11:22:33') AS date_value
-SELECT dateName('year', date_value), dateName('month', date_value), dateName('day', date_value);
+SELECT
+    dateName('year', date_value),
+    dateName('month', date_value),
+    dateName('day', date_value);
 ```
 
 Result:
@@ -1057,7 +1079,44 @@ Result:
 ```text
 ┌─dateName('year', date_value)─┬─dateName('month', date_value)─┬─dateName('day', date_value)─┐
 │ 2021                         │ April                         │ 14                          │
-└──────────────────────────────┴───────────────────────────────┴─────────────────────────────
+└──────────────────────────────┴───────────────────────────────┴─────────────────────────────┘
+```
+
+## monthName
+
+Returns name of the month.
+
+**Syntax**
+
+``` sql
+monthName(date)
+```
+
+**Arguments**
+
+-   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Returned value**
+
+-   The name of the month.
+
+Type: [String](../../sql-reference/data-types/string.md#string)
+
+**Example**
+
+Query:
+
+```sql
+WITH toDateTime('2021-04-14 11:22:33') AS date_value
+SELECT monthName(date_value);
+```
+
+Result:
+
+```text
+┌─monthName(date_value)─┐
+│ April                 │
+└───────────────────────┘
 ```
 
 ## FROM\_UNIXTIME
diff --git a/docs/en/sql-reference/functions/files.md b/docs/en/sql-reference/functions/files.md
index fc2f8a0e050..b17981ed0e0 100644
--- a/docs/en/sql-reference/functions/files.md
+++ b/docs/en/sql-reference/functions/files.md
@@ -12,12 +12,13 @@ Reads file as a String. The file content is not parsed, so any information is re
 **Syntax**
 
 ``` sql
-file(path)
+file(path[, default])
 ```
 
 **Arguments**
 
 -   `path` — The relative path to the file from [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Path to file support following wildcards: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc', 'def'` — strings.
+-   `default` — The value that will be returned in the case when a file does not exist or cannot be accessed. Data types supported: [String](../../sql-reference/data-types/string.md) and [NULL](../../sql-reference/syntax.md#null-literal).
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 78f9d1b8285..ed48a590cd7 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -22,7 +22,7 @@ Consider using the [sipHash64](#hash_functions-siphash64) function instead.
 
 **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).
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned Value**
 
@@ -69,7 +69,7 @@ Function [interprets](../../sql-reference/functions/type-conversion-functions.md
 
 **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).
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned Value**
 
@@ -99,7 +99,7 @@ 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).
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned value**
 
@@ -135,7 +135,7 @@ This is a fast non-cryptographic hash function. It uses the CityHash algorithm f
 
 **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).
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned Value**
 
@@ -275,7 +275,7 @@ These functions use the `Fingerprint64` and `Hash64` methods respectively from a
 
 **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).
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data)..
 
 **Returned Value**
 
@@ -401,7 +401,7 @@ metroHash64(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).
+The function takes a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned Value**
 
@@ -436,7 +436,7 @@ murmurHash2_64(par1, ...)
 
 **Arguments**
 
-Both functions take a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md).
+Both functions take a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned Value**
 
@@ -504,7 +504,7 @@ murmurHash3_64(par1, ...)
 
 **Arguments**
 
-Both functions take a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md).
+Both functions take a variable number of input parameters. Arguments can be any of the [supported data types](../../sql-reference/data-types/index.md). For some data types calculated value of hash function may be the same for the same values even if types of arguments differ (integers of different size, named and unnamed `Tuple` with the same data, `Map` and the corresponding `Array(Tuple(key, value))` type with the same data).
 
 **Returned Value**
 
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 6b01ee31501..6597cd2d6bf 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -1822,10 +1822,13 @@ Result:
 Evaluate external model.
 Accepts a model name and model arguments. Returns Float64.
 
-## throwIf(x\[, custom_message\])
+## throwIf(x\[, message\[, error_code\]\])
 
 Throw an exception if the argument is non zero.
-custom_message - is an optional parameter: a constant string, provides an error message
+`message` - is an optional parameter: a constant string providing a custom error message
+`error_code` - is an optional parameter: a constant integer providing a custom error code
+
+To use the `error_code` argument, configuration parameter `allow_custom_error_code_in_throwif` must be enabled.
 
 ``` sql
 SELECT throwIf(number = 3, 'Too many') FROM numbers(10);
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index c51445675f5..ecdf34bf7ee 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -218,23 +218,23 @@ SELECT toDate32('1955-01-01') AS value, toTypeName(value);
 2. The value is outside the range:
 
 ``` sql
-SELECT toDate32('1924-01-01') AS value, toTypeName(value);
+SELECT toDate32('1899-01-01') AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
-│ 1925-01-01 │ Date32                             │
+┌──────value─┬─toTypeName(toDate32('1899-01-01'))─┐
+│ 1900-01-01 │ Date32                             │
 └────────────┴────────────────────────────────────┘
 ```
 
 3. With `Date`-type argument:
 
 ``` sql
-SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
+SELECT toDate32(toDate('1899-01-01')) AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32(toDate('1924-01-01')))─┐
+┌──────value─┬─toTypeName(toDate32(toDate('1899-01-01')))─┐
 │ 1970-01-01 │ Date32                                     │
 └────────────┴────────────────────────────────────────────┘
 ```
@@ -248,14 +248,14 @@ The same as [toDate32](#todate32) but returns the min value of [Date32](../../sq
 Query:
 
 ``` sql
-SELECT toDate32OrZero('1924-01-01'), toDate32OrZero('');
+SELECT toDate32OrZero('1899-01-01'), toDate32OrZero('');
 ```
 
 Result:
 
 ``` text
-┌─toDate32OrZero('1924-01-01')─┬─toDate32OrZero('')─┐
-│                   1925-01-01 │         1925-01-01 │
+┌─toDate32OrZero('1899-01-01')─┬─toDate32OrZero('')─┐
+│                   1900-01-01 │         1900-01-01 │
 └──────────────────────────────┴────────────────────┘
 ```
 
@@ -1072,7 +1072,7 @@ For all of the formats with separator the function parses months names expressed
 Query:
 
 ``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
+SELECT parseDateTimeBestEffort('23/10/2020 12:12:57')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1080,7 +1080,7 @@ Result:
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
+│     2020-10-23 12:12:57 │
 └─────────────────────────┘
 ```
 
@@ -1117,7 +1117,7 @@ Result:
 Query:
 
 ``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
+SELECT parseDateTimeBestEffort('2018-10-23 10:12:12')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1125,7 +1125,7 @@ Result:
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
+│     2018-10-23 10:12:12 │
 └─────────────────────────┘
 ```
 
@@ -1152,77 +1152,7 @@ Result:
 
 ## parseDateTimeBestEffortUS
 
-This function is similar to [parseDateTimeBestEffort](#parsedatetimebesteffort), the only difference is that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity.
-
-**Syntax**
-
-``` sql
-parseDateTimeBestEffortUS(time_string [, time_zone])
-```
-
-**Arguments**
-
--   `time_string` — String containing a date and time to convert. [String](../../sql-reference/data-types/string.md).
--   `time_zone` — Time zone. The function parses `time_string` according to the time zone. [String](../../sql-reference/data-types/string.md).
-
-**Supported non-standard formats**
-
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time component: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted as `2000-01`.
--   A string that includes the date and time along with time zone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
-
-**Returned value**
-
--   `time_string` converted to the `DateTime` data type.
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09/12/2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09-12-2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09.12.2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
+This function behaves like [parseDateTimeBestEffort](#parsedatetimebesteffort) for ISO date formats, e.g. `YYYY-MM-DD hh:mm:ss`, and other date formats where the month and date components can be unambiguously extracted, e.g. `YYYYMMDDhhmmss`, `YYYY-MM`, `DD hh`, or `YYYY-MM-DD hh:mm:ss ±h:mm`. If the month and the date components cannot be unambiguously extracted, e.g. `MM/DD/YYYY`, `MM-DD-YYYY`, or `MM-DD-YY`, it prefers the US date format instead of `DD/MM/YYYY`, `DD-MM-YYYY`, or `DD-MM-YY`. As an exception from the latter, if the month is bigger than 12 and smaller or equal than 31, this function falls back to the behavior of [parseDateTimeBestEffort](#parsedatetimebesteffort), e.g. `15/08/2020` is parsed as `2020-08-15`.
 
 ## parseDateTimeBestEffortOrNull
 ## parseDateTime32BestEffortOrNull
@@ -1238,174 +1168,10 @@ Same as for [parseDateTimeBestEffort](#parsedatetimebesteffort) except that it r
 
 Same as [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS) function except that it returns `NULL` when it encounters a date format that cannot be processed.
 
-**Syntax**
-
-``` sql
-parseDateTimeBestEffortUSOrNull(time_string[, time_zone])
-```
-
-**Parameters**
-
--   `time_string` — String containing a date or date with time to convert. The date must be in the US date format (`MM/DD/YYYY`, etc). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
-
-**Supported non-standard formats**
-
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time components: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY`, etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted with `2000-01`.
--   A string that includes date and time along with timezone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
-
-**Returned values**
-
--   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
--   `NULL` if the input string cannot be converted to the `DateTime` data type.
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02-10-2021 21:12:57 GMT', 'Asia/Istanbul') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02.10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│                            ᴺᵁᴸᴸ │
-└─────────────────────────────────┘
-```
-
 ## parseDateTimeBestEffortUSOrZero
 
 Same as [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS) function except that it returns zero date (`1970-01-01`) or zero date with time (`1970-01-01 00:00:00`) when it encounters a date format that cannot be processed.
 
-**Syntax**
-
-``` sql
-parseDateTimeBestEffortUSOrZero(time_string[, time_zone])
-```
-
-**Parameters**
-
--   `time_string` — String containing a date or date with time to convert. The date must be in the US date format (`MM/DD/YYYY`, etc). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
-
-**Supported non-standard formats**
-
--   A string containing 9..10 digit [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   A string with a date and a time components: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   A string with a date, but no time component: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY`, etc.
--   A string with a day and time: `DD`, `DD hh`, `DD hh:mm`. In this case, `YYYY-MM` are substituted with `2000-01`.
--   A string that includes date and time along with timezone offset information: `YYYY-MM-DD hh:mm:ss ±h:mm`, etc. For example, `2020-12-12 17:36:00 -5:00`.
-
-**Returned values**
-
--   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
--   Zero date or zero date with time if the input string cannot be converted to the `DateTime` data type.
-
-**Examples**
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02-10-2021 21:12:57 GMT', 'Asia/Istanbul') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.10.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Query:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Result:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             1970-01-01 00:00:00 │
-└─────────────────────────────────┘
-```
-
 ## parseDateTime64BestEffort
 
 Same as [parseDateTimeBestEffort](#parsedatetimebesteffort) function but also parse milliseconds and microseconds and returns [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime) data type.
@@ -1452,18 +1218,30 @@ Result:
 └────────────────────────────┴────────────────────────────────┘
 ```
 
+## parseDateTime64BestEffortUS
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity.
+
 ## parseDateTime64BestEffortOrNull
 
 Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort) except that it returns `NULL` when it encounters a date format that cannot be processed.
 
 ## parseDateTime64BestEffortOrZero
 
-Same as for [parseDateTime64BestEffort](#parsedatetimebesteffort) except that it returns zero date or zero date time when it encounters a date format that cannot be processed.
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort) except that it returns zero date or zero date time when it encounters a date format that cannot be processed.
+
+## parseDateTime64BestEffortUSOrNull
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity and returns `NULL` when it encounters a date format that cannot be processed.
+
+## parseDateTime64BestEffortUSOrZero
+
+Same as for [parseDateTime64BestEffort](#parsedatetime64besteffort), except that this function prefers US date format (`MM/DD/YYYY` etc.) in case of ambiguity and returns zero date or zero date time when it encounters a date format that cannot be processed.
 
 
 ## toLowCardinality
 
-Converts input parameter to the [LowCardianlity](../../sql-reference/data-types/lowcardinality.md) version of same data type.
+Converts input parameter to the [LowCardinality](../../sql-reference/data-types/lowcardinality.md) version of same data type.
 
 To convert data from the `LowCardinality` data type use the [CAST](#type_conversion_function-cast) function. For example, `CAST(x as String)`.
 
diff --git a/docs/en/sql-reference/statements/alter/ttl.md b/docs/en/sql-reference/statements/alter/ttl.md
index 37a171d4969..2682279d1f7 100644
--- a/docs/en/sql-reference/statements/alter/ttl.md
+++ b/docs/en/sql-reference/statements/alter/ttl.md
@@ -34,7 +34,7 @@ CREATE TABLE table_with_ttl
 )
 ENGINE MergeTree()
 ORDER BY tuple()
-TTL event_time + INTERVAL 3 MONTH;
+TTL event_time + INTERVAL 3 MONTH
 SETTINGS min_bytes_for_wide_part = 0;
 
 INSERT INTO table_with_ttl VALUES (now(), 1, 'username1');
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index feda8459104..3837c60deb1 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -1,6 +1,9 @@
 ---
 sidebar_position: 39
 sidebar_label: USER
+tags:
+  - create user
+  - add user
 ---
 
 # CREATE USER
diff --git a/docs/en/sql-reference/table-functions/index.md b/docs/en/sql-reference/table-functions/index.md
index a51312324f0..95c0d2f8494 100644
--- a/docs/en/sql-reference/table-functions/index.md
+++ b/docs/en/sql-reference/table-functions/index.md
@@ -9,13 +9,13 @@ Table functions are methods for constructing tables.
 
 You can use table functions in:
 
--   [FROM](../../sql-reference/statements/select/from.md) clause of the `SELECT` query.
+-  [FROM](../../sql-reference/statements/select/from.md) clause of the `SELECT` query.
 
-        The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
+   The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
 
 -   [CREATE TABLE AS table_function()](../../sql-reference/statements/create/table.md) query.
 
-        It's one of the methods of creating a table.
+   It's one of the methods of creating a table.
 
 -   [INSERT INTO TABLE FUNCTION](../../sql-reference/statements/insert-into.md#inserting-into-table-function) query.
 
@@ -38,4 +38,3 @@ You can’t use table functions if the [allow_ddl](../../operations/settings/per
 | [s3](../../sql-reference/table-functions/s3.md)                  | Creates a [S3](../../engines/table-engines/integrations/s3.md)-engine table.                                                           |
 | [sqlite](../../sql-reference/table-functions/sqlite.md)          | Creates a [sqlite](../../engines/table-engines/integrations/sqlite.md)-engine table.                                                       |
 
-[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/ru/development/build-osx.md b/docs/ru/development/build-osx.md
index cc6927bebb8..205edce2b78 100644
--- a/docs/ru/development/build-osx.md
+++ b/docs/ru/development/build-osx.md
@@ -8,6 +8,7 @@ sidebar_label: Сборка на Mac OS X
 :::info "Вам не нужно собирать ClickHouse самостоятельно"
      Вы можете установить предварительно собранный ClickHouse, как описано в [Быстром старте](https://clickhouse.com/#quick-start).
      Следуйте инструкциям по установке для `macOS (Intel)` или `macOS (Apple Silicon)`.
+:::
 
 Сборка должна запускаться с x86_64 (Intel) на macOS версии 10.15 (Catalina) и выше в последней версии компилятора Xcode's native AppleClang, Homebrew's vanilla Clang или в GCC-компиляторах.
 
@@ -90,6 +91,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
 
 :::info "Note"
     Вам понадобится команда `sudo`.
+:::
 
 1. Создайте файл `/Library/LaunchDaemons/limit.maxfiles.plist` и поместите в него следующее:
 
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index 4c1981198a0..8e1320c4dcd 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -170,7 +170,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 В случае использования на разработческой машине старого HDD или SSD, а также при желании использовать меньше места для артефактов сборки можно использовать следующую команду:
 ```bash
-cmake -DUSE_DEBUG_HELPERS=1 -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1 ..
+cmake -DUSE_DEBUG_HELPERS=1 -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 ..
 ```
 При этом надо учесть, что получаемые в результате сборки исполнимые файлы будут динамически слинкованы с библиотеками, и поэтому фактически станут непереносимыми на другие компьютеры (либо для этого нужно будет предпринять значительно больше усилий по сравнению со статической сборкой). Плюсом же в данном случае является значительно меньшее время сборки (это проявляется не на первой сборке, а на последующих, после внесения изменений в исходный код - тратится меньшее время на линковку по сравнению со статической сборкой) и значительно меньшее использование места на жёстком диске (экономия более, чем в 3 раза по сравнению со статической сборкой). Для целей разработки, когда планируются только отладочные запуски на том же компьютере, где осуществлялась сборка, это может быть наиболее удобным вариантом.
 
@@ -285,3 +285,9 @@ Pull request можно создать, даже если работа над з
 Система подготовит сборки ClickHouse специально для вашего pull request. Для их получения, нажмите на ссылку «Details» у проверки «Clickhouse build check». Там вы сможете найти прямые ссылки на собранные .deb пакеты ClickHouse, которые, при желании, вы даже сможете установить на свои продакшен серверы (если не страшно).
 
 Вероятнее всего, часть сборок не будет успешной с первого раза. Ведь мы проверяем сборку кода и gcc и clang, а при сборке с помощью clang включаются почти все существующие в природе warnings (всегда с флагом `-Werror`). На той же странице, вы сможете найти логи сборки - вам не обязательно самому собирать ClickHouse всеми возможными способами.
+
+## Навигация по коду ClickHouse {#navigatsiia-po-kodu-clickhouse}
+
+Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно.
+
+Также вы можете просматривать исходники на [GitHub](https://github.com/ClickHouse/ClickHouse).
diff --git a/docs/ru/engines/database-engines/postgresql.md b/docs/ru/engines/database-engines/postgresql.md
index 521a3689a7d..324b39117d5 100644
--- a/docs/ru/engines/database-engines/postgresql.md
+++ b/docs/ru/engines/database-engines/postgresql.md
@@ -29,7 +29,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use
 
 ## Поддерживаемые типы данных {#data_types-support}
 
-| PostgerSQL       | ClickHouse                                                   |
+| PostgreSQL       | ClickHouse                                                   |
 |------------------|--------------------------------------------------------------|
 | DATE             | [Date](../../sql-reference/data-types/date.md)               |
 | TIMESTAMP        | [DateTime](../../sql-reference/data-types/datetime.md)       |
diff --git a/docs/ru/engines/table-engines/integrations/postgresql.md b/docs/ru/engines/table-engines/integrations/postgresql.md
index f9702930a30..28debaf9c23 100644
--- a/docs/ru/engines/table-engines/integrations/postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@@ -49,6 +49,7 @@ PostgreSQL массивы конвертируются в массивы ClickHo
 
 :::info "Внимание"
     Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустимы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+:::
 
 Поддерживает несколько реплик, которые должны быть перечислены через `|`. Например:
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 6b5d2e862bf..e30e771c4df 100644
--- a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -40,6 +40,7 @@ ORDER BY (CounterID, StartDate, intHash32(UserID));
 
 :::info "Info"
     Не рекомендуется делать слишком гранулированное партиционирование – то есть задавать партиции по столбцу, в котором будет слишком большой разброс значений (речь идет о порядке более тысячи партиций). Это приведет к скоплению большого числа файлов и файловых дескрипторов в системе, что может значительно снизить производительность запросов `SELECT`.
+:::
 
 Чтобы получить набор кусков и партиций таблицы, можно воспользоваться системной таблицей [system.parts](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md#system_tables-parts). В качестве примера рассмотрим таблицу `visits`, в которой задано партиционирование по месяцам. Выполним `SELECT` для таблицы `system.parts`:
 
@@ -80,6 +81,7 @@ WHERE table = 'visits'
 
 :::info "Info"
     Названия кусков для таблиц старого типа образуются следующим образом: `20190117_20190123_2_2_0` (минимальная дата _ максимальная дата _ номер минимального блока _ номер максимального блока _ уровень).
+:::
 
 Как видно из примера выше, таблица содержит несколько отдельных кусков для одной и той же партиции (например, куски `201901_1_3_1` и `201901_1_9_2` принадлежат партиции `201901`). Это означает, что эти куски еще не были объединены – в файловой системе они хранятся отдельно. После того как будет выполнено автоматическое слияние данных (выполняется примерно спустя 10 минут после вставки данных), исходные куски будут объединены в один более крупный кусок и помечены как неактивные.
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
index 1b0c5ffd103..73044377d2b 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -28,19 +28,65 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Описание параметров запроса смотрите в [описании запроса](../../../engines/table-engines/mergetree-family/replacingmergetree.md).
 
-    :::note "Внимание"
-    Уникальность строк определяется `ORDER BY` секцией таблицы, а не `PRIMARY KEY`.
-    :::
-**Параметры ReplacingMergeTree**
+:::warning "Внимание"
+Уникальность строк определяется `ORDER BY` секцией таблицы, а не `PRIMARY KEY`.
+:::
 
--   `ver` — столбец с номером версии. Тип `UInt*`, `Date`, `DateTime` или `DateTime64`. Необязательный параметр.
+## Параметры ReplacingMergeTree
 
-    При слиянии `ReplacingMergeTree` оставляет только строку для каждого уникального ключа сортировки:
+### ver
+
+`ver` — столбец с номером версии. Тип `UInt*`, `Date`, `DateTime` или `DateTime64`. Необязательный параметр.
+
+При слиянии `ReplacingMergeTree` оставляет только строку для каждого уникального ключа сортировки:
 
     - Последнюю в выборке, если `ver` не задан. Под выборкой здесь понимается набор строк в наборе кусков данных, участвующих в слиянии. Последний по времени создания кусок (последняя вставка) будет последним в выборке. Таким образом, после дедупликации для каждого значения ключа сортировки останется самая последняя строка из самой последней вставки.
     - С максимальной версией, если `ver` задан. Если `ver` одинаковый у нескольких строк, то для них используется правило -- если `ver` не задан, т.е. в результате слияния останется самая последняя строка из самой последней вставки.
 
-**Секции запроса**
+Пример: 
+
+```sql
+-- without ver - the last inserted 'wins'
+CREATE TABLE myFirstReplacingMT
+(
+    `key` Int64,
+    `someCol` String,
+    `eventTime` DateTime
+)
+ENGINE = ReplacingMergeTree
+ORDER BY key;
+
+INSERT INTO myFirstReplacingMT Values (1, 'first', '2020-01-01 01:01:01');
+INSERT INTO myFirstReplacingMT Values (1, 'second', '2020-01-01 00:00:00');
+
+SELECT * FROM myFirstReplacingMT FINAL;
+
+┌─key─┬─someCol─┬───────────eventTime─┐
+│   1 │ second  │ 2020-01-01 00:00:00 │
+└─────┴─────────┴─────────────────────┘
+
+
+-- with ver - the row with the biggest ver 'wins'
+CREATE TABLE mySecondReplacingMT
+(
+    `key` Int64,
+    `someCol` String,
+    `eventTime` DateTime
+)
+ENGINE = ReplacingMergeTree(eventTime)
+ORDER BY key;
+
+INSERT INTO mySecondReplacingMT Values (1, 'first', '2020-01-01 01:01:01');
+INSERT INTO mySecondReplacingMT Values (1, 'second', '2020-01-01 00:00:00');
+
+SELECT * FROM mySecondReplacingMT FINAL;
+
+┌─key─┬─someCol─┬───────────eventTime─┐
+│   1 │ first   │ 2020-01-01 01:01:01 │
+└─────┴─────────┴─────────────────────┘
+```
+
+## Секции запроса
 
 При создании таблицы `ReplacingMergeTree` используются те же [секции](mergetree.md), что и при создании таблицы `MergeTree`.
 
@@ -48,9 +94,10 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 <summary>Устаревший способ создания таблицы</summary>
 
-    :::note "Внимание"
-    Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ описанный выше.
-    :::
+:::warning "Внимание"
+Не используйте этот способ в новых проектах и по возможности переведите старые проекты на способ, описанный выше.
+:::
+
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 (
diff --git a/docs/ru/faq/general/dbms-naming.md b/docs/ru/faq/general/dbms-naming.md
index 9bc036cc2e4..dd58d89924e 100644
--- a/docs/ru/faq/general/dbms-naming.md
+++ b/docs/ru/faq/general/dbms-naming.md
@@ -14,3 +14,4 @@ sidebar_position: 10
 
 :::info "Забавный факт"
     Спустя годы после того, как ClickHouse получил свое название, принцип комбинирования двух слов, каждое из которых имеет подходящий смысл, был признан лучшим способом назвать базу данных в [исследовании Andy Pavlo](https://www.cs.cmu.edu/~pavlo/blog/2020/03/on-naming-a-database-management-system.html), Associate Professor of Databases в Carnegie Mellon University. ClickHouse разделил награду "за лучшее название СУБД" с Postgres.
+:::
\ No newline at end of file
diff --git a/docs/ru/faq/general/index.md b/docs/ru/faq/general/index.md
index 81715a64acd..7d34cc643f2 100644
--- a/docs/ru/faq/general/index.md
+++ b/docs/ru/faq/general/index.md
@@ -20,5 +20,6 @@ sidebar_label: Общие вопросы
 
 :::info "Если вы не нашли то, что искали:"
     Загляните в другие категории F.A.Q. или поищите в остальных разделах документации, ориентируясь по оглавлению слева.
+:::
 
 [Original article](https://clickhouse.com/docs/ru/faq/general/) <!--hide-->
diff --git a/docs/ru/faq/general/why-clickhouse-is-so-fast.md b/docs/ru/faq/general/why-clickhouse-is-so-fast.md
index 0c74cb2cfa2..43b3c818249 100644
--- a/docs/ru/faq/general/why-clickhouse-is-so-fast.md
+++ b/docs/ru/faq/general/why-clickhouse-is-so-fast.md
@@ -60,3 +60,4 @@ sidebar_position: 8
     -   Ориентируйтесь на показатели, собранные при работе с реальными данными.
     -   Проверяйте производительность в процессе CI.
     -   Измеряйте и анализируйте всё, что только возможно.
+:::
diff --git a/docs/ru/faq/integration/index.md b/docs/ru/faq/integration/index.md
index cc917718000..ee01688af6e 100644
--- a/docs/ru/faq/integration/index.md
+++ b/docs/ru/faq/integration/index.md
@@ -15,5 +15,6 @@ sidebar_label: Интеграция
 
 :::info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
+:::
 
 [Original article](https://clickhouse.com/docs/ru/faq/integration/)
diff --git a/docs/ru/faq/operations/index.md b/docs/ru/faq/operations/index.md
index bd5ba13e182..aab31ec3305 100644
--- a/docs/ru/faq/operations/index.md
+++ b/docs/ru/faq/operations/index.md
@@ -14,5 +14,6 @@ sidebar_label: Операции
 
 :::info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
+:::
 
 [Original article](https://clickhouse.com/docs/en/faq/operations/)
diff --git a/docs/ru/getting-started/example-datasets/nyc-taxi.md b/docs/ru/getting-started/example-datasets/nyc-taxi.md
index 991d7dafe05..9d9caa43b5e 100644
--- a/docs/ru/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/ru/getting-started/example-datasets/nyc-taxi.md
@@ -293,6 +293,7 @@ $ clickhouse-client --query "SELECT COUNT(*) FROM datasets.trips_mergetree"
 :::info "Info"
     Если вы собираетесь выполнять запросы, приведенные ниже, то к имени таблицы
 нужно добавить имя базы, `datasets.trips_mergetree`.
+:::
 
 ## Результаты на одном сервере {#rezultaty-na-odnom-servere}
 
diff --git a/docs/ru/getting-started/example-datasets/ontime.md b/docs/ru/getting-started/example-datasets/ontime.md
index b7c4a2f952c..8dab19c7bae 100644
--- a/docs/ru/getting-started/example-datasets/ontime.md
+++ b/docs/ru/getting-started/example-datasets/ontime.md
@@ -157,6 +157,7 @@ $ clickhouse-client --query "SELECT COUNT(*) FROM datasets.ontime"
 :::info "Info"
     Если вы собираетесь выполнять запросы, приведенные ниже, то к имени таблицы
 нужно добавить имя базы, `datasets.ontime`.
+:::
 
 ## Запросы: {#zaprosy}
 
diff --git a/docs/ru/getting-started/example-datasets/uk-price-paid.md b/docs/ru/getting-started/example-datasets/uk-price-paid.md
index c5d13c55b05..ee010da28ea 100644
--- a/docs/ru/getting-started/example-datasets/uk-price-paid.md
+++ b/docs/ru/getting-started/example-datasets/uk-price-paid.md
@@ -389,12 +389,6 @@ SETTINGS mutations_sync = 1;
 
 Давайте выполним те же 3 запроса.
 
-[Включите](../../operations/settings/settings.md#allow-experimental-projection-optimization) поддержку проекций:
-
-```sql
-SET allow_experimental_projection_optimization = 1;
-```
-
 ### Запрос 1. Средняя цена за год {#average-price-projections}
 
 Запрос:
@@ -647,4 +641,3 @@ no projection: 100 rows in set. Elapsed: 0.069 sec. Processed 26.32 million rows
 ### Online Playground {#playground}
 
 Этот набор данных доступен в [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIHRvd24sIGRpc3RyaWN0LCBjb3VudCgpIEFTIGMsIHJvdW5kKGF2ZyhwcmljZSkpIEFTIHByaWNlLCBiYXIocHJpY2UsIDAsIDUwMDAwMDAsIDEwMCkgRlJPTSB1a19wcmljZV9wYWlkIFdIRVJFIGRhdGUgPj0gJzIwMjAtMDEtMDEnIEdST1VQIEJZIHRvd24sIGRpc3RyaWN0IEhBVklORyBjID49IDEwMCBPUkRFUiBCWSBwcmljZSBERVNDIExJTUlUIDEwMA==).
-
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index f51b70c17bf..eb43db02698 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -84,6 +84,13 @@ $ cat file.csv | clickhouse-client --database=test --query="INSERT INTO test FOR
 clickhouse-client --param_parName="[1, 2]"  -q "SELECT * FROM table WHERE a = {parName:Array(UInt16)}"
 ```
 
+Также возможно устанавливать значения параметров, находясь внутри интерактивной сессии:
+``` bash
+$ clickhouse-client -nq "
+  SET param_parName='[1, 2]';
+  SELECT {parName:Array(UInt16)}"
+```
+
 #### Синтаксис запроса {#cli-queries-with-parameters-syntax}
 
 Отформатируйте запрос обычным способом. Представьте значения, которые вы хотите передать из параметров приложения в запрос в следующем формате:
diff --git a/docs/ru/operations/external-authenticators/kerberos.md b/docs/ru/operations/external-authenticators/kerberos.md
index 9575d935836..197bf5a6047 100644
--- a/docs/ru/operations/external-authenticators/kerberos.md
+++ b/docs/ru/operations/external-authenticators/kerberos.md
@@ -99,6 +99,7 @@ ClickHouse предоставляет возможность аутентифи
 
 :::info ""
     Ещё раз отметим, что кроме `users.xml`, необходимо также включить Kerberos в `config.xml`.
+:::
 
 ### Настройка Kerberos через SQL {#enabling-kerberos-using-sql}
 
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index 0c0c7da330d..f1d7280892e 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -174,6 +174,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 :::info "Примечание"
     Жесткое ограничение настраивается с помощью системных инструментов.
+:::
 
 **Пример**
 
@@ -407,6 +408,18 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <include_from>/etc/metrica.xml</include_from>
 ```
 
+## interserver_listen_host {#interserver-listen-host}
+
+Ограничение по хостам, для обмена между серверами ClickHouse.
+Значение по умолчанию совпадает со значением параметра listen_host
+
+Примеры:
+
+``` xml
+<interserver_listen_host>::ffff:a00:1</interserver_listen_host>
+<interserver_listen_host>10.0.0.1</interserver_listen_host>
+```
+
 ## interserver_http_port {#interserver-http-port}
 
 Порт для обмена между серверами ClickHouse.
@@ -694,6 +707,7 @@ ClickHouse поддерживает динамическое изменение
 
 :::info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
+:::
 
 Возможные значения:
 
@@ -714,6 +728,7 @@ ClickHouse поддерживает динамическое изменение
 
 :::info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
+:::
 
 Возможные значения:
 
@@ -734,6 +749,7 @@ ClickHouse поддерживает динамическое изменение
 
 :::info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
+:::
 
 Возможные значения:
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 5ad6e4ef3b6..abaa05639c6 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -3790,14 +3790,14 @@ Exception: Total regexp lengths too large.
 
 ## enable_positional_arguments {#enable-positional-arguments}
 
-Включает и отключает поддержку позиционных аргументов для [GROUP BY](../../sql-reference/statements/select/group-by.md), [LIMIT BY](../../sql-reference/statements/select/limit-by.md), [ORDER BY](../../sql-reference/statements/select/order-by.md). Если вы хотите использовать номера столбцов вместо названий в выражениях этих операторов, установите `enable_positional_arguments = 1`.
+Включает и отключает поддержку позиционных аргументов для [GROUP BY](../../sql-reference/statements/select/group-by.md), [LIMIT BY](../../sql-reference/statements/select/limit-by.md), [ORDER BY](../../sql-reference/statements/select/order-by.md).
 
 Возможные значения:
 
 -   0 — Позиционные аргументы не поддерживаются.
 -   1 — Позиционные аргументы поддерживаются: можно использовать номера столбцов вместо названий столбцов.
 
-Значение по умолчанию: `0`.
+Значение по умолчанию: `1`.
 
 **Пример**
 
@@ -3808,8 +3808,6 @@ CREATE TABLE positional_arguments(one Int, two Int, three Int) ENGINE=Memory();
 
 INSERT INTO positional_arguments VALUES (10, 20, 30), (20, 20, 10), (30, 10, 20);
 
-SET enable_positional_arguments = 1;
-
 SELECT * FROM positional_arguments ORDER BY 2,3;
 ```
 
diff --git a/docs/ru/operations/system-tables/mutations.md b/docs/ru/operations/system-tables/mutations.md
index f2047745c0c..f3810e29698 100644
--- a/docs/ru/operations/system-tables/mutations.md
+++ b/docs/ru/operations/system-tables/mutations.md
@@ -30,6 +30,7 @@
 
 :::info "Замечание"
     Даже если `parts_to_do = 0`, для реплицированной таблицы возможна ситуация, когда мутация ещё не завершена из-за долго выполняющейся операции `INSERT`, которая добавляет данные, которые нужно будет мутировать.
+:::
 
 Если во время мутации какого-либо куска возникли проблемы, заполняются следующие столбцы:
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
index f46d7ca6111..49edc3932e0 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
@@ -8,6 +8,7 @@ sidebar_position: 141
 
 :::info "Примечание"
     Чтобы эта функция работала должным образом, исходные данные должны быть отсортированы. В [материализованном представлении](../../../sql-reference/statements/create/view.md#materialized) вместо нее рекомендуется использовать [deltaSumTimestamp](../../../sql-reference/aggregate-functions/reference/deltasumtimestamp.md#agg_functions-deltasumtimestamp).
+:::
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md
index 46dac961639..45b41bd13a3 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -20,6 +20,7 @@ intervalLengthSum(start, end)
 
 :::info "Примечание"
     Аргументы должны быть одного типа. В противном случае ClickHouse сгенерирует исключение.
+:::
 
 **Возвращаемое значение**
 
diff --git a/docs/ru/sql-reference/data-types/date32.md b/docs/ru/sql-reference/data-types/date32.md
index 31b2258b70b..1fc5ff6e5e2 100644
--- a/docs/ru/sql-reference/data-types/date32.md
+++ b/docs/ru/sql-reference/data-types/date32.md
@@ -5,7 +5,7 @@ sidebar_label: Date32
 
 # Date32 {#data_type-datetime32}
 
-Дата. Поддерживается такой же диапазон дат, как для типа [Datetime64](../../sql-reference/data-types/datetime64.md). Значение хранится в четырех байтах и соответствует числу дней с 1925-01-01 по 2283-11-11. 
+Дата. Поддерживается такой же диапазон дат, как для типа [Datetime64](../../sql-reference/data-types/datetime64.md). Значение хранится в четырех байтах и соответствует числу дней с 1900-01-01 по 2299-12-31.
 
 **Пример**
 
@@ -36,5 +36,5 @@ SELECT * FROM new;
 
 -   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
 -   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
--   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null) 
+-   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null)
 
diff --git a/docs/ru/sql-reference/data-types/datetime64.md b/docs/ru/sql-reference/data-types/datetime64.md
index 8428c5b7309..0473d8256e9 100644
--- a/docs/ru/sql-reference/data-types/datetime64.md
+++ b/docs/ru/sql-reference/data-types/datetime64.md
@@ -18,7 +18,7 @@ DateTime64(precision, [timezone])
 
 Данные хранятся в виде количества ‘тиков’, прошедших с момента начала эпохи (1970-01-01 00:00:00 UTC), в Int64. Размер тика определяется параметром precision. Дополнительно, тип `DateTime64` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime64` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01.000’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки. Подробнее см. [DateTime](datetime.md).
 
-Диапазон значений: \[1925-01-01 00:00:00, 2283-11-11 23:59:59.99999999\] (Примечание: Точность максимального значения составляет 8).
+Диапазон значений: \[1900-01-01 00:00:00, 2299-12-31 23:59:59.99999999\] (Примечание: Точность максимального значения составляет 8).
 
 ## Примеры {#examples}
 
diff --git a/docs/ru/sql-reference/data-types/nullable.md b/docs/ru/sql-reference/data-types/nullable.md
index f018409772d..31a3674af6b 100644
--- a/docs/ru/sql-reference/data-types/nullable.md
+++ b/docs/ru/sql-reference/data-types/nullable.md
@@ -26,6 +26,7 @@ sidebar_label: Nullable
 
 :::info "Info"
     Почти всегда использование `Nullable` снижает производительность, учитывайте это при проектировании своих баз.
+:::
 
 ## Поиск NULL {#finding-null}
 
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index ac03dd39047..a80fedfbb24 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -464,6 +464,7 @@ SOURCE(ODBC(
 
 :::info "Примечание"
     Поля `table` и `query` не могут быть использованы вместе. Также обязательно должен быть один из источников данных: `table` или `query`.
+:::
 
 ClickHouse получает от ODBC-драйвера информацию о квотировании и квотирует настройки в запросах к драйверу, поэтому имя таблицы нужно указывать в соответствии с регистром имени таблицы в базе данных.
 
@@ -543,6 +544,7 @@ SOURCE(MYSQL(
 :::info "Примечание"
     Поля `table` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `table` или `query`.
     Явный параметр `secure` отсутствует. Автоматически поддержана работа в обоих случаях: когда установка SSL-соединения необходима и когда нет.
+:::
 
 MySQL можно подключить на локальном хосте через сокеты, для этого необходимо задать `host` и `socket`.
 
@@ -633,6 +635,7 @@ SOURCE(CLICKHOUSE(
 
 :::info "Примечание"
     Поля `table` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `table` или `query`.
+:::
 
 ### MongoDB {#dicts-external_dicts_dict_sources-mongodb}
 
@@ -748,6 +751,7 @@ SOURCE(REDIS(
 
 :::info "Примечание"
     Поля `column_family` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `column_family` или `query`.
+:::
 
 ### PostgreSQL {#dicts-external_dicts_dict_sources-postgresql}
 
@@ -804,3 +808,4 @@ SOURCE(POSTGRESQL(
 
 :::info "Примечание"
     Поля `table` или `where` не могут быть использованы вместе с полем `query`. Также обязательно должен быть один из источников данных: `table` или `query`.
+:::
diff --git a/docs/ru/sql-reference/functions/arithmetic-functions.md b/docs/ru/sql-reference/functions/arithmetic-functions.md
index c8f2e31cb0b..ba4340093b4 100644
--- a/docs/ru/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ru/sql-reference/functions/arithmetic-functions.md
@@ -56,7 +56,7 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 ## modulo(a, b), оператор a % b {#modulo}
 
 Вычисляет остаток от деления.
-Если аргументы - числа с плавающей запятой, то они предварительно преобразуются в целые числа, путём отбрасывания дробной части.
+Тип результата - целое число, если оба аргумента - целые числа. Если один из аргументов является числом с плавающей точкой, результатом будет число с плавающей точкой.
 Берётся остаток в том же смысле, как это делается в C++. По факту, для отрицательных чисел, используется truncated division.
 При делении на ноль или при делении минимального отрицательного числа на минус единицу, кидается исключение.
 
diff --git a/docs/ru/sql-reference/functions/array-join.md b/docs/ru/sql-reference/functions/array-join.md
index c35821b7f48..330a22f6553 100644
--- a/docs/ru/sql-reference/functions/array-join.md
+++ b/docs/ru/sql-reference/functions/array-join.md
@@ -9,15 +9,11 @@ sidebar_label: "Функция ArrayJoin"
 
 Обычные функции не изменяют множество строк, а лишь изменяют значения в каждой строке (map).
 Агрегатные функции выполняют свёртку множества строк (fold, reduce).
-Функция arrayJoin выполняет размножение каждой строки в множество строк (unfold).
+Функция `arrayJoin` выполняет размножение каждой строки в множество строк (unfold).
 
 Функция принимает в качестве аргумента массив, и размножает исходную строку в несколько строк - по числу элементов массива.
 Все значения в столбцах просто копируются, кроме значения в столбце с применением этой функции - он заменяется на соответствующее значение массива.
 
-В запросе может быть использовано несколько функций `arrayJoin`. В этом случае, соответствующее преобразование делается несколько раз.
-
-Обратите внимание на синтаксис ARRAY JOIN в запросе SELECT, который предоставляет более широкие возможности.
-
 Пример:
 
 ``` sql
@@ -32,3 +28,112 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
+Функция `arrayJoin` влияет на все секции запроса, включая секцию `WHERE`. Обратите внимание на результат 2, хотя подзапрос вернул 1 строку.
+
+Пример:
+
+```sql
+SELECT sum(1) AS impressions
+FROM
+(
+    SELECT ['Istanbul', 'Berlin', 'Bobruisk'] AS cities
+)
+WHERE arrayJoin(cities) IN ['Istanbul', 'Berlin'];
+```
+
+``` text
+┌─impressions─┐
+│           2 │
+└─────────────┘
+```
+
+В запросе может быть использовано несколько функций `arrayJoin`. В этом случае, соответствующее преобразование делается несколько раз и строки перемножаются.
+
+Пример:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    arrayJoin(cities) AS city,
+    arrayJoin(browsers) AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           2 │ Istanbul │ Chrome  │
+│           1 │ Istanbul │ Firefox │
+│           2 │ Berlin   │ Chrome  │
+│           1 │ Berlin   │ Firefox │
+│           2 │ Bobruisk │ Chrome  │
+│           1 │ Bobruisk │ Firefox │
+└─────────────┴──────────┴─────────┘
+```
+
+Обратите внимание на синтаксис [ARRAY JOIN](../statements/select/array-join.md) в запросе SELECT, который предоставляет более широкие возможности.
+`ARRAY JOIN` позволяет преобразовать несколько массивов с одинаковым количеством элементов за раз.
+
+Пример:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    city,
+    browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+ARRAY JOIN
+    cities AS city,
+    browsers AS browser
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
+
+Или можно использовать [Tuple](../data-types/tuple.md)
+
+Пример:
+
+```sql
+SELECT
+    sum(1) AS impressions,
+    (arrayJoin(arrayZip(cities, browsers)) AS t).1 AS city,
+    t.2 AS browser
+FROM
+(
+    SELECT
+        ['Istanbul', 'Berlin', 'Bobruisk'] AS cities,
+        ['Firefox', 'Chrome', 'Chrome'] AS browsers
+)
+GROUP BY
+    2,
+    3
+```
+
+``` text
+┌─impressions─┬─city─────┬─browser─┐
+│           1 │ Istanbul │ Firefox │
+│           1 │ Berlin   │ Chrome  │
+│           1 │ Bobruisk │ Chrome  │
+└─────────────┴──────────┴─────────┘
+```
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index da48cd940a7..9c873b0fcfc 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -57,7 +57,7 @@ toTimezone(value, timezone)
 **Аргументы**
 
 -   `value` — время или дата с временем. [DateTime64](../../sql-reference/data-types/datetime64.md).
--   `timezone` — часовой пояс для возвращаемого значения. [String](../../sql-reference/data-types/string.md). Этот аргумент является константой, потому что `toTimezone` изменяет часовой пояс столбца (часовой пояс является атрибутом типов `DateTime*`). 
+-   `timezone` — часовой пояс для возвращаемого значения. [String](../../sql-reference/data-types/string.md). Этот аргумент является константой, потому что `toTimezone` изменяет часовой пояс столбца (часовой пояс является атрибутом типов `DateTime*`).
 
 **Возвращаемое значение**
 
@@ -267,7 +267,7 @@ SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp;
 ```
 
     :::note "Attention"
-    `Date` или `DateTime` это возвращаемый тип функций `toStartOf*`, который описан ниже. Несмотря на то, что эти функции могут принимать `DateTime64` в качестве аргумента, если переданное значение типа `DateTime64` выходит за пределы нормального диапазона (с 1925 по 2283 год), то это даст неверный результат.
+    `Date` или `DateTime` это возвращаемый тип функций `toStartOf*`, который описан ниже. Несмотря на то, что эти функции могут принимать `DateTime64` в качестве аргумента, если переданное значение типа `DateTime64` выходит за пределы нормального диапазона (с 1900 по 2299 год), то это даст неверный результат.
     :::
 ## toStartOfYear {#tostartofyear}
 
@@ -931,6 +931,13 @@ SELECT now('Europe/Moscow');
 └──────────────────────┘
 ```
 
+## nowInBlock {#nowinblock}
+
+Возращает текующию дату и время в момент обработки блока данных. В отличие от функции `now`, возращаемое значение не константа, и будет возрващаться разлчиные значения в разных блоках данных при долгих запросах
+
+Имеет смысл использовать данную функцию для получения времени сейчас при длительных запросов INSERT SELECT.
+
+
 ## today {#today}
 
 Возвращает текущую дату на момент выполнения запроса. Функция не требует аргументов.
@@ -944,14 +951,31 @@ SELECT now('Europe/Moscow');
 ## timeSlot {#timeslot}
 
 Округляет время до получаса.
-Эта функция является специфичной для Яндекс.Метрики, так как пол часа - минимальное время, для которого, если соседние по времени хиты одного посетителя на одном счётчике отстоят друг от друга строго более, чем на это время, визит может быть разбит на два визита. То есть, кортежи (номер счётчика, идентификатор посетителя, тайм-слот) могут использоваться для поиска хитов, входящий в соответствующий визит.
+Эта функция является специфичной для Яндекс.Метрики, так как полчаса - минимальное время, для которого, если соседние по времени хиты одного посетителя на одном счётчике отстоят друг от друга строго более, чем на это время, визит может быть разбит на два визита. То есть, кортежи (номер счётчика, идентификатор посетителя, тайм-слот) могут использоваться для поиска хитов, входящий в соответствующий визит.
 
 ## timeSlots(StartTime, Duration,\[, Size\]) {#timeslotsstarttime-duration-size}
+Для интервала, начинающегося в `StartTime` и длящегося `Duration` секунд, возвращает массив моментов времени, кратных `Size`. Параметр `Size` указывать необязательно, по умолчанию он равен 1800 секундам (30 минутам) - необязательный параметр.
+Данная функция может использоваться, например, для анализа количества просмотров страницы за соответствующую сессию. 
+Аргумент `StartTime` может иметь тип `DateTime` или `DateTime64`. В случае, если используется `DateTime`, аргументы `Duration` и `Size` должны иметь тип `UInt32`; Для DateTime64 они должны быть типа `Decimal64`.  
+Возвращает массив DateTime/DateTime64 (тип будет совпадать с типом параметра ’StartTime’). Для DateTime64 масштаб(scale) возвращаемой величины может отличаться от масштаба фргумента ’StartTime’ --- результат будет иметь наибольший масштаб среди всех данных аргументов.
 
-Для интервала времени, начинающегося в ‘StartTime’ и продолжающегося ‘Duration’ секунд, возвращает массив моментов времени, состоящий из округлений вниз до ‘Size’ точек в секундах из этого интервала. ‘Size’ - необязательный параметр, константный UInt32, по умолчанию равен 1800.
-
-Например, `timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600)) = [toDateTime('2012-01-01 12:00:00'), toDateTime('2012-01-01 12:30:00')]`.
-Это нужно для поиска хитов, входящих в соответствующий визит.
+Пример использования:
+```sql
+SELECT timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600));
+SELECT timeSlots(toDateTime('1980-12-12 21:01:02', 'UTC'), toUInt32(600), 299);
+SELECT timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64(600.1, 1), toDecimal64(299, 0));
+```
+``` text
+┌─timeSlots(toDateTime('2012-01-01 12:20:00'), toUInt32(600))─┐
+│ ['2012-01-01 12:00:00','2012-01-01 12:30:00']               │
+└─────────────────────────────────────────────────────────────┘
+┌─timeSlots(toDateTime('1980-12-12 21:01:02', 'UTC'), toUInt32(600), 299)─┐
+│ ['1980-12-12 20:56:13','1980-12-12 21:01:12','1980-12-12 21:06:11']     │
+└─────────────────────────────────────────────────────────────────────────┘
+┌─timeSlots(toDateTime64('1980-12-12 21:01:02.1234', 4, 'UTC'), toDecimal64(600.1, 1), toDecimal64(299, 0))─┐
+│ ['1980-12-12 20:56:13.0000','1980-12-12 21:01:12.0000','1980-12-12 21:06:11.0000']                        │
+└───────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
 
 ## toYYYYMM
 
diff --git a/docs/ru/sql-reference/functions/files.md b/docs/ru/sql-reference/functions/files.md
index 1dae9478425..ef4369870ed 100644
--- a/docs/ru/sql-reference/functions/files.md
+++ b/docs/ru/sql-reference/functions/files.md
@@ -12,12 +12,13 @@ sidebar_label: "Функции для работы с файлами"
 **Синтаксис**
 
 ``` sql
-file(path)
+file(path[, default])
 ```
 
 **Аргументы**
 
 -   `path` — относительный путь до файла от [user_files_path](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-user_files_path). Путь к файлу может включать следующие символы подстановки и шаблоны: `*`, `?`, `{abc,def}` и `{N..M}`, где `N`, `M` — числа, `'abc', 'def'` — строки.
+-   `default` — Значение возвращаемое в случае, если указанный файл не существует. Поддерживаемые типы данных: [String](../../sql-reference/data-types/string.md) и [NULL](../../sql-reference/syntax.md#null-literal).
 
 **Примеры**
 
diff --git a/docs/ru/sql-reference/functions/geo/geohash.md b/docs/ru/sql-reference/functions/geo/geohash.md
index fe853cef267..933775dcfbe 100644
--- a/docs/ru/sql-reference/functions/geo/geohash.md
+++ b/docs/ru/sql-reference/functions/geo/geohash.md
@@ -86,6 +86,7 @@ geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precisi
 
 :::info "Замечание"
     Все передаваемые координаты должны быть одного и того же типа: либо `Float32`, либо `Float64`.
+:::
 
 **Возвращаемые значения**
 
@@ -96,6 +97,7 @@ geohashesInBox(longitude_min, latitude_min, longitude_max, latitude_max, precisi
 
 :::info "Замечание"
     Если возвращаемый массив содержит свыше 10 000 000 элементов, функция сгенерирует исключение.
+:::
 
 **Пример**
 
diff --git a/docs/ru/sql-reference/functions/other-functions.md b/docs/ru/sql-reference/functions/other-functions.md
index 30343c85c5a..bfe0d3d463b 100644
--- a/docs/ru/sql-reference/functions/other-functions.md
+++ b/docs/ru/sql-reference/functions/other-functions.md
@@ -1727,10 +1727,13 @@ SELECT joinGet(db_test.id_val,'val',toUInt32(number)) from numbers(4) SETTINGS j
 
 Принимает на вход имя и аргументы модели. Возвращает Float64.
 
-## throwIf(x\[, custom_message\]) {#throwifx-custom-message}
+## throwIf(x\[, message\[, error_code\]\]) {#throwifx-custom-message}
 
 Бросает исключение, если аргумент не равен нулю.
-custom_message - необязательный параметр, константная строка, задает текст сообщения об ошибке.
+`custom_message` - необязательный параметр, константная строка, задает текст сообщения об ошибке.
+`error_code` - необязательный параметр, константное число, задает код ошибки.
+
+Чтобы использовать аргумент `error_code`, должен быть включен параметр конфигурации `allow_custom_error_code_in_throwif`.
 
 ``` sql
 SELECT throwIf(number = 3, 'Too many') FROM numbers(10);
diff --git a/docs/ru/sql-reference/functions/type-conversion-functions.md b/docs/ru/sql-reference/functions/type-conversion-functions.md
index 946abddf3d0..7635bda78e6 100644
--- a/docs/ru/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ru/sql-reference/functions/type-conversion-functions.md
@@ -209,7 +209,7 @@ SELECT toDate32('1955-01-01') AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
+┌──────value─┬─toTypeName(toDate32('1955-01-01'))─┐
 │ 1955-01-01 │ Date32                             │
 └────────────┴────────────────────────────────────┘
 ```
@@ -217,23 +217,23 @@ SELECT toDate32('1955-01-01') AS value, toTypeName(value);
 2. Значение выходит за границы диапазона:
 
 ``` sql
-SELECT toDate32('1924-01-01') AS value, toTypeName(value);
+SELECT toDate32('1899-01-01') AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
-│ 1925-01-01 │ Date32                             │
+┌──────value─┬─toTypeName(toDate32('1899-01-01'))─┐
+│ 1900-01-01 │ Date32                             │
 └────────────┴────────────────────────────────────┘
 ```
 
 3. С аргументом типа `Date`:
 
 ``` sql
-SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
+SELECT toDate32(toDate('1899-01-01')) AS value, toTypeName(value);
 ```
 
 ``` text
-┌──────value─┬─toTypeName(toDate32(toDate('1924-01-01')))─┐
+┌──────value─┬─toTypeName(toDate32(toDate('1899-01-01')))─┐
 │ 1970-01-01 │ Date32                                     │
 └────────────┴────────────────────────────────────────────┘
 ```
@@ -247,14 +247,14 @@ SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
 Запрос:
 
 ``` sql
-SELECT toDate32OrZero('1924-01-01'), toDate32OrZero('');
+SELECT toDate32OrZero('1899-01-01'), toDate32OrZero('');
 ```
 
 Результат:
 
 ``` text
-┌─toDate32OrZero('1924-01-01')─┬─toDate32OrZero('')─┐
-│                   1925-01-01 │         1925-01-01 │
+┌─toDate32OrZero('1899-01-01')─┬─toDate32OrZero('')─┐
+│                   1900-01-01 │         1900-01-01 │
 └──────────────────────────────┴────────────────────┘
 ```
 
@@ -994,7 +994,7 @@ parseDateTimeBestEffort(time_string[, time_zone])
 Запрос:
 
 ``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
+SELECT parseDateTimeBestEffort('23/10/2020 12:12:57')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1002,7 +1002,7 @@ AS parseDateTimeBestEffort;
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
+│     2020-10-23 12:12:57 │
 └─────────────────────────┘
 ```
 
@@ -1039,7 +1039,7 @@ AS parseDateTimeBestEffort;
 Запрос:
 
 ``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
+SELECT parseDateTimeBestEffort('2018-10-23 10:12:12')
 AS parseDateTimeBestEffort;
 ```
 
@@ -1047,7 +1047,7 @@ AS parseDateTimeBestEffort;
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
+│     2018-10-23 10:12:12 │
 └─────────────────────────┘
 ```
 
@@ -1074,77 +1074,7 @@ SELECT parseDateTimeBestEffort('10 20:19');
 
 ## parseDateTimeBestEffortUS {#parsedatetimebesteffortUS}
 
-Эта функция похожа на [‘parseDateTimeBestEffort’](#parsedatetimebesteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности.
-
-**Синтаксис**
-
-``` sql
-parseDateTimeBestEffortUS(time_string [, time_zone])
-```
-
-**Аргументы**
-
--   `time_string` — строка, содержащая дату и время для преобразования. [String](../../sql-reference/data-types/string.md).
--   `time_zone` — часовой пояс. Функция анализирует `time_string` в соответствии с часовым поясом. [String](../../sql-reference/data-types/string.md).
-
-**Поддерживаемые нестандартные форматы**
-
--   Строка, содержащая 9-10 цифр [unix timestamp](https://en.wikipedia.org/wiki/Unix_time).
--   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss`, etc.
--   Строка с датой, но без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` etc.
--   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
--   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
-
-**Возвращаемое значение**
-
--   `time_string` преобразован в тип данных `DateTime`.
-
-**Примеры**
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09/12/2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09-12-2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUS('09.12.2020 12:12:57')
-AS parseDateTimeBestEffortUS;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUS─┐
-│     2020-09-12 12:12:57   │
-└─────────────────────────——┘
-```
+Эта функция ведет себя как [parseDateTimeBestEffort](#parsedatetimebesteffort) для форматов даты ISO, например, `YYYY-MM-DD hh:mm:ss`, и других форматов даты, где компоненты месяца и дня могут быть однозначно выделены, например, `YYYYMMDDhhmmss`, `YYYY-MM`, `DD hh`, или `YYYY-MM-DD hh:mm:ss ±h:mm`. Если месяц и день не могут быть однозначно выделены, например, `MM/DD/YYY`, `MM-DD-YYYY` или `MM-DD-YY`, то вместо `DD/MM/YYY`, `DD-MM-YYYY` или `DD-MM-YY` предпочитается формат даты США. Впрочем, если номер месяца был бы больше 12 и меньше или равен 31, эта функция возвращается к поведению [parseDateTimeBestEffort](#parsedatetimebesteffort), т.е. `15/08/2020` будет разобрано как `2020-08-15`.
 
 ## parseDateTimeBestEffortOrNull {#parsedatetimebesteffortornull}
 ## parseDateTime32BestEffortOrNull {#parsedatetime32besteffortornull}
@@ -1160,174 +1090,10 @@ AS parseDateTimeBestEffortUS;
 
 Работает аналогично функции [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS), но в отличие от нее возвращает `NULL`, если входная строка не может быть преобразована в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
 
-**Синтаксис**
-
-``` sql
-parseDateTimeBestEffortUSOrNull(time_string[, time_zone])
-```
-
-**Аргументы**
-
--   `time_string` — строка, содержащая дату или дату со временем для преобразования. Дата должна быть в американском формате (`MM/DD/YYYY` и т.д.). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция анализирует `time_string` в соответствии с заданным часовым поясом. Опциональный параметр. [String](../../sql-reference/data-types/string.md).
-
-**Поддерживаемые нестандартные форматы**
-
--   Строка в формате [unix timestamp](https://en.wikipedia.org/wiki/Unix_time), содержащая 9-10 цифр.
--   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss` и т.д.
--   Строка, содержащая дату без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` и т.д.
--   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
--   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
-
-**Возвращаемые значения**
-
--   `time_string`, преобразованная в тип данных `DateTime`.
--   `NULL`, если входная строка не может быть преобразована в тип данных `DateTime`.
-
-**Примеры**
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('02.10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrNull('10.2021') AS parseDateTimeBestEffortUSOrNull;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrNull─┐
-│                            ᴺᵁᴸᴸ │
-└─────────────────────────────────┘
-```
-
 ## parseDateTimeBestEffortUSOrZero {#parsedatetimebesteffortusorzero}
 
 Работает аналогично функции [parseDateTimeBestEffortUS](#parsedatetimebesteffortUS), но в отличие от нее возвращает нулевую дату (`1970-01-01`) или нулевую дату со временем (`1970-01-01 00:00:00`), если входная строка не может быть преобразована в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
 
-**Синтаксис**
-
-``` sql
-parseDateTimeBestEffortUSOrZero(time_string[, time_zone])
-```
-
-**Аргументы**
-
--   `time_string` — строка, содержащая дату или дату со временем для преобразования. Дата должна быть в американском формате (`MM/DD/YYYY` и т.д.). [String](../../sql-reference/data-types/string.md).
--   `time_zone` — [часовой пояс](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция анализирует `time_string` в соответствии с заданным часовым поясом. Опциональный параметр. [String](../../sql-reference/data-types/string.md).
-
-**Поддерживаемые нестандартные форматы**
-
--   Строка в формате [unix timestamp](https://en.wikipedia.org/wiki/Unix_time), содержащая 9-10 цифр.
--   Строка, содержащая дату и время: `YYYYMMDDhhmmss`, `MM/DD/YYYY hh:mm:ss`, `MM-DD-YY hh:mm`, `YYYY-MM-DD hh:mm:ss` и т.д.
--   Строка, содержащая дату без времени: `YYYY`, `YYYYMM`, `YYYY*MM`, `MM/DD/YYYY`, `MM-DD-YY` и т.д.
--   Строка, содержащая день и время: `DD`, `DD hh`, `DD hh:mm`. В этом случае `YYYY-MM` заменяется на `2000-01`.
--   Строка, содержащая дату и время, а также информацию о часовом поясе: `YYYY-MM-DD hh:mm:ss ±h:mm` и т.д. Например, `2020-12-12 17:36:00 -5:00`.
-
-**Возвращаемые значения**
-
--   `time_string`, преобразованная в тип данных `DateTime`.
--   Нулевая дата или нулевая дата со временем, если входная строка не может быть преобразована в тип данных `DateTime`.
-
-**Примеры**
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02/10/2021 21:12:57') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 21:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02-10-2021 21:12:57 GMT', 'Europe/Moscow') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-11 00:12:57 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.10.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             2021-02-10 00:00:00 │
-└─────────────────────────────────┘
-```
-
-Запрос:
-
-``` sql
-SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOrZero;
-```
-
-Результат:
-
-``` text
-┌─parseDateTimeBestEffortUSOrZero─┐
-│             1970-01-01 00:00:00 │
-└─────────────────────────────────┘
-```
-
 ## parseDateTime64BestEffort {#parsedatetime64besteffort}
 
 Работает аналогично функции [parseDateTimeBestEffort](#parsedatetimebesteffort), но также принимает миллисекунды и микросекунды. Возвращает тип данных [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime).
@@ -1374,17 +1140,29 @@ FORMAT PrettyCompactMonoBlock;
 └────────────────────────────┴────────────────────────────────┘
 ```
 
-## parseDateTime64BestEffortOrNull {#parsedatetime32besteffortornull}
+## parseDateTime64BestEffortUS {#parsedatetime64besteffortus}
+
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности.
+
+## parseDateTime64BestEffortOrNull {#parsedatetime64besteffortornull}
 
 Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но возвращает `NULL`, если формат даты не может быть обработан.
 
 ## parseDateTime64BestEffortOrZero {#parsedatetime64besteffortorzero}
 
-Работает аналогично функции [parseDateTime64BestEffort](#parsedatetimebesteffort), но возвращает нулевую дату и время, если формат даты не может быть обработан.
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но возвращает нулевую дату и время, если формат даты не может быть обработан.
+
+## parseDateTime64BestEffortUSOrNull {#parsedatetime64besteffortusornull}
+
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности и возвращает `NULL`, если формат даты не может быть обработан.
+
+## parseDateTime64BestEffortUSOrZero {#parsedatetime64besteffortusorzero}
+
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но разница состоит в том, что в она предполагает американский формат даты (`MM/DD/YYYY` etc.) в случае неоднозначности и возвращает нулевую дату и время, если формат даты не может быть обработан.
 
 ## toLowCardinality {#tolowcardinality}
 
-Преобразует входные данные в версию [LowCardianlity](../data-types/lowcardinality.md) того же типа данных.
+Преобразует входные данные в версию [LowCardinality](../data-types/lowcardinality.md) того же типа данных.
 
 Чтобы преобразовать данные из типа `LowCardinality`, используйте функцию [CAST](#type_conversion_function-cast). Например, `CAST(x as String)`.
 
@@ -1431,6 +1209,7 @@ SELECT toLowCardinality('1');
 
 :::info "Примечание"
     Возвращаемое значение — это временная метка в UTC, а не в часовом поясе `DateTime64`.
+:::
 
 **Синтаксис**
 
diff --git a/docs/ru/sql-reference/statements/alter/index.md b/docs/ru/sql-reference/statements/alter/index.md
index fd3f6c8adf6..0191c794e9c 100644
--- a/docs/ru/sql-reference/statements/alter/index.md
+++ b/docs/ru/sql-reference/statements/alter/index.md
@@ -25,7 +25,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 -   [CONSTRAINT](../../../sql-reference/statements/alter/constraint.md)
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
-    :::note 
+    :::note
     Запрос `ALTER TABLE` поддерживается только для таблиц типа `*MergeTree`, а также `Merge` и `Distributed`. Запрос имеет несколько вариантов.
     :::
 Следующие запросы `ALTER` управляют представлениями:
@@ -77,5 +77,6 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 
 :::info "Примечание"
     Для всех запросов `ALTER` при `replication_alter_partitions_sync = 2` и неактивности некоторых реплик больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, генерируется исключение `UNFINISHED`.
+:::
 
 Для запросов `ALTER TABLE ... UPDATE|DELETE` синхронность выполнения определяется настройкой [mutations_sync](../../../operations/settings/settings.md#mutations_sync).
diff --git a/docs/ru/sql-reference/statements/create/user.md b/docs/ru/sql-reference/statements/create/user.md
index d7da1748821..683e56a61b3 100644
--- a/docs/ru/sql-reference/statements/create/user.md
+++ b/docs/ru/sql-reference/statements/create/user.md
@@ -56,6 +56,7 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1]
 
 :::info "Внимание"
     ClickHouse трактует конструкцию `user_name@'address'` как имя пользователя целиком. То есть технически вы можете создать несколько пользователей с одинаковыми `user_name`, но разными частями конструкции после `@`, но лучше так не делать.
+:::
 
 ## Секция GRANTEES {#grantees}
 
diff --git a/docs/ru/sql-reference/statements/create/view.md b/docs/ru/sql-reference/statements/create/view.md
index 9a2db0ac2de..a0193cea21c 100644
--- a/docs/ru/sql-reference/statements/create/view.md
+++ b/docs/ru/sql-reference/statements/create/view.md
@@ -88,6 +88,7 @@ LIVE-представления работают по тому же принци
     - `LIVE VIEW` не обновляется, если в исходном запросе используются несколько таблиц.
 
     В случаях, когда `LIVE VIEW` не обновляется автоматически, чтобы обновлять его принудительно с заданной периодичностью, используйте [WITH REFRESH](#live-view-with-refresh).
+:::
 
 ### Отслеживание изменений LIVE-представлений {#live-view-monitoring}
 
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index b0b71ae412c..61480a0c1ab 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -30,6 +30,7 @@ ClickHouse не оповещает клиента. Чтобы включить 
 
 :::info "Примечание"
     Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+:::
 
 ## Выражение BY {#by-expression}
 
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 0926cc0863e..3e7560b0882 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -368,6 +368,7 @@ SHOW ACCESS
 
 :::info "Note"
     По запросу `SHOW CLUSTER name` вы получите содержимое таблицы system.clusters для этого кластера.
+:::
 
 ### Синтаксис {#show-cluster-syntax}
 
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index 63cf6271d72..cac6c261f21 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -19,3 +19,4 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 
 :::info "Примечание"
     Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+:::
diff --git a/docs/ru/sql-reference/statements/watch.md b/docs/ru/sql-reference/statements/watch.md
index 227a6e26c02..f925e25b0d5 100644
--- a/docs/ru/sql-reference/statements/watch.md
+++ b/docs/ru/sql-reference/statements/watch.md
@@ -104,3 +104,4 @@ WATCH lv EVENTS LIMIT 1;
 
 :::info "Примечание"
     При отслеживании [LIVE VIEW](./create/view.md#live-view) через интерфейс HTTP следует использовать формат [JSONEachRowWithProgress](../../interfaces/formats.md#jsoneachrowwithprogress). Постоянные сообщения об изменениях будут добавлены в поток вывода для поддержания активности долговременного HTTP-соединения до тех пор, пока результат запроса изменяется. Проомежуток времени между сообщениями об изменениях управляется настройкой[live_view_heartbeat_interval](./create/view.md#live-view-settings).
+:::
\ No newline at end of file
diff --git a/docs/ru/sql-reference/table-functions/postgresql.md b/docs/ru/sql-reference/table-functions/postgresql.md
index 3408951c690..2e1e5314f91 100644
--- a/docs/ru/sql-reference/table-functions/postgresql.md
+++ b/docs/ru/sql-reference/table-functions/postgresql.md
@@ -28,6 +28,7 @@ postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
 
 :::info "Примечание"
     В запросах `INSERT` для того чтобы отличить табличную функцию `postgresql(...)` от таблицы со списком имен столбцов вы должны указывать ключевые слова `FUNCTION` или `TABLE FUNCTION`. См. примеры ниже.
+:::
 
 ## Особенности реализации {#implementation-details}
 
@@ -43,6 +44,7 @@ PostgreSQL массивы конвертируются в массивы ClickHo
 
 :::info "Примечание"
     Будьте внимательны, в PostgreSQL массивы, созданные как `type_name[]`, являются многомерными и могут содержать в себе разное количество измерений в разных строках одной таблицы. Внутри ClickHouse допустипы только многомерные массивы с одинаковым кол-вом измерений во всех строках таблицы.
+:::
 
 Поддерживает несколько реплик, которые должны быть перечислены через `|`. Например:
 
diff --git a/docs/tools/build.py b/docs/tools/build.py
index 3756cf66794..7f78af5e203 100755
--- a/docs/tools/build.py
+++ b/docs/tools/build.py
@@ -19,10 +19,6 @@ def build(args):
 
     if not args.skip_website:
         website.build_website(args)
-
-    if not args.skip_website:
-        website.process_benchmark_results(args)
-        website.minify_website(args)
         redirects.build_static_redirects(args)
 
 
@@ -74,9 +70,5 @@ if __name__ == "__main__":
         new_args = sys.executable + " " + " ".join(new_args)
 
         server = livereload.Server()
-        server.watch(
-            args.website_dir + "**/*",
-            livereload.shell(new_args, cwd="tools", shell=True),
-        )
         server.serve(root=args.output_dir, host="0.0.0.0", port=args.livereload)
         sys.exit(0)
diff --git a/docs/tools/deploy-to-test.sh b/docs/tools/deploy-to-test.sh
deleted file mode 100755
index a7a922137d5..00000000000
--- a/docs/tools/deploy-to-test.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-#
-# README:
-# This script deploys ClickHouse website to your personal test subdomain.
-#
-# Before first use of this script:
-# 1) Set up building documentation according to https://github.com/ClickHouse/ClickHouse/tree/master/docs/tools#use-buildpy-use-build-py
-# 2) Create https://github.com/GIT_USER/clickhouse.github.io repo (replace GIT_USER with your GitHub login)
-# 3) Enable GitHub Pages in settings of this repo
-# 4) Add file named CNAME in root of this repo with "GIT_USER-test.clickhouse.com" content (without quotes)
-# 5) Send email on address from https://clickhouse.com/#contacts asking to create GIT_USER-test.clickhouse.com domain
-#
-set -ex
-
-BASE_DIR=$(dirname "$(readlink -f "$0")")
-GIT_USER=${GIT_USER:-$USER}
-
-GIT_PROD_URI=git@github.com:${GIT_USER}/clickhouse.github.io.git \
- BASE_DOMAIN=${GIT_USER}-test.clickhouse.com \
- EXTRA_BUILD_ARGS="${*}" \
- CLOUDFLARE_TOKEN="" \
- "${BASE_DIR}/release.sh"
diff --git a/docs/tools/easy_edit.sh b/docs/tools/easy_edit.sh
deleted file mode 100755
index ed8a43fead7..00000000000
--- a/docs/tools/easy_edit.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Creates symlinks to docs in ClickHouse/docs/edit/
-# that are easy to open in both languages simultaneously
-# for example, with `vim -O docs/edit/my_article/*`
-
-set -ex
-BASE_DIR="$(dirname $(readlink -f $0))/.."
-DOCS_DIR="${BASE_DIR}"
-EDIT_DIR="${BASE_DIR}/edit"
-
-pushd "${DOCS_DIR}/en"
-ARTICLES=$(find . -name '*.md' | sed -e 's/\.md$//g' -e 's/^\.\/en\///g')
-popd
-
-rm -rf "${EDIT_DIR}" || true
-
-for DOCS_LANG in en ru zh ja fa
-do
-    for ARTICLE in ${ARTICLES}
-    do
-        ARTICLE_DIR="${EDIT_DIR}/${ARTICLE}"
-        mkdir -p $ARTICLE_DIR || true
-        ln -s "${DOCS_DIR}/${DOCS_LANG}/${ARTICLE}.md" "${ARTICLE_DIR}/${DOCS_LANG}.md"
-    done
-done
-
-
diff --git a/docs/tools/release.sh b/docs/tools/release.sh
index b55841f9da2..1d344457bf1 100755
--- a/docs/tools/release.sh
+++ b/docs/tools/release.sh
@@ -36,15 +36,4 @@ then
     # Push to GitHub rewriting the existing contents.
     # Sometimes it does not work with error message "! [remote rejected] master -> master (cannot lock ref 'refs/heads/master': is at 42a0f6b6b6c7be56a469441b4bf29685c1cebac3 but expected 520e9b02c0d4678a2a5f41d2f561e6532fb98cc1)"
     for _ in {1..10}; do git push --force origin master && break; sleep 5; done
-
-    # Turn off logging.
-    set +x
-
-    if [[ -n "${CLOUDFLARE_TOKEN}" ]]
-    then
-        sleep 1m
-        # https://api.cloudflare.com/#zone-purge-files-by-cache-tags,-host-or-prefix
-        POST_DATA='{"hosts":["clickhouse.com"]}'
-        curl -X POST "https://api.cloudflare.com/client/v4/zones/4fc6fb1d46e87851605aa7fa69ca6fe0/purge_cache" -H "Authorization: Bearer ${CLOUDFLARE_TOKEN}" -H "Content-Type:application/json" --data "${POST_DATA}"
-    fi
 fi
diff --git a/docs/tools/util.py b/docs/tools/util.py
index a5ebb1b11b2..dc9fb640b47 100644
--- a/docs/tools/util.py
+++ b/docs/tools/util.py
@@ -113,7 +113,6 @@ def init_jinja2_filters(env):
     env.filters["chunks"] = lambda line: [
         line[i : i + chunk_size] for i in range(0, len(line), chunk_size)
     ]
-    env.filters["adjust_markdown_html"] = website.adjust_markdown_html
     env.filters["to_rfc882"] = lambda d: datetime.datetime.strptime(
         d, "%Y-%m-%d"
     ).strftime("%a, %d %b %Y %H:%M:%S GMT")
diff --git a/docs/tools/website.py b/docs/tools/website.py
index a44464b6828..2a34458fd29 100644
--- a/docs/tools/website.py
+++ b/docs/tools/website.py
@@ -5,122 +5,9 @@ import os
 import shutil
 import subprocess
 
-import bs4
-
 import util
 
 
-def handle_iframe(iframe, soup):
-    allowed_domains = ["https://www.youtube.com/"]
-    illegal_domain = True
-    iframe_src = iframe.attrs["src"]
-    for domain in allowed_domains:
-        if iframe_src.startswith(domain):
-            illegal_domain = False
-            break
-    if illegal_domain:
-        raise RuntimeError(f"iframe from illegal domain: {iframe_src}")
-    wrapper = soup.new_tag("div")
-    wrapper.attrs["class"] = ["embed-responsive", "embed-responsive-16by9"]
-    iframe.insert_before(wrapper)
-    iframe.extract()
-    wrapper.insert(0, iframe)
-    if "width" in iframe.attrs:
-        del iframe.attrs["width"]
-    if "height" in iframe.attrs:
-        del iframe.attrs["height"]
-    iframe.attrs[
-        "allow"
-    ] = "accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
-    iframe.attrs["class"] = "embed-responsive-item"
-    iframe.attrs["frameborder"] = "0"
-    iframe.attrs["allowfullscreen"] = "1"
-
-
-def adjust_markdown_html(content):
-    soup = bs4.BeautifulSoup(content, features="html.parser")
-
-    for a in soup.find_all("a"):
-        a_class = a.attrs.get("class")
-        a_href = a.attrs.get("href")
-        if a_class and "headerlink" in a_class:
-            a.string = "\xa0"
-        if a_href and a_href.startswith("http"):
-            a.attrs["target"] = "_blank"
-
-    for code in soup.find_all("code"):
-        code_class = code.attrs.get("class")
-        if code_class:
-            code.attrs["class"] = code_class + ["syntax"]
-        else:
-            code.attrs["class"] = "syntax"
-
-    for iframe in soup.find_all("iframe"):
-        handle_iframe(iframe, soup)
-
-    for img in soup.find_all("img"):
-        if img.attrs.get("alt") == "iframe":
-            img.name = "iframe"
-            img.string = ""
-            handle_iframe(img, soup)
-            continue
-        img_class = img.attrs.get("class")
-        if img_class:
-            img.attrs["class"] = img_class + ["img-fluid"]
-        else:
-            img.attrs["class"] = "img-fluid"
-
-    for details in soup.find_all("details"):
-        for summary in details.find_all("summary"):
-            if summary.parent != details:
-                summary.extract()
-                details.insert(0, summary)
-
-    for dd in soup.find_all("dd"):
-        dd_class = dd.attrs.get("class")
-        if dd_class:
-            dd.attrs["class"] = dd_class + ["pl-3"]
-        else:
-            dd.attrs["class"] = "pl-3"
-
-    for div in soup.find_all("div"):
-        div_class = div.attrs.get("class")
-        is_admonition = div_class and "admonition" in div.attrs.get("class")
-        if is_admonition:
-            for a in div.find_all("a"):
-                a_class = a.attrs.get("class")
-                if a_class:
-                    a.attrs["class"] = a_class + ["alert-link"]
-                else:
-                    a.attrs["class"] = "alert-link"
-
-        for p in div.find_all("p"):
-            p_class = p.attrs.get("class")
-            if is_admonition and p_class and ("admonition-title" in p_class):
-                p.attrs["class"] = p_class + [
-                    "alert-heading",
-                    "display-4",
-                    "text-reset",
-                    "mb-2",
-                ]
-
-        if is_admonition:
-            div.attrs["role"] = "alert"
-            if ("info" in div_class) or ("note" in div_class):
-                mode = "alert-primary"
-            elif ("attention" in div_class) or ("warning" in div_class):
-                mode = "alert-warning"
-            elif "important" in div_class:
-                mode = "alert-danger"
-            elif "tip" in div_class:
-                mode = "alert-info"
-            else:
-                mode = "alert-secondary"
-            div.attrs["class"] = div_class + ["alert", "pb-0", "mb-4", mode]
-
-    return str(soup)
-
-
 def build_website(args):
     logging.info("Building website")
     env = util.init_jinja2_env(args)
@@ -145,11 +32,6 @@ def build_website(args):
         ),
     )
 
-    shutil.copytree(
-        os.path.join(args.website_dir, "images"),
-        os.path.join(args.output_dir, "docs", "images"),
-    )
-
     # This file can be requested to check for available ClickHouse releases.
     shutil.copy2(
         os.path.join(args.src_dir, "utils", "list-versions", "version_date.tsv"),
@@ -179,84 +61,3 @@ def build_website(args):
 
             with open(path, "wb") as f:
                 f.write(content.encode("utf-8"))
-
-
-def get_css_in(args):
-    return [
-        f"'{args.website_dir}/css/bootstrap.css'",
-        f"'{args.website_dir}/css/docsearch.css'",
-        f"'{args.website_dir}/css/base.css'",
-        f"'{args.website_dir}/css/blog.css'",
-        f"'{args.website_dir}/css/docs.css'",
-        f"'{args.website_dir}/css/highlight.css'",
-        f"'{args.website_dir}/css/main.css'",
-    ]
-
-
-def get_js_in(args):
-    return [
-        f"'{args.website_dir}/js/jquery.js'",
-        f"'{args.website_dir}/js/popper.js'",
-        f"'{args.website_dir}/js/bootstrap.js'",
-        f"'{args.website_dir}/js/sentry.js'",
-        f"'{args.website_dir}/js/base.js'",
-        f"'{args.website_dir}/js/index.js'",
-        f"'{args.website_dir}/js/docsearch.js'",
-        f"'{args.website_dir}/js/docs.js'",
-        f"'{args.website_dir}/js/main.js'",
-    ]
-
-
-def minify_website(args):
-    css_in = " ".join(get_css_in(args))
-    css_out = f"{args.output_dir}/docs/css/base.css"
-    os.makedirs(f"{args.output_dir}/docs/css")
-
-    command = f"cat {css_in}"
-    output = subprocess.check_output(command, shell=True)
-    with open(css_out, "wb+") as f:
-        f.write(output)
-
-    with open(css_out, "rb") as f:
-        css_digest = hashlib.sha3_224(f.read()).hexdigest()[0:8]
-
-    js_in = " ".join(get_js_in(args))
-    js_out = f"{args.output_dir}/docs/js/base.js"
-    os.makedirs(f"{args.output_dir}/docs/js")
-
-    command = f"cat {js_in}"
-    output = subprocess.check_output(command, shell=True)
-    with open(js_out, "wb+") as f:
-        f.write(output)
-
-    with open(js_out, "rb") as f:
-        js_digest = hashlib.sha3_224(f.read()).hexdigest()[0:8]
-        logging.info(js_digest)
-
-
-def process_benchmark_results(args):
-    benchmark_root = os.path.join(args.website_dir, "benchmark")
-    required_keys = {
-        "hardware": ["result", "system", "system_full", "kind"],
-        "versions": ["version", "system"],
-    }
-    for benchmark_kind in ["hardware", "versions"]:
-        results = []
-        results_root = os.path.join(benchmark_root, benchmark_kind, "results")
-        for result in sorted(os.listdir(results_root)):
-            result_file = os.path.join(results_root, result)
-            logging.info(f"Reading benchmark result from {result_file}")
-            with open(result_file, "r") as f:
-                result = json.loads(f.read())
-                for item in result:
-                    for required_key in required_keys[benchmark_kind]:
-                        assert (
-                            required_key in item
-                        ), f'No "{required_key}" in {result_file}'
-                results += result
-        results_js = os.path.join(
-            args.output_dir, "benchmark", benchmark_kind, "results.js"
-        )
-        with open(results_js, "w") as f:
-            data = json.dumps(results)
-            f.write(f"var results = {data};")
diff --git a/docs/zh/development/developer-instruction.md b/docs/zh/development/developer-instruction.md
index 7ade3ad57fb..77caad105c6 100644
--- a/docs/zh/development/developer-instruction.md
+++ b/docs/zh/development/developer-instruction.md
@@ -264,3 +264,9 @@ ClickHouse成员一旦在您的拉取请求上贴上«可以测试»标签，就
 系统将分别为您的拉取请求准备ClickHouse二进制版本。若要检索这些构建信息，请在检查列表中单击« ClickHouse构建检查»旁边的«详细信息»链接。在这里，您会找到指向ClickHouse的.deb软件包的直接链接，此外，甚至可以将其部署在生产服务器上（如果您不担心）。
 
 某些构建项很可能会在首次构建时失败。这是因为我们同时检查了基于gcc和clang的构建，几乎所有现有的被clang启用的警告（总是带有`-Werror`标志）。在同一页面上，您可以找到所有构建的日志，因此不必以所有可能的方式构建ClickHouse。
+
+## 浏览ClickHouse源代码 {#browse-clickhouse-source-code}
+
+您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。
+
+此外，您还可以像往常一样浏览源代码 [GitHub](https://github.com/ClickHouse/ClickHouse)
diff --git a/docs/zh/engines/database-engines/postgresql.md b/docs/zh/engines/database-engines/postgresql.md
index 6afefa09cd5..0f2901e6389 100644
--- a/docs/zh/engines/database-engines/postgresql.md
+++ b/docs/zh/engines/database-engines/postgresql.md
@@ -29,7 +29,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cac
 
 ## 支持的数据类型 {#data_types-support}
 
-| PostgerSQL       | ClickHouse                                                   |
+| PostgreSQL       | ClickHouse                                                   |
 |------------------|--------------------------------------------------------------|
 | DATE             | [Date](../../sql-reference/data-types/date.md)               |
 | TIMESTAMP        | [DateTime](../../sql-reference/data-types/datetime.md)       |
diff --git a/docs/zh/engines/table-engines/mergetree-family/mergetree.md b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
index 0ace414b4b8..7b723d38594 100644
--- a/docs/zh/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
@@ -62,6 +62,8 @@ ORDER BY expr
 
 - `PARTITION BY` — [分区键](custom-partitioning-key.md) ，可选项。
 
+     大多数情况下，不需要分使用区键。即使需要使用，也不需要使用比月更细粒度的分区键。分区不会加快查询（这与 ORDER BY 表达式不同）。永远也别使用过细粒度的分区键。不要使用客户端指定分区标识符或分区字段名称来对数据进行分区（而是将分区字段标识或名称作为 ORDER BY 表达式的第一列来指定分区）。
+
      要按月分区，可以使用表达式 `toYYYYMM(date_column)` ，这里的 `date_column` 是一个 [Date](../../../engines/table-engines/mergetree-family/mergetree.md) 类型的列。分区名的格式会是 `"YYYYMM"` 。
 
 - `PRIMARY KEY` - 如果要 [选择与排序键不同的主键](#choosing-a-primary-key-that-differs-from-the-sorting-key)，在这里指定，可选项。
diff --git a/docs/zh/faq/general/dbms-naming.md b/docs/zh/faq/general/dbms-naming.md
index 72b96886924..6725524d58a 100644
--- a/docs/zh/faq/general/dbms-naming.md
+++ b/docs/zh/faq/general/dbms-naming.md
@@ -10,7 +10,7 @@ sidebar_position: 10
 
 这个由两部分组成的意思有两个结果:
 
-- 唯一正确的写“Click**H** house”的方式是用大写H。
+- 唯一正确的写“Click**H**ouse”的方式是用大写H。
 - 如果需要缩写，请使用“**CH**”。由于一些历史原因，缩写CK在中国也很流行，主要是因为中文中最早的一个关于ClickHouse的演讲使用了这种形式。
 
 !!! info “有趣的事实”
diff --git a/docs/zh/guides/improving-query-performance/_category_.yml b/docs/zh/guides/improving-query-performance/_category_.yml
new file mode 100644
index 00000000000..62885213bfc
--- /dev/null
+++ b/docs/zh/guides/improving-query-performance/_category_.yml
@@ -0,0 +1,8 @@
+position: 10
+label: '优化查询性能'
+collapsible: true
+collapsed: true
+link:
+  type: generated-index
+  title: Improving Query Performance
+  slug: /zh/guides/improving-query-performance
diff --git a/docs/zh/guides/improving-query-performance/skipping-indexes.md b/docs/zh/guides/improving-query-performance/skipping-indexes.md
new file mode 100644
index 00000000000..b3cb82bf769
--- /dev/null
+++ b/docs/zh/guides/improving-query-performance/skipping-indexes.md
@@ -0,0 +1,167 @@
+---
+sidebar_label: Data Skipping Indexes
+sidebar_position: 2
+---
+
+# 深入理解ClickHouse跳数索引
+
+### 跳数索引
+
+影响ClickHouse查询性能的因素很多。在大多数场景中，关键因素是ClickHouse在计算查询WHERE子句条件时是否可以使用主键。因此，选择适用于最常见查询模式的主键对于表的设计至关重要。
+
+然而，无论如何仔细地调优主键，不可避免地会出现不能有效使用它的查询用例。用户通常依赖于ClickHouse获得时间序列类型的数据，但他们通常希望根据其他业务维度(如客户id、网站URL或产品编号)分析同一批数据。在这种情况下，查询性能可能会相当差，因为应用WHERE子句条件可能需要对每个列值进行完整扫描。虽然ClickHouse在这些情况下仍然相对较快，但计算数百万或数十亿个单独的值将导致“非索引”查询的执行速度比基于主键的查询慢得多。
+
+在传统的关系数据库中，解决这个问题的一种方法是将一个或多个“二级”索引附加到表上。这是一个b-树结构，允许数据库在O(log(n))时间内找到磁盘上所有匹配的行，而不是O(n)时间(一次表扫描)，其中n是行数。但是，这种类型的二级索引不适用于ClickHouse(或其他面向列的数据库)，因为磁盘上没有单独的行可以添加到索引中。
+
+相反，ClickHouse提供了一种不同类型的索引，在特定情况下可以显著提高查询速度。这些结构被标记为跳数索引，因为它们使ClickHouse能够跳过保证没有匹配值的数据块。
+### 基本操作
+
+用户只能在MergeTree表引擎上使用数据跳数索引。每个跳数索引都有四个主要参数：
+
+- 索引名称。索引名用于在每个分区中创建索引文件。此外，在删除或具体化索引时需要将其作为参数。
+- 索引的表达式。索引表达式用于计算存储在索引中的值集。它可以是列、简单操作符、函数的子集的组合。
+- 类型。索引的类型控制计算，该计算决定是否可以跳过读取和计算每个索引块。
+- GRANULARITY。每个索引块由颗粒（granule）组成。例如，如果主表索引粒度为8192行，GRANULARITY为4，则每个索引“块”将为32768行。
+
+当用户创建数据跳数索引时，表的每个数据部分目录中将有两个额外的文件。
+
+- skp_idx_{index_name}.idx：包含排序的表达式值。
+- skp_idx_{index_name}.mrk2：包含关联数据列文件中的相应偏移量。
+
+如果在执行查询并读取相关列文件时，WHERE子句过滤条件的某些部分与跳数索引表达式匹配，ClickHouse将使用索引文件数据来确定每个相关的数据块是必须被处理还是可以被绕过(假设块还没有通过应用主键索引被排除)。这里用一个非常简单的示例：考虑以下加载了可预测数据的表。
+
+```
+CREATE TABLE skip_table
+(
+  my_key UInt64,
+  my_value UInt64
+)
+ENGINE MergeTree primary key my_key
+SETTINGS index_granularity=8192;
+
+INSERT INTO skip_table SELECT number, intDiv(number,4096) FROM numbers(100000000);
+```
+
+当执行一个不使用主键的简单查询时，将扫描my_value列所有的一亿条记录：
+
+```
+SELECT * FROM skip_table WHERE my_value IN (125, 700)
+
+┌─my_key─┬─my_value─┐
+│ 512000 │      125 │
+│ 512001 │      125 │
+│    ... |      ... |
+└────────┴──────────┘
+
+8192 rows in set. Elapsed: 0.079 sec. Processed 100.00 million rows, 800.10 MB (1.26 billion rows/s., 10.10 GB/s.
+```
+
+增加一个基本的跳数索引：
+
+```
+ALTER TABLE skip_table ADD INDEX vix my_value TYPE set(100) GRANULARITY 2;
+```
+
+通常，跳数索引只应用于新插入的数据，所以仅仅添加索引不会影响上述查询。
+
+要使已经存在的数据生效，那执行：
+
+```
+ALTER TABLE skip_table MATERIALIZE INDEX vix;
+```
+
+重跑SQL：
+
+```
+SELECT * FROM skip_table WHERE my_value IN (125, 700)
+
+┌─my_key─┬─my_value─┐
+│ 512000 │      125 │
+│ 512001 │      125 │
+│    ... |      ... |
+└────────┴──────────┘
+
+8192 rows in set. Elapsed: 0.051 sec. Processed 32.77 thousand rows, 360.45 KB (643.75 thousand rows/s., 7.08 MB/s.)
+```
+
+这次没有再去处理1亿行800MB的数据，ClickHouse只读取和分析32768行360KB的数据—4个granule的数据。
+
+下图是更直观的展示，这就是如何读取和选择my_value为125的4096行，以及如何跳过以下行而不从磁盘读取:
+
+![Simple Skip](../../../en/guides/improving-query-performance/images/simple_skip.svg)
+
+通过在执行查询时启用跟踪，用户可以看到关于跳数索引使用情况的详细信息。在clickhouse-client中设置send_logs_level:
+
+```
+SET send_logs_level='trace';
+```
+这将在尝试调优查询SQL和表索引时提供有用的调试信息。上面的例子中，调试日志显示跳数索引过滤了大部分granule，只读取了两个:
+
+```
+<Debug> default.skip_table (933d4b2c-8cea-4bf9-8c93-c56e900eefd1) (SelectExecutor): Index `vix` has dropped 6102/6104 granules.
+```
+### 跳数索引类型
+
+#### minmax
+
+这种轻量级索引类型不需要参数。它存储每个块的索引表达式的最小值和最大值(如果表达式是一个元组，它分别存储元组元素的每个成员的值)。对于倾向于按值松散排序的列，这种类型非常理想。在查询处理期间，这种索引类型的开销通常是最小的。
+
+这种类型的索引只适用于标量或元组表达式——索引永远不适用于返回数组或map数据类型的表达式。
+
+#### set
+
+这种轻量级索引类型接受单个参数max_size，即每个块的值集(0允许无限数量的离散值)。这个集合包含块中的所有值(如果值的数量超过max_size则为空)。这种索引类型适用于每组颗粒中基数较低(本质上是“聚集在一起”)但总体基数较高的列。
+
+该索引的成本、性能和有效性取决于块中的基数。如果每个块包含大量惟一值，那么针对大型索引集计算查询条件将非常昂贵，或者由于索引超过max_size而为空，因此索引将不应用。
+
+#### Bloom Filter Types
+
+Bloom filter是一种数据结构，它允许对集合成员进行高效的是否存在测试，但代价是有轻微的误报。在跳数索引的使用场景，假阳性不是一个大问题，因为惟一的问题只是读取一些不必要的块。潜在的假阳性意味着索引表达式应该为真，否则有效的数据可能会被跳过。
+
+因为Bloom filter可以更有效地处理大量离散值的测试，所以它们可以适用于大量条件表达式判断的场景。特别的是Bloom filter索引可以应用于数组，数组中的每个值都被测试，也可以应用于map，通过使用mapKeys或mapValues函数将键或值转换为数组。
+
+有三种基于Bloom过滤器的数据跳数索引类型：
+
+* 基本的**bloom_filter**接受一个可选参数，该参数表示在0到1之间允许的“假阳性”率(如果未指定，则使用.025)。
+
+* 更专业的**tokenbf_v1**。需要三个参数，用来优化布隆过滤器：（1）过滤器的大小字节(大过滤器有更少的假阳性，有更高的存储成本)，（2）哈希函数的个数(更多的散列函数可以减少假阳性)。（3）布隆过滤器哈希函数的种子。有关这些参数如何影响布隆过滤器功能的更多细节，请参阅  [这里](https://hur.st/bloomfilter/)  。此索引仅适用于String、FixedString和Map类型的数据。输入表达式被分割为由非字母数字字符分隔的字符序列。例如，列值`This is a candidate for a "full text" search`将被分割为`This` `is` `a` `candidate` `for` `full` `text` `search`。它用于LIKE、EQUALS、in、hasToken()和类似的长字符串中单词和其他值的搜索。例如，一种可能的用途是在非结构的应用程序日志行列中搜索少量的类名或行号。
+  
+* 更专业的**ngrambf_v1**。该索引的功能与tokenbf_v1相同。在Bloom filter设置之前需要一个额外的参数，即要索引的ngram的大小。一个ngram是长度为n的任何字符串，比如如果n是4，`A short string`会被分割为`A sh`` sho`, `shor`, `hort`, `ort s`, `or st`, `r str`, ` stri`, `trin`, `ring`。这个索引对于文本搜索也很有用，特别是没有单词间断的语言，比如中文。
+
+### 跳数索引函数
+
+跳数索引核心目的是限制流行查询分析的数据量。鉴于ClickHouse数据的分析特性，这些查询的模式在大多数情况下都包含函数表达式。因此，跳数索引必须与常用函数正确交互才能提高效率。这种情况可能发生在:
+* 插入数据并将索引定义为一个函数表达式(表达式的结果存储在索引文件中)或者
+* 处理查询，并将表达式应用于存储的索引值，以确定是否排除数据块。
+
+每种类型的跳数索引支持的函数列表可以查看 [这里](https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#functions-support) 。通常，集合索引和基于Bloom filter的索引(另一种类型的集合索引)都是无序的，因此不能用于范围。相反，最大最小值索引在范围中工作得特别好，因为确定范围是否相交非常快。部分匹配函数LIKE、startsWith、endsWith和hasToken的有效性取决于使用的索引类型、索引表达式和数据的特定形状。
+
+### 跳数索引的配置
+
+有两个可用的设置可应用于跳数索引。
+
+* **use_skip_indexes** (0或1，默认为1)。不是所有查询都可以有效地使用跳过索引。如果一个特定的过滤条件可能包含很多颗粒，那么应用数据跳过索引将导致不必要的、有时甚至是非常大的成本。对于不太可能从任何跳过索引中获益的查询，将该值设置为0。
+* **force_data_skipping_indexes** (以逗号分隔的索引名列表)。此设置可用于防止某些类型的低效查询。在某些情况下，除非使用跳过索引，否则查询表的开销太大，如果将此设置与一个或多个索引名一起使用，则对于任何没有使用所列索引的查询将返回一个异常。这将防止编写糟糕的查询消耗服务器资源。
+
+### 最佳实践
+
+跳数索引并不直观，特别是对于来自RDMS领域并且习惯二级行索引或来自文档存储的反向索引的用户来说。要获得任何优化，应用ClickHouse数据跳数索引必须避免足够多的颗粒读取，以抵消计算索引的成本。关键是，如果一个值在一个索引块中只出现一次，就意味着整个块必须读入内存并计算，而索引开销是不必要的。
+
+考虑以下数据分布：
+
+![Bad Skip!](../../../en/guides/improving-query-performance/images/bad_skip_1.svg)
+
+
+假设主键/顺序是时间戳，并且在visitor_id上有一个索引。考虑下面的查询:
+
+ `SELECT timestamp, url FROM table WHERE visitor_id = 1001`
+
+对于这种数据分布，传统的二级索引非常有利。不是读取所有的32678行来查找具有请求的visitor_id的5行，而是二级索引只包含5行位置，并且只从磁盘读取这5行。ClickHouse数据跳过索引的情况正好相反。无论跳转索引的类型是什么，visitor_id列中的所有32678值都将被测试。
+
+因此，试图通过简单地向键列添加索引来加速ClickHouse查询的冲动通常是不正确的。只有在研究了其他替代方法之后，才应该使用此高级功能，例如修改主键(查看 [如何选择主键](../improving-query-performance/sparse-primary-indexes.md))、使用投影或使用实体化视图。即使跳数索引是合适的，也经常需要对索引和表进行仔细的调优。
+
+在大多数情况下，一个有用的跳数索引需要主键和目标的非主列/表达式之间具有很强的相关性。如果没有相关性(如上图所示)，那么在包含数千个值的块中，至少有一行满足过滤条件的可能性很高，并且只有几个块会被跳过。相反，如果主键的值范围(如一天中的时间)与潜在索引列中的值强相关(如电视观众年龄)，则最小值类型的索引可能是有益的。注意，在插入数据时，可以增加这种相关性，方法是在sort /ORDER by键中包含额外的列，或者以在插入时对与主键关联的值进行分组的方式对插入进行批处理。例如，即使主键是一个包含大量站点事件的时间戳，特定site_id的所有事件也都可以被分组并由写入进程插入到一起，这将导致许多只包含少量站点id的颗粒，因此当根据特定的site_id值搜索时，可以跳过许多块。
+
+跳数索引的另一个候选者是高基数表达式，其中任何一个值在数据中都相对稀疏。一个可能的例子是跟踪API请求中的错误代码的可观察性平台。某些错误代码虽然在数据中很少出现，但对搜索来说可能特别重要。error_code列上的set skip索引将允许绕过绝大多数不包含错误的块，从而显著改善针对错误的查询。
+
+最后，关键的最佳实践是测试、测试、再测试。同样，与用于搜索文档的b-树二级索引或倒排索引不同，跳数索引行为是不容易预测的。将它们添加到表中会在数据摄取和查询方面产生很大的成本，这些查询由于各种原因不能从索引中受益。它们应该总是在真实世界的数据类型上进行测试，测试应该包括类型、粒度大小和其他参数的变化。测试通常会暴露仅仅通过思考不能发现的陷阱。
diff --git a/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md b/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md
new file mode 100644
index 00000000000..3d91d75432c
--- /dev/null
+++ b/docs/zh/guides/improving-query-performance/sparse-primary-indexes.md
@@ -0,0 +1,1172 @@
+---
+sidebar_label: Sparse Primary Indexes
+sidebar_position: 20
+---
+
+
+
+# ClickHouse主键索引最佳实践
+
+在本文中，我们将深入研究ClickHouse索引。我们将对此进行详细说明和讨论：
+- ClickHouse的索引与传统的关系数据库有何不同
+- ClickHouse是怎样构建和使用主键稀疏索引的
+- ClickHouse索引的最佳实践
+
+您可以选择在自己的机器上执行本文给出的所有Clickhouse SQL语句和查询。
+如何安装和搭建ClickHouse请查看<a href="https://clickhouse.com/docs/zh/getting-started/" target="_blank">快速上手</a>
+
+:::note
+这篇文章主要关注稀疏索引。
+
+如果想了解<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#table_engine-mergetree-data_skipping-indexes" target="_blank">二级跳数索引</a>，请查看[教程](./skipping-indexes.md). 
+
+:::
+
+
+## 数据集 
+
+在本文中，我们将使用一个匿名的web流量数据集。
+
+- 我们将使用样本数据集中的887万行(事件)的子集。 
+- 未压缩的数据大小为887万个事件和大约700mb。当存储在ClickHouse时，压缩为200mb。
+- 在我们的子集中，每行包含三列，表示在特定时间(EventTime列)单击URL (URL列)的互联网用户(UserID列)。
+
+通过这三个列，我们已经可以制定一些典型的web分析查询，如：
+ 
+- 某个用户点击次数最多的前10个url是什么？
+- 点击某个URL次数最多的前10名用户是谁？
+- 用户点击特定URL的最频繁时间(比如一周中的几天)是什么？
+
+## 测试环境
+
+本文档中给出的所有运行时数据都是在带有Apple M1 Pro芯片和16GB RAM的MacBook Pro上本地运行ClickHouse 22.2.1。
+
+## 全表扫描
+
+为了了解在没有主键的情况下如何对数据集执行查询，我们通过执行以下SQL DDL语句(使用MergeTree表引擎)创建了一个表：    
+
+```sql
+CREATE TABLE hits_NoPrimaryKey
+(
+    `UserID` UInt32,
+    `URL` String,
+    `EventTime` DateTime
+)
+ENGINE = MergeTree
+PRIMARY KEY tuple();
+```
+
+
+
+接下来，使用以下插入SQL将命中数据集的一个子集插入到表中。这个SQL使用<a href="https://clickhouse.com/docs/en/sql-reference/table-functions/url/" target="_blank">URL表函数</a>和<a href="https://clickhouse.com/blog/whats-new-in-clickhouse-22-1/#schema-inference" target="_blank">类型推断</a>从clickhouse.com加载一个数据集的一部分数据：
+
+```sql
+INSERT INTO hits_NoPrimaryKey SELECT
+   intHash32(c11::UInt64) AS UserID,
+   c15 AS URL,
+   c5 AS EventTime
+FROM url('https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz')
+WHERE URL != '';
+```
+结果：
+```response 
+Ok.
+
+0 rows in set. Elapsed: 145.993 sec. Processed 8.87 million rows, 18.40 GB (60.78 thousand rows/s., 126.06 MB/s.)
+``` 
+
+
+ClickHouse客户端输出了执行结果，插入了887万行数据。
+
+
+最后，为了简化本文后面的讨论，并使图表和结果可重现，我们使用FINAL关键字<a href="https://clickhouse.com/docs/en/sql-reference/statements/optimize/" target="_blank">optimize</a>该表：
+
+```sql
+OPTIMIZE TABLE hits_NoPrimaryKey FINAL;
+```
+
+:::note
+一般来说，不需要也不建议在加载数据后立即执行optimize。对于这个示例，为什么需要这样做是很明显的。
+:::
+
+
+现在我们执行第一个web分析查询。以下是用户id为749927693的互联网用户点击次数最多的前10个url：
+
+```sql
+SELECT URL, count(URL) as Count
+FROM hits_NoPrimaryKey
+WHERE UserID = 749927693
+GROUP BY URL
+ORDER BY Count DESC
+LIMIT 10;
+```
+结果：
+```response 
+┌─URL────────────────────────────┬─Count─┐
+│ http://auto.ru/chatay-barana.. │   170 │
+│ http://auto.ru/chatay-id=371...│    52 │
+│ http://public_search           │    45 │
+│ http://kovrik-medvedevushku-...│    36 │
+│ http://forumal                 │    33 │
+│ http://korablitz.ru/L_1OFFER...│    14 │
+│ http://auto.ru/chatay-id=371...│    14 │
+│ http://auto.ru/chatay-john-D...│    13 │
+│ http://auto.ru/chatay-john-D...│    10 │
+│ http://wot/html?page/23600_m...│     9 │
+└────────────────────────────────┴───────┘
+
+10 rows in set. Elapsed: 0.022 sec.
+// highlight-next-line 
+Processed 8.87 million rows, 
+70.45 MB (398.53 million rows/s., 3.17 GB/s.)
+``` 
+
+
+ClickHouse客户端输出表明，ClickHouse执行了一个完整的表扫描！我们的表的887万行中的每一行都被加载到ClickHouse中，这不是可扩展的。
+
+为了使这种(方式)更有效和更快，我们需要使用一个具有适当主键的表。这将允许ClickHouse自动(基于主键的列)创建一个稀疏的主索引，然后可以用于显著加快我们示例查询的执行。
+
+<a name="original-table"></a>
+
+## 包含主键的表
+
+创建一个包含联合主键UserID和URL列的表： 
+
+```sql
+CREATE TABLE hits_UserID_URL
+(
+    `UserID` UInt32,
+    `URL` String,
+    `EventTime` DateTime
+)
+ENGINE = MergeTree
+// highlight-next-line    
+PRIMARY KEY (UserID, URL)
+ORDER BY (UserID, URL, EventTime)
+SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
+```
+
+[//]: # (<details open>)
+<details>
+    <summary><font color="black">
+    DDL详情
+    </font></summary>
+    <p><font color="black">
+
+为了简化本文后面的讨论，并使图和结果可重现，使用DDL语句有如下说明：
+<ul>
+<li>通过ORDER BY子句指定表的复合排序键</li>
+<br/>
+<li>通过设置配置控制主索引有多少索引项：</li>
+<br/>
+<ul>
+<li><font face = "monospace">index_granularity</font>: 显式设置为其默认值8192。这意味着对于每一组8192行，主索引将有一个索引条目，例如，如果表包含16384行，那么索引将有两个索引条目。
+</li>
+<br/>
+<li><font face = "monospace">index_granularity_bytes</font>: 设置为0表示禁止<a href="https://clickhouse.com/docs/en/whats-new/changelog/2019/#experimental-features-1" target="_blank"><font color="blue">字适应索引粒度</font></a>。自适应索引粒度意味着ClickHouse自动为一组n行创建一个索引条目
+<ul>
+<li>如果n小于8192，但n行的合并行数据大小大于或等于10MB (index_granularity_bytes的默认值)或</li>
+<li>n达到8192</li>
+</ul>
+</li>
+</ul>
+</ul>
+</font></p>
+</details>
+
+
+上面DDL语句中的主键会基于两个指定的键列创建主索引。
+
+<br/>
+插入数据：
+
+```sql
+INSERT INTO hits_UserID_URL SELECT
+   intHash32(c11::UInt64) AS UserID,
+   c15 AS URL,
+   c5 AS EventTime
+FROM url('https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz')
+WHERE URL != '';
+```
+结果：
+```response 
+0 rows in set. Elapsed: 149.432 sec. Processed 8.87 million rows, 18.40 GB (59.38 thousand rows/s., 123.16 MB/s.)
+```
+
+
+<br/>
+optimize表：
+
+```sql
+OPTIMIZE TABLE hits_UserID_URL FINAL;
+```
+
+<br/>
+我们可以使用下面的查询来获取关于表的元数据：
+
+```sql
+SELECT
+    part_type,
+    path,
+    formatReadableQuantity(rows) AS rows,
+    formatReadableSize(data_uncompressed_bytes) AS data_uncompressed_bytes,
+    formatReadableSize(data_compressed_bytes) AS data_compressed_bytes,
+    formatReadableSize(primary_key_bytes_in_memory) AS primary_key_bytes_in_memory,
+    marks,
+    formatReadableSize(bytes_on_disk) AS bytes_on_disk
+FROM system.parts
+WHERE (table = 'hits_UserID_URL') AND (active = 1)
+FORMAT Vertical;
+```
+ 
+结果：
+
+```response
+part_type:                   Wide
+path:                        ./store/d9f/d9f36a1a-d2e6-46d4-8fb5-ffe9ad0d5aed/all_1_9_2/
+rows:                        8.87 million
+data_uncompressed_bytes:     733.28 MiB
+data_compressed_bytes:       206.94 MiB
+primary_key_bytes_in_memory: 96.93 KiB
+marks:                       1083
+bytes_on_disk:               207.07 MiB
+
+
+1 rows in set. Elapsed: 0.003 sec.
+```
+
+客户端输出表明：
+ 
+- 表数据以<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-data-storage" target="_blank">wide format</a>存储在一个特定目录，每个列有一个数据文件和mark文件。
+- 表有887万行数据。
+- 未压缩的数据有733.28 MB。
+- 压缩之后的数据有206.94 MB。
+- 有1083个主键索引条目，大小是96.93 KB。
+- 在磁盘上，表的数据、标记文件和主索引文件总共占用207.07 MB。
+
+
+## 针对海量数据规模的索引设计
+
+在传统的关系数据库管理系统中，每个表行包含一个主索引。对于我们的数据集，这将导致主索引——通常是一个<a href="https://en.wikipedia.org/wiki/B%2B_tree" target="_blank">B(+)-Tree</a>的数据结构——包含887万个条目。
+
+这样的索引允许快速定位特定的行，从而提高查找点查和更新的效率。在B(+)-Tree数据结构中搜索一个条目的平均时间复杂度为O(log2n)。对于一个有887万行的表，这意味着需要23步来定位任何索引条目。
+
+这种能力是有代价的:额外的磁盘和内存开销，以及向表中添加新行和向索引中添加条目时更高的插入成本(有时还需要重新平衡B-Tree)。
+
+考虑到与B-Tee索引相关的挑战，ClickHouse中的表引擎使用了一种不同的方法。ClickHouse<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/" target="_blank">MergeTree Engine</a>引擎系列被设计和优化用来处理大量数据。
+
+这些表被设计为每秒接收数百万行插入，并存储非常大(100 pb)的数据量。
+
+数据被<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-data-storage" target="_blank">一批一批的</a>快速写入表中，并在后台应用合并规则。
+
+在ClickHouse中，每个数据部分（data part）都有自己的主索引。当他们被合并时，合并部分的主索引也被合并。
+
+在大规模中情况下，磁盘和内存的效率是非常重要的。因此，不是为每一行创建索引，而是为一组数据行（称为颗粒（granule））构建一个索引条目。
+
+之所以可以使用这种稀疏索引，是因为ClickHouse会按照主键列的顺序将一组行存储在磁盘上。
+
+与直接定位单个行(如基于B-Tree的索引)不同，稀疏主索引允许它快速(通过对索引项进行二分查找)识别可能匹配查询的行组。
+
+然后潜在的匹配行组(颗粒)以并行的方式被加载到ClickHouse引擎中，以便找到匹配的行。
+
+这种索引设计允许主索引很小(它可以而且必须完全适合主内存)，同时仍然显著加快查询执行时间：特别是对于数据分析用例中常见的范围查询。
+
+下面详细说明了ClickHouse是如何构建和使用其稀疏主索引的。在本文后面，我们将讨论如何选择、移除和排序用于构建索引的表列(主键列)的一些最佳实践。
+
+<a name="data-storage"></a>
+
+## 数据按照主键排序存储在磁盘上
+
+上面创建的表有： 
+- 联合<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#primary-keys-and-indexes-in-queries" target="_blank">主键</a> <font face = "monospace">(UserID, URL)</font> 
+- 联合<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#choosing-a-primary-key-that-differs-from-the-sorting-key" target="_blank">排序键</a> <font face = "monospace">(UserID, URL, EventTime)</font>。
+
+:::note
+- 如果我们只指定了排序键，那么主键将隐式定义为排序键。
+
+- 为了提高内存效率，我们显式地指定了一个主键，只包含查询过滤的列。基于主键的主索引被完全加载到主内存中。
+
+- 为了上下文的一致性和最大的压缩比例，我们单独定义了排序键，排序键包含当前表所有的列（和压缩算法有关，一般排序之后又更好的压缩率）。
+
+- 如果同时指定了主键和排序键，则主键必须是排序键的前缀。
+:::
+
+
+插入的行按照主键列(以及排序键的附加EventTime列)的字典序(从小到大)存储在磁盘上。 
+
+:::note
+ClickHouse允许插入具有相同主键列的多行数据。在这种情况下(参见下图中的第1行和第2行)，最终的顺序是由指定的排序键决定的，这里是EventTime列的值。
+:::
+
+
+如下图所示：ClickHouse是<a href="https://clickhouse.com/docs/en/introduction/distinctive-features/#true-column-oriented-dbms" target="_blank">列存数据库</a>。
+- 在磁盘上，每个表都有一个数据文件(*.bin)，该列的所有值都以<a href="https://clickhouse.com/docs/en/introduction/distinctive-features/#data-compression" target="_blank">压缩</a>格式存储，并且
+- 在这个例子中，这887万行按主键列(以及附加的排序键列)的字典升序存储在磁盘上
+  - <font face = "monospace">UserID</font>第一位，
+  - 然后是<font face = "monospace">URL</font>，
+  - 最后是<font face = "monospace">EventTime</font>：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-01.png').default} class="image"/>
+UserID.bin，URL.bin，和EventTime.bin是<font face = "monospace">UserID</font>，<font face = "monospace">URL</font>，和<font face = "monospace">EventTime</font>列的数据文件。
+
+<br/>
+<br/>
+
+
+:::note
+- 因为主键定义了磁盘上行的字典顺序，所以一个表只能有一个主键。
+
+- 我们从0开始对行进行编号，以便与ClickHouse内部行编号方案对齐，该方案也用于记录消息。
+:::
+
+<a name="granules"></a>
+
+## 数据被组织成颗粒以进行并行数据处理
+
+出于数据处理的目的，表的列值在逻辑上被划分为多个颗粒。颗粒是流进ClickHouse进行数据处理的最小的不可分割数据集。这意味着，ClickHouse不是读取单独的行，而是始终读取(以流方式并并行地)整个行组（颗粒）。
+:::note
+列值并不物理地存储在颗粒中，颗粒只是用于查询处理的列值的逻辑组织方式。
+:::
+
+下图显示了如何将表中的887万行(列值)组织成1083个颗粒，这是表的DDL语句包含设置<font face = "monospace">index_granularity</font>(设置为默认值8192)的结果。
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-02.png').default} class="image"/>
+
+第一个(根据磁盘上的物理顺序)8192行(它们的列值)在逻辑上属于颗粒0，然后下一个8192行(它们的列值)属于颗粒1，以此类推。
+
+:::note
+- 最后一个颗粒（1082颗粒）是少于8192行的。
+
+- 我们将主键列(<font face = "monospace">UserID</font>, <font face = "monospace">URL</font>)中的一些列值标记为橙色。
+
+  这些橙色标记的列值是每个颗粒中每个主键列的最小值。这里的例外是最后一个颗粒(上图中的颗粒1082)，最后一个颗粒我们标记的是最大的值。
+
+  正如我们将在下面看到的，这些橙色标记的列值将是表主索引中的条目。
+
+- 我们从0开始对行进行编号，以便与ClickHouse内部行编号方案对齐，该方案也用于记录消息。
+:::
+
+<a name="primary-index"></a>
+
+## 每个颗粒对应主索引的一个条目
+
+主索引是基于上图中显示的颗粒创建的。这个索引是一个未压缩的扁平数组文件(primary.idx)，包含从0开始的所谓的数字索引标记。
+
+下面的图显示了索引存储了每个颗粒的最小主键列值(在上面的图中用橙色标记的值)。
+例如：
+- 第一个索引条目(下图中的“mark 0”)存储上图中颗粒0的主键列的最小值，  
+- 第二个索引条目(下图中的“mark 1”)存储上图中颗粒1的主键列的最小值，以此类推。 
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-03a.png').default} class="image"/>
+
+在我们的表中，索引总共有1083个条目，887万行数据和1083个颗粒: 
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-03b.png').default} class="image"/>
+
+:::note
+- 最后一个索引条目(上图中的“mark 1082”)存储了上图中颗粒1082的主键列的最大值。
+
+- 索引条目(索引标记)不是基于表中的特定行，而是基于颗粒。例如，对于上图中的索引条目‘mark 0’，在我们的表中没有<font face = "monospace">UserID</font>为240.923且<font face = "monospace">URL</font>为“goal://metry=10000467796a411…”的行，相反，对于该表，有一个颗粒0，在该颗粒中，最小<font face = "monospace">UserID</font>值是240.923，最小<font face = "monospace">URL</font>值是“goal://metry=10000467796a411…”，这两个值来自不同的行。
+
+- 主索引文件完全加载到主内存中。如果文件大于可用的空闲内存空间，则ClickHouse将发生错误。 
+:::
+
+
+主键条目称为索引标记，因为每个索引条目都标志着特定数据范围的开始。对于示例表:
+- UserID index marks:<br/>
+  主索引中存储的<font face = "monospace">UserID</font>值按升序排序。<br/>
+  上图中的‘mark 1’指示颗粒1中所有表行的UserID值，以及随后所有颗粒中的<font face = "monospace">UserID</font>值，都保证大于或等于4.073.710。
+ 
+ [正如我们稍后将看到的](#query-on-userid-fast), 当查询对主键的第一列进行过滤时，此全局有序使ClickHouse能够对第一个键列的索引标记使用二分查找算法。
+
+- URL index marks:<br/> 
+  主键列<font face = "monospace">UserID</font>和<font face = "monospace">URL</font>有相同的基数，这意味着第一列之后的所有主键列的索引标记通常只表示每个颗粒的数据范围。<br/> 
+  例如，‘mark 0’中的<font face = "monospace">URL</font>列所有的值都大于等于<font face = "monospace">goal://metry=10000467796a411...</font>， 然后颗粒1中的<font face = "monospace">URL</font>并不是如此，这是因为‘mark 1‘与‘mark 0‘具有不同的<font face = "monospace">UserID</font>列值。
+
+  稍后我们将更详细地讨论这对查询执行性能的影响。
+
+## 主索引被用来选择颗粒
+
+现在，我们可以在主索引的支持下执行查询。
+
+<a name="query-on-userid"></a>
+下面计算UserID 749927693点击次数最多的10个url。
+
+```sql
+SELECT URL, count(URL) AS Count
+FROM hits_UserID_URL
+WHERE UserID = 749927693
+GROUP BY URL
+ORDER BY Count DESC
+LIMIT 10;
+```
+ 
+结果：
+<a name="query-on-userid-fast"></a>
+
+```response
+┌─URL────────────────────────────┬─Count─┐
+│ http://auto.ru/chatay-barana.. │   170 │
+│ http://auto.ru/chatay-id=371...│    52 │
+│ http://public_search           │    45 │
+│ http://kovrik-medvedevushku-...│    36 │
+│ http://forumal                 │    33 │
+│ http://korablitz.ru/L_1OFFER...│    14 │
+│ http://auto.ru/chatay-id=371...│    14 │
+│ http://auto.ru/chatay-john-D...│    13 │
+│ http://auto.ru/chatay-john-D...│    10 │
+│ http://wot/html?page/23600_m...│     9 │
+└────────────────────────────────┴───────┘
+
+10 rows in set. Elapsed: 0.005 sec.
+// highlight-next-line  
+Processed 8.19 thousand rows, 
+740.18 KB (1.53 million rows/s., 138.59 MB/s.)
+```
+
+ClickHouse客户端的输出显示，没有进行全表扫描，只有8.19万行流到ClickHouse。
+
+
+如果<a href="https://clickhouse.com/docs/en/operations/server-configuration-parameters/settings/#server_configuration_parameters-logger" target="_blank">trace logging</a>打开了，那ClickHouse服务端日志会显示ClickHouse正在对1083个UserID索引标记执行<a href="https://github.com/ClickHouse/ClickHouse/blob/22.3/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp#L1452" target="_blank">二分查找</a>以便识别可能包含UserID列值为749927693的行的颗粒。这需要19个步骤，平均时间复杂度为<font face = "monospace">O(log2 n)</font>：
+```response
+...Executor): Key condition: (column 0 in [749927693, 749927693])
+// highlight-next-line 
+...Executor): Running binary search on index range for part all_1_9_2 (1083 marks)
+...Executor): Found (LEFT) boundary mark: 176
+...Executor): Found (RIGHT) boundary mark: 177
+...Executor): Found continuous range in 19 steps
+...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
+// highlight-next-line  
+              1/1083 marks by primary key, 1 marks to read from 1 ranges
+...Reading ...approx. 8192 rows starting from 1441792
+```
+
+
+我们可以在上面的跟踪日志中看到，1083个现有标记中有一个满足查询。
+
+<details>
+    <summary><font color="black">
+    Trace Log详情
+    </font></summary>
+    <p><font color="black">
+
+Mark 176 was identified (the 'found left boundary mark' is inclusive, the 'found right boundary mark' is exclusive), and therefore all 8192 rows from granule 176 (which starts at row 1.441.792 - we will see that later on in this article) are then streamed into ClickHouse in order to find the actual rows with a UserID column value of <font face = "monospace">749927693</font>. 
+</font></p>
+</details>
+
+我们也可以通过使用<a href="https://clickhouse.com/docs/en/sql-reference/statements/explain/" target="_blank">EXPLAIN</a>来重现这个结果：
+```sql
+EXPLAIN indexes = 1
+SELECT URL, count(URL) AS Count
+FROM hits_UserID_URL
+WHERE UserID = 749927693
+GROUP BY URL
+ORDER BY Count DESC
+LIMIT 10;
+```
+ 
+结果如下：
+
+```response
+┌─explain───────────────────────────────────────────────────────────────────────────────┐
+│ Expression (Projection)                                                               │
+│   Limit (preliminary LIMIT (without OFFSET))                                          │
+│     Sorting (Sorting for ORDER BY)                                                    │
+│       Expression (Before ORDER BY)                                                    │
+│         Aggregating                                                                   │
+│           Expression (Before GROUP BY)                                                │
+│             Filter (WHERE)                                                            │
+│               SettingQuotaAndLimits (Set limits and quota after reading from storage) │
+│                 ReadFromMergeTree                                                     │
+│                 Indexes:                                                              │
+│                   PrimaryKey                                                          │
+│                     Keys:                                                             │
+│                       UserID                                                          │
+│                     Condition: (UserID in [749927693, 749927693])                     │
+│                     Parts: 1/1                                                        │
+// highlight-next-line
+│                     Granules: 1/1083                                                  │
+└───────────────────────────────────────────────────────────────────────────────────────┘
+
+16 rows in set. Elapsed: 0.003 sec.
+```
+客户端输出显示，在1083个颗粒中选择了一个可能包含UserID列值为749927693的行。
+
+
+:::note Conclusion
+当查询对联合主键的一部分并且是第一个主键进行过滤时，ClickHouse将主键索引标记运行二分查找算法。
+:::
+
+<br/>
+
+
+正如上面所讨论的，ClickHouse使用它的稀疏主索引来快速(通过二分查找算法)选择可能包含匹配查询的行的颗粒。
+
+这是ClickHouse查询执行的**第一阶段(颗粒选择)**。
+
+在**第二阶段(数据读取中)**, ClickHouse定位所选的颗粒，以便将它们的所有行流到ClickHouse引擎中，以便找到实际匹配查询的行。
+
+我们将在下一节更详细地讨论第二阶段。  
+
+<a name="mark-files"></a>
+
+## 标记文件用来定位颗粒
+
+下图描述了上表主索引文件的一部分。 
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-04.png').default} class="image"/>
+
+如上所述，通过对索引的1083个UserID标记进行二分搜索，确定了第176个标记。因此，它对应的颗粒176可能包含UserID列值为749.927.693的行。
+
+<details>
+    <summary><font color="black">
+    颗粒选择的具体过程
+    </font></summary>
+    <p><font color="black">
+
+上图显示，标记176是第一个UserID值小于749.927.693的索引条目，并且下一个标记(标记177)的颗粒177的最小UserID值大于该值的索引条目。因此，只有标记176对应的颗粒176可能包含UserID列值为749.927.693的行。
+</font></p>
+</details>
+
+为了确认(或排除)颗粒176中的某些行包含UserID列值为749.927.693，需要将属于此颗粒的所有8192行读取到ClickHouse。
+
+为了读取这部分数据，ClickHouse需要知道颗粒176的物理地址。
+
+在ClickHouse中，我们表的所有颗粒的物理位置都存储在标记文件中。与数据文件类似，每个表的列有一个标记文件。
+
+下图显示了三个标记文件UserID.mrk、URL.mrk、EventTime.mrk，为表的UserID、URL和EventTime列存储颗粒的物理位置。
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-05.png').default} class="image"/>
+
+我们已经讨论了主索引是一个扁平的未压缩数组文件(primary.idx)，其中包含从0开始编号的索引标记。
+
+类似地，标记文件也是一个扁平的未压缩数组文件(*.mrk)，其中包含从0开始编号的标记。
+
+一旦ClickHouse确定并选择了可能包含查询所需的匹配行的颗粒的索引标记，就可以在标记文件数组中查找，以获得颗粒的物理位置。
+
+每个特定列的标记文件条目以偏移量的形式存储两个位置: 
+
+- 第一个偏移量(上图中的'block_offset')是在包含所选颗粒的压缩版本的压缩列数据文件中定位块。这个压缩块可能包含几个压缩的颗粒。所定位的压缩文件块在读取时被解压到内存中。 
+
+- 标记文件的第二个偏移量(上图中的“granule_offset”)提供了颗粒在解压数据块中的位置。
+
+定位到的颗粒中的所有8192行数据都会被ClickHouse加载然后进一步处理。
+
+
+:::note 为什么需要mark文件
+
+为什么主索引不直接包含与索引标记相对应的颗粒的物理位置？
+
+因为ClickHouse设计的场景就是超大规模数据，非常高效地使用磁盘和内存非常重要。
+
+主索引文件需要放入内存中。
+
+对于我们的示例查询，ClickHouse使用了主索引，并选择了可能包含与查询匹配的行的单个颗粒。只有对于这一个颗粒，ClickHouse才需定位物理位置，以便将相应的行组读取以进一步的处理。
+
+而且，只有UserID和URL列需要这个偏移量信息。
+
+对于查询中不使用的列，例如EventTime，不需要偏移量信息。
+
+对于我们的示例查询，Clickhouse只需要UserID数据文件(UserID.bin)中176颗粒的两个物理位置偏移，以及URL数据文件(URL.data)中176颗粒的两个物理位置偏移。
+
+由mark文件提供的间接方法避免了直接在主索引中存储所有三个列的所有1083个颗粒的物理位置的条目：因此避免了在主内存中有不必要的(可能未使用的)数据。
+
+:::
+
+下面的图表和文本说明了我们的查询示例，ClickHouse如何在UserID.bin数据文件中定位176颗粒。
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-06.png').default} class="image"/>
+
+我们在本文前面讨论过，ClickHouse选择了主索引标记176，因此176颗粒可能包含查询所需的匹配行。
+
+ClickHouse现在使用从索引中选择的标记号(176)在UserID.mark中进行位置数组查找，以获得两个偏移量，用于定位颗粒176。
+
+如图所示，第一个偏移量是定位UserID.bin数据文件中的压缩文件块，该数据文件包含颗粒176的压缩数据。
+
+一旦所定位的文件块被解压缩到主内存中，就可以使用标记文件的第二个偏移量在未压缩的数据中定位颗粒176。
+
+ClickHouse需要从UserID.bin数据文件和URL.bin数据文件中定位(读取)颗粒176，以便执行我们的示例查询(UserID为749.927.693的互联网用户点击次数最多的10个url)。
+
+上图显示了ClickHouse如何定位UserID.bin数据文件的颗粒。
+
+同时，ClickHouse对URL.bin数据文件的颗粒176执行相同的操作。这两个不同的颗粒被对齐并加载到ClickHouse引擎以进行进一步的处理，即聚合并计算UserID为749.927.693的所有行的每组URL值，最后以计数降序输出10个最大的URL组。
+
+
+<a name="filtering-on-key-columns-after-the-first"></a>
+
+## 查询使用第二位主键的性能问题
+
+
+当查询对复合键的一部分并且是第一个主键列进行过滤时，ClickHouse将对主键列的索引标记运行二分查找。
+
+但是，当查询对联合主键的一部分但不是第一个键列进行过滤时，会发生什么情况？
+
+:::note
+我们讨论了这样一种场景:查询不是显式地对第一个主键列进行过滤，而是对第一个主键列之后的任何键列进行过滤。
+
+当查询同时对第一个主键列和第一个主键列之后的任何键列进行过滤时，ClickHouse将对第一个主键列的索引标记运行二分查找。
+:::
+
+<br/>
+<br/>
+
+<a name="query-on-url"></a>
+我们使用一个查询来计算最点击"http://public_search"的最多的前10名用户：
+
+```sql
+SELECT UserID, count(UserID) AS Count
+FROM hits_UserID_URL
+WHERE URL = 'http://public_search'
+GROUP BY UserID
+ORDER BY Count DESC
+LIMIT 10;
+```
+
+结果是： <a name="query-on-url-slow"></a>
+```response 
+┌─────UserID─┬─Count─┐
+│ 2459550954 │  3741 │
+│ 1084649151 │  2484 │
+│  723361875 │   729 │
+│ 3087145896 │   695 │
+│ 2754931092 │   672 │
+│ 1509037307 │   582 │
+│ 3085460200 │   573 │
+│ 2454360090 │   556 │
+│ 3884990840 │   539 │
+│  765730816 │   536 │
+└────────────┴───────┘
+
+10 rows in set. Elapsed: 0.086 sec.
+// highlight-next-line  
+Processed 8.81 million rows, 
+799.69 MB (102.11 million rows/s., 9.27 GB/s.)
+``` 
+
+客户端输出表明，尽管URL列是联合主键的一部分，ClickHouse几乎执行了一一次全表扫描！ClickHouse从表的887万行中读取881万行。
+
+如果启用了trace日志，那么ClickHouse服务日志文件显示，ClickHouse在1083个URL索引标记上使用了通用的排除搜索，以便识别那些可能包含URL列值为"http://public_search"的行。
+```response 
+...Executor): Key condition: (column 1 in ['http://public_search', 
+                                           'http://public_search'])
+// highlight-next-line 
+...Executor): Used generic exclusion search over index for part all_1_9_2 
+              with 1537 steps
+...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
+// highlight-next-line 
+              1076/1083 marks by primary key, 1076 marks to read from 5 ranges
+...Executor): Reading approx. 8814592 rows with 10 streams
+``` 
+我们可以在上面的跟踪日志示例中看到，1083个颗粒中有1076个(通过标记)被选中，因为可能包含具有匹配URL值的行。  
+
+这将导致881万行被读取到ClickHouse引擎中(通过使用10个流并行地读取)，以便识别实际包含URL值"http://public_search"的行。
+
+然而，[稍后](#query-on-url-fast)仅仅39个颗粒包含匹配的行。
+
+虽然基于联合主键(UserID, URL)的主索引对于加快过滤具有特定UserID值的行的查询非常有用，但对于过滤具有特定URL值的行的查询，索引并没有提供显著的帮助。
+
+原因是URL列不是第一个主键列，因此ClickHouse是使用一个通用的排除搜索算法(而不是二分查找)查找URL列的索引标志，和UserID主键列不同，它的算法的有效性依赖于URL列的基数。
+
+为了说明，我们给出通用的排除搜索算法的工作原理：
+
+<details open>
+    <summary><font color="black">
+    <a name="generic-exclusion-search-algorithm"></a>通用排除搜索算法 
+    </font></summary>
+    <p><font color="black">
+
+
+
+
+下面将演示当通过第一个列之后的任何列选择颗粒时，当前一个键列具有或高或低的基数时，ClickHouse<a href="https://github.com/ClickHouse/ClickHouse/blob/22.3/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp#L14444" target="_blank" ><font color="blue">通用排除搜索算法</font></a> 是如何工作的。
+
+作为这两种情况的例子，我们将假设：
+- 搜索URL值为"W3"的行。
+- 点击表抽象简化为只有简单值的UserID和UserID。
+- 相同联合主键(UserID、URL)。这意味着行首先按UserID值排序，具有相同UserID值的行然后再按URL排序。
+- 颗粒大小为2，即每个颗粒包含两行。
+
+在下面的图表中，我们用橙色标注了每个颗粒的最小键列值。
+
+**前缀主键低基数**<a name="generic-exclusion-search-fast"></a>
+
+假设UserID具有较低的基数。在这种情况下，相同的UserID值很可能分布在多个表行和颗粒上，从而分布在索引标记上。对于具有相同UserID的索引标记，索引标记的URL值按升序排序(因为表行首先按UserID排序，然后按URL排序)。这使得有效的过滤如下所述：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-07.png').default} class="image"/>
+
+在上图中，我们的抽象样本数据的颗粒选择过程有三种不同的场景:
+
+
+1. 如果索引标记0的(最小)URL值小于W3，并且紧接索引标记的URL值也小于W3，则可以排除索引标记0，因为标记0、标记1和标记2具有相同的UserID值。注意，这个排除前提条件确保颗粒0和下一个颗粒1完全由U1 UserID值组成，这样ClickHouse就可以假设颗粒0中的最大URL值也小于W3并排除该颗粒。
+
+2. 如果索引标记1的URL值小于(或等于)W3，并且后续索引标记的URL值大于(或等于)W3，则选择索引标记1，因为这意味着粒度1可能包含URL为W3的行)。
+
+3. 可以排除URL值大于W3的索引标记2和3，因为主索引的索引标记存储了每个颗粒的最小键列值，因此颗粒2和3不可能包含URL值W3。
+
+ 
+
+**前缀主键高基数**<a name="generic-exclusion-search-slow"></a>
+
+当UserID具有较高的基数时，相同的UserID值不太可能分布在多个表行和颗粒上。这意味着索引标记的URL值不是单调递增的：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-08.png').default} class="image"/>
+
+
+正如在上面的图表中所看到的，所有URL值小于W3的标记都被选中，以便将其关联的颗粒的行加载到ClickHouse引擎中。
+
+这是因为虽然图中的所有索引标记都属于上面描述的场景1，但它们不满足前面提到的排除前提条件，即两个直接随后的索引标记都具有与当前标记相同的UserID值，因此不能被排除。
+
+例如，考虑索引标记0，其URL值小于W3，并且其直接后续索引标记的URL值也小于W3。这不能排除，因为两个直接随后的索引标记1和2与当前标记0没有相同的UserID值。
+
+请注意，随后的两个索引标记需要具有相同的UserID值。这确保了当前和下一个标记的颗粒完全由U1 UserID值组成。如果仅仅是下一个标记具有相同的UserID，那么下一个标记的URL值可能来自具有不同UserID的表行——当您查看上面的图表时，确实是这样的情况，即W2来自U2而不是U1的行。
+
+这最终阻止了ClickHouse对颗粒0中的最大URL值进行假设。相反，它必须假设颗粒0可能包含URL值为W3的行，并被迫选择标记0。
+
+<br/>
+同样的情况也适用于标记1、2和3。
+
+</font></p>
+</details>
+
+:::note 结论
+当查询对联合主键的一部分列(但不是第一个键列)进行过滤时，ClickHouse使用的通用排除搜索算法(而不是二分查找)在前一个键列基数较低时最有效。
+:::
+
+在我们的示例数据集中，两个键列(UserID、URL)都具有类似的高基数，并且，如前所述，当URL列的前一个键列具有较高基数时，通用排除搜索算法不是很有效。
+
+:::note 看下跳数索引
+因为UserID和URL具有较高的基数，[<font color="blue">根据URL过滤数据</font>](#query-on-url)不是特别有效，对URL列创建[<font color="blue">二级跳数索引</font>](./skipping-indexes.md)同样也不会有太多改善。
+
+例如，这两个语句在我们的表的URL列上创建并填充一个<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#primary-keys-and-indexes-in-queries" target="_blank"><font color="blue">minmax</font></a>跳数索引。
+```sql
+ALTER TABLE hits_UserID_URL ADD INDEX url_skipping_index URL TYPE minmax GRANULARITY 4;
+ALTER TABLE hits_UserID_URL MATERIALIZE INDEX url_skipping_index;
+```
+ClickHouse现在创建了一个额外的索引来存储—每组4个连续的颗粒(注意上面ALTER TABLE语句中的GRANULARITY 4子句)—最小和最大的URL值：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-13a.png').default} class="image"/>
+
+第一个索引条目(上图中的mark 0)存储属于表的前4个颗粒的行的最小和最大URL值。
+
+第二个索引条目(mark 1)存储属于表中下一个4个颗粒的行的最小和最大URL值，依此类推。
+
+(ClickHouse还为跳数索引创建了一个特殊的标记文件，用于定位与索引标记相关联的颗粒组。)
+
+由于UserID和URL的基数相似，在执行对URL的查询过滤时，这个二级跳数索引不能帮助排除选择的颗粒。
+
+正在寻找的特定URL值('http://public_search')很可能是索引为每组颗粒存储的最小值和最大值之间的值，导致ClickHouse被迫选择这组颗粒(因为它们可能包含匹配查询的行)。
+
+
+
+
+:::
+
+
+因此，如果我们想显著提高过滤具有特定URL的行的示例查询的速度，那么我们需要使用针对该查询优化的主索引。
+
+此外，如果我们想保持过滤具有特定UserID的行的示例查询的良好性能，那么我们需要使用多个主索引。
+
+下面是实现这一目标的方法。
+
+<a name="multiple-primary-indexes"></a>
+
+## 使用多个主键索引进行调优
+
+
+如果我们想显著加快我们的两个示例查询——一个过滤具有特定UserID的行，一个过滤具有特定URL的行——那么我们需要使用多个主索引，通过使用这三个方法中的一个：
+
+- 新建一个不同主键的新表。
+- 创建一个雾化视图。
+- 增加projection。
+
+这三个方法都会有效地将示例数据复制到另一个表中，以便重新组织表的主索引和行排序顺序。
+
+然而，这三个选项的不同之处在于，附加表对于查询和插入语句的路由对用户的透明程度。
+
+当创建有不同主键的第二个表时，查询必须显式地发送给最适合查询的表版本，并且必须显式地插入新数据到两个表中，以保持表的同步：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-09a.png').default} class="image"/>
+
+
+在物化视图中，额外的表被隐藏，数据自动在两个表之间保持同步：
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-09b.png').default} class="image"/>
+
+
+projection方式是最透明的选项，因为除了自动保持隐藏的附加表与数据变化同步外，ClickHouse还会自动选择最有效的表版本进行查询：
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-09c.png').default} class="image"/>
+
+下面我们使用真实的例子详细讨论下这三种方式。
+
+<a name="multiple-primary-indexes-via-secondary-tables"></a>
+
+## 通过辅助表使用联合主键索引
+
+<a name="secondary-table"></a>
+我们创建一个新的附加表，其中我们在主键中切换键列的顺序(与原始表相比)：
+
+```sql
+CREATE TABLE hits_URL_UserID
+(
+    `UserID` UInt32,
+    `URL` String,
+    `EventTime` DateTime
+)
+ENGINE = MergeTree
+// highlight-next-line  
+PRIMARY KEY (URL, UserID)
+ORDER BY (URL, UserID, EventTime)
+SETTINGS index_granularity = 8192, index_granularity_bytes = 0;
+```
+
+写入887万行源表数据：
+
+```sql
+INSERT INTO hits_URL_UserID 
+SELECT * from hits_UserID_URL;
+```
+ 
+结果：
+
+```response
+Ok.
+
+0 rows in set. Elapsed: 2.898 sec. Processed 8.87 million rows, 838.84 MB (3.06 million rows/s., 289.46 MB/s.)
+```
+
+最后optimize下：
+```sql
+OPTIMIZE TABLE hits_URL_UserID FINAL;
+```
+
+因为我们切换了主键中列的顺序，插入的行现在以不同的字典顺序存储在磁盘上(与我们的原始表相比)，因此该表的1083个颗粒也包含了与以前不同的值：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-10.png').default} class="image"/>
+
+主键索引如下：
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-11.png').default} class="image"/>
+
+现在计算最频繁点击URL"http://public_search"的前10名用户，这时候的查询速度是明显加快的：
+```sql
+SELECT UserID, count(UserID) AS Count
+// highlight-next-line
+FROM hits_URL_UserID
+WHERE URL = 'http://public_search'
+GROUP BY UserID
+ORDER BY Count DESC
+LIMIT 10;
+```
+ 
+结果：
+<a name="query-on-url-fast"></a>
+
+```response
+┌─────UserID─┬─Count─┐
+│ 2459550954 │  3741 │
+│ 1084649151 │  2484 │
+│  723361875 │   729 │
+│ 3087145896 │   695 │
+│ 2754931092 │   672 │
+│ 1509037307 │   582 │
+│ 3085460200 │   573 │
+│ 2454360090 │   556 │
+│ 3884990840 │   539 │
+│  765730816 │   536 │
+└────────────┴───────┘
+
+10 rows in set. Elapsed: 0.017 sec.
+// highlight-next-line 
+Processed 319.49 thousand rows, 
+11.38 MB (18.41 million rows/s., 655.75 MB/s.)
+```
+
+现在没有全表扫描了，ClickHouse执行高效了很多。
+
+对于原始表中的主索引(其中UserID是第一个键列，URL是第二个键列)，ClickHouse在索引标记上使用了通用排除搜索来执行该查询，但这不是很有效，因为UserID和URL的基数同样很高。
+
+将URL作为主索引的第一列，ClickHouse现在对索引标记运行二分搜索。ClickHouse服务器日志文件中对应的跟踪日志：
+
+```response
+...Executor): Key condition: (column 0 in ['http://public_search', 
+                                           'http://public_search'])
+// highlight-next-line                                           
+...Executor): Running binary search on index range for part all_1_9_2 (1083 marks)
+...Executor): Found (LEFT) boundary mark: 644
+...Executor): Found (RIGHT) boundary mark: 683
+...Executor): Found continuous range in 19 steps
+...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
+// highlight-next-line 
+              39/1083 marks by primary key, 39 marks to read from 1 ranges
+...Executor): Reading approx. 319488 rows with 2 streams
+```
+ClickHouse只选择了39个索引标记，而不是使用通用排除搜索时的1076个。
+
+请注意，辅助表经过了优化，以加快对url的示例查询过滤的执行。
+
+像之前我们查询过滤URL一样，如果我们现在对辅助表查询过滤UserID，性能同样会比较差，因为现在UserID是第二主索引键列，所以ClickHouse将使用通用排除搜索算法查找颗粒，这对于类似高基数的UserID和URL来说不是很有效。
+
+点击下面了解详情：
+<details>
+    <summary><font color="black">
+    对UserID的查询过滤性能较差<a name="query-on-userid-slow"></a>
+    </font></summary>
+    <p><font color="black">
+
+```sql
+SELECT URL, count(URL) AS Count
+FROM hits_URL_UserID
+WHERE UserID = 749927693
+GROUP BY URL
+ORDER BY Count DESC
+LIMIT 10;
+```
+ 
+结果
+
+```response
+┌─URL────────────────────────────┬─Count─┐
+│ http://auto.ru/chatay-barana.. │   170 │
+│ http://auto.ru/chatay-id=371...│    52 │
+│ http://public_search           │    45 │
+│ http://kovrik-medvedevushku-...│    36 │
+│ http://forumal                 │    33 │
+│ http://korablitz.ru/L_1OFFER...│    14 │
+│ http://auto.ru/chatay-id=371...│    14 │
+│ http://auto.ru/chatay-john-D...│    13 │
+│ http://auto.ru/chatay-john-D...│    10 │
+│ http://wot/html?page/23600_m...│     9 │
+└────────────────────────────────┴───────┘
+
+10 rows in set. Elapsed: 0.024 sec.
+// highlight-next-line  
+Processed 8.02 million rows, 
+73.04 MB (340.26 million rows/s., 3.10 GB/s.)
+```
+
+服务端日志：
+```response
+...Executor): Key condition: (column 1 in [749927693, 749927693])
+// highlight-next-line
+...Executor): Used generic exclusion search over index for part all_1_9_2 
+              with 1453 steps
+...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
+// highlight-next-line 
+              980/1083 marks by primary key, 980 marks to read from 23 ranges
+...Executor): Reading approx. 8028160 rows with 10 streams
+```
+</font></p>
+</details>
+
+
+
+现在我们有了两张表。优化了对UserID和URL的查询过滤，分别:
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12a.png').default} class="image"/>
+
+
+
+
+
+
+
+
+
+## 通过物化视图使用联合主键
+
+在原表上创建物化视图：
+```sql
+CREATE MATERIALIZED VIEW mv_hits_URL_UserID
+ENGINE = MergeTree()
+PRIMARY KEY (URL, UserID)
+ORDER BY (URL, UserID, EventTime)
+POPULATE
+AS SELECT * FROM hits_UserID_URL;
+```
+ 
+结果：
+
+```response
+Ok.
+
+0 rows in set. Elapsed: 2.935 sec. Processed 8.87 million rows, 838.84 MB (3.02 million rows/s., 285.84 MB/s.)
+```
+
+:::note
+- 我们在视图的主键中切换键列的顺序(与原始表相比)
+- 雾化视图由一个隐藏表支持，该表的行顺序和主索引基于给定的主键定义
+- 我们使用POPULATE关键字，以便用源表hits_UserID_URL中的所有887万行立即导入新的物化视图 
+- 如果在源表hits_UserID_URL中插入了新行，那么这些行也会自动插入到隐藏表中
+- 实际上，隐式创建的隐藏表的行顺序和主索引与我们上面显式创建的辅助表相同:
+
+
+
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12b-1.png').default} class="image"/>
+
+
+ClickHouse将隐藏表的列数据文件(.bin)、标记文件(.mrk2)和主索引(primary.idx)存储在ClickHouse服务器的数据目录的一个特殊文件夹中：
+
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12b-2.png').default} class="image"/>
+
+:::
+
+
+物化视图背后的隐藏表(和它的主索引)现在可以用来显著加快我们在URL列上查询过滤的执行速度：
+```sql
+SELECT UserID, count(UserID) AS Count
+// highlight-next-line
+FROM mv_hits_URL_UserID
+WHERE URL = 'http://public_search'
+GROUP BY UserID
+ORDER BY Count DESC
+LIMIT 10;
+```
+ 
+结果：
+
+```response
+┌─────UserID─┬─Count─┐
+│ 2459550954 │  3741 │
+│ 1084649151 │  2484 │
+│  723361875 │   729 │
+│ 3087145896 │   695 │
+│ 2754931092 │   672 │
+│ 1509037307 │   582 │
+│ 3085460200 │   573 │
+│ 2454360090 │   556 │
+│ 3884990840 │   539 │
+│  765730816 │   536 │
+└────────────┴───────┘
+
+10 rows in set. Elapsed: 0.026 sec.
+// highlight-next-line 
+Processed 335.87 thousand rows, 
+13.54 MB (12.91 million rows/s., 520.38 MB/s.)
+```
+
+物化视图背后隐藏表(及其主索引)实际上与我们显式创建的辅助表是相同的，所以查询的执行方式与显式创建的表相同。
+
+ClickHouse服务器日志文件中相应的跟踪日志确认了ClickHouse正在对索引标记运行二分搜索：
+
+```response
+...Executor): Key condition: (column 0 in ['http://public_search', 
+                                           'http://public_search'])
+// highlight-next-line
+...Executor): Running binary search on index range ...
+...
+...Executor): Selected 4/4 parts by partition key, 4 parts by primary key,
+// highlight-next-line 
+              41/1083 marks by primary key, 41 marks to read from 4 ranges
+...Executor): Reading approx. 335872 rows with 4 streams
+```
+
+
+
+## 通过projections使用联合主键索引
+
+
+<a href="https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#projections" target="_blank">Projections</a>目前是一个实验性的功能，因此我们需要告诉ClickHouse：
+
+```sql
+SET allow_experimental_projection_optimization = 1;
+```
+
+
+在原表上创建projection：
+```sql
+ALTER TABLE hits_UserID_URL
+    ADD PROJECTION prj_url_userid
+    (
+        SELECT *
+        ORDER BY (URL, UserID)
+    );
+```
+
+雾化projection：
+```sql
+ALTER TABLE hits_UserID_URL
+    MATERIALIZE PROJECTION prj_url_userid;
+```
+
+:::note
+- 该projection正在创建一个隐藏表，该表的行顺序和主索引基于该projection的给定order BY子句
+- 我们使用MATERIALIZE关键字，以便立即用源表hits_UserID_URL的所有887万行导入隐藏表
+- 如果在源表hits_UserID_URL中插入了新行，那么这些行也会自动插入到隐藏表中
+- 查询总是(从语法上)针对源表hits_UserID_URL，但是如果隐藏表的行顺序和主索引允许更有效地执行查询，那么将使用该隐藏表
+- 实际上，隐式创建的隐藏表的行顺序和主索引与我们显式创建的辅助表相同：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12c-1.png').default} class="image"/>
+
+ClickHouse将隐藏表的列数据文件(.bin)、标记文件(.mrk2)和主索引(primary.idx)存储在一个特殊的文件夹中(在下面的截图中用橙色标记)，紧挨着源表的数据文件、标记文件和主索引文件：
+
+<img src={require('../../../en/guides/improving-query-performance/sparse-primary-indexes/images/sparse-primary-indexes-12c-2.png').default} class="image"/>
+:::
+
+由投影创建的隐藏表(以及它的主索引)现在可以(隐式地)用于显著加快URL列上查询过滤的执行。注意，查询在语法上针对投影的源表。
+
+```sql
+SELECT UserID, count(UserID) AS Count
+// highlight-next-line
+FROM hits_UserID_URL
+WHERE URL = 'http://public_search'
+GROUP BY UserID
+ORDER BY Count DESC
+LIMIT 10;
+```
+ 
+结果：
+
+```response
+┌─────UserID─┬─Count─┐
+│ 2459550954 │  3741 │
+│ 1084649151 │  2484 │
+│  723361875 │   729 │
+│ 3087145896 │   695 │
+│ 2754931092 │   672 │
+│ 1509037307 │   582 │
+│ 3085460200 │   573 │
+│ 2454360090 │   556 │
+│ 3884990840 │   539 │
+│  765730816 │   536 │
+└────────────┴───────┘
+
+10 rows in set. Elapsed: 0.029 sec. 
+// highlight-next-line 
+Processed 319.49 thousand rows, 1
+1.38 MB (11.05 million rows/s., 393.58 MB/s.)
+```
+
+因为由投影创建的隐藏表(及其主索引)实际上与我们显式创建的辅助表相同，所以查询的执行方式与显式创建的表相同。
+
+ClickHouse服务器日志文件中跟踪日志确认了ClickHouse正在对索引标记运行二分搜索：
+
+
+```response
+...Executor): Key condition: (column 0 in ['http://public_search', 
+                                           'http://public_search'])
+// highlight-next-line                                           
+...Executor): Running binary search on index range for part prj_url_userid (1083 marks)
+...Executor): ...
+// highlight-next-line
+...Executor): Choose complete Normal projection prj_url_userid
+...Executor): projection required columns: URL, UserID
+...Executor): Selected 1/1 parts by partition key, 1 parts by primary key,
+// highlight-next-line 
+              39/1083 marks by primary key, 39 marks to read from 1 ranges
+...Executor): Reading approx. 319488 rows with 2 streams
+```
+
+
+## 移除无效的主键列
+
+
+带有联合主键(UserID, URL)的表的主索引对于加快UserID的查询过滤非常有用。但是，尽管URL列是联合主键的一部分，但该索引在加速URL查询过滤方面并没有提供显著的帮助。
+
+反之亦然：具有复合主键(URL, UserID)的表的主索引加快了URL上的查询过滤，但没有为UserID上的查询过滤提供太多支持。
+
+由于主键列UserID和URL的基数同样很高，过滤第二个键列的查询不会因为第二个键列位于索引中而受益太多。
+
+因此，从主索引中删除第二个键列(从而减少索引的内存消耗)并使用多个主索引是有意义的。
+
+但是，如果复合主键中的键列在基数上有很大的差异，那么查询按基数升序对主键列进行排序是有益的。
+
+主键键列之间的基数差越大，主键键列的顺序越重要。我们将在以后的文章中对此进行演示。请继续关注。
diff --git a/docs/zh/sql-reference/data-types/datetime64.md b/docs/zh/sql-reference/data-types/datetime64.md
index 571bcffd66e..da637929180 100644
--- a/docs/zh/sql-reference/data-types/datetime64.md
+++ b/docs/zh/sql-reference/data-types/datetime64.md
@@ -19,7 +19,7 @@ DateTime64(precision, [timezone])
 
 在内部，此类型以Int64类型将数据存储为自Linux纪元开始(1970-01-01 00:00:00UTC)的时间刻度数（ticks）。时间刻度的分辨率由precision参数确定。此外，`DateTime64` 类型可以像存储其他数据列一样存储时区信息，时区会影响 `DateTime64` 类型的值如何以文本格式显示，以及如何解析以字符串形式指定的时间数据 (‘2020-01-01 05:00:01.000’)。时区不存储在表的行中（也不在resultset中），而是存储在列的元数据中。详细信息请参考 [DateTime](datetime.md) 数据类型.
 
-值的范围: \[1925-01-01 00:00:00, 2283-11-11 23:59:59.99999999\] (注意: 最大值的精度是8)。
+值的范围: \[1900-01-01 00:00:00, 2299-12-31 23:59:59.99999999\] (注意: 最大值的精度是8)。
 
 ## 示例 {#examples}
 
diff --git a/docs/zh/sql-reference/functions/arithmetic-functions.md b/docs/zh/sql-reference/functions/arithmetic-functions.md
index 15bec0d2107..acba761b619 100644
--- a/docs/zh/sql-reference/functions/arithmetic-functions.md
+++ b/docs/zh/sql-reference/functions/arithmetic-functions.md
@@ -54,7 +54,7 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 ## modulo(a, b), a % b operator {#modulo}
 
 计算除法后的余数。
-如果参数是浮点数，则通过删除小数部分将它们预转换为整数。
+如果两个输入都是整数，结果类型是整数。如果其中一个输入是浮点数，则结果是浮点数。
 其余部分与C++中的含义相同。截断除法用于负数。
 除以零或将最小负数除以-1时抛出异常。
 
diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index f268e9584ce..b9fdc4e21f2 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -263,8 +263,8 @@ SELECT toUnixTimestamp('2017-11-05 08:07:47', 'Asia/Tokyo') AS unix_timestamp
 └────────────────┘
 ```
 
-:::注意    
-下面描述的返回类型 `toStartOf` 函数是 `Date` 或 `DateTime`。尽管这些函数可以将 `DateTime64` 作为参数，但将超出正常范围（1925年-2283年）的 `DateTime64` 传递给它们会给出不正确的结果。
+:::注意
+下面描述的返回类型 `toStartOf` 函数是 `Date` 或 `DateTime`。尽管这些函数可以将 `DateTime64` 作为参数，但将超出正常范围（1900年-2299年）的 `DateTime64` 传递给它们会给出不正确的结果。
 :::
 
 ## toStartOfYear {#tostartofyear}
@@ -1221,4 +1221,4 @@ SELECT fromModifiedJulianDayOrNull(58849);
 └────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
\ No newline at end of file
+[Original article](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/type-conversion-functions.md b/docs/zh/sql-reference/functions/type-conversion-functions.md
index 70d63d6231d..d2330df6cb1 100644
--- a/docs/zh/sql-reference/functions/type-conversion-functions.md
+++ b/docs/zh/sql-reference/functions/type-conversion-functions.md
@@ -424,7 +424,7 @@ parseDateTimeBestEffort(time_string [, time_zone]);
 查询:
 
 ``` sql
-SELECT parseDateTimeBestEffort('12/12/2020 12:12:57')
+SELECT parseDateTimeBestEffort('23/10/2020 12:12:57')
 AS parseDateTimeBestEffort;
 ```
 
@@ -432,7 +432,7 @@ AS parseDateTimeBestEffort;
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2020-12-12 12:12:57 │
+│     2020-10-23 12:12:57 │
 └─────────────────────────┘
 ```
 
@@ -469,7 +469,7 @@ AS parseDateTimeBestEffort
 查询:
 
 ``` sql
-SELECT parseDateTimeBestEffort('2018-12-12 10:12:12')
+SELECT parseDateTimeBestEffort('2018-10-23 10:12:12')
 AS parseDateTimeBestEffort
 ```
 
@@ -477,7 +477,7 @@ AS parseDateTimeBestEffort
 
 ``` text
 ┌─parseDateTimeBestEffort─┐
-│     2018-12-12 10:12:12 │
+│     2018-10-23 10:12:12 │
 └─────────────────────────┘
 ```
 
@@ -512,7 +512,7 @@ SELECT parseDateTimeBestEffort('10 20:19')
 
 ## toLowCardinality {#tolowcardinality}
 
-把输入值转换为[LowCardianlity](../data-types/lowcardinality.md)的相同类型的数据。
+把输入值转换为[LowCardinality](../data-types/lowcardinality.md)的相同类型的数据。
 
 如果要把`LowCardinality`类型的数据转换为其他类型，使用[CAST](#type_conversion_function-cast)函数。比如：`CAST(x as String)`。
 
diff --git a/packages/clickhouse-server.postinstall b/packages/clickhouse-server.postinstall
index 419c13e3daf..ff376b89bd4 100644
--- a/packages/clickhouse-server.postinstall
+++ b/packages/clickhouse-server.postinstall
@@ -26,7 +26,7 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
 
     ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
 
-    if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
+    if [ -x "/bin/systemctl" ] && [ -f /lib/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
         # if old rc.d service present - remove it
         if [ -x "/etc/init.d/clickhouse-server" ] && [ -x "/usr/sbin/update-rc.d" ]; then
             /usr/sbin/update-rc.d clickhouse-server remove
@@ -44,4 +44,16 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
             fi
         fi
     fi
+
+    # /etc/systemd/system/clickhouse-server.service shouldn't be distributed by the package, but it was
+    # here we delete the service file if it was from our package
+    if [ -f /etc/systemd/system/clickhouse-server.service ]; then
+      SHA256=$(sha256sum /etc/systemd/system/clickhouse-server.service | cut -d' ' -f1)
+      for ref_sum in 7769a14773e811a56f67fd70f7960147217f5e68f746010aec96722e24d289bb 22890012047ea84fbfcebd6e291fe2ef2185cbfdd94a0294e13c8bf9959f58f8 b7790ae57156663c723f92e75ac2508453bf0a7b7e8313bb8081da99e5e88cd3 d1dcc1dbe92dab3ae17baa395f36abf1876b4513df272bf021484923e0111eef ac29ddd32a02eb31670bf5f0018c5d8a3cc006ca7ea572dcf717cb42310dcad7 c62d23052532a70115414833b500b266647d3924eb006a6f3eb673ff0d55f8fa b6b200ffb517afc2b9cf9e25ad8a4afdc0dad5a045bddbfb0174f84cc5a959ed; do
+        if [ "$SHA256" = "$ref_sum" ]; then
+          rm /etc/systemd/system/clickhouse-server.service
+          break
+        fi
+      done
+    fi
 fi
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 76799350119..d10a3e9ca14 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -18,7 +18,8 @@ option (ENABLE_CLICKHOUSE_SERVER "Server mode (main mode)" ${ENABLE_CLICKHOUSE_A
 option (ENABLE_CLICKHOUSE_CLIENT "Client mode (interactive tui/shell that connects to the server)"
     ${ENABLE_CLICKHOUSE_ALL})
 
-if (CLICKHOUSE_SPLIT_BINARY)
+if (SPLIT_SHARED_LIBRARIES)
+    # Don't create self-extracting clickhouse for split build
     option (ENABLE_CLICKHOUSE_SELF_EXTRACTING "Self-extracting executable" OFF)
 else ()
     option (ENABLE_CLICKHOUSE_SELF_EXTRACTING "Self-extracting executable" ON)
@@ -48,15 +49,13 @@ option (ENABLE_CLICKHOUSE_OBFUSCATOR "Table data obfuscator (convert real data t
 # https://clickhouse.com/docs/en/operations/utilities/odbc-bridge/
 # TODO Also needs NANODBC.
 if (ENABLE_ODBC AND NOT USE_MUSL)
-    option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver"
-        ${ENABLE_CLICKHOUSE_ALL})
+    option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver" ${ENABLE_CLICKHOUSE_ALL})
 else ()
     option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver" OFF)
 endif ()
 
 if (NOT USE_MUSL)
-    option (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE "HTTP-server working like a proxy to Library dictionary source"
-        ${ENABLE_CLICKHOUSE_ALL})
+    option (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE "HTTP-server working like a proxy to Library dictionary source" ${ENABLE_CLICKHOUSE_ALL})
 endif ()
 
 # https://presentations.clickhouse.com/matemarketing_2020/
@@ -80,12 +79,7 @@ if (NOT ENABLE_NURAFT)
     set(ENABLE_CLICKHOUSE_KEEPER_CONVERTER OFF)
 endif()
 
-if (CLICKHOUSE_SPLIT_BINARY)
-    option(ENABLE_CLICKHOUSE_INSTALL "Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)" OFF)
-else ()
-    option(ENABLE_CLICKHOUSE_INSTALL "Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)"
-        ${ENABLE_CLICKHOUSE_ALL})
-endif ()
+option(ENABLE_CLICKHOUSE_INSTALL "Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)" ${ENABLE_CLICKHOUSE_ALL})
 
 message(STATUS "ClickHouse modes:")
 
@@ -195,6 +189,12 @@ else()
     message(STATUS "ClickHouse disks mode: OFF")
 endif()
 
+if (ENABLE_CLICKHOUSE_SU)
+    message(STATUS "ClickHouse su: ON")
+else()
+    message(STATUS "ClickHouse su: OFF")
+endif()
+
 configure_file (config_tools.h.in ${ConfigIncludePath}/config_tools.h)
 
 macro(clickhouse_target_link_split_lib target name)
@@ -205,10 +205,6 @@ macro(clickhouse_target_link_split_lib target name)
     endif()
 endmacro()
 
-macro(clickhouse_program_link_split_binary name)
-    clickhouse_target_link_split_lib(clickhouse-${name} ${name})
-endmacro()
-
 macro(clickhouse_program_add_library name)
     string(TOUPPER ${name} name_uc)
     string(REPLACE "-" "_" name_uc ${name_uc})
@@ -233,17 +229,8 @@ macro(clickhouse_program_add_library name)
     endif()
 endmacro()
 
-macro(clickhouse_program_add_executable name)
-    if(CLICKHOUSE_SPLIT_BINARY)
-        clickhouse_add_executable(clickhouse-${name} clickhouse-${name}.cpp)
-        clickhouse_program_link_split_binary(${name})
-        install(TARGETS clickhouse-${name} ${CLICKHOUSE_ALL_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    endif()
-endmacro()
-
 macro(clickhouse_program_add name)
     clickhouse_program_add_library(${name})
-    clickhouse_program_add_executable(${name})
 endmacro()
 
 add_subdirectory (server)
@@ -336,206 +323,173 @@ if (CLICKHOUSE_ONE_SHARED)
     install (TARGETS clickhouse-lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT clickhouse)
 endif()
 
-if (CLICKHOUSE_SPLIT_BINARY)
-    set (CLICKHOUSE_ALL_TARGETS
-        clickhouse-server
-        clickhouse-client
-        clickhouse-local
-        clickhouse-benchmark
-        clickhouse-extract-from-config
-        clickhouse-compressor
-        clickhouse-format
-        clickhouse-obfuscator
-        clickhouse-git-import
-        clickhouse-copier
-        clickhouse-static-files-disk-uploader
-        clickhouse-disks)
+clickhouse_add_executable (clickhouse main.cpp)
 
-    if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
-        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-odbc-bridge)
-    endif ()
+if (NOT USE_STATIC_LIBRARIES AND SPLIT_SHARED_LIBRARIES)
+    # Shared split (dev) build: In CI, the server is run with custom LD_LIBRARY_PATH. This makes the harmful env check re-execute the
+    # process in a clean environment but as in CI the containing directory is not included in DT_RUNPATH/DT_RPATH, the server won't come up.
+    target_compile_definitions(clickhouse PRIVATE DISABLE_HARMFUL_ENV_VAR_CHECK)
+endif ()
 
-    if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
-        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-library-bridge)
-    endif ()
+# A library that prevent usage of several functions from libc.
+if (ARCH_AMD64 AND OS_LINUX AND NOT OS_ANDROID)
+    set (HARMFUL_LIB harmful)
+endif ()
 
-    if (ENABLE_CLICKHOUSE_KEEPER)
-        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-keeper)
-    endif ()
+target_link_libraries (clickhouse PRIVATE clickhouse_common_io string_utils ${HARMFUL_LIB})
+target_include_directories (clickhouse PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
-    if (ENABLE_CLICKHOUSE_KEEPER_CONVERTER)
-        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-keeper-converter)
-    endif ()
+if (ENABLE_CLICKHOUSE_SERVER)
+    clickhouse_target_link_split_lib(clickhouse server)
+endif ()
+if (ENABLE_CLICKHOUSE_CLIENT)
+    clickhouse_target_link_split_lib(clickhouse client)
+endif ()
+if (ENABLE_CLICKHOUSE_LOCAL)
+    clickhouse_target_link_split_lib(clickhouse local)
+endif ()
+if (ENABLE_CLICKHOUSE_BENCHMARK)
+    clickhouse_target_link_split_lib(clickhouse benchmark)
+endif ()
+if (ENABLE_CLICKHOUSE_COPIER)
+    clickhouse_target_link_split_lib(clickhouse copier)
+endif ()
+if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
+    clickhouse_target_link_split_lib(clickhouse extract-from-config)
+endif ()
+if (ENABLE_CLICKHOUSE_COMPRESSOR)
+    clickhouse_target_link_split_lib(clickhouse compressor)
+endif ()
+if (ENABLE_CLICKHOUSE_FORMAT)
+    clickhouse_target_link_split_lib(clickhouse format)
+endif ()
+if (ENABLE_CLICKHOUSE_OBFUSCATOR)
+    clickhouse_target_link_split_lib(clickhouse obfuscator)
+endif ()
+if (ENABLE_CLICKHOUSE_GIT_IMPORT)
+    clickhouse_target_link_split_lib(clickhouse git-import)
+endif ()
+if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
+    clickhouse_target_link_split_lib(clickhouse static-files-disk-uploader)
+endif ()
+if (ENABLE_CLICKHOUSE_SU)
+    clickhouse_target_link_split_lib(clickhouse su)
+endif ()
+if (ENABLE_CLICKHOUSE_KEEPER)
+    clickhouse_target_link_split_lib(clickhouse keeper)
+endif()
+if (ENABLE_CLICKHOUSE_KEEPER_CONVERTER)
+    clickhouse_target_link_split_lib(clickhouse keeper-converter)
+endif()
+if (ENABLE_CLICKHOUSE_INSTALL)
+    clickhouse_target_link_split_lib(clickhouse install)
+endif ()
+if (ENABLE_CLICKHOUSE_DISKS)
+    clickhouse_target_link_split_lib(clickhouse disks)
+endif ()
 
-    set_target_properties(${CLICKHOUSE_ALL_TARGETS} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+set (CLICKHOUSE_BUNDLE)
+if (ENABLE_CLICKHOUSE_SELF_EXTRACTING)
+    list(APPEND CLICKHOUSE_BUNDLE self-extracting)
+endif ()
+if (ENABLE_CLICKHOUSE_SERVER)
+    add_custom_target (clickhouse-server ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-server DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-server)
+endif ()
+if (ENABLE_CLICKHOUSE_CLIENT)
+    add_custom_target (clickhouse-client ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-client DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-client" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-client)
+endif ()
+if (ENABLE_CLICKHOUSE_LOCAL)
+    add_custom_target (clickhouse-local ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-local DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-local" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-local)
+endif ()
+if (ENABLE_CLICKHOUSE_BENCHMARK)
+    add_custom_target (clickhouse-benchmark ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-benchmark DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-benchmark" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-benchmark)
+endif ()
+if (ENABLE_CLICKHOUSE_COPIER)
+    add_custom_target (clickhouse-copier ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-copier DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-copier" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-copier)
+endif ()
+if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
+    add_custom_target (clickhouse-extract-from-config ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-extract-from-config DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-extract-from-config)
+endif ()
+if (ENABLE_CLICKHOUSE_COMPRESSOR)
+    add_custom_target (clickhouse-compressor ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-compressor DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-compressor)
+endif ()
+if (ENABLE_CLICKHOUSE_FORMAT)
+    add_custom_target (clickhouse-format ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-format DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-format)
+endif ()
+if (ENABLE_CLICKHOUSE_OBFUSCATOR)
+    add_custom_target (clickhouse-obfuscator ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-obfuscator DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)
+endif ()
+if (ENABLE_CLICKHOUSE_GIT_IMPORT)
+    add_custom_target (clickhouse-git-import ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-git-import DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-git-import" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-git-import)
+endif ()
+if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
+    add_custom_target (clickhouse-static-files-disk-uploader ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-static-files-disk-uploader DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-static-files-disk-uploader" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-static-files-disk-uploader)
+endif ()
+if (ENABLE_CLICKHOUSE_SU)
+    add_custom_target (clickhouse-su ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-su DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-su" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-su)
+endif ()
 
-    add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_ALL_TARGETS})
-    add_custom_target (clickhouse ALL DEPENDS clickhouse-bundle)
-
-    install(PROGRAMS clickhouse-split-helper DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME clickhouse COMPONENT clickhouse)
-else ()
-    clickhouse_add_executable (clickhouse main.cpp)
-
-    # A library that prevent usage of several functions from libc.
-    if (ARCH_AMD64 AND OS_LINUX AND NOT OS_ANDROID)
-        set (HARMFUL_LIB harmful)
-    endif ()
-
-    target_link_libraries (clickhouse PRIVATE clickhouse_common_io string_utils ${HARMFUL_LIB})
-    target_include_directories (clickhouse PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-
-    if (ENABLE_CLICKHOUSE_SERVER)
-        clickhouse_target_link_split_lib(clickhouse server)
-    endif ()
-    if (ENABLE_CLICKHOUSE_CLIENT)
-        clickhouse_target_link_split_lib(clickhouse client)
-    endif ()
-    if (ENABLE_CLICKHOUSE_LOCAL)
-        clickhouse_target_link_split_lib(clickhouse local)
-    endif ()
-    if (ENABLE_CLICKHOUSE_BENCHMARK)
-        clickhouse_target_link_split_lib(clickhouse benchmark)
-    endif ()
-    if (ENABLE_CLICKHOUSE_COPIER)
-        clickhouse_target_link_split_lib(clickhouse copier)
-    endif ()
-    if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
-        clickhouse_target_link_split_lib(clickhouse extract-from-config)
-    endif ()
-    if (ENABLE_CLICKHOUSE_COMPRESSOR)
-        clickhouse_target_link_split_lib(clickhouse compressor)
-    endif ()
-    if (ENABLE_CLICKHOUSE_FORMAT)
-        clickhouse_target_link_split_lib(clickhouse format)
-    endif ()
-    if (ENABLE_CLICKHOUSE_OBFUSCATOR)
-        clickhouse_target_link_split_lib(clickhouse obfuscator)
-    endif ()
-    if (ENABLE_CLICKHOUSE_GIT_IMPORT)
-        clickhouse_target_link_split_lib(clickhouse git-import)
-    endif ()
-    if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
-        clickhouse_target_link_split_lib(clickhouse static-files-disk-uploader)
-    endif ()
-    if (ENABLE_CLICKHOUSE_SU)
-        clickhouse_target_link_split_lib(clickhouse su)
-    endif ()
-    if (ENABLE_CLICKHOUSE_KEEPER)
-        clickhouse_target_link_split_lib(clickhouse keeper)
-    endif()
-    if (ENABLE_CLICKHOUSE_KEEPER_CONVERTER)
-        clickhouse_target_link_split_lib(clickhouse keeper-converter)
-    endif()
-    if (ENABLE_CLICKHOUSE_INSTALL)
-        clickhouse_target_link_split_lib(clickhouse install)
-    endif ()
-    if (ENABLE_CLICKHOUSE_DISKS)
-        clickhouse_target_link_split_lib(clickhouse disks)
-    endif ()
-
-    set (CLICKHOUSE_BUNDLE)
-    if (ENABLE_CLICKHOUSE_SELF_EXTRACTING)
-        list(APPEND CLICKHOUSE_BUNDLE self-extracting)
-    endif ()
-    if (ENABLE_CLICKHOUSE_SERVER)
-        add_custom_target (clickhouse-server ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-server DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-server)
-    endif ()
-    if (ENABLE_CLICKHOUSE_CLIENT)
-        add_custom_target (clickhouse-client ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-client DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-client" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-client)
-    endif ()
-    if (ENABLE_CLICKHOUSE_LOCAL)
-        add_custom_target (clickhouse-local ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-local DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-local" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-local)
-    endif ()
-    if (ENABLE_CLICKHOUSE_BENCHMARK)
-        add_custom_target (clickhouse-benchmark ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-benchmark DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-benchmark" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-benchmark)
-    endif ()
-    if (ENABLE_CLICKHOUSE_COPIER)
-        add_custom_target (clickhouse-copier ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-copier DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-copier" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-copier)
-    endif ()
-    if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
-        add_custom_target (clickhouse-extract-from-config ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-extract-from-config DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-extract-from-config)
-    endif ()
-    if (ENABLE_CLICKHOUSE_COMPRESSOR)
-        add_custom_target (clickhouse-compressor ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-compressor DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-compressor)
-    endif ()
-    if (ENABLE_CLICKHOUSE_FORMAT)
-        add_custom_target (clickhouse-format ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-format DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-format)
-    endif ()
-    if (ENABLE_CLICKHOUSE_OBFUSCATOR)
-        add_custom_target (clickhouse-obfuscator ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-obfuscator DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)
-    endif ()
-    if (ENABLE_CLICKHOUSE_GIT_IMPORT)
-        add_custom_target (clickhouse-git-import ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-git-import DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-git-import" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-git-import)
-    endif ()
-    if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
-        add_custom_target (clickhouse-static-files-disk-uploader ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-static-files-disk-uploader DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-static-files-disk-uploader" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-static-files-disk-uploader)
-    endif ()
-    if (ENABLE_CLICKHOUSE_SU)
-        add_custom_target (clickhouse-su ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-su DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-su" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-su)
-    endif ()
-
-    if (ENABLE_CLICKHOUSE_KEEPER)
-        if (NOT BUILD_STANDALONE_KEEPER AND CREATE_KEEPER_SYMLINK)
-            add_custom_target (clickhouse-keeper ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-keeper DEPENDS clickhouse)
-            install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-keeper" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        endif()
-
-        # otherwise we don't build keeper
-        if (BUILD_STANDALONE_KEEPER OR CREATE_KEEPER_SYMLINK)
-            list(APPEND CLICKHOUSE_BUNDLE clickhouse-keeper)
-        endif()
-    endif ()
-    if (ENABLE_CLICKHOUSE_KEEPER_CONVERTER)
-        add_custom_target (clickhouse-keeper-converter ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-keeper-converter DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-keeper-converter" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-keeper-converter)
-    endif ()
-    if (ENABLE_CLICKHOUSE_DISKS)
-        add_custom_target (clickhouse-disks ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-disks DEPENDS clickhouse)
-        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-disks" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-        list(APPEND CLICKHOUSE_BUNDLE clickhouse-disks)
-    endif ()
-
-    add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_BUNDLE})
-
-    if (USE_GDB_ADD_INDEX)
-        add_custom_command(TARGET clickhouse POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} clickhouse COMMENT "Adding .gdb-index to clickhouse" VERBATIM)
+if (ENABLE_CLICKHOUSE_KEEPER)
+    if (NOT BUILD_STANDALONE_KEEPER AND CREATE_KEEPER_SYMLINK)
+        add_custom_target (clickhouse-keeper ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-keeper DEPENDS clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-keeper" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
     endif()
 
-    if (USE_BINARY_HASH)
-        add_custom_command(TARGET clickhouse POST_BUILD COMMAND ./clickhouse hash-binary > hash && ${OBJCOPY_PATH} --add-section .clickhouse.hash=hash clickhouse COMMENT "Adding section '.clickhouse.hash' to clickhouse binary" VERBATIM)
+    # otherwise we don't build keeper
+    if (BUILD_STANDALONE_KEEPER OR CREATE_KEEPER_SYMLINK)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-keeper)
     endif()
+endif ()
+if (ENABLE_CLICKHOUSE_KEEPER_CONVERTER)
+    add_custom_target (clickhouse-keeper-converter ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-keeper-converter DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-keeper-converter" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-keeper-converter)
+endif ()
+if (ENABLE_CLICKHOUSE_DISKS)
+    add_custom_target (clickhouse-disks ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-disks DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-disks" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE clickhouse-disks)
+endif ()
 
-    if (SPLIT_DEBUG_SYMBOLS)
-        clickhouse_split_debug_symbols(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SPLITTED_DEBUG_SYMBOLS_DIR} BINARY_PATH clickhouse)
-    else()
-        clickhouse_make_empty_debug_info_for_nfpm(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SPLITTED_DEBUG_SYMBOLS_DIR})
-        install (TARGETS clickhouse RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    endif()
+add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_BUNDLE})
+
+if (USE_GDB_ADD_INDEX)
+    add_custom_command(TARGET clickhouse POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} clickhouse COMMENT "Adding .gdb-index to clickhouse" VERBATIM)
+endif()
+
+if (USE_BINARY_HASH)
+    add_custom_command(TARGET clickhouse POST_BUILD COMMAND ./clickhouse hash-binary > hash && ${OBJCOPY_PATH} --add-section .clickhouse.hash=hash clickhouse COMMENT "Adding section '.clickhouse.hash' to clickhouse binary" VERBATIM)
+endif()
+
+if (SPLIT_DEBUG_SYMBOLS)
+    clickhouse_split_debug_symbols(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SPLITTED_DEBUG_SYMBOLS_DIR} BINARY_PATH clickhouse)
+else()
+    clickhouse_make_empty_debug_info_for_nfpm(TARGET clickhouse DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/${SPLITTED_DEBUG_SYMBOLS_DIR})
+    install (TARGETS clickhouse RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
 endif()
 
 if (ENABLE_TESTS)
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 5b77883c7b0..fcfce7bc2a3 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -61,16 +61,17 @@ public:
     Benchmark(unsigned concurrency_, double delay_,
             Strings && hosts_, Ports && ports_, bool round_robin_,
             bool cumulative_, bool secure_, const String & default_database_,
-            const String & user_, const String & password_, const String & stage,
+            const String & user_, const String & password_, const String & quota_key_, const String & stage,
             bool randomize_, size_t max_iterations_, double max_time_,
             const String & json_path_, size_t confidence_,
             const String & query_id_, const String & query_to_execute_, bool continue_on_errors_,
-            bool reconnect_, bool print_stacktrace_, const Settings & settings_)
+            bool reconnect_, bool display_client_side_time_, bool print_stacktrace_, const Settings & settings_)
         :
         round_robin(round_robin_), concurrency(concurrency_), delay(delay_), queue(concurrency), randomize(randomize_),
         cumulative(cumulative_), max_iterations(max_iterations_), max_time(max_time_),
         json_path(json_path_), confidence(confidence_), query_id(query_id_),
         query_to_execute(query_to_execute_), continue_on_errors(continue_on_errors_), reconnect(reconnect_),
+        display_client_side_time(display_client_side_time_),
         print_stacktrace(print_stacktrace_), settings(settings_),
         shared_context(Context::createShared()), global_context(Context::createGlobal(shared_context.get())),
         pool(concurrency)
@@ -90,7 +91,7 @@ public:
             connections.emplace_back(std::make_unique<ConnectionPool>(
                 concurrency,
                 cur_host, cur_port,
-                default_database_, user_, password_,
+                default_database_, user_, password_, quota_key_,
                 /* cluster_= */ "",
                 /* cluster_secret_= */ "",
                 /* client_name_= */ "benchmark",
@@ -166,6 +167,7 @@ private:
     String query_to_execute;
     bool continue_on_errors;
     bool reconnect;
+    bool display_client_side_time;
     bool print_stacktrace;
     const Settings & settings;
     SharedContextHolder shared_context;
@@ -408,8 +410,8 @@ private:
                         true /*check embedded stack trace*/) << std::endl;
 
                     size_t info_index = round_robin ? 0 : connection_index;
-                    comparison_info_per_interval[info_index]->errors++;
-                    comparison_info_total[info_index]->errors++;
+                    ++comparison_info_per_interval[info_index]->errors;
+                    ++comparison_info_total[info_index]->errors;
                 }
             }
             // Count failed queries toward executed, so that we'd reach
@@ -443,7 +445,9 @@ private:
 
         executor.finish();
 
-        double seconds = watch.elapsedSeconds();
+        double seconds = (display_client_side_time || progress.elapsed_ns == 0)
+            ? watch.elapsedSeconds()
+            : progress.elapsed_ns / 1e9;
 
         std::lock_guard lock(mutex);
 
@@ -607,6 +611,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         /// So we copy the results to std::string.
         std::optional<std::string> env_user_str;
         std::optional<std::string> env_password_str;
+        std::optional<std::string> env_quota_key_str;
 
         const char * env_user = getenv("CLICKHOUSE_USER");
         if (env_user != nullptr)
@@ -616,6 +621,10 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         if (env_password != nullptr)
             env_password_str.emplace(std::string(env_password));
 
+        const char * env_quota_key = getenv("CLICKHOUSE_QUOTA_KEY");
+        if (env_quota_key != nullptr)
+            env_quota_key_str.emplace(std::string(env_quota_key));
+
         boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
         desc.add_options()
             ("help",                                                            "produce help message")
@@ -625,21 +634,23 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             ("stage",         value<std::string>()->default_value("complete"),  "request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
             ("iterations,i",  value<size_t>()->default_value(0),                "amount of queries to be executed")
             ("timelimit,t",   value<double>()->default_value(0.),               "stop launch of queries after specified time limit")
-            ("randomize,r",   value<bool>()->default_value(false),              "randomize order of execution")
+            ("randomize,r",                                                     "randomize order of execution")
             ("json",          value<std::string>()->default_value(""),          "write final report to specified file in JSON format")
             ("host,h",        value<Strings>()->multitoken(),                   "list of hosts")
             ("port",          value<Ports>()->multitoken(),                     "list of ports")
-            ("roundrobin",                                                      "Instead of comparing queries for different --host/--port just pick one random --host/--port for every query and send query to it.")
-            ("cumulative",                                                      "prints cumulative data instead of data per interval")
-            ("secure,s",                                                        "Use TLS connection")
+            ("roundrobin",    "Instead of comparing queries for different --host/--port just pick one random --host/--port for every query and send query to it.")
+            ("cumulative",    "prints cumulative data instead of data per interval")
+            ("secure,s",      "Use TLS connection")
             ("user,u",        value<std::string>()->default_value(env_user_str.value_or("default")), "")
             ("password",      value<std::string>()->default_value(env_password_str.value_or("")), "")
-            ("database",      value<std::string>()->default_value("default"),   "")
-            ("stacktrace",                                                      "print stack traces of exceptions")
-            ("confidence",    value<size_t>()->default_value(5), "set the level of confidence for T-test [0=80%, 1=90%, 2=95%, 3=98%, 4=99%, 5=99.5%(default)")
-            ("query_id",      value<std::string>()->default_value(""),         "")
+            ("quota_key",     value<std::string>()->default_value(env_quota_key_str.value_or("")), "")
+            ("database", value<std::string>()->default_value("default"), "")
+            ("stacktrace", "print stack traces of exceptions")
+            ("confidence", value<size_t>()->default_value(5), "set the level of confidence for T-test [0=80%, 1=90%, 2=95%, 3=98%, 4=99%, 5=99.5%(default)")
+            ("query_id", value<std::string>()->default_value(""), "")
             ("continue_on_errors", "continue testing even if a query fails")
             ("reconnect", "establish new connection for every query")
+            ("client-side-time", "display the time including network communication instead of server-side time; note that for server versions before 22.8 we always display client-side time")
         ;
 
         Settings settings;
@@ -682,8 +693,9 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             options["database"].as<std::string>(),
             options["user"].as<std::string>(),
             options["password"].as<std::string>(),
+            options["quota_key"].as<std::string>(),
             options["stage"].as<std::string>(),
-            options["randomize"].as<bool>(),
+            options.count("randomize"),
             options["iterations"].as<size_t>(),
             options["timelimit"].as<double>(),
             options["json"].as<std::string>(),
@@ -692,6 +704,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
             options["query"].as<std::string>(),
             options.count("continue_on_errors"),
             options.count("reconnect"),
+            options.count("client-side-time"),
             print_stacktrace,
             settings);
         return benchmark.run();
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 584806951cf..9b1dbbe221a 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -133,6 +133,7 @@ std::vector<String> Client::loadWarningMessages()
     std::vector<String> messages;
     connection->sendQuery(connection_parameters.timeouts,
                           "SELECT * FROM viewIfPermitted(SELECT message FROM system.warnings ELSE null('message String'))",
+                          {} /* query_parameters */,
                           "" /* query_id */,
                           QueryProcessingStage::Complete,
                           &global_context->getSettingsRef(),
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index f3609902fcb..2e7d81617fa 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -2010,7 +2010,7 @@ UInt64 ClusterCopier::executeQueryOnCluster(
             {
                 connections.emplace_back(std::make_shared<Connection>(
                     node.host_name, node.port, node.default_database,
-                    node.user, node.password, node.cluster, node.cluster_secret,
+                    node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
                     "ClusterCopier", node.compression, node.secure
                 ));
 
diff --git a/programs/diagnostics/internal/platform/database/native.go b/programs/diagnostics/internal/platform/database/native.go
index e512a634fbf..45b9af0349e 100644
--- a/programs/diagnostics/internal/platform/database/native.go
+++ b/programs/diagnostics/internal/platform/database/native.go
@@ -3,6 +3,7 @@ package database
 import (
 	"database/sql"
 	"fmt"
+	"net/url"
 	"strings"
 
 	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
@@ -17,7 +18,7 @@ type ClickhouseNativeClient struct {
 
 func NewNativeClient(host string, port uint16, username string, password string) (*ClickhouseNativeClient, error) {
 	// debug output ?debug=true
-	connection, err := sql.Open("clickhouse", fmt.Sprintf("clickhouse://%s:%s@%s:%d/", username, password, host, port))
+	connection, err := sql.Open("clickhouse", fmt.Sprintf("clickhouse://%s:%s@%s:%d/", url.QueryEscape(username), url.QueryEscape(password), host, port))
 	if err != nil {
 		return &ClickhouseNativeClient{}, err
 	}
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index da133096baf..45c7c9a912e 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -1,6 +1,7 @@
 #include <iostream>
 #include <filesystem>
 #include <boost/program_options.hpp>
+#include <Common/filesystemHelpers.h>
 
 #include <sys/stat.h>
 #include <pwd.h>
@@ -378,10 +379,10 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
             if (fs::exists(symlink_path))
             {
-                bool is_symlink = fs::is_symlink(symlink_path);
+                bool is_symlink = FS::isSymlink(symlink_path);
                 fs::path points_to;
                 if (is_symlink)
-                    points_to = fs::weakly_canonical(fs::read_symlink(symlink_path));
+                    points_to = fs::weakly_canonical(FS::readSymlink(symlink_path));
 
                 if (is_symlink && points_to == main_bin_path)
                 {
diff --git a/programs/keeper-converter/KeeperConverter.cpp b/programs/keeper-converter/KeeperConverter.cpp
index dda84a4d2ae..7d25c1d5017 100644
--- a/programs/keeper-converter/KeeperConverter.cpp
+++ b/programs/keeper-converter/KeeperConverter.cpp
@@ -39,14 +39,19 @@ int mainEntryClickHouseKeeperConverter(int argc, char ** argv)
 
     try
     {
-        DB::KeeperStorage storage(500, "", true);
+        auto keeper_context = std::make_shared<KeeperContext>();
+        keeper_context->digest_enabled = true;
+
+        DB::KeeperStorage storage(/* tick_time_ms */ 500, /* superdigest */ "", keeper_context, /* initialize_system_nodes */ false);
 
         DB::deserializeKeeperStorageFromSnapshotsDir(storage, options["zookeeper-snapshots-dir"].as<std::string>(), logger);
+        storage.initializeSystemNodes();
+
         DB::deserializeLogsAndApplyToStorage(storage, options["zookeeper-logs-dir"].as<std::string>(), logger);
         DB::SnapshotMetadataPtr snapshot_meta = std::make_shared<DB::SnapshotMetadata>(storage.getZXID(), 1, std::make_shared<nuraft::cluster_config>());
         DB::KeeperStorageSnapshot snapshot(&storage, snapshot_meta);
 
-        DB::KeeperSnapshotManager manager(options["output-dir"].as<std::string>(), 1);
+        DB::KeeperSnapshotManager manager(options["output-dir"].as<std::string>(), 1, keeper_context);
         auto snp = manager.serializeSnapshotToBuffer(snapshot);
         auto path = manager.serializeSnapshotBufferToDisk(*snp, storage.getZXID());
         std::cout << "Snapshot serialized to path:" << path << std::endl;
diff --git a/programs/library-bridge/CMakeLists.txt b/programs/library-bridge/CMakeLists.txt
index 2f52652c929..40cabacded4 100644
--- a/programs/library-bridge/CMakeLists.txt
+++ b/programs/library-bridge/CMakeLists.txt
@@ -1,13 +1,13 @@
 include(${ClickHouse_SOURCE_DIR}/cmake/split_debug_symbols.cmake)
 
 set (CLICKHOUSE_LIBRARY_BRIDGE_SOURCES
-    library-bridge.cpp
-    LibraryInterface.cpp
+    ExternalDictionaryLibraryAPI.cpp
+    ExternalDictionaryLibraryHandler.cpp
+    ExternalDictionaryLibraryHandlerFactory.cpp
     LibraryBridge.cpp
-    Handlers.cpp
-    HandlerFactory.cpp
-    SharedLibraryHandler.cpp
-    SharedLibraryHandlerFactory.cpp
+    LibraryBridgeHandlerFactory.cpp
+    LibraryBridgeHandlers.cpp
+    library-bridge.cpp
 )
 
 if (OS_LINUX)
diff --git a/programs/library-bridge/LibraryInterface.cpp b/programs/library-bridge/ExternalDictionaryLibraryAPI.cpp
similarity index 55%
rename from programs/library-bridge/LibraryInterface.cpp
rename to programs/library-bridge/ExternalDictionaryLibraryAPI.cpp
index cae681e901a..70cd6fca375 100644
--- a/programs/library-bridge/LibraryInterface.cpp
+++ b/programs/library-bridge/ExternalDictionaryLibraryAPI.cpp
@@ -1,4 +1,4 @@
-#include "LibraryInterface.h"
+#include "ExternalDictionaryLibraryAPI.h"
 
 #include <Common/logger_useful.h>
 
@@ -7,24 +7,7 @@ namespace
 const char DICT_LOGGER_NAME[] = "LibraryDictionarySourceExternal";
 }
 
-namespace ClickHouseLibrary
-{
-
-std::string_view LIBRARY_CREATE_NEW_FUNC_NAME = "ClickHouseDictionary_v3_libNew";
-std::string_view LIBRARY_CLONE_FUNC_NAME = "ClickHouseDictionary_v3_libClone";
-std::string_view LIBRARY_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_libDelete";
-
-std::string_view LIBRARY_DATA_NEW_FUNC_NAME = "ClickHouseDictionary_v3_dataNew";
-std::string_view LIBRARY_DATA_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_dataDelete";
-
-std::string_view LIBRARY_LOAD_ALL_FUNC_NAME = "ClickHouseDictionary_v3_loadAll";
-std::string_view LIBRARY_LOAD_IDS_FUNC_NAME = "ClickHouseDictionary_v3_loadIds";
-std::string_view LIBRARY_LOAD_KEYS_FUNC_NAME = "ClickHouseDictionary_v3_loadKeys";
-
-std::string_view LIBRARY_IS_MODIFIED_FUNC_NAME = "ClickHouseDictionary_v3_isModified";
-std::string_view LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME = "ClickHouseDictionary_v3_supportsSelectiveLoad";
-
-void log(LogLevel level, CString msg)
+void ExternalDictionaryLibraryAPI::log(LogLevel level, CString msg)
 {
     auto & logger = Poco::Logger::get(DICT_LOGGER_NAME);
     switch (level)
@@ -63,5 +46,3 @@ void log(LogLevel level, CString msg)
             break;
     }
 }
-
-}
diff --git a/programs/library-bridge/ExternalDictionaryLibraryAPI.h b/programs/library-bridge/ExternalDictionaryLibraryAPI.h
new file mode 100644
index 00000000000..04201710edb
--- /dev/null
+++ b/programs/library-bridge/ExternalDictionaryLibraryAPI.h
@@ -0,0 +1,106 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#define CLICKHOUSE_DICTIONARY_LIBRARY_API 1
+
+struct ExternalDictionaryLibraryAPI
+{
+    using CString = const char *;
+    using ColumnName = CString;
+    using ColumnNames = ColumnName[];
+
+    struct CStrings
+    {
+        CString * data = nullptr;
+        uint64_t size = 0;
+    };
+
+    struct VectorUInt64
+    {
+        const uint64_t * data = nullptr;
+        uint64_t size = 0;
+    };
+
+    struct ColumnsUInt64
+    {
+        VectorUInt64 * data = nullptr;
+        uint64_t size = 0;
+    };
+
+    struct Field
+    {
+        const void * data = nullptr;
+        uint64_t size = 0;
+    };
+
+    struct Row
+    {
+        const Field * data = nullptr;
+        uint64_t size = 0;
+    };
+
+    struct Table
+    {
+        const Row * data = nullptr;
+        uint64_t size = 0;
+        uint64_t error_code = 0; // 0 = ok; !0 = error, with message in error_string
+        const char * error_string = nullptr;
+    };
+
+    enum LogLevel
+    {
+        FATAL = 1,
+        CRITICAL,
+        ERROR,
+        WARNING,
+        NOTICE,
+        INFORMATION,
+        DEBUG,
+        TRACE,
+    };
+
+    static void log(LogLevel level, CString msg);
+
+    using LibraryContext = void *;
+    using LibraryLoggerFunc = void (*)(LogLevel, CString /* message */);
+    using LibrarySettings = CStrings *;
+    using LibraryData = void *;
+    using RawClickHouseLibraryTable = void *;
+    /// Can be safely casted into const Table * with static_cast<const ClickHouseLibrary::Table *>
+    using RequestedColumnsNames = CStrings *;
+    using RequestedIds = const VectorUInt64 *;
+    using RequestedKeys = Table *;
+
+    using LibraryNewFunc = LibraryContext (*)(LibrarySettings, LibraryLoggerFunc);
+    static constexpr const char * LIBRARY_CREATE_NEW_FUNC_NAME = "ClickHouseDictionary_v3_libNew";
+
+    using LibraryCloneFunc = LibraryContext (*)(LibraryContext);
+    static constexpr const char * LIBRARY_CLONE_FUNC_NAME = "ClickHouseDictionary_v3_libClone";
+
+    using LibraryDeleteFunc = void (*)(LibraryContext);
+    static constexpr const char * LIBRARY_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_libDelete";
+
+    using LibraryDataNewFunc = LibraryData (*)(LibraryContext);
+    static constexpr const char * LIBRARY_DATA_NEW_FUNC_NAME = "ClickHouseDictionary_v3_dataNew";
+
+    using LibraryDataDeleteFunc = void (*)(LibraryContext, LibraryData);
+    static constexpr const char * LIBRARY_DATA_DELETE_FUNC_NAME = "ClickHouseDictionary_v3_dataDelete";
+
+    using LibraryLoadAllFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames);
+    static constexpr const char * LIBRARY_LOAD_ALL_FUNC_NAME = "ClickHouseDictionary_v3_loadAll";
+
+    using LibraryLoadIdsFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames, RequestedIds);
+    static constexpr const char * LIBRARY_LOAD_IDS_FUNC_NAME = "ClickHouseDictionary_v3_loadIds";
+
+    /// There are no requested column names for load keys func
+    using LibraryLoadKeysFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedKeys);
+    static constexpr const char * LIBRARY_LOAD_KEYS_FUNC_NAME = "ClickHouseDictionary_v3_loadKeys";
+
+    using LibraryIsModifiedFunc = bool (*)(LibraryContext, LibrarySettings);
+    static constexpr const char * LIBRARY_IS_MODIFIED_FUNC_NAME = "ClickHouseDictionary_v3_isModified";
+
+    using LibrarySupportsSelectiveLoadFunc = bool (*)(LibraryContext, LibrarySettings);
+    static constexpr const char * LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME = "ClickHouseDictionary_v3_supportsSelectiveLoad";
+};
diff --git a/programs/library-bridge/ExternalDictionaryLibraryHandler.cpp b/programs/library-bridge/ExternalDictionaryLibraryHandler.cpp
new file mode 100644
index 00000000000..14850da2ebf
--- /dev/null
+++ b/programs/library-bridge/ExternalDictionaryLibraryHandler.cpp
@@ -0,0 +1,214 @@
+#include "ExternalDictionaryLibraryHandler.h"
+
+#include <base/scope_guard.h>
+#include <base/bit_cast.h>
+#include <base/find_symbols.h>
+#include <IO/ReadHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXTERNAL_LIBRARY_ERROR;
+    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
+
+ExternalDictionaryLibraryHandler::ExternalDictionaryLibraryHandler(
+    const std::string & library_path_,
+    const std::vector<std::string> & library_settings,
+    const Block & sample_block_,
+    const std::vector<std::string> & attributes_names_)
+    : library_path(library_path_)
+    , sample_block(sample_block_)
+    , attributes_names(attributes_names_)
+{
+    library = std::make_shared<SharedLibrary>(library_path);
+    settings_holder = std::make_shared<CStringsHolder>(CStringsHolder(library_settings));
+
+    auto lib_new = library->tryGet<ExternalDictionaryLibraryAPI::LibraryNewFunc>(ExternalDictionaryLibraryAPI::LIBRARY_CREATE_NEW_FUNC_NAME);
+
+    if (lib_new)
+        lib_data = lib_new(&settings_holder->strings, ExternalDictionaryLibraryAPI::log);
+    else
+        throw Exception("Method extDict_libNew failed", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+}
+
+
+ExternalDictionaryLibraryHandler::ExternalDictionaryLibraryHandler(const ExternalDictionaryLibraryHandler & other)
+    : library_path{other.library_path}
+    , sample_block{other.sample_block}
+    , attributes_names{other.attributes_names}
+    , library{other.library}
+    , settings_holder{other.settings_holder}
+{
+
+    auto lib_clone = library->tryGet<ExternalDictionaryLibraryAPI::LibraryCloneFunc>(ExternalDictionaryLibraryAPI::LIBRARY_CLONE_FUNC_NAME);
+
+    if (lib_clone)
+    {
+        lib_data = lib_clone(other.lib_data);
+    }
+    else
+    {
+        auto lib_new = library->tryGet<ExternalDictionaryLibraryAPI::LibraryNewFunc>(ExternalDictionaryLibraryAPI::LIBRARY_CREATE_NEW_FUNC_NAME);
+
+        if (lib_new)
+            lib_data = lib_new(&settings_holder->strings, ExternalDictionaryLibraryAPI::log);
+    }
+}
+
+
+ExternalDictionaryLibraryHandler::~ExternalDictionaryLibraryHandler()
+{
+    auto lib_delete = library->tryGet<ExternalDictionaryLibraryAPI::LibraryDeleteFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DELETE_FUNC_NAME);
+
+    if (lib_delete)
+        lib_delete(lib_data);
+}
+
+
+bool ExternalDictionaryLibraryHandler::isModified()
+{
+    auto func_is_modified = library->tryGet<ExternalDictionaryLibraryAPI::LibraryIsModifiedFunc>(ExternalDictionaryLibraryAPI::LIBRARY_IS_MODIFIED_FUNC_NAME);
+
+    if (func_is_modified)
+        return func_is_modified(lib_data, &settings_holder->strings);
+
+    return true;
+}
+
+
+bool ExternalDictionaryLibraryHandler::supportsSelectiveLoad()
+{
+    auto func_supports_selective_load = library->tryGet<ExternalDictionaryLibraryAPI::LibrarySupportsSelectiveLoadFunc>(ExternalDictionaryLibraryAPI::LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME);
+
+    if (func_supports_selective_load)
+        return func_supports_selective_load(lib_data, &settings_holder->strings);
+
+    return true;
+}
+
+
+Block ExternalDictionaryLibraryHandler::loadAll()
+{
+    auto columns_holder = std::make_unique<ExternalDictionaryLibraryAPI::CString[]>(attributes_names.size());
+    ExternalDictionaryLibraryAPI::CStrings columns{static_cast<decltype(ExternalDictionaryLibraryAPI::CStrings::data)>(columns_holder.get()), attributes_names.size()};
+    for (size_t i = 0; i < attributes_names.size(); ++i)
+        columns.data[i] = attributes_names[i].c_str();
+
+    auto load_all_func = library->get<ExternalDictionaryLibraryAPI::LibraryLoadAllFunc>(ExternalDictionaryLibraryAPI::LIBRARY_LOAD_ALL_FUNC_NAME);
+    auto data_new_func = library->get<ExternalDictionaryLibraryAPI::LibraryDataNewFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ExternalDictionaryLibraryAPI::LibraryDataDeleteFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ExternalDictionaryLibraryAPI::LibraryData data_ptr = data_new_func(lib_data);
+    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
+
+    ExternalDictionaryLibraryAPI::RawClickHouseLibraryTable data = load_all_func(data_ptr, &settings_holder->strings, &columns);
+    return dataToBlock(data);
+}
+
+
+Block ExternalDictionaryLibraryHandler::loadIds(const std::vector<uint64_t> & ids)
+{
+    const ExternalDictionaryLibraryAPI::VectorUInt64 ids_data{bit_cast<decltype(ExternalDictionaryLibraryAPI::VectorUInt64::data)>(ids.data()), ids.size()};
+
+    auto columns_holder = std::make_unique<ExternalDictionaryLibraryAPI::CString[]>(attributes_names.size());
+    ExternalDictionaryLibraryAPI::CStrings columns_pass{static_cast<decltype(ExternalDictionaryLibraryAPI::CStrings::data)>(columns_holder.get()), attributes_names.size()};
+
+    auto load_ids_func = library->get<ExternalDictionaryLibraryAPI::LibraryLoadIdsFunc>(ExternalDictionaryLibraryAPI::LIBRARY_LOAD_IDS_FUNC_NAME);
+    auto data_new_func = library->get<ExternalDictionaryLibraryAPI::LibraryDataNewFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ExternalDictionaryLibraryAPI::LibraryDataDeleteFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ExternalDictionaryLibraryAPI::LibraryData data_ptr = data_new_func(lib_data);
+    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
+
+    ExternalDictionaryLibraryAPI::RawClickHouseLibraryTable data = load_ids_func(data_ptr, &settings_holder->strings, &columns_pass, &ids_data);
+    return dataToBlock(data);
+}
+
+
+Block ExternalDictionaryLibraryHandler::loadKeys(const Columns & key_columns)
+{
+    auto holder = std::make_unique<ExternalDictionaryLibraryAPI::Row[]>(key_columns.size());
+    std::vector<std::unique_ptr<ExternalDictionaryLibraryAPI::Field[]>> column_data_holders;
+
+    for (size_t i = 0; i < key_columns.size(); ++i)
+    {
+        auto cell_holder = std::make_unique<ExternalDictionaryLibraryAPI::Field[]>(key_columns[i]->size());
+
+        for (size_t j = 0; j < key_columns[i]->size(); ++j)
+        {
+            auto data_ref = key_columns[i]->getDataAt(j);
+
+            cell_holder[j] = ExternalDictionaryLibraryAPI::Field{
+                    .data = static_cast<const void *>(data_ref.data),
+                    .size = data_ref.size};
+        }
+
+        holder[i] = ExternalDictionaryLibraryAPI::Row{
+                    .data = static_cast<ExternalDictionaryLibraryAPI::Field *>(cell_holder.get()),
+                    .size = key_columns[i]->size()};
+
+        column_data_holders.push_back(std::move(cell_holder));
+    }
+
+    ExternalDictionaryLibraryAPI::Table request_cols{
+            .data = static_cast<ExternalDictionaryLibraryAPI::Row *>(holder.get()),
+            .size = key_columns.size()};
+
+    auto load_keys_func = library->get<ExternalDictionaryLibraryAPI::LibraryLoadKeysFunc>(ExternalDictionaryLibraryAPI::LIBRARY_LOAD_KEYS_FUNC_NAME);
+    auto data_new_func = library->get<ExternalDictionaryLibraryAPI::LibraryDataNewFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ExternalDictionaryLibraryAPI::LibraryDataDeleteFunc>(ExternalDictionaryLibraryAPI::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ExternalDictionaryLibraryAPI::LibraryData data_ptr = data_new_func(lib_data);
+    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
+
+    ExternalDictionaryLibraryAPI::RawClickHouseLibraryTable data = load_keys_func(data_ptr, &settings_holder->strings, &request_cols);
+    return dataToBlock(data);
+}
+
+
+Block ExternalDictionaryLibraryHandler::dataToBlock(ExternalDictionaryLibraryAPI::RawClickHouseLibraryTable data)
+{
+    if (!data)
+        throw Exception("LibraryDictionarySource: No data returned", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+
+    const auto * columns_received = static_cast<const ExternalDictionaryLibraryAPI::Table *>(data);
+    if (columns_received->error_code)
+        throw Exception(
+            "LibraryDictionarySource: Returned error: " + std::to_string(columns_received->error_code) + " " + (columns_received->error_string ? columns_received->error_string : ""),
+            ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+
+    MutableColumns columns = sample_block.cloneEmptyColumns();
+
+    for (size_t col_n = 0; col_n < columns_received->size; ++col_n)
+    {
+        if (columns.size() != columns_received->data[col_n].size)
+            throw Exception(
+                "LibraryDictionarySource: Returned unexpected number of columns: " + std::to_string(columns_received->data[col_n].size) + ", must be " + std::to_string(columns.size()),
+                ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
+
+        for (size_t row_n = 0; row_n < columns_received->data[col_n].size; ++row_n)
+        {
+            const auto & field = columns_received->data[col_n].data[row_n];
+            if (!field.data)
+            {
+                /// sample_block contains null_value (from config) inside corresponding column
+                const auto & col = sample_block.getByPosition(row_n);
+                columns[row_n]->insertFrom(*(col.column), 0);
+            }
+            else
+            {
+                const auto & size = field.size;
+                columns[row_n]->insertData(static_cast<const char *>(field.data), size);
+            }
+        }
+    }
+
+    return sample_block.cloneWithColumns(std::move(columns));
+}
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandler.h b/programs/library-bridge/ExternalDictionaryLibraryHandler.h
similarity index 64%
rename from programs/library-bridge/SharedLibraryHandler.h
rename to programs/library-bridge/ExternalDictionaryLibraryHandler.h
index 633180257b7..7713e9a6830 100644
--- a/programs/library-bridge/SharedLibraryHandler.h
+++ b/programs/library-bridge/ExternalDictionaryLibraryHandler.h
@@ -2,7 +2,7 @@
 
 #include <Common/SharedLibrary.h>
 #include <Common/logger_useful.h>
-#include "LibraryUtils.h"
+#include "ExternalDictionaryLibraryUtils.h"
 
 
 namespace DB
@@ -10,21 +10,21 @@ namespace DB
 
 /// A class that manages all operations with library dictionary.
 /// Every library dictionary source has its own object of this class, accessed by UUID.
-class SharedLibraryHandler
+class ExternalDictionaryLibraryHandler
 {
 
 public:
-    SharedLibraryHandler(
+    ExternalDictionaryLibraryHandler(
         const std::string & library_path_,
         const std::vector<std::string> & library_settings,
         const Block & sample_block_,
         const std::vector<std::string> & attributes_names_);
 
-    SharedLibraryHandler(const SharedLibraryHandler & other);
+    ExternalDictionaryLibraryHandler(const ExternalDictionaryLibraryHandler & other);
 
-    SharedLibraryHandler & operator=(const SharedLibraryHandler & other) = delete;
+    ExternalDictionaryLibraryHandler & operator=(const ExternalDictionaryLibraryHandler & other) = delete;
 
-    ~SharedLibraryHandler();
+    ~ExternalDictionaryLibraryHandler();
 
     Block loadAll();
 
@@ -39,7 +39,7 @@ public:
     const Block & getSampleBlock() { return sample_block; }
 
 private:
-    Block dataToBlock(const ClickHouseLibrary::RawClickHouseLibraryTable data);
+    Block dataToBlock(ExternalDictionaryLibraryAPI::RawClickHouseLibraryTable data);
 
     std::string library_path;
     const Block sample_block;
@@ -50,6 +50,6 @@ private:
     void * lib_data;
 };
 
-using SharedLibraryHandlerPtr = std::shared_ptr<SharedLibraryHandler>;
+using SharedLibraryHandlerPtr = std::shared_ptr<ExternalDictionaryLibraryHandler>;
 
 }
diff --git a/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp b/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp
new file mode 100644
index 00000000000..ffa5ff6f493
--- /dev/null
+++ b/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp
@@ -0,0 +1,62 @@
+#include "ExternalDictionaryLibraryHandlerFactory.h"
+
+
+namespace DB
+{
+
+SharedLibraryHandlerPtr ExternalDictionaryLibraryHandlerFactory::get(const std::string & dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    auto library_handler = library_handlers.find(dictionary_id);
+
+    if (library_handler != library_handlers.end())
+        return library_handler->second;
+
+    return nullptr;
+}
+
+
+void ExternalDictionaryLibraryHandlerFactory::create(
+    const std::string & dictionary_id,
+    const std::string & library_path,
+    const std::vector<std::string> & library_settings,
+    const Block & sample_block,
+    const std::vector<std::string> & attributes_names)
+{
+    std::lock_guard lock(mutex);
+    if (!library_handlers.contains(dictionary_id))
+        library_handlers.emplace(std::make_pair(dictionary_id, std::make_shared<ExternalDictionaryLibraryHandler>(library_path, library_settings, sample_block, attributes_names)));
+    else
+        LOG_WARNING(&Poco::Logger::get("ExternalDictionaryLibraryHandlerFactory"), "Library handler with dictionary id {} already exists", dictionary_id);
+}
+
+
+bool ExternalDictionaryLibraryHandlerFactory::clone(const std::string & from_dictionary_id, const std::string & to_dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    auto from_library_handler = library_handlers.find(from_dictionary_id);
+
+    if (from_library_handler == library_handlers.end())
+        return false;
+
+    /// extDict_libClone method will be called in copy constructor
+    library_handlers[to_dictionary_id] = std::make_shared<ExternalDictionaryLibraryHandler>(*from_library_handler->second);
+    return true;
+}
+
+
+bool ExternalDictionaryLibraryHandlerFactory::remove(const std::string & dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    /// extDict_libDelete is called in destructor.
+    return library_handlers.erase(dictionary_id);
+}
+
+
+ExternalDictionaryLibraryHandlerFactory & ExternalDictionaryLibraryHandlerFactory::instance()
+{
+    static ExternalDictionaryLibraryHandlerFactory instance;
+    return instance;
+}
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandlerFactory.h b/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.h
similarity index 77%
rename from programs/library-bridge/SharedLibraryHandlerFactory.h
rename to programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.h
index 1a6dfb01e34..d821270c474 100644
--- a/programs/library-bridge/SharedLibraryHandlerFactory.h
+++ b/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SharedLibraryHandler.h"
+#include "ExternalDictionaryLibraryHandler.h"
 #include <base/defines.h>
 
 #include <unordered_map>
@@ -11,11 +11,11 @@ namespace DB
 {
 
 /// Each library dictionary source has unique UUID. When clone() method is called, a new UUID is generated.
-/// There is a unique mapping from diciotnary UUID to sharedLibraryHandler.
-class SharedLibraryHandlerFactory final : private boost::noncopyable
+/// There is a unique mapping from dictionary UUID to sharedLibraryHandler.
+class ExternalDictionaryLibraryHandlerFactory final : private boost::noncopyable
 {
 public:
-    static SharedLibraryHandlerFactory & instance();
+    static ExternalDictionaryLibraryHandlerFactory & instance();
 
     SharedLibraryHandlerPtr get(const std::string & dictionary_id);
 
diff --git a/programs/library-bridge/LibraryUtils.h b/programs/library-bridge/ExternalDictionaryLibraryUtils.h
similarity index 67%
rename from programs/library-bridge/LibraryUtils.h
rename to programs/library-bridge/ExternalDictionaryLibraryUtils.h
index b2498df0031..e813efab2a6 100644
--- a/programs/library-bridge/LibraryUtils.h
+++ b/programs/library-bridge/ExternalDictionaryLibraryUtils.h
@@ -5,7 +5,7 @@
 #include <base/bit_cast.h>
 #include <base/range.h>
 
-#include "LibraryInterface.h"
+#include "ExternalDictionaryLibraryAPI.h"
 
 
 namespace DB
@@ -22,7 +22,7 @@ public:
         strings_holder = strings_pass;
         strings.size = strings_holder.size();
 
-        ptr_holder = std::make_unique<ClickHouseLibrary::CString[]>(strings.size);
+        ptr_holder = std::make_unique<ExternalDictionaryLibraryAPI::CString[]>(strings.size);
         strings.data = ptr_holder.get();
 
         size_t i = 0;
@@ -33,10 +33,10 @@ public:
         }
     }
 
-    ClickHouseLibrary::CStrings strings; // will pass pointer to lib
+    ExternalDictionaryLibraryAPI::CStrings strings; // will pass pointer to lib
 
 private:
-    std::unique_ptr<ClickHouseLibrary::CString[]> ptr_holder = nullptr;
+    std::unique_ptr<ExternalDictionaryLibraryAPI::CString[]> ptr_holder = nullptr;
     Container strings_holder;
 };
 
diff --git a/programs/library-bridge/HandlerFactory.cpp b/programs/library-bridge/HandlerFactory.cpp
deleted file mode 100644
index 43087082c46..00000000000
--- a/programs/library-bridge/HandlerFactory.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "HandlerFactory.h"
-
-#include <Poco/Net/HTTPServerRequest.h>
-#include <Server/HTTP/HTMLForm.h>
-#include "Handlers.h"
-
-
-namespace DB
-{
-    std::unique_ptr<HTTPRequestHandler> LibraryBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
-    {
-        Poco::URI uri{request.getURI()};
-        LOG_DEBUG(log, "Request URI: {}", uri.toString());
-
-        if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
-            return std::make_unique<LibraryExistsHandler>(keep_alive_timeout, getContext());
-
-        if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
-            return std::make_unique<LibraryRequestHandler>(keep_alive_timeout, getContext());
-
-        return nullptr;
-    }
-}
diff --git a/programs/library-bridge/HandlerFactory.h b/programs/library-bridge/HandlerFactory.h
deleted file mode 100644
index 381745a0e74..00000000000
--- a/programs/library-bridge/HandlerFactory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <Interpreters/Context.h>
-#include <Server/HTTP/HTTPRequestHandlerFactory.h>
-#include <Common/logger_useful.h>
-
-
-namespace DB
-{
-
-class SharedLibraryHandler;
-using SharedLibraryHandlerPtr = std::shared_ptr<SharedLibraryHandler>;
-
-/// Factory for '/ping', '/' handlers.
-class LibraryBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
-{
-public:
-    LibraryBridgeHandlerFactory(
-            const std::string & name_,
-            size_t keep_alive_timeout_,
-            ContextPtr context_)
-        : WithContext(context_)
-        , log(&Poco::Logger::get(name_))
-        , name(name_)
-        , keep_alive_timeout(keep_alive_timeout_)
-    {
-    }
-
-    std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
-
-private:
-    Poco::Logger * log;
-    std::string name;
-    size_t keep_alive_timeout;
-};
-
-}
diff --git a/programs/library-bridge/LibraryBridge.cpp b/programs/library-bridge/LibraryBridge.cpp
index 2e5d6041151..8a07ca57104 100644
--- a/programs/library-bridge/LibraryBridge.cpp
+++ b/programs/library-bridge/LibraryBridge.cpp
@@ -1,6 +1,5 @@
 #include "LibraryBridge.h"
 
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 int mainEntryClickHouseLibraryBridge(int argc, char ** argv)
 {
     DB::LibraryBridge app;
@@ -15,3 +14,18 @@ int mainEntryClickHouseLibraryBridge(int argc, char ** argv)
         return code ? code : 1;
     }
 }
+
+namespace DB
+{
+
+std::string LibraryBridge::bridgeName() const
+{
+    return "LibraryBridge";
+}
+
+LibraryBridge::HandlerFactoryPtr LibraryBridge::getHandlerFactoryPtr(ContextPtr context) const
+{
+    return std::make_shared<LibraryBridgeHandlerFactory>("LibraryRequestHandlerFactory", keep_alive_timeout, context);
+}
+
+}
diff --git a/programs/library-bridge/LibraryBridge.h b/programs/library-bridge/LibraryBridge.h
index 9f0d0e148c1..04860a042a3 100644
--- a/programs/library-bridge/LibraryBridge.h
+++ b/programs/library-bridge/LibraryBridge.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context.h>
 #include <Bridge/IBridge.h>
-#include "HandlerFactory.h"
+#include "LibraryBridgeHandlerFactory.h"
 
 
 namespace DB
@@ -12,15 +12,8 @@ class LibraryBridge : public IBridge
 {
 
 protected:
-    std::string bridgeName() const override
-    {
-        return "LibraryBridge";
-    }
-
-    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override
-    {
-        return std::make_shared<LibraryBridgeHandlerFactory>("LibraryRequestHandlerFactory-factory", keep_alive_timeout, context);
-    }
+    std::string bridgeName() const override;
+    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override;
 };
 
 }
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
new file mode 100644
index 00000000000..f8f6a23e1be
--- /dev/null
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
@@ -0,0 +1,40 @@
+#include "LibraryBridgeHandlerFactory.h"
+
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Server/HTTP/HTMLForm.h>
+#include "LibraryBridgeHandlers.h"
+
+
+namespace DB
+{
+LibraryBridgeHandlerFactory::LibraryBridgeHandlerFactory(
+    const std::string & name_,
+    size_t keep_alive_timeout_,
+    ContextPtr context_)
+    : WithContext(context_)
+    , log(&Poco::Logger::get(name_))
+    , name(name_)
+    , keep_alive_timeout(keep_alive_timeout_)
+{
+}
+
+std::unique_ptr<HTTPRequestHandler> LibraryBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
+{
+    Poco::URI uri{request.getURI()};
+    LOG_DEBUG(log, "Request URI: {}", uri.toString());
+
+    if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+    {
+        if (uri.getPath() == "/extdict_ping")
+            return std::make_unique<ExternalDictionaryLibraryBridgeExistsHandler>(keep_alive_timeout, getContext());
+    }
+
+    if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+    {
+        if (uri.getPath() == "/extdict_request")
+            return std::make_unique<ExternalDictionaryLibraryBridgeRequestHandler>(keep_alive_timeout, getContext());
+    }
+
+    return nullptr;
+}
+}
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.h b/programs/library-bridge/LibraryBridgeHandlerFactory.h
new file mode 100644
index 00000000000..7565052c4cb
--- /dev/null
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandlerFactory.h>
+#include <Common/logger_useful.h>
+
+
+namespace DB
+{
+
+class LibraryBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
+{
+public:
+    LibraryBridgeHandlerFactory(
+        const std::string & name_,
+        size_t keep_alive_timeout_,
+        ContextPtr context_);
+
+    std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
+
+private:
+    Poco::Logger * log;
+    const std::string name;
+    const size_t keep_alive_timeout;
+};
+
+}
diff --git a/programs/library-bridge/Handlers.cpp b/programs/library-bridge/LibraryBridgeHandlers.cpp
similarity index 74%
rename from programs/library-bridge/Handlers.cpp
rename to programs/library-bridge/LibraryBridgeHandlers.cpp
index 58f9bd0a936..a28148bd1f7 100644
--- a/programs/library-bridge/Handlers.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlers.cpp
@@ -1,10 +1,11 @@
-#include "Handlers.h"
-#include "SharedLibraryHandlerFactory.h"
+#include "LibraryBridgeHandlers.h"
+#include "ExternalDictionaryLibraryHandlerFactory.h"
 
 #include <Formats/FormatFactory.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/Net/HTMLForm.h>
@@ -78,12 +79,39 @@ static void writeData(Block data, OutputFormatPtr format)
     executor.execute();
 }
 
+ExternalDictionaryLibraryBridgeRequestHandler::ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeRequestHandler"))
+    , keep_alive_timeout(keep_alive_timeout_)
+{
+}
 
-void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
+void ExternalDictionaryLibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     LOG_TRACE(log, "Request URI: {}", request.getURI());
     HTMLForm params(getContext()->getSettingsRef(), request);
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            processError(response, "Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != LIBRARY_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        processError(response, "Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
     if (!params.has("method"))
     {
         processError(response, "No 'method' in request URL");
@@ -104,8 +132,8 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
 
     try
     {
-        bool lib_new = (method == "libNew");
-        if (method == "libClone")
+        bool lib_new = (method == "extDict_libNew");
+        if (method == "extDict_libClone")
         {
             if (!params.has("from_dictionary_id"))
             {
@@ -115,7 +143,7 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
 
             std::string from_dictionary_id = params.get("from_dictionary_id");
             bool cloned = false;
-            cloned = SharedLibraryHandlerFactory::instance().clone(from_dictionary_id, dictionary_id);
+            cloned = ExternalDictionaryLibraryHandlerFactory::instance().clone(from_dictionary_id, dictionary_id);
 
             if (cloned)
             {
@@ -123,7 +151,7 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             }
             else
             {
-                LOG_TRACE(log, "Cannot clone from dictionary with id: {}, will call libNew instead", from_dictionary_id);
+                LOG_TRACE(log, "Cannot clone from dictionary with id: {}, will call extDict_libNew instead", from_dictionary_id);
                 lib_new = true;
             }
         }
@@ -138,13 +166,14 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
                 return;
             }
 
+            std::string library_path = params.get("library_path");
+
             if (!params.has("library_settings"))
             {
                 processError(response, "No 'library_settings' in request URL");
                 return;
             }
 
-            std::string library_path = params.get("library_path");
             const auto & settings_string = params.get("library_settings");
 
             LOG_DEBUG(log, "Parsing library settings from binary string");
@@ -197,12 +226,12 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
 
             LOG_DEBUG(log, "Dictionary sample block with null values: {}", sample_block_with_nulls.dumpStructure());
 
-            SharedLibraryHandlerFactory::instance().create(dictionary_id, library_path, library_settings, sample_block_with_nulls, attributes_names);
+            ExternalDictionaryLibraryHandlerFactory::instance().create(dictionary_id, library_path, library_settings, sample_block_with_nulls, attributes_names);
             writeStringBinary("1", out);
         }
-        else if (method == "libDelete")
+        else if (method == "extDict_libDelete")
         {
-            auto deleted = SharedLibraryHandlerFactory::instance().remove(dictionary_id);
+            bool deleted = ExternalDictionaryLibraryHandlerFactory::instance().remove(dictionary_id);
 
             /// Do not throw, a warning is ok.
             if (!deleted)
@@ -210,57 +239,57 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
 
             writeStringBinary("1", out);
         }
-        else if (method == "isModified")
+        else if (method == "extDict_isModified")
         {
-            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
             if (!library_handler)
                 throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER, "Not found dictionary with id: {}", dictionary_id);
 
             bool res = library_handler->isModified();
             writeStringBinary(std::to_string(res), out);
         }
-        else if (method == "supportsSelectiveLoad")
+        else if (method == "extDict_supportsSelectiveLoad")
         {
-            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
             if (!library_handler)
                 throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER, "Not found dictionary with id: {}", dictionary_id);
 
             bool res = library_handler->supportsSelectiveLoad();
             writeStringBinary(std::to_string(res), out);
         }
-        else if (method == "loadAll")
+        else if (method == "extDict_loadAll")
         {
-            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
             if (!library_handler)
                 throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER, "Not found dictionary with id: {}", dictionary_id);
 
             const auto & sample_block = library_handler->getSampleBlock();
-            LOG_DEBUG(log, "Calling loadAll() for dictionary id: {}", dictionary_id);
+            LOG_DEBUG(log, "Calling extDict_loadAll() for dictionary id: {}", dictionary_id);
             auto input = library_handler->loadAll();
 
             LOG_DEBUG(log, "Started sending result data for dictionary id: {}", dictionary_id);
             auto output = FormatFactory::instance().getOutputFormat(FORMAT, out, sample_block, getContext());
             writeData(std::move(input), std::move(output));
         }
-        else if (method == "loadIds")
+        else if (method == "extDict_loadIds")
         {
             LOG_DEBUG(log, "Getting diciontary ids for dictionary with id: {}", dictionary_id);
             String ids_string;
             std::vector<uint64_t> ids = parseIdsFromBinary(request.getStream());
 
-            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
             if (!library_handler)
                 throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER, "Not found dictionary with id: {}", dictionary_id);
 
             const auto & sample_block = library_handler->getSampleBlock();
-            LOG_DEBUG(log, "Calling loadIds() for dictionary id: {}", dictionary_id);
+            LOG_DEBUG(log, "Calling extDict_loadIds() for dictionary id: {}", dictionary_id);
             auto input = library_handler->loadIds(ids);
 
             LOG_DEBUG(log, "Started sending result data for dictionary id: {}", dictionary_id);
             auto output = FormatFactory::instance().getOutputFormat(FORMAT, out, sample_block, getContext());
             writeData(std::move(input), std::move(output));
         }
-        else if (method == "loadKeys")
+        else if (method == "extDict_loadKeys")
         {
             if (!params.has("requested_block_sample"))
             {
@@ -289,18 +318,22 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             Block block;
             executor.pull(block);
 
-            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
             if (!library_handler)
                 throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER, "Not found dictionary with id: {}", dictionary_id);
 
             const auto & sample_block = library_handler->getSampleBlock();
-            LOG_DEBUG(log, "Calling loadKeys() for dictionary id: {}", dictionary_id);
+            LOG_DEBUG(log, "Calling extDict_loadKeys() for dictionary id: {}", dictionary_id);
             auto input = library_handler->loadKeys(block.getColumns());
 
             LOG_DEBUG(log, "Started sending result data for dictionary id: {}", dictionary_id);
             auto output = FormatFactory::instance().getOutputFormat(FORMAT, out, sample_block, getContext());
             writeData(std::move(input), std::move(output));
         }
+        else
+        {
+            LOG_WARNING(log, "Unknown library method: '{}'", method);
+        }
     }
     catch (...)
     {
@@ -329,8 +362,14 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
     }
 }
 
+ExternalDictionaryLibraryBridgeExistsHandler::ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , keep_alive_timeout(keep_alive_timeout_)
+    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeExistsHandler"))
+{
+}
 
-void LibraryExistsHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
+void ExternalDictionaryLibraryBridgeExistsHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     try
     {
@@ -344,15 +383,13 @@ void LibraryExistsHandler::handleRequest(HTTPServerRequest & request, HTTPServer
         }
 
         std::string dictionary_id = params.get("dictionary_id");
-        auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
-        String res;
-        if (library_handler)
-            res = "1";
-        else
-            res = "0";
+
+        auto library_handler = ExternalDictionaryLibraryHandlerFactory::instance().get(dictionary_id);
+
+        String res = library_handler ? "1" : "0";
 
         setResponseDefaultHeaders(response, keep_alive_timeout);
-        LOG_TRACE(log, "Senging ping response: {} (dictionary id: {})", res, dictionary_id);
+        LOG_TRACE(log, "Sending ping response: {} (dictionary id: {})", res, dictionary_id);
         response.sendBuffer(res.data(), res.size());
     }
     catch (...)
diff --git a/programs/library-bridge/Handlers.h b/programs/library-bridge/LibraryBridgeHandlers.h
similarity index 53%
rename from programs/library-bridge/Handlers.h
rename to programs/library-bridge/LibraryBridgeHandlers.h
index 0a342a5d6c7..b20f40616ce 100644
--- a/programs/library-bridge/Handlers.h
+++ b/programs/library-bridge/LibraryBridgeHandlers.h
@@ -3,31 +3,23 @@
 #include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
 #include <Common/logger_useful.h>
-#include "SharedLibraryHandler.h"
+#include "ExternalDictionaryLibraryHandler.h"
 
 
 namespace DB
 {
 
-
 /// Handler for requests to Library Dictionary Source, returns response in RowBinary format.
-/// When a library dictionary source is created, it sends libNew request to library bridge (which is started on first
+/// When a library dictionary source is created, it sends 'extDict_libNew' request to library bridge (which is started on first
 /// request to it, if it was not yet started). On this request a new sharedLibrayHandler is added to a
-/// sharedLibraryHandlerFactory by a dictionary uuid. With libNew request come: library_path, library_settings,
+/// sharedLibraryHandlerFactory by a dictionary uuid. With 'extDict_libNew' request come: library_path, library_settings,
 /// names of dictionary attributes, sample block to parse block of null values, block of null values. Everything is
 /// passed in binary format and is urlencoded. When dictionary is cloned, a new handler is created.
 /// Each handler is unique to dictionary.
-class LibraryRequestHandler : public HTTPRequestHandler, WithContext
+class ExternalDictionaryLibraryBridgeRequestHandler : public HTTPRequestHandler, WithContext
 {
 public:
-
-    LibraryRequestHandler(
-        size_t keep_alive_timeout_, ContextPtr context_)
-        : WithContext(context_)
-        , log(&Poco::Logger::get("LibraryRequestHandler"))
-        , keep_alive_timeout(keep_alive_timeout_)
-    {
-    }
+    ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
@@ -39,22 +31,16 @@ private:
 };
 
 
-class LibraryExistsHandler : public HTTPRequestHandler, WithContext
+class ExternalDictionaryLibraryBridgeExistsHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    explicit LibraryExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
-        : WithContext(context_)
-        , keep_alive_timeout(keep_alive_timeout_)
-        , log(&Poco::Logger::get("LibraryRequestHandler"))
-    {
-    }
+    ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_);
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
 private:
     const size_t keep_alive_timeout;
     Poco::Logger * log;
-
 };
 
 }
diff --git a/programs/library-bridge/LibraryInterface.h b/programs/library-bridge/LibraryInterface.h
deleted file mode 100644
index d23de59bbb1..00000000000
--- a/programs/library-bridge/LibraryInterface.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-#define CLICKHOUSE_DICTIONARY_LIBRARY_API 1
-
-namespace ClickHouseLibrary
-{
-using CString = const char *;
-using ColumnName = CString;
-using ColumnNames = ColumnName[];
-
-struct CStrings
-{
-    CString * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct VectorUInt64
-{
-    const uint64_t * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct ColumnsUInt64
-{
-    VectorUInt64 * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct Field
-{
-    const void * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct Row
-{
-    const Field * data = nullptr;
-    uint64_t size = 0;
-};
-
-struct Table
-{
-    const Row * data = nullptr;
-    uint64_t size = 0;
-    uint64_t error_code = 0; // 0 = ok; !0 = error, with message in error_string
-    const char * error_string = nullptr;
-};
-
-enum LogLevel
-{
-    FATAL = 1,
-    CRITICAL,
-    ERROR,
-    WARNING,
-    NOTICE,
-    INFORMATION,
-    DEBUG,
-    TRACE,
-};
-
-void log(LogLevel level, CString msg);
-
-extern std::string_view LIBRARY_CREATE_NEW_FUNC_NAME;
-extern std::string_view LIBRARY_CLONE_FUNC_NAME;
-extern std::string_view LIBRARY_DELETE_FUNC_NAME;
-
-extern std::string_view LIBRARY_DATA_NEW_FUNC_NAME;
-extern std::string_view LIBRARY_DATA_DELETE_FUNC_NAME;
-
-extern std::string_view LIBRARY_LOAD_ALL_FUNC_NAME;
-extern std::string_view LIBRARY_LOAD_IDS_FUNC_NAME;
-extern std::string_view LIBRARY_LOAD_KEYS_FUNC_NAME;
-
-extern std::string_view LIBRARY_IS_MODIFIED_FUNC_NAME;
-extern std::string_view LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME;
-
-using LibraryContext = void *;
-
-using LibraryLoggerFunc = void (*)(LogLevel, CString /* message */);
-
-using LibrarySettings = CStrings *;
-
-using LibraryNewFunc = LibraryContext (*)(LibrarySettings, LibraryLoggerFunc);
-using LibraryCloneFunc = LibraryContext (*)(LibraryContext);
-using LibraryDeleteFunc = void (*)(LibraryContext);
-
-using LibraryData = void *;
-using LibraryDataNewFunc = LibraryData (*)(LibraryContext);
-using LibraryDataDeleteFunc = void (*)(LibraryContext, LibraryData);
-
-/// Can be safely casted into const Table * with static_cast<const ClickHouseLibrary::Table *>
-using RawClickHouseLibraryTable = void *;
-using RequestedColumnsNames = CStrings *;
-
-using LibraryLoadAllFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames);
-
-using RequestedIds = const VectorUInt64 *;
-using LibraryLoadIdsFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames, RequestedIds);
-
-using RequestedKeys = Table *;
-/// There are no requested column names for load keys func
-using LibraryLoadKeysFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedKeys);
-
-using LibraryIsModifiedFunc = bool (*)(LibraryContext, LibrarySettings);
-using LibrarySupportsSelectiveLoadFunc = bool (*)(LibraryContext, LibrarySettings);
-
-}
diff --git a/programs/library-bridge/SharedLibraryHandler.cpp b/programs/library-bridge/SharedLibraryHandler.cpp
deleted file mode 100644
index cfdba2c9eb8..00000000000
--- a/programs/library-bridge/SharedLibraryHandler.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-#include "SharedLibraryHandler.h"
-
-#include <base/scope_guard.h>
-#include <base/bit_cast.h>
-#include <base/find_symbols.h>
-#include <IO/ReadHelpers.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int EXTERNAL_LIBRARY_ERROR;
-    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
-}
-
-
-SharedLibraryHandler::SharedLibraryHandler(
-    const std::string & library_path_,
-    const std::vector<std::string> & library_settings,
-    const Block & sample_block_,
-    const std::vector<std::string> & attributes_names_)
-    : library_path(library_path_)
-    , sample_block(sample_block_)
-    , attributes_names(attributes_names_)
-{
-    library = std::make_shared<SharedLibrary>(library_path, RTLD_LAZY);
-    settings_holder = std::make_shared<CStringsHolder>(CStringsHolder(library_settings));
-
-    auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME);
-
-    if (lib_new)
-        lib_data = lib_new(&settings_holder->strings, ClickHouseLibrary::log);
-    else
-        throw Exception("Method libNew failed", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-}
-
-
-SharedLibraryHandler::SharedLibraryHandler(const SharedLibraryHandler & other)
-    : library_path{other.library_path}
-    , sample_block{other.sample_block}
-    , attributes_names{other.attributes_names}
-    , library{other.library}
-    , settings_holder{other.settings_holder}
-{
-
-    auto lib_clone = library->tryGet<ClickHouseLibrary::LibraryCloneFunc>(ClickHouseLibrary::LIBRARY_CLONE_FUNC_NAME);
-
-    if (lib_clone)
-    {
-        lib_data = lib_clone(other.lib_data);
-    }
-    else
-    {
-        auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME);
-
-        if (lib_new)
-            lib_data = lib_new(&settings_holder->strings, ClickHouseLibrary::log);
-    }
-}
-
-
-SharedLibraryHandler::~SharedLibraryHandler()
-{
-    auto lib_delete = library->tryGet<ClickHouseLibrary::LibraryDeleteFunc>(ClickHouseLibrary::LIBRARY_DELETE_FUNC_NAME);
-
-    if (lib_delete)
-        lib_delete(lib_data);
-}
-
-
-bool SharedLibraryHandler::isModified()
-{
-    auto func_is_modified = library->tryGet<ClickHouseLibrary::LibraryIsModifiedFunc>(ClickHouseLibrary::LIBRARY_IS_MODIFIED_FUNC_NAME);
-
-    if (func_is_modified)
-        return func_is_modified(lib_data, &settings_holder->strings);
-
-    return true;
-}
-
-
-bool SharedLibraryHandler::supportsSelectiveLoad()
-{
-    auto func_supports_selective_load = library->tryGet<ClickHouseLibrary::LibrarySupportsSelectiveLoadFunc>(ClickHouseLibrary::LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME);
-
-    if (func_supports_selective_load)
-        return func_supports_selective_load(lib_data, &settings_holder->strings);
-
-    return true;
-}
-
-
-Block SharedLibraryHandler::loadAll()
-{
-    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(attributes_names.size());
-    ClickHouseLibrary::CStrings columns{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()), attributes_names.size()};
-    for (size_t i = 0; i < attributes_names.size(); ++i)
-        columns.data[i] = attributes_names[i].c_str();
-
-    auto load_all_func = library->get<ClickHouseLibrary::LibraryLoadAllFunc>(ClickHouseLibrary::LIBRARY_LOAD_ALL_FUNC_NAME);
-    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
-    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
-
-    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
-    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
-
-    ClickHouseLibrary::RawClickHouseLibraryTable data = load_all_func(data_ptr, &settings_holder->strings, &columns);
-    return dataToBlock(data);
-}
-
-
-Block SharedLibraryHandler::loadIds(const std::vector<uint64_t> & ids)
-{
-    const ClickHouseLibrary::VectorUInt64 ids_data{bit_cast<decltype(ClickHouseLibrary::VectorUInt64::data)>(ids.data()), ids.size()};
-
-    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(attributes_names.size());
-    ClickHouseLibrary::CStrings columns_pass{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()), attributes_names.size()};
-
-    auto load_ids_func = library->get<ClickHouseLibrary::LibraryLoadIdsFunc>(ClickHouseLibrary::LIBRARY_LOAD_IDS_FUNC_NAME);
-    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
-    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
-
-    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
-    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
-
-    ClickHouseLibrary::RawClickHouseLibraryTable data = load_ids_func(data_ptr, &settings_holder->strings, &columns_pass, &ids_data);
-    return dataToBlock(data);
-}
-
-
-Block SharedLibraryHandler::loadKeys(const Columns & key_columns)
-{
-    auto holder = std::make_unique<ClickHouseLibrary::Row[]>(key_columns.size());
-    std::vector<std::unique_ptr<ClickHouseLibrary::Field[]>> column_data_holders;
-
-    for (size_t i = 0; i < key_columns.size(); ++i)
-    {
-        auto cell_holder = std::make_unique<ClickHouseLibrary::Field[]>(key_columns[i]->size());
-
-        for (size_t j = 0; j < key_columns[i]->size(); ++j)
-        {
-            auto data_ref = key_columns[i]->getDataAt(j);
-
-            cell_holder[j] = ClickHouseLibrary::Field{
-                    .data = static_cast<const void *>(data_ref.data),
-                    .size = data_ref.size};
-        }
-
-        holder[i] = ClickHouseLibrary::Row{
-                    .data = static_cast<ClickHouseLibrary::Field *>(cell_holder.get()),
-                    .size = key_columns[i]->size()};
-
-        column_data_holders.push_back(std::move(cell_holder));
-    }
-
-    ClickHouseLibrary::Table request_cols{
-            .data = static_cast<ClickHouseLibrary::Row *>(holder.get()),
-            .size = key_columns.size()};
-
-    auto load_keys_func = library->get<ClickHouseLibrary::LibraryLoadKeysFunc>(ClickHouseLibrary::LIBRARY_LOAD_KEYS_FUNC_NAME);
-    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
-    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
-
-    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
-    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
-
-    ClickHouseLibrary::RawClickHouseLibraryTable data = load_keys_func(data_ptr, &settings_holder->strings, &request_cols);
-    return dataToBlock(data);
-}
-
-
-Block SharedLibraryHandler::dataToBlock(const ClickHouseLibrary::RawClickHouseLibraryTable data)
-{
-    if (!data)
-        throw Exception("LibraryDictionarySource: No data returned", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-
-    const auto * columns_received = static_cast<const ClickHouseLibrary::Table *>(data);
-    if (columns_received->error_code)
-        throw Exception(
-            "LibraryDictionarySource: Returned error: " + std::to_string(columns_received->error_code) + " " + (columns_received->error_string ? columns_received->error_string : ""),
-            ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-
-    MutableColumns columns = sample_block.cloneEmptyColumns();
-
-    for (size_t col_n = 0; col_n < columns_received->size; ++col_n)
-    {
-        if (columns.size() != columns_received->data[col_n].size)
-            throw Exception(
-                "LibraryDictionarySource: Returned unexpected number of columns: " + std::to_string(columns_received->data[col_n].size) + ", must be " + std::to_string(columns.size()),
-                ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-        for (size_t row_n = 0; row_n < columns_received->data[col_n].size; ++row_n)
-        {
-            const auto & field = columns_received->data[col_n].data[row_n];
-            if (!field.data)
-            {
-                /// sample_block contains null_value (from config) inside corresponding column
-                const auto & col = sample_block.getByPosition(row_n);
-                columns[row_n]->insertFrom(*(col.column), 0);
-            }
-            else
-            {
-                const auto & size = field.size;
-                columns[row_n]->insertData(static_cast<const char *>(field.data), size);
-            }
-        }
-    }
-
-    return sample_block.cloneWithColumns(std::move(columns));
-}
-
-}
diff --git a/programs/library-bridge/SharedLibraryHandlerFactory.cpp b/programs/library-bridge/SharedLibraryHandlerFactory.cpp
deleted file mode 100644
index 2abc208e502..00000000000
--- a/programs/library-bridge/SharedLibraryHandlerFactory.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "SharedLibraryHandlerFactory.h"
-
-
-namespace DB
-{
-
-SharedLibraryHandlerPtr SharedLibraryHandlerFactory::get(const std::string & dictionary_id)
-{
-    std::lock_guard lock(mutex);
-    auto library_handler = library_handlers.find(dictionary_id);
-
-    if (library_handler != library_handlers.end())
-        return library_handler->second;
-
-    return nullptr;
-}
-
-
-void SharedLibraryHandlerFactory::create(
-    const std::string & dictionary_id,
-    const std::string & library_path,
-    const std::vector<std::string> & library_settings,
-    const Block & sample_block,
-    const std::vector<std::string> & attributes_names)
-{
-    std::lock_guard lock(mutex);
-    if (!library_handlers.contains(dictionary_id))
-        library_handlers.emplace(std::make_pair(dictionary_id, std::make_shared<SharedLibraryHandler>(library_path, library_settings, sample_block, attributes_names)));
-    else
-        LOG_WARNING(&Poco::Logger::get("SharedLibraryHandlerFactory"), "Library handler with dictionary id {} already exists", dictionary_id);
-}
-
-
-bool SharedLibraryHandlerFactory::clone(const std::string & from_dictionary_id, const std::string & to_dictionary_id)
-{
-    std::lock_guard lock(mutex);
-    auto from_library_handler = library_handlers.find(from_dictionary_id);
-
-    if (from_library_handler == library_handlers.end())
-        return false;
-
-    /// libClone method will be called in copy constructor
-    library_handlers[to_dictionary_id] = std::make_shared<SharedLibraryHandler>(*from_library_handler->second);
-    return true;
-}
-
-
-bool SharedLibraryHandlerFactory::remove(const std::string & dictionary_id)
-{
-    std::lock_guard lock(mutex);
-    /// libDelete is called in destructor.
-    return library_handlers.erase(dictionary_id);
-}
-
-
-SharedLibraryHandlerFactory & SharedLibraryHandlerFactory::instance()
-{
-    static SharedLibraryHandlerFactory ret;
-    return ret;
-}
-
-}
diff --git a/programs/library-bridge/library-bridge.cpp b/programs/library-bridge/library-bridge.cpp
index 5fff2ffe525..9c44fdb4564 100644
--- a/programs/library-bridge/library-bridge.cpp
+++ b/programs/library-bridge/library-bridge.cpp
@@ -1,3 +1,2 @@
 int mainEntryClickHouseLibraryBridge(int argc, char ** argv);
 int main(int argc_, char ** argv_) { return mainEntryClickHouseLibraryBridge(argc_, argv_); }
-
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 4f3b92bbcf0..ce31600642a 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -323,12 +323,28 @@ void LocalServer::setupUsers()
     auto & access_control = global_context->getAccessControl();
     access_control.setNoPasswordAllowed(config().getBool("allow_no_password", true));
     access_control.setPlaintextPasswordAllowed(config().getBool("allow_plaintext_password", true));
-    if (config().has("users_config") || config().has("config-file") || fs::exists("config.xml"))
+    if (config().has("config-file") || fs::exists("config.xml"))
     {
-        const auto users_config_path = config().getString("users_config", config().getString("config-file", "config.xml"));
-        ConfigProcessor config_processor(users_config_path);
-        const auto loaded_config = config_processor.loadConfig();
-        users_config = loaded_config.configuration;
+        String config_path = config().getString("config-file", "");
+        bool has_user_directories = config().has("user_directories");
+        const auto config_dir = fs::path{config_path}.remove_filename().string();
+        String users_config_path = config().getString("users_config", "");
+
+        if (users_config_path.empty() && has_user_directories)
+        {
+            users_config_path = config().getString("user_directories.users_xml.path");
+            if (fs::path(users_config_path).is_relative() && fs::exists(fs::path(config_dir) / users_config_path))
+                users_config_path = fs::path(config_dir) / users_config_path;
+        }
+
+        if (users_config_path.empty())
+            users_config = getConfigurationFromXMLString(minimal_default_user_xml);
+        else
+        {
+            ConfigProcessor config_processor(users_config_path);
+            const auto loaded_config = config_processor.loadConfig();
+            users_config = loaded_config.configuration;
+        }
     }
     else
         users_config = getConfigurationFromXMLString(minimal_default_user_xml);
@@ -338,7 +354,6 @@ void LocalServer::setupUsers()
         throw Exception("Can't load config for users", ErrorCodes::CANNOT_LOAD_CONFIG);
 }
 
-
 void LocalServer::connect()
 {
     connection_parameters = ConnectionParameters(config());
@@ -352,6 +367,9 @@ try
 {
     UseSSL use_ssl;
     ThreadStatus thread_status;
+
+    StackTrace::setShowAddresses(config().getBool("show_addresses_in_stack_traces", true));
+
     setupSignalHandler();
 
     std::cout << std::fixed << std::setprecision(3);
@@ -540,14 +558,16 @@ void LocalServer::processConfig()
     global_context->getProcessList().setMaxSize(0);
 
     /// Size of cache for uncompressed blocks. Zero means disabled.
+    String uncompressed_cache_policy = config().getString("uncompressed_cache_policy", "");
     size_t uncompressed_cache_size = config().getUInt64("uncompressed_cache_size", 0);
     if (uncompressed_cache_size)
-        global_context->setUncompressedCache(uncompressed_cache_size);
+        global_context->setUncompressedCache(uncompressed_cache_size, uncompressed_cache_policy);
 
     /// Size of cache for marks (index of MergeTree family of tables).
+    String mark_cache_policy = config().getString("mark_cache_policy", "");
     size_t mark_cache_size = config().getUInt64("mark_cache_size", 5368709120);
     if (mark_cache_size)
-        global_context->setMarkCache(mark_cache_size);
+        global_context->setMarkCache(mark_cache_size, mark_cache_policy);
 
     /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
     size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
diff --git a/programs/main.cpp b/programs/main.cpp
index 175504a85fa..27e17cfd2e0 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -345,6 +345,7 @@ struct Checker
 ;
 
 
+#ifndef DISABLE_HARMFUL_ENV_VAR_CHECK
 /// NOTE: We will migrate to full static linking or our own dynamic loader to make this code obsolete.
 void checkHarmfulEnvironmentVariables(char ** argv)
 {
@@ -396,6 +397,7 @@ void checkHarmfulEnvironmentVariables(char ** argv)
         _exit(error);
     }
 }
+#endif
 
 }
 
@@ -422,7 +424,9 @@ int main(int argc_, char ** argv_)
     ///  will work only after additional call of this function.
     updatePHDRCache();
 
+#ifndef DISABLE_HARMFUL_ENV_VAR_CHECK
     checkHarmfulEnvironmentVariables(argv_);
+#endif
 
     /// Reset new handler to default (that throws std::bad_alloc)
     /// It is needed because LLVM library clobbers it.
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index 056ed85c670..6891d2113a5 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -46,6 +46,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_map.hpp>
 #include <Common/TerminalSize.h>
+#include <bit>
 
 
 static const char * documentation = R"(
@@ -186,7 +187,7 @@ static UInt64 transform(UInt64 x, UInt64 seed)
     if (x == 2 || x == 3)
         return x ^ (seed & 1);
 
-    size_t num_leading_zeros = __builtin_clzll(x);
+    size_t num_leading_zeros = std::countl_zero(x);
 
     return feistelNetwork(x, 64 - num_leading_zeros - 1, seed);
 }
diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index a40df3cfb6e..f649e81c50a 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -2,17 +2,17 @@ include(${ClickHouse_SOURCE_DIR}/cmake/split_debug_symbols.cmake)
 
 set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
     ColumnInfoHandler.cpp
-    getIdentifierQuote.cpp
-    HandlerFactory.cpp
     IdentifierQuoteHandler.cpp
     MainHandler.cpp
     ODBCBlockInputStream.cpp
     ODBCBlockOutputStream.cpp
     ODBCBridge.cpp
+    ODBCHandlerFactory.cpp
     PingHandler.cpp
     SchemaAllowedHandler.cpp
-    validateODBCConnectionString.cpp
+    getIdentifierQuote.cpp
     odbc-bridge.cpp
+    validateODBCConnectionString.cpp
 )
 
 if (OS_LINUX)
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index f043c832aa4..0ea2495af78 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ParserQueryWithOutput.h>
 #include <Parsers/parseQuery.h>
@@ -14,6 +15,7 @@
 #include <Poco/NumberParser.h>
 #include <Common/logger_useful.h>
 #include <base/scope_guard.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/quoteString.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
@@ -80,6 +82,27 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         LOG_WARNING(log, fmt::runtime(message));
     };
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            process_error("Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        process_error("Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
     if (!params.has("table"))
     {
         process_error("No 'table' param in request URL");
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index c3a88804a51..8157e3b6159 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -5,11 +5,13 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ParserQueryWithOutput.h>
 #include <Parsers/parseQuery.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
 #include <base/scope_guard.h>
 #include "getIdentifierQuote.h"
@@ -32,6 +34,27 @@ void IdentifierQuoteHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         LOG_WARNING(log, fmt::runtime(message));
     };
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            process_error("Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        process_error("Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
     if (!params.has("connection_string"))
     {
         process_error("No 'connection_string' in request URL");
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index bb1cf53205d..fe22d8facfd 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -17,6 +17,7 @@
 #include <QueryPipeline/QueryPipeline.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Formats/IInputFormat.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Common/config.h>
@@ -55,6 +56,28 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
     HTMLForm params(getContext()->getSettingsRef(), request);
     LOG_TRACE(log, "Request URI: {}", request.getURI());
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            processError(response, "Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        processError(response, "Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
+
     if (mode == "read")
         params.read(request.getStream());
 
diff --git a/programs/odbc-bridge/ODBCBridge.cpp b/programs/odbc-bridge/ODBCBridge.cpp
index 0deefe46014..e91cc3158df 100644
--- a/programs/odbc-bridge/ODBCBridge.cpp
+++ b/programs/odbc-bridge/ODBCBridge.cpp
@@ -1,6 +1,5 @@
 #include "ODBCBridge.h"
 
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
 int mainEntryClickHouseODBCBridge(int argc, char ** argv)
 {
     DB::ODBCBridge app;
@@ -15,3 +14,18 @@ int mainEntryClickHouseODBCBridge(int argc, char ** argv)
         return code ? code : 1;
     }
 }
+
+namespace DB
+{
+
+std::string ODBCBridge::bridgeName() const
+{
+    return "ODBCBridge";
+}
+
+ODBCBridge::HandlerFactoryPtr ODBCBridge::getHandlerFactoryPtr(ContextPtr context) const
+{
+    return std::make_shared<ODBCBridgeHandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context);
+}
+
+}
diff --git a/programs/odbc-bridge/ODBCBridge.h b/programs/odbc-bridge/ODBCBridge.h
index b07ae095d7c..5e56dce7c60 100644
--- a/programs/odbc-bridge/ODBCBridge.h
+++ b/programs/odbc-bridge/ODBCBridge.h
@@ -3,7 +3,7 @@
 #include <Interpreters/Context.h>
 #include <Poco/Logger.h>
 #include <Bridge/IBridge.h>
-#include "HandlerFactory.h"
+#include "ODBCHandlerFactory.h"
 
 
 namespace DB
@@ -13,14 +13,7 @@ class ODBCBridge : public IBridge
 {
 
 protected:
-    std::string bridgeName() const override
-    {
-        return "ODBCBridge";
-    }
-
-    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override
-    {
-        return std::make_shared<ODBCBridgeHandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context);
-    }
+    std::string bridgeName() const override;
+    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override;
 };
 }
diff --git a/programs/odbc-bridge/HandlerFactory.cpp b/programs/odbc-bridge/ODBCHandlerFactory.cpp
similarity index 83%
rename from programs/odbc-bridge/HandlerFactory.cpp
rename to programs/odbc-bridge/ODBCHandlerFactory.cpp
index 4b6dacafe30..2ae533431d3 100644
--- a/programs/odbc-bridge/HandlerFactory.cpp
+++ b/programs/odbc-bridge/ODBCHandlerFactory.cpp
@@ -1,4 +1,4 @@
-#include "HandlerFactory.h"
+#include "ODBCHandlerFactory.h"
 #include "PingHandler.h"
 #include "ColumnInfoHandler.h"
 #include <Common/config.h>
@@ -9,6 +9,14 @@
 namespace DB
 {
 
+ODBCBridgeHandlerFactory::ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_)
+    : WithContext(context_)
+    , log(&Poco::Logger::get(name_))
+    , name(name_)
+    , keep_alive_timeout(keep_alive_timeout_)
+{
+}
+
 std::unique_ptr<HTTPRequestHandler> ODBCBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
 {
     Poco::URI uri{request.getURI()};
diff --git a/programs/odbc-bridge/HandlerFactory.h b/programs/odbc-bridge/ODBCHandlerFactory.h
similarity index 79%
rename from programs/odbc-bridge/HandlerFactory.h
rename to programs/odbc-bridge/ODBCHandlerFactory.h
index ffbbe3670af..3e3da7c9f24 100644
--- a/programs/odbc-bridge/HandlerFactory.h
+++ b/programs/odbc-bridge/ODBCHandlerFactory.h
@@ -17,13 +17,7 @@ namespace DB
 class ODBCBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
 {
 public:
-    ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_)
-        : WithContext(context_)
-        , log(&Poco::Logger::get(name_))
-        , name(name_)
-        , keep_alive_timeout(keep_alive_timeout_)
-    {
-    }
+    ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_);
 
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
 
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index 54dfa20f808..4d20c8bc3b7 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -4,9 +4,11 @@
 
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
 #include "validateODBCConnectionString.h"
 #include "ODBCPooledConnectionFactory.h"
@@ -40,6 +42,28 @@ void SchemaAllowedHandler::handleRequest(HTTPServerRequest & request, HTTPServer
         LOG_WARNING(log, fmt::runtime(message));
     };
 
+    size_t version;
+
+    if (!params.has("version"))
+        version = 0; /// assumed version for too old servers which do not send a version
+    else
+    {
+        String version_str = params.get("version");
+        if (!tryParse(version, version_str))
+        {
+            process_error("Unable to parse 'version' string in request URL: '" + version_str + "' Check if the server and library-bridge have the same version.");
+            return;
+        }
+    }
+
+    if (version != XDBC_BRIDGE_PROTOCOL_VERSION)
+    {
+        /// backwards compatibility is considered unnecessary for now, just let the user know that the server and the bridge must be upgraded together
+        process_error("Server and library-bridge have different versions: '" + std::to_string(version) + "' vs. '" + std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION) + "'");
+        return;
+    }
+
+
     if (!params.has("connection_string"))
     {
         process_error("No 'connection_string' in request URL");
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 621c40c31bf..7bb889afdce 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -29,6 +29,7 @@
 #include <Common/ClickHouseRevision.h>
 #include <Common/DNSResolver.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/ConcurrencyControl.h>
 #include <Common/Macros.h>
 #include <Common/ShellCommand.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -366,7 +367,7 @@ Poco::Net::SocketAddress Server::socketBindListen(
     return address;
 }
 
-std::vector<std::string> getListenHosts(const Poco::Util::AbstractConfiguration & config)
+Strings getListenHosts(const Poco::Util::AbstractConfiguration & config)
 {
     auto listen_hosts = DB::getMultipleValuesFromConfig(config, "", "listen_host");
     if (listen_hosts.empty())
@@ -377,6 +378,16 @@ std::vector<std::string> getListenHosts(const Poco::Util::AbstractConfiguration
     return listen_hosts;
 }
 
+Strings getInterserverListenHosts(const Poco::Util::AbstractConfiguration & config)
+{
+    auto interserver_listen_hosts = DB::getMultipleValuesFromConfig(config, "", "interserver_listen_host");
+    if (!interserver_listen_hosts.empty())
+      return interserver_listen_hosts;
+
+    /// Use more general restriction in case of emptiness
+    return getListenHosts(config);
+}
+
 bool getListenTry(const Poco::Util::AbstractConfiguration & config)
 {
     bool listen_try = config.getBool("listen_try", false);
@@ -602,10 +613,22 @@ static void sanityChecks(Server & server)
     {
         if (getAvailableMemoryAmount() < (2l << 30))
             server.context()->addWarningMessage("Available memory at server startup is too low (2GiB).");
+    }
+    catch (...)
+    {
+    }
 
+    try
+    {
         if (!enoughSpaceInDirectory(data_path, 1ull << 30))
             server.context()->addWarningMessage("Available disk space for data at server startup is too low (1GiB): " + String(data_path));
+    }
+    catch (...)
+    {
+    }
 
+    try
+    {
         if (!logs_path.empty())
         {
             auto logs_parent = fs::path(logs_path).parent_path();
@@ -616,6 +639,13 @@ static void sanityChecks(Server & server)
     catch (...)
     {
     }
+
+    if (server.context()->getMergeTreeSettings().allow_remote_fs_zero_copy_replication)
+    {
+        server.context()->addWarningMessage("The setting 'allow_remote_fs_zero_copy_replication' is enabled for MergeTree tables."
+            " But the feature of 'zero-copy replication' is under development and is not ready for production."
+            " The usage of this feature can lead to data corruption and loss. The setting should be disabled in production.");
+    }
 }
 
 int Server::main(const std::vector<std::string> & /*args*/)
@@ -626,6 +656,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     MainThreadStatus::getInstance();
 
+    StackTrace::setShowAddresses(config().getBool("show_addresses_in_stack_traces", true));
+
     registerFunctions();
     registerAggregateFunctions();
     registerTableFunctions();
@@ -1124,6 +1156,21 @@ int Server::main(const std::vector<std::string> & /*args*/)
             if (config->has("max_partition_size_to_drop"))
                 global_context->setMaxPartitionSizeToDrop(config->getUInt64("max_partition_size_to_drop"));
 
+            ConcurrencyControl::SlotCount concurrent_threads_soft_limit = ConcurrencyControl::Unlimited;
+            if (config->has("concurrent_threads_soft_limit_num"))
+            {
+                auto value = config->getUInt64("concurrent_threads_soft_limit_num", 0);
+                if (value > 0 && value < concurrent_threads_soft_limit)
+                    concurrent_threads_soft_limit = value;
+            }
+            if (config->has("concurrent_threads_soft_limit_ratio_to_cores"))
+            {
+                auto value = config->getUInt64("concurrent_threads_soft_limit_ratio_to_cores", 0) * std::thread::hardware_concurrency();
+                if (value > 0 && value < concurrent_threads_soft_limit)
+                    concurrent_threads_soft_limit = value;
+            }
+            ConcurrencyControl::instance().setMaxConcurrency(concurrent_threads_soft_limit);
+
             if (config->has("max_concurrent_queries"))
                 global_context->getProcessList().setMaxSize(config->getInt("max_concurrent_queries", 0));
 
@@ -1214,6 +1261,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         /* already_loaded = */ false);  /// Reload it right now (initial loading)
 
     const auto listen_hosts = getListenHosts(config());
+    const auto interserver_listen_hosts = getInterserverListenHosts(config());
     const auto listen_try = getListenTry(config());
 
     if (config().has("keeper_server"))
@@ -1331,6 +1379,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
     size_t max_cache_size = memory_amount * cache_size_to_ram_max_ratio;
 
     /// Size of cache for uncompressed blocks. Zero means disabled.
+    String uncompressed_cache_policy = config().getString("uncompressed_cache_policy", "");
+    LOG_INFO(log, "Uncompressed cache policy name {}", uncompressed_cache_policy);
     size_t uncompressed_cache_size = config().getUInt64("uncompressed_cache_size", 0);
     if (uncompressed_cache_size > max_cache_size)
     {
@@ -1338,7 +1388,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         LOG_INFO(log, "Uncompressed cache size was lowered to {} because the system has low amount of memory",
             formatReadableSizeWithBinarySuffix(uncompressed_cache_size));
     }
-    global_context->setUncompressedCache(uncompressed_cache_size);
+    global_context->setUncompressedCache(uncompressed_cache_size, uncompressed_cache_policy);
 
     /// Load global settings from default_profile and system_profile.
     global_context->setDefaultProfiles(config());
@@ -1357,6 +1407,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     /// Size of cache for marks (index of MergeTree family of tables).
     size_t mark_cache_size = config().getUInt64("mark_cache_size", 5368709120);
+    String mark_cache_policy = config().getString("mark_cache_policy", "");
     if (!mark_cache_size)
         LOG_ERROR(log, "Too low mark cache size will lead to severe performance degradation.");
     if (mark_cache_size > max_cache_size)
@@ -1365,7 +1416,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         LOG_INFO(log, "Mark cache size was lowered to {} because the system has low amount of memory",
             formatReadableSizeWithBinarySuffix(mark_cache_size));
     }
-    global_context->setMarkCache(mark_cache_size);
+    global_context->setMarkCache(mark_cache_size, mark_cache_policy);
 
     /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
     size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
@@ -1488,7 +1539,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         /// We load temporary database first, because projections need it.
         database_catalog.initializeAndLoadTemporaryDatabase();
         loadMetadataSystem(global_context);
-        maybeConvertOrdinaryDatabaseToAtomic(global_context, DatabaseCatalog::instance().getSystemDatabase());
+        maybeConvertSystemDatabase(global_context);
         /// After attaching system databases we can initialize system log.
         global_context->initializeSystemLogs();
         global_context->setSystemZooKeeperLogAfterInitializationIfNeeded();
@@ -1502,6 +1553,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
         database_catalog.loadMarkedAsDroppedTables();
         /// Then, load remaining databases
         loadMetadata(global_context, default_database);
+        convertDatabasesEnginesIfNeed(global_context);
         startupSystemTables();
         database_catalog.loadDatabases();
         /// After loading validate that default database exists
@@ -1609,7 +1661,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
         {
             std::lock_guard lock(servers_lock);
-            createServers(config(), listen_hosts, listen_try, server_pool, async_metrics, servers);
+            createServers(config(), listen_hosts, interserver_listen_hosts, listen_try, server_pool, async_metrics, servers);
             if (servers.empty())
                 throw Exception(
                     "No servers started (add valid listen_host and 'tcp_port' or 'http_port' to configuration file.)",
@@ -1791,7 +1843,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
 void Server::createServers(
     Poco::Util::AbstractConfiguration & config,
-    const std::vector<std::string> & listen_hosts,
+    const Strings & listen_hosts,
+    const Strings & interserver_listen_hosts,
     bool listen_try,
     Poco::ThreadPool & server_pool,
     AsynchronousMetrics & async_metrics,
@@ -1909,51 +1962,6 @@ void Server::createServers(
 #endif
         });
 
-        /// Interserver IO HTTP
-        port_name = "interserver_http_port";
-        createServer(config, listen_host, port_name, listen_try, start_servers, servers, [&](UInt16 port) -> ProtocolServerAdapter
-        {
-            Poco::Net::ServerSocket socket;
-            auto address = socketBindListen(config, socket, listen_host, port);
-            socket.setReceiveTimeout(settings.http_receive_timeout);
-            socket.setSendTimeout(settings.http_send_timeout);
-            return ProtocolServerAdapter(
-                listen_host,
-                port_name,
-                "replica communication (interserver): http://" + address.toString(),
-                std::make_unique<HTTPServer>(
-                    context(),
-                    createHandlerFactory(*this, async_metrics, "InterserverIOHTTPHandler-factory"),
-                    server_pool,
-                    socket,
-                    http_params));
-        });
-
-        port_name = "interserver_https_port";
-        createServer(config, listen_host, port_name, listen_try, start_servers, servers, [&](UInt16 port) -> ProtocolServerAdapter
-        {
-#if USE_SSL
-            Poco::Net::SecureServerSocket socket;
-            auto address = socketBindListen(config, socket, listen_host, port, /* secure = */ true);
-            socket.setReceiveTimeout(settings.http_receive_timeout);
-            socket.setSendTimeout(settings.http_send_timeout);
-            return ProtocolServerAdapter(
-                listen_host,
-                port_name,
-                "secure replica communication (interserver): https://" + address.toString(),
-                std::make_unique<HTTPServer>(
-                    context(),
-                    createHandlerFactory(*this, async_metrics, "InterserverIOHTTPSHandler-factory"),
-                    server_pool,
-                    socket,
-                    http_params));
-#else
-            UNUSED(port);
-            throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
-                            ErrorCodes::SUPPORT_IS_DISABLED};
-#endif
-        });
-
         port_name = "mysql_port";
         createServer(config, listen_host, port_name, listen_try, start_servers, servers, [&](UInt16 port) -> ProtocolServerAdapter
         {
@@ -2012,6 +2020,55 @@ void Server::createServers(
         });
     }
 
+    /// Now iterate over interserver_listen_hosts
+    for (const auto & interserver_listen_host : interserver_listen_hosts)
+    {
+         /// Interserver IO HTTP
+        const char * port_name = "interserver_http_port";
+        createServer(config, interserver_listen_host, port_name, listen_try, start_servers, servers, [&](UInt16 port) -> ProtocolServerAdapter
+        {
+            Poco::Net::ServerSocket socket;
+            auto address = socketBindListen(config, socket, interserver_listen_host, port);
+            socket.setReceiveTimeout(settings.http_receive_timeout);
+            socket.setSendTimeout(settings.http_send_timeout);
+            return ProtocolServerAdapter(
+                interserver_listen_host,
+                port_name,
+                "replica communication (interserver): http://" + address.toString(),
+                std::make_unique<HTTPServer>(
+                    context(),
+                    createHandlerFactory(*this, async_metrics, "InterserverIOHTTPHandler-factory"),
+                    server_pool,
+                    socket,
+                    http_params));
+        });
+
+        port_name = "interserver_https_port";
+        createServer(config, interserver_listen_host, port_name, listen_try, start_servers, servers, [&](UInt16 port) -> ProtocolServerAdapter
+        {
+#if USE_SSL
+            Poco::Net::SecureServerSocket socket;
+            auto address = socketBindListen(config, socket, interserver_listen_host, port, /* secure = */ true);
+            socket.setReceiveTimeout(settings.http_receive_timeout);
+            socket.setSendTimeout(settings.http_send_timeout);
+            return ProtocolServerAdapter(
+                interserver_listen_host,
+                port_name,
+                "secure replica communication (interserver): https://" + address.toString(),
+                std::make_unique<HTTPServer>(
+                    context(),
+                    createHandlerFactory(*this, async_metrics, "InterserverIOHTTPSHandler-factory"),
+                    server_pool,
+                    socket,
+                    http_params));
+#else
+            UNUSED(port);
+            throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
+                            ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+        });
+    }
+
 }
 
 void Server::updateServers(
@@ -2023,6 +2080,7 @@ void Server::updateServers(
     Poco::Logger * log = &logger();
 
     const auto listen_hosts = getListenHosts(config);
+    const auto interserver_listen_hosts = getInterserverListenHosts(config);
     const auto listen_try = getListenTry(config);
 
     /// Remove servers once all their connections are closed
@@ -2055,7 +2113,7 @@ void Server::updateServers(
         }
     }
 
-    createServers(config, listen_hosts, listen_try, server_pool, async_metrics, servers, /* start_servers= */ true);
+    createServers(config, listen_hosts, interserver_listen_hosts, listen_try, server_pool, async_metrics, servers, /* start_servers= */ true);
 
     std::erase_if(servers, std::bind_front(check_server, ""));
 }
diff --git a/programs/server/Server.h b/programs/server/Server.h
index 4235fcc2d3b..9b664b6213c 100644
--- a/programs/server/Server.h
+++ b/programs/server/Server.h
@@ -86,7 +86,8 @@ private:
 
     void createServers(
         Poco::Util::AbstractConfiguration & config,
-        const std::vector<std::string> & listen_hosts,
+        const Strings & listen_hosts,
+        const Strings & interserver_listen_hosts,
         bool listen_try,
         Poco::ThreadPool & server_pool,
         AsynchronousMetrics & async_metrics,
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 40e561c1880..2ce3fe7754f 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -60,6 +60,14 @@
           </logger>
         </levels>
         -->
+        <!-- Structured log formatting:
+        You can specify log format(for now, JSON only). In that case, the console log will be printed
+        in specified format like JSON.
+        For example, as below:
+        {"date_time":"1650918987.180175","thread_name":"#1","thread_id":"254545","level":"Trace","query_id":"","logger_name":"BaseDaemon","message":"Received signal 2","source_file":"../base/daemon/BaseDaemon.cpp; virtual void SignalListener::run()","source_line":"192"}
+        To enable JSON logging support, just uncomment <formatting> tag below.
+        -->
+        <!-- <formatting>json</formatting> -->
     </logger>
 
     <!-- Add headers to response in options request. OPTIONS method is used in CORS preflight requests. -->
@@ -188,6 +196,10 @@
     <listen_host>127.0.0.1</listen_host>
     -->
 
+    <!-- <interserver_listen_host>::</interserver_listen_host> -->
+    <!-- Listen host for communication between replicas. Used for data exchange -->
+    <!-- Default values - equal to listen_host -->
+
     <!-- Don't exit if IPv6 or IPv4 networks are unavailable while trying to listen. -->
     <!-- <listen_try>0</listen_try> -->
 
@@ -269,6 +281,13 @@
     <http_server_default_response><![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]></http_server_default_response>
     -->
 
+    <!-- The maximum number of query processing threads, excluding threads for retrieving data from remote servers, allowed to run all queries.
+         This is not a hard limit. In case if the limit is reached the query will still get at least one thread to run.
+         Query can upscale to desired number of threads during execution if more threads become available.
+    -->
+    <concurrent_threads_soft_limit_num>0</concurrent_threads_soft_limit_num>
+    <concurrent_threads_soft_limit_ratio_to_cores>0</concurrent_threads_soft_limit_ratio_to_cores>
+
     <!-- Maximum number of concurrent queries. -->
     <max_concurrent_queries>100</max_concurrent_queries>
 
@@ -604,7 +623,7 @@
              if this setting is true the user B will see all rows, and if this setting is false the user B will see no rows.
              By default this setting is false for compatibility with earlier access configurations. -->
         <users_without_row_policies_can_read_rows>false</users_without_row_policies_can_read_rows>
-        
+
         <!-- By default, for backward compatibility ON CLUSTER queries ignore CLUSTER grant,
              however you can change this behaviour by setting this to true -->
         <on_cluster_queries_require_cluster_grant>false</on_cluster_queries_require_cluster_grant>
@@ -1379,4 +1398,13 @@
         <lru_cache_size>268435456</lru_cache_size>
         <continue_if_corrupted>true</continue_if_corrupted>
     </merge_tree_metadata_cache-->
+
+    <!-- This allows to disable exposing addresses in stack traces for security reasons.
+         Please be aware that it does not improve security much, but makes debugging much harder.
+         The addresses that are small offsets from zero will be displayed nevertheless to show nullptr dereferences.
+         Regardless of this configuration, the addresses are visible in the system.stack_trace and system.trace_log tables
+         if the user has access to these tables.
+         I don't recommend to change this setting.
+    -->
+    <show_addresses_in_stack_traces>false</show_addresses_in_stack_traces>
 </clickhouse>
diff --git a/programs/server/play.html b/programs/server/play.html
index c7ea5e4ef12..c511d13cf91 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -75,6 +75,10 @@
         *
         {
             box-sizing: border-box;
+            /* For iPad */
+            margin: 0;
+            border-radius: 0;
+            tab-size: 4;
         }
 
         html, body
@@ -275,13 +279,23 @@
             display: none;
         }
 
-        /* When mouse pointer is over table cell, will display full text (with wrap) instead of cut. */
-        td.left:hover
+        /* When mouse pointer is over table cell, will display full text (with wrap) instead of cut.
+         * We also keep it for some time on mouseout for "hysteresis" effect.
+         */
+        td.left:hover, .td-hover-hysteresis
         {
             white-space: pre-wrap;
             max-width: none;
         }
 
+        .td-selected
+        {
+            white-space: pre-wrap;
+            max-width: none;
+            background-color: var(--table-hover-color);
+            border: 2px solid var(--border-color);
+        }
+
         td.transposed
         {
             max-width: none;
@@ -295,6 +309,14 @@
             vertical-align: middle;
         }
 
+        .row-number
+        {
+            width: 1%;
+            text-align: right;
+            background-color: var(--table-header-color);
+            color: var(--misc-text-color);
+        }
+
         div.empty-result
         {
             opacity: 10%;
@@ -501,20 +523,27 @@
 
         const server_address = document.getElementById('url').value;
 
-        const url = server_address +
+        var url = server_address +
             (server_address.indexOf('?') >= 0 ? '&' : '?') +
             /// Ask server to allow cross-domain requests.
             'add_http_cors_header=1' +
-            '&user=' + encodeURIComponent(user) +
-            '&password=' + encodeURIComponent(password) +
             '&default_format=JSONCompact' +
             /// Safety settings to prevent results that browser cannot display.
             '&max_result_rows=1000&max_result_bytes=10000000&result_overflow_mode=break';
 
+        // If play.html is opened locally, append username and password to the URL parameter to avoid CORS issue.
+        if (document.location.href.startsWith("file://")) {
+            url += '&user=' + encodeURIComponent(user) +
+            '&password=' + encodeURIComponent(password)
+        }
+
         const xhr = new XMLHttpRequest;
 
         xhr.open('POST', url, true);
-
+        // If play.html is open normally, use Basic auth to prevent username and password being exposed in URL parameters
+        if (!document.location.href.startsWith("file://")) {
+            xhr.setRequestHeader("Authorization", "Basic " + btoa(user+":"+password));
+        }
         xhr.onreadystatechange = function()
         {
             if (posted_request_num != request_num) {
@@ -581,11 +610,13 @@
         }
     }
 
+    let query_area = document.getElementById('query');
+
     window.onpopstate = function(event) {
         if (!event.state) {
             return;
         }
-        document.getElementById('query').value = event.state.query;
+        query_area.value = event.state.query;
         if (!event.state.response) {
             clear();
             return;
@@ -594,13 +625,13 @@
     };
 
     if (window.location.hash) {
-        document.getElementById('query').value = window.atob(window.location.hash.substr(1));
+        query_area.value = window.atob(window.location.hash.substr(1));
     }
 
     function post()
     {
         ++request_num;
-        let query = document.getElementById('query').value;
+        let query = query_area.value;
         postImpl(request_num, query);
     }
 
@@ -617,6 +648,32 @@
         }
     }
 
+    /// Pressing Tab in textarea will increase indentation.
+    /// But for accessibility reasons, we will fall back to tab navigation if the user already used Tab for that.
+
+    let user_prefers_tab_navigation = false;
+
+    [...document.querySelectorAll('input')].map(elem => {
+        elem.onkeydown = (e) => {
+            if (e.key == 'Tab') { user_prefers_tab_navigation = true; }
+        };
+    });
+
+    query_area.onkeydown = (e) => {
+        if (e.key == 'Tab' && !event.shiftKey && !user_prefers_tab_navigation) {
+            let elem = e.target;
+            let selection_start = elem.selectionStart;
+            let selection_end = elem.selectionEnd;
+
+            elem.value = elem.value.substring(0, elem.selectionStart) + '    ' + elem.value.substring(elem.selectionEnd);
+            elem.selectionStart = selection_start + 4;
+            elem.selectionEnd = selection_start + 4;
+
+            e.preventDefault();
+            return false;
+        }
+    };
+
     function clearElement(id)
     {
         let elem = document.getElementById(id);
@@ -633,10 +690,9 @@
         clearElement('chart');
         clearElement('data-unparsed');
         clearElement('error');
-        clearElement('hourglass');
 
-        document.getElementById('check-mark').innerText = '';
-        document.getElementById('hourglass').innerText = '';
+        document.getElementById('check-mark').display = 'none';
+        document.getElementById('hourglass').display = 'none';
         document.getElementById('stats').innerText = '';
         document.getElementById('logo-container').style.display = 'block';
     }
@@ -674,7 +730,7 @@
         stats.innerText = `Elapsed: ${seconds} sec, read ${formatted_rows} rows, ${formatted_bytes}.`;
 
         /// We can also render graphs if user performed EXPLAIN PIPELINE graph=1 or EXPLAIN AST graph = 1
-        if (response.data.length > 3 && document.getElementById('query').value.match(/^\s*EXPLAIN/i) && typeof(response.data[0][0]) === "string" && response.data[0][0].startsWith("digraph")) {
+        if (response.data.length > 3 && query_area.value.match(/^\s*EXPLAIN/i) && typeof(response.data[0][0]) === "string" && response.data[0][0].startsWith("digraph")) {
             renderGraph(response);
         } else {
             renderTable(response);
@@ -784,7 +840,17 @@
             return;
         }
 
+        const should_display_row_numbers = response.data.length > 3;
+
         let thead = document.createElement('thead');
+
+        if (should_display_row_numbers) {
+            let th = document.createElement('th');
+            th.className = 'row-number';
+            th.appendChild(document.createTextNode('№'));
+            thead.appendChild(th);
+        }
+
         for (let idx in response.meta) {
             let th = document.createElement('th');
             const name = document.createTextNode(response.meta[idx].name);
@@ -794,7 +860,9 @@
 
         /// To prevent hanging the browser, limit the number of cells in a table.
         /// It's important to have the limit on number of cells, not just rows, because tables may be wide or narrow.
+        /// Also we permit rendering of more records but only if elapsed time is not large.
         const max_rows = 10000 / response.meta.length;
+        const max_render_ms = 200;
         let row_num = 0;
 
         const column_is_number = response.meta.map(elem => !!elem.type.match(/^(Nullable\()?(U?Int|Decimal|Float)/));
@@ -810,18 +878,35 @@
             column_need_render_bars: column_need_render_bars,
         };
 
+        const start_time = performance.now();
+
         let tbody = document.createElement('tbody');
         for (let row_idx in response.data) {
             let tr = document.createElement('tr');
+            if (should_display_row_numbers) {
+                let td = document.createElement('td');
+                td.className = 'row-number';
+                td.appendChild(document.createTextNode(1 + +row_idx));
+                tr.appendChild(td);
+            }
             for (let col_idx in response.data[row_idx]) {
                 let cell = response.data[row_idx][col_idx];
                 const td = renderCell(cell, col_idx, settings);
+
+                td.onclick = () => { td.classList.add('td-selected') };
+                td.onmouseenter = () => {
+                    td.classList.add('td-hover-hysteresis');
+                    td.onmouseleave = () => {
+                        setTimeout(() => { td && td.classList.remove('td-hover-hysteresis') }, 1000);
+                    };
+                };
+
                 tr.appendChild(td);
             }
             tbody.appendChild(tr);
 
             ++row_num;
-            if (row_num >= max_rows) {
+            if (row_num >= max_rows && performance.now() - start_time >= max_render_ms) {
                 break;
             }
         }
diff --git a/programs/su/CMakeLists.txt b/programs/su/CMakeLists.txt
index df207e16f6e..3228eef8b8d 100644
--- a/programs/su/CMakeLists.txt
+++ b/programs/su/CMakeLists.txt
@@ -1,3 +1,3 @@
-set (CLICKHOUSE_SU_SOURCES clickhouse-su.cpp)
+set (CLICKHOUSE_SU_SOURCES clickhouse-su.cpp su.cpp)
 set (CLICKHOUSE_SU_LINK PRIVATE dbms)
 clickhouse_program_add(su)
diff --git a/programs/su/clickhouse-su.cpp b/programs/su/clickhouse-su.cpp
index 0979abf353d..bb0967ca271 100644
--- a/programs/su/clickhouse-su.cpp
+++ b/programs/su/clickhouse-su.cpp
@@ -1,145 +1,2 @@
-#include <Common/Exception.h>
-#include <IO/ReadHelpers.h>
-#include <fmt/format.h>
-#include <vector>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
-
-
-/// "su" means "set user"
-/// In fact, this program can set Unix user and group.
-///
-/// Usage:
-/// clickhouse su user[:group] args...
-///
-/// - will set user and, optionally, group and exec the remaining args.
-///   user and group can be numeric identifiers or strings.
-///
-/// The motivation for this tool is very obscure and idiosyncratic. It is needed for Docker.
-/// People want to run programs inside Docker with dropped privileges (less than root).
-/// But the standard Linux "su" program is not suitable for usage inside Docker,
-/// because it is creating pseudoterminals to avoid hijacking input from the terminal, for security,
-/// but Docker is also doing something with the terminal and it is incompatible.
-/// For this reason, people use alternative and less "secure" versions of "su" tools like "gosu" or "su-exec".
-/// But it would be very strange to use 3rd-party software only to do two-three syscalls.
-/// That's why we provide this tool.
-///
-/// Note: ClickHouse does not need Docker at all and works better without Docker.
-/// ClickHouse has no dependencies, it is packaged and distributed in single binary.
-/// There is no reason to use Docker unless you are already running all your software in Docker.
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int SYSTEM_ERROR;
-}
-
-void setUserAndGroup(std::string arg_uid, std::string arg_gid)
-{
-    static constexpr size_t buf_size = 16384; /// Linux man page says it is enough. Nevertheless, we will check if it's not enough and throw.
-    std::unique_ptr<char[]> buf(new char[buf_size]);
-
-    /// Set the group first, because if we set user, the privileges will be already dropped and we will not be able to set the group later.
-
-    if (!arg_gid.empty())
-    {
-        gid_t gid = 0;
-        if (!tryParse(gid, arg_gid) || gid == 0)
-        {
-            group entry{};
-            group * result{};
-
-            if (0 != getgrnam_r(arg_gid.data(), &entry, buf.get(), buf_size, &result))
-                throwFromErrno(fmt::format("Cannot do 'getgrnam_r' to obtain gid from group name ({})", arg_gid), ErrorCodes::SYSTEM_ERROR);
-
-            if (!result)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Group {} is not found in the system", arg_gid);
-
-            gid = entry.gr_gid;
-        }
-
-        if (gid == 0 && getgid() != 0)
-            throw Exception("Group has id 0, but dropping privileges to gid 0 does not make sense", ErrorCodes::BAD_ARGUMENTS);
-
-        if (0 != setgid(gid))
-            throwFromErrno(fmt::format("Cannot do 'setgid' to user ({})", arg_gid), ErrorCodes::SYSTEM_ERROR);
-    }
-
-    if (!arg_uid.empty())
-    {
-        /// Is it numeric id or name?
-        uid_t uid = 0;
-        if (!tryParse(uid, arg_uid) || uid == 0)
-        {
-            passwd entry{};
-            passwd * result{};
-
-            if (0 != getpwnam_r(arg_uid.data(), &entry, buf.get(), buf_size, &result))
-                throwFromErrno(fmt::format("Cannot do 'getpwnam_r' to obtain uid from user name ({})", arg_uid), ErrorCodes::SYSTEM_ERROR);
-
-            if (!result)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "User {} is not found in the system", arg_uid);
-
-            uid = entry.pw_uid;
-        }
-
-        if (uid == 0 && getuid() != 0)
-            throw Exception("User has id 0, but dropping privileges to uid 0 does not make sense", ErrorCodes::BAD_ARGUMENTS);
-
-        if (0 != setuid(uid))
-            throwFromErrno(fmt::format("Cannot do 'setuid' to user ({})", arg_uid), ErrorCodes::SYSTEM_ERROR);
-    }
-}
-
-}
-
-
-int mainEntryClickHouseSU(int argc, char ** argv)
-try
-{
-    using namespace DB;
-
-    if (argc < 3)
-    {
-        std::cout << "Usage: ./clickhouse su user:group ..." << std::endl;
-        exit(0);
-    }
-
-    std::string_view user_and_group = argv[1];
-
-    std::string user;
-    std::string group;
-
-    auto pos = user_and_group.find(':');
-    if (pos == std::string_view::npos)
-    {
-        user = user_and_group;
-    }
-    else
-    {
-        user = user_and_group.substr(0, pos);
-        group = user_and_group.substr(pos + 1);
-    }
-
-    setUserAndGroup(std::move(user), std::move(group));
-
-    std::vector<char *> new_argv;
-    new_argv.reserve(argc - 1);
-    new_argv.insert(new_argv.begin(), argv + 2, argv + argc);
-    new_argv.push_back(nullptr);
-
-    execvp(new_argv.front(), new_argv.data());
-
-    throwFromErrno("Cannot execvp", ErrorCodes::SYSTEM_ERROR);
-}
-catch (...)
-{
-    std::cerr << DB::getCurrentExceptionMessage(false) << '\n';
-    return 1;
-}
+int mainEntryClickHouseSU(int argc, char ** argv);
+int main(int argc_, char ** argv_) { return mainEntryClickHouseSU(argc_, argv_); }
diff --git a/programs/su/su.cpp b/programs/su/su.cpp
new file mode 100644
index 00000000000..0979abf353d
--- /dev/null
+++ b/programs/su/su.cpp
@@ -0,0 +1,145 @@
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
+#include <fmt/format.h>
+#include <vector>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+
+
+/// "su" means "set user"
+/// In fact, this program can set Unix user and group.
+///
+/// Usage:
+/// clickhouse su user[:group] args...
+///
+/// - will set user and, optionally, group and exec the remaining args.
+///   user and group can be numeric identifiers or strings.
+///
+/// The motivation for this tool is very obscure and idiosyncratic. It is needed for Docker.
+/// People want to run programs inside Docker with dropped privileges (less than root).
+/// But the standard Linux "su" program is not suitable for usage inside Docker,
+/// because it is creating pseudoterminals to avoid hijacking input from the terminal, for security,
+/// but Docker is also doing something with the terminal and it is incompatible.
+/// For this reason, people use alternative and less "secure" versions of "su" tools like "gosu" or "su-exec".
+/// But it would be very strange to use 3rd-party software only to do two-three syscalls.
+/// That's why we provide this tool.
+///
+/// Note: ClickHouse does not need Docker at all and works better without Docker.
+/// ClickHouse has no dependencies, it is packaged and distributed in single binary.
+/// There is no reason to use Docker unless you are already running all your software in Docker.
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int SYSTEM_ERROR;
+}
+
+void setUserAndGroup(std::string arg_uid, std::string arg_gid)
+{
+    static constexpr size_t buf_size = 16384; /// Linux man page says it is enough. Nevertheless, we will check if it's not enough and throw.
+    std::unique_ptr<char[]> buf(new char[buf_size]);
+
+    /// Set the group first, because if we set user, the privileges will be already dropped and we will not be able to set the group later.
+
+    if (!arg_gid.empty())
+    {
+        gid_t gid = 0;
+        if (!tryParse(gid, arg_gid) || gid == 0)
+        {
+            group entry{};
+            group * result{};
+
+            if (0 != getgrnam_r(arg_gid.data(), &entry, buf.get(), buf_size, &result))
+                throwFromErrno(fmt::format("Cannot do 'getgrnam_r' to obtain gid from group name ({})", arg_gid), ErrorCodes::SYSTEM_ERROR);
+
+            if (!result)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Group {} is not found in the system", arg_gid);
+
+            gid = entry.gr_gid;
+        }
+
+        if (gid == 0 && getgid() != 0)
+            throw Exception("Group has id 0, but dropping privileges to gid 0 does not make sense", ErrorCodes::BAD_ARGUMENTS);
+
+        if (0 != setgid(gid))
+            throwFromErrno(fmt::format("Cannot do 'setgid' to user ({})", arg_gid), ErrorCodes::SYSTEM_ERROR);
+    }
+
+    if (!arg_uid.empty())
+    {
+        /// Is it numeric id or name?
+        uid_t uid = 0;
+        if (!tryParse(uid, arg_uid) || uid == 0)
+        {
+            passwd entry{};
+            passwd * result{};
+
+            if (0 != getpwnam_r(arg_uid.data(), &entry, buf.get(), buf_size, &result))
+                throwFromErrno(fmt::format("Cannot do 'getpwnam_r' to obtain uid from user name ({})", arg_uid), ErrorCodes::SYSTEM_ERROR);
+
+            if (!result)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "User {} is not found in the system", arg_uid);
+
+            uid = entry.pw_uid;
+        }
+
+        if (uid == 0 && getuid() != 0)
+            throw Exception("User has id 0, but dropping privileges to uid 0 does not make sense", ErrorCodes::BAD_ARGUMENTS);
+
+        if (0 != setuid(uid))
+            throwFromErrno(fmt::format("Cannot do 'setuid' to user ({})", arg_uid), ErrorCodes::SYSTEM_ERROR);
+    }
+}
+
+}
+
+
+int mainEntryClickHouseSU(int argc, char ** argv)
+try
+{
+    using namespace DB;
+
+    if (argc < 3)
+    {
+        std::cout << "Usage: ./clickhouse su user:group ..." << std::endl;
+        exit(0);
+    }
+
+    std::string_view user_and_group = argv[1];
+
+    std::string user;
+    std::string group;
+
+    auto pos = user_and_group.find(':');
+    if (pos == std::string_view::npos)
+    {
+        user = user_and_group;
+    }
+    else
+    {
+        user = user_and_group.substr(0, pos);
+        group = user_and_group.substr(pos + 1);
+    }
+
+    setUserAndGroup(std::move(user), std::move(group));
+
+    std::vector<char *> new_argv;
+    new_argv.reserve(argc - 1);
+    new_argv.insert(new_argv.begin(), argv + 2, argv + argc);
+    new_argv.push_back(nullptr);
+
+    execvp(new_argv.front(), new_argv.data());
+
+    throwFromErrno("Cannot execvp", ErrorCodes::SYSTEM_ERROR);
+}
+catch (...)
+{
+    std::cerr << DB::getCurrentExceptionMessage(false) << '\n';
+    return 1;
+}
diff --git a/src/Access/Common/AccessType.h b/src/Access/Common/AccessType.h
index 38e006f18e7..e8d3b453188 100644
--- a/src/Access/Common/AccessType.h
+++ b/src/Access/Common/AccessType.h
@@ -140,6 +140,7 @@ enum class AccessType
     M(SYSTEM_DROP_MMAP_CACHE, "SYSTEM DROP MMAP, DROP MMAP CACHE, DROP MMAP", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_COMPILED_EXPRESSION_CACHE, "SYSTEM DROP COMPILED EXPRESSION, DROP COMPILED EXPRESSION CACHE, DROP COMPILED EXPRESSIONS", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_FILESYSTEM_CACHE, "SYSTEM DROP FILESYSTEM CACHE, DROP FILESYSTEM CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
+    M(SYSTEM_DROP_SCHEMA_CACHE, "SYSTEM DROP SCHEMA CACHE, DROP SCHEMA CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_CACHE, "DROP CACHE", GROUP, SYSTEM) \
     M(SYSTEM_RELOAD_CONFIG, "RELOAD CONFIG", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_SYMBOLS, "RELOAD SYMBOLS", GLOBAL, SYSTEM_RELOAD) \
diff --git a/src/Access/MultipleAccessStorage.h b/src/Access/MultipleAccessStorage.h
index 58cf09fd0ff..bc9a4705785 100644
--- a/src/Access/MultipleAccessStorage.h
+++ b/src/Access/MultipleAccessStorage.h
@@ -2,7 +2,7 @@
 
 #include <Access/IAccessStorage.h>
 #include <base/defines.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <mutex>
 
 
@@ -63,7 +63,7 @@ private:
     std::shared_ptr<const Storages> getStoragesInternal() const;
 
     std::shared_ptr<const Storages> nested_storages TSA_GUARDED_BY(mutex);
-    mutable LRUCache<UUID, Storage> ids_cache TSA_GUARDED_BY(mutex);
+    mutable CacheBase<UUID, Storage> ids_cache TSA_GUARDED_BY(mutex);
     mutable std::mutex mutex;
 };
 
diff --git a/src/Access/examples/kerberos_init.cpp b/src/Access/examples/kerberos_init.cpp
index 5dbe92a5b57..f9f9d882ece 100644
--- a/src/Access/examples/kerberos_init.cpp
+++ b/src/Access/examples/kerberos_init.cpp
@@ -25,7 +25,7 @@ int main(int argc, char ** argv)
         return 0;
     }
 
-    String cache_name = "";
+    const char * cache_name = "";
     if (argc == 4)
         cache_name = argv[3];
 
diff --git a/src/AggregateFunctions/AggregateFunctionArray.h b/src/AggregateFunctions/AggregateFunctionArray.h
index c32cf8f2418..85e0dfc8050 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.h
+++ b/src/AggregateFunctions/AggregateFunctionArray.h
@@ -49,6 +49,16 @@ public:
         return nested_func->getReturnType();
     }
 
+    const IAggregateFunction & getBaseAggregateFunctionWithSameStateRepresentation() const override
+    {
+        return nested_func->getBaseAggregateFunctionWithSameStateRepresentation();
+    }
+
+    DataTypePtr getNormalizedStateType() const override
+    {
+        return nested_func->getNormalizedStateType();
+    }
+
     bool isVersioned() const override
     {
         return nested_func->isVersioned();
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index 4199cb55409..a58eecf5aca 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -5,9 +5,11 @@
 
 #include <array>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnsCommon.h>
 #include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Common/assert_cast.h>
 
 #include <Common/config.h>
@@ -102,6 +104,19 @@ public:
         }
     }
 
+    bool haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const override
+    {
+        return this->getName() == rhs.getName();
+    }
+
+    DataTypePtr getNormalizedStateType() const override
+    {
+        /// Return normalized state type: count()
+        AggregateFunctionProperties properties;
+        return std::make_shared<DataTypeAggregateFunction>(
+            AggregateFunctionFactory::instance().get(getName(), {}, {}, properties), DataTypes{}, Array{});
+    }
+
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
         data(place).count += data(rhs).count;
@@ -240,6 +255,19 @@ public:
         }
     }
 
+    bool haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const override
+    {
+        return this->getName() == rhs.getName();
+    }
+
+    DataTypePtr getNormalizedStateType() const override
+    {
+        /// Return normalized state type: count()
+        AggregateFunctionProperties properties;
+        return std::make_shared<DataTypeAggregateFunction>(
+            AggregateFunctionFactory::instance().get(getName(), {}, {}, properties), DataTypes{}, Array{});
+    }
+
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
         data(place).count += data(rhs).count;
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.h b/src/AggregateFunctions/AggregateFunctionDistinct.h
index 91e25ddfdfd..5afe104bcc0 100644
--- a/src/AggregateFunctions/AggregateFunctionDistinct.h
+++ b/src/AggregateFunctions/AggregateFunctionDistinct.h
@@ -152,8 +152,8 @@ template <typename Data>
 class AggregateFunctionDistinct : public IAggregateFunctionDataHelper<Data, AggregateFunctionDistinct<Data>>
 {
 private:
-    static constexpr auto prefix_size = sizeof(Data);
     AggregateFunctionPtr nested_func;
+    size_t prefix_size;
     size_t arguments_num;
 
     AggregateDataPtr getNestedPlace(AggregateDataPtr __restrict place) const noexcept
@@ -170,7 +170,11 @@ public:
     AggregateFunctionDistinct(AggregateFunctionPtr nested_func_, const DataTypes & arguments, const Array & params_)
     : IAggregateFunctionDataHelper<Data, AggregateFunctionDistinct>(arguments, params_)
     , nested_func(nested_func_)
-    , arguments_num(arguments.size()) {}
+    , arguments_num(arguments.size())
+    {
+        size_t nested_size = nested_func->alignOfData();
+        prefix_size = (sizeof(Data) + nested_size - 1) / nested_size * nested_size;
+    }
 
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/AggregateFunctionIf.h
index f3221ae66e9..18104f94fad 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.h
+++ b/src/AggregateFunctions/AggregateFunctionIf.h
@@ -56,6 +56,16 @@ public:
         return nested_func->getReturnType();
     }
 
+    const IAggregateFunction & getBaseAggregateFunctionWithSameStateRepresentation() const override
+    {
+        return nested_func->getBaseAggregateFunctionWithSameStateRepresentation();
+    }
+
+    DataTypePtr getNormalizedStateType() const override
+    {
+        return nested_func->getNormalizedStateType();
+    }
+
     bool isVersioned() const override
     {
         return nested_func->isVersioned();
diff --git a/src/AggregateFunctions/AggregateFunctionMerge.cpp b/src/AggregateFunctions/AggregateFunctionMerge.cpp
index cdf399585f5..a6d3a0771ab 100644
--- a/src/AggregateFunctions/AggregateFunctionMerge.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMerge.cpp
@@ -23,14 +23,20 @@ public:
     DataTypes transformArguments(const DataTypes & arguments) const override
     {
         if (arguments.size() != 1)
-            throw Exception("Incorrect number of arguments for aggregate function with " + getName() + " suffix", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Incorrect number of arguments for aggregate function with {} suffix",
+                getName());
 
         const DataTypePtr & argument = arguments[0];
 
         const DataTypeAggregateFunction * function = typeid_cast<const DataTypeAggregateFunction *>(argument.get());
         if (!function)
-            throw Exception("Illegal type " + argument->getName() + " of argument for aggregate function with " + getName() + " suffix"
-                + " must be AggregateFunction(...)", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument for aggregate function with {} suffix. It must be AggregateFunction(...)",
+                argument->getName(),
+                getName());
 
         return function->getArgumentsDataTypes();
     }
@@ -45,13 +51,21 @@ public:
 
         const DataTypeAggregateFunction * function = typeid_cast<const DataTypeAggregateFunction *>(argument.get());
         if (!function)
-            throw Exception("Illegal type " + argument->getName() + " of argument for aggregate function with " + getName() + " suffix"
-                + " must be AggregateFunction(...)", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument for aggregate function with {} suffix. It must be AggregateFunction(...)",
+                argument->getName(),
+                getName());
 
-        if (nested_function->getName() != function->getFunctionName())
-            throw Exception("Illegal type " + argument->getName() + " of argument for aggregate function with " + getName() + " suffix"
-                + ", because it corresponds to different aggregate function: " + function->getFunctionName() + " instead of " + nested_function->getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        if (!nested_function->haveSameStateRepresentation(*function->getFunction()))
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument for aggregate function with {} suffix. because it corresponds to different aggregate "
+                "function: {} instead of {}",
+                argument->getName(),
+                getName(),
+                function->getFunctionName(),
+                nested_function->getName());
 
         return std::make_shared<AggregateFunctionMerge>(nested_function, argument, params);
     }
diff --git a/src/AggregateFunctions/AggregateFunctionMerge.h b/src/AggregateFunctions/AggregateFunctionMerge.h
index 8058e104415..7bf0f5ea00f 100644
--- a/src/AggregateFunctions/AggregateFunctionMerge.h
+++ b/src/AggregateFunctions/AggregateFunctionMerge.h
@@ -50,6 +50,11 @@ public:
         return nested_func->getReturnType();
     }
 
+    const IAggregateFunction & getBaseAggregateFunctionWithSameStateRepresentation() const override
+    {
+        return nested_func->getBaseAggregateFunctionWithSameStateRepresentation();
+    }
+
     bool isVersioned() const override
     {
         return nested_func->isVersioned();
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index bb2a68da4e6..65edcaea13a 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 
 /// These must be exposed in header for the purpose of dynamic compilation.
 #include <AggregateFunctions/QuantileReservoirSampler.h>
@@ -20,9 +21,11 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Common/assert_cast.h>
+#include <Interpreters/GatherFunctionQuantileVisitor.h>
 
 #include <type_traits>
 
@@ -61,10 +64,9 @@ template <
     typename FloatReturnType,
     /// If true, the function will accept multiple parameters with quantile levels
     ///  and return an Array filled with many values of that quantiles.
-    bool returns_many
->
-class AggregateFunctionQuantile final : public IAggregateFunctionDataHelper<Data,
-    AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>
+    bool returns_many>
+class AggregateFunctionQuantile final
+    : public IAggregateFunctionDataHelper<Data, AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>
 {
 private:
     using ColVecType = ColumnVectorOrDecimal<Value>;
@@ -81,11 +83,14 @@ private:
 
 public:
     AggregateFunctionQuantile(const DataTypes & argument_types_, const Array & params)
-        : IAggregateFunctionDataHelper<Data, AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>(argument_types_, params)
-        , levels(params, returns_many), level(levels.levels[0]), argument_type(this->argument_types[0])
+        : IAggregateFunctionDataHelper<Data, AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>(
+            argument_types_, params)
+        , levels(params, returns_many)
+        , level(levels.levels[0])
+        , argument_type(this->argument_types[0])
     {
         if (!returns_many && levels.size() > 1)
-            throw Exception("Aggregate function " + getName() + " require one parameter or less", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} require one parameter or less", getName());
     }
 
     String getName() const override { return Name::name; }
@@ -105,9 +110,22 @@ public:
             return res;
     }
 
-    bool haveSameStateRepresentation(const IAggregateFunction & rhs) const override
+    bool haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const override
     {
-        return getName() == rhs.getName() && this->haveEqualArgumentTypes(rhs);
+        return GatherFunctionQuantileData::toFusedNameOrSelf(getName()) == GatherFunctionQuantileData::toFusedNameOrSelf(rhs.getName())
+            && this->haveEqualArgumentTypes(rhs);
+    }
+
+    DataTypePtr getNormalizedStateType() const override
+    {
+        /// Return normalized state type: quantiles*(1)(...)
+        Array params{1};
+        AggregateFunctionProperties properties;
+        return std::make_shared<DataTypeAggregateFunction>(
+            AggregateFunctionFactory::instance().get(
+                GatherFunctionQuantileData::toFusedNameOrSelf(getName()), this->argument_types, params, properties),
+            this->argument_types,
+            params);
     }
 
     bool allocatesMemoryInArena() const override { return false; }
@@ -124,9 +142,7 @@ public:
         }
 
         if constexpr (has_second_arg)
-            this->data(place).add(
-                value,
-                columns[1]->getUInt(row_num));
+            this->data(place).add(value, columns[1]->getUInt(row_num));
         else
             this->data(place).add(value);
     }
@@ -149,7 +165,6 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        /// const_cast is required because some data structures apply finalizaton (like sorting) for obtain a result.
         auto & data = this->data(place);
 
         if constexpr (returns_many)
@@ -195,7 +210,11 @@ public:
         {
             assertBinary(Name::name, types);
             if (!isUnsignedInteger(types[1]))
-                throw Exception("Second argument (weight) for function " + std::string(Name::name) + " must be unsigned integer, but it has type " + types[1]->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Second argument (weight) for function {} must be unsigned integer, but it has type {}",
+                    Name::name,
+                    types[1]->getName());
         }
         else
             assertUnary(Name::name, types);
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 8b0f7ccfbd1..5c1ab803f19 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -163,7 +163,7 @@ public:
         this->data(place).deserialize(buf);
     }
 
-    bool haveSameStateRepresentation(const IAggregateFunction & rhs) const override
+    bool haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const override
     {
         return this->getName() == rhs.getName() && this->haveEqualArgumentTypes(rhs);
     }
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
index a4222b5471f..a627afaaa85 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
@@ -194,7 +194,7 @@ public:
 
     DataTypePtr getReturnType() const override { return data_type; }
 
-    bool haveSameStateRepresentation(const IAggregateFunction & rhs) const override
+    bool haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const override
     {
         return this->getName() == rhs.getName() && this->haveEqualArgumentTypes(rhs);
     }
diff --git a/src/AggregateFunctions/AggregateFunctionState.h b/src/AggregateFunctions/AggregateFunctionState.h
index 9a1d4528d96..a598e4838cc 100644
--- a/src/AggregateFunctions/AggregateFunctionState.h
+++ b/src/AggregateFunctions/AggregateFunctionState.h
@@ -37,6 +37,11 @@ public:
         return getStateType();
     }
 
+    const IAggregateFunction & getBaseAggregateFunctionWithSameStateRepresentation() const override
+    {
+        return nested_func->getBaseAggregateFunctionWithSameStateRepresentation();
+    }
+
     DataTypePtr getStateType() const override
     {
         return nested_func->getStateType();
diff --git a/src/AggregateFunctions/IAggregateFunction.cpp b/src/AggregateFunctions/IAggregateFunction.cpp
index ea4f8338fb8..25d2a9a4530 100644
--- a/src/AggregateFunctions/IAggregateFunction.cpp
+++ b/src/AggregateFunctions/IAggregateFunction.cpp
@@ -59,6 +59,13 @@ bool IAggregateFunction::haveEqualArgumentTypes(const IAggregateFunction & rhs)
 }
 
 bool IAggregateFunction::haveSameStateRepresentation(const IAggregateFunction & rhs) const
+{
+    const auto & lhs_base = getBaseAggregateFunctionWithSameStateRepresentation();
+    const auto & rhs_base = rhs.getBaseAggregateFunctionWithSameStateRepresentation();
+    return lhs_base.haveSameStateRepresentationImpl(rhs_base);
+}
+
+bool IAggregateFunction::haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const
 {
     bool res = getName() == rhs.getName()
         && parameters == rhs.parameters
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index cdb3b2f32b7..87cb1006d36 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -73,13 +73,19 @@ public:
     /// Get the data type of internal state. By default it is AggregateFunction(name(params), argument_types...).
     virtual DataTypePtr getStateType() const;
 
+    /// Same as the above but normalize state types so that variants with the same binary representation will use the same type.
+    virtual DataTypePtr getNormalizedStateType() const { return getStateType(); }
+
     /// Returns true if two aggregate functions have the same state representation in memory and the same serialization,
     /// so state of one aggregate function can be safely used with another.
     /// Examples:
     ///  - quantile(x), quantile(a)(x), quantile(b)(x) - parameter doesn't affect state and used for finalization only
     ///  - foo(x) and fooIf(x) - If combinator doesn't affect state
     /// By default returns true only if functions have exactly the same names, combinators and parameters.
-    virtual bool haveSameStateRepresentation(const IAggregateFunction & rhs) const;
+    bool haveSameStateRepresentation(const IAggregateFunction & rhs) const;
+    virtual bool haveSameStateRepresentationImpl(const IAggregateFunction & rhs) const;
+
+    virtual const IAggregateFunction & getBaseAggregateFunctionWithSameStateRepresentation() const { return *this; }
 
     bool haveEqualArgumentTypes(const IAggregateFunction & rhs) const;
 
diff --git a/src/Backups/BackupIO.h b/src/Backups/BackupIO.h
index 433e81a70a2..389df97502a 100644
--- a/src/Backups/BackupIO.h
+++ b/src/Backups/BackupIO.h
@@ -8,21 +8,22 @@ class SeekableReadBuffer;
 class WriteBuffer;
 
 /// Represents operations of loading from disk or downloading for reading a backup.
-class IBackupReader /// BackupReaderFile, BackupReaderDisk, BackupReaderS3
+class IBackupReader /// BackupReaderFile, BackupReaderDisk
 {
 public:
     virtual ~IBackupReader() = default;
     virtual bool fileExists(const String & file_name) = 0;
-    virtual size_t getFileSize(const String & file_name) = 0;
+    virtual UInt64 getFileSize(const String & file_name) = 0;
     virtual std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) = 0;
 };
 
 /// Represents operations of storing to disk or uploading for writing a backup.
-class IBackupWriter /// BackupWriterFile, BackupWriterDisk, BackupWriterS3
+class IBackupWriter /// BackupWriterFile, BackupWriterDisk
 {
 public:
     virtual ~IBackupWriter() = default;
     virtual bool fileExists(const String & file_name) = 0;
+    virtual UInt64 getFileSize(const String & file_name) = 0;
     virtual bool fileContentsEqual(const String & file_name, const String & expected_file_contents) = 0;
     virtual std::unique_ptr<WriteBuffer> writeFile(const String & file_name) = 0;
     virtual void removeFiles(const Strings & file_names) = 0;
diff --git a/src/Backups/BackupIO_Disk.cpp b/src/Backups/BackupIO_Disk.cpp
index 537bc667cd4..22a86825387 100644
--- a/src/Backups/BackupIO_Disk.cpp
+++ b/src/Backups/BackupIO_Disk.cpp
@@ -17,7 +17,7 @@ bool BackupReaderDisk::fileExists(const String & file_name)
     return disk->exists(path / file_name);
 }
 
-size_t BackupReaderDisk::getFileSize(const String & file_name)
+UInt64 BackupReaderDisk::getFileSize(const String & file_name)
 {
     return disk->getFileSize(path / file_name);
 }
@@ -38,6 +38,11 @@ bool BackupWriterDisk::fileExists(const String & file_name)
     return disk->exists(path / file_name);
 }
 
+UInt64 BackupWriterDisk::getFileSize(const String & file_name)
+{
+    return disk->getFileSize(path / file_name);
+}
+
 bool BackupWriterDisk::fileContentsEqual(const String & file_name, const String & expected_file_contents)
 {
     if (!disk->exists(path / file_name))
diff --git a/src/Backups/BackupIO_Disk.h b/src/Backups/BackupIO_Disk.h
index 8ba99470938..53412e6d219 100644
--- a/src/Backups/BackupIO_Disk.h
+++ b/src/Backups/BackupIO_Disk.h
@@ -15,7 +15,7 @@ public:
     ~BackupReaderDisk() override;
 
     bool fileExists(const String & file_name) override;
-    size_t getFileSize(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
     std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) override;
 
 private:
@@ -30,6 +30,7 @@ public:
     ~BackupWriterDisk() override;
 
     bool fileExists(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
     bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
     std::unique_ptr<WriteBuffer> writeFile(const String & file_name) override;
     void removeFiles(const Strings & file_names) override;
diff --git a/src/Backups/BackupIO_File.cpp b/src/Backups/BackupIO_File.cpp
index 774d493ee38..7c08c150474 100644
--- a/src/Backups/BackupIO_File.cpp
+++ b/src/Backups/BackupIO_File.cpp
@@ -18,7 +18,7 @@ bool BackupReaderFile::fileExists(const String & file_name)
     return fs::exists(path / file_name);
 }
 
-size_t BackupReaderFile::getFileSize(const String & file_name)
+UInt64 BackupReaderFile::getFileSize(const String & file_name)
 {
     return fs::file_size(path / file_name);
 }
@@ -39,6 +39,11 @@ bool BackupWriterFile::fileExists(const String & file_name)
     return fs::exists(path / file_name);
 }
 
+UInt64 BackupWriterFile::getFileSize(const String & file_name)
+{
+    return fs::file_size(path / file_name);
+}
+
 bool BackupWriterFile::fileContentsEqual(const String & file_name, const String & expected_file_contents)
 {
     if (!fs::exists(path / file_name))
diff --git a/src/Backups/BackupIO_File.h b/src/Backups/BackupIO_File.h
index aebf2bdab73..5d37408e6d8 100644
--- a/src/Backups/BackupIO_File.h
+++ b/src/Backups/BackupIO_File.h
@@ -13,7 +13,7 @@ public:
     ~BackupReaderFile() override;
 
     bool fileExists(const String & file_name) override;
-    size_t getFileSize(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
     std::unique_ptr<SeekableReadBuffer> readFile(const String & file_name) override;
 
 private:
@@ -27,6 +27,7 @@ public:
     ~BackupWriterFile() override;
 
     bool fileExists(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
     bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
     std::unique_ptr<WriteBuffer> writeFile(const String & file_name) override;
     void removeFiles(const Strings & file_names) override;
diff --git a/src/Backups/BackupImpl.cpp b/src/Backups/BackupImpl.cpp
index d445ef9d52c..263aab2bd50 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -219,10 +219,7 @@ void BackupImpl::open(const ContextPtr & context)
 void BackupImpl::close()
 {
     std::lock_guard lock{mutex};
-
-    archive_readers.clear();
-    for (auto & archive_writer : archive_writers)
-        archive_writer = {"", nullptr};
+    closeArchives();
 
     if (!is_internal_backup && writer && !writing_finalized)
         removeAllFilesAfterFailure();
@@ -232,10 +229,29 @@ void BackupImpl::close()
     coordination.reset();
 }
 
-time_t BackupImpl::getTimestamp() const
+void BackupImpl::closeArchives()
+{
+    archive_readers.clear();
+    for (auto & archive_writer : archive_writers)
+        archive_writer = {"", nullptr};
+}
+
+size_t BackupImpl::getNumFiles() const
 {
     std::lock_guard lock{mutex};
-    return timestamp;
+    return num_files;
+}
+
+UInt64 BackupImpl::getUncompressedSize() const
+{
+    std::lock_guard lock{mutex};
+    return uncompressed_size;
+}
+
+UInt64 BackupImpl::getCompressedSize() const
+{
+    std::lock_guard lock{mutex};
+    return compressed_size;
 }
 
 void BackupImpl::writeBackupMetadata()
@@ -290,6 +306,7 @@ void BackupImpl::writeBackupMetadata()
             if (info.pos_in_archive != static_cast<size_t>(-1))
                 config->setUInt64(prefix + "pos_in_archive", info.pos_in_archive);
         }
+        increaseUncompressedSize(info);
         ++index;
     }
 
@@ -306,6 +323,8 @@ void BackupImpl::writeBackupMetadata()
         out = writer->writeFile(".backup");
     out->write(str.data(), str.size());
     out->finalize();
+
+    increaseUncompressedSize(str.size());
 }
 
 void BackupImpl::readBackupMetadata()
@@ -315,6 +334,7 @@ void BackupImpl::readBackupMetadata()
     {
         if (!reader->fileExists(archive_params.archive_name))
             throw Exception(ErrorCodes::BACKUP_NOT_FOUND, "Backup {} not found", backup_name);
+        setCompressedSize();
         in = getArchiveReader("")->readFile(".backup");
     }
     else
@@ -326,6 +346,7 @@ void BackupImpl::readBackupMetadata()
 
     String str;
     readStringUntilEOF(str, *in);
+    increaseUncompressedSize(str.size());
     std::istringstream stream(str); // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     Poco::AutoPtr<Poco::Util::XMLConfiguration> config{new Poco::Util::XMLConfiguration()};
     config->load(stream);
@@ -382,8 +403,12 @@ void BackupImpl::readBackupMetadata()
             }
 
             coordination->addFileInfo(info);
+            increaseUncompressedSize(info);
         }
     }
+
+    if (!use_archives)
+        setCompressedSize();
 }
 
 void BackupImpl::checkBackupDoesntExist() const
@@ -750,6 +775,8 @@ void BackupImpl::finalizeWriting()
     {
         LOG_TRACE(log, "Finalizing backup {}", backup_name);
         writeBackupMetadata();
+        closeArchives();
+        setCompressedSize();
         removeLockFile();
         LOG_TRACE(log, "Finalized backup {}", backup_name);
     }
@@ -758,12 +785,32 @@ void BackupImpl::finalizeWriting()
 }
 
 
+void BackupImpl::increaseUncompressedSize(UInt64 file_size)
+{
+    uncompressed_size += file_size;
+    ++num_files;
+}
+
+void BackupImpl::increaseUncompressedSize(const FileInfo & info)
+{
+    if ((info.size > info.base_size) && (info.data_file_name.empty() || (info.data_file_name == info.file_name)))
+        increaseUncompressedSize(info.size - info.base_size);
+}
+
+void BackupImpl::setCompressedSize()
+{
+    if (use_archives)
+        compressed_size = writer ? writer->getFileSize(archive_params.archive_name) : reader->getFileSize(archive_params.archive_name);
+    else
+        compressed_size = uncompressed_size;
+}
+
+
 String BackupImpl::getArchiveNameWithSuffix(const String & suffix) const
 {
     return archive_params.archive_name + (suffix.empty() ? "" : ".") + suffix;
 }
 
-
 std::shared_ptr<IArchiveReader> BackupImpl::getArchiveReader(const String & suffix) const
 {
     auto it = archive_readers.find(suffix);
@@ -796,6 +843,7 @@ std::shared_ptr<IArchiveWriter> BackupImpl::getArchiveWriter(const String & suff
     return new_archive_writer;
 }
 
+
 void BackupImpl::removeAllFilesAfterFailure()
 {
     if (is_internal_backup)
diff --git a/src/Backups/BackupImpl.h b/src/Backups/BackupImpl.h
index ac0662c62c1..525aec2fcd6 100644
--- a/src/Backups/BackupImpl.h
+++ b/src/Backups/BackupImpl.h
@@ -55,8 +55,11 @@ public:
 
     const String & getName() const override { return backup_name; }
     OpenMode getOpenMode() const override { return open_mode; }
-    time_t getTimestamp() const override;
+    time_t getTimestamp() const override { return timestamp; }
     UUID getUUID() const override { return *uuid; }
+    size_t getNumFiles() const override;
+    UInt64 getUncompressedSize() const override;
+    UInt64 getCompressedSize() const override;
     Strings listFiles(const String & directory, bool recursive) const override;
     bool hasFiles(const String & directory) const override;
     bool fileExists(const String & file_name) const override;
@@ -76,6 +79,7 @@ private:
 
     void open(const ContextPtr & context);
     void close();
+    void closeArchives();
 
     /// Writes the file ".backup" containing backup's metadata.
     void writeBackupMetadata();
@@ -96,6 +100,13 @@ private:
     std::shared_ptr<IArchiveReader> getArchiveReader(const String & suffix) const;
     std::shared_ptr<IArchiveWriter> getArchiveWriter(const String & suffix);
 
+    /// Increases `uncompressed_size` by a specific value and `num_files` by 1.
+    void increaseUncompressedSize(UInt64 file_size);
+    void increaseUncompressedSize(const FileInfo & info);
+
+    /// Calculates and sets `compressed_size`.
+    void setCompressedSize();
+
     const String backup_name;
     const ArchiveParams archive_params;
     const bool use_archives;
@@ -108,6 +119,9 @@ private:
     mutable std::mutex mutex;
     std::optional<UUID> uuid;
     time_t timestamp = 0;
+    size_t num_files = 0;
+    UInt64 uncompressed_size = 0;
+    UInt64 compressed_size = 0;
     UInt64 version;
     std::optional<BackupInfo> base_backup_info;
     std::shared_ptr<const IBackup> base_backup;
diff --git a/src/Backups/BackupSettings.cpp b/src/Backups/BackupSettings.cpp
index a9ba7cb5f74..a4b20e0b863 100644
--- a/src/Backups/BackupSettings.cpp
+++ b/src/Backups/BackupSettings.cpp
@@ -60,6 +60,7 @@ namespace
 
 /// List of backup settings except base_backup_name and cluster_host_ids.
 #define LIST_OF_BACKUP_SETTINGS(M) \
+    M(String, id) \
     M(String, compression_method) \
     M(Int64, compression_level) \
     M(String, password) \
diff --git a/src/Backups/BackupSettings.h b/src/Backups/BackupSettings.h
index 4e2bad67fce..5c5f336aa45 100644
--- a/src/Backups/BackupSettings.h
+++ b/src/Backups/BackupSettings.h
@@ -11,6 +11,9 @@ class ASTBackupQuery;
 /// Settings specified in the "SETTINGS" clause of a BACKUP query.
 struct BackupSettings
 {
+    /// ID of the backup operation, to identify it in the system.backups table. Auto-generated if not set.
+    String id;
+
     /// Base backup, if it's set an incremental backup will be built. That means only differences made after the base backup will be put
     /// into a new backup.
     std::optional<BackupInfo> base_backup_info;
diff --git a/src/Backups/BackupStatus.cpp b/src/Backups/BackupStatus.cpp
index dd1f70dd20b..53adaa577ea 100644
--- a/src/Backups/BackupStatus.cpp
+++ b/src/Backups/BackupStatus.cpp
@@ -15,18 +15,18 @@ std::string_view toString(BackupStatus backup_status)
 {
     switch (backup_status)
     {
-        case BackupStatus::MAKING_BACKUP:
-            return "MAKING_BACKUP";
-        case BackupStatus::BACKUP_COMPLETE:
-            return "BACKUP_COMPLETE";
-        case BackupStatus::FAILED_TO_BACKUP:
-            return "FAILED_TO_BACKUP";
+        case BackupStatus::CREATING_BACKUP:
+            return "CREATING_BACKUP";
+        case BackupStatus::BACKUP_CREATED:
+            return "BACKUP_CREATED";
+        case BackupStatus::BACKUP_FAILED:
+            return "BACKUP_FAILED";
         case BackupStatus::RESTORING:
             return "RESTORING";
         case BackupStatus::RESTORED:
             return "RESTORED";
-        case BackupStatus::FAILED_TO_RESTORE:
-            return "FAILED_TO_RESTORE";
+        case BackupStatus::RESTORE_FAILED:
+            return "RESTORE_FAILED";
         default:
             break;
     }
diff --git a/src/Backups/BackupStatus.h b/src/Backups/BackupStatus.h
index 3382b6b55d1..0afe6efe899 100644
--- a/src/Backups/BackupStatus.h
+++ b/src/Backups/BackupStatus.h
@@ -9,14 +9,14 @@ namespace DB
 enum class BackupStatus
 {
     /// Statuses of making backups
-    MAKING_BACKUP,
-    BACKUP_COMPLETE,
-    FAILED_TO_BACKUP,
+    CREATING_BACKUP,
+    BACKUP_CREATED,
+    BACKUP_FAILED,
 
     /// Status of restoring
     RESTORING,
     RESTORED,
-    FAILED_TO_RESTORE,
+    RESTORE_FAILED,
 
     MAX,
 };
diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index cd505ed587c..add23411d8f 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -27,9 +27,11 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
 }
 
+using OperationID = BackupsWorker::OperationID;
 namespace Stage = BackupCoordinationStage;
 
 namespace
@@ -92,10 +94,21 @@ namespace
         }
     }
 
+    bool isFinalStatus(BackupStatus status)
+    {
+        return (status == BackupStatus::BACKUP_CREATED) || (status == BackupStatus::BACKUP_FAILED) || (status == BackupStatus::RESTORED)
+            || (status == BackupStatus::RESTORE_FAILED);
+    }
+
+    bool isErrorStatus(BackupStatus status)
+    {
+        return (status == BackupStatus::BACKUP_FAILED) || (status == BackupStatus::RESTORE_FAILED);
+    }
+
     /// Used to change num_active_backups.
     size_t getNumActiveBackupsChange(BackupStatus status)
     {
-        return status == BackupStatus::MAKING_BACKUP;
+        return status == BackupStatus::CREATING_BACKUP;
     }
 
     /// Used to change num_active_restores.
@@ -115,7 +128,7 @@ BackupsWorker::BackupsWorker(size_t num_backup_threads, size_t num_restore_threa
 }
 
 
-std::pair<UUID, bool> BackupsWorker::start(const ASTPtr & backup_or_restore_query, ContextMutablePtr context)
+OperationID BackupsWorker::start(const ASTPtr & backup_or_restore_query, ContextMutablePtr context)
 {
     const ASTBackupQuery & backup_query = typeid_cast<const ASTBackupQuery &>(*backup_or_restore_query);
     if (backup_query.kind == ASTBackupQuery::Kind::BACKUP)
@@ -125,17 +138,24 @@ std::pair<UUID, bool> BackupsWorker::start(const ASTPtr & backup_or_restore_quer
 }
 
 
-std::pair<UUID, bool> BackupsWorker::startMakingBackup(const ASTPtr & query, const ContextPtr & context)
+OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const ContextPtr & context)
 {
     auto backup_query = std::static_pointer_cast<ASTBackupQuery>(query->clone());
     auto backup_settings = BackupSettings::fromBackupQuery(*backup_query);
 
     if (!backup_settings.backup_uuid)
         backup_settings.backup_uuid = UUIDHelpers::generateV4();
-    UUID backup_uuid = *backup_settings.backup_uuid;
+
+    /// `backup_id` will be used as a key to the `infos` map, so it should be unique.
+    OperationID backup_id;
+    if (backup_settings.internal)
+        backup_id = "internal-" + toString(UUIDHelpers::generateV4()); /// Always generate `backup_id` for internal backup to avoid collision if both internal and non-internal backups are on the same host
+    else if (!backup_settings.id.empty())
+        backup_id = backup_settings.id;
+    else
+        backup_id = toString(*backup_settings.backup_uuid);
 
     std::shared_ptr<IBackupCoordination> backup_coordination;
-
     if (backup_settings.internal)
     {
         /// The following call of makeBackupCoordination() is not essential because doBackup() will later create a backup coordination
@@ -147,7 +167,7 @@ std::pair<UUID, bool> BackupsWorker::startMakingBackup(const ASTPtr & query, con
     try
     {
         auto backup_info = BackupInfo::fromAST(*backup_query->backup_name);
-        addInfo(backup_uuid, backup_settings.internal, backup_info.toString(), BackupStatus::MAKING_BACKUP);
+        addInfo(backup_id, backup_info.toString(), backup_settings.internal, BackupStatus::CREATING_BACKUP);
 
         /// Prepare context to use.
         ContextPtr context_in_use = context;
@@ -163,10 +183,11 @@ std::pair<UUID, bool> BackupsWorker::startMakingBackup(const ASTPtr & query, con
         if (backup_settings.async)
         {
             backups_thread_pool.scheduleOrThrowOnError(
-                [this, backup_uuid, backup_query, backup_settings, backup_info, backup_coordination, context_in_use, mutable_context] {
+                [this, backup_query, backup_id, backup_settings, backup_info, backup_coordination, context_in_use, mutable_context]
+                {
                     doBackup(
-                        backup_uuid,
                         backup_query,
+                        backup_id,
                         backup_settings,
                         backup_info,
                         backup_coordination,
@@ -178,8 +199,8 @@ std::pair<UUID, bool> BackupsWorker::startMakingBackup(const ASTPtr & query, con
         else
         {
             doBackup(
-                backup_uuid,
                 backup_query,
+                backup_id,
                 backup_settings,
                 backup_info,
                 backup_coordination,
@@ -188,12 +209,12 @@ std::pair<UUID, bool> BackupsWorker::startMakingBackup(const ASTPtr & query, con
                 /* called_async= */ false);
         }
 
-        return {backup_uuid, backup_settings.internal};
+        return backup_id;
     }
     catch (...)
     {
         /// Something bad happened, the backup has not built.
-        setStatus(backup_uuid, backup_settings.internal, BackupStatus::FAILED_TO_BACKUP);
+        setStatusSafe(backup_id, BackupStatus::BACKUP_FAILED);
         sendCurrentExceptionToCoordination(backup_coordination, backup_settings.host_id);
         throw;
     }
@@ -201,8 +222,8 @@ std::pair<UUID, bool> BackupsWorker::startMakingBackup(const ASTPtr & query, con
 
 
 void BackupsWorker::doBackup(
-    const UUID & backup_uuid,
     const std::shared_ptr<ASTBackupQuery> & backup_query,
+    const OperationID & backup_id,
     BackupSettings backup_settings,
     const BackupInfo & backup_info,
     std::shared_ptr<IBackupCoordination> backup_coordination,
@@ -237,7 +258,7 @@ void BackupsWorker::doBackup(
             if (backup_settings.coordination_zk_path.empty())
             {
                 String root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
-                backup_settings.coordination_zk_path = root_zk_path + "/backup-" + toString(backup_uuid);
+                backup_settings.coordination_zk_path = root_zk_path + "/backup-" + toString(*backup_settings.backup_uuid);
             }
         }
 
@@ -256,7 +277,7 @@ void BackupsWorker::doBackup(
         backup_create_params.password = backup_settings.password;
         backup_create_params.is_internal_backup = backup_settings.internal;
         backup_create_params.backup_coordination = backup_coordination;
-        backup_create_params.backup_uuid = backup_uuid;
+        backup_create_params.backup_uuid = backup_settings.backup_uuid;
         BackupMutablePtr backup = BackupFactory::instance().createBackup(backup_create_params);
 
         /// Write the backup.
@@ -297,15 +318,25 @@ void BackupsWorker::doBackup(
             backup_coordination->setStage(backup_settings.host_id, Stage::COMPLETED, "");
         }
 
+        size_t num_files = 0;
+        UInt64 uncompressed_size = 0;
+        UInt64 compressed_size = 0;
+
         /// Finalize backup (write its metadata).
         if (!backup_settings.internal)
+        {
             backup->finalizeWriting();
+            num_files = backup->getNumFiles();
+            uncompressed_size = backup->getUncompressedSize();
+            compressed_size = backup->getCompressedSize();
+        }
 
         /// Close the backup.
         backup.reset();
 
         LOG_INFO(log, "{} {} was created successfully", (backup_settings.internal ? "Internal backup" : "Backup"), backup_info.toString());
-        setStatus(backup_uuid, backup_settings.internal, BackupStatus::BACKUP_COMPLETE);
+        setStatus(backup_id, BackupStatus::BACKUP_CREATED);
+        setNumFilesAndSize(backup_id, num_files, uncompressed_size, compressed_size);
     }
     catch (...)
     {
@@ -313,7 +344,7 @@ void BackupsWorker::doBackup(
         if (called_async)
         {
             tryLogCurrentException(log, fmt::format("Failed to make {} {}", (backup_settings.internal ? "internal backup" : "backup"), backup_info.toString()));
-            setStatus(backup_uuid, backup_settings.internal, BackupStatus::FAILED_TO_BACKUP);
+            setStatusSafe(backup_id, BackupStatus::BACKUP_FAILED);
             sendCurrentExceptionToCoordination(backup_coordination, backup_settings.host_id);
         }
         else
@@ -325,14 +356,21 @@ void BackupsWorker::doBackup(
 }
 
 
-std::pair<UUID, bool> BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePtr context)
+OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePtr context)
 {
     auto restore_query = std::static_pointer_cast<ASTBackupQuery>(query->clone());
     auto restore_settings = RestoreSettings::fromRestoreQuery(*restore_query);
-    UUID restore_uuid = UUIDHelpers::generateV4();
+
+    /// `restore_id` will be used as a key to the `infos` map, so it should be unique.
+    OperationID restore_id;
+    if (restore_settings.internal)
+        restore_id = "internal-" + toString(UUIDHelpers::generateV4()); /// Always generate `restore_id` for internal restore to avoid collision if both internal and non-internal restores are on the same host
+    else if (!restore_settings.id.empty())
+        restore_id = restore_settings.id;
+    else
+        restore_id = toString(UUIDHelpers::generateV4());
 
     std::shared_ptr<IRestoreCoordination> restore_coordination;
-
     if (restore_settings.internal)
     {
         /// The following call of makeRestoreCoordination() is not essential because doRestore() will later create a restore coordination
@@ -344,7 +382,7 @@ std::pair<UUID, bool> BackupsWorker::startRestoring(const ASTPtr & query, Contex
     try
     {
         auto backup_info = BackupInfo::fromAST(*restore_query->backup_name);
-        addInfo(restore_uuid, restore_settings.internal, backup_info.toString(), BackupStatus::RESTORING);
+        addInfo(restore_id, backup_info.toString(), restore_settings.internal, BackupStatus::RESTORING);
 
         /// Prepare context to use.
         ContextMutablePtr context_in_use = context;
@@ -359,10 +397,10 @@ std::pair<UUID, bool> BackupsWorker::startRestoring(const ASTPtr & query, Contex
         if (restore_settings.async)
         {
             backups_thread_pool.scheduleOrThrowOnError(
-                [this, restore_uuid, restore_query, restore_settings, backup_info, restore_coordination, context_in_use] {
+                [this, restore_query, restore_id, restore_settings, backup_info, restore_coordination, context_in_use] {
                     doRestore(
-                        restore_uuid,
                         restore_query,
+                        restore_id,
                         restore_settings,
                         backup_info,
                         restore_coordination,
@@ -373,8 +411,8 @@ std::pair<UUID, bool> BackupsWorker::startRestoring(const ASTPtr & query, Contex
         else
         {
             doRestore(
-                restore_uuid,
                 restore_query,
+                restore_id,
                 restore_settings,
                 backup_info,
                 restore_coordination,
@@ -382,12 +420,12 @@ std::pair<UUID, bool> BackupsWorker::startRestoring(const ASTPtr & query, Contex
                 /* called_async= */ false);
         }
 
-        return {restore_uuid, restore_settings.internal};
+        return restore_id;
     }
     catch (...)
     {
         /// Something bad happened, the backup has not built.
-        setStatus(restore_uuid, restore_settings.internal, BackupStatus::FAILED_TO_RESTORE);
+        setStatusSafe(restore_id, BackupStatus::RESTORE_FAILED);
         sendCurrentExceptionToCoordination(restore_coordination, restore_settings.host_id);
         throw;
     }
@@ -395,8 +433,8 @@ std::pair<UUID, bool> BackupsWorker::startRestoring(const ASTPtr & query, Contex
 
 
 void BackupsWorker::doRestore(
-    const UUID & restore_uuid,
     const std::shared_ptr<ASTBackupQuery> & restore_query,
+    const OperationID & restore_id,
     RestoreSettings restore_settings,
     const BackupInfo & backup_info,
     std::shared_ptr<IRestoreCoordination> restore_coordination,
@@ -421,6 +459,8 @@ void BackupsWorker::doRestore(
         backup_open_params.password = restore_settings.password;
         BackupPtr backup = BackupFactory::instance().createBackup(backup_open_params);
 
+        setNumFilesAndSize(restore_id, backup->getNumFiles(), backup->getUncompressedSize(), backup->getCompressedSize());
+
         String current_database = context->getCurrentDatabase();
 
         /// Checks access rights if this is ON CLUSTER query.
@@ -453,7 +493,7 @@ void BackupsWorker::doRestore(
         if (on_cluster && restore_settings.coordination_zk_path.empty())
         {
             String root_zk_path = context->getConfigRef().getString("backups.zookeeper_path", "/clickhouse/backups");
-            restore_settings.coordination_zk_path = root_zk_path + "/restore-" + toString(restore_uuid);
+            restore_settings.coordination_zk_path = root_zk_path + "/restore-" + toString(UUIDHelpers::generateV4());
         }
 
         if (!restore_coordination)
@@ -500,7 +540,7 @@ void BackupsWorker::doRestore(
         }
 
         LOG_INFO(log, "Restored from {} {} successfully", (restore_settings.internal ? "internal backup" : "backup"), backup_info.toString());
-        setStatus(restore_uuid, restore_settings.internal, BackupStatus::RESTORED);
+        setStatus(restore_id, BackupStatus::RESTORED);
     }
     catch (...)
     {
@@ -508,7 +548,7 @@ void BackupsWorker::doRestore(
         if (called_async)
         {
             tryLogCurrentException(log, fmt::format("Failed to restore from {} {}", (restore_settings.internal ? "internal backup" : "backup"), backup_info.toString()));
-            setStatus(restore_uuid, restore_settings.internal, BackupStatus::FAILED_TO_RESTORE);
+            setStatusSafe(restore_id, BackupStatus::RESTORE_FAILED);
             sendCurrentExceptionToCoordination(restore_coordination, restore_settings.host_id);
         }
         else
@@ -520,63 +560,103 @@ void BackupsWorker::doRestore(
 }
 
 
-void BackupsWorker::addInfo(const UUID & uuid, bool internal, const String & backup_name, BackupStatus status)
+void BackupsWorker::addInfo(const OperationID & id, const String & name, bool internal, BackupStatus status)
 {
     Info info;
-    info.uuid = uuid;
-    info.backup_name = backup_name;
-    info.status = status;
-    info.status_changed_time = time(nullptr);
+    info.id = id;
+    info.name = name;
     info.internal = internal;
+    info.status = status;
+    info.start_time = std::chrono::system_clock::now();
+
+    if (isFinalStatus(status))
+        info.end_time = info.start_time;
 
     std::lock_guard lock{infos_mutex};
-    bool inserted = infos.try_emplace({uuid, internal}, std::move(info)).second;
-    if (!inserted)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pair of UUID={} and internal={} is already in use", uuid, internal);
+
+    auto it = infos.find(id);
+    if (it != infos.end())
+    {
+        /// It's better not allow to overwrite the current status if it's in progress.
+        auto current_status = it->second.status;
+        if (!isFinalStatus(current_status))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot start a backup or restore: ID {} is already in use", id);
+    }
+
+    infos[id] = std::move(info);
 
     num_active_backups += getNumActiveBackupsChange(status);
     num_active_restores += getNumActiveRestoresChange(status);
 }
 
 
-void BackupsWorker::setStatus(const UUID & uuid, bool internal, BackupStatus status)
+void BackupsWorker::setStatus(const String & id, BackupStatus status, bool throw_if_error)
 {
     std::lock_guard lock{infos_mutex};
-    auto it = infos.find({uuid, internal});
+    auto it = infos.find(id);
     if (it == infos.end())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown pair of UUID={} and internal={}", uuid, internal);
+    {
+        if (throw_if_error)
+           throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
+        else
+            return;
+    }
 
     auto & info = it->second;
     auto old_status = info.status;
+
     info.status = status;
-    info.status_changed_time = time(nullptr);
+
+    if (isFinalStatus(status))
+        info.end_time = std::chrono::system_clock::now();
+
+    if (isErrorStatus(status))
+    {
+        info.error_message = getCurrentExceptionMessage(false);
+        info.exception = std::current_exception();
+    }
+
     num_active_backups += getNumActiveBackupsChange(status) - getNumActiveBackupsChange(old_status);
     num_active_restores += getNumActiveRestoresChange(status) - getNumActiveRestoresChange(old_status);
 }
 
 
-void BackupsWorker::wait(const UUID & backup_or_restore_uuid, bool internal, bool rethrow_exception)
+void BackupsWorker::setNumFilesAndSize(const String & id, size_t num_files, UInt64 uncompressed_size, UInt64 compressed_size)
+{
+    std::lock_guard lock{infos_mutex};
+    auto it = infos.find(id);
+    if (it == infos.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
+
+    auto & info = it->second;
+    info.num_files = num_files;
+    info.uncompressed_size = uncompressed_size;
+    info.compressed_size = compressed_size;
+}
+
+
+void BackupsWorker::wait(const OperationID & id, bool rethrow_exception)
 {
     std::unique_lock lock{infos_mutex};
     status_changed.wait(lock, [&]
     {
-        auto it = infos.find({backup_or_restore_uuid, internal});
+        auto it = infos.find(id);
         if (it == infos.end())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown pair of UUID={} and internal={}", backup_or_restore_uuid, internal);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
         const auto & info = it->second;
         auto current_status = info.status;
-        if (rethrow_exception && ((current_status == BackupStatus::FAILED_TO_BACKUP) || (current_status == BackupStatus::FAILED_TO_RESTORE)))
+        if (rethrow_exception && isErrorStatus(current_status))
             std::rethrow_exception(info.exception);
-        return (current_status == BackupStatus::BACKUP_COMPLETE) || (current_status == BackupStatus::RESTORED);
+        return isFinalStatus(current_status);
     });
 }
 
-BackupsWorker::Info BackupsWorker::getInfo(const UUID & backup_or_restore_uuid, bool internal) const
+BackupsWorker::Info BackupsWorker::getInfo(const OperationID & id) const
 {
     std::lock_guard lock{infos_mutex};
-    auto it = infos.find({backup_or_restore_uuid, internal});
+    auto it = infos.find(id);
     if (it == infos.end())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown pair of UUID={} and internal={}", backup_or_restore_uuid, internal);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
     return it->second;
 }
 
@@ -585,20 +665,23 @@ std::vector<BackupsWorker::Info> BackupsWorker::getAllInfos() const
     std::vector<Info> res_infos;
     std::lock_guard lock{infos_mutex};
     for (const auto & info : infos | boost::adaptors::map_values)
-        res_infos.push_back(info);
+    {
+        if (!info.internal)
+            res_infos.push_back(info);
+    }
     return res_infos;
 }
 
 void BackupsWorker::shutdown()
 {
-    bool has_active_backups_or_restores = (num_active_backups || num_active_restores);
-    if (has_active_backups_or_restores)
+    bool has_active_backups_and_restores = (num_active_backups || num_active_restores);
+    if (has_active_backups_and_restores)
         LOG_INFO(log, "Waiting for {} backups and {} restores to be finished", num_active_backups, num_active_restores);
 
     backups_thread_pool.wait();
     restores_thread_pool.wait();
 
-    if (has_active_backups_or_restores)
+    if (has_active_backups_and_restores)
         LOG_INFO(log, "All backup and restore tasks have finished");
 }
 
diff --git a/src/Backups/BackupsWorker.h b/src/Backups/BackupsWorker.h
index 7db62633412..54b20c1df90 100644
--- a/src/Backups/BackupsWorker.h
+++ b/src/Backups/BackupsWorker.h
@@ -28,55 +28,72 @@ public:
     /// Waits until all tasks have been completed.
     void shutdown();
 
-    /// Starts executing a BACKUP or RESTORE query. Returns UUID of the operation.
-    std::pair<UUID, bool> start(const ASTPtr & backup_or_restore_query, ContextMutablePtr context);
+    /// Backup's or restore's operation ID, can be either passed via SETTINGS id=... or be randomly generated UUID.
+    using OperationID = String;
+
+    /// Starts executing a BACKUP or RESTORE query. Returns ID of the operation.
+    OperationID start(const ASTPtr & backup_or_restore_query, ContextMutablePtr context);
 
     /// Waits until a BACKUP or RESTORE query started by start() is finished.
     /// The function returns immediately if the operation is already finished.
-    void wait(const UUID & backup_or_restore_uuid, bool internal, bool rethrow_exception = true);
+    void wait(const OperationID & backup_or_restore_id, bool rethrow_exception = true);
 
     /// Information about executing a BACKUP or RESTORE query started by calling start().
     struct Info
     {
-        UUID uuid;
+        /// Backup's or restore's operation ID, can be either passed via SETTINGS id=... or be randomly generated UUID.
+        OperationID id;
 
         /// Backup's name, a string like "Disk('backups', 'my_backup')"
-        String backup_name;
+        String name;
 
-        BackupStatus status;
-        time_t status_changed_time;
-
-        String error_message;
-        std::exception_ptr exception;
-
-        /// Whether this operation is internal, i.e. caused by another BACKUP or RESTORE operation.
-        /// For example BACKUP ON CLUSTER executes an internal BACKUP commands per each node.
+        /// This operation is internal and should not be shown in system.backups
         bool internal = false;
+
+        /// Status of backup or restore operation.
+        BackupStatus status;
+
+        /// Number of files in the backup (including backup's metadata; only unique files are counted).
+        size_t num_files = 0;
+
+        /// Size of all files in the backup (including backup's metadata; only unique files are counted).
+        UInt64 uncompressed_size = 0;
+
+        /// Size of the backup if it's stored as an archive; or the same as `uncompressed_size` if the backup is stored as a folder.
+        UInt64 compressed_size = 0;
+
+        /// Set only if there was an error.
+        std::exception_ptr exception;
+        String error_message;
+
+        std::chrono::system_clock::time_point start_time;
+        std::chrono::system_clock::time_point end_time;
     };
 
-    Info getInfo(const UUID & backup_or_restore_uuid, bool internal) const;
+    Info getInfo(const OperationID & id) const;
     std::vector<Info> getAllInfos() const;
 
 private:
-    std::pair<UUID, bool> startMakingBackup(const ASTPtr & query, const ContextPtr & context);
+    OperationID startMakingBackup(const ASTPtr & query, const ContextPtr & context);
 
-    void doBackup(const UUID & backup_uuid, const std::shared_ptr<ASTBackupQuery> & backup_query, BackupSettings backup_settings,
+    void doBackup(const std::shared_ptr<ASTBackupQuery> & backup_query, const OperationID & backup_id, BackupSettings backup_settings,
                   const BackupInfo & backup_info, std::shared_ptr<IBackupCoordination> backup_coordination, const ContextPtr & context,
                   ContextMutablePtr mutable_context, bool called_async);
 
-    std::pair<UUID, bool> startRestoring(const ASTPtr & query, ContextMutablePtr context);
+    OperationID startRestoring(const ASTPtr & query, ContextMutablePtr context);
 
-    void doRestore(const UUID & restore_uuid, const std::shared_ptr<ASTBackupQuery> & restore_query, RestoreSettings restore_settings,
-                   const BackupInfo & backup_info, std::shared_ptr<IRestoreCoordination> restore_coordination, ContextMutablePtr context,
-                   bool called_async);
+    void doRestore(const std::shared_ptr<ASTBackupQuery> & restore_query, const OperationID & restore_id, RestoreSettings restore_settings, const BackupInfo & backup_info,
+                   std::shared_ptr<IRestoreCoordination> restore_coordination, ContextMutablePtr context, bool called_async);
 
-    void addInfo(const UUID & uuid, bool internal, const String & backup_name, BackupStatus status);
-    void setStatus(const UUID & uuid, bool internal, BackupStatus status);
+    void addInfo(const OperationID & id, const String & name, bool internal, BackupStatus status);
+    void setStatus(const OperationID & id, BackupStatus status, bool throw_if_error = true);
+    void setStatusSafe(const String & id, BackupStatus status) { setStatus(id, status, false); }
+    void setNumFilesAndSize(const OperationID & id, size_t num_files, UInt64 uncompressed_size, UInt64 compressed_size);
 
     ThreadPool backups_thread_pool;
     ThreadPool restores_thread_pool;
 
-    std::map<std::pair<UUID, bool>, Info> infos;
+    std::unordered_map<OperationID, Info> infos;
     std::condition_variable status_changed;
     std::atomic<size_t> num_active_backups = 0;
     std::atomic<size_t> num_active_restores = 0;
diff --git a/src/Backups/IBackup.h b/src/Backups/IBackup.h
index 467c8fea4cd..a8ddbb5b64d 100644
--- a/src/Backups/IBackup.h
+++ b/src/Backups/IBackup.h
@@ -36,6 +36,15 @@ public:
     /// Returns UUID of the backup.
     virtual UUID getUUID() const = 0;
 
+    /// Returns the number of unique files in the backup.
+    virtual size_t getNumFiles() const = 0;
+
+    /// Returns the total size of unique files in the backup.
+    virtual UInt64 getUncompressedSize() const = 0;
+
+    /// Returns the compressed size of the backup. If the backup is not stored as an archive it returns the same as getUncompressedSize().
+    virtual UInt64 getCompressedSize() const = 0;
+
     /// Returns names of entries stored in a specified directory in the backup.
     /// If `directory` is empty or '/' the functions returns entries in the backup's root.
     virtual Strings listFiles(const String & directory, bool recursive = false) const = 0;
diff --git a/src/Backups/RestoreSettings.cpp b/src/Backups/RestoreSettings.cpp
index efa1fe2cfb8..63915670fa4 100644
--- a/src/Backups/RestoreSettings.cpp
+++ b/src/Backups/RestoreSettings.cpp
@@ -143,6 +143,7 @@ namespace
 
 /// List of restore settings except base_backup_name and cluster_host_ids.
 #define LIST_OF_RESTORE_SETTINGS(M) \
+    M(String, id) \
     M(String, password) \
     M(Bool, structure_only) \
     M(RestoreTableCreationMode, create_table) \
diff --git a/src/Backups/RestoreSettings.h b/src/Backups/RestoreSettings.h
index 1bc5d867a37..713adbe8029 100644
--- a/src/Backups/RestoreSettings.h
+++ b/src/Backups/RestoreSettings.h
@@ -41,6 +41,9 @@ using RestoreUDFCreationMode = RestoreAccessCreationMode;
 /// Settings specified in the "SETTINGS" clause of a RESTORE query.
 struct RestoreSettings
 {
+    /// ID of the restore operation, to identify it in the system.backups table. Auto-generated if not set.
+    String id;
+
     /// Base backup, with this setting we can override the location of the base backup while restoring.
     /// Any incremental backup keeps inside the information about its base backup, so using this setting is optional.
     std::optional<BackupInfo> base_backup_info;
diff --git a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
new file mode 100644
index 00000000000..4f943e47fa9
--- /dev/null
+++ b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
@@ -0,0 +1,273 @@
+#include "ExternalDictionaryLibraryBridgeHelper.h"
+
+#include <Formats/formatBlock.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Formats/FormatFactory.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/ShellCommand.h>
+#include <Common/logger_useful.h>
+#include <base/range.h>
+#include <Core/Field.h>
+#include <Common/escapeForFileName.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXTERNAL_LIBRARY_ERROR;
+    extern const int LOGICAL_ERROR;
+}
+
+ExternalDictionaryLibraryBridgeHelper::ExternalDictionaryLibraryBridgeHelper(
+        ContextPtr context_,
+        const Block & sample_block_,
+        const Field & dictionary_id_,
+        const LibraryInitData & library_data_)
+    : LibraryBridgeHelper(context_->getGlobalContext())
+    , sample_block(sample_block_)
+    , library_data(library_data_)
+    , dictionary_id(dictionary_id_)
+{
+}
+
+
+Poco::URI ExternalDictionaryLibraryBridgeHelper::getPingURI() const
+{
+    auto uri = createBaseURI();
+    uri.setPath(PING_HANDLER);
+    uri.addQueryParameter("dictionary_id", toString(dictionary_id));
+    return uri;
+}
+
+
+Poco::URI ExternalDictionaryLibraryBridgeHelper::getMainURI() const
+{
+    auto uri = createBaseURI();
+    uri.setPath(MAIN_HANDLER);
+    return uri;
+}
+
+
+Poco::URI ExternalDictionaryLibraryBridgeHelper::createRequestURI(const String & method) const
+{
+    auto uri = getMainURI();
+    uri.addQueryParameter("version", std::to_string(LIBRARY_BRIDGE_PROTOCOL_VERSION));
+    uri.addQueryParameter("dictionary_id", toString(dictionary_id));
+    uri.addQueryParameter("method", method);
+    return uri;
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::bridgeHandShake()
+{
+    String result;
+    try
+    {
+        ReadWriteBufferFromHTTP buf(getPingURI(), Poco::Net::HTTPRequest::HTTP_GET, {}, http_timeouts, credentials);
+        readString(result, buf);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        return false;
+    }
+
+    /*
+     * When pinging bridge we also pass current dicionary_id. The bridge will check if there is such
+     * dictionary. It is possible that such dictionary_id is not present only in two cases:
+     * 1. It is dictionary source creation and initialization of library handler on bridge side did not happen yet.
+     * 2. Bridge crashed or restarted for some reason while server did not.
+    **/
+    if (result.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected message from library bridge: {}. Check that bridge and server have the same version.", result);
+
+    UInt8 dictionary_id_exists;
+    auto parsed = tryParse<UInt8>(dictionary_id_exists, result);
+    if (!parsed || (dictionary_id_exists != 0 && dictionary_id_exists != 1))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected message from library bridge: {} ({}). Check that bridge and server have the same version.",
+                        result, parsed ? toString(dictionary_id_exists) : "failed to parse");
+
+    LOG_TRACE(log, "dictionary_id: {}, dictionary_id_exists on bridge side: {}, library confirmed to be initialized on server side: {}",
+              toString(dictionary_id), toString(dictionary_id_exists), library_initialized);
+
+    if (dictionary_id_exists && !library_initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Library was not initialized, but bridge responded to already have dictionary id: {}", dictionary_id);
+
+    /// Here we want to say bridge to recreate a new library handler for current dictionary,
+    /// because it responded to have lost it, but we know that it has already been created. (It is a direct result of bridge crash).
+    if (!dictionary_id_exists && library_initialized)
+    {
+        LOG_WARNING(log, "Library bridge does not have library handler with dictionaty id: {}. It will be reinitialized.", dictionary_id);
+        bool reinitialized = false;
+        try
+        {
+            auto uri = createRequestURI(EXT_DICT_LIB_NEW_METHOD);
+            reinitialized = executeRequest(uri, getInitLibraryCallback());
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log);
+            return false;
+        }
+
+        if (!reinitialized)
+            throw Exception(ErrorCodes::EXTERNAL_LIBRARY_ERROR,
+                            "Failed to reinitialize library handler on bridge side for dictionary with id: {}", dictionary_id);
+    }
+
+    return true;
+}
+
+
+ReadWriteBufferFromHTTP::OutStreamCallback ExternalDictionaryLibraryBridgeHelper::getInitLibraryCallback() const
+{
+    /// Sample block must contain null values
+    WriteBufferFromOwnString out;
+    auto output_format = getContext()->getOutputFormat(ExternalDictionaryLibraryBridgeHelper::DEFAULT_FORMAT, out, sample_block);
+    formatBlock(output_format, sample_block);
+    auto block_string = out.str();
+
+    return [block_string, this](std::ostream & os)
+    {
+        os << "library_path=" << escapeForFileName(library_data.library_path) << "&";
+        os << "library_settings=" << escapeForFileName(library_data.library_settings) << "&";
+        os << "attributes_names=" << escapeForFileName(library_data.dict_attributes) << "&";
+        os << "sample_block=" << escapeForFileName(sample_block.getNamesAndTypesList().toString()) << "&";
+        os << "null_values=" << escapeForFileName(block_string);
+    };
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::initLibrary()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_LIB_NEW_METHOD);
+    library_initialized = executeRequest(uri, getInitLibraryCallback());
+    return library_initialized;
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::cloneLibrary(const Field & other_dictionary_id)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_LIB_CLONE_METHOD);
+    uri.addQueryParameter("from_dictionary_id", toString(other_dictionary_id));
+    /// We also pass initialization settings in order to create a library handler
+    /// in case from_dictionary_id does not exist in bridge side (possible in case of bridge crash).
+    library_initialized = executeRequest(uri, getInitLibraryCallback());
+    return library_initialized;
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::removeLibrary()
+{
+    /// Do not force bridge restart if it is not running in case of removeLibrary
+    /// because in this case after restart it will not have this dictionaty id in memory anyway.
+    if (bridgeHandShake())
+    {
+        auto uri = createRequestURI(EXT_DICT_LIB_DELETE_METHOD);
+        return executeRequest(uri);
+    }
+    return true;
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::isModified()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_IS_MODIFIED_METHOD);
+    return executeRequest(uri);
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::supportsSelectiveLoad()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_SUPPORTS_SELECTIVE_LOAD_METHOD);
+    return executeRequest(uri);
+}
+
+
+QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadAll()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_LOAD_ALL_METHOD);
+    return QueryPipeline(loadBase(uri));
+}
+
+
+static String getDictIdsString(const std::vector<UInt64> & ids)
+{
+    WriteBufferFromOwnString out;
+    writeVectorBinary(ids, out);
+    return out.str();
+}
+
+
+QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadIds(const std::vector<uint64_t> & ids)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_LOAD_IDS_METHOD);
+    uri.addQueryParameter("ids_num", toString(ids.size())); /// Not used parameter, but helpful
+    auto ids_string = getDictIdsString(ids);
+    return QueryPipeline(loadBase(uri, [ids_string](std::ostream & os) { os << ids_string; }));
+}
+
+
+QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadKeys(const Block & requested_block)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(EXT_DICT_LOAD_KEYS_METHOD);
+    /// Sample block to parse block from callback
+    uri.addQueryParameter("requested_block_sample", requested_block.getNamesAndTypesList().toString());
+    ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [requested_block, this](std::ostream & os)
+    {
+        WriteBufferFromOStream out_buffer(os);
+        auto output_format = getContext()->getOutputFormat(ExternalDictionaryLibraryBridgeHelper::DEFAULT_FORMAT, out_buffer, requested_block.cloneEmpty());
+        formatBlock(output_format, requested_block);
+    };
+    return QueryPipeline(loadBase(uri, out_stream_callback));
+}
+
+
+bool ExternalDictionaryLibraryBridgeHelper::executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback) const
+{
+    ReadWriteBufferFromHTTP buf(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        std::move(out_stream_callback),
+        http_timeouts, credentials);
+
+    bool res;
+    readBoolText(res, buf);
+    return res;
+}
+
+
+QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
+{
+    auto read_buf_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        std::move(out_stream_callback),
+        http_timeouts,
+        credentials,
+        0,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        getContext()->getReadSettings(),
+        ReadWriteBufferFromHTTP::HTTPHeaderEntries{});
+
+    auto source = FormatFactory::instance().getInput(ExternalDictionaryLibraryBridgeHelper::DEFAULT_FORMAT, *read_buf_ptr, sample_block, getContext(), DEFAULT_BLOCK_SIZE);
+    source->addBuffer(std::move(read_buf_ptr));
+    return QueryPipeline(std::move(source));
+}
+
+}
diff --git a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h
new file mode 100644
index 00000000000..feebf997387
--- /dev/null
+++ b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/URI.h>
+#include <BridgeHelper/LibraryBridgeHelper.h>
+#include <QueryPipeline/QueryPipeline.h>
+
+
+namespace DB
+{
+
+class Pipe;
+
+// Class to access the external dictionary part of the clickhouse-library-bridge.
+class ExternalDictionaryLibraryBridgeHelper : public LibraryBridgeHelper
+{
+
+public:
+    struct LibraryInitData
+    {
+        String library_path;
+        String library_settings;
+        String dict_attributes;
+    };
+
+    static constexpr inline auto PING_HANDLER = "/extdict_ping";
+    static constexpr inline auto MAIN_HANDLER = "/extdict_request";
+
+    ExternalDictionaryLibraryBridgeHelper(ContextPtr context_, const Block & sample_block, const Field & dictionary_id_, const LibraryInitData & library_data_);
+
+    bool initLibrary();
+
+    bool cloneLibrary(const Field & other_dictionary_id);
+
+    bool removeLibrary();
+
+    bool isModified();
+
+    bool supportsSelectiveLoad();
+
+    QueryPipeline loadAll();
+
+    QueryPipeline loadIds(const std::vector<uint64_t> & ids);
+
+    QueryPipeline loadKeys(const Block & requested_block);
+
+    LibraryInitData getLibraryData() const { return library_data; }
+
+protected:
+    Poco::URI getPingURI() const override;
+
+    Poco::URI getMainURI() const override;
+
+    bool bridgeHandShake() override;
+
+    QueryPipeline loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
+
+    bool executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {}) const;
+
+    ReadWriteBufferFromHTTP::OutStreamCallback getInitLibraryCallback() const;
+
+private:
+    static constexpr inline auto EXT_DICT_LIB_NEW_METHOD = "extDict_libNew";
+    static constexpr inline auto EXT_DICT_LIB_CLONE_METHOD = "extDict_libClone";
+    static constexpr inline auto EXT_DICT_LIB_DELETE_METHOD = "extDict_libDelete";
+    static constexpr inline auto EXT_DICT_LOAD_ALL_METHOD = "extDict_loadAll";
+    static constexpr inline auto EXT_DICT_LOAD_IDS_METHOD = "extDict_loadIds";
+    static constexpr inline auto EXT_DICT_LOAD_KEYS_METHOD = "extDict_loadKeys";
+    static constexpr inline auto EXT_DICT_IS_MODIFIED_METHOD = "extDict_isModified";
+    static constexpr inline auto EXT_DICT_SUPPORTS_SELECTIVE_LOAD_METHOD = "extDict_supportsSelectiveLoad";
+
+    Poco::URI createRequestURI(const String & method) const;
+
+    const Block sample_block;
+    LibraryInitData library_data;
+    Field dictionary_id;
+    bool library_initialized = false;
+};
+
+}
diff --git a/src/BridgeHelper/IBridgeHelper.cpp b/src/BridgeHelper/IBridgeHelper.cpp
index 01ea1636a12..7d6ce74c698 100644
--- a/src/BridgeHelper/IBridgeHelper.cpp
+++ b/src/BridgeHelper/IBridgeHelper.cpp
@@ -18,22 +18,6 @@ namespace ErrorCodes
 }
 
 
-Poco::URI IBridgeHelper::getMainURI() const
-{
-    auto uri = createBaseURI();
-    uri.setPath(MAIN_HANDLER);
-    return uri;
-}
-
-
-Poco::URI IBridgeHelper::getPingURI() const
-{
-    auto uri = createBaseURI();
-    uri.setPath(PING_HANDLER);
-    return uri;
-}
-
-
 void IBridgeHelper::startBridgeSync()
 {
     if (!bridgeHandShake())
diff --git a/src/BridgeHelper/IBridgeHelper.h b/src/BridgeHelper/IBridgeHelper.h
index 7c9b16e9014..5068e84f885 100644
--- a/src/BridgeHelper/IBridgeHelper.h
+++ b/src/BridgeHelper/IBridgeHelper.h
@@ -19,8 +19,6 @@ class IBridgeHelper: protected WithContext
 
 public:
     static constexpr inline auto DEFAULT_HOST = "127.0.0.1";
-    static constexpr inline auto PING_HANDLER = "/ping";
-    static constexpr inline auto MAIN_HANDLER = "/";
     static constexpr inline auto DEFAULT_FORMAT = "RowBinary";
     static constexpr inline auto PING_OK_ANSWER = "Ok.";
 
@@ -31,9 +29,9 @@ public:
 
     virtual ~IBridgeHelper() = default;
 
-    Poco::URI getMainURI() const;
+    virtual Poco::URI getMainURI() const = 0;
 
-    Poco::URI getPingURI() const;
+    virtual Poco::URI getPingURI() const = 0;
 
     void startBridgeSync();
 
@@ -41,7 +39,6 @@ protected:
     /// Check bridge is running. Can also check something else in the mean time.
     virtual bool bridgeHandShake() = 0;
 
-    /// clickhouse-odbc-bridge, clickhouse-library-bridge
     virtual String serviceAlias() const = 0;
 
     virtual String serviceFileName() const = 0;
diff --git a/src/BridgeHelper/LibraryBridgeHelper.cpp b/src/BridgeHelper/LibraryBridgeHelper.cpp
index 052ef3329b6..d83e62a0fd3 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/LibraryBridgeHelper.cpp
@@ -1,56 +1,23 @@
 #include "LibraryBridgeHelper.h"
 
-#include <Formats/formatBlock.h>
-#include <Dictionaries/DictionarySourceHelpers.h>
-#include <QueryPipeline/Pipe.h>
-#include <Processors/Formats/IInputFormat.h>
-#include <IO/WriteBufferFromOStream.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Formats/FormatFactory.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/ShellCommand.h>
-#include <Common/logger_useful.h>
-#include <base/range.h>
-#include <Core/Field.h>
-#include <Common/escapeForFileName.h>
-
-
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int EXTERNAL_LIBRARY_ERROR;
-    extern const int LOGICAL_ERROR;
-}
-
-LibraryBridgeHelper::LibraryBridgeHelper(
-        ContextPtr context_,
-        const Block & sample_block_,
-        const Field & dictionary_id_,
-        const LibraryInitData & library_data_)
-    : IBridgeHelper(context_->getGlobalContext())
-    , log(&Poco::Logger::get("LibraryBridgeHelper"))
-    , sample_block(sample_block_)
+LibraryBridgeHelper::LibraryBridgeHelper(ContextPtr context_)
+    : IBridgeHelper(context_)
     , config(context_->getConfigRef())
+    , log(&Poco::Logger::get("LibraryBridgeHelper"))
     , http_timeout(context_->getGlobalContext()->getSettingsRef().http_receive_timeout.value)
-    , library_data(library_data_)
-    , dictionary_id(dictionary_id_)
+    , bridge_host(config.getString("library_bridge.host", DEFAULT_HOST))
+    , bridge_port(config.getUInt("library_bridge.port", DEFAULT_PORT))
     , http_timeouts(ConnectionTimeouts::getHTTPTimeouts(context_))
 {
-    bridge_port = config.getUInt("library_bridge.port", DEFAULT_PORT);
-    bridge_host = config.getString("library_bridge.host", DEFAULT_HOST);
 }
 
 
-Poco::URI LibraryBridgeHelper::createRequestURI(const String & method) const
+void LibraryBridgeHelper::startBridge(std::unique_ptr<ShellCommand> cmd) const
 {
-    auto uri = getMainURI();
-    uri.addQueryParameter("dictionary_id", toString(dictionary_id));
-    uri.addQueryParameter("method", method);
-    return uri;
+    getContext()->addBridgeCommand(std::move(cmd));
 }
 
 
@@ -64,215 +31,4 @@ Poco::URI LibraryBridgeHelper::createBaseURI() const
 }
 
 
-void LibraryBridgeHelper::startBridge(std::unique_ptr<ShellCommand> cmd) const
-{
-    getContext()->addBridgeCommand(std::move(cmd));
-}
-
-
-bool LibraryBridgeHelper::bridgeHandShake()
-{
-    String result;
-    try
-    {
-        ReadWriteBufferFromHTTP buf(createRequestURI(PING), Poco::Net::HTTPRequest::HTTP_GET, {}, http_timeouts, credentials);
-        readString(result, buf);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log);
-        return false;
-    }
-
-    /*
-     * When pinging bridge we also pass current dicionary_id. The bridge will check if there is such
-     * dictionary. It is possible that such dictionary_id is not present only in two cases:
-     * 1. It is dictionary source creation and initialization of library handler on bridge side did not happen yet.
-     * 2. Bridge crashed or restarted for some reason while server did not.
-    **/
-    if (result.size() != 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected message from library bridge: {}. Check bridge and server have the same version.", result);
-
-    UInt8 dictionary_id_exists;
-    auto parsed = tryParse<UInt8>(dictionary_id_exists, result);
-    if (!parsed || (dictionary_id_exists != 0 && dictionary_id_exists != 1))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected message from library bridge: {} ({}). Check bridge and server have the same version.",
-                        result, parsed ? toString(dictionary_id_exists) : "failed to parse");
-
-    LOG_TRACE(log, "dictionary_id: {}, dictionary_id_exists on bridge side: {}, library confirmed to be initialized on server side: {}",
-              toString(dictionary_id), toString(dictionary_id_exists), library_initialized);
-
-    if (dictionary_id_exists && !library_initialized)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Library was not initialized, but bridge responded to already have dictionary id: {}", dictionary_id);
-
-    /// Here we want to say bridge to recreate a new library handler for current dictionary,
-    /// because it responded to have lost it, but we know that it has already been created. (It is a direct result of bridge crash).
-    if (!dictionary_id_exists && library_initialized)
-    {
-        LOG_WARNING(log, "Library bridge does not have library handler with dictionaty id: {}. It will be reinitialized.", dictionary_id);
-        bool reinitialized = false;
-        try
-        {
-            auto uri = createRequestURI(LIB_NEW_METHOD);
-            reinitialized = executeRequest(uri, getInitLibraryCallback());
-        }
-        catch (...)
-        {
-            tryLogCurrentException(log);
-            return false;
-        }
-
-        if (!reinitialized)
-            throw Exception(ErrorCodes::EXTERNAL_LIBRARY_ERROR,
-                            "Failed to reinitialize library handler on bridge side for dictionary with id: {}", dictionary_id);
-    }
-
-    return true;
-}
-
-
-ReadWriteBufferFromHTTP::OutStreamCallback LibraryBridgeHelper::getInitLibraryCallback() const
-{
-    /// Sample block must contain null values
-    WriteBufferFromOwnString out;
-    auto output_format = getContext()->getOutputFormat(LibraryBridgeHelper::DEFAULT_FORMAT, out, sample_block);
-    formatBlock(output_format, sample_block);
-    auto block_string = out.str();
-
-    return [block_string, this](std::ostream & os)
-    {
-        os << "library_path=" << escapeForFileName(library_data.library_path) << "&";
-        os << "library_settings=" << escapeForFileName(library_data.library_settings) << "&";
-        os << "attributes_names=" << escapeForFileName(library_data.dict_attributes) << "&";
-        os << "sample_block=" << escapeForFileName(sample_block.getNamesAndTypesList().toString()) << "&";
-        os << "null_values=" << escapeForFileName(block_string);
-    };
-}
-
-
-bool LibraryBridgeHelper::initLibrary()
-{
-    startBridgeSync();
-    auto uri = createRequestURI(LIB_NEW_METHOD);
-    library_initialized = executeRequest(uri, getInitLibraryCallback());
-    return library_initialized;
-}
-
-
-bool LibraryBridgeHelper::cloneLibrary(const Field & other_dictionary_id)
-{
-    startBridgeSync();
-    auto uri = createRequestURI(LIB_CLONE_METHOD);
-    uri.addQueryParameter("from_dictionary_id", toString(other_dictionary_id));
-    /// We also pass initialization settings in order to create a library handler
-    /// in case from_dictionary_id does not exist in bridge side (possible in case of bridge crash).
-    library_initialized = executeRequest(uri, getInitLibraryCallback());
-    return library_initialized;
-}
-
-
-bool LibraryBridgeHelper::removeLibrary()
-{
-    /// Do not force bridge restart if it is not running in case of removeLibrary
-    /// because in this case after restart it will not have this dictionaty id in memory anyway.
-    if (bridgeHandShake())
-    {
-        auto uri = createRequestURI(LIB_DELETE_METHOD);
-        return executeRequest(uri);
-    }
-    return true;
-}
-
-
-bool LibraryBridgeHelper::isModified()
-{
-    startBridgeSync();
-    auto uri = createRequestURI(IS_MODIFIED_METHOD);
-    return executeRequest(uri);
-}
-
-
-bool LibraryBridgeHelper::supportsSelectiveLoad()
-{
-    startBridgeSync();
-    auto uri = createRequestURI(SUPPORTS_SELECTIVE_LOAD_METHOD);
-    return executeRequest(uri);
-}
-
-
-QueryPipeline LibraryBridgeHelper::loadAll()
-{
-    startBridgeSync();
-    auto uri = createRequestURI(LOAD_ALL_METHOD);
-    return QueryPipeline(loadBase(uri));
-}
-
-
-QueryPipeline LibraryBridgeHelper::loadIds(const std::vector<uint64_t> & ids)
-{
-    startBridgeSync();
-    auto uri = createRequestURI(LOAD_IDS_METHOD);
-    uri.addQueryParameter("ids_num", toString(ids.size())); /// Not used parameter, but helpful
-    auto ids_string = getDictIdsString(ids);
-    return QueryPipeline(loadBase(uri, [ids_string](std::ostream & os) { os << ids_string; }));
-}
-
-
-QueryPipeline LibraryBridgeHelper::loadKeys(const Block & requested_block)
-{
-    startBridgeSync();
-    auto uri = createRequestURI(LOAD_KEYS_METHOD);
-    /// Sample block to parse block from callback
-    uri.addQueryParameter("requested_block_sample", requested_block.getNamesAndTypesList().toString());
-    ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [requested_block, this](std::ostream & os)
-    {
-        WriteBufferFromOStream out_buffer(os);
-        auto output_format = getContext()->getOutputFormat(LibraryBridgeHelper::DEFAULT_FORMAT, out_buffer, requested_block.cloneEmpty());
-        formatBlock(output_format, requested_block);
-    };
-    return QueryPipeline(loadBase(uri, out_stream_callback));
-}
-
-
-bool LibraryBridgeHelper::executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback) const
-{
-    ReadWriteBufferFromHTTP buf(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        std::move(out_stream_callback),
-        http_timeouts, credentials);
-
-    bool res;
-    readBoolText(res, buf);
-    return res;
-}
-
-
-QueryPipeline LibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
-{
-    auto read_buf_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        std::move(out_stream_callback),
-        http_timeouts,
-        credentials,
-        0,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        getContext()->getReadSettings(),
-        ReadWriteBufferFromHTTP::HTTPHeaderEntries{});
-
-    auto source = FormatFactory::instance().getInput(LibraryBridgeHelper::DEFAULT_FORMAT, *read_buf_ptr, sample_block, getContext(), DEFAULT_BLOCK_SIZE);
-    source->addBuffer(std::move(read_buf_ptr));
-    return QueryPipeline(std::move(source));
-}
-
-
-String LibraryBridgeHelper::getDictIdsString(const std::vector<UInt64> & ids)
-{
-    WriteBufferFromOwnString out;
-    writeVectorBinary(ids, out);
-    return out.str();
-}
-
-
 }
diff --git a/src/BridgeHelper/LibraryBridgeHelper.h b/src/BridgeHelper/LibraryBridgeHelper.h
index 598e473f07b..447a4c713f4 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.h
+++ b/src/BridgeHelper/LibraryBridgeHelper.h
@@ -6,53 +6,16 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
 #include <BridgeHelper/IBridgeHelper.h>
-#include <QueryPipeline/QueryPipeline.h>
-
+#include <Common/BridgeProtocolVersion.h>
 
 namespace DB
 {
 
-class Pipe;
-
+// Common base class to access the clickhouse-library-bridge.
 class LibraryBridgeHelper : public IBridgeHelper
 {
-
-public:
-    struct LibraryInitData
-    {
-        String library_path;
-        String library_settings;
-        String dict_attributes;
-    };
-
-    static constexpr inline size_t DEFAULT_PORT = 9012;
-
-    LibraryBridgeHelper(ContextPtr context_, const Block & sample_block, const Field & dictionary_id_, const LibraryInitData & library_data_);
-
-    bool initLibrary();
-
-    bool cloneLibrary(const Field & other_dictionary_id);
-
-    bool removeLibrary();
-
-    bool isModified();
-
-    bool supportsSelectiveLoad();
-
-    QueryPipeline loadAll();
-
-    QueryPipeline loadIds(const std::vector<uint64_t> & ids);
-
-    QueryPipeline loadKeys(const Block & requested_block);
-
-    QueryPipeline loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
-
-    bool executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {}) const;
-
-    LibraryInitData getLibraryData() const { return library_data; }
-
 protected:
-    bool bridgeHandShake() override;
+    explicit LibraryBridgeHelper(ContextPtr context_);
 
     void startBridge(std::unique_ptr<ShellCommand> cmd) const override;
 
@@ -74,33 +37,13 @@ protected:
 
     Poco::URI createBaseURI() const override;
 
-    ReadWriteBufferFromHTTP::OutStreamCallback getInitLibraryCallback() const;
+    static constexpr inline size_t DEFAULT_PORT = 9012;
 
-private:
-    static constexpr inline auto LIB_NEW_METHOD = "libNew";
-    static constexpr inline auto LIB_CLONE_METHOD = "libClone";
-    static constexpr inline auto LIB_DELETE_METHOD = "libDelete";
-    static constexpr inline auto LOAD_ALL_METHOD = "loadAll";
-    static constexpr inline auto LOAD_IDS_METHOD = "loadIds";
-    static constexpr inline auto LOAD_KEYS_METHOD = "loadKeys";
-    static constexpr inline auto IS_MODIFIED_METHOD = "isModified";
-    static constexpr inline auto PING = "ping";
-    static constexpr inline auto SUPPORTS_SELECTIVE_LOAD_METHOD = "supportsSelectiveLoad";
-
-    Poco::URI createRequestURI(const String & method) const;
-
-    static String getDictIdsString(const std::vector<UInt64> & ids);
-
-    Poco::Logger * log;
-    const Block sample_block;
     const Poco::Util::AbstractConfiguration & config;
+    Poco::Logger * log;
     const Poco::Timespan http_timeout;
-
-    LibraryInitData library_data;
-    Field dictionary_id;
     std::string bridge_host;
     size_t bridge_port;
-    bool library_initialized = false;
     ConnectionTimeouts http_timeouts;
     Poco::Net::HTTPBasicCredentials credentials{};
 };
diff --git a/src/BridgeHelper/XDBCBridgeHelper.h b/src/BridgeHelper/XDBCBridgeHelper.h
index 1eb676f0d87..f2cd76d5d81 100644
--- a/src/BridgeHelper/XDBCBridgeHelper.h
+++ b/src/BridgeHelper/XDBCBridgeHelper.h
@@ -9,6 +9,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Common/BridgeProtocolVersion.h>
 #include <Common/ShellCommand.h>
 #include <Common/logger_useful.h>
 #include <IO/ConnectionTimeoutsContext.h>
@@ -53,6 +54,8 @@ class XDBCBridgeHelper : public IXDBCBridgeHelper
 
 public:
     static constexpr inline auto DEFAULT_PORT = BridgeHelperMixin::DEFAULT_PORT;
+    static constexpr inline auto PING_HANDLER = "/ping";
+    static constexpr inline auto MAIN_HANDLER = "/";
     static constexpr inline auto COL_INFO_HANDLER = "/columns_info";
     static constexpr inline auto IDENTIFIER_QUOTE_HANDLER = "/identifier_quote";
     static constexpr inline auto SCHEMA_ALLOWED_HANDLER = "/schema_allowed";
@@ -72,6 +75,23 @@ public:
     }
 
 protected:
+    Poco::URI getPingURI() const override
+    {
+        auto uri = createBaseURI();
+        uri.setPath(PING_HANDLER);
+        return uri;
+    }
+
+
+    Poco::URI getMainURI() const override
+    {
+        auto uri = createBaseURI();
+        uri.setPath(MAIN_HANDLER);
+        uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
+        return uri;
+    }
+
+
     bool bridgeHandShake() override
     {
         try
@@ -145,6 +165,7 @@ protected:
     {
         auto uri = createBaseURI();
         uri.setPath(COL_INFO_HANDLER);
+        uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
         return uri;
     }
 
@@ -166,6 +187,7 @@ protected:
 
             auto uri = createBaseURI();
             uri.setPath(SCHEMA_ALLOWED_HANDLER);
+            uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
             uri.addQueryParameter("connection_string", getConnectionString());
 
             ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()), credentials);
@@ -186,6 +208,7 @@ protected:
 
             auto uri = createBaseURI();
             uri.setPath(IDENTIFIER_QUOTE_HANDLER);
+            uri.addQueryParameter("version", std::to_string(XDBC_BRIDGE_PROTOCOL_VERSION));
             uri.addQueryParameter("connection_string", getConnectionString());
 
             ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()), credentials);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2a17a68238..c8aa0c84a24 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,6 +130,9 @@ if (TARGET ch_contrib::hdfs)
     add_headers_and_sources(dbms Disks/ObjectStorages/HDFS)
 endif()
 
+add_headers_and_sources(dbms Disks/ObjectStorages/Cached)
+add_headers_and_sources(dbms Disks/ObjectStorages/Web)
+
 add_headers_and_sources(dbms Storages/Cache)
 if (TARGET ch_contrib::hivemetastore)
     add_headers_and_sources(dbms Storages/Hive)
@@ -144,8 +147,8 @@ endif ()
 list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD})
 list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
 
-list (APPEND dbms_sources Functions/IFunction.cpp Functions/FunctionFactory.cpp Functions/FunctionHelpers.cpp Functions/extractTimeZoneFromFunctionArguments.cpp Functions/replicate.cpp Functions/FunctionsLogical.cpp)
-list (APPEND dbms_headers Functions/IFunction.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/replicate.h Functions/FunctionsLogical.h)
+list (APPEND dbms_sources Functions/IFunction.cpp Functions/FunctionFactory.cpp Functions/FunctionHelpers.cpp Functions/extractTimeZoneFromFunctionArguments.cpp Functions/FunctionsLogical.cpp Functions/indexHint.cpp)
+list (APPEND dbms_headers Functions/IFunction.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/FunctionsLogical.h Functions/indexHint.h)
 
 list (APPEND dbms_sources
     AggregateFunctions/IAggregateFunction.cpp
@@ -488,7 +491,7 @@ if (TARGET ch_contrib::aws_s3)
 endif()
 
 if (TARGET ch_contrib::azure_sdk)
-    target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::azure_sdk)
+    dbms_target_link_libraries (PRIVATE ch_contrib::azure_sdk)
 endif()
 
 if (TARGET ch_contrib::s2)
@@ -615,4 +618,3 @@ if (ENABLE_TESTS)
 
     add_check(unit_tests_dbms)
 endif ()
-
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index faef19fe1a3..c399f01c565 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -583,9 +583,14 @@ try
         if (has_vertical_output_suffix)
             current_format = "Vertical";
 
-        /// It is not clear how to write progress intermixed with data with parallel formatting.
+        bool logs_into_stdout = server_logs_file == "-";
+        bool extras_into_stdout = need_render_progress || logs_into_stdout;
+        bool select_only_into_file = select_into_file && !select_into_file_and_stdout;
+
+        /// It is not clear how to write progress and logs
+        /// intermixed with data with parallel formatting.
         /// It may increase code complexity significantly.
-        if (!need_render_progress || (select_into_file && !select_into_file_and_stdout))
+        if (!extras_into_stdout || select_only_into_file)
             output_format = global_context->getOutputFormatParallelIfPossible(
                 current_format, out_file_buf ? *out_file_buf : *out_buf, block);
         else
@@ -735,8 +740,10 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
     /// Rewrite query only when we have query parameters.
     /// Note that if query is rewritten, comments in query are lost.
     /// But the user often wants to see comments in server logs, query log, processlist, etc.
+    /// For recent versions of the server query parameters will be transferred by network and applied on the server side.
     auto query = query_to_execute;
-    if (!query_parameters.empty())
+    if (!query_parameters.empty()
+        && connection->getServerRevision(connection_parameters.timeouts) < DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
     {
         /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
         ReplaceQueryParameterVisitor visitor(query_parameters);
@@ -757,6 +764,7 @@ void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr pa
             connection->sendQuery(
                 connection_parameters.timeouts,
                 query,
+                query_parameters,
                 global_context->getCurrentQueryId(),
                 query_processing_stage,
                 &global_context->getSettingsRef(),
@@ -1082,7 +1090,8 @@ bool ClientBase::receiveSampleBlock(Block & out, ColumnsDescription & columns_de
 void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr parsed_query)
 {
     auto query = query_to_execute;
-    if (!query_parameters.empty())
+    if (!query_parameters.empty()
+        && connection->getServerRevision(connection_parameters.timeouts) < DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
     {
         /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
         ReplaceQueryParameterVisitor visitor(query_parameters);
@@ -1109,6 +1118,7 @@ void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr pars
     connection->sendQuery(
         connection_parameters.timeouts,
         query,
+        query_parameters,
         global_context->getCurrentQueryId(),
         query_processing_stage,
         &global_context->getSettingsRef(),
@@ -1481,7 +1491,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
         if (with_output && with_output->settings_ast)
             apply_query_settings(*with_output->settings_ast);
 
-        if (!connection->checkConnected())
+        if (!connection->checkConnected(connection_parameters.timeouts))
             connect();
 
         ASTPtr input_function;
@@ -1825,7 +1835,7 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
 
                     have_error = false;
 
-                    if (!connection->checkConnected())
+                    if (!connection->checkConnected(connection_parameters.timeouts))
                         connect();
                 }
 
@@ -2042,7 +2052,7 @@ void ClientBase::runInteractive()
             /// Client-side exception during query execution can result in the loss of
             /// sync in the connection protocol.
             /// So we reconnect and allow to enter the next query.
-            if (!connection->checkConnected())
+            if (!connection->checkConnected(connection_parameters.timeouts))
                 connect();
         }
     }
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index df37d1c98a4..5047f958a10 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -64,20 +64,19 @@ Connection::~Connection() = default;
 Connection::Connection(const String & host_, UInt16 port_,
     const String & default_database_,
     const String & user_, const String & password_,
+    const String & quota_key_,
     const String & cluster_,
     const String & cluster_secret_,
     const String & client_name_,
     Protocol::Compression compression_,
-    Protocol::Secure secure_,
-    Poco::Timespan sync_request_timeout_)
+    Protocol::Secure secure_)
     : host(host_), port(port_), default_database(default_database_)
-    , user(user_), password(password_)
+    , user(user_), password(password_), quota_key(quota_key_)
     , cluster(cluster_)
     , cluster_secret(cluster_secret_)
     , client_name(client_name_)
     , compression(compression_)
     , secure(secure_)
-    , sync_request_timeout(sync_request_timeout_)
     , log_wrapper(*this)
 {
     /// Don't connect immediately, only on first need.
@@ -169,6 +168,8 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
 
         sendHello();
         receiveHello();
+        if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM)
+            sendAddendum();
 
         LOG_TRACE(log_wrapper.get(), "Connected to {} server version {}.{}.{}.",
             server_name, server_version_major, server_version_minor, server_version_patch);
@@ -266,6 +267,14 @@ void Connection::sendHello()
 }
 
 
+void Connection::sendAddendum()
+{
+    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY)
+        writeStringBinary(quota_key, *out);
+    out->next();
+}
+
+
 void Connection::receiveHello()
 {
     /// Receive hello packet.
@@ -375,7 +384,7 @@ void Connection::forceConnected(const ConnectionTimeouts & timeouts)
     {
         connect(timeouts);
     }
-    else if (!ping())
+    else if (!ping(timeouts))
     {
         LOG_TRACE(log_wrapper.get(), "Connection was closed, will reconnect.");
         connect(timeouts);
@@ -395,11 +404,11 @@ void Connection::sendClusterNameAndSalt()
 }
 #endif
 
-bool Connection::ping()
+bool Connection::ping(const ConnectionTimeouts & timeouts)
 {
     try
     {
-        TimeoutSetter timeout_setter(*socket, sync_request_timeout, true);
+        TimeoutSetter timeout_setter(*socket, timeouts.sync_request_timeout, true);
 
         UInt64 pong = 0;
         writeVarUInt(Protocol::Client::Ping, *out);
@@ -443,7 +452,7 @@ TablesStatusResponse Connection::getTablesStatus(const ConnectionTimeouts & time
     if (!connected)
         connect(timeouts);
 
-    TimeoutSetter timeout_setter(*socket, sync_request_timeout, true);
+    TimeoutSetter timeout_setter(*socket, timeouts.sync_request_timeout, true);
 
     writeVarUInt(Protocol::Client::TablesStatusRequest, *out);
     request.write(*out, server_revision);
@@ -466,6 +475,7 @@ TablesStatusResponse Connection::getTablesStatus(const ConnectionTimeouts & time
 void Connection::sendQuery(
     const ConnectionTimeouts & timeouts,
     const String & query,
+    const NameToNameMap & query_parameters,
     const String & query_id_,
     UInt64 stage,
     const Settings * settings,
@@ -558,6 +568,14 @@ void Connection::sendQuery(
 
     writeStringBinary(query, *out);
 
+    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
+    {
+        Settings params;
+        for (const auto & [name, value] : query_parameters)
+            params.set(name, value);
+        params.write(*out, SettingsWriteFormat::STRINGS_WITH_FLAGS);
+    }
+
     maybe_compressed_in.reset();
     maybe_compressed_out.reset();
     block_in.reset();
@@ -1083,6 +1101,7 @@ ServerConnectionPtr Connection::createConnection(const ConnectionParameters & pa
         parameters.default_database,
         parameters.user,
         parameters.password,
+        parameters.quota_key,
         "", /* cluster */
         "", /* cluster_secret */
         "client",
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index d00a5760a8d..a92f78fad46 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -51,12 +51,12 @@ public:
     Connection(const String & host_, UInt16 port_,
         const String & default_database_,
         const String & user_, const String & password_,
+        const String & quota_key_,
         const String & cluster_,
         const String & cluster_secret_,
         const String & client_name_,
         Protocol::Compression compression_,
-        Protocol::Secure secure_,
-        Poco::Timespan sync_request_timeout_ = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0));
+        Protocol::Secure secure_);
 
     ~Connection() override;
 
@@ -96,6 +96,7 @@ public:
     void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
+        const NameToNameMap& query_parameters,
         const String & query_id_/* = "" */,
         UInt64 stage/* = QueryProcessingStage::Complete */,
         const Settings * settings/* = nullptr */,
@@ -123,7 +124,7 @@ public:
 
     bool isConnected() const override { return connected; }
 
-    bool checkConnected() override { return connected && ping(); }
+    bool checkConnected(const ConnectionTimeouts & timeouts) override { return connected && ping(timeouts); }
 
     void disconnect() override;
 
@@ -159,6 +160,7 @@ private:
     String default_database;
     String user;
     String password;
+    String quota_key;
 
     /// For inter-server authorization
     String cluster;
@@ -205,8 +207,6 @@ private:
       */
     ThrottlerPtr throttler;
 
-    Poco::Timespan sync_request_timeout;
-
     /// From where to read query execution result.
     std::shared_ptr<ReadBuffer> maybe_compressed_in;
     std::unique_ptr<NativeReader> block_in;
@@ -245,12 +245,13 @@ private:
 
     void connect(const ConnectionTimeouts & timeouts);
     void sendHello();
+    void sendAddendum();
     void receiveHello();
 
 #if USE_SSL
     void sendClusterNameAndSalt();
 #endif
-    bool ping();
+    bool ping(const ConnectionTimeouts & timeouts);
 
     Block receiveData();
     Block receiveLogData();
diff --git a/src/Client/ConnectionParameters.cpp b/src/Client/ConnectionParameters.cpp
index 3101176101b..6d538fee307 100644
--- a/src/Client/ConnectionParameters.cpp
+++ b/src/Client/ConnectionParameters.cpp
@@ -58,6 +58,7 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
         if (auto * result = readpassphrase(prompt.c_str(), buf, sizeof(buf), 0))
             password = result;
     }
+    quota_key = config.getString("quota_key", "");
 
     /// By default compression is disabled if address looks like localhost.
     compression = config.getBool("compression", !isLocalAddress(DNSResolver::instance().resolveHost(host)))
@@ -68,6 +69,8 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
             Poco::Timespan(config.getInt("send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0),
             Poco::Timespan(config.getInt("receive_timeout", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0),
             Poco::Timespan(config.getInt("tcp_keep_alive_timeout", 0), 0));
+
+    timeouts.sync_request_timeout = Poco::Timespan(config.getInt("sync_request_timeout", DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC), 0);
 }
 
 ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfiguration & config)
diff --git a/src/Client/ConnectionParameters.h b/src/Client/ConnectionParameters.h
index ae204296fbf..0ccd6b92290 100644
--- a/src/Client/ConnectionParameters.h
+++ b/src/Client/ConnectionParameters.h
@@ -18,6 +18,7 @@ struct ConnectionParameters
     std::string default_database;
     std::string user;
     std::string password;
+    std::string quota_key;
     Protocol::Secure security = Protocol::Secure::Disable;
     Protocol::Compression compression = Protocol::Compression::Enable;
     ConnectionTimeouts timeouts;
diff --git a/src/Client/ConnectionPool.cpp b/src/Client/ConnectionPool.cpp
index 4ec87127318..8433b0833fa 100644
--- a/src/Client/ConnectionPool.cpp
+++ b/src/Client/ConnectionPool.cpp
@@ -12,6 +12,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
     String default_database,
     String user,
     String password,
+    String quota_key,
     String cluster,
     String cluster_secret,
     String client_name,
@@ -20,7 +21,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
     Int64 priority)
 {
     Key key{
-        max_connections, host, port, default_database, user, password, cluster, cluster_secret, client_name, compression, secure, priority};
+        max_connections, host, port, default_database, user, password, quota_key, cluster, cluster_secret, client_name, compression, secure, priority};
 
     std::lock_guard lock(mutex);
     auto [it, inserted] = pools.emplace(key, ConnectionPoolPtr{});
@@ -37,6 +38,7 @@ ConnectionPoolPtr ConnectionPoolFactory::get(
             default_database,
             user,
             password,
+            quota_key,
             cluster,
             cluster_secret,
             client_name,
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index d1ee844358b..c3d0955019e 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -54,6 +54,7 @@ public:
             const String & default_database_,
             const String & user_,
             const String & password_,
+            const String & quota_key_,
             const String & cluster_,
             const String & cluster_secret_,
             const String & client_name_,
@@ -67,6 +68,7 @@ public:
         default_database(default_database_),
         user(user_),
         password(password_),
+        quota_key(quota_key_),
         cluster(cluster_),
         cluster_secret(cluster_secret_),
         client_name(client_name_),
@@ -112,7 +114,7 @@ protected:
     {
         return std::make_shared<Connection>(
             host, port,
-            default_database, user, password,
+            default_database, user, password, quota_key,
             cluster, cluster_secret,
             client_name, compression, secure);
     }
@@ -123,6 +125,7 @@ private:
     String default_database;
     String user;
     String password;
+    String quota_key;
 
     /// For inter-server authorization
     String cluster;
@@ -149,6 +152,7 @@ public:
         String default_database;
         String user;
         String password;
+        String quota_key;
         String cluster;
         String cluster_secret;
         String client_name;
@@ -171,6 +175,7 @@ public:
         String default_database,
         String user,
         String password,
+        String quota_key,
         String cluster,
         String cluster_secret,
         String client_name,
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index 9f0ead79981..f1802467b57 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -183,7 +183,7 @@ void HedgedConnections::sendQuery(
             modified_settings.parallel_replica_offset = fd_to_replica_location[replica.packet_receiver->getFileDescriptor()].offset;
         }
 
-        replica.connection->sendQuery(timeouts, query, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
+        replica.connection->sendQuery(timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
         replica.change_replica_timeout.setRelative(timeouts.receive_data_timeout);
         replica.packet_receiver->setReceiveTimeout(hedged_connections_factory.getConnectionTimeouts().receive_timeout);
     };
diff --git a/src/Client/IServerConnection.h b/src/Client/IServerConnection.h
index 542aecb9849..5a09f23a70c 100644
--- a/src/Client/IServerConnection.h
+++ b/src/Client/IServerConnection.h
@@ -86,6 +86,7 @@ public:
     virtual void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
+        const NameToNameMap & query_parameters,
         const String & query_id_,
         UInt64 stage,
         const Settings * settings,
@@ -121,7 +122,7 @@ public:
     virtual bool isConnected() const = 0;
 
     /// Check if connection is still active with ping request.
-    virtual bool checkConnected() = 0;
+    virtual bool checkConnected(const ConnectionTimeouts & /*timeouts*/) = 0;
 
     /** Disconnect.
       * This may be used, if connection is left in unsynchronised state
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index 425e54fb392..b10e24f1ae4 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -75,6 +75,7 @@ void LocalConnection::sendProfileEvents()
 void LocalConnection::sendQuery(
     const ConnectionTimeouts &,
     const String & query,
+    const NameToNameMap & query_parameters,
     const String & query_id,
     UInt64 stage,
     const Settings *,
@@ -82,6 +83,9 @@ void LocalConnection::sendQuery(
     bool,
     std::function<void(const Progress &)> process_progress_callback)
 {
+    if (!query_parameters.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "clickhouse local does not support query parameters");
+
     /// Suggestion comes without client_info.
     if (client_info)
         query_context = session.makeQueryContext(*client_info);
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
index 1ebe4a1d901..7967874d11f 100644
--- a/src/Client/LocalConnection.h
+++ b/src/Client/LocalConnection.h
@@ -94,6 +94,7 @@ public:
     void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
+        const NameToNameMap & query_parameters,
         const String & query_id/* = "" */,
         UInt64 stage/* = QueryProcessingStage::Complete */,
         const Settings * settings/* = nullptr */,
@@ -121,7 +122,7 @@ public:
 
     bool isConnected() const override { return true; }
 
-    bool checkConnected() override { return true; }
+    bool checkConnected(const ConnectionTimeouts & /*timeouts*/) override { return true; }
 
     void disconnect() override {}
 
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index b14ff9f2c8d..72cd4c46477 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -160,15 +160,15 @@ void MultiplexedConnections::sendQuery(
             if (enable_sample_offset_parallel_processing)
                 modified_settings.parallel_replica_offset = i;
 
-            replica_states[i].connection->sendQuery(timeouts, query, query_id,
-                                                    stage, &modified_settings, &client_info, with_pending_data, {});
+            replica_states[i].connection->sendQuery(
+                timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
         }
     }
     else
     {
         /// Use single replica.
-        replica_states[0].connection->sendQuery(timeouts, query, query_id,
-                                                stage, &modified_settings, &client_info, with_pending_data, {});
+        replica_states[0].connection->sendQuery(
+            timeouts, query, /* query_parameters */ {}, query_id, stage, &modified_settings, &client_info, with_pending_data, {});
     }
 
     sent_query = true;
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index 1074adb2bd4..f8d41853566 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -138,7 +138,8 @@ void Suggest::load(ContextPtr context, const ConnectionParameters & connection_p
 
 void Suggest::fetch(IServerConnection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
 {
-    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false, {});
+    connection.sendQuery(
+        timeouts, query, {} /* query_parameters */, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false, {});
 
     while (true)
     {
diff --git a/src/Columns/Collator.h b/src/Columns/Collator.h
index 37dbe0d4347..dd61b66a2ca 100644
--- a/src/Columns/Collator.h
+++ b/src/Columns/Collator.h
@@ -46,8 +46,10 @@ public:
     int compare(const char * str1, size_t length1, const char * str2, size_t length2) const;
 
     const std::string & getLocale() const;
-private:
 
+    bool operator==(const Collator & other) const { return this->getLocale() == other.getLocale(); }
+
+private:
     std::string locale;
     UCollator * collator;
 };
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 24da9644335..93bcc3eb611 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -56,7 +56,9 @@ ColumnArray::ColumnArray(MutableColumnPtr && nested_column, MutableColumnPtr &&
 
         /// This will also prevent possible overflow in offset.
         if (data->size() != last_offset)
-            throw Exception("offsets_column has data inconsistent with nested_column", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "offsets_column has data inconsistent with nested_column. Data size: {}, last offset: {}",
+                data->size(), last_offset);
     }
 
     /** NOTE
diff --git a/src/Columns/ColumnConst.h b/src/Columns/ColumnConst.h
index fdee16a1dbb..21cfaf7f64c 100644
--- a/src/Columns/ColumnConst.h
+++ b/src/Columns/ColumnConst.h
@@ -263,11 +263,6 @@ public:
         }
     }
 
-    SerializationInfoPtr getSerializationInfo() const override
-    {
-        return data->getSerializationInfo();
-    }
-
     bool isNullable() const override { return isColumnNullable(*data); }
     bool onlyNull() const override { return data->isNullAt(0); }
     bool isNumeric() const override { return data->isNumeric(); }
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index 4290a7a4cb1..63b76dbb230 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -298,7 +298,7 @@ ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_
         {
             while (mask)
             {
-                size_t index = __builtin_ctzll(mask);
+                size_t index = std::countr_zero(mask);
                 res_data.push_back(data_pos[index]);
             #ifdef __BMI__
                 mask = _blsr_u64(mask);
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index b71323f2ec7..158d154f3f8 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -240,7 +240,7 @@ ColumnPtr ColumnFixedString::filter(const IColumn::Filter & filt, ssize_t result
             size_t res_chars_size = res->chars.size();
             while (mask)
             {
-                size_t index = __builtin_ctzll(mask);
+                size_t index = std::countr_zero(mask);
                 res->chars.resize(res_chars_size + n);
                 memcpySmallAllowReadWriteOverflow15(&res->chars[res_chars_size], data_pos + index * n, n);
                 res_chars_size += n;
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index 7c8d73edd16..6763c11bb9a 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -561,15 +561,4 @@ void ColumnTuple::getIndicesOfNonDefaultRows(Offsets & indices, size_t from, siz
     return getIndicesOfNonDefaultRowsImpl<ColumnTuple>(indices, from, limit);
 }
 
-SerializationInfoPtr ColumnTuple::getSerializationInfo() const
-{
-    MutableSerializationInfos infos;
-    infos.reserve(columns.size());
-
-    for (const auto & column : columns)
-        infos.push_back(const_pointer_cast<SerializationInfo>(column->getSerializationInfo()));
-
-    return std::make_shared<SerializationInfoTuple>(std::move(infos), SerializationInfo::Settings{});
-}
-
 }
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index e6797c2582c..b1de8df74a9 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -102,7 +102,6 @@ public:
     ColumnPtr compress() const override;
     double getRatioOfDefaultRows(double sample_ratio) const override;
     void getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const override;
-    SerializationInfoPtr getSerializationInfo() const override;
 
     size_t tupleSize() const { return columns.size(); }
 
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 60423e2b0fe..d89917fc6c2 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -12,12 +12,14 @@
 #include <Common/RadixSort.h>
 #include <Common/SipHash.h>
 #include <Common/WeakHash.h>
+#include <Common/TargetSpecific.h>
 #include <Common/assert_cast.h>
 #include <base/sort.h>
 #include <base/unaligned.h>
 #include <base/bit_cast.h>
 #include <base/scope_guard.h>
 
+#include <bit>
 #include <cmath>
 #include <cstring>
 
@@ -25,6 +27,10 @@
 #    include <emmintrin.h>
 #endif
 
+#if USE_MULTITARGET_CODE
+#    include <immintrin.h>
+#endif
+
 #if USE_EMBEDDED_COMPILER
 #include <DataTypes/Native.h>
 #include <llvm/IR/IRBuilder.h>
@@ -471,6 +477,128 @@ void ColumnVector<T>::insertRangeFrom(const IColumn & src, size_t start, size_t
     memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
 }
 
+static inline UInt64 blsr(UInt64 mask)
+{
+#ifdef __BMI__
+    return _blsr_u64(mask);
+#else
+    return mask & (mask-1);
+#endif
+}
+
+DECLARE_DEFAULT_CODE(
+template <typename T, typename Container, size_t SIMD_BYTES>
+inline void doFilterAligned(const UInt8 *& filt_pos, const UInt8 *& filt_end_aligned, const T *& data_pos, Container & res_data)
+{
+    while (filt_pos < filt_end_aligned)
+    {
+        UInt64 mask = bytes64MaskToBits64Mask(filt_pos);
+
+        if (0xffffffffffffffff == mask)
+        {
+            res_data.insert(data_pos, data_pos + SIMD_BYTES);
+        }
+        else
+        {
+            while (mask)
+            {
+                size_t index = std::countr_zero(mask);
+                res_data.push_back(data_pos[index]);
+                mask = blsr(mask);
+            }
+        }
+
+        filt_pos += SIMD_BYTES;
+        data_pos += SIMD_BYTES;
+    }
+}
+)
+
+namespace
+{
+template <typename T, typename Container>
+void resize(Container & res_data, size_t reserve_size)
+{
+#if defined(MEMORY_SANITIZER)
+    res_data.resize_fill(reserve_size, static_cast<T>(0)); // MSan doesn't recognize that all allocated memory is written by AVX-512 intrinsics.
+#else
+    res_data.resize(reserve_size);
+#endif
+}
+}
+
+DECLARE_AVX512VBMI2_SPECIFIC_CODE(
+template <size_t ELEMENT_WIDTH>
+inline void compressStoreAVX512(const void *src, void *dst, const UInt64 mask)
+{
+    __m512i vsrc = _mm512_loadu_si512(src);
+    if constexpr (ELEMENT_WIDTH == 1)
+        _mm512_mask_compressstoreu_epi8(dst, static_cast<__mmask64>(mask), vsrc);
+    else if constexpr (ELEMENT_WIDTH == 2)
+        _mm512_mask_compressstoreu_epi16(dst, static_cast<__mmask32>(mask), vsrc);
+    else if constexpr (ELEMENT_WIDTH == 4)
+        _mm512_mask_compressstoreu_epi32(dst, static_cast<__mmask16>(mask), vsrc);
+    else if constexpr (ELEMENT_WIDTH == 8)
+        _mm512_mask_compressstoreu_epi64(dst, static_cast<__mmask8>(mask), vsrc);
+}
+
+template <typename T, typename Container, size_t SIMD_BYTES>
+inline void doFilterAligned(const UInt8 *& filt_pos, const UInt8 *& filt_end_aligned, const T *& data_pos, Container & res_data)
+{
+    static constexpr size_t VEC_LEN = 64;   /// AVX512 vector length - 64 bytes
+    static constexpr size_t ELEMENT_WIDTH = sizeof(T);
+    static constexpr size_t ELEMENTS_PER_VEC = VEC_LEN / ELEMENT_WIDTH;
+    static constexpr UInt64 KMASK = 0xffffffffffffffff >> (64 - ELEMENTS_PER_VEC);
+
+    size_t current_offset = res_data.size();
+    size_t reserve_size = res_data.size();
+    size_t alloc_size = SIMD_BYTES * 2;
+
+    while (filt_pos < filt_end_aligned)
+    {
+        /// to avoid calling resize too frequently, resize to reserve buffer.
+        if (reserve_size - current_offset < SIMD_BYTES)
+        {
+            reserve_size += alloc_size;
+            resize<T>(res_data, reserve_size);
+            alloc_size *= 2;
+        }
+
+        UInt64 mask = bytes64MaskToBits64Mask(filt_pos);
+
+        if (0xffffffffffffffff == mask)
+        {
+            for (size_t i = 0; i < SIMD_BYTES; i += ELEMENTS_PER_VEC)
+                _mm512_storeu_si512(reinterpret_cast<void *>(&res_data[current_offset + i]),
+                        _mm512_loadu_si512(reinterpret_cast<const void *>(data_pos + i)));
+            current_offset += SIMD_BYTES;
+        }
+        else
+        {
+            if (mask)
+            {
+                for (size_t i = 0; i < SIMD_BYTES; i += ELEMENTS_PER_VEC)
+                {
+                    compressStoreAVX512<ELEMENT_WIDTH>(reinterpret_cast<const void *>(data_pos + i),
+                            reinterpret_cast<void *>(&res_data[current_offset]), mask & KMASK);
+                    current_offset += std::popcount(mask & KMASK);
+                    /// prepare mask for next iter, if ELEMENTS_PER_VEC = 64, no next iter
+                    if (ELEMENTS_PER_VEC < 64)
+                    {
+                        mask >>= ELEMENTS_PER_VEC;
+                    }
+                }
+            }
+        }
+
+        filt_pos += SIMD_BYTES;
+        data_pos += SIMD_BYTES;
+    }
+    /// resize to the real size.
+    res_data.resize(current_offset);
+}
+)
+
 template <typename T>
 ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_size_hint) const
 {
@@ -496,31 +624,13 @@ ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_s
     static constexpr size_t SIMD_BYTES = 64;
     const UInt8 * filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
-    while (filt_pos < filt_end_aligned)
-    {
-        UInt64 mask = bytes64MaskToBits64Mask(filt_pos);
-
-        if (0xffffffffffffffff == mask)
-        {
-            res_data.insert(data_pos, data_pos + SIMD_BYTES);
-        }
-        else
-        {
-            while (mask)
-            {
-                size_t index = __builtin_ctzll(mask);
-                res_data.push_back(data_pos[index]);
-            #ifdef __BMI__
-                mask = _blsr_u64(mask);
-            #else
-                mask = mask & (mask-1);
-            #endif
-            }
-        }
-
-        filt_pos += SIMD_BYTES;
-        data_pos += SIMD_BYTES;
-    }
+#if USE_MULTITARGET_CODE
+    static constexpr bool VBMI2_CAPABLE = sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8;
+    if (VBMI2_CAPABLE && isArchSupported(TargetArch::AVX512VBMI2))
+        TargetSpecific::AVX512VBMI2::doFilterAligned<T, Container, SIMD_BYTES>(filt_pos, filt_end_aligned, data_pos, res_data);
+    else
+#endif
+        TargetSpecific::Default::doFilterAligned<T, Container, SIMD_BYTES>(filt_pos, filt_end_aligned, data_pos, res_data);
 
     while (filt_pos < filt_end)
     {
diff --git a/src/Columns/ColumnsCommon.cpp b/src/Columns/ColumnsCommon.cpp
index cbc62140bef..17f521c242c 100644
--- a/src/Columns/ColumnsCommon.cpp
+++ b/src/Columns/ColumnsCommon.cpp
@@ -2,13 +2,14 @@
 #include <Columns/ColumnVector.h>
 #include <Common/typeid_cast.h>
 #include <Common/HashTable/HashSet.h>
+#include <bit>
 #include "ColumnsCommon.h"
 
 
 namespace DB
 {
 
-#if defined(__SSE2__) && defined(__POPCNT__)
+#if defined(__SSE2__)
 /// Transform 64-byte mask to 64-bit mask.
 static UInt64 toBits64(const Int8 * bytes64)
 {
@@ -41,11 +42,11 @@ size_t countBytesInFilter(const UInt8 * filt, size_t start, size_t end)
 
     const Int8 * end_pos = pos + (end - start);
 
-#if defined(__SSE2__) && defined(__POPCNT__)
+#if defined(__SSE2__)
     const Int8 * end_pos64 = pos + (end - start) / 64 * 64;
 
     for (; pos < end_pos64; pos += 64)
-        count += __builtin_popcountll(toBits64(pos));
+        count += std::popcount(toBits64(pos));
 
     /// TODO Add duff device for tail?
 #endif
@@ -74,11 +75,11 @@ size_t countBytesInFilterWithNull(const IColumn::Filter & filt, const UInt8 * nu
     const Int8 * pos2 = reinterpret_cast<const Int8 *>(null_map) + start;
     const Int8 * end_pos = pos + (end - start);
 
-#if defined(__SSE2__) && defined(__POPCNT__)
+#if defined(__SSE2__)
     const Int8 * end_pos64 = pos + (end - start) / 64 * 64;
 
     for (; pos < end_pos64; pos += 64, pos2 += 64)
-        count += __builtin_popcountll(toBits64(pos) & ~toBits64(pos2));
+        count += std::popcount(toBits64(pos) & ~toBits64(pos2));
 
         /// TODO Add duff device for tail?
 #endif
@@ -259,7 +260,7 @@ namespace
             {
                 while (mask)
                 {
-                    size_t index = __builtin_ctzll(mask);
+                    size_t index = std::countr_zero(mask);
                     copy_array(offsets_pos + index);
                 #ifdef __BMI__
                     mask = _blsr_u64(mask);
diff --git a/src/Columns/ColumnsCommon.h b/src/Columns/ColumnsCommon.h
index 1e5849e2b88..814c5850d57 100644
--- a/src/Columns/ColumnsCommon.h
+++ b/src/Columns/ColumnsCommon.h
@@ -27,17 +27,17 @@ namespace ErrorCodes
 inline UInt64 bytes64MaskToBits64Mask(const UInt8 * bytes64)
 {
 #if defined(__AVX512F__) && defined(__AVX512BW__)
-    static const __m512i zero64 = _mm512_setzero_epi32();
-    UInt64 res = _mm512_cmp_epi8_mask(_mm512_loadu_si512(reinterpret_cast<const __m512i *>(bytes64)), zero64, _MM_CMPINT_EQ);
+    const __m512i vbytes = _mm512_loadu_si512(reinterpret_cast<const void *>(bytes64));
+    UInt64 res = _mm512_testn_epi8_mask(vbytes, vbytes);
 #elif defined(__AVX__) && defined(__AVX2__)
-    static const __m256i zero32 = _mm256_setzero_si256();
+    const __m256i zero32 = _mm256_setzero_si256();
     UInt64 res =
         (static_cast<UInt64>(_mm256_movemask_epi8(_mm256_cmpeq_epi8(
         _mm256_loadu_si256(reinterpret_cast<const __m256i *>(bytes64)), zero32))) & 0xffffffff)
         | (static_cast<UInt64>(_mm256_movemask_epi8(_mm256_cmpeq_epi8(
         _mm256_loadu_si256(reinterpret_cast<const __m256i *>(bytes64+32)), zero32))) << 32);
-#elif defined(__SSE2__) && defined(__POPCNT__)
-    static const __m128i zero16 = _mm_setzero_si128();
+#elif defined(__SSE2__)
+    const __m128i zero16 = _mm_setzero_si128();
     UInt64 res =
         (static_cast<UInt64>(_mm_movemask_epi8(_mm_cmpeq_epi8(
         _mm_loadu_si128(reinterpret_cast<const __m128i *>(bytes64)), zero16))) & 0xffff)
diff --git a/src/Columns/IColumn.cpp b/src/Columns/IColumn.cpp
index e7caee3b23d..2158adb86a8 100644
--- a/src/Columns/IColumn.cpp
+++ b/src/Columns/IColumn.cpp
@@ -64,11 +64,6 @@ ColumnPtr IColumn::createWithOffsets(const Offsets & offsets, const Field & defa
     return res;
 }
 
-SerializationInfoPtr IColumn::getSerializationInfo() const
-{
-    return std::make_shared<SerializationInfo>(ISerialization::getKind(*this), SerializationInfo::Settings{});
-}
-
 bool isColumnNullable(const IColumn & column)
 {
     return checkColumn<ColumnNullable>(column);
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index a99d4172e5b..8b693015674 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -35,9 +35,6 @@ class ColumnGathererStream;
 class Field;
 class WeakHash32;
 
-class SerializationInfo;
-using SerializationInfoPtr = std::shared_ptr<const SerializationInfo>;
-
 /*
  * Represents a set of equal ranges in previous column to perform sorting in current column.
  * Used in sorting by tuples.
@@ -445,8 +442,6 @@ public:
     /// Used to create full column from sparse.
     [[nodiscard]] virtual Ptr createWithOffsets(const Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const;
 
-    [[nodiscard]] virtual SerializationInfoPtr getSerializationInfo() const;
-
     /// Compress column in memory to some representation that allows to decompress it back.
     /// Return itself if compression is not applicable for this column type.
     [[nodiscard]] virtual Ptr compress() const
diff --git a/src/Columns/tests/gtest_column_vector.cpp b/src/Columns/tests/gtest_column_vector.cpp
new file mode 100644
index 00000000000..5a8fd1fad60
--- /dev/null
+++ b/src/Columns/tests/gtest_column_vector.cpp
@@ -0,0 +1,91 @@
+#include <typeinfo>
+#include <vector>
+#include <Columns/ColumnsNumber.h>
+#include <Common/randomSeed.h>
+#include <gtest/gtest.h>
+
+
+using namespace DB;
+
+static pcg64 rng(randomSeed());
+static constexpr int error_code = 12345;
+static constexpr size_t TEST_RUNS = 500;
+static constexpr size_t MAX_ROWS = 10000;
+static const std::vector<size_t> filter_ratios = {1, 2, 5, 11, 32, 64, 100, 1000};
+static const size_t K = filter_ratios.size();
+
+template <typename T>
+static MutableColumnPtr createColumn(size_t n)
+{
+    auto column = ColumnVector<T>::create();
+    auto & values = column->getData();
+
+    for (size_t i = 0; i < n; ++i)
+    {
+        values.push_back(i);
+    }
+
+    return column;
+}
+
+bool checkFilter(const PaddedPODArray<UInt8> &flit, const IColumn & src, const IColumn & dst)
+{
+    size_t n = flit.size();
+    size_t dst_size = dst.size();
+    size_t j = 0;   /// index of dest
+    for (size_t i = 0; i < n; ++i)
+    {
+        if (flit[i] != 0)
+        {
+            if ((dst_size <= j) || (src.compareAt(i, j, dst, 0) != 0))
+                return false;
+            j++;
+        }
+    }
+    return dst_size == j;   /// filtered size check
+}
+
+template <typename T>
+static void testFilter()
+{
+    auto test_case = [&](size_t rows, size_t filter_ratio)
+    {
+        auto vector_column = createColumn<T>(rows);
+        PaddedPODArray<UInt8> flit(rows);
+        for (size_t i = 0; i < rows; ++i)
+            flit[i] = rng() % filter_ratio == 0;
+        auto res_column = vector_column->filter(flit, -1);
+
+        if (!checkFilter(flit, *vector_column, *res_column))
+            throw Exception(error_code, "VectorColumn filter failure, type: {}", typeid(T).name());
+    };
+
+    try
+    {
+        for (size_t i = 0; i < TEST_RUNS; ++i)
+        {
+            size_t rows = rng() % MAX_ROWS + 1;
+            size_t filter_ratio = filter_ratios[rng() % K];
+
+            test_case(rows, filter_ratio);
+        }
+    }
+    catch (const Exception & e)
+    {
+        FAIL() << e.displayText();
+    }
+}
+
+
+TEST(ColumnVector, Filter)
+{
+    testFilter<UInt8>();
+    testFilter<Int16>();
+    testFilter<UInt32>();
+    testFilter<Int64>();
+    testFilter<UInt128>();
+    testFilter<Int256>();
+    testFilter<Float32>();
+    testFilter<Float64>();
+    testFilter<UUID>();
+}
diff --git a/src/Common/BridgeProtocolVersion.h b/src/Common/BridgeProtocolVersion.h
new file mode 100644
index 00000000000..77d094fce3f
--- /dev/null
+++ b/src/Common/BridgeProtocolVersion.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <cstddef>
+
+namespace DB
+{
+
+// Version of protocol between clickhouse-server and clickhouse-library-bridge. Increment if you change it in a non-compatible way.
+static constexpr size_t LIBRARY_BRIDGE_PROTOCOL_VERSION = 1;
+
+// Version of protocol between clickhouse-server and clickhouse-xdbc-bridge. Increment if you change it in a non-compatible way.
+static constexpr size_t XDBC_BRIDGE_PROTOCOL_VERSION = 1;
+
+}
diff --git a/src/Common/LRUCache.h b/src/Common/CacheBase.h
similarity index 58%
rename from src/Common/LRUCache.h
rename to src/Common/CacheBase.h
index c149ee184ab..af6cd8cef65 100644
--- a/src/Common/LRUCache.h
+++ b/src/Common/CacheBase.h
@@ -1,11 +1,16 @@
 #pragma once
 
-#include <unordered_map>
-#include <list>
-#include <memory>
-#include <chrono>
-#include <mutex>
+#include <Common/Exception.h>
+#include <Common/ICachePolicy.h>
+#include <Common/LRUCachePolicy.h>
+#include <Common/SLRUCachePolicy.h>
+
 #include <atomic>
+#include <cassert>
+#include <chrono>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
 
 #include <Common/logger_useful.h>
 #include <base/defines.h>
@@ -13,43 +18,54 @@
 
 namespace DB
 {
-
-template <typename T>
-struct TrivialWeightFunction
+namespace ErrorCodes
 {
-    size_t operator()(const T &) const
-    {
-        return 1;
-    }
-};
+    extern const int BAD_ARGUMENTS;
+}
 
-
-/// Thread-safe cache that evicts entries which are not used for a long time.
+/// Thread-safe cache that evicts entries using special cache policy
+/// (default policy evicts entries which are not used for a long time).
 /// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
 /// of that value.
 /// Cache starts to evict entries when their total weight exceeds max_size.
 /// Value weight should not change after insertion.
 template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
-class LRUCache
+class CacheBase
 {
 public:
     using Key = TKey;
     using Mapped = TMapped;
     using MappedPtr = std::shared_ptr<Mapped>;
 
-    /** Initialize LRUCache with max_size and max_elements_size.
-      * max_elements_size == 0 means no elements size restrictions.
-      */
-    explicit LRUCache(size_t max_size_, size_t max_elements_size_ = 0)
-        : max_size(std::max(static_cast<size_t>(1), max_size_))
-        , max_elements_size(max_elements_size_)
-        {}
+    CacheBase(size_t max_size, size_t max_elements_size = 0, String cache_policy_name = "", double size_ratio = 0.5)
+    {
+        auto on_weight_loss_function = [&](size_t weight_loss) { onRemoveOverflowWeightLoss(weight_loss); };
+
+        if (cache_policy_name.empty())
+        {
+            cache_policy_name = default_cache_policy_name;
+        }
+
+        if (cache_policy_name == "LRU")
+        {
+            using LRUPolicy = LRUCachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+            cache_policy = std::make_unique<LRUPolicy>(max_size, max_elements_size, on_weight_loss_function);
+        }
+        else if (cache_policy_name == "SLRU")
+        {
+            using SLRUPolicy = SLRUCachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+            cache_policy = std::make_unique<SLRUPolicy>(max_size, max_elements_size, size_ratio, on_weight_loss_function);
+        }
+        else
+        {
+            throw Exception("Undeclared cache policy name: " + cache_policy_name, ErrorCodes::BAD_ARGUMENTS);
+        }
+    }
 
     MappedPtr get(const Key & key)
     {
         std::lock_guard lock(mutex);
-
-        auto res = getImpl(key);
+        auto res = cache_policy->get(key, lock);
         if (res)
             ++hits;
         else
@@ -61,20 +77,7 @@ public:
     void set(const Key & key, const MappedPtr & mapped)
     {
         std::lock_guard lock(mutex);
-
-        setImpl(key, mapped);
-    }
-
-    void remove(const Key & key)
-    {
-        std::lock_guard lock(mutex);
-        auto it = cells.find(key);
-        if (it == cells.end())
-            return;
-        auto & cell = it->second;
-        current_size -= cell.size;
-        queue.erase(cell.queue_iterator);
-        cells.erase(it);
+        cache_policy->set(key, mapped, lock);
     }
 
     /// If the value for the key is in the cache, returns it. If it is not, calls load_func() to
@@ -91,8 +94,7 @@ public:
         InsertTokenHolder token_holder;
         {
             std::lock_guard cache_lock(mutex);
-
-            auto val = getImpl(key);
+            auto val = cache_policy->get(key, cache_lock);
             if (val)
             {
                 ++hits;
@@ -130,7 +132,7 @@ public:
         auto token_it = insert_tokens.find(key);
         if (token_it != insert_tokens.end() && token_it->second.get() == token)
         {
-            setImpl(key, token->value);
+            cache_policy->set(key, token->value, cache_lock);
             result = true;
         }
 
@@ -147,64 +149,64 @@ public:
         out_misses = misses;
     }
 
+    void reset()
+    {
+        std::lock_guard lock(mutex);
+        insert_tokens.clear();
+        hits = 0;
+        misses = 0;
+        cache_policy->reset(lock);
+    }
+
+    void remove(const Key & key)
+    {
+        std::lock_guard lock(mutex);
+        cache_policy->remove(key, lock);
+    }
+
     size_t weight() const
     {
         std::lock_guard lock(mutex);
-        return current_size;
+        return cache_policy->weight(lock);
     }
 
     size_t count() const
     {
         std::lock_guard lock(mutex);
-        return cells.size();
+        return cache_policy->count(lock);
     }
 
     size_t maxSize() const
+        TSA_NO_THREAD_SAFETY_ANALYSIS // disabled because max_size of cache_policy is a constant parameter
     {
-        return max_size;
+        return cache_policy->maxSize();
     }
 
-    void reset()
-    {
-        std::lock_guard lock(mutex);
-        queue.clear();
-        cells.clear();
-        insert_tokens.clear();
-        current_size = 0;
-        hits = 0;
-        misses = 0;
-    }
-
-    virtual ~LRUCache() = default;
+    virtual ~CacheBase() = default;
 
 protected:
-    using LRUQueue = std::list<Key>;
-    using LRUQueueIterator = typename LRUQueue::iterator;
-
-    struct Cell
-    {
-        MappedPtr value;
-        size_t size;
-        LRUQueueIterator queue_iterator;
-    };
-
-    using Cells = std::unordered_map<Key, Cell, HashFunction>;
-
-    Cells cells TSA_GUARDED_BY(mutex);
-
     mutable std::mutex mutex;
+
 private:
+    using CachePolicy = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+
+    std::unique_ptr<CachePolicy> cache_policy TSA_GUARDED_BY(mutex);
+
+    inline static const String default_cache_policy_name = "SLRU";
+
+    std::atomic<size_t> hits{0};
+    std::atomic<size_t> misses{0};
 
     /// Represents pending insertion attempt.
     struct InsertToken
     {
-        explicit InsertToken(LRUCache & cache_) : cache(cache_) {}
+        explicit InsertToken(CacheBase & cache_) : cache(cache_) {}
 
         std::mutex mutex;
         bool cleaned_up TSA_GUARDED_BY(mutex) = false;
         MappedPtr value TSA_GUARDED_BY(mutex);
 
-        LRUCache & cache;
+        CacheBase & cache;
         size_t refcount = 0; /// Protected by the cache mutex
     };
 
@@ -221,7 +223,7 @@ private:
 
         InsertTokenHolder() = default;
 
-        void acquire(const Key * key_, const std::shared_ptr<InsertToken> & token_, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
+        void acquire(const Key * key_, const std::shared_ptr<InsertToken> & token_, std::lock_guard<std::mutex> & /* cache_lock */)
             TSA_NO_THREAD_SAFETY_ANALYSIS // disabled only because we can't reference the parent-level cache mutex from here
         {
             key = key_;
@@ -229,7 +231,7 @@ private:
             ++token->refcount;
         }
 
-        void cleanup([[maybe_unused]] std::lock_guard<std::mutex> & token_lock, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
+        void cleanup(std::lock_guard<std::mutex> & /* token_lock */, std::lock_guard<std::mutex> & /* cache_lock */)
             TSA_NO_THREAD_SAFETY_ANALYSIS // disabled only because we can't reference the parent-level cache mutex from here
         {
             token->cache.insert_tokens.erase(*key);
@@ -260,105 +262,8 @@ private:
 
     friend struct InsertTokenHolder;
 
-
     InsertTokenById insert_tokens TSA_GUARDED_BY(mutex);
 
-    LRUQueue queue TSA_GUARDED_BY(mutex);
-
-    /// Total weight of values.
-    size_t current_size TSA_GUARDED_BY(mutex) = 0;
-    const size_t max_size;
-    const size_t max_elements_size;
-
-    std::atomic<size_t> hits {0};
-    std::atomic<size_t> misses {0};
-
-    const WeightFunction weight_function;
-
-    MappedPtr getImpl(const Key & key) TSA_REQUIRES(mutex)
-    {
-        auto it = cells.find(key);
-        if (it == cells.end())
-        {
-            return MappedPtr();
-        }
-
-        Cell & cell = it->second;
-
-        /// Move the key to the end of the queue. The iterator remains valid.
-        queue.splice(queue.end(), queue, cell.queue_iterator);
-
-        return cell.value;
-    }
-
-    void setImpl(const Key & key, const MappedPtr & mapped) TSA_REQUIRES(mutex)
-    {
-        auto [it, inserted] = cells.emplace(std::piecewise_construct,
-            std::forward_as_tuple(key),
-            std::forward_as_tuple());
-
-        Cell & cell = it->second;
-
-        if (inserted)
-        {
-            try
-            {
-                cell.queue_iterator = queue.insert(queue.end(), key);
-            }
-            catch (...)
-            {
-                cells.erase(it);
-                throw;
-            }
-        }
-        else
-        {
-            current_size -= cell.size;
-            queue.splice(queue.end(), queue, cell.queue_iterator);
-        }
-
-        cell.value = mapped;
-        cell.size = cell.value ? weight_function(*cell.value) : 0;
-        current_size += cell.size;
-
-        removeOverflow();
-    }
-
-    void removeOverflow() TSA_REQUIRES(mutex)
-    {
-        size_t current_weight_lost = 0;
-        size_t queue_size = cells.size();
-
-        while ((current_size > max_size || (max_elements_size != 0 && queue_size > max_elements_size)) && (queue_size > 1))
-        {
-            const Key & key = queue.front();
-
-            auto it = cells.find(key);
-            if (it == cells.end())
-            {
-                LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
-                abort();
-            }
-
-            const auto & cell = it->second;
-
-            current_size -= cell.size;
-            current_weight_lost += cell.size;
-
-            cells.erase(it);
-            queue.pop_front();
-            --queue_size;
-        }
-
-        onRemoveOverflowWeightLoss(current_weight_lost);
-
-        if (current_size > (1ull << 63))
-        {
-            LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
-            abort();
-        }
-    }
-
     /// Override this method if you want to track how much weight was lost in removeOverflow method.
     virtual void onRemoveOverflowWeightLoss(size_t /*weight_loss*/) {}
 };
diff --git a/src/Common/CaresPTRResolver.cpp b/src/Common/CaresPTRResolver.cpp
index f6228e97c02..376d3665f7e 100644
--- a/src/Common/CaresPTRResolver.cpp
+++ b/src/Common/CaresPTRResolver.cpp
@@ -35,8 +35,13 @@ namespace DB
          * See https://github.com/grpc/grpc/blob/master/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc#L1187
          * That means it's safe to init it here, but we should be cautious when introducing new code that depends on c-ares and even updates
          * to grpc. As discussed in https://github.com/ClickHouse/ClickHouse/pull/37827#discussion_r919189085, c-ares should be adapted to be atomic
+         *
+         * Since C++ 11 static objects are initialized in a thread safe manner. The static qualifier also makes sure
+         * it'll be called/ initialized only once.
          * */
-        if (ares_library_init(ARES_LIB_INIT_ALL) != ARES_SUCCESS || ares_init(&channel) != ARES_SUCCESS)
+        static const auto library_init_result = ares_library_init(ARES_LIB_INIT_ALL);
+
+        if (library_init_result != ARES_SUCCESS || ares_init(&channel) != ARES_SUCCESS)
         {
             throw DB::Exception("Failed to initialize c-ares", DB::ErrorCodes::DNS_ERROR);
         }
@@ -45,7 +50,12 @@ namespace DB
     CaresPTRResolver::~CaresPTRResolver()
     {
         ares_destroy(channel);
-        ares_library_cleanup();
+        /*
+         * Library initialization is currently done only once in the constructor. Multiple instances of CaresPTRResolver
+         * will be used in the lifetime of ClickHouse, thus it's problematic to have de-init here.
+         * In a practical view, it makes little to no sense to de-init a DNS library since DNS requests will happen
+         * until the end of the program. Hence, ares_library_cleanup() will not be called.
+         * */
     }
 
     std::vector<std::string> CaresPTRResolver::resolve(const std::string & ip)
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index e921f4fbf9a..0e4617345fa 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -4,13 +4,11 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/ColumnsHashingImpl.h>
 #include <Common/Arena.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/assert_cast.h>
-#include "Columns/IColumn.h"
 #include <base/unaligned.h>
 
 #include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnLowCardinality.h>
 
@@ -85,11 +83,8 @@ struct HashMethodString
 
     HashMethodString(const ColumnRawPtrs & key_columns, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
     {
-        const IColumn * column = key_columns[0];
-        if (isColumnConst(*column))
-            column = &assert_cast<const ColumnConst &>(*column).getDataColumn();
-
-        const ColumnString & column_string = assert_cast<const ColumnString &>(*column);
+        const IColumn & column = *key_columns[0];
+        const ColumnString & column_string = assert_cast<const ColumnString &>(column);
         offsets = column_string.getOffsets().data();
         chars = column_string.getChars().data();
     }
@@ -193,7 +188,7 @@ public:
     void set(const DictionaryKey & key, const CachedValuesPtr & mapped) { cache.set(key, mapped); }
 
 private:
-    using Cache = LRUCache<DictionaryKey, CachedValues, DictionaryKeyHash>;
+    using Cache = CacheBase<DictionaryKey, CachedValues, DictionaryKeyHash>;
     Cache cache;
 };
 
diff --git a/src/Common/CompactArray.h b/src/Common/CompactArray.h
index cf97206edb8..c2dd696d651 100644
--- a/src/Common/CompactArray.h
+++ b/src/Common/CompactArray.h
@@ -130,7 +130,7 @@ public:
 private:
     ReadBuffer & in;
     /// The physical location of the current cell.
-    Locus locus;
+    Locus locus{};
     /// The current position in the file as a cell number.
     BucketIndex current_bucket_index = 0;
     /// The number of bytes read.
diff --git a/src/Common/ConcurrencyControl.h b/src/Common/ConcurrencyControl.h
new file mode 100644
index 00000000000..6f37bb45c84
--- /dev/null
+++ b/src/Common/ConcurrencyControl.h
@@ -0,0 +1,266 @@
+#pragma once
+
+#include <base/types.h>
+#include <boost/core/noncopyable.hpp>
+#include <mutex>
+#include <memory>
+#include <list>
+#include <condition_variable>
+
+#include <Common/Exception.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+}
+
+/*
+ * Controls how many threads can be allocated for a query (or another activity).
+ * There is a limited amount of slots for threads. It can be set with `setMaxConcurrency(limit)`.
+ *
+ * Lifecycle of a slot: free -> granted -> acquired -> free.
+ * free: slot is available to be allocated by any query.
+ * granted: slot is allocated by specific query, but not yet acquired by any thread.
+ * acquired: slot is allocated by specific query and acquired by a thread.
+ *
+ * USAGE:
+ *   1. Create an allocation for a query:
+ *      `auto slots = ConcurrencyControl::instance().allocate(min, max);`
+ *      It will allocate at least `min` and at most `max` slots.
+ *      Note that `min` slots are granted immediately, but other `max - min` may be granted later.
+ *   2. For every thread a slot has to be acquired from that allocation:
+ *      `while (auto slot = slots->tryAcquire()) createYourThread([slot = std::move(slot)] { ... });`
+ *      This snippet can be used at query startup and for upscaling later.
+ * (both functions are non-blocking)
+ *
+ * Released slots are distributed between waiting allocations in a round-robin manner to provide fairness.
+ * Oversubscription is possible: total amount of allocated slots can exceed `setMaxConcurrency(limit)`
+ * because `min` amount of slots is allocated for each query unconditionally.
+ */
+class ConcurrencyControl : boost::noncopyable
+{
+public:
+    struct Allocation;
+    using AllocationPtr = std::shared_ptr<Allocation>;
+    using SlotCount = UInt64;
+    using Waiters = std::list<Allocation *>;
+
+    static constexpr SlotCount Unlimited = std::numeric_limits<SlotCount>::max();
+
+    // Scoped guard for acquired slot, see Allocation::tryAcquire()
+    struct Slot : boost::noncopyable
+    {
+        ~Slot()
+        {
+            allocation->release();
+        }
+
+    private:
+        friend struct Allocation; // for ctor
+
+        explicit Slot(AllocationPtr && allocation_)
+            : allocation(std::move(allocation_))
+        {}
+
+        AllocationPtr allocation;
+    };
+
+    // FIXME: have to be unique_ptr, but ThreadFromGlobalPool does not support move semantics yet
+    using SlotPtr = std::shared_ptr<Slot>;
+
+    // Manages group of slots for a single query, see ConcurrencyControl::allocate(min, max)
+    struct Allocation : std::enable_shared_from_this<Allocation>, boost::noncopyable
+    {
+        ~Allocation()
+        {
+            // We have to lock parent's mutex to avoid race with grant()
+            // NOTE: shortcut can be added, but it requires Allocation::mutex lock even to check if shortcut is possible
+            parent.free(this);
+        }
+
+        // Take one already granted slot if available. Lock-free iff there is no granted slot.
+        [[nodiscard]] SlotPtr tryAcquire()
+        {
+            SlotCount value = granted.load();
+            while (value)
+            {
+                if (granted.compare_exchange_strong(value, value - 1))
+                {
+                    std::unique_lock lock{mutex};
+                    return SlotPtr(new Slot(shared_from_this())); // can't use std::make_shared due to private ctor
+                }
+            }
+            return {}; // avoid unnecessary locking
+        }
+
+        SlotCount grantedCount() const
+        {
+            return granted;
+        }
+
+    private:
+        friend struct Slot; // for release()
+        friend class ConcurrencyControl; // for grant(), free() and ctor
+
+        Allocation(ConcurrencyControl & parent_, SlotCount limit_, SlotCount granted_, Waiters::iterator waiter_ = {})
+            : parent(parent_)
+            , limit(limit_)
+            , allocated(granted_)
+            , granted(granted_)
+            , waiter(waiter_)
+        {
+            if (allocated < limit)
+                *waiter = this;
+        }
+
+        auto cancel()
+        {
+            std::unique_lock lock{mutex};
+            return std::pair{allocated - released,
+                allocated < limit ?
+                    std::optional<Waiters::iterator>(waiter) :
+                    std::optional<Waiters::iterator>()};
+        }
+
+        // Grant single slot to allocation, returns true iff more slot(s) are required
+        bool grant()
+        {
+            std::unique_lock lock{mutex};
+            granted++;
+            allocated++;
+            return allocated < limit;
+        }
+
+        // Release one slot and grant it to other allocation if required
+        void release()
+        {
+            parent.release(1);
+            std::unique_lock lock{mutex};
+            released++;
+            if (released > allocated)
+                abort();
+        }
+
+        ConcurrencyControl & parent;
+        const SlotCount limit;
+
+        std::mutex mutex; // the following values must be accessed under this mutex
+        SlotCount allocated; // allocated total (including already `released`)
+        SlotCount released = 0;
+
+        std::atomic<SlotCount> granted; // allocated, but not yet acquired
+
+        const Waiters::iterator waiter; // iterator to itself in Waiters list; valid iff allocated < limit
+    };
+
+public:
+    ConcurrencyControl()
+        : cur_waiter(waiters.end())
+    {}
+
+    // WARNING: all Allocation objects MUST be destructed before ConcurrencyControl
+    // NOTE: Recommended way to achieve this is to use `instance()` and do graceful shutdown of queries
+    ~ConcurrencyControl()
+    {
+        if (!waiters.empty())
+            abort();
+    }
+
+    // Allocate at least `min` and at most `max` slots.
+    // If not all `max` slots were successfully allocated, a subscription for later allocation is created
+    // Use `Allocation::tryAcquire()` to acquire allocated slot, before running a thread.
+    [[nodiscard]] AllocationPtr allocate(SlotCount min, SlotCount max)
+    {
+        if (min > max)
+            throw DB::Exception("ConcurrencyControl: invalid allocation requirements", DB::ErrorCodes::LOGICAL_ERROR);
+
+        std::unique_lock lock{mutex};
+
+        // Acquire as much slots as we can, but not lower than `min`
+        SlotCount granted = std::max(min, std::min(max, available(lock)));
+        cur_concurrency += granted;
+
+        // Create allocation and start waiting if more slots are required
+        if (granted < max)
+            return AllocationPtr(new Allocation(*this, max, granted,
+                waiters.insert(cur_waiter, nullptr /* pointer is set by Allocation ctor */)));
+        else
+            return AllocationPtr(new Allocation(*this, max, granted));
+    }
+
+    void setMaxConcurrency(SlotCount value)
+    {
+        std::unique_lock lock{mutex};
+        max_concurrency = std::max<SlotCount>(1, value); // never allow max_concurrency to be zero
+        schedule(lock);
+    }
+
+    static ConcurrencyControl & instance()
+    {
+        static ConcurrencyControl result;
+        return result;
+    }
+
+private:
+    friend struct Allocation; // for free() and release()
+
+    void free(Allocation * allocation)
+    {
+        // Allocation is allowed to be canceled even if there are:
+        //  - `amount`: granted slots (acquired slots are not possible, because Slot holds AllocationPtr)
+        //  - `waiter`: active waiting for more slots to be allocated
+        // Thus Allocation destruction may require the following lock, to avoid race conditions
+        std::unique_lock lock{mutex};
+        auto [amount, waiter] = allocation->cancel();
+
+        cur_concurrency -= amount;
+        if (waiter)
+        {
+            if (cur_waiter == *waiter)
+                cur_waiter = waiters.erase(*waiter);
+            else
+                waiters.erase(*waiter);
+        }
+        schedule(lock);
+    }
+
+    void release(SlotCount amount)
+    {
+        std::unique_lock lock{mutex};
+        cur_concurrency -= amount;
+        schedule(lock);
+    }
+
+    // Round-robin scheduling of available slots among waiting allocations
+    void schedule(std::unique_lock<std::mutex> &)
+    {
+        while (cur_concurrency < max_concurrency && !waiters.empty())
+        {
+            cur_concurrency++;
+            if (cur_waiter == waiters.end())
+                cur_waiter = waiters.begin();
+            Allocation * allocation = *cur_waiter;
+            if (allocation->grant())
+                ++cur_waiter;
+            else
+                cur_waiter = waiters.erase(cur_waiter); // last required slot has just been granted -- stop waiting
+        }
+    }
+
+    SlotCount available(std::unique_lock<std::mutex> &)
+    {
+        if (cur_concurrency < max_concurrency)
+            return max_concurrency - cur_concurrency;
+        else
+            return 0;
+    }
+
+    std::mutex mutex;
+    Waiters waiters;
+    Waiters::iterator cur_waiter; // round-robin pointer
+    SlotCount max_concurrency = Unlimited;
+    SlotCount cur_concurrency = 0;
+};
diff --git a/src/Common/Config/ConfigHelper.h b/src/Common/Config/ConfigHelper.h
index b168be6ca9c..a1b630fa726 100644
--- a/src/Common/Config/ConfigHelper.h
+++ b/src/Common/Config/ConfigHelper.h
@@ -15,6 +15,6 @@ namespace DB::ConfigHelper
 
 /// The behavior is like `config.getBool(key, default_)`,
 /// except when the tag is empty (aka. self-closing), `empty_as` will be used instead of throwing Poco::Exception.
-bool getBool(const Poco::Util::AbstractConfiguration & config, const std::string & key, bool default_, bool empty_as);
+bool getBool(const Poco::Util::AbstractConfiguration & config, const std::string & key, bool default_ = false, bool empty_as = true);
 
 }
diff --git a/src/Common/Config/ConfigReloader.cpp b/src/Common/Config/ConfigReloader.cpp
index 65e12e09333..de7011b67bf 100644
--- a/src/Common/Config/ConfigReloader.cpp
+++ b/src/Common/Config/ConfigReloader.cpp
@@ -13,8 +13,6 @@ namespace fs = std::filesystem;
 namespace DB
 {
 
-constexpr decltype(ConfigReloader::reload_interval) ConfigReloader::reload_interval;
-
 ConfigReloader::ConfigReloader(
         const std::string & path_,
         const std::string & include_from_path_,
diff --git a/src/Common/CpuId.h b/src/Common/CpuId.h
index 167fa22faf6..1e54ccf62b3 100644
--- a/src/Common/CpuId.h
+++ b/src/Common/CpuId.h
@@ -82,6 +82,7 @@ inline bool cpuid(UInt32 op, UInt32 * res) noexcept /// NOLINT
     OP(AVX512BW)             \
     OP(AVX512VL)             \
     OP(AVX512VBMI)           \
+    OP(AVX512VBMI2)          \
     OP(PREFETCHWT1)          \
     OP(SHA)                  \
     OP(ADX)                  \
@@ -302,6 +303,11 @@ bool haveAVX512VBMI() noexcept
     return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ecx >> 1) & 1u);
 }
 
+bool haveAVX512VBMI2() noexcept
+{
+    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ecx >> 6) & 1u);
+}
+
 bool haveRDRAND() noexcept
 {
     return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x1).registers.ecx >> 30) & 1u);
diff --git a/src/Common/CurrentMemoryTracker.cpp b/src/Common/CurrentMemoryTracker.cpp
index e41cb258f08..921c244da21 100644
--- a/src/Common/CurrentMemoryTracker.cpp
+++ b/src/Common/CurrentMemoryTracker.cpp
@@ -51,15 +51,23 @@ void CurrentMemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     {
         if (current_thread)
         {
-            current_thread->untracked_memory += size;
+            Int64 will_be = current_thread->untracked_memory + size;
+            Int64 limit = current_thread->untracked_memory_limit + current_thread->untracked_memory_limit_increase;
 
-            if (current_thread->untracked_memory > current_thread->untracked_memory_limit)
+            if (will_be > limit)
             {
-                /// Zero untracked before track. If tracker throws out-of-limit we would be able to alloc up to untracked_memory_limit bytes
+                /// Increase limit before track. If tracker throws out-of-limit we would be able to alloc up to untracked_memory_limit bytes
                 /// more. It could be useful to enlarge Exception message in rethrow logic.
-                Int64 tmp = current_thread->untracked_memory;
+                current_thread->untracked_memory_limit_increase = current_thread->untracked_memory_limit;
+                memory_tracker->allocImpl(will_be, throw_if_memory_exceeded);
+                current_thread->untracked_memory_limit_increase = 0;
                 current_thread->untracked_memory = 0;
-                memory_tracker->allocImpl(tmp, throw_if_memory_exceeded);
+            }
+            else
+            {
+                /// Update after successful allocations,
+                /// since failed allocations should not be take into account.
+                current_thread->untracked_memory = will_be;
             }
         }
         /// total_memory_tracker only, ignore untracked_memory
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index f479e4cc140..c46342f6ade 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -92,6 +92,8 @@
     M(FilesystemCacheReadBuffers, "Number of active cache buffers") \
     M(CacheFileSegments, "Number of existing cache file segments") \
     M(CacheDetachedFileSegments, "Number of existing detached cache file segments") \
+    M(FilesystemCacheSize, "Filesystem cache size in bytes") \
+    M(FilesystemCacheElements, "Filesystem cache elements (file segments)") \
     M(S3Requests, "S3 requests") \
     M(KeeperAliveConnections, "Number of alive connections") \
     M(KeeperOutstandingRequets, "Number of outstanding requests") \
diff --git a/src/Common/CurrentThread.cpp b/src/Common/CurrentThread.cpp
index e3f6b63b28a..a2cdf9c8361 100644
--- a/src/Common/CurrentThread.cpp
+++ b/src/Common/CurrentThread.cpp
@@ -43,13 +43,6 @@ ProfileEvents::Counters & CurrentThread::getProfileEvents()
     return current_thread ? current_thread->performance_counters : ProfileEvents::global_counters;
 }
 
-MemoryTracker * CurrentThread::getMemoryTracker()
-{
-    if (unlikely(!current_thread))
-        return nullptr;
-    return &current_thread->memory_tracker;
-}
-
 void CurrentThread::updateProgressIn(const Progress & value)
 {
     if (unlikely(!current_thread))
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index fa52fafa9e2..cbe60365798 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -54,7 +54,12 @@ public:
     static void updatePerformanceCounters();
 
     static ProfileEvents::Counters & getProfileEvents();
-    static MemoryTracker * getMemoryTracker();
+    inline ALWAYS_INLINE static MemoryTracker * getMemoryTracker()
+    {
+        if (unlikely(!current_thread))
+            return nullptr;
+        return &current_thread->memory_tracker;
+    }
 
     /// Update read and write rows (bytes) statistics (used in system.query_thread_log)
     static void updateProgressIn(const Progress & value);
diff --git a/src/Common/DNSPTRResolverProvider.cpp b/src/Common/DNSPTRResolverProvider.cpp
index 41c73f4f36f..97d601a3a78 100644
--- a/src/Common/DNSPTRResolverProvider.cpp
+++ b/src/Common/DNSPTRResolverProvider.cpp
@@ -5,9 +5,8 @@ namespace DB
 {
     std::shared_ptr<DNSPTRResolver> DNSPTRResolverProvider::get()
     {
-        static auto cares_resolver = std::make_shared<CaresPTRResolver>(
+        return std::make_shared<CaresPTRResolver>(
             CaresPTRResolver::provider_token {}
         );
-        return cares_resolver;
     }
 }
diff --git a/src/Common/DateLUT.cpp b/src/Common/DateLUT.cpp
index d14b63cd70a..1206015b764 100644
--- a/src/Common/DateLUT.cpp
+++ b/src/Common/DateLUT.cpp
@@ -3,6 +3,7 @@
 #include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
 #include <Poco/SHA1Engine.h>
+#include <Common/filesystemHelpers.h>
 
 #include <filesystem>
 #include <fstream>
@@ -64,9 +65,9 @@ std::string determineDefaultTimeZone()
         ///  /etc/localtime -> /usr/share/zoneinfo//UTC
         ///  /usr/share/zoneinfo//UTC -> UCT
         /// But the preferred time zone name is pointed by the first link (UTC), and the second link is just an internal detail.
-        if (fs::is_symlink(tz_file_path))
+        if (FS::isSymlink(tz_file_path))
         {
-            tz_file_path = fs::read_symlink(tz_file_path);
+            tz_file_path = FS::readSymlink(tz_file_path);
             /// If it's relative - make it absolute.
             if (tz_file_path.is_relative())
                 tz_file_path = (fs::path("/etc/") / tz_file_path).lexically_normal();
diff --git a/src/Common/DateLUTImpl.h b/src/Common/DateLUTImpl.h
index 4bc9614abcb..f9361e809a9 100644
--- a/src/Common/DateLUTImpl.h
+++ b/src/Common/DateLUTImpl.h
@@ -10,20 +10,23 @@
 #include <type_traits>
 
 
-#define DATE_LUT_MIN_YEAR 1925 /// 1925 since wast majority of timezones changed to 15-minute aligned offsets somewhere in 1924 or earlier.
-#define DATE_LUT_MAX_YEAR 2283 /// Last supported year (complete)
+#define DATE_LUT_MIN_YEAR 1900 /// 1900 since majority of financial organizations consider 1900 as an initial year.
+#define DATE_LUT_MAX_YEAR 2299 /// Last supported year (complete)
 #define DATE_LUT_YEARS (1 + DATE_LUT_MAX_YEAR - DATE_LUT_MIN_YEAR) /// Number of years in lookup table
 
-#define DATE_LUT_SIZE 0x20000
+#define DATE_LUT_SIZE 0x23AB1
 
 #define DATE_LUT_MAX (0xFFFFFFFFU - 86400)
 #define DATE_LUT_MAX_DAY_NUM 0xFFFF
+
+#define DAYNUM_OFFSET_EPOCH 25567
+
 /// Max int value of Date32, DATE LUT cache size minus daynum_offset_epoch
-#define DATE_LUT_MAX_EXTEND_DAY_NUM (DATE_LUT_SIZE - 16436)
+#define DATE_LUT_MAX_EXTEND_DAY_NUM (DATE_LUT_SIZE - DAYNUM_OFFSET_EPOCH)
 
 /// A constant to add to time_t so every supported time point becomes non-negative and still has the same remainder of division by 3600.
 /// If we treat "remainder of division" operation in the sense of modular arithmetic (not like in C++).
-#define DATE_LUT_ADD ((1970 - DATE_LUT_MIN_YEAR) * 366 * 86400)
+#define DATE_LUT_ADD ((1970 - DATE_LUT_MIN_YEAR) * 366L * 86400)
 
 
 #if defined(__PPC__)
@@ -64,62 +67,78 @@ private:
     // Same as above but select different function overloads for zero saturation.
     STRONG_TYPEDEF(UInt32, LUTIndexWithSaturation)
 
+    static inline LUTIndex normalizeLUTIndex(UInt32 index)
+    {
+        if (index >= DATE_LUT_SIZE)
+            return LUTIndex(DATE_LUT_SIZE - 1);
+        return LUTIndex{index};
+    }
+
+    static inline LUTIndex normalizeLUTIndex(Int64 index)
+    {
+        if (unlikely(index < 0))
+            return LUTIndex(0);
+        if (index >= DATE_LUT_SIZE)
+            return LUTIndex(DATE_LUT_SIZE - 1);
+        return LUTIndex{index};
+    }
+
     template <typename T>
     friend inline LUTIndex operator+(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() + UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(index.toUnderType() + UInt32(v));
     }
 
     template <typename T>
     friend inline LUTIndex operator+(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(v + index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(v + index.toUnderType()));
     }
 
     friend inline LUTIndex operator+(const LUTIndex & index, const LUTIndex & v)
     {
-        return LUTIndex{(index.toUnderType() + v.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<UInt32>(index.toUnderType() + v.toUnderType()));
     }
 
     template <typename T>
     friend inline LUTIndex operator-(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() - UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(index.toUnderType() - UInt32(v)));
     }
 
     template <typename T>
     friend inline LUTIndex operator-(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(v - index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(v - index.toUnderType()));
     }
 
     friend inline LUTIndex operator-(const LUTIndex & index, const LUTIndex & v)
     {
-        return LUTIndex{(index.toUnderType() - v.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<Int64>(index.toUnderType() - v.toUnderType()));
     }
 
     template <typename T>
     friend inline LUTIndex operator*(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() * UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(index.toUnderType() * UInt32(v));
     }
 
     template <typename T>
     friend inline LUTIndex operator*(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(v * index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(v * index.toUnderType());
     }
 
     template <typename T>
     friend inline LUTIndex operator/(const LUTIndex & index, const T v)
     {
-        return LUTIndex{(index.toUnderType() / UInt32(v)) & date_lut_mask};
+        return normalizeLUTIndex(index.toUnderType() / UInt32(v));
     }
 
     template <typename T>
     friend inline LUTIndex operator/(const T v, const LUTIndex & index)
     {
-        return LUTIndex{(UInt32(v) / index.toUnderType()) & date_lut_mask};
+        return normalizeLUTIndex(UInt32(v) / index.toUnderType());
     }
 
 public:
@@ -168,14 +187,9 @@ public:
     static_assert(sizeof(Values) == 16);
 
 private:
-
-    /// Mask is all-ones to allow efficient protection against overflow.
-    static constexpr UInt32 date_lut_mask = 0x1ffff;
-    static_assert(date_lut_mask == DATE_LUT_SIZE - 1);
-
     /// Offset to epoch in days (ExtendedDayNum) of the first day in LUT.
     /// "epoch" is the Unix Epoch (starts at unix timestamp zero)
-    static constexpr UInt32 daynum_offset_epoch = 16436;
+    static constexpr UInt32 daynum_offset_epoch = 25567;
     static_assert(daynum_offset_epoch == (1970 - DATE_LUT_MIN_YEAR) * 365 + (1970 - DATE_LUT_MIN_YEAR / 4 * 4) / 4);
 
     /// Lookup table is indexed by LUTIndex.
@@ -232,12 +246,12 @@ private:
 
     static inline LUTIndex toLUTIndex(DayNum d)
     {
-        return LUTIndex{(d + daynum_offset_epoch) & date_lut_mask};
+        return normalizeLUTIndex(d + daynum_offset_epoch);
     }
 
     static inline LUTIndex toLUTIndex(ExtendedDayNum d)
     {
-        return LUTIndex{static_cast<UInt32>(d + daynum_offset_epoch) & date_lut_mask};
+        return normalizeLUTIndex(static_cast<UInt32>(d + daynum_offset_epoch));
     }
 
     inline LUTIndex toLUTIndex(Time t) const
@@ -1062,7 +1076,7 @@ public:
 
         auto year_lut_index = (year - DATE_LUT_MIN_YEAR) * 12 + month - 1;
         UInt32 index = years_months_lut[year_lut_index].toUnderType() + day_of_month - 1;
-        /// When date is out of range, default value is DATE_LUT_SIZE - 1 (2283-11-11)
+        /// When date is out of range, default value is DATE_LUT_SIZE - 1 (2299-12-31)
         return LUTIndex{std::min(index, static_cast<UInt32>(DATE_LUT_SIZE - 1))};
     }
 
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index 904fee99214..f8d8deab08b 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -634,6 +634,7 @@
     M(663, INCONSISTENT_METADATA_FOR_BACKUP) \
     M(664, ACCESS_STORAGE_DOESNT_ALLOW_BACKUP) \
     M(665, CANNOT_CONNECT_NATS) \
+    M(666, CANNOT_USE_CACHE) \
     \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
diff --git a/src/Common/LRUFileCache.cpp b/src/Common/FileCache.cpp
similarity index 69%
rename from src/Common/LRUFileCache.cpp
rename to src/Common/FileCache.cpp
index 6306b6de059..1aa8a25bb79 100644
--- a/src/Common/LRUFileCache.cpp
+++ b/src/Common/FileCache.cpp
@@ -1,8 +1,7 @@
-#include "LRUFileCache.h"
+#include "FileCache.h"
 
 #include <Common/randomSeed.h>
 #include <Common/SipHash.h>
-#include <Common/hex.h>
 #include <Common/FileCacheSettings.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
@@ -11,6 +10,7 @@
 #include <IO/Operators.h>
 #include <pcg-random/pcg_random.hpp>
 #include <filesystem>
+#include <Common/LRUFileCachePriority.h>
 
 namespace fs = std::filesystem;
 
@@ -22,16 +22,62 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-LRUFileCache::LRUFileCache(const String & cache_base_path_, const FileCacheSettings & cache_settings_)
-    : IFileCache(cache_base_path_, cache_settings_)
-    , max_stash_element_size(cache_settings_.max_elements)
+FileCache::FileCache(
+    const String & cache_base_path_,
+    const FileCacheSettings & cache_settings_)
+    : cache_base_path(cache_base_path_)
+    , max_size(cache_settings_.max_size)
+    , max_element_size(cache_settings_.max_elements)
+    , max_file_segment_size(cache_settings_.max_file_segment_size)
+    , allow_persistent_files(cache_settings_.do_not_evict_index_and_mark_files)
     , enable_cache_hits_threshold(cache_settings_.enable_cache_hits_threshold)
-    , log(&Poco::Logger::get("LRUFileCache"))
-    , allow_to_remove_persistent_segments_from_cache_by_default(cache_settings_.allow_to_remove_persistent_segments_from_cache_by_default)
+    , enable_filesystem_query_cache_limit(cache_settings_.enable_filesystem_query_cache_limit)
+    , log(&Poco::Logger::get("FileCache"))
+    , main_priority(std::make_unique<LRUFileCachePriority>())
+    , stash_priority(std::make_unique<LRUFileCachePriority>())
+    , max_stash_element_size(cache_settings_.max_elements)
 {
 }
 
-void LRUFileCache::initialize()
+FileCache::Key FileCache::hash(const String & path)
+{
+    return Key(sipHash128(path.data(), path.size()));
+}
+
+String FileCache::getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const
+{
+    auto key_str = key.toString();
+    return fs::path(cache_base_path)
+        / key_str.substr(0, 3)
+        / key_str
+        / (std::to_string(offset) + (is_persistent ? "_persistent" : ""));
+}
+
+String FileCache::getPathInLocalCache(const Key & key) const
+{
+    auto key_str = key.toString();
+    return fs::path(cache_base_path) / key_str.substr(0, 3) / key_str;
+}
+
+static bool isQueryInitialized()
+{
+    return CurrentThread::isInitialized()
+        && CurrentThread::get().getQueryContext()
+        && !CurrentThread::getQueryId().empty();
+}
+
+bool FileCache::isReadOnly()
+{
+    return !isQueryInitialized();
+}
+
+void FileCache::assertInitialized() const
+{
+    if (!is_initialized)
+        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Cache not initialized");
+}
+
+void FileCache::initialize()
 {
     std::lock_guard cache_lock(mutex);
     if (!is_initialized)
@@ -55,8 +101,8 @@ void LRUFileCache::initialize()
     }
 }
 
-void LRUFileCache::useCell(
-    const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock)
+void FileCache::useCell(
+    const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock) const
 {
     auto file_segment = cell.file_segment;
 
@@ -75,11 +121,11 @@ void LRUFileCache::useCell(
     if (cell.queue_iterator)
     {
         /// Move to the end of the queue. The iterator remains valid.
-        queue.moveToEnd(*cell.queue_iterator, cache_lock);
+        cell.queue_iterator->use(cache_lock);
     }
 }
 
-LRUFileCache::FileSegmentCell * LRUFileCache::getCell(
+FileCache::FileSegmentCell * FileCache::getCell(
     const Key & key, size_t offset, std::lock_guard<std::mutex> & /* cache_lock */)
 {
     auto it = files.find(key);
@@ -94,7 +140,7 @@ LRUFileCache::FileSegmentCell * LRUFileCache::getCell(
     return &cell_it->second;
 }
 
-FileSegments LRUFileCache::getImpl(
+FileSegments FileCache::getImpl(
     const Key & key, const FileSegment::Range & range, std::lock_guard<std::mutex> & cache_lock)
 {
     /// Given range = [left, right] and non-overlapping ordered set of file segments,
@@ -112,7 +158,7 @@ FileSegments LRUFileCache::getImpl(
         files.erase(key);
 
         /// Note: it is guaranteed that there is no concurrency with files deletion,
-        /// because cache files are deleted only inside IFileCache and under cache lock.
+        /// because cache files are deleted only inside FileCache and under cache lock.
         if (fs::exists(key_path))
             fs::remove_all(key_path);
 
@@ -150,7 +196,6 @@ FileSegments LRUFileCache::getImpl(
                 ///       [___________
                 ///       ^
                 ///       range.left
-
                 useCell(prev_cell, result, cache_lock);
             }
         }
@@ -175,7 +220,7 @@ FileSegments LRUFileCache::getImpl(
     return result;
 }
 
-FileSegments LRUFileCache::splitRangeIntoCells(
+FileSegments FileCache::splitRangeIntoCells(
     const Key & key, size_t offset, size_t size, FileSegment::State state, bool is_persistent, std::lock_guard<std::mutex> & cache_lock)
 {
     assert(size > 0);
@@ -204,7 +249,7 @@ FileSegments LRUFileCache::splitRangeIntoCells(
     return file_segments;
 }
 
-void LRUFileCache::fillHolesWithEmptyFileSegments(
+void FileCache::fillHolesWithEmptyFileSegments(
     FileSegments & file_segments,
     const Key & key,
     const FileSegment::Range & range,
@@ -298,7 +343,7 @@ void LRUFileCache::fillHolesWithEmptyFileSegments(
     }
 }
 
-FileSegmentsHolder LRUFileCache::getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent)
+FileSegmentsHolder FileCache::getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent)
 {
     assertInitialized();
 
@@ -326,7 +371,7 @@ FileSegmentsHolder LRUFileCache::getOrSet(const Key & key, size_t offset, size_t
     return FileSegmentsHolder(std::move(file_segments));
 }
 
-FileSegmentsHolder LRUFileCache::get(const Key & key, size_t offset, size_t size)
+FileSegmentsHolder FileCache::get(const Key & key, size_t offset, size_t size)
 {
     assertInitialized();
 
@@ -358,7 +403,7 @@ FileSegmentsHolder LRUFileCache::get(const Key & key, size_t offset, size_t size
     return FileSegmentsHolder(std::move(file_segments));
 }
 
-LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
+FileCache::FileSegmentCell * FileCache::addCell(
     const Key & key, size_t offset, size_t size,
     FileSegment::State state, bool is_persistent,
     std::lock_guard<std::mutex> & cache_lock)
@@ -379,30 +424,27 @@ LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
         FileSegment::State result_state = state;
         if (state == FileSegment::State::EMPTY && enable_cache_hits_threshold)
         {
-            auto record = records.find({key, offset});
+            auto record = stash_records.find({key, offset});
 
-            if (record == records.end())
+            if (record == stash_records.end())
             {
-                auto queue_iter = stash_queue.add(key, offset, 0, cache_lock);
-                records.insert({{key, offset}, queue_iter});
+                auto priority_iter = stash_priority->add(key, offset, 0, cache_lock);
+                stash_records.insert({{key, offset}, priority_iter});
 
-                if (stash_queue.getElementsNum(cache_lock) > max_stash_element_size)
+                if (stash_priority->getElementsNum(cache_lock) > max_stash_element_size)
                 {
-                    auto remove_queue_iter = stash_queue.begin();
-                    records.erase({remove_queue_iter->key, remove_queue_iter->offset});
-                    stash_queue.remove(remove_queue_iter, cache_lock);
+                    auto remove_priority_iter = stash_priority->getLowestPriorityWriteIterator(cache_lock);
+                    stash_records.erase({remove_priority_iter->key(), remove_priority_iter->offset()});
+                    remove_priority_iter->removeAndGetNext(cache_lock);
                 }
-
                 /// For segments that do not reach the download threshold, we do not download them, but directly read them
                 result_state = FileSegment::State::SKIP_CACHE;
             }
             else
             {
-                auto queue_iter = record->second;
-                queue_iter->hits++;
-                stash_queue.moveToEnd(queue_iter, cache_lock);
-
-                result_state = queue_iter->hits >= enable_cache_hits_threshold ? FileSegment::State::EMPTY : FileSegment::State::SKIP_CACHE;
+                auto priority_iter = record->second;
+                priority_iter->use(cache_lock);
+                result_state = priority_iter->hits() >= enable_cache_hits_threshold ? FileSegment::State::EMPTY : FileSegment::State::SKIP_CACHE;
             }
         }
 
@@ -429,18 +471,20 @@ LRUFileCache::FileSegmentCell * LRUFileCache::addCell(
     return &(it->second);
 }
 
-FileSegmentsHolder LRUFileCache::setDownloading(
+FileSegmentPtr FileCache::createFileSegmentForDownload(
     const Key & key,
     size_t offset,
     size_t size,
-    bool is_persistent)
+    bool is_persistent,
+    std::lock_guard<std::mutex> & cache_lock)
 {
-    std::lock_guard cache_lock(mutex);
-
 #ifndef NDEBUG
     assertCacheCorrectness(key, cache_lock);
 #endif
 
+    if (size > max_file_segment_size)
+        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Requested size exceeds max file segment size");
+
     auto * cell = getCell(key, offset, cache_lock);
     if (cell)
         throw Exception(
@@ -448,11 +492,15 @@ FileSegmentsHolder LRUFileCache::setDownloading(
             "Cache cell already exists for key `{}` and offset {}",
             key.toString(), offset);
 
-    auto file_segments = splitRangeIntoCells(key, offset, size, FileSegment::State::DOWNLOADING, is_persistent, cache_lock);
-    return FileSegmentsHolder(std::move(file_segments));
+    cell = addCell(key, offset, size, FileSegment::State::EMPTY, is_persistent, cache_lock);
+
+    if (!cell)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to add a new cell for download");
+
+    return cell->file_segment;
 }
 
-bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
+bool FileCache::tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
 {
     auto query_context = enable_filesystem_query_cache_limit ? getCurrentQueryContext(cache_lock) : nullptr;
     if (!query_context)
@@ -473,44 +521,63 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
     else
     {
         size_t removed_size = 0;
-        size_t queue_size = queue.getElementsNum(cache_lock);
+        size_t queue_size = main_priority->getElementsNum(cache_lock);
 
         auto * cell_for_reserve = getCell(key, offset, cache_lock);
 
-        std::vector<IFileCache::LRUQueue::Iterator> ghost;
+        struct Segment
+        {
+            Key key;
+            size_t offset;
+            size_t size;
+
+            Segment(Key key_, size_t offset_, size_t size_)
+                : key(key_), offset(offset_), size(size_) {}
+        };
+
+        std::vector<Segment> ghost;
         std::vector<FileSegmentCell *> trash;
         std::vector<FileSegmentCell *> to_evict;
 
         auto is_overflow = [&]
         {
-            return (max_size != 0 && queue.getTotalCacheSize(cache_lock) + size - removed_size > max_size)
+            return (max_size != 0 && main_priority->getCacheSize(cache_lock) + size - removed_size > max_size)
             || (max_element_size != 0 && queue_size > max_element_size)
             || (query_context->getCacheSize() + size - removed_size > query_context->getMaxCacheSize());
         };
 
         /// Select the cache from the LRU queue held by query for expulsion.
-        for (auto iter = query_context->queue().begin(); iter != query_context->queue().end(); iter++)
+        for (auto iter = query_context->getPriority()->getLowestPriorityWriteIterator(cache_lock); iter->valid();)
         {
             if (!is_overflow())
                 break;
 
-            auto * cell = getCell(iter->key, iter->offset, cache_lock);
+            auto * cell = getCell(iter->key(), iter->offset(), cache_lock);
 
             if (!cell)
             {
                 /// The cache corresponding to this record may be swapped out by
                 /// other queries, so it has become invalid.
-                ghost.push_back(iter);
-                removed_size += iter->size;
+                removed_size += iter->size();
+                ghost.push_back(Segment(iter->key(), iter->offset(), iter->size()));
+                /// next()
+                iter->removeAndGetNext(cache_lock);
             }
             else
             {
                 size_t cell_size = cell->size();
-                assert(iter->size == cell_size);
+                assert(iter->size() == cell_size);
 
                 if (cell->releasable())
                 {
                     auto & file_segment = cell->file_segment;
+
+                    if (file_segment->isPersistent() && allow_persistent_files)
+                    {
+                        LOG_DEBUG(log, "File segment will not be removed, because it is persistent: {}", file_segment->getInfoForLog());
+                        continue;
+                    }
+
                     std::lock_guard segment_lock(file_segment->mutex);
 
                     switch (file_segment->download_state)
@@ -529,6 +596,8 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
                     removed_size += cell_size;
                     --queue_size;
                 }
+
+                iter->next();
             }
         }
 
@@ -547,8 +616,8 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
                 remove_file_segment(file_segment, cell->size());
         }
 
-        for (auto & iter : ghost)
-            query_context->remove(iter->key, iter->offset, iter->size, cache_lock);
+        for (auto & entry : ghost)
+            query_context->remove(entry.key, entry.offset, entry.size, cache_lock);
 
         if (is_overflow())
             return false;
@@ -557,9 +626,9 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
         {
             auto queue_iterator = cell_for_reserve->queue_iterator;
             if (queue_iterator)
-                queue.incrementSize(*queue_iterator, size, cache_lock);
+                queue_iterator->incrementSize(size, cache_lock);
             else
-                cell_for_reserve->queue_iterator = queue.add(key, offset, size, cache_lock);
+                cell_for_reserve->queue_iterator = main_priority->add(key, offset, size, cache_lock);
         }
 
         for (auto & cell : to_evict)
@@ -573,11 +642,11 @@ bool LRUFileCache::tryReserve(const Key & key, size_t offset, size_t size, std::
     }
 }
 
-bool LRUFileCache::tryReserveForMainList(
+bool FileCache::tryReserveForMainList(
     const Key & key, size_t offset, size_t size, QueryContextPtr query_context, std::lock_guard<std::mutex> & cache_lock)
 {
     auto removed_size = 0;
-    size_t queue_size = queue.getElementsNum(cache_lock);
+    size_t queue_size = main_priority->getElementsNum(cache_lock);
     assert(queue_size <= max_element_size);
 
     /// Since space reservation is incremental, cache cell already exists if it's state is EMPTY.
@@ -592,15 +661,18 @@ bool LRUFileCache::tryReserveForMainList(
     auto is_overflow = [&]
     {
         /// max_size == 0 means unlimited cache size, max_element_size means unlimited number of cache elements.
-        return (max_size != 0 && queue.getTotalCacheSize(cache_lock) + size - removed_size > max_size)
+        return (max_size != 0 && main_priority->getCacheSize(cache_lock) + size - removed_size > max_size)
             || (max_element_size != 0 && queue_size > max_element_size);
     };
 
     std::vector<FileSegmentCell *> to_evict;
     std::vector<FileSegmentCell *> trash;
 
-    for (const auto & [entry_key, entry_offset, entry_size, _] : queue)
+    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
     {
+        const auto & entry_key = it->key();
+        auto entry_offset = it->offset();
+
         if (!is_overflow())
             break;
 
@@ -612,7 +684,7 @@ bool LRUFileCache::tryReserveForMainList(
                 key.toString(), offset);
 
         size_t cell_size = cell->size();
-        assert(entry_size == cell_size);
+        assert(it->size() == cell_size);
 
         /// It is guaranteed that cell is not removed from cache as long as
         /// pointer to corresponding file segment is hold by any other thread.
@@ -621,6 +693,12 @@ bool LRUFileCache::tryReserveForMainList(
         {
             auto & file_segment = cell->file_segment;
 
+            if (file_segment->isPersistent() && allow_persistent_files)
+            {
+                LOG_DEBUG(log, "File segment will not be removed, because it is persistent: {}", file_segment->getInfoForLog());
+                continue;
+            }
+
             std::lock_guard segment_lock(file_segment->mutex);
 
             switch (file_segment->download_state)
@@ -671,9 +749,9 @@ bool LRUFileCache::tryReserveForMainList(
         /// If queue iterator already exists, we need to update the size after each space reservation.
         auto queue_iterator = cell_for_reserve->queue_iterator;
         if (queue_iterator)
-            queue.incrementSize(*queue_iterator, size, cache_lock);
+            queue_iterator->incrementSize(size, cache_lock);
         else
-            cell_for_reserve->queue_iterator = queue.add(key, offset, size, cache_lock);
+            cell_for_reserve->queue_iterator = main_priority->add(key, offset, size, cache_lock);
     }
 
     for (auto & cell : to_evict)
@@ -682,7 +760,7 @@ bool LRUFileCache::tryReserveForMainList(
             remove_file_segment(file_segment);
     }
 
-    if (queue.getTotalCacheSize(cache_lock) > (1ull << 63))
+    if (main_priority->getCacheSize(cache_lock) > (1ull << 63))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache became inconsistent. There must be a bug");
 
     if (query_context)
@@ -691,7 +769,7 @@ bool LRUFileCache::tryReserveForMainList(
     return true;
 }
 
-void LRUFileCache::removeIfExists(const Key & key)
+void FileCache::removeIfExists(const Key & key)
 {
     assertInitialized();
 
@@ -742,7 +820,7 @@ void LRUFileCache::removeIfExists(const Key & key)
     }
 }
 
-void LRUFileCache::removeIfReleasable(bool remove_persistent_files)
+void FileCache::removeIfReleasable()
 {
     /// Try remove all cached files by cache_base_path.
     /// Only releasable file segments are evicted.
@@ -751,10 +829,12 @@ void LRUFileCache::removeIfReleasable(bool remove_persistent_files)
 
     std::lock_guard cache_lock(mutex);
 
-    std::vector<FileSegment *> to_remove;
-    for (auto it = queue.begin(); it != queue.end();)
+    std::vector<FileSegmentPtr> to_remove;
+    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
     {
-        const auto & [key, offset, size, _] = *it++;
+        const auto & key = it->key();
+        auto offset = it->offset();
+
         auto * cell = getCell(key, offset, cache_lock);
         if (!cell)
             throw Exception(
@@ -764,28 +844,31 @@ void LRUFileCache::removeIfReleasable(bool remove_persistent_files)
         if (cell->releasable())
         {
             auto file_segment = cell->file_segment;
-            if (file_segment
-                && (!file_segment->isPersistent()
-                    || remove_persistent_files
-                    || allow_to_remove_persistent_segments_from_cache_by_default))
+
+            if (file_segment)
             {
-                std::lock_guard segment_lock(file_segment->mutex);
-                file_segment->detach(cache_lock, segment_lock);
-                remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
+                to_remove.emplace_back(file_segment);
             }
         }
     }
 
+    for (auto & file_segment : to_remove)
+    {
+        std::lock_guard segment_lock(file_segment->mutex);
+        file_segment->detach(cache_lock, segment_lock);
+        remove(file_segment->key(), file_segment->offset(), cache_lock, segment_lock);
+    }
+
     /// Remove all access information.
-    records.clear();
-    stash_queue.removeAll(cache_lock);
+    stash_records.clear();
+    stash_priority->removeAll(cache_lock);
 
 #ifndef NDEBUG
     assertCacheCorrectness(cache_lock);
 #endif
 }
 
-void LRUFileCache::remove(
+void FileCache::remove(
     Key key, size_t offset,
     std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */)
 {
@@ -799,7 +882,7 @@ void LRUFileCache::remove(
 
     if (cell->queue_iterator)
     {
-        queue.remove(*cell->queue_iterator, cache_lock);
+        cell->queue_iterator->removeAndGetNext(cache_lock);
     }
 
     auto & offsets = files[key];
@@ -831,15 +914,14 @@ void LRUFileCache::remove(
     }
 }
 
-void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock)
 {
     Key key;
     UInt64 offset = 0;
     size_t size = 0;
-    std::vector<std::pair<LRUQueue::Iterator, std::weak_ptr<FileSegment>>> queue_entries;
+    std::vector<std::pair<IFileCachePriority::WriteIterator, std::weak_ptr<FileSegment>>> queue_entries;
 
     /// cache_base_path / key_prefix / key / offset
-
     if (!files.empty())
         throw Exception(
             ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR,
@@ -853,8 +935,13 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
         fs::directory_iterator key_it{key_prefix_it->path()};
         for (; key_it != fs::directory_iterator(); ++key_it)
         {
-            key = Key(unhexUInt<UInt128>(key_it->path().filename().string().data()));
+            if (!key_it->is_directory())
+            {
+                LOG_WARNING(log, "Unexpected file: {}. Expected a directory", key_it->path().string());
+                continue;
+            }
 
+            key = Key(unhexUInt<UInt128>(key_it->path().filename().string().data()));
             fs::directory_iterator offset_it{key_it->path()};
             for (; offset_it != fs::directory_iterator(); ++offset_it)
             {
@@ -873,7 +960,7 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
 
                 if (!parsed)
                 {
-                    LOG_WARNING(log, "Unexpected file: ", offset_it->path().string());
+                    LOG_WARNING(log, "Unexpected file: {}", offset_it->path().string());
                     continue; /// Or just remove? Some unexpected file.
                 }
 
@@ -888,13 +975,15 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
                 {
                     auto * cell = addCell(key, offset, size, FileSegment::State::DOWNLOADED, is_persistent, cache_lock);
                     if (cell)
-                        queue_entries.emplace_back(*cell->queue_iterator, cell->file_segment);
+                        queue_entries.emplace_back(cell->queue_iterator, cell->file_segment);
                 }
                 else
                 {
-                    LOG_WARNING(log,
-                                "Cache capacity changed (max size: {}, available: {}), cached file `{}` does not fit in cache anymore (size: {})",
-                                max_size, getAvailableCacheSizeUnlocked(cache_lock), key_it->path().string(), size);
+                    LOG_WARNING(
+                        log,
+                        "Cache capacity changed (max size: {}, available: {}), cached file `{}` does not fit in cache anymore (size: {})",
+                        max_size, getAvailableCacheSizeUnlocked(cache_lock), key_it->path().string(), size);
+
                     fs::remove(offset_it->path());
                 }
             }
@@ -912,14 +1001,14 @@ void LRUFileCache::loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_l
         if (file_segment.expired())
             continue;
 
-        queue.moveToEnd(it, cache_lock);
+        it->use(cache_lock);
     }
 #ifndef NDEBUG
     assertCacheCorrectness(cache_lock);
 #endif
 }
 
-void LRUFileCache::reduceSizeToDownloaded(
+void FileCache::reduceSizeToDownloaded(
     const Key & key, size_t offset,
     std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */)
 {
@@ -952,7 +1041,7 @@ void LRUFileCache::reduceSizeToDownloaded(
     cell->file_segment = std::make_shared<FileSegment>(offset, downloaded_size, key, this, FileSegment::State::DOWNLOADED);
 }
 
-bool LRUFileCache::isLastFileSegmentHolder(
+bool FileCache::isLastFileSegmentHolder(
     const Key & key, size_t offset,
     std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */)
 {
@@ -965,7 +1054,7 @@ bool LRUFileCache::isLastFileSegmentHolder(
     return cell->file_segment.use_count() == 2;
 }
 
-FileSegments LRUFileCache::getSnapshot() const
+FileSegments FileCache::getSnapshot() const
 {
     std::lock_guard cache_lock(mutex);
 
@@ -979,7 +1068,7 @@ FileSegments LRUFileCache::getSnapshot() const
     return file_segments;
 }
 
-std::vector<String> LRUFileCache::tryGetCachePaths(const Key & key)
+std::vector<String> FileCache::tryGetCachePaths(const Key & key)
 {
     std::lock_guard cache_lock(mutex);
 
@@ -996,42 +1085,36 @@ std::vector<String> LRUFileCache::tryGetCachePaths(const Key & key)
     return cache_paths;
 }
 
-size_t LRUFileCache::getUsedCacheSize() const
+size_t FileCache::getUsedCacheSize() const
 {
     std::lock_guard cache_lock(mutex);
     return getUsedCacheSizeUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+size_t FileCache::getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
 {
-    return queue.getTotalCacheSize(cache_lock);
+    return main_priority->getCacheSize(cache_lock);
 }
 
-size_t LRUFileCache::getAvailableCacheSize() const
-{
-    std::lock_guard cache_lock(mutex);
-    return getAvailableCacheSizeUnlocked(cache_lock);
-}
-
-size_t LRUFileCache::getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+size_t FileCache::getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const
 {
     return max_size - getUsedCacheSizeUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getFileSegmentsNum() const
+size_t FileCache::getFileSegmentsNum() const
 {
     std::lock_guard cache_lock(mutex);
     return getFileSegmentsNumUnlocked(cache_lock);
 }
 
-size_t LRUFileCache::getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const
+size_t FileCache::getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const
 {
-    return queue.getElementsNum(cache_lock);
+    return main_priority->getElementsNum(cache_lock);
 }
 
-LRUFileCache::FileSegmentCell::FileSegmentCell(
+FileCache::FileSegmentCell::FileSegmentCell(
     FileSegmentPtr file_segment_,
-    LRUFileCache * cache,
+    FileCache * cache,
     std::lock_guard<std::mutex> & cache_lock)
     : file_segment(file_segment_)
 {
@@ -1045,7 +1128,7 @@ LRUFileCache::FileSegmentCell::FileSegmentCell(
     {
         case FileSegment::State::DOWNLOADED:
         {
-            queue_iterator = cache->queue.add(file_segment->key(), file_segment->offset(), file_segment->range().size(), cache_lock);
+            queue_iterator = cache->main_priority->add(file_segment->key(), file_segment->offset(), file_segment->range().size(), cache_lock);
             break;
         }
         case FileSegment::State::SKIP_CACHE:
@@ -1061,79 +1144,13 @@ LRUFileCache::FileSegmentCell::FileSegmentCell(
     }
 }
 
-IFileCache::LRUQueue::Iterator IFileCache::LRUQueue::add(
-    const IFileCache::Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-#ifndef NDEBUG
-    for (const auto & [entry_key, entry_offset, entry_size, entry_hits] : queue)
-    {
-        if (entry_key == key && entry_offset == offset)
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR,
-                "Attempt to add duplicate queue entry to queue. (Key: {}, offset: {}, size: {})",
-                key.toString(), offset, size);
-    }
-#endif
-
-    cache_size += size;
-    return queue.insert(queue.end(), FileKeyAndOffset(key, offset, size));
-}
-
-void IFileCache::LRUQueue::remove(Iterator queue_it, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    cache_size -= queue_it->size;
-    queue.erase(queue_it);
-}
-
-void IFileCache::LRUQueue::removeAll(std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    queue.clear();
-    cache_size = 0;
-}
-
-void IFileCache::LRUQueue::moveToEnd(Iterator queue_it, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    queue.splice(queue.end(), queue, queue_it);
-}
-
-void IFileCache::LRUQueue::incrementSize(Iterator queue_it, size_t size_increment, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    cache_size += size_increment;
-    queue_it->size += size_increment;
-}
-
-bool IFileCache::LRUQueue::contains(
-    const IFileCache::Key & key, size_t offset, std::lock_guard<std::mutex> & /* cache_lock */) const
-{
-    /// This method is used for assertions in debug mode.
-    /// So we do not care about complexity here.
-    for (const auto & [entry_key, entry_offset, size, _] : queue)
-    {
-        if (key == entry_key && offset == entry_offset)
-            return true;
-    }
-    return false;
-}
-
-String IFileCache::LRUQueue::toString(std::lock_guard<std::mutex> & /* cache_lock */) const
-{
-    String result;
-    for (const auto & [key, offset, size, _] : queue)
-    {
-        if (!result.empty())
-            result += ", ";
-        result += fmt::format("{}: [{}, {}]", key.toString(), offset, offset + size - 1);
-    }
-    return result;
-}
-
-String LRUFileCache::dumpStructure(const Key & key)
+String FileCache::dumpStructure(const Key & key)
 {
     std::lock_guard cache_lock(mutex);
     return dumpStructureUnlocked(key, cache_lock);
 }
 
-String LRUFileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std::mutex> & cache_lock)
+String FileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std::mutex> &)
 {
     WriteBufferFromOwnString result;
     const auto & cells_by_offset = files[key];
@@ -1141,11 +1158,10 @@ String LRUFileCache::dumpStructureUnlocked(const Key & key, std::lock_guard<std:
     for (const auto & [offset, cell] : cells_by_offset)
         result << cell.file_segment->getInfoForLog() << "\n";
 
-    result << "\n\nQueue: " << queue.toString(cache_lock);
     return result.str();
 }
 
-void LRUFileCache::assertCacheCellsCorrectness(
+void FileCache::assertCacheCellsCorrectness(
     const FileSegmentsByOffset & cells_by_offset, [[maybe_unused]] std::lock_guard<std::mutex> & cache_lock)
 {
     for (const auto & [_, cell] : cells_by_offset)
@@ -1156,30 +1172,32 @@ void LRUFileCache::assertCacheCellsCorrectness(
         if (file_segment->reserved_size != 0)
         {
             assert(cell.queue_iterator);
-            assert(queue.contains(file_segment->key(), file_segment->offset(), cache_lock));
+            assert(main_priority->contains(file_segment->key(), file_segment->offset(), cache_lock));
         }
     }
 }
 
-void LRUFileCache::assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock)
+void FileCache::assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock)
 {
     assertCacheCellsCorrectness(files[key], cache_lock);
-    assertQueueCorrectness(cache_lock);
+    assertPriorityCorrectness(cache_lock);
 }
 
-void LRUFileCache::assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock)
 {
     for (const auto & [key, cells_by_offset] : files)
         assertCacheCellsCorrectness(files[key], cache_lock);
-    assertQueueCorrectness(cache_lock);
+    assertPriorityCorrectness(cache_lock);
 }
 
-void LRUFileCache::assertQueueCorrectness(std::lock_guard<std::mutex> & cache_lock)
+void FileCache::assertPriorityCorrectness(std::lock_guard<std::mutex> & cache_lock)
 {
     [[maybe_unused]] size_t total_size = 0;
-    for (auto it = queue.begin(); it != queue.end();)
+    for (auto it = main_priority->getLowestPriorityReadIterator(cache_lock); it->valid(); it->next())
     {
-        auto & [key, offset, size, _] = *it++;
+        const auto & key = it->key();
+        auto offset = it->offset();
+        auto size = it->size();
 
         auto * cell = getCell(key, offset, cache_lock);
         if (!cell)
@@ -1188,14 +1206,138 @@ void LRUFileCache::assertQueueCorrectness(std::lock_guard<std::mutex> & cache_lo
                 ErrorCodes::LOGICAL_ERROR,
                 "Cache is in inconsistent state: LRU queue contains entries with no cache cell (assertCorrectness())");
         }
-
         assert(cell->size() == size);
         total_size += size;
     }
+    assert(total_size == main_priority->getCacheSize(cache_lock));
+    assert(main_priority->getCacheSize(cache_lock) <= max_size);
+    assert(main_priority->getElementsNum(cache_lock) <= max_element_size);
+}
 
-    assert(total_size == queue.getTotalCacheSize(cache_lock));
-    assert(queue.getTotalCacheSize(cache_lock) <= max_size);
-    assert(queue.getElementsNum(cache_lock) <= max_element_size);
+FileCache::QueryContextPtr FileCache::getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock)
+{
+    if (!isQueryInitialized())
+        return nullptr;
+
+    return getQueryContext(std::string(CurrentThread::getQueryId()), cache_lock);
+}
+
+FileCache::QueryContextPtr FileCache::getQueryContext(const String & query_id, std::lock_guard<std::mutex> & /* cache_lock */)
+{
+    auto query_iter = query_map.find(query_id);
+    return (query_iter == query_map.end()) ? nullptr : query_iter->second;
+}
+
+void FileCache::removeQueryContext(const String & query_id)
+{
+    std::lock_guard cache_lock(mutex);
+    auto query_iter = query_map.find(query_id);
+
+    if (query_iter == query_map.end())
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Attempt to release query context that does not exist (query_id: {})",
+            query_id);
+    }
+
+    query_map.erase(query_iter);
+}
+
+FileCache::QueryContextPtr FileCache::getOrSetQueryContext(
+    const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (query_id.empty())
+        return nullptr;
+
+    auto context = getQueryContext(query_id, cache_lock);
+    if (context)
+        return context;
+
+    auto query_context = std::make_shared<QueryContext>(settings.max_query_cache_size, settings.skip_download_if_exceeds_query_cache);
+    auto query_iter = query_map.emplace(query_id, query_context).first;
+    return query_iter->second;
+}
+
+FileCache::QueryContextHolder FileCache::getQueryContextHolder(const String & query_id, const ReadSettings & settings)
+{
+    std::lock_guard cache_lock(mutex);
+
+    if (!enable_filesystem_query_cache_limit || settings.max_query_cache_size == 0)
+        return {};
+
+    /// if enable_filesystem_query_cache_limit is true, and max_query_cache_size large than zero,
+    /// we create context query for current query.
+    auto context = getOrSetQueryContext(query_id, settings, cache_lock);
+    return QueryContextHolder(query_id, this, context);
+}
+
+void FileCache::QueryContext::remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (cache_size < size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Deleted cache size exceeds existing cache size");
+
+    if (!skip_download_if_exceeds_query_cache)
+    {
+        auto record = records.find({key, offset});
+        if (record != records.end())
+        {
+            record->second->removeAndGetNext(cache_lock);
+            records.erase({key, offset});
+        }
+    }
+    cache_size -= size;
+}
+
+void FileCache::QueryContext::reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (cache_size + size > max_cache_size)
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Reserved cache size exceeds the remaining cache size (key: {}, offset: {})",
+            key.toString(), offset);
+    }
+
+    if (!skip_download_if_exceeds_query_cache)
+    {
+        auto record = records.find({key, offset});
+        if (record == records.end())
+        {
+            auto queue_iter = priority->add(key, offset, 0, cache_lock);
+            record = records.insert({{key, offset}, queue_iter}).first;
+        }
+        record->second->incrementSize(size, cache_lock);
+    }
+    cache_size += size;
+}
+
+void FileCache::QueryContext::use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock)
+{
+    if (skip_download_if_exceeds_query_cache)
+        return;
+
+    auto record = records.find({key, offset});
+    if (record != records.end())
+        record->second->use(cache_lock);
+}
+
+FileCache::QueryContextHolder::QueryContextHolder(
+    const String & query_id_,
+    FileCache * cache_,
+    FileCache::QueryContextPtr context_)
+    : query_id(query_id_)
+    , cache(cache_)
+    , context(context_)
+{
+}
+
+FileCache::QueryContextHolder::~QueryContextHolder()
+{
+    /// If only the query_map and the current holder hold the context_query,
+    /// the query has been completed and the query_context is released.
+    if (context && context.use_count() == 2)
+        cache->removeQueryContext(query_id);
 }
 
 }
diff --git a/src/Common/FileCache.h b/src/Common/FileCache.h
new file mode 100644
index 00000000000..1690690d102
--- /dev/null
+++ b/src/Common/FileCache.h
@@ -0,0 +1,308 @@
+#pragma once
+
+#include <atomic>
+#include <chrono>
+#include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
+#include <unordered_set>
+#include <boost/functional/hash.hpp>
+#include <boost/noncopyable.hpp>
+
+#include <Core/Types.h>
+#include <IO/ReadSettings.h>
+#include <Common/FileCache_fwd.h>
+#include <Common/FileSegment.h>
+#include <Common/IFileCachePriority.h>
+#include <Common/logger_useful.h>
+#include <Common/FileCacheType.h>
+
+namespace DB
+{
+
+/// Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
+/// Different caching algorithms are implemented using IFileCachePriority.
+class FileCache : private boost::noncopyable
+{
+
+friend class FileSegment;
+friend class IFileCachePriority;
+friend struct FileSegmentsHolder;
+friend class FileSegmentRangeWriter;
+
+struct QueryContext;
+using QueryContextPtr = std::shared_ptr<QueryContext>;
+
+public:
+    using Key = DB::FileCacheKey;
+
+    FileCache(const String & cache_base_path_, const FileCacheSettings & cache_settings_);
+
+    ~FileCache() = default;
+
+    /// Restore cache from local filesystem.
+    void initialize();
+
+    const String & getBasePath() const { return cache_base_path; }
+
+    /**
+     * Given an `offset` and `size` representing [offset, offset + size) bytes interval,
+     * return list of cached non-overlapping non-empty
+     * file segments `[segment1, ..., segmentN]` which intersect with given interval.
+     *
+     * Segments in returned list are ordered in ascending order and represent a full contiguous
+     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
+     *
+     * As long as pointers to returned file segments are hold
+     * it is guaranteed that these file segments are not removed from cache.
+     */
+    FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent);
+
+    /**
+     * Segments in returned list are ordered in ascending order and represent a full contiguous
+     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
+     *
+     * If file segment has state EMPTY, then it is also marked as "detached". E.g. it is "detached"
+     * from cache (not owned by cache), and as a result will never change it's state and will be destructed
+     * with the destruction of the holder, while in getOrSet() EMPTY file segments can eventually change
+     * it's state (and become DOWNLOADED).
+     */
+    FileSegmentsHolder get(const Key & key, size_t offset, size_t size);
+
+    /// Remove files by `key`. Removes files which might be used at the moment.
+    void removeIfExists(const Key & key);
+
+    /// Remove files by `key`. Will not remove files which are used at the moment.
+    void removeIfReleasable();
+
+    static Key hash(const String & path);
+
+    String getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const;
+
+    String getPathInLocalCache(const Key & key) const;
+
+    std::vector<String> tryGetCachePaths(const Key & key);
+
+    size_t capacity() const { return max_size; }
+
+    size_t getUsedCacheSize() const;
+
+    size_t getFileSegmentsNum() const;
+
+    static bool isReadOnly();
+
+    /**
+     * Create a file segment of exactly requested size with EMPTY state.
+     * Throw exception if requested size exceeds max allowed file segment size.
+     * This method is for protected usage: file segment range writer uses it
+     * to dynamically allocate file segments.
+     */
+    FileSegmentPtr createFileSegmentForDownload(
+         const Key & key,
+         size_t offset,
+         size_t size,
+         bool is_persistent,
+         std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegments getSnapshot() const;
+
+    /// For debug.
+    String dumpStructure(const Key & key);
+
+    /// Save a query context information, and adopt different cache policies
+    /// for different queries through the context cache layer.
+    struct QueryContextHolder : private boost::noncopyable
+    {
+        QueryContextHolder(const String & query_id_, FileCache * cache_, QueryContextPtr context_);
+
+        QueryContextHolder() = default;
+
+        ~QueryContextHolder();
+
+        String query_id;
+        FileCache * cache = nullptr;
+        QueryContextPtr context;
+    };
+
+    QueryContextHolder getQueryContextHolder(const String & query_id, const ReadSettings & settings);
+
+private:
+    String cache_base_path;
+
+    size_t max_size;
+    size_t max_element_size;
+    size_t max_file_segment_size;
+
+    bool allow_persistent_files;
+    size_t enable_cache_hits_threshold;
+    bool enable_filesystem_query_cache_limit;
+
+    Poco::Logger * log;
+    bool is_initialized = false;
+
+    mutable std::mutex mutex;
+
+    bool tryReserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+
+    void remove(
+        Key key,
+        size_t offset,
+        std::lock_guard<std::mutex> & cache_lock,
+        std::lock_guard<std::mutex> & segment_lock);
+
+    bool isLastFileSegmentHolder(
+        const Key & key,
+        size_t offset,
+        std::lock_guard<std::mutex> & cache_lock,
+        std::lock_guard<std::mutex> & segment_lock);
+
+    void reduceSizeToDownloaded(
+        const Key & key,
+        size_t offset,
+        std::lock_guard<std::mutex> & cache_lock,
+        std::lock_guard<std::mutex> & segment_lock);
+
+    void assertInitialized() const;
+
+    struct FileSegmentCell : private boost::noncopyable
+    {
+        FileSegmentPtr file_segment;
+
+        /// Iterator is put here on first reservation attempt, if successful.
+        IFileCachePriority::WriteIterator queue_iterator;
+
+        /// Pointer to file segment is always hold by the cache itself.
+        /// Apart from pointer in cache, it can be hold by cache users, when they call
+        /// getorSet(), but cache users always hold it via FileSegmentsHolder.
+        bool releasable() const { return file_segment.unique(); }
+
+        size_t size() const { return file_segment->reserved_size; }
+
+        FileSegmentCell(FileSegmentPtr file_segment_, FileCache * cache, std::lock_guard<std::mutex> & cache_lock);
+
+        FileSegmentCell(FileSegmentCell && other) noexcept
+            : file_segment(std::move(other.file_segment)), queue_iterator(std::move(other.queue_iterator)) {}
+    };
+
+    using AccessKeyAndOffset = std::pair<Key, size_t>;
+    struct KeyAndOffsetHash
+    {
+        std::size_t operator()(const AccessKeyAndOffset & key) const
+        {
+            return std::hash<UInt128>()(key.first.key) ^ std::hash<UInt64>()(key.second);
+        }
+    };
+
+    using FileSegmentsByOffset = std::map<size_t, FileSegmentCell>;
+    using CachedFiles = std::unordered_map<Key, FileSegmentsByOffset>;
+    using FileCacheRecords = std::unordered_map<AccessKeyAndOffset, IFileCachePriority::WriteIterator, KeyAndOffsetHash>;
+
+    CachedFiles files;
+    std::unique_ptr<IFileCachePriority> main_priority;
+
+    FileCacheRecords stash_records;
+    std::unique_ptr<IFileCachePriority> stash_priority;
+    size_t max_stash_element_size;
+
+    void loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegments getImpl(const Key & key, const FileSegment::Range & range, std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegmentCell * getCell(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegmentCell * addCell(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        FileSegment::State state,
+        bool is_persistent,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    void useCell(const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock) const;
+
+    bool tryReserveForMainList(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        QueryContextPtr query_context,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    FileSegments splitRangeIntoCells(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        FileSegment::State state,
+        bool is_persistent,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    String dumpStructureUnlocked(const Key & key_, std::lock_guard<std::mutex> & cache_lock);
+
+    void fillHolesWithEmptyFileSegments(
+        FileSegments & file_segments,
+        const Key & key,
+        const FileSegment::Range & range,
+        bool fill_with_detached_file_segments,
+        bool is_persistent,
+        std::lock_guard<std::mutex> & cache_lock);
+
+    size_t getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+
+    size_t getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+
+    size_t getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
+
+    void assertCacheCellsCorrectness(const FileSegmentsByOffset & cells_by_offset, std::lock_guard<std::mutex> & cache_lock);
+
+    /// Used to track and control the cache access of each query.
+    /// Through it, we can realize the processing of different queries by the cache layer.
+    struct QueryContext
+    {
+        FileCacheRecords records;
+        FileCachePriorityPtr priority;
+
+        size_t cache_size = 0;
+        size_t max_cache_size;
+
+        bool skip_download_if_exceeds_query_cache;
+
+        QueryContext(size_t max_cache_size_, bool skip_download_if_exceeds_query_cache_)
+            : max_cache_size(max_cache_size_)
+            , skip_download_if_exceeds_query_cache(skip_download_if_exceeds_query_cache_) {}
+
+        size_t getMaxCacheSize() const { return max_cache_size; }
+
+        size_t getCacheSize() const { return cache_size; }
+
+        FileCachePriorityPtr getPriority() const { return priority; }
+
+        bool isSkipDownloadIfExceed() const { return skip_download_if_exceeds_query_cache; }
+
+        void remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+
+        void reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
+
+        void use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
+    };
+
+    using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
+    QueryContextMap query_map;
+
+    QueryContextPtr getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock);
+
+    QueryContextPtr getQueryContext(const String & query_id, std::lock_guard<std::mutex> & cache_lock);
+
+    void removeQueryContext(const String & query_id);
+
+    QueryContextPtr getOrSetQueryContext(const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> &);
+
+public:
+    void assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock);
+
+    void assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock);
+
+    void assertPriorityCorrectness(std::lock_guard<std::mutex> & cache_lock);
+};
+
+}
diff --git a/src/Common/FileCacheFactory.cpp b/src/Common/FileCacheFactory.cpp
index 259c1d3f48e..b276760c0dd 100644
--- a/src/Common/FileCacheFactory.cpp
+++ b/src/Common/FileCacheFactory.cpp
@@ -1,5 +1,5 @@
 #include "FileCacheFactory.h"
-#include "LRUFileCache.h"
+#include "FileCache.h"
 
 namespace DB
 {
@@ -53,7 +53,7 @@ FileCachePtr FileCacheFactory::getOrCreate(
         return it->second->cache;
     }
 
-    auto cache = std::make_shared<LRUFileCache>(cache_base_path, file_cache_settings);
+    auto cache = std::make_shared<FileCache>(cache_base_path, file_cache_settings);
     FileCacheData result{cache, file_cache_settings};
 
     auto cache_it = caches.insert(caches.end(), std::move(result));
diff --git a/src/Common/FileCacheSettings.cpp b/src/Common/FileCacheSettings.cpp
index 88ca6e3ce6b..b08c80f20db 100644
--- a/src/Common/FileCacheSettings.cpp
+++ b/src/Common/FileCacheSettings.cpp
@@ -1,20 +1,37 @@
 #include "FileCacheSettings.h"
 
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
 void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
 {
-    max_size = config.getUInt64(config_prefix + ".data_cache_max_size", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_CACHE_SIZE);
-    max_elements = config.getUInt64(config_prefix + ".data_cache_max_elements", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS);
+    if (!config.has(config_prefix + ".max_size"))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected cache size (`size`) in configuration");
+
+    max_size = config.getUInt64(config_prefix + ".max_size", 0);
+    if (max_size == 0)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected non-zero size for cache configuration");
+
+    auto path = config.getString(config_prefix + ".path", "");
+    if (path.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Disk Cache requires non-empty `path` field (cache base path) in config");
+
+    max_elements = config.getUInt64(config_prefix + ".max_elements", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS);
     max_file_segment_size = config.getUInt64(config_prefix + ".max_file_segment_size", REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE);
+
     cache_on_write_operations = config.getUInt64(config_prefix + ".cache_on_write_operations", false);
     enable_filesystem_query_cache_limit = config.getUInt64(config_prefix + ".enable_filesystem_query_cache_limit", false);
     enable_cache_hits_threshold = config.getUInt64(config_prefix + ".enable_cache_hits_threshold", REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD);
+
     do_not_evict_index_and_mark_files = config.getUInt64(config_prefix + ".do_not_evict_index_and_mark_files", true);
-    allow_to_remove_persistent_segments_from_cache_by_default = config.getUInt64(config_prefix + ".allow_to_remove_persistent_segments_from_cache_by_default", true);
 }
 
 }
diff --git a/src/Common/FileCacheSettings.h b/src/Common/FileCacheSettings.h
index c04cc915486..1e4f668e8bb 100644
--- a/src/Common/FileCacheSettings.h
+++ b/src/Common/FileCacheSettings.h
@@ -19,7 +19,6 @@ struct FileCacheSettings
     bool enable_filesystem_query_cache_limit = false;
 
     bool do_not_evict_index_and_mark_files = true;
-    bool allow_to_remove_persistent_segments_from_cache_by_default = true;
 
     void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 };
diff --git a/src/Common/FileCacheType.h b/src/Common/FileCacheType.h
new file mode 100644
index 00000000000..cf4ab5d20c5
--- /dev/null
+++ b/src/Common/FileCacheType.h
@@ -0,0 +1,31 @@
+#pragma once
+#include <Core/Types.h>
+#include <Common/hex.h>
+
+namespace DB
+{
+
+struct FileCacheKey
+{
+    UInt128 key;
+
+    String toString() const { return getHexUIntLowercase(key); }
+
+    FileCacheKey() = default;
+
+    explicit FileCacheKey(const UInt128 & key_) : key(key_) { }
+
+    bool operator==(const FileCacheKey & other) const { return key == other.key; }
+};
+
+}
+
+namespace std
+{
+template <>
+struct hash<DB::FileCacheKey>
+{
+    std::size_t operator()(const DB::FileCacheKey & k) const { return hash<UInt128>()(k.key); }
+};
+
+}
diff --git a/src/Common/FileCache_fwd.h b/src/Common/FileCache_fwd.h
index 8a7c2eeb458..13f037783b0 100644
--- a/src/Common/FileCache_fwd.h
+++ b/src/Common/FileCache_fwd.h
@@ -4,13 +4,12 @@
 namespace DB
 {
 
-static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_CACHE_SIZE = 1024 * 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_FILE_SEGMENT_SIZE = 100 * 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_DEFAULT_MAX_ELEMENTS = 1024 * 1024;
 static constexpr int REMOTE_FS_OBJECTS_CACHE_ENABLE_HITS_THRESHOLD = 0;
 
-class IFileCache;
-using FileCachePtr = std::shared_ptr<IFileCache>;
+class FileCache;
+using FileCachePtr = std::shared_ptr<FileCache>;
 
 struct FileCacheSettings;
 
diff --git a/src/Common/FileSegment.cpp b/src/Common/FileSegment.cpp
index c16d4658ae5..c2a12b38320 100644
--- a/src/Common/FileSegment.cpp
+++ b/src/Common/FileSegment.cpp
@@ -1,12 +1,14 @@
 #include "FileSegment.h"
+
 #include <base/getThreadId.h>
-#include <Common/hex.h>
+#include <base/scope_guard.h>
 #include <Common/logger_useful.h>
+#include <Common/FileCache.h>
+#include <Common/hex.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <filesystem>
 
-
 namespace CurrentMetrics
 {
 extern const Metric CacheDetachedFileSegments;
@@ -25,7 +27,7 @@ FileSegment::FileSegment(
         size_t offset_,
         size_t size_,
         const Key & key_,
-        IFileCache * cache_,
+        FileCache * cache_,
         State download_state_,
         bool is_persistent_)
     : segment_range(offset_, offset_ + size_ - 1)
@@ -37,7 +39,7 @@ FileSegment::FileSegment(
 #else
     , log(&Poco::Logger::get("FileSegment"))
 #endif
-    , is_persistent(is_persistent_) /// Not really used for now, see PR 36171
+    , is_persistent(is_persistent_)
 {
     /// On creation, file segment state can be EMPTY, DOWNLOADED, DOWNLOADING.
     switch (download_state)
@@ -55,13 +57,6 @@ FileSegment::FileSegment(
             reserved_size = downloaded_size = size_;
             break;
         }
-        /// DOWNLOADING is used only for write-through caching (e.g. getOrSetDownloader() is not
-        /// needed, downloader is set on file segment creation).
-        case (State::DOWNLOADING):
-        {
-            downloader_id = getCallerId();
-            break;
-        }
         case (State::SKIP_CACHE):
         {
             break;
@@ -91,6 +86,18 @@ size_t FileSegment::getDownloadedSize() const
     return getDownloadedSize(segment_lock);
 }
 
+size_t FileSegment::getRemainingSizeToDownload() const
+{
+    std::lock_guard segment_lock(mutex);
+    return range().size() - downloaded_size;
+}
+
+bool FileSegment::isDetached() const
+{
+    std::lock_guard segment_lock(mutex);
+    return is_detached;
+}
+
 size_t FileSegment::getDownloadedSize(std::lock_guard<std::mutex> & /* segment_lock */) const
 {
     if (download_state == State::DOWNLOADED)
@@ -184,6 +191,22 @@ FileSegment::RemoteFileReaderPtr FileSegment::getRemoteFileReader()
     return remote_file_reader;
 }
 
+FileSegment::RemoteFileReaderPtr FileSegment::extractRemoteFileReader()
+{
+    std::lock_guard cache_lock(cache->mutex);
+    std::lock_guard segment_lock(mutex);
+
+    if (!is_detached)
+    {
+        bool is_last_holder = cache->isLastFileSegmentHolder(key(), offset(), cache_lock, segment_lock);
+        if (!downloader_id.empty() || !is_last_holder)
+            return nullptr;
+    }
+
+    LOG_TRACE(log, "Extracted reader from file segment");
+    return std::move(remote_file_reader);
+}
+
 void FileSegment::setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_)
 {
     if (!isDownloader())
@@ -279,80 +302,6 @@ String FileSegment::getPathInLocalCache() const
     return cache->getPathInLocalCache(key(), offset(), isPersistent());
 }
 
-void FileSegment::writeInMemory(const char * from, size_t size)
-{
-    if (!size)
-        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Attempt to write zero size cache file");
-
-    if (availableSize() < size)
-        throw Exception(
-            ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR,
-            "Not enough space is reserved. Available: {}, expected: {}", availableSize(), size);
-
-    std::lock_guard segment_lock(mutex);
-    assertNotDetached(segment_lock);
-
-    if (cache_writer)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache writer already initialized");
-
-    auto download_path = getPathInLocalCache();
-    cache_writer = std::make_unique<WriteBufferFromFile>(download_path, size + 1);
-
-    try
-    {
-        cache_writer->write(from, size);
-    }
-    catch (Exception & e)
-    {
-        wrapWithCacheInfo(e, "while writing into cache", segment_lock);
-
-        setDownloadFailed(segment_lock);
-
-        cv.notify_all();
-
-        throw;
-    }
-}
-
-size_t FileSegment::finalizeWrite()
-{
-    std::lock_guard segment_lock(mutex);
-
-    if (!cache_writer)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache writer not initialized");
-
-    size_t size = cache_writer->offset();
-
-    if (size == 0)
-        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Writing zero size is not allowed");
-
-    assertNotDetached(segment_lock);
-
-    try
-    {
-        cache_writer->next();
-    }
-    catch (Exception & e)
-    {
-        wrapWithCacheInfo(e, "while writing into cache", segment_lock);
-
-        setDownloadFailed(segment_lock);
-
-        cv.notify_all();
-
-        throw;
-    }
-
-    downloaded_size += size;
-
-    if (downloaded_size != range().size())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected downloaded size to equal file segment size ({} == {})", downloaded_size, range().size());
-
-    setDownloaded(segment_lock);
-
-    return size;
-}
-
 FileSegment::State FileSegment::wait()
 {
     std::unique_lock segment_lock(mutex);
@@ -481,7 +430,7 @@ void FileSegment::completeBatchAndResetDownloader()
     cv.notify_all();
 }
 
-void FileSegment::complete(State state)
+void FileSegment::completeWithState(State state, bool auto_resize)
 {
     std::lock_guard cache_lock(cache->mutex);
     std::lock_guard segment_lock(mutex);
@@ -506,8 +455,24 @@ void FileSegment::complete(State state)
     }
 
     if (state == State::DOWNLOADED)
+    {
+        if (auto_resize && downloaded_size != range().size())
+        {
+            LOG_TEST(log, "Resize cell {} to downloaded: {}", range().toString(), downloaded_size);
+            assert(downloaded_size <= range().size());
+            segment_range = Range(segment_range.left, segment_range.left + downloaded_size - 1);
+        }
+
+        /// Update states and finalize cache write buffer.
         setDownloaded(segment_lock);
 
+        if (downloaded_size != range().size())
+            throw Exception(
+                ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR,
+                "Cannot complete file segment as DOWNLOADED, because downloaded size ({}) does not match expected size ({})",
+                downloaded_size, range().size());
+    }
+
     download_state = state;
 
     try
@@ -526,16 +491,20 @@ void FileSegment::complete(State state)
     cv.notify_all();
 }
 
-void FileSegment::complete(std::lock_guard<std::mutex> & cache_lock)
+void FileSegment::completeBasedOnCurrentState(std::lock_guard<std::mutex> & cache_lock)
 {
     std::lock_guard segment_lock(mutex);
 
+    if (is_detached)
+        return;
+
     assertNotDetached(segment_lock);
 
-    completeUnlocked(cache_lock, segment_lock);
+    completeBasedOnCurrentStateUnlocked(cache_lock, segment_lock);
 }
 
-void FileSegment::completeUnlocked(std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock)
+void FileSegment::completeBasedOnCurrentStateUnlocked(
+    std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock)
 {
     bool is_last_holder = cache->isLastFileSegmentHolder(key(), offset(), cache_lock, segment_lock);
 
@@ -607,7 +576,10 @@ void FileSegment::completeImpl(std::lock_guard<std::mutex> & cache_lock, std::lo
             * it only when nobody needs it.
             */
             download_state = State::PARTIALLY_DOWNLOADED_NO_CONTINUATION;
-            LOG_TEST(log, "Resize cell {} to downloaded: {}", range().toString(), current_downloaded_size);
+            /// Resize this file segment by creating a copy file segment with DOWNLOADED state,
+            /// but current file segment should remain PARRTIALLY_DOWNLOADED_NO_CONTINUATION and with detached state,
+            /// because otherwise an invariant that getOrSet() returns a contiguous range of file segments will be broken
+            /// (this will be crucial for other file segment holder, not for current one).
             cache->reduceSizeToDownloaded(key(), offset(), cache_lock, segment_lock);
         }
 
@@ -644,8 +616,9 @@ String FileSegment::getInfoForLogImpl(std::lock_guard<std::mutex> & segment_lock
     info << "state: " << download_state << ", ";
     info << "downloaded size: " << getDownloadedSize(segment_lock) << ", ";
     info << "reserved size: " << reserved_size << ", ";
-    info << "downloader id: " << downloader_id << ", ";
-    info << "caller id: " << getCallerId();
+    info << "downloader id: " << (downloader_id.empty() ? "None" : downloader_id) << ", ";
+    info << "caller id: " << getCallerId() << ", ";
+    info << "persistent: " << is_persistent;
 
     return info.str();
 }
@@ -787,7 +760,7 @@ FileSegmentsHolder::~FileSegmentsHolder()
     /// FileSegmentsHolder right after calling file_segment->complete(), so on destruction here
     /// remain only uncompleted file segments.
 
-    IFileCache * cache = nullptr;
+    FileCache * cache = nullptr;
 
     for (auto file_segment_it = file_segments.begin(); file_segment_it != file_segments.end();)
     {
@@ -820,7 +793,7 @@ FileSegmentsHolder::~FileSegmentsHolder()
             /// under the same mutex, because complete() checks for segment pointers.
             std::lock_guard cache_lock(cache->mutex);
 
-            file_segment->complete(cache_lock);
+            file_segment->completeBasedOnCurrentState(cache_lock);
 
             file_segment_it = file_segments.erase(current_file_segment_it);
         }
@@ -843,4 +816,149 @@ String FileSegmentsHolder::toString()
     return ranges;
 }
 
+FileSegmentRangeWriter::FileSegmentRangeWriter(
+    FileCache * cache_,
+    const FileSegment::Key & key_,
+    OnCompleteFileSegmentCallback && on_complete_file_segment_func_)
+    : cache(cache_)
+    , key(key_)
+    , current_file_segment_it(file_segments_holder.file_segments.end())
+    , on_complete_file_segment_func(on_complete_file_segment_func_)
+{
+}
+
+FileSegments::iterator FileSegmentRangeWriter::allocateFileSegment(size_t offset, bool is_persistent)
+{
+    /**
+     * Allocate a new file segment starting `offset`.
+     * File segment capacity will equal `max_file_segment_size`, but actual size is 0.
+     */
+
+    std::lock_guard cache_lock(cache->mutex);
+
+    /// We set max_file_segment_size to be downloaded,
+    /// if we have less size to write, file segment will be resized in complete() method.
+    auto file_segment = cache->createFileSegmentForDownload(
+        key, offset, cache->max_file_segment_size, is_persistent, cache_lock);
+    return file_segments_holder.add(std::move(file_segment));
+}
+
+void FileSegmentRangeWriter::completeFileSegment(FileSegment & file_segment)
+{
+    /**
+     * Complete file segment based on downaloaded size.
+     */
+
+    /// File segment can be detached if space reservation failed.
+    if (file_segment.isDetached())
+        return;
+
+    if (file_segment.getDownloadedSize() > 0)
+    {
+        /// file_segment->complete(DOWNLOADED) is not enough, because file segment capacity
+        /// was initially set with a margin as `max_file_segment_size`. => We need to always
+        /// resize to actual size after download finished.
+        file_segment.getOrSetDownloader();
+        file_segment.completeWithState(FileSegment::State::DOWNLOADED, /* auto_resize */true);
+        on_complete_file_segment_func(file_segment);
+    }
+    else
+    {
+        std::lock_guard cache_lock(cache->mutex);
+        file_segment.completeBasedOnCurrentState(cache_lock);
+    }
+}
+
+bool FileSegmentRangeWriter::write(const char * data, size_t size, size_t offset, bool is_persistent)
+{
+    /**
+     * Write a range of file segments. Allocate file segment of `max_file_segment_size` and write to
+     * it until it is full and then allocate next file segment.
+     */
+
+    if (finalized)
+        return false;
+
+    auto & file_segments = file_segments_holder.file_segments;
+
+    if (current_file_segment_it == file_segments.end())
+    {
+        current_file_segment_it = allocateFileSegment(current_file_segment_write_offset, is_persistent);
+    }
+    else
+    {
+        if (current_file_segment_write_offset != offset)
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Cannot write file segment at offset {}, because current write offset is: {}",
+                offset, current_file_segment_write_offset);
+        }
+
+        if ((*current_file_segment_it)->getRemainingSizeToDownload() == 0)
+        {
+            completeFileSegment(**current_file_segment_it);
+            current_file_segment_it = allocateFileSegment(current_file_segment_write_offset, is_persistent);
+        }
+        else if ((*current_file_segment_it)->getDownloadOffset() != offset)
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Cannot file segment download offset {} does not match current write offset {}",
+                (*current_file_segment_it)->getDownloadOffset(), offset);
+        }
+    }
+
+    auto & file_segment = *current_file_segment_it;
+    file_segment->getOrSetDownloader();
+    SCOPE_EXIT({
+        file_segment->resetDownloader();
+    });
+
+    bool reserved = file_segment->reserve(size);
+    if (!reserved)
+    {
+        file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+        on_complete_file_segment_func(*file_segment);
+
+        LOG_DEBUG(
+            &Poco::Logger::get("FileSegmentRangeWriter"),
+            "Unsuccessful space reservation attempt (size: {}, file segment info: {}",
+            size, file_segment->getInfoForLog());
+
+        return false;
+    }
+
+    (*current_file_segment_it)->write(data, size, offset);
+    current_file_segment_write_offset += size;
+
+    return true;
+}
+
+void FileSegmentRangeWriter::finalize()
+{
+    if (finalized)
+        return;
+
+    auto & file_segments = file_segments_holder.file_segments;
+    if (file_segments.empty() || current_file_segment_it == file_segments.end())
+        return;
+
+    completeFileSegment(**current_file_segment_it);
+    finalized = true;
+}
+
+FileSegmentRangeWriter::~FileSegmentRangeWriter()
+{
+    try
+    {
+        if (!finalized)
+            finalize();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
 }
diff --git a/src/Common/FileSegment.h b/src/Common/FileSegment.h
index 93cbf269a8e..4168cf8bd03 100644
--- a/src/Common/FileSegment.h
+++ b/src/Common/FileSegment.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <boost/noncopyable.hpp>
-#include <Common/IFileCache.h>
 #include <Core/Types.h>
+
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <list>
+#include <Common/FileCacheType.h>
 
 namespace Poco { class Logger; }
 
@@ -17,7 +17,8 @@ extern const Metric CacheFileSegments;
 namespace DB
 {
 
-class IFileCache;
+class FileCache;
+class ReadBufferFromFileBase;
 
 class FileSegment;
 using FileSegmentPtr = std::shared_ptr<FileSegment>;
@@ -27,12 +28,12 @@ using FileSegments = std::list<FileSegmentPtr>;
 class FileSegment : boost::noncopyable
 {
 
-friend class LRUFileCache;
+friend class FileCache;
 friend struct FileSegmentsHolder;
 friend class FileSegmentRangeWriter;
 
 public:
-    using Key = IFileCache::Key;
+    using Key = FileCacheKey;
     using RemoteFileReaderPtr = std::shared_ptr<ReadBufferFromFileBase>;
     using LocalCacheWriterPtr = std::unique_ptr<WriteBufferFromFile>;
 
@@ -74,7 +75,7 @@ public:
         size_t offset_,
         size_t size_,
         const Key & key_,
-        IFileCache * cache_,
+        FileCache * cache_,
         State download_state_,
         bool is_persistent_ = false);
 
@@ -113,17 +114,10 @@ public:
 
     void write(const char * from, size_t size, size_t offset_);
 
-    /**
-     * writeInMemory and finalizeWrite are used together to write a single file with delay.
-     * Both can be called only once, one after another. Used for writing cache via threadpool
-     * on wrote operations. TODO: this solution is temporary, until adding a separate cache layer.
-     */
-    void writeInMemory(const char * from, size_t size);
-
-    size_t finalizeWrite();
-
     RemoteFileReaderPtr getRemoteFileReader();
 
+    RemoteFileReaderPtr extractRemoteFileReader();
+
     void setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_);
 
     void resetRemoteFileReader();
@@ -144,9 +138,11 @@ public:
 
     size_t getDownloadedSize() const;
 
+    size_t getRemainingSizeToDownload() const;
+
     void completeBatchAndResetDownloader();
 
-    void complete(State state);
+    void completeWithState(State state, bool auto_resize = false);
 
     String getInfoForLog() const;
 
@@ -168,6 +164,8 @@ public:
 
     [[noreturn]] void throwIfDetached() const;
 
+    bool isDetached() const;
+
     String getPathInLocalCache() const;
 
 private:
@@ -197,8 +195,8 @@ private:
     /// FileSegmentsHolder. complete() might check if the caller of the method
     /// is the last alive holder of the segment. Therefore, complete() and destruction
     /// of the file segment pointer must be done under the same cache mutex.
-    void complete(std::lock_guard<std::mutex> & cache_lock);
-    void completeUnlocked(std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock);
+    void completeBasedOnCurrentState(std::lock_guard<std::mutex> & cache_lock);
+    void completeBasedOnCurrentStateUnlocked(std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & segment_lock);
 
     void completeImpl(
         std::lock_guard<std::mutex> & cache_lock,
@@ -206,7 +204,7 @@ private:
 
     void resetDownloaderImpl(std::lock_guard<std::mutex> & segment_lock);
 
-    const Range segment_range;
+    Range segment_range;
 
     State download_state;
 
@@ -234,7 +232,7 @@ private:
     mutable std::mutex download_mutex;
 
     Key file_key;
-    IFileCache * cache;
+    FileCache * cache;
 
     Poco::Logger * log;
 
@@ -246,23 +244,71 @@ private:
     std::atomic<size_t> hits_count = 0; /// cache hits.
     std::atomic<size_t> ref_count = 0; /// Used for getting snapshot state
 
-    /// Currently no-op. (will be added in PR 36171)
-    /// Defined if a file comply by the eviction policy.
     bool is_persistent;
     CurrentMetrics::Increment metric_increment{CurrentMetrics::CacheFileSegments};
 };
 
 struct FileSegmentsHolder : private boost::noncopyable
 {
+    FileSegmentsHolder() = default;
+
     explicit FileSegmentsHolder(FileSegments && file_segments_) : file_segments(std::move(file_segments_)) {}
 
     FileSegmentsHolder(FileSegmentsHolder && other) noexcept : file_segments(std::move(other.file_segments)) {}
 
     ~FileSegmentsHolder();
 
-    FileSegments file_segments{};
-
     String toString();
+
+    FileSegments::iterator add(FileSegmentPtr && file_segment)
+    {
+        return file_segments.insert(file_segments.end(), file_segment);
+    }
+
+    FileSegments file_segments{};
+};
+
+/**
+  * We want to write eventually some size, which is not known until the very end.
+  * Therefore we allocate file segments lazily. Each file segment is assigned capacity
+  * of max_file_segment_size, but reserved_size remains 0, until call to tryReserve().
+  * Once current file segment is full (reached max_file_segment_size), we allocate a
+  * new file segment. All allocated file segments resize in file segments holder.
+  * If at the end of all writes, the last file segment is not full, then it is resized.
+  */
+class FileSegmentRangeWriter
+{
+public:
+    using OnCompleteFileSegmentCallback = std::function<void(const FileSegment & file_segment)>;
+
+    FileSegmentRangeWriter(
+        FileCache * cache_,
+        const FileSegment::Key & key_,
+        /// A callback which is called right after each file segment is completed.
+        /// It is used to write into filesystem cache log.
+        OnCompleteFileSegmentCallback && on_complete_file_segment_func_);
+
+    ~FileSegmentRangeWriter();
+
+    bool write(const char * data, size_t size, size_t offset, bool is_persistent);
+
+    void finalize();
+
+private:
+    FileSegments::iterator allocateFileSegment(size_t offset, bool is_persistent);
+    void completeFileSegment(FileSegment & file_segment);
+
+    FileCache * cache;
+    FileSegment::Key key;
+
+    FileSegmentsHolder file_segments_holder;
+    FileSegments::iterator current_file_segment_it;
+
+    size_t current_file_segment_write_offset = 0;
+
+    bool finalized = false;
+
+    OnCompleteFileSegmentCallback on_complete_file_segment_func;
 };
 
 }
diff --git a/src/Common/HashTable/StringHashTable.h b/src/Common/HashTable/StringHashTable.h
index 8d15fde4ce0..c947e746e8d 100644
--- a/src/Common/HashTable/StringHashTable.h
+++ b/src/Common/HashTable/StringHashTable.h
@@ -3,6 +3,7 @@
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashTable.h>
 
+#include <bit>
 #include <new>
 #include <variant>
 
@@ -21,17 +22,17 @@ struct StringKey24
 inline StringRef ALWAYS_INLINE toStringRef(const StringKey8 & n)
 {
     assert(n != 0);
-    return {reinterpret_cast<const char *>(&n), 8ul - (__builtin_clzll(n) >> 3)};
+    return {reinterpret_cast<const char *>(&n), 8ul - (std::countl_zero(n) >> 3)};
 }
 inline StringRef ALWAYS_INLINE toStringRef(const StringKey16 & n)
 {
     assert(n.items[1] != 0);
-    return {reinterpret_cast<const char *>(&n), 16ul - (__builtin_clzll(n.items[1]) >> 3)};
+    return {reinterpret_cast<const char *>(&n), 16ul - (std::countl_zero(n.items[1]) >> 3)};
 }
 inline StringRef ALWAYS_INLINE toStringRef(const StringKey24 & n)
 {
     assert(n.c != 0);
-    return {reinterpret_cast<const char *>(&n), 24ul - (__builtin_clzll(n.c) >> 3)};
+    return {reinterpret_cast<const char *>(&n), 24ul - (std::countl_zero(n.c) >> 3)};
 }
 
 struct StringHashTableHash
diff --git a/src/Common/HyperLogLogCounter.h b/src/Common/HyperLogLogCounter.h
index 4644d18ecf3..cdd4f246e53 100644
--- a/src/Common/HyperLogLogCounter.h
+++ b/src/Common/HyperLogLogCounter.h
@@ -11,6 +11,7 @@
 #include <IO/WriteHelpers.h>
 #include <Core/Defines.h>
 
+#include <bit>
 #include <cmath>
 #include <cstring>
 
@@ -205,7 +206,7 @@ struct TrailingZerosCounter<UInt32>
 {
     static int apply(UInt32 val)
     {
-        return __builtin_ctz(val);
+        return std::countr_zero(val);
     }
 };
 
@@ -214,7 +215,7 @@ struct TrailingZerosCounter<UInt64>
 {
     static int apply(UInt64 val)
     {
-        return __builtin_ctzll(val);
+        return std::countr_zero(val);
     }
 };
 
diff --git a/src/Common/ICachePolicy.h b/src/Common/ICachePolicy.h
new file mode 100644
index 00000000000..4e5916f125e
--- /dev/null
+++ b/src/Common/ICachePolicy.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <mutex>
+
+namespace DB
+{
+template <typename T>
+struct TrivialWeightFunction
+{
+    size_t operator()(const T &) const
+    {
+        return 1;
+    }
+};
+
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+class ICachePolicy
+{
+public:
+    using Key = TKey;
+    using Mapped = TMapped;
+    using MappedPtr = std::shared_ptr<Mapped>;
+    using OnWeightLossFunction = std::function<void(size_t)>;
+
+    virtual size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const = 0;
+    virtual size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const = 0;
+    virtual size_t maxSize() const = 0;
+
+    virtual void reset(std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+    virtual void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) = 0;
+
+    virtual ~ICachePolicy() = default;
+
+protected:
+    OnWeightLossFunction on_weight_loss_function = [](size_t) {};
+};
+
+}
diff --git a/src/Common/IFileCache.cpp b/src/Common/IFileCache.cpp
deleted file mode 100644
index 8fe434dd740..00000000000
--- a/src/Common/IFileCache.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-#include "IFileCache.h"
-
-#include <Common/hex.h>
-#include <Common/CurrentThread.h>
-#include <Common/SipHash.h>
-#include <Common/FileCacheSettings.h>
-#include <IO/ReadSettings.h>
-#include <filesystem>
-
-namespace fs = std::filesystem;
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int REMOTE_FS_OBJECT_CACHE_ERROR;
-    extern const int LOGICAL_ERROR;
-}
-
-IFileCache::IFileCache(
-    const String & cache_base_path_,
-    const FileCacheSettings & cache_settings_)
-    : cache_base_path(cache_base_path_)
-    , max_size(cache_settings_.max_size)
-    , max_element_size(cache_settings_.max_elements)
-    , max_file_segment_size(cache_settings_.max_file_segment_size)
-    , enable_filesystem_query_cache_limit(cache_settings_.enable_filesystem_query_cache_limit)
-{
-}
-
-String IFileCache::Key::toString() const
-{
-    return getHexUIntLowercase(key);
-}
-
-IFileCache::Key IFileCache::hash(const String & path)
-{
-    return Key(sipHash128(path.data(), path.size()));
-}
-
-String IFileCache::getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const
-{
-    auto key_str = key.toString();
-    return fs::path(cache_base_path)
-        / key_str.substr(0, 3)
-        / key_str
-        / (std::to_string(offset) + (is_persistent ? "_persistent" : ""));
-}
-
-String IFileCache::getPathInLocalCache(const Key & key) const
-{
-    auto key_str = key.toString();
-    return fs::path(cache_base_path) / key_str.substr(0, 3) / key_str;
-}
-
-static bool isQueryInitialized()
-{
-    return CurrentThread::isInitialized()
-        && CurrentThread::get().getQueryContext()
-        && !CurrentThread::getQueryId().empty();
-}
-
-bool IFileCache::isReadOnly()
-{
-    return !isQueryInitialized();
-}
-
-void IFileCache::assertInitialized() const
-{
-    if (!is_initialized)
-        throw Exception(ErrorCodes::REMOTE_FS_OBJECT_CACHE_ERROR, "Cache not initialized");
-}
-
-IFileCache::QueryContextPtr IFileCache::getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock)
-{
-    if (!isQueryInitialized())
-        return nullptr;
-
-    return getQueryContext(std::string(CurrentThread::getQueryId()), cache_lock);
-}
-
-IFileCache::QueryContextPtr IFileCache::getQueryContext(const String & query_id, std::lock_guard<std::mutex> & /* cache_lock */)
-{
-    auto query_iter = query_map.find(query_id);
-    return (query_iter == query_map.end()) ? nullptr : query_iter->second;
-}
-
-void IFileCache::removeQueryContext(const String & query_id)
-{
-    std::lock_guard cache_lock(mutex);
-    auto query_iter = query_map.find(query_id);
-
-    if (query_iter == query_map.end())
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Attempt to release query context that does not exist (query_id: {})",
-            query_id);
-    }
-
-    query_map.erase(query_iter);
-}
-
-IFileCache::QueryContextPtr IFileCache::getOrSetQueryContext(
-    const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (query_id.empty())
-        return nullptr;
-
-    auto context = getQueryContext(query_id, cache_lock);
-    if (context)
-        return context;
-
-    auto query_context = std::make_shared<QueryContext>(settings.max_query_cache_size, settings.skip_download_if_exceeds_query_cache);
-    auto query_iter = query_map.emplace(query_id, query_context).first;
-    return query_iter->second;
-}
-
-IFileCache::QueryContextHolder IFileCache::getQueryContextHolder(const String & query_id, const ReadSettings & settings)
-{
-    std::lock_guard cache_lock(mutex);
-
-    if (!enable_filesystem_query_cache_limit || settings.max_query_cache_size == 0)
-        return {};
-
-    /// if enable_filesystem_query_cache_limit is true, and max_query_cache_size large than zero,
-    /// we create context query for current query.
-    auto context = getOrSetQueryContext(query_id, settings, cache_lock);
-    return QueryContextHolder(query_id, this, context);
-}
-
-void IFileCache::QueryContext::remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (cache_size < size)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Deleted cache size exceeds existing cache size");
-
-    if (!skip_download_if_exceeds_query_cache)
-    {
-        auto record = records.find({key, offset});
-        if (record != records.end())
-        {
-            lru_queue.remove(record->second, cache_lock);
-            records.erase({key, offset});
-        }
-    }
-    cache_size -= size;
-}
-
-void IFileCache::QueryContext::reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (cache_size + size > max_cache_size)
-    {
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "Reserved cache size exceeds the remaining cache size (key: {}, offset: {})",
-            key.toString(), offset);
-    }
-
-    if (!skip_download_if_exceeds_query_cache)
-    {
-        auto record = records.find({key, offset});
-        if (record == records.end())
-        {
-            auto queue_iter = lru_queue.add(key, offset, 0, cache_lock);
-            record = records.insert({{key, offset}, queue_iter}).first;
-        }
-        record->second->size += size;
-    }
-    cache_size += size;
-}
-
-void IFileCache::QueryContext::use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock)
-{
-    if (skip_download_if_exceeds_query_cache)
-        return;
-
-    auto record = records.find({key, offset});
-    if (record != records.end())
-        lru_queue.moveToEnd(record->second, cache_lock);
-}
-
-IFileCache::QueryContextHolder::QueryContextHolder(
-    const String & query_id_,
-    IFileCache * cache_,
-    IFileCache::QueryContextPtr context_)
-    : query_id(query_id_)
-    , cache(cache_)
-    , context(context_)
-{
-}
-
-IFileCache::QueryContextHolder::~QueryContextHolder()
-{
-    /// If only the query_map and the current holder hold the context_query,
-    /// the query has been completed and the query_context is released.
-    if (context && context.use_count() == 2)
-        cache->removeQueryContext(query_id);
-}
-
-}
diff --git a/src/Common/IFileCache.h b/src/Common/IFileCache.h
deleted file mode 100644
index c820d18cb95..00000000000
--- a/src/Common/IFileCache.h
+++ /dev/null
@@ -1,267 +0,0 @@
-#pragma once
-
-#include <Core/Types.h>
-#include <Common/FileCache_fwd.h>
-
-#include <boost/noncopyable.hpp>
-#include <list>
-#include <unordered_map>
-#include <functional>
-
-
-namespace DB
-{
-
-class FileSegment;
-using FileSegmentPtr = std::shared_ptr<FileSegment>;
-using FileSegments = std::list<FileSegmentPtr>;
-struct FileSegmentsHolder;
-struct ReadSettings;
-
-/**
- * Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
- */
-class IFileCache : private boost::noncopyable
-{
-friend class FileSegment;
-friend struct FileSegmentsHolder;
-friend class FileSegmentRangeWriter;
-
-public:
-    struct Key
-    {
-        UInt128 key;
-        String toString() const;
-
-        Key() = default;
-        explicit Key(const UInt128 & key_) : key(key_) {}
-
-        bool operator==(const Key & other) const { return key == other.key; }
-    };
-
-    IFileCache(
-        const String & cache_base_path_,
-        const FileCacheSettings & cache_settings_);
-
-    virtual ~IFileCache() = default;
-
-    /// Restore cache from local filesystem.
-    virtual void initialize() = 0;
-
-    virtual void removeIfExists(const Key & key) = 0;
-
-    virtual void removeIfReleasable(bool remove_persistent_files) = 0;
-
-    static bool isReadOnly();
-
-    /// Cache capacity in bytes.
-    size_t capacity() const { return max_size; }
-
-    static Key hash(const String & path);
-
-    String getPathInLocalCache(const Key & key, size_t offset, bool is_persistent) const;
-
-    String getPathInLocalCache(const Key & key) const;
-
-    const String & getBasePath() const { return cache_base_path; }
-
-    virtual std::vector<String> tryGetCachePaths(const Key & key) = 0;
-
-    /**
-     * Given an `offset` and `size` representing [offset, offset + size) bytes interval,
-     * return list of cached non-overlapping non-empty
-     * file segments `[segment1, ..., segmentN]` which intersect with given interval.
-     *
-     * Segments in returned list are ordered in ascending order and represent a full contiguous
-     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
-     *
-     * As long as pointers to returned file segments are hold
-     * it is guaranteed that these file segments are not removed from cache.
-     */
-    virtual FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent) = 0;
-
-    /**
-     * Segments in returned list are ordered in ascending order and represent a full contiguous
-     * interval (no holes). Each segment in returned list has state: DOWNLOADED, DOWNLOADING or EMPTY.
-     *
-     * If file segment has state EMPTY, then it is also marked as "detached". E.g. it is "detached"
-     * from cache (not owned by cache), and as a result will never change it's state and will be destructed
-     * with the destruction of the holder, while in getOrSet() EMPTY file segments can eventually change
-     * it's state (and become DOWNLOADED).
-     */
-    virtual FileSegmentsHolder get(const Key & key, size_t offset, size_t size) = 0;
-
-    virtual FileSegmentsHolder setDownloading(const Key & key, size_t offset, size_t size, bool is_persistent) = 0;
-
-    virtual FileSegments getSnapshot() const = 0;
-
-    /// For debug.
-    virtual String dumpStructure(const Key & key) = 0;
-
-    virtual size_t getUsedCacheSize() const = 0;
-
-    virtual size_t getFileSegmentsNum() const = 0;
-
-protected:
-    String cache_base_path;
-    size_t max_size;
-    size_t max_element_size;
-    size_t max_file_segment_size;
-
-    bool is_initialized = false;
-
-    mutable std::mutex mutex;
-
-    virtual bool tryReserve(
-        const Key & key, size_t offset, size_t size,
-        std::lock_guard<std::mutex> & cache_lock) = 0;
-
-    virtual void remove(
-        Key key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) = 0;
-
-    virtual bool isLastFileSegmentHolder(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) = 0;
-
-    virtual void reduceSizeToDownloaded(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & /* segment_lock */) = 0;
-
-    void assertInitialized() const;
-
-    class LRUQueue
-    {
-    public:
-        struct FileKeyAndOffset
-        {
-            Key key;
-            size_t offset;
-            size_t size;
-            size_t hits = 0;
-
-            FileKeyAndOffset(const Key & key_, size_t offset_, size_t size_) : key(key_), offset(offset_), size(size_) {}
-        };
-
-        using Iterator = typename std::list<FileKeyAndOffset>::iterator;
-
-        size_t getTotalCacheSize(std::lock_guard<std::mutex> & /* cache_lock */) const { return cache_size; }
-
-        size_t getElementsNum(std::lock_guard<std::mutex> & /* cache_lock */) const { return queue.size(); }
-
-        Iterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void remove(Iterator queue_it, std::lock_guard<std::mutex> & cache_lock);
-
-        void moveToEnd(Iterator queue_it, std::lock_guard<std::mutex> & cache_lock);
-
-        /// Space reservation for a file segment is incremental, so we need to be able to increment size of the queue entry.
-        void incrementSize(Iterator queue_it, size_t size_increment, std::lock_guard<std::mutex> & cache_lock);
-
-        String toString(std::lock_guard<std::mutex> & cache_lock) const;
-
-        bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock) const;
-
-        Iterator begin() { return queue.begin(); }
-
-        Iterator end() { return queue.end(); }
-
-        void removeAll(std::lock_guard<std::mutex> & cache_lock);
-
-    private:
-        std::list<FileKeyAndOffset> queue;
-        size_t cache_size = 0;
-    };
-
-    using AccessKeyAndOffset = std::pair<Key, size_t>;
-    struct KeyAndOffsetHash
-    {
-        std::size_t operator()(const AccessKeyAndOffset & key) const
-        {
-            return std::hash<UInt128>()(key.first.key) ^ std::hash<UInt64>()(key.second);
-        }
-    };
-
-    using AccessRecord = std::unordered_map<AccessKeyAndOffset, LRUQueue::Iterator, KeyAndOffsetHash>;
-
-    /// Used to track and control the cache access of each query.
-    /// Through it, we can realize the processing of different queries by the cache layer.
-    struct QueryContext
-    {
-        LRUQueue lru_queue;
-        AccessRecord records;
-
-        size_t cache_size = 0;
-        size_t max_cache_size;
-
-        bool skip_download_if_exceeds_query_cache;
-
-        QueryContext(size_t max_cache_size_, bool skip_download_if_exceeds_query_cache_)
-            : max_cache_size(max_cache_size_)
-            , skip_download_if_exceeds_query_cache(skip_download_if_exceeds_query_cache_) {}
-
-        void remove(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void reserve(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock);
-
-        void use(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
-
-        size_t getMaxCacheSize() const { return max_cache_size; }
-
-        size_t getCacheSize() const { return cache_size; }
-
-        LRUQueue & queue() { return lru_queue; }
-
-        bool isSkipDownloadIfExceed() const { return skip_download_if_exceeds_query_cache; }
-    };
-
-    using QueryContextPtr = std::shared_ptr<QueryContext>;
-    using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
-
-    QueryContextMap query_map;
-
-    bool enable_filesystem_query_cache_limit;
-
-    QueryContextPtr getCurrentQueryContext(std::lock_guard<std::mutex> & cache_lock);
-
-    QueryContextPtr getQueryContext(const String & query_id, std::lock_guard<std::mutex> & cache_lock);
-
-    void removeQueryContext(const String & query_id);
-
-    QueryContextPtr getOrSetQueryContext(const String & query_id, const ReadSettings & settings, std::lock_guard<std::mutex> &);
-
-public:
-    /// Save a query context information, and adopt different cache policies
-    /// for different queries through the context cache layer.
-    struct QueryContextHolder : private boost::noncopyable
-    {
-        QueryContextHolder(const String & query_id_, IFileCache * cache_, QueryContextPtr context_);
-
-        QueryContextHolder() = default;
-
-        ~QueryContextHolder();
-
-        String query_id;
-        IFileCache * cache = nullptr;
-        QueryContextPtr context;
-    };
-
-    QueryContextHolder getQueryContextHolder(const String & query_id, const ReadSettings & settings);
-
-};
-
-using FileCachePtr = std::shared_ptr<IFileCache>;
-
-}
-
-namespace std
-{
-template <> struct hash<DB::IFileCache::Key>
-{
-    std::size_t operator()(const DB::IFileCache::Key & k) const { return hash<UInt128>()(k.key); }
-};
-
-}
diff --git a/src/Common/IFileCachePriority.h b/src/Common/IFileCachePriority.h
new file mode 100644
index 00000000000..f80266f9eea
--- /dev/null
+++ b/src/Common/IFileCachePriority.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include <memory>
+#include <mutex>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/FileCacheType.h>
+
+namespace DB
+{
+
+class IFileCachePriority;
+using FileCachePriorityPtr = std::shared_ptr<IFileCachePriority>;
+
+/// IFileCachePriority is used to maintain the priority of cached data.
+class IFileCachePriority
+{
+public:
+    class IIterator;
+    using Key = FileCacheKey;
+    using ReadIterator = std::unique_ptr<const IIterator>;
+    using WriteIterator = std::shared_ptr<IIterator>;
+
+    struct FileCacheRecord
+    {
+        Key key;
+        size_t offset;
+        size_t size;
+        size_t hits = 0;
+
+        FileCacheRecord(const Key & key_, size_t offset_, size_t size_) : key(key_), offset(offset_), size(size_) { }
+    };
+
+    /// It provides an iterator to traverse the cache priority. Under normal circumstances,
+    /// the iterator can only return the records that have been directly swapped out.
+    /// For example, in the LRU algorithm, it can traverse all records, but in the LRU-K, it
+    /// can only traverse the records in the low priority queue.
+    class IIterator
+    {
+    public:
+        virtual ~IIterator() = default;
+
+        virtual const Key & key() const = 0;
+
+        virtual size_t offset() const = 0;
+
+        virtual size_t size() const = 0;
+
+        virtual size_t hits() const = 0;
+
+        /// Point the iterator to the next higher priority cache record.
+        virtual void next() const = 0;
+
+        virtual bool valid() const = 0;
+
+        /// Mark a cache record as recently used, it will update the priority
+        /// of the cache record according to different cache algorithms.
+        virtual void use(std::lock_guard<std::mutex> &) = 0;
+
+        /// Deletes an existing cached record. And to avoid pointer suspension
+        /// the iterator should automatically point to the next record.
+        virtual void removeAndGetNext(std::lock_guard<std::mutex> &) = 0;
+
+        virtual void incrementSize(size_t, std::lock_guard<std::mutex> &) = 0;
+    };
+
+public:
+    virtual ~IFileCachePriority() = default;
+
+    /// Add a cache record that did not exist before, and throw a
+    /// logical exception if the cache block already exists.
+    virtual WriteIterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    /// This method is used for assertions in debug mode. So we do not care about complexity here.
+    /// Query whether a cache record exists. If it exists, return true. If not, return false.
+    virtual bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    virtual void removeAll(std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    /// Returns an iterator pointing to the lowest priority cached record.
+    /// We can traverse all cached records through the iterator's next().
+    virtual ReadIterator getLowestPriorityReadIterator(std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    /// The same as getLowestPriorityReadIterator(), but it is writeable.
+    virtual WriteIterator getLowestPriorityWriteIterator(std::lock_guard<std::mutex> & cache_lock) = 0;
+
+    virtual size_t getElementsNum(std::lock_guard<std::mutex> & cache_lock) const = 0;
+
+    size_t getCacheSize(std::lock_guard<std::mutex> &) const { return cache_size; }
+
+protected:
+    size_t max_cache_size = 0;
+    size_t cache_size = 0;
+};
+};
diff --git a/src/Common/IPv6ToBinary.cpp b/src/Common/IPv6ToBinary.cpp
index a8363a46de7..8d335d89353 100644
--- a/src/Common/IPv6ToBinary.cpp
+++ b/src/Common/IPv6ToBinary.cpp
@@ -5,6 +5,7 @@
 #include <Common/formatIPv6.h>
 
 #include <cstring>
+#include <bit>
 
 
 namespace DB
@@ -89,7 +90,7 @@ bool matchIPv6Subnet(const uint8_t * addr, const uint8_t * cidr_addr, UInt8 pref
 
     if (mask)
     {
-        auto offset = __builtin_ctz(mask);
+        auto offset = std::countr_zero(mask);
 
         if (prefix / 8 != offset)
             return prefix / 8 < offset;
diff --git a/src/Common/LRUCachePolicy.h b/src/Common/LRUCachePolicy.h
new file mode 100644
index 00000000000..3c069eb276b
--- /dev/null
+++ b/src/Common/LRUCachePolicy.h
@@ -0,0 +1,181 @@
+#pragma once
+
+#include <Common/ICachePolicy.h>
+
+#include <list>
+#include <unordered_map>
+
+#include <Common/logger_useful.h>
+
+namespace DB
+{
+/// Cache policy LRU evicts entries which are not used for a long time.
+/// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
+/// of that value.
+/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Value weight should not change after insertion.
+/// To work with the thread-safe implementation of this class use a class "CacheBase" with first parameter "LRU"
+/// and next parameters in the same order as in the constructor of the current class.
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+class LRUCachePolicy : public ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>
+{
+public:
+    using Key = TKey;
+    using Mapped = TMapped;
+    using MappedPtr = std::shared_ptr<Mapped>;
+
+    using Base = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+    using typename Base::OnWeightLossFunction;
+
+    /** Initialize LRUCachePolicy with max_size and max_elements_size.
+      * max_elements_size == 0 means no elements size restrictions.
+      */
+    explicit LRUCachePolicy(size_t max_size_, size_t max_elements_size_ = 0, OnWeightLossFunction on_weight_loss_function_ = {})
+        : max_size(std::max(static_cast<size_t>(1), max_size_)), max_elements_size(max_elements_size_)
+    {
+        Base::on_weight_loss_function = on_weight_loss_function_;
+    }
+
+    size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return current_size;
+    }
+
+    size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return cells.size();
+    }
+
+    size_t maxSize() const override
+    {
+        return max_size;
+    }
+
+    void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        queue.clear();
+        cells.clear();
+        current_size = 0;
+    }
+
+    void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+            return;
+        auto & cell = it->second;
+        current_size -= cell.size;
+        queue.erase(cell.queue_iterator);
+        cells.erase(it);
+    }
+
+    MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+        {
+            return MappedPtr();
+        }
+
+        Cell & cell = it->second;
+
+        /// Move the key to the end of the queue. The iterator remains valid.
+        queue.splice(queue.end(), queue, cell.queue_iterator);
+
+        return cell.value;
+    }
+
+    void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto [it, inserted] = cells.emplace(std::piecewise_construct,
+            std::forward_as_tuple(key),
+            std::forward_as_tuple());
+
+        Cell & cell = it->second;
+
+        if (inserted)
+        {
+            try
+            {
+                cell.queue_iterator = queue.insert(queue.end(), key);
+            }
+            catch (...)
+            {
+                cells.erase(it);
+                throw;
+            }
+        }
+        else
+        {
+            current_size -= cell.size;
+            queue.splice(queue.end(), queue, cell.queue_iterator);
+        }
+
+        cell.value = mapped;
+        cell.size = cell.value ? weight_function(*cell.value) : 0;
+        current_size += cell.size;
+
+        removeOverflow();
+    }
+
+protected:
+    using LRUQueue = std::list<Key>;
+    using LRUQueueIterator = typename LRUQueue::iterator;
+
+    LRUQueue queue;
+
+    struct Cell
+    {
+        MappedPtr value;
+        size_t size;
+        LRUQueueIterator queue_iterator;
+    };
+
+    using Cells = std::unordered_map<Key, Cell, HashFunction>;
+
+    Cells cells;
+
+    /// Total weight of values.
+    size_t current_size = 0;
+    const size_t max_size;
+    const size_t max_elements_size;
+
+    WeightFunction weight_function;
+
+    void removeOverflow()
+    {
+        size_t current_weight_lost = 0;
+        size_t queue_size = cells.size();
+
+        while ((current_size > max_size || (max_elements_size != 0 && queue_size > max_elements_size)) && (queue_size > 0))
+        {
+            const Key & key = queue.front();
+
+            auto it = cells.find(key);
+            if (it == cells.end())
+            {
+                LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
+                abort();
+            }
+
+            const auto & cell = it->second;
+
+            current_size -= cell.size;
+            current_weight_lost += cell.size;
+
+            cells.erase(it);
+            queue.pop_front();
+            --queue_size;
+        }
+
+        Base::on_weight_loss_function(current_weight_lost);
+
+        if (current_size > (1ull << 63))
+        {
+            LOG_ERROR(&Poco::Logger::get("LRUCache"), "LRUCache became inconsistent. There must be a bug in it.");
+            abort();
+        }
+    }
+};
+
+}
diff --git a/src/Common/LRUFileCache.h b/src/Common/LRUFileCache.h
deleted file mode 100644
index 059fc0c22c9..00000000000
--- a/src/Common/LRUFileCache.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#pragma once
-
-#include <atomic>
-#include <chrono>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <unordered_map>
-#include <unordered_set>
-#include <boost/functional/hash.hpp>
-#include <boost/noncopyable.hpp>
-#include <map>
-
-#include <Common/logger_useful.h>
-#include <Common/FileSegment.h>
-#include <Common/IFileCache.h>
-
-
-namespace DB
-{
-
-/**
- * Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
- * Implements LRU eviction policy.
- */
-class LRUFileCache final : public IFileCache
-{
-public:
-    LRUFileCache(
-        const String & cache_base_path_,
-        const FileCacheSettings & cache_settings_);
-
-    FileSegmentsHolder getOrSet(const Key & key, size_t offset, size_t size, bool is_persistent) override;
-
-    FileSegmentsHolder get(const Key & key, size_t offset, size_t size) override;
-
-    FileSegments getSnapshot() const override;
-
-    void initialize() override;
-
-    void removeIfExists(const Key & key) override;
-
-    void removeIfReleasable(bool remove_persistent_files) override;
-
-    std::vector<String> tryGetCachePaths(const Key & key) override;
-
-    size_t getUsedCacheSize() const override;
-
-    size_t getFileSegmentsNum() const override;
-
-private:
-    struct FileSegmentCell : private boost::noncopyable
-    {
-        FileSegmentPtr file_segment;
-
-        /// Iterator is put here on first reservation attempt, if successful.
-        std::optional<LRUQueue::Iterator> queue_iterator;
-
-        /// Pointer to file segment is always hold by the cache itself.
-        /// Apart from pointer in cache, it can be hold by cache users, when they call
-        /// getorSet(), but cache users always hold it via FileSegmentsHolder.
-        bool releasable() const {return file_segment.unique(); }
-
-        size_t size() const { return file_segment->reserved_size; }
-
-        FileSegmentCell(FileSegmentPtr file_segment_, LRUFileCache * cache, std::lock_guard<std::mutex> & cache_lock);
-
-        FileSegmentCell(FileSegmentCell && other) noexcept
-            : file_segment(std::move(other.file_segment))
-            , queue_iterator(other.queue_iterator) {}
-    };
-
-    using FileSegmentsByOffset = std::map<size_t, FileSegmentCell>;
-    using CachedFiles = std::unordered_map<Key, FileSegmentsByOffset>;
-
-    CachedFiles files;
-    LRUQueue queue;
-
-    LRUQueue stash_queue;
-    AccessRecord records;
-
-    size_t max_stash_element_size;
-    size_t enable_cache_hits_threshold;
-
-    Poco::Logger * log;
-    bool allow_to_remove_persistent_segments_from_cache_by_default;
-
-    FileSegments getImpl(
-        const Key & key, const FileSegment::Range & range,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegmentCell * getCell(
-        const Key & key, size_t offset, std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegmentCell * addCell(
-        const Key & key, size_t offset, size_t size,
-        FileSegment::State state, bool is_persistent,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    void useCell(const FileSegmentCell & cell, FileSegments & result, std::lock_guard<std::mutex> & cache_lock);
-
-    bool tryReserve(
-        const Key & key, size_t offset, size_t size,
-        std::lock_guard<std::mutex> & cache_lock) override;
-
-    bool tryReserveForMainList(
-        const Key & key, size_t offset, size_t size,
-        QueryContextPtr query_context,
-        std::lock_guard<std::mutex> & cache_lock);
-
-    void remove(
-        Key key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) override;
-
-    bool isLastFileSegmentHolder(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock,
-        std::lock_guard<std::mutex> & segment_lock) override;
-
-    size_t getAvailableCacheSize() const;
-
-    void loadCacheInfoIntoMemory(std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegments splitRangeIntoCells(
-        const Key & key, size_t offset, size_t size, FileSegment::State state, bool is_persistent, std::lock_guard<std::mutex> & cache_lock);
-
-    String dumpStructureUnlocked(const Key & key_, std::lock_guard<std::mutex> & cache_lock);
-
-    void fillHolesWithEmptyFileSegments(
-        FileSegments & file_segments, const Key & key, const FileSegment::Range & range, bool fill_with_detached_file_segments, bool is_persistent, std::lock_guard<std::mutex> & cache_lock);
-
-    FileSegmentsHolder setDownloading(const Key & key, size_t offset, size_t size, bool is_persistent) override;
-
-    size_t getUsedCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    size_t getAvailableCacheSizeUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    size_t getFileSegmentsNumUnlocked(std::lock_guard<std::mutex> & cache_lock) const;
-
-    void assertCacheCellsCorrectness(const FileSegmentsByOffset & cells_by_offset, std::lock_guard<std::mutex> & cache_lock);
-
-    void reduceSizeToDownloaded(
-        const Key & key, size_t offset,
-        std::lock_guard<std::mutex> & cache_lock, std::lock_guard<std::mutex> & /* segment_lock */) override;
-
-public:
-    String dumpStructure(const Key & key_) override;
-
-    void assertCacheCorrectness(const Key & key, std::lock_guard<std::mutex> & cache_lock);
-
-    void assertCacheCorrectness(std::lock_guard<std::mutex> & cache_lock);
-
-    void assertQueueCorrectness(std::lock_guard<std::mutex> & cache_lock);
-};
-
-}
diff --git a/src/Common/LRUFileCachePriority.cpp b/src/Common/LRUFileCachePriority.cpp
new file mode 100644
index 00000000000..91addc92501
--- /dev/null
+++ b/src/Common/LRUFileCachePriority.cpp
@@ -0,0 +1,105 @@
+#include <Common/LRUFileCachePriority.h>
+#include <Common/CurrentMetrics.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric FilesystemCacheSize;
+    extern const Metric FilesystemCacheElements;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+IFileCachePriority::WriteIterator LRUFileCachePriority::add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> &)
+{
+#ifndef NDEBUG
+    for (const auto & entry : queue)
+    {
+        if (entry.key == key && entry.offset == offset)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Attempt to add duplicate queue entry to queue. (Key: {}, offset: {}, size: {})",
+                entry.key.toString(),
+                entry.offset,
+                entry.size);
+    }
+#endif
+
+    auto iter = queue.insert(queue.end(), FileCacheRecord(key, offset, size));
+    cache_size += size;
+
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size);
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheElements);
+
+    return std::make_shared<LRUFileCacheIterator>(this, iter);
+}
+
+bool LRUFileCachePriority::contains(const Key & key, size_t offset, std::lock_guard<std::mutex> &)
+{
+    for (const auto & record : queue)
+    {
+        if (key == record.key && offset == record.offset)
+            return true;
+    }
+    return false;
+}
+
+void LRUFileCachePriority::removeAll(std::lock_guard<std::mutex> &)
+{
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, cache_size);
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements, queue.size());
+
+    queue.clear();
+    cache_size = 0;
+}
+
+LRUFileCachePriority::LRUFileCacheIterator::LRUFileCacheIterator(
+    LRUFileCachePriority * cache_priority_, LRUFileCachePriority::LRUQueueIterator queue_iter_)
+    : cache_priority(cache_priority_), queue_iter(queue_iter_)
+{
+}
+
+IFileCachePriority::ReadIterator LRUFileCachePriority::getLowestPriorityReadIterator(std::lock_guard<std::mutex> &)
+{
+    return std::make_unique<const LRUFileCacheIterator>(this, queue.begin());
+}
+
+IFileCachePriority::WriteIterator LRUFileCachePriority::getLowestPriorityWriteIterator(std::lock_guard<std::mutex> &)
+{
+    return std::make_shared<LRUFileCacheIterator>(this, queue.begin());
+}
+
+size_t LRUFileCachePriority::getElementsNum(std::lock_guard<std::mutex> &) const
+{
+    return queue.size();
+}
+
+void LRUFileCachePriority::LRUFileCacheIterator::removeAndGetNext(std::lock_guard<std::mutex> &)
+{
+    cache_priority->cache_size -= queue_iter->size;
+
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheSize, queue_iter->size);
+    CurrentMetrics::sub(CurrentMetrics::FilesystemCacheElements);
+
+    queue_iter = cache_priority->queue.erase(queue_iter);
+}
+
+void LRUFileCachePriority::LRUFileCacheIterator::incrementSize(size_t size_increment, std::lock_guard<std::mutex> &)
+{
+    cache_priority->cache_size += size_increment;
+    CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size_increment);
+    queue_iter->size += size_increment;
+}
+
+void LRUFileCachePriority::LRUFileCacheIterator::use(std::lock_guard<std::mutex> &)
+{
+    queue_iter->hits++;
+    cache_priority->queue.splice(cache_priority->queue.end(), cache_priority->queue, queue_iter);
+}
+
+};
diff --git a/src/Common/LRUFileCachePriority.h b/src/Common/LRUFileCachePriority.h
new file mode 100644
index 00000000000..7ea35e9a5eb
--- /dev/null
+++ b/src/Common/LRUFileCachePriority.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <list>
+#include <Common/IFileCachePriority.h>
+
+namespace DB
+{
+
+/// Based on the LRU algorithm implementation, the record with the lowest priority is stored at
+/// the head of the queue, and the record with the highest priority is stored at the tail.
+class LRUFileCachePriority : public IFileCachePriority
+{
+private:
+    class LRUFileCacheIterator;
+    using LRUQueue = std::list<FileCacheRecord>;
+    using LRUQueueIterator = typename LRUQueue::iterator;
+
+public:
+    LRUFileCachePriority() = default;
+
+    WriteIterator add(const Key & key, size_t offset, size_t size, std::lock_guard<std::mutex> &) override;
+
+    bool contains(const Key & key, size_t offset, std::lock_guard<std::mutex> &) override;
+
+    void removeAll(std::lock_guard<std::mutex> &) override;
+
+    ReadIterator getLowestPriorityReadIterator(std::lock_guard<std::mutex> &) override;
+
+    WriteIterator getLowestPriorityWriteIterator(std::lock_guard<std::mutex> &) override;
+
+    size_t getElementsNum(std::lock_guard<std::mutex> &) const override;
+
+private:
+    LRUQueue queue;
+};
+
+class LRUFileCachePriority::LRUFileCacheIterator : public IFileCachePriority::IIterator
+{
+public:
+    LRUFileCacheIterator(LRUFileCachePriority * cache_priority_, LRUFileCachePriority::LRUQueueIterator queue_iter_);
+
+    void next() const override { queue_iter++; }
+
+    bool valid() const override { return queue_iter != cache_priority->queue.end(); }
+
+    const Key & key() const override { return queue_iter->key; }
+
+    size_t offset() const override { return queue_iter->offset; }
+
+    size_t size() const override { return queue_iter->size; }
+
+    size_t hits() const override { return queue_iter->hits; }
+
+    void removeAndGetNext(std::lock_guard<std::mutex> &) override;
+
+    void incrementSize(size_t size_increment, std::lock_guard<std::mutex> &) override;
+
+    void use(std::lock_guard<std::mutex> &) override;
+
+private:
+    LRUFileCachePriority * cache_priority;
+    mutable LRUFileCachePriority::LRUQueueIterator queue_iter;
+};
+
+};
diff --git a/src/Common/LRUResourceCache.h b/src/Common/LRUResourceCache.h
index 904c69b25ae..1fe3075a2a3 100644
--- a/src/Common/LRUResourceCache.h
+++ b/src/Common/LRUResourceCache.h
@@ -24,7 +24,7 @@ struct TrivialLRUResourceCacheReleaseFunction
 };
 
 /**
- * Similar to implementation in LRUCache.h, but with the difference that keys can
+ * Similar to implementation in LRUCachePolicy.h, but with the difference that keys can
  * only be evicted when they are releasable. Release state is controlled by this implementation.
  * get() and getOrSet() methods return a Holder to actual value, which does release() in destructor.
  *
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 5546dc6b7b3..da3ce3cc3d2 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -57,17 +57,17 @@ inline std::string_view toDescription(OvercommitResult result)
     switch (result)
     {
     case OvercommitResult::NONE:
-        return "Memory overcommit isn't used. OvercommitTracker isn't set.";
+        return "Memory overcommit isn't used. OvercommitTracker isn't set";
     case OvercommitResult::DISABLED:
-        return "Memory overcommit isn't used. Waiting time or orvercommit denominator are set to zero.";
+        return "Memory overcommit isn't used. Waiting time or overcommit denominator are set to zero";
     case OvercommitResult::MEMORY_FREED:
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "OvercommitResult::MEMORY_FREED shouldn't be asked for description");
     case OvercommitResult::SELECTED:
-        return "Query was selected to stop by OvercommitTracker.";
+        return "Query was selected to stop by OvercommitTracker";
     case OvercommitResult::TIMEOUTED:
-        return "Waiting timeout for memory to be freed is reached.";
+        return "Waiting timeout for memory to be freed is reached";
     case OvercommitResult::NOT_ENOUGH_FREED:
-        return "Memory overcommit has freed not enough memory.";
+        return "Memory overcommit has freed not enough memory";
     }
 }
 
@@ -169,12 +169,14 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
     std::bernoulli_distribution fault(fault_probability);
     if (unlikely(fault_probability && fault(thread_local_rng)) && memoryTrackerCanThrow(level, true) && throw_if_memory_exceeded)
     {
+        /// Revert
+        amount.fetch_sub(size, std::memory_order_relaxed);
+
         /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
         MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
 
         ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
         const auto * description = description_ptr.load(std::memory_order_relaxed);
-        amount.fetch_sub(size, std::memory_order_relaxed);
         throw DB::Exception(
             DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
             "Memory tracker{}{}: fault injected. Would use {} (attempt to allocate chunk of {} bytes), maximum: {}",
@@ -211,6 +213,9 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded, MemoryT
 
         if (overcommit_result != OvercommitResult::MEMORY_FREED)
         {
+            /// Revert
+            amount.fetch_sub(size, std::memory_order_relaxed);
+
             /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
             MemoryTrackerBlockerInThread untrack_lock(VariableContext::Global);
             ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index 44be28eab75..d3232d833ee 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -703,10 +703,9 @@ public:
 
         size_t bytes_to_copy = this->byte_size(required_capacity);
         if (bytes_to_copy)
-        {
             memcpy(this->c_start, reinterpret_cast<const void *>(&*from_begin), bytes_to_copy);
-            this->c_end = this->c_start + bytes_to_copy;
-        }
+
+        this->c_end = this->c_start + bytes_to_copy;
     }
 
     // ISO C++ has strict ambiguity rules, thus we cannot apply TAllocatorParams here.
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 580e5f94952..e5275be43c1 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -1,7 +1,6 @@
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentThread.h>
-#include <Common/typeid_cast.h>
-#include <Columns/ColumnArray.h>
+
 
 /// Available events. Add something here as you wish.
 #define APPLY_FOR_EVENTS(M) \
@@ -25,6 +24,10 @@
     M(WriteBufferFromFileDescriptorWrite, "Number of writes (write/pwrite) to a file descriptor. Does not include sockets.") \
     M(WriteBufferFromFileDescriptorWriteFailed, "Number of times the write (write/pwrite) to a file descriptor have failed.") \
     M(WriteBufferFromFileDescriptorWriteBytes, "Number of bytes written to file descriptors. If the file is compressed, this will show compressed data size.") \
+    M(FileSync, "Number of times the F_FULLFSYNC/fsync/fdatasync function was called for files.") \
+    M(DirectorySync, "Number of times the F_FULLFSYNC/fsync/fdatasync function was called for directories.") \
+    M(FileSyncElapsedMicroseconds, "Total time spent waiting for F_FULLFSYNC/fsync/fdatasync syscall for files.") \
+    M(DirectorySyncElapsedMicroseconds, "Total time spent waiting for F_FULLFSYNC/fsync/fdatasync syscall for directories.") \
     M(ReadCompressedBytes, "Number of bytes (the number of bytes before decompression) read from compressed sources (files, network).") \
     M(CompressedReadBufferBlocks, "Number of compressed blocks (the blocks of data that are compressed independent of each other) read from compressed sources (files, network).") \
     M(CompressedReadBufferBytes, "Number of uncompressed bytes (the number of bytes after decompression) read from compressed sources (files, network).") \
@@ -275,6 +278,8 @@
     M(CachedReadBufferReadFromCacheBytes, "Bytes read from filesystem cache") \
     M(CachedReadBufferCacheWriteBytes, "Bytes written from source (remote fs, etc) to filesystem cache") \
     M(CachedReadBufferCacheWriteMicroseconds, "Time spent writing data into filesystem cache") \
+    M(CachedWriteBufferCacheWriteBytes, "Bytes written from source (remote fs, etc) to filesystem cache") \
+    M(CachedWriteBufferCacheWriteMicroseconds, "Time spent writing data into filesystem cache") \
     \
     M(RemoteFSSeeks, "Total number of seeks for async buffer") \
     M(RemoteFSPrefetches, "Number of prefetches made with asynchronous reading from remote filesystem") \
@@ -344,7 +349,13 @@
     \
     M(ScalarSubqueriesGlobalCacheHit, "Number of times a read from a scalar subquery was done using the global cache") \
     M(ScalarSubqueriesLocalCacheHit, "Number of times a read from a scalar subquery was done using the local cache") \
-    M(ScalarSubqueriesCacheMiss, "Number of times a read from a scalar subquery was not cached and had to be calculated completely") \
+    M(ScalarSubqueriesCacheMiss, "Number of times a read from a scalar subquery was not cached and had to be calculated completely")                                                                                                                                                                                                 \
+    \
+    M(SchemaInferenceCacheHits, "Number of times a schema from cache was used for schema inference") \
+    M(SchemaInferenceCacheMisses, "Number of times a schema is not in cache while schema inference") \
+    M(SchemaInferenceCacheEvictions, "Number of times a schema from cache was evicted due to overflow") \
+    M(SchemaInferenceCacheInvalidations, "Number of times a schema in cache became invalid due to changes in data") \
+    \
     M(KeeperPacketsSent, "Packets sent by keeper server") \
     M(KeeperPacketsReceived, "Packets received by keeper server") \
     M(KeeperRequestTotal, "Total requests number on keeper server") \
@@ -357,7 +368,10 @@
     M(KeeperSnapshotApplysFailed, "Number of failed snapshot applying")\
     M(KeeperReadSnapshot, "Number of snapshot read(serialization)")\
     M(KeeperSaveSnapshot, "Number of snapshot save")\
-
+    \
+    M(OverflowBreak, "Number of times, data processing was cancelled by query complexity limitation with setting '*_overflow_mode' = 'break' and the result is incomplete.") \
+    M(OverflowThrow, "Number of times, data processing was cancelled by query complexity limitation with setting '*_overflow_mode' = 'throw' and exception was thrown.") \
+    M(OverflowAny, "Number of times approximate GROUP BY was in effect: when aggregation was performed only on top of first 'max_rows_to_group_by' unique keys and other keys were ignored due to 'group_by_overflow_mode' = 'any'.") \
 
 namespace ProfileEvents
 {
@@ -446,7 +460,7 @@ void increment(Event event, Count amount)
 CountersIncrement::CountersIncrement(Counters::Snapshot const & snapshot)
 {
     init();
-    std::memcpy(increment_holder.get(), snapshot.counters_holder.get(), Counters::num_counters * sizeof(Increment));
+    memcpy(increment_holder.get(), snapshot.counters_holder.get(), Counters::num_counters * sizeof(Increment));
 }
 
 CountersIncrement::CountersIncrement(Counters::Snapshot const & after, Counters::Snapshot const & before)
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index 8ca1612e916..ab4ecf5c25f 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -8,7 +8,6 @@
 #include "Common/formatReadable.h"
 #include <Common/TerminalSize.h>
 #include <Common/UnicodeBar.h>
-#include <Common/Stopwatch.h>
 #include "IO/WriteBufferFromString.h"
 #include <Databases/DatabaseMemory.h>
 
@@ -33,6 +32,13 @@ namespace
 namespace DB
 {
 
+UInt64 ProgressIndication::getElapsedNanoseconds() const
+{
+    /// New server versions send server-side elapsed time, which is preferred for calculations.
+    UInt64 server_elapsed_ns = progress.elapsed_ns.load(std::memory_order_relaxed);
+    return server_elapsed_ns ? server_elapsed_ns : watch.elapsed();
+}
+
 bool ProgressIndication::updateProgress(const Progress & value)
 {
     return progress.incrementPiecewiseAtomically(value);
@@ -56,7 +62,7 @@ void ProgressIndication::resetProgress()
     write_progress_on_update = false;
     {
         std::lock_guard lock(profile_events_mutex);
-        cpu_usage_meter.reset(static_cast<double>(clock_gettime_ns()));
+        cpu_usage_meter.reset(getElapsedNanoseconds());
         thread_data.clear();
     }
 }
@@ -93,7 +99,7 @@ void ProgressIndication::updateThreadEventData(HostToThreadTimesMap & new_thread
         total_cpu_ns += aggregateCPUUsageNs(new_host_map.second);
         thread_data[new_host_map.first] = std::move(new_host_map.second);
     }
-    cpu_usage_meter.add(static_cast<double>(clock_gettime_ns()), total_cpu_ns);
+    cpu_usage_meter.add(getElapsedNanoseconds(), total_cpu_ns);
 }
 
 size_t ProgressIndication::getUsedThreadsCount() const
@@ -110,7 +116,7 @@ size_t ProgressIndication::getUsedThreadsCount() const
 double ProgressIndication::getCPUUsage()
 {
     std::lock_guard lock(profile_events_mutex);
-    return cpu_usage_meter.rate(clock_gettime_ns());
+    return cpu_usage_meter.rate(getElapsedNanoseconds());
 }
 
 ProgressIndication::MemoryUsage ProgressIndication::getMemoryUsage() const
@@ -139,7 +145,7 @@ void ProgressIndication::writeFinalProgress()
     std::cout << "Processed " << formatReadableQuantity(progress.read_rows) << " rows, "
                 << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
 
-    size_t elapsed_ns = watch.elapsed();
+    UInt64 elapsed_ns = getElapsedNanoseconds();
     if (elapsed_ns)
         std::cout << " (" << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
                     << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.)";
@@ -185,7 +191,7 @@ void ProgressIndication::writeProgress()
         << formatReadableQuantity(progress.read_rows) << " rows, "
         << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
 
-    auto elapsed_ns = watch.elapsed();
+    UInt64 elapsed_ns = getElapsedNanoseconds();
     if (elapsed_ns)
         message << " ("
                 << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index 588a31beca7..4f05f41b9d0 100644
--- a/src/Common/ProgressIndication.h
+++ b/src/Common/ProgressIndication.h
@@ -55,7 +55,7 @@ public:
     void setFileProgressCallback(ContextMutablePtr context, bool write_progress_on_update = false);
 
     /// How much seconds passed since query execution start.
-    double elapsedSeconds() const { return watch.elapsedSeconds(); }
+    double elapsedSeconds() const { return getElapsedNanoseconds() / 1e9; }
 
     void addThreadIdToList(String const & host, UInt64 thread_id);
 
@@ -74,6 +74,8 @@ private:
 
     MemoryUsage getMemoryUsage() const;
 
+    UInt64 getElapsedNanoseconds() const;
+
     /// This flag controls whether to show the progress bar. We start showing it after
     /// the query has been executing for 0.5 seconds, and is still less than half complete.
     bool show_progress_bar = false;
@@ -86,7 +88,7 @@ private:
     /// This information is stored here.
     Progress progress;
 
-    /// Track query execution time.
+    /// Track query execution time on client.
     Stopwatch watch;
 
     bool write_progress_on_update = false;
diff --git a/src/Common/SLRUCachePolicy.h b/src/Common/SLRUCachePolicy.h
new file mode 100644
index 00000000000..10b043ebaca
--- /dev/null
+++ b/src/Common/SLRUCachePolicy.h
@@ -0,0 +1,251 @@
+#pragma once
+
+#include <Common/ICachePolicy.h>
+
+#include <list>
+#include <unordered_map>
+
+#include <Common/logger_useful.h>
+
+namespace DB
+{
+
+/// Cache policy SLRU evicts entries which were used only once and are not used for a long time,
+/// this policy protects entries which were used more then once from a sequential scan.
+/// WeightFunction is a functor that takes Mapped as a parameter and returns "weight" (approximate size)
+/// of that value.
+/// Cache starts to evict entries when their total weight exceeds max_size.
+/// Value weight should not change after insertion.
+/// To work with the thread-safe implementation of this class use a class "CacheBase" with first parameter "SLRU"
+/// and next parameters in the same order as in the constructor of the current class.
+template <typename TKey, typename TMapped, typename HashFunction = std::hash<TKey>, typename WeightFunction = TrivialWeightFunction<TMapped>>
+class SLRUCachePolicy : public ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>
+{
+public:
+    using Key = TKey;
+    using Mapped = TMapped;
+    using MappedPtr = std::shared_ptr<Mapped>;
+
+    using Base = ICachePolicy<TKey, TMapped, HashFunction, WeightFunction>;
+    using typename Base::OnWeightLossFunction;
+
+    /** Initialize SLRUCachePolicy with max_size and max_protected_size.
+      * max_protected_size shows how many of the most frequently used entries will not be evicted after a sequential scan.
+      * max_protected_size == 0 means that the default protected size is equal to half of the total max size.
+      */
+    /// TODO: construct from special struct with cache policy parametrs (also with max_protected_size).
+    SLRUCachePolicy(size_t max_size_, size_t max_elements_size_ = 0, double size_ratio = 0.5, OnWeightLossFunction on_weight_loss_function_ = {})
+        : max_protected_size(max_size_ * std::min(1.0, size_ratio))
+        , max_size(max_size_)
+        , max_elements_size(max_elements_size_)
+        {
+            Base::on_weight_loss_function = on_weight_loss_function_;
+        }
+
+    size_t weight(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return current_size;
+    }
+
+    size_t count(std::lock_guard<std::mutex> & /* cache_lock */) const override
+    {
+        return cells.size();
+    }
+
+    size_t maxSize() const override
+    {
+        return max_size;
+    }
+
+    void reset(std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        cells.clear();
+        probationary_queue.clear();
+        protected_queue.clear();
+        current_size = 0;
+        current_protected_size = 0;
+    }
+
+    void remove(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+            return;
+        auto & cell = it->second;
+        current_size -= cell.size;
+        if (cell.is_protected)
+        {
+            current_protected_size -= cell.size;
+        }
+        auto & queue = cell.is_protected ? protected_queue : probationary_queue;
+        queue.erase(cell.queue_iterator);
+        cells.erase(it);
+    }
+
+    MappedPtr get(const Key & key, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto it = cells.find(key);
+        if (it == cells.end())
+        {
+            return MappedPtr();
+        }
+
+        Cell & cell = it->second;
+
+        if (cell.is_protected)
+        {
+            protected_queue.splice(protected_queue.end(), protected_queue, cell.queue_iterator);
+        }
+        else
+        {
+            cell.is_protected = true;
+            current_protected_size += cell.size;
+            protected_queue.splice(protected_queue.end(), probationary_queue, cell.queue_iterator);
+            removeOverflow(protected_queue, max_protected_size, current_protected_size, /*is_protected=*/true);
+        }
+
+        return cell.value;
+    }
+
+    void set(const Key & key, const MappedPtr & mapped, std::lock_guard<std::mutex> & /* cache_lock */) override
+    {
+        auto [it, inserted] = cells.emplace(std::piecewise_construct,
+            std::forward_as_tuple(key),
+            std::forward_as_tuple());
+
+        Cell & cell = it->second;
+
+        if (inserted)
+        {
+            try
+            {
+                cell.queue_iterator = probationary_queue.insert(probationary_queue.end(), key);
+            }
+            catch (...)
+            {
+                cells.erase(it);
+                throw;
+            }
+        }
+        else
+        {
+            current_size -= cell.size;
+            if (cell.is_protected)
+            {
+                current_protected_size -= cell.size;
+                protected_queue.splice(protected_queue.end(), protected_queue, cell.queue_iterator);
+            }
+            else
+            {
+                cell.is_protected = true;
+                protected_queue.splice(protected_queue.end(), probationary_queue, cell.queue_iterator);
+            }
+        }
+
+        cell.value = mapped;
+        cell.size = cell.value ? weight_function(*cell.value) : 0;
+        current_size += cell.size;
+        current_protected_size += cell.is_protected ? cell.size : 0;
+
+        removeOverflow(protected_queue, max_protected_size, current_protected_size, /*is_protected=*/true);
+        removeOverflow(probationary_queue, max_size, current_size, /*is_protected=*/false);
+    }
+
+protected:
+    using SLRUQueue = std::list<Key>;
+    using SLRUQueueIterator = typename SLRUQueue::iterator;
+
+    SLRUQueue probationary_queue;
+    SLRUQueue protected_queue;
+
+    struct Cell
+    {
+        bool is_protected = false;
+        MappedPtr value;
+        size_t size;
+        SLRUQueueIterator queue_iterator;
+    };
+
+    using Cells = std::unordered_map<Key, Cell, HashFunction>;
+
+    Cells cells;
+
+    size_t current_protected_size = 0;
+    size_t current_size = 0;
+    const size_t max_protected_size;
+    const size_t max_size;
+    const size_t max_elements_size;
+
+    WeightFunction weight_function;
+
+    void removeOverflow(SLRUQueue & queue, const size_t max_weight_size, size_t & current_weight_size, bool is_protected)
+    {
+        size_t current_weight_lost = 0;
+        size_t queue_size = queue.size();
+
+        std::function<bool()> need_remove;
+        if (is_protected)
+        {
+            /// Check if after remove all elements from probationary part there will be no more than max elements
+            /// in protected queue and weight of all protected elements will be less then max protected weight.
+            /// It's not possible to check only cells.size() > max_elements_size
+            /// because protected elements move to probationary part and still remain in cache.
+            need_remove = [&]()
+            {
+                return ((max_elements_size != 0 && cells.size() - probationary_queue.size() > max_elements_size)
+                || (current_weight_size > max_weight_size)) && (queue_size > 0);
+            };
+        }
+        else
+        {
+            need_remove = [&]()
+            {
+                return ((max_elements_size != 0 && cells.size() > max_elements_size)
+                || (current_weight_size > max_weight_size)) && (queue_size > 0);
+            };
+        }
+
+        while (need_remove())
+        {
+            const Key & key = queue.front();
+
+            auto it = cells.find(key);
+            if (it == cells.end())
+            {
+                LOG_ERROR(&Poco::Logger::get("SLRUCache"), "SLRUCache became inconsistent. There must be a bug in it.");
+                abort();
+            }
+
+            auto & cell = it->second;
+
+            current_weight_size -= cell.size;
+
+            if (cell.is_protected)
+            {
+                cell.is_protected = false;
+                probationary_queue.splice(probationary_queue.end(), queue, cell.queue_iterator);
+            }
+            else
+            {
+                current_weight_lost += cell.size;
+                cells.erase(it);
+                queue.pop_front();
+            }
+
+            --queue_size;
+        }
+
+        if (!is_protected)
+        {
+            Base::on_weight_loss_function(current_weight_lost);
+        }
+
+        if (current_size > (1ull << 63))
+        {
+            LOG_ERROR(&Poco::Logger::get("SLRUCache"), "SLRUCache became inconsistent. There must be a bug in it.");
+            abort();
+        }
+    }
+};
+
+}
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index 38188a022f8..1f26cba31fb 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -111,7 +111,7 @@ public:
 
         while (data + 8 <= end)
         {
-            current_word = unalignedLoad<UInt64>(data);
+            current_word = unalignedLoadLE<UInt64>(data);
 
             v3 ^= current_word;
             SIPROUND;
@@ -157,8 +157,8 @@ public:
     void get128(char * out)
     {
         finalize();
-        unalignedStore<UInt64>(out, v0 ^ v1);
-        unalignedStore<UInt64>(out + 8, v2 ^ v3);
+        unalignedStoreLE<UInt64>(out, v0 ^ v1);
+        unalignedStoreLE<UInt64>(out + 8, v2 ^ v3);
     }
 
     template <typename T>
diff --git a/src/Common/SpaceSaving.h b/src/Common/SpaceSaving.h
index 0f577349722..20d6812b91b 100644
--- a/src/Common/SpaceSaving.h
+++ b/src/Common/SpaceSaving.h
@@ -78,7 +78,7 @@ private:
     constexpr uint64_t nextAlphaSize(uint64_t x)
     {
         constexpr uint64_t alpha_map_elements_per_counter = 6;
-        return 1ULL << (sizeof(uint64_t) * 8 - __builtin_clzll(x * alpha_map_elements_per_counter));
+        return 1ULL << (sizeof(uint64_t) * 8 - std::countl_zero(x * alpha_map_elements_per_counter));
     }
 
 public:
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index f41a646f31e..70f80b62868 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -1,6 +1,5 @@
 #include <Common/StackTrace.h>
 
-#include <Core/Defines.h>
 #include <Common/Dwarf.h>
 #include <Common/Elf.h>
 #include <Common/SymbolIndex.h>
@@ -8,6 +7,7 @@
 #include <base/CachedFn.h>
 #include <base/demangle.h>
 
+#include <atomic>
 #include <cstring>
 #include <filesystem>
 #include <sstream>
@@ -19,6 +19,32 @@
 #    include <libunwind.h>
 #endif
 
+
+namespace
+{
+    /// Currently this variable is set up once on server startup.
+    /// But we use atomic just in case, so it is possible to be modified at runtime.
+    std::atomic<bool> show_addresses = true;
+
+    bool shouldShowAddress(const void * addr)
+    {
+        /// If the address is less than 4096, most likely it is a nullptr dereference with offset,
+        /// and showing this offset is secure nevertheless.
+        /// NOTE: 4096 is the page size on x86 and it can be different on other systems,
+        /// but for the purpose of this branch, it does not matter.
+        if (reinterpret_cast<uintptr_t>(addr) < 4096)
+            return true;
+
+        return show_addresses.load(std::memory_order_relaxed);
+    }
+}
+
+void StackTrace::setShowAddresses(bool show)
+{
+    show_addresses.store(show, std::memory_order_relaxed);
+}
+
+
 std::string signalToErrorMessage(int sig, const siginfo_t & info, [[maybe_unused]] const ucontext_t & context)
 {
     std::stringstream error;        // STYLE_CHECK_ALLOW_STD_STRING_STREAM
@@ -30,7 +56,7 @@ std::string signalToErrorMessage(int sig, const siginfo_t & info, [[maybe_unused
             /// Print info about address and reason.
             if (nullptr == info.si_addr)
                 error << "Address: NULL pointer.";
-            else
+            else if (shouldShowAddress(info.si_addr))
                 error << "Address: " << info.si_addr;
 
 #if defined(__x86_64__) && !defined(OS_FREEBSD) && !defined(OS_DARWIN) && !defined(__arm__) && !defined(__powerpc__)
@@ -372,7 +398,9 @@ static void toStringEveryLineImpl(
         else
             out << "?";
 
-        out << " @ " << physical_addr;
+        if (shouldShowAddress(physical_addr))
+            out << " @ " << physical_addr;
+
         out << " in " << (object ? object->name : "?");
 
         for (size_t j = 0; j < inline_frames.size(); ++j)
@@ -393,10 +421,13 @@ static void toStringEveryLineImpl(
     for (size_t i = offset; i < size; ++i)
     {
         const void * addr = frame_pointers[i];
-        out << i << ". " << addr;
+        if (shouldShowAddress(addr))
+        {
+            out << i << ". " << addr;
 
-        callback(out.str());
-        out.str({});
+            callback(out.str());
+            out.str({});
+        }
     }
 #endif
 }
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 84a2e9d1f7f..f07c05107ee 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -67,6 +67,11 @@ public:
 
     void toStringEveryLine(std::function<void(const std::string &)> callback) const;
 
+    /// Displaying the addresses can be disabled for security reasons.
+    /// If you turn off addresses, it will be more secure, but we will be unable to help you with debugging.
+    /// Please note: addresses are also available in the system.stack_trace and system.trace_log tables.
+    static void setShowAddresses(bool show);
+
 protected:
     void tryCapture();
 
diff --git a/src/Common/TargetSpecific.cpp b/src/Common/TargetSpecific.cpp
index 70b03833775..a5fbe7de078 100644
--- a/src/Common/TargetSpecific.cpp
+++ b/src/Common/TargetSpecific.cpp
@@ -20,6 +20,8 @@ UInt32 getSupportedArchs()
         result |= static_cast<UInt32>(TargetArch::AVX512BW);
     if (Cpu::CpuFlagsCache::have_AVX512VBMI)
         result |= static_cast<UInt32>(TargetArch::AVX512VBMI);
+    if (Cpu::CpuFlagsCache::have_AVX512VBMI2)
+        result |= static_cast<UInt32>(TargetArch::AVX512VBMI2);
     return result;
 }
 
@@ -38,8 +40,9 @@ String toString(TargetArch arch)
         case TargetArch::AVX:     return "avx";
         case TargetArch::AVX2:    return "avx2";
         case TargetArch::AVX512F: return "avx512f";
-        case TargetArch::AVX512BW: return "avx512bw";
-        case TargetArch::AVX512VBMI: return "avx512vbmi";
+        case TargetArch::AVX512BW:    return "avx512bw";
+        case TargetArch::AVX512VBMI:  return "avx512vbmi";
+        case TargetArch::AVX512VBMI2: return "avx512vbmi";
     }
 
     __builtin_unreachable();
diff --git a/src/Common/TargetSpecific.h b/src/Common/TargetSpecific.h
index f078c0e3ffc..250642f6ee4 100644
--- a/src/Common/TargetSpecific.h
+++ b/src/Common/TargetSpecific.h
@@ -31,7 +31,7 @@
  * int funcImpl() {
  *     return 2;
  * }
- * ) // DECLARE_DEFAULT_CODE
+ * ) // DECLARE_AVX2_SPECIFIC_CODE
  *
  * int func() {
  * #if USE_MULTITARGET_CODE
@@ -80,8 +80,9 @@ enum class TargetArch : UInt32
     AVX      = (1 << 1),
     AVX2     = (1 << 2),
     AVX512F  = (1 << 3),
-    AVX512BW  = (1 << 4),
-    AVX512VBMI = (1 << 5),
+    AVX512BW    = (1 << 4),
+    AVX512VBMI  = (1 << 5),
+    AVX512VBMI2 = (1 << 6),
 };
 
 /// Runtime detection.
@@ -100,6 +101,7 @@ String toString(TargetArch arch);
 
 #if defined(__clang__)
 
+#define AVX512VBMI2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2")))
 #define AVX512VBMI_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi")))
 #define AVX512BW_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw")))
 #define AVX512_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f")))
@@ -108,6 +110,8 @@ String toString(TargetArch arch);
 #define SSE42_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt")))
 #define DEFAULT_FUNCTION_SPECIFIC_ATTRIBUTE
 
+#   define BEGIN_AVX512VBMI2_SPECIFIC_CODE \
+        _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2\"))),apply_to=function)")
 #   define BEGIN_AVX512VBMI_SPECIFIC_CODE \
         _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi\"))),apply_to=function)")
 #   define BEGIN_AVX512BW_SPECIFIC_CODE \
@@ -129,6 +133,7 @@ String toString(TargetArch arch);
 #   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void _dummy_function_definition();
 #else
 
+#define AVX512VBMI2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2,tune=native")))
 #define AVX512VBMI_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,tune=native")))
 #define AVX512BW_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,tune=native")))
 #define AVX512_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,tune=native")))
@@ -137,6 +142,9 @@ String toString(TargetArch arch);
 #define SSE42_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt",tune=native)))
 #define DEFAULT_FUNCTION_SPECIFIC_ATTRIBUTE
 
+#   define BEGIN_AVX512VBMI2_SPECIFIC_CODE \
+        _Pragma("GCC push_options") \
+        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2,tune=native\")")
 #   define BEGIN_AVX512VBMI_SPECIFIC_CODE \
         _Pragma("GCC push_options") \
         _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,tune=native\")")
@@ -217,6 +225,16 @@ namespace TargetSpecific::AVX512VBMI { \
 } \
 END_TARGET_SPECIFIC_CODE
 
+#define DECLARE_AVX512VBMI2_SPECIFIC_CODE(...) \
+BEGIN_AVX512VBMI2_SPECIFIC_CODE \
+namespace TargetSpecific::AVX512VBMI2 { \
+    DUMMY_FUNCTION_DEFINITION \
+    using namespace DB::TargetSpecific::AVX512VBMI2; \
+    __VA_ARGS__ \
+} \
+END_TARGET_SPECIFIC_CODE
+
+
 #else
 
 #define USE_MULTITARGET_CODE 0
@@ -229,6 +247,7 @@ END_TARGET_SPECIFIC_CODE
 #define DECLARE_AVX512F_SPECIFIC_CODE(...)
 #define DECLARE_AVX512BW_SPECIFIC_CODE(...)
 #define DECLARE_AVX512VBMI_SPECIFIC_CODE(...)
+#define DECLARE_AVX512VBMI2_SPECIFIC_CODE(...)
 
 #endif
 
@@ -245,8 +264,9 @@ DECLARE_SSE42_SPECIFIC_CODE  (__VA_ARGS__) \
 DECLARE_AVX_SPECIFIC_CODE    (__VA_ARGS__) \
 DECLARE_AVX2_SPECIFIC_CODE   (__VA_ARGS__) \
 DECLARE_AVX512F_SPECIFIC_CODE(__VA_ARGS__) \
-DECLARE_AVX512BW_SPECIFIC_CODE(__VA_ARGS__) \
-DECLARE_AVX512VBMI_SPECIFIC_CODE(__VA_ARGS__)
+DECLARE_AVX512BW_SPECIFIC_CODE    (__VA_ARGS__) \
+DECLARE_AVX512VBMI_SPECIFIC_CODE  (__VA_ARGS__) \
+DECLARE_AVX512VBMI2_SPECIFIC_CODE (__VA_ARGS__)
 
 DECLARE_DEFAULT_CODE(
     constexpr auto BuildArch = TargetArch::Default; /// NOLINT
@@ -276,6 +296,9 @@ DECLARE_AVX512VBMI_SPECIFIC_CODE(
     constexpr auto BuildArch = TargetArch::AVX512VBMI; /// NOLINT
 ) // DECLARE_AVX512VBMI_SPECIFIC_CODE
 
+DECLARE_AVX512VBMI2_SPECIFIC_CODE(
+    constexpr auto BuildArch = TargetArch::AVX512VBMI2; /// NOLINT
+) // DECLARE_AVX512VBMI2_SPECIFIC_CODE
 
 /** Runtime Dispatch helpers for class members.
   *
diff --git a/src/Common/TaskStatsInfoGetter.cpp b/src/Common/TaskStatsInfoGetter.cpp
index 304ccc84765..b81da2f3fe2 100644
--- a/src/Common/TaskStatsInfoGetter.cpp
+++ b/src/Common/TaskStatsInfoGetter.cpp
@@ -238,27 +238,36 @@ TaskStatsInfoGetter::TaskStatsInfoGetter()
     if (netlink_socket_fd < 0)
         throwFromErrno("Can't create PF_NETLINK socket", ErrorCodes::NETLINK_ERROR);
 
-    /// On some containerized environments, operation on Netlink socket could hang forever.
-    /// We set reasonably small timeout to overcome this issue.
-
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 50000;
-
-    if (0 != ::setsockopt(netlink_socket_fd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<const char *>(&tv), sizeof(tv)))
-        throwFromErrno("Can't set timeout on PF_NETLINK socket", ErrorCodes::NETLINK_ERROR);
-
-    union
+    try
     {
-        ::sockaddr_nl addr{};
-        ::sockaddr sockaddr;
-    };
-    addr.nl_family = AF_NETLINK;
+        /// On some containerized environments, operation on Netlink socket could hang forever.
+        /// We set reasonably small timeout to overcome this issue.
 
-    if (::bind(netlink_socket_fd, &sockaddr, sizeof(addr)) < 0)
-        throwFromErrno("Can't bind PF_NETLINK socket", ErrorCodes::NETLINK_ERROR);
+        struct timeval tv;
+        tv.tv_sec = 0;
+        tv.tv_usec = 50000;
 
-    taskstats_family_id = getFamilyId(netlink_socket_fd);
+        if (0 != ::setsockopt(netlink_socket_fd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<const char *>(&tv), sizeof(tv)))
+            throwFromErrno("Can't set timeout on PF_NETLINK socket", ErrorCodes::NETLINK_ERROR);
+
+        union
+        {
+            ::sockaddr_nl addr{};
+            ::sockaddr sockaddr;
+        };
+        addr.nl_family = AF_NETLINK;
+
+        if (::bind(netlink_socket_fd, &sockaddr, sizeof(addr)) < 0)
+            throwFromErrno("Can't bind PF_NETLINK socket", ErrorCodes::NETLINK_ERROR);
+
+        taskstats_family_id = getFamilyId(netlink_socket_fd);
+    }
+    catch (...)
+    {
+        if (netlink_socket_fd >= 0)
+            close(netlink_socket_fd);
+        throw;
+    }
 }
 
 
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 4dd32f7ff10..423a44c97d6 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -24,9 +24,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
-thread_local ThreadStatus * current_thread = nullptr;
-thread_local ThreadStatus * main_thread = nullptr;
+thread_local ThreadStatus constinit * current_thread = nullptr;
 
 #if !defined(SANITIZER)
 namespace
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 7c22d3b8335..2a4ffd229f2 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -102,8 +102,16 @@ public:
 
 using ThreadGroupStatusPtr = std::shared_ptr<ThreadGroupStatus>;
 
-
-extern thread_local ThreadStatus * current_thread;
+/**
+ * We use **constinit** here to tell the compiler the current_thread variable is initialized.
+ * If we didn't help the compiler, then it would most likely add a check before every use of the variable to initialize it if needed.
+ * Instead it will trust that we are doing the right thing (and we do initialize it to nullptr) and emit more optimal code.
+ * This is noticeable in functions like CurrentMemoryTracker::free and CurrentMemoryTracker::allocImpl
+ * See also:
+ * - https://en.cppreference.com/w/cpp/language/constinit
+ * - https://github.com/ClickHouse/ClickHouse/pull/40078
+ */
+extern thread_local constinit ThreadStatus * current_thread;
 
 /** Encapsulates all per-thread info (ProfileEvents, MemoryTracker, query_id, query context, etc.).
   * The object must be created in thread function and destroyed in the same thread before the exit.
@@ -127,6 +135,8 @@ public:
     Int64 untracked_memory = 0;
     /// Each thread could new/delete memory in range of (-untracked_memory_limit, untracked_memory_limit) without access to common counters.
     Int64 untracked_memory_limit = 4 * 1024 * 1024;
+    /// Increase limit in case of exception.
+    Int64 untracked_memory_limit_increase = 0;
 
     /// Statistics of read and write rows/bytes
     Progress progress_in;
diff --git a/src/Common/UTF8Helpers.cpp b/src/Common/UTF8Helpers.cpp
index b1d38c4f31a..0af31726f40 100644
--- a/src/Common/UTF8Helpers.cpp
+++ b/src/Common/UTF8Helpers.cpp
@@ -2,6 +2,7 @@
 #include <Common/StringUtils/StringUtils.h>
 
 #include <widechar_width.h>
+#include <bit>
 
 
 namespace DB
@@ -124,7 +125,7 @@ size_t computeWidthImpl(const UInt8 * data, size_t size, size_t prefix, size_t l
 
             if (non_regular_width_mask)
             {
-                auto num_regular_chars = __builtin_ctz(non_regular_width_mask);
+                auto num_regular_chars = std::countr_zero(non_regular_width_mask);
                 width += num_regular_chars;
                 i += num_regular_chars;
                 break;
diff --git a/src/Common/UTF8Helpers.h b/src/Common/UTF8Helpers.h
index 72bdb965789..ce90af3d5ce 100644
--- a/src/Common/UTF8Helpers.h
+++ b/src/Common/UTF8Helpers.h
@@ -83,7 +83,7 @@ inline size_t countCodePoints(const UInt8 * data, size_t size)
     const auto threshold = vdupq_n_s8(0xBF);
 
     for (; data < src_end_sse; data += bytes_sse)
-        res += __builtin_popcountll(get_nibble_mask(vcgtq_s8(vld1q_s8(reinterpret_cast<const int8_t *>(data)), threshold)));
+        res += std::popcount(get_nibble_mask(vcgtq_s8(vld1q_s8(reinterpret_cast<const int8_t *>(data)), threshold)));
     res >>= 2;
 #endif
 
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 79f9943cb57..c6aa954688b 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -2,6 +2,7 @@
 
 #include <base/types.h>
 #include <Common/Exception.h>
+#include <Coordination/KeeperConstants.h>
 
 #include <vector>
 #include <memory>
@@ -57,6 +58,8 @@ struct Stat
     int32_t dataLength{0}; /// NOLINT
     int32_t numChildren{0}; /// NOLINT
     int64_t pzxid{0};
+
+    bool operator==(const Stat &) const = default;
 };
 
 enum class Error : int32_t
@@ -109,7 +112,6 @@ bool isUserError(Error code);
 
 const char * errorMessage(Error code);
 
-
 struct Request;
 using RequestPtr = std::shared_ptr<Request>;
 using Requests = std::vector<RequestPtr>;
@@ -516,6 +518,8 @@ public:
         const Requests & requests,
         MultiCallback callback) = 0;
 
+    virtual DB::KeeperApiVersion getApiVersion() = 0;
+
     /// Expire session and finish all pending requests
     virtual void finalize(const String & reason) = 0;
 };
diff --git a/src/Common/ZooKeeper/TestKeeper.h b/src/Common/ZooKeeper/TestKeeper.h
index 6e77a5d38c1..5fcd00b01b0 100644
--- a/src/Common/ZooKeeper/TestKeeper.h
+++ b/src/Common/ZooKeeper/TestKeeper.h
@@ -90,6 +90,11 @@ public:
 
     void finalize(const String & reason) override;
 
+    DB::KeeperApiVersion getApiVersion() override
+    {
+        return KeeperApiVersion::ZOOKEEPER_COMPATIBLE;
+    }
+
     struct Node
     {
         String data;
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index b4d2a22c7a0..96abf3b543a 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -337,17 +337,17 @@ Coordination::Error ZooKeeper::getChildrenImpl(const std::string & path, Strings
     }
 }
 
-Strings ZooKeeper::getChildren(const std::string & path, Coordination::Stat * stat, const EventPtr & watch)
+Strings ZooKeeper::getChildren(const std::string & path, Coordination::Stat * stat, const EventPtr & watch, Coordination::ListRequestType list_request_type)
 {
     Strings res;
-    check(tryGetChildren(path, res, stat, watch), path);
+    check(tryGetChildren(path, res, stat, watch, list_request_type), path);
     return res;
 }
 
-Strings ZooKeeper::getChildrenWatch(const std::string & path, Coordination::Stat * stat, Coordination::WatchCallback watch_callback)
+Strings ZooKeeper::getChildrenWatch(const std::string & path, Coordination::Stat * stat, Coordination::WatchCallback watch_callback, Coordination::ListRequestType list_request_type)
 {
     Strings res;
-    check(tryGetChildrenWatch(path, res, stat, watch_callback), path);
+    check(tryGetChildrenWatch(path, res, stat, watch_callback, list_request_type), path);
     return res;
 }
 
@@ -540,7 +540,6 @@ Coordination::Error ZooKeeper::getImpl(const std::string & path, std::string & r
     }
 }
 
-
 std::string ZooKeeper::get(const std::string & path, Coordination::Stat * stat, const EventPtr & watch)
 {
     Coordination::Error code = Coordination::Error::ZOK;
@@ -904,6 +903,11 @@ bool ZooKeeper::expired()
     return impl->isExpired();
 }
 
+DB::KeeperApiVersion ZooKeeper::getApiVersion()
+{
+    return impl->getApiVersion();
+}
+
 Int64 ZooKeeper::getClientID()
 {
     return impl->getSessionID();
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index d2f92b6b4c3..c9b5dc69499 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -127,6 +127,8 @@ public:
     /// Returns true, if the session has expired.
     bool expired();
 
+    DB::KeeperApiVersion getApiVersion();
+
     /// Create a znode.
     /// Throw an exception if something went wrong.
     std::string create(const std::string & path, const std::string & data, int32_t mode);
@@ -184,11 +186,13 @@ public:
 
     Strings getChildren(const std::string & path,
                         Coordination::Stat * stat = nullptr,
-                        const EventPtr & watch = nullptr);
+                        const EventPtr & watch = nullptr,
+                        Coordination::ListRequestType list_request_type = Coordination::ListRequestType::ALL);
 
     Strings getChildrenWatch(const std::string & path,
                              Coordination::Stat * stat,
-                             Coordination::WatchCallback watch_callback);
+                             Coordination::WatchCallback watch_callback,
+                             Coordination::ListRequestType list_request_type = Coordination::ListRequestType::ALL);
 
     /// Doesn't not throw in the following cases:
     /// * The node doesn't exist.
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index 837ea5bbad8..b15126f5701 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -724,7 +724,10 @@ void ZooKeeperResponse::fillLogElements(LogElements & elems, size_t idx) const
     assert(!elem.xid || elem.xid == xid);
     elem.xid = xid;
     int32_t response_op = tryGetOpNum();
-    assert(!elem.op_num || elem.op_num == response_op || response_op < 0);
+
+    [[maybe_unused]] const bool is_filtered_list = elem.op_num == static_cast<int32_t>(Coordination::OpNum::FilteredList)
+        && response_op == static_cast<int32_t>(Coordination::OpNum::List);
+    assert(!elem.op_num || elem.op_num == response_op || is_filtered_list || response_op < 0);
     elem.op_num = response_op;
 
     elem.zxid = zxid;
@@ -892,6 +895,7 @@ ZooKeeperRequestFactory::ZooKeeperRequestFactory()
     registerZooKeeperRequest<OpNum::SessionID, ZooKeeperSessionIDRequest>(*this);
     registerZooKeeperRequest<OpNum::GetACL, ZooKeeperGetACLRequest>(*this);
     registerZooKeeperRequest<OpNum::SetACL, ZooKeeperSetACLRequest>(*this);
+    registerZooKeeperRequest<OpNum::FilteredList, ZooKeeperFilteredListRequest>(*this);
 }
 
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.cpp b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
index 5b121ed6138..ba7a9b9f0c5 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
@@ -24,6 +24,7 @@ static const std::unordered_set<int32_t> VALID_OPERATIONS =
     static_cast<int32_t>(OpNum::SessionID),
     static_cast<int32_t>(OpNum::SetACL),
     static_cast<int32_t>(OpNum::GetACL),
+    static_cast<int32_t>(OpNum::FilteredList),
 };
 
 std::string toString(OpNum op_num)
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index 8fa6f28c29c..1d0f1fdb1a2 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -6,6 +6,7 @@
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <Common/logger_useful.h>
@@ -352,6 +353,8 @@ ZooKeeper::ZooKeeper(
     send_thread = ThreadFromGlobalPool([this] { sendThread(); });
     receive_thread = ThreadFromGlobalPool([this] { receiveThread(); });
 
+    initApiVersion();
+
     ProfileEvents::increment(ProfileEvents::ZooKeeperInit);
 }
 
@@ -698,6 +701,7 @@ void ZooKeeper::receiveEvent()
 
     RequestInfo request_info;
     ZooKeeperResponsePtr response;
+    UInt64 elapsed_ms = 0;
 
     if (xid == PING_XID)
     {
@@ -758,8 +762,8 @@ void ZooKeeper::receiveEvent()
             CurrentMetrics::sub(CurrentMetrics::ZooKeeperRequest);
         }
 
-        auto elapsed_microseconds = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
-        ProfileEvents::increment(ProfileEvents::ZooKeeperWaitMicroseconds, elapsed_microseconds);
+        elapsed_ms = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
+        ProfileEvents::increment(ProfileEvents::ZooKeeperWaitMicroseconds, elapsed_ms);
     }
 
     try
@@ -809,7 +813,7 @@ void ZooKeeper::receiveEvent()
         if (length != actual_length)
             throw Exception("Response length doesn't match. Expected: " + DB::toString(length) + ", actual: " + DB::toString(actual_length), Error::ZMARSHALLINGERROR);
 
-        logOperationIfNeeded(request_info.request, response);   //-V614
+        logOperationIfNeeded(request_info.request, response, /* finalize= */ false, elapsed_ms);   //-V614
     }
     catch (...)
     {
@@ -828,7 +832,7 @@ void ZooKeeper::receiveEvent()
             if (request_info.callback)
                 request_info.callback(*response);
 
-            logOperationIfNeeded(request_info.request, response);
+            logOperationIfNeeded(request_info.request, response, /* finalize= */ false, elapsed_ms);
         }
         catch (...)
         {
@@ -916,13 +920,14 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
                     ? Error::ZCONNECTIONLOSS
                     : Error::ZSESSIONEXPIRED;
                 response->xid = request_info.request->xid;
+                UInt64 elapsed_ms = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
 
                 if (request_info.callback)
                 {
                     try
                     {
                         request_info.callback(*response);
-                        logOperationIfNeeded(request_info.request, response, true);
+                        logOperationIfNeeded(request_info.request, response, true, elapsed_ms);
                     }
                     catch (...)
                     {
@@ -982,7 +987,8 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
                     try
                     {
                         info.callback(*response);
-                        logOperationIfNeeded(info.request, response, true);
+                        UInt64 elapsed_ms = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - info.time).count();
+                        logOperationIfNeeded(info.request, response, true, elapsed_ms);
                     }
                     catch (...)
                     {
@@ -1057,6 +1063,44 @@ void ZooKeeper::pushRequest(RequestInfo && info)
     ProfileEvents::increment(ProfileEvents::ZooKeeperTransactions);
 }
 
+KeeperApiVersion ZooKeeper::getApiVersion()
+{
+    return keeper_api_version;
+}
+
+void ZooKeeper::initApiVersion()
+{
+    auto promise = std::make_shared<std::promise<Coordination::GetResponse>>();
+    auto future = promise->get_future();
+
+    auto callback = [promise](const Coordination::GetResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    get(keeper_api_version_path, std::move(callback), {});
+    if (future.wait_for(std::chrono::milliseconds(operation_timeout.totalMilliseconds())) != std::future_status::ready)
+    {
+        LOG_TRACE(log, "Failed to get API version: timeout");
+        return;
+    }
+
+    auto response = future.get();
+
+    if (response.error != Coordination::Error::ZOK)
+    {
+        LOG_TRACE(log, "Failed to get API version");
+        return;
+    }
+
+    uint8_t keeper_version{0};
+    DB::ReadBufferFromOwnString buf(response.data);
+    DB::readIntText(keeper_version, buf);
+    keeper_api_version = static_cast<DB::KeeperApiVersion>(keeper_version);
+    LOG_TRACE(log, "Detected server's API version: {}", keeper_api_version);
+}
+
+
 void ZooKeeper::executeGenericRequest(
     const ZooKeeperRequestPtr & request,
     ResponseCallback callback)
@@ -1172,14 +1216,27 @@ void ZooKeeper::list(
     ListCallback callback,
     WatchCallback watch)
 {
-    ZooKeeperFilteredListRequest request;
-    request.path = path;
-    request.list_request_type = list_request_type;
+    std::shared_ptr<ZooKeeperListRequest> request{nullptr};
+    if (keeper_api_version < Coordination::KeeperApiVersion::WITH_FILTERED_LIST)
+    {
+        if (list_request_type != ListRequestType::ALL)
+            throw Exception("Filtered list request type cannot be used because it's not supported by the server", Error::ZBADARGUMENTS);
+
+        request = std::make_shared<ZooKeeperListRequest>();
+    }
+    else
+    {
+        auto filtered_list_request = std::make_shared<ZooKeeperFilteredListRequest>();
+        filtered_list_request->list_request_type = list_request_type;
+        request = std::move(filtered_list_request);
+    }
+
+    request->path = path;
 
     RequestInfo request_info;
-    request_info.request = std::make_shared<ZooKeeperListRequest>(std::move(request));
     request_info.callback = [callback](const Response & response) { callback(dynamic_cast<const ListResponse &>(response)); };
     request_info.watch = watch;
+    request_info.request = std::move(request);
 
     pushRequest(std::move(request_info));
     ProfileEvents::increment(ProfileEvents::ZooKeeperList);
@@ -1256,7 +1313,7 @@ void ZooKeeper::setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_)
 }
 
 #ifdef ZOOKEEPER_LOG
-void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response, bool finalize)
+void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response, bool finalize, UInt64 elapsed_ms)
 {
     auto maybe_zk_log = std::atomic_load(&zk_log);
     if (!maybe_zk_log)
@@ -1294,6 +1351,7 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const
         elem.event_time = event_time;
         elem.address = socket_address;
         elem.session_id = session_id;
+        elem.duration_ms = elapsed_ms;
         if (request)
         {
             elem.thread_id = request->thread_id;
@@ -1303,7 +1361,7 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const
     }
 }
 #else
-void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr &, const ZooKeeperResponsePtr &, bool)
+void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr &, const ZooKeeperResponsePtr &, bool, UInt64)
 {}
 #endif
 
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index aa27b0eefe9..e00250c1517 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -7,6 +7,7 @@
 #include <Common/ThreadPool.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Coordination/KeeperConstants.h>
 
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
@@ -181,6 +182,8 @@ public:
         const Requests & requests,
         MultiCallback callback) override;
 
+    DB::KeeperApiVersion getApiVersion() override;
+
     /// Without forcefully invalidating (finalizing) ZooKeeper session before
     /// establishing a new one, there was a possibility that server is using
     /// two ZooKeeper sessions simultaneously in different parts of code.
@@ -273,10 +276,14 @@ private:
     template <typename T>
     void read(T &);
 
-    void logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response = nullptr, bool finalize = false);
+    void logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response = nullptr, bool finalize = false, UInt64 elapsed_ms = 0);
+
+    void initApiVersion();
 
     CurrentMetrics::Increment active_session_metric_increment{CurrentMetrics::ZooKeeperSession};
     std::shared_ptr<ZooKeeperLog> zk_log;
+
+    DB::KeeperApiVersion keeper_api_version{DB::KeeperApiVersion::ZOOKEEPER_COMPATIBLE};
 };
 
 }
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index d8d308c59bd..27db791b954 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -18,7 +18,6 @@
 
 #cmakedefine01 USE_DATASKETCHES
 #cmakedefine01 USE_YAML_CPP
-#cmakedefine01 CLICKHOUSE_SPLIT_BINARY
 #cmakedefine01 USE_BZIP2
 #cmakedefine01 USE_MINIZIP
 #cmakedefine01 USE_SNAPPY
diff --git a/src/Common/examples/average.cpp b/src/Common/examples/average.cpp
index 5a42d8c5020..d2802717fc8 100644
--- a/src/Common/examples/average.cpp
+++ b/src/Common/examples/average.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string>
+#include <bit>
 
 #include <fmt/format.h>
 
@@ -561,7 +562,7 @@ int main(int argc, char ** argv)
     /// Fill source data
     for (size_t i = 0; i < size; ++i)
     {
-        keys[i] = __builtin_ctz(i + 1); /// Make keys to have just slightly more realistic distribution.
+        keys[i] = std::countr_zero(i + 1); /// Make keys to have just slightly more realistic distribution.
         values[i] = 1234.5; /// The distribution of values does not affect execution speed.
     }
 
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index 1e8e53bf1ea..610608cd312 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -351,4 +351,24 @@ void setModificationTime(const std::string & path, time_t time)
     if (utime(path.c_str(), &tb) != 0)
         DB::throwFromErrnoWithPath("Cannot set modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
 }
+
+bool isSymlink(const fs::path & path)
+{
+    /// Remove trailing slash before checking if file is symlink.
+    /// Let /path/to/link is a symlink to /path/to/target/dir/ directory.
+    /// In this case is_symlink("/path/to/link") is true,
+    /// but is_symlink("/path/to/link/") is false (it's a directory)
+    if (path.filename().empty())
+        return fs::is_symlink(path.parent_path());      /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+    return fs::is_symlink(path);        /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+}
+
+fs::path readSymlink(const fs::path & path)
+{
+    /// See the comment for isSymlink
+    if (path.filename().empty())
+        return fs::read_symlink(path.parent_path());        /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+    return fs::read_symlink(path);      /// STYLE_CHECK_ALLOW_STD_FS_SYMLINK
+}
+
 }
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index 2be3ea748fa..f96fe269eab 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -9,6 +9,7 @@
 #include <sys/statvfs.h>
 #include <Poco/TemporaryFile.h>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -89,4 +90,8 @@ Poco::Timestamp getModificationTimestamp(const std::string & path);
 void setModificationTime(const std::string & path, time_t time);
 /// st_ctime
 time_t getChangeTime(const std::string & path);
+
+bool isSymlink(const fs::path & path);
+fs::path readSymlink(const fs::path & path);
+
 }
diff --git a/src/Common/memcmpSmall.h b/src/Common/memcmpSmall.h
index 7b977a4a23c..e95a21b836d 100644
--- a/src/Common/memcmpSmall.h
+++ b/src/Common/memcmpSmall.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <algorithm>
+#include <bit>
 #include <cstdint>
 
 #include <Core/Defines.h>
@@ -50,7 +51,7 @@ inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= min_size)
                 break;
@@ -82,7 +83,7 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= min_size)
                 break;
@@ -123,7 +124,7 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= max_size)
                 return 0;
@@ -150,7 +151,7 @@ inline int memcmpSmallAllowOverflow15(const Char * a, const Char * b, size_t siz
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= size)
                 return 0;
@@ -180,7 +181,7 @@ inline bool memequalSmallAllowOverflow15(const Char * a, size_t a_size, const Ch
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
             return offset >= a_size;
         }
     }
@@ -203,7 +204,7 @@ inline int memcmpSmallMultipleOf16(const Char * a, const Char * b, size_t size)
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
             return detail::cmp(a[offset], b[offset]);
         }
     }
@@ -222,7 +223,7 @@ inline int memcmp16(const Char * a, const Char * b)
 
     if (mask)
     {
-        auto offset = __builtin_ctz(mask);
+        auto offset = std::countr_zero(mask);
         return detail::cmp(a[offset], b[offset]);
     }
 
@@ -252,7 +253,7 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
             return offset >= size;
         }
     }
@@ -285,7 +286,7 @@ inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= min_size)
                 break;
@@ -317,7 +318,7 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= min_size)
                 break;
@@ -359,7 +360,7 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= max_size)
                 return 0;
@@ -386,7 +387,7 @@ inline int memcmpSmallAllowOverflow15(const Char * a, const Char * b, size_t siz
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
 
             if (offset >= size)
                 return 0;
@@ -416,7 +417,7 @@ inline bool memequalSmallAllowOverflow15(const Char * a, size_t a_size, const Ch
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
             return offset >= a_size;
         }
     }
@@ -439,7 +440,7 @@ inline int memcmpSmallMultipleOf16(const Char * a, const Char * b, size_t size)
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
             return detail::cmp(a[offset], b[offset]);
         }
     }
@@ -459,7 +460,7 @@ inline int memcmp16(const Char * a, const Char * b)
 
     if (mask)
     {
-        auto offset = __builtin_ctz(mask);
+        auto offset = std::countr_zero(mask);
         return detail::cmp(a[offset], b[offset]);
     }
 
@@ -490,7 +491,7 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 
         if (mask)
         {
-            offset += __builtin_ctz(mask);
+            offset += std::countr_zero(mask);
             return offset >= size;
         }
     }
@@ -523,7 +524,7 @@ inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
 
             if (offset >= min_size)
                 break;
@@ -548,7 +549,7 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
 
             if (offset >= min_size)
                 break;
@@ -589,7 +590,7 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
 
             if (offset >= max_size)
                 return 0;
@@ -611,7 +612,7 @@ inline int memcmpSmallAllowOverflow15(const Char * a, const Char * b, size_t siz
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
 
             if (offset >= size)
                 return 0;
@@ -637,7 +638,7 @@ inline bool memequalSmallAllowOverflow15(const Char * a, size_t a_size, const Ch
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
             return offset >= a_size;
         }
     }
@@ -656,7 +657,7 @@ inline int memcmpSmallMultipleOf16(const Char * a, const Char * b, size_t size)
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
             return detail::cmp(a[offset], b[offset]);
         }
     }
@@ -672,7 +673,7 @@ inline int memcmp16(const Char * a, const Char * b)
     mask = ~mask;
     if (mask)
     {
-        auto offset = __builtin_ctzll(mask) >> 2;
+        auto offset = std::countr_zero(mask) >> 2;
         return detail::cmp(a[offset], b[offset]);
     }
     return 0;
@@ -694,7 +695,7 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 
         if (mask)
         {
-            offset += __builtin_ctzll(mask) >> 2;
+            offset += std::countr_zero(mask) >> 2;
             return offset >= size;
         }
     }
diff --git a/src/Common/register_objects.cpp b/src/Common/register_objects.cpp
new file mode 100644
index 00000000000..93b0feb5f8d
--- /dev/null
+++ b/src/Common/register_objects.cpp
@@ -0,0 +1,12 @@
+#include <Common/register_objects.h>
+
+namespace DB
+{
+
+FunctionRegisterMap & FunctionRegisterMap::instance()
+{
+    static FunctionRegisterMap map;
+    return map;
+}
+
+}
diff --git a/src/Common/register_objects.h b/src/Common/register_objects.h
new file mode 100644
index 00000000000..0a08fdf43a4
--- /dev/null
+++ b/src/Common/register_objects.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <string_view>
+#include <unordered_map>
+
+namespace DB
+{
+
+class FunctionFactory;
+
+using FunctionRegisterFunctionPtr = void (*)(::DB::FunctionFactory &);
+
+struct FunctionRegisterMap : public std::unordered_map<std::string_view, FunctionRegisterFunctionPtr>
+{
+    static FunctionRegisterMap & instance();
+};
+
+struct FunctionRegister
+{
+    FunctionRegister(std::string_view name, FunctionRegisterFunctionPtr func_ptr)
+    {
+        FunctionRegisterMap::instance().emplace(std::move(name), func_ptr);
+    }
+};
+
+}
+
+#define REGISTER_FUNCTION_IMPL(fn, func_name, register_name) \
+    void func_name(::DB::FunctionFactory & factory); \
+    static ::DB::FunctionRegister register_name(#fn, func_name); \
+    void func_name(::DB::FunctionFactory & factory)
+
+#define REGISTER_FUNCTION(fn) REGISTER_FUNCTION_IMPL(fn, registerFunction##fn, REGISTER_FUNCTION_##fn)
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
index d522448d337..49013625ed3 100644
--- a/src/Common/tests/gtest_DateLUTImpl.cpp
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -79,12 +79,13 @@ FailuresCount countFailures(const ::testing::TestResult & test_result)
 TEST(DateLUTTest, makeDayNumTest)
 {
     const DateLUTImpl & lut = DateLUT::instance("UTC");
-    EXPECT_EQ(0, lut.makeDayNum(1924, 12, 31));
-    EXPECT_EQ(-1, lut.makeDayNum(1924, 12, 31, -1));
+    EXPECT_EQ(0, lut.makeDayNum(1899, 12, 31));
+    EXPECT_EQ(-1, lut.makeDayNum(1899, 12, 31, -1));
+    EXPECT_EQ(-25567, lut.makeDayNum(1900, 1, 1));
     EXPECT_EQ(-16436, lut.makeDayNum(1925, 1, 1));
     EXPECT_EQ(0, lut.makeDayNum(1970, 1, 1));
-    EXPECT_EQ(114635, lut.makeDayNum(2283, 11, 11));
-    EXPECT_EQ(114635, lut.makeDayNum(2500, 12, 25));
+    EXPECT_EQ(120529, lut.makeDayNum(2300, 12, 31));
+    EXPECT_EQ(120529, lut.makeDayNum(2500, 12, 25));
 }
 
 
diff --git a/src/Common/tests/gtest_concurrency_control.cpp b/src/Common/tests/gtest_concurrency_control.cpp
new file mode 100644
index 00000000000..2ffb16511f3
--- /dev/null
+++ b/src/Common/tests/gtest_concurrency_control.cpp
@@ -0,0 +1,289 @@
+#include <gtest/gtest.h>
+
+#include <vector>
+#include <thread>
+#include <pcg_random.hpp>
+
+#include <base/types.h>
+#include <base/sleep.h>
+#include <Common/ConcurrencyControl.h>
+#include <Common/randomSeed.h>
+
+struct ConcurrencyControlTest
+{
+    ConcurrencyControl cc;
+
+    explicit ConcurrencyControlTest(ConcurrencyControl::SlotCount limit = ConcurrencyControl::Unlimited)
+    {
+        cc.setMaxConcurrency(limit);
+    }
+};
+
+TEST(ConcurrencyControl, Unlimited)
+{
+    ConcurrencyControlTest t; // unlimited number of slots
+    auto slots = t.cc.allocate(0, 100500);
+    std::vector<ConcurrencyControl::SlotPtr> acquired;
+    while (auto slot = slots->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 100500);
+}
+
+TEST(ConcurrencyControl, Fifo)
+{
+    ConcurrencyControlTest t(1); // use single slot
+    std::vector<ConcurrencyControl::AllocationPtr> allocations;
+    constexpr int count = 42;
+    allocations.reserve(count);
+    for (int i = 0; i < count; i++)
+        allocations.emplace_back(t.cc.allocate(0, 1));
+    for (int i = 0; i < count; i++)
+    {
+        ConcurrencyControl::SlotPtr holder;
+        for (int j = 0; j < count; j++)
+        {
+            auto slot = allocations[j]->tryAcquire();
+            if (i == j) // check fifo order of allocations
+            {
+                ASSERT_TRUE(slot);
+                holder = std::move(slot);
+            }
+            else
+                ASSERT_TRUE(!slot);
+        }
+        holder.reset(); // release slot -- leads to the next allocation
+    }
+}
+
+TEST(ConcurrencyControl, Oversubscription)
+{
+    ConcurrencyControlTest t(10);
+    std::vector<ConcurrencyControl::AllocationPtr> allocations;
+    allocations.reserve(10);
+    for (int i = 0; i < 10; i++)
+        allocations.emplace_back(t.cc.allocate(1, 2));
+    std::vector<ConcurrencyControl::SlotPtr> slots;
+    // Normal allocation using maximum amount of slots
+    for (int i = 0; i < 5; i++)
+    {
+        auto slot1 = allocations[i]->tryAcquire();
+        ASSERT_TRUE(slot1);
+        slots.emplace_back(std::move(slot1));
+        auto slot2 = allocations[i]->tryAcquire();
+        ASSERT_TRUE(slot2);
+        slots.emplace_back(std::move(slot2));
+        ASSERT_TRUE(!allocations[i]->tryAcquire());
+    }
+    // Oversubscription: only minimum amount of slots are allocated
+    for (int i = 5; i < 10; i++)
+    {
+        auto slot1 = allocations[i]->tryAcquire();
+        ASSERT_TRUE(slot1);
+        slots.emplace_back(std::move(slot1));
+        ASSERT_TRUE(!allocations[i]->tryAcquire());
+    }
+}
+
+TEST(ConcurrencyControl, ReleaseUnacquiredSlots)
+{
+    ConcurrencyControlTest t(10);
+    {
+        std::vector<ConcurrencyControl::AllocationPtr> allocations;
+        allocations.reserve(10);
+        for (int i = 0; i < 10; i++)
+            allocations.emplace_back(t.cc.allocate(1, 2));
+        // Do not acquire - just destroy allocations with granted slots
+    }
+    // Check that slots were actually released
+    auto allocation = t.cc.allocate(0, 20);
+    std::vector<ConcurrencyControl::SlotPtr> acquired;
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 10);
+}
+
+TEST(ConcurrencyControl, DestroyNotFullyAllocatedAllocation)
+{
+    ConcurrencyControlTest t(10);
+    for (int i = 0; i < 3; i++)
+    {
+        auto allocation = t.cc.allocate(5, 20);
+        std::vector<ConcurrencyControl::SlotPtr> acquired;
+        while (auto slot = allocation->tryAcquire())
+            acquired.emplace_back(std::move(slot));
+        ASSERT_TRUE(acquired.size() == 10);
+    }
+}
+
+TEST(ConcurrencyControl, DestroyAllocationBeforeSlots)
+{
+    ConcurrencyControlTest t(10);
+    for (int i = 0; i < 3; i++)
+    {
+        std::vector<ConcurrencyControl::SlotPtr> acquired;
+        auto allocation = t.cc.allocate(5, 20);
+        while (auto slot = allocation->tryAcquire())
+            acquired.emplace_back(std::move(slot));
+        ASSERT_TRUE(acquired.size() == 10);
+        allocation.reset(); // slots are still acquired (they should actually hold allocation)
+    }
+}
+
+TEST(ConcurrencyControl, GrantReleasedToTheSameAllocation)
+{
+    ConcurrencyControlTest t(3);
+    auto allocation = t.cc.allocate(0, 10);
+    std::list<ConcurrencyControl::SlotPtr> acquired;
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 3); // 0 1 2
+    acquired.clear();
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 3); // 3 4 5
+    acquired.pop_back();
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 3); // 3 4 6
+    acquired.pop_front();
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 3); // 4 6 7
+    acquired.clear();
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 2); // 8 9
+}
+
+TEST(ConcurrencyControl, FairGranting)
+{
+    ConcurrencyControlTest t(3);
+    auto start_busy_period = t.cc.allocate(3, 3);
+    auto a1 = t.cc.allocate(0, 10);
+    auto a2 = t.cc.allocate(0, 10);
+    auto a3 = t.cc.allocate(0, 10);
+    start_busy_period.reset();
+    for (int i = 0; i < 10; i++)
+    {
+        auto s1 = a1->tryAcquire();
+        ASSERT_TRUE(s1);
+        ASSERT_TRUE(!a1->tryAcquire());
+        auto s2 = a2->tryAcquire();
+        ASSERT_TRUE(s2);
+        ASSERT_TRUE(!a2->tryAcquire());
+        auto s3 = a3->tryAcquire();
+        ASSERT_TRUE(s3);
+        ASSERT_TRUE(!a3->tryAcquire());
+    }
+}
+
+TEST(ConcurrencyControl, SetSlotCount)
+{
+    ConcurrencyControlTest t(10);
+    auto allocation = t.cc.allocate(5, 30);
+    std::vector<ConcurrencyControl::SlotPtr> acquired;
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 10);
+
+    t.cc.setMaxConcurrency(15);
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 15);
+
+    t.cc.setMaxConcurrency(5);
+    acquired.clear();
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 5);
+
+    // Check that newly added slots are equally distributed over waiting allocations
+    std::vector<ConcurrencyControl::SlotPtr> acquired2;
+    auto allocation2 = t.cc.allocate(0, 30);
+    ASSERT_TRUE(!allocation->tryAcquire());
+    t.cc.setMaxConcurrency(15); // 10 slots added: 5 to the first allocation and 5 to the second one
+    while (auto slot = allocation->tryAcquire())
+        acquired.emplace_back(std::move(slot));
+    while (auto slot = allocation2->tryAcquire())
+        acquired2.emplace_back(std::move(slot));
+    ASSERT_TRUE(acquired.size() == 10);
+    ASSERT_TRUE(acquired2.size() == 5);
+}
+
+TEST(ConcurrencyControl, MultipleThreads)
+{
+    constexpr int cfg_total_queries = 1000; // total amount of queries to run
+    constexpr int cfg_work_us = 49; // max microseconds per single work
+    constexpr int cfg_concurrent_queries = 8; // do not run more than specified number of concurrent queries
+    constexpr int cfg_max_threads = 4; // max amount of threads a query is allowed to have
+    constexpr int cfg_max_concurrency = 16; // concurrency control limit (must be >3)
+
+    ConcurrencyControlTest t(cfg_max_concurrency);
+
+    auto run_query = [&] (size_t max_threads)
+    {
+        ConcurrencyControl::AllocationPtr slots = t.cc.allocate(1, max_threads);
+        std::mutex threads_mutex;
+        std::vector<std::thread> threads;
+        threads.reserve(max_threads);
+
+        std::function<void()> spawn_threads = [&] ()
+        {
+            while (auto slot = slots->tryAcquire())
+            {
+                std::unique_lock lock{threads_mutex};
+                threads.emplace_back([&, slot = std::move(slot)]
+                {
+                    pcg64 rng(randomSeed());
+                    std::uniform_int_distribution<size_t> distribution(1, cfg_work_us);
+                    size_t steps = distribution(rng);
+                    for (size_t step = 0; step < steps; step++)
+                    {
+                        sleepForMicroseconds(distribution(rng)); // emulate work
+                        spawn_threads(); // upscale
+                    }
+                });
+            }
+        };
+
+        spawn_threads();
+
+        // graceful shutdown of a query
+        for (size_t thread_num = 0; ; thread_num++)
+        {
+            std::unique_lock lock{threads_mutex};
+            if (thread_num >= threads.size())
+                break;
+            if (threads[thread_num].joinable())
+            {
+                auto & thread = threads[thread_num];
+                lock.unlock(); // to avoid deadlock if thread we are going to join starts spawning threads
+                thread.join();
+            }
+        }
+        // NOTE: No races: all concurrent spawn_threads() calls are done from `threads`, but they're already joined.
+    };
+
+    pcg64 rng(randomSeed());
+    std::uniform_int_distribution<size_t> max_threads_distribution(1, cfg_max_threads);
+    std::vector<std::thread> queries;
+    std::atomic<int> started = 0; // queries started in total
+    std::atomic<int> finished = 0; // queries finished in total
+    while (started < cfg_total_queries)
+    {
+        while (started < finished + cfg_concurrent_queries)
+        {
+            queries.emplace_back([&, max_threads = max_threads_distribution(rng)]
+            {
+                run_query(max_threads);
+                finished++;
+            });
+            started++;
+        }
+        sleepForMicroseconds(5); // wait some queries to finish
+        t.cc.setMaxConcurrency(cfg_max_concurrency - started % 3); // emulate configuration updates
+    }
+
+    for (auto & query : queries)
+        query.join();
+}
diff --git a/src/Common/tests/gtest_lru_cache.cpp b/src/Common/tests/gtest_lru_cache.cpp
index 7694a76ea72..f74d1eb9464 100644
--- a/src/Common/tests/gtest_lru_cache.cpp
+++ b/src/Common/tests/gtest_lru_cache.cpp
@@ -1,12 +1,12 @@
 #include <iomanip>
 #include <iostream>
 #include <gtest/gtest.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 
 TEST(LRUCache, set)
 {
-    using SimpleLRUCache = DB::LRUCache<int, int>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(2, std::make_shared<int>(3));
 
@@ -18,8 +18,8 @@ TEST(LRUCache, set)
 
 TEST(LRUCache, update)
 {
-    using SimpleLRUCache = DB::LRUCache<int, int>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(1, std::make_shared<int>(3));
     auto val = lru_cache.get(1);
@@ -29,11 +29,11 @@ TEST(LRUCache, update)
 
 TEST(LRUCache, get)
 {
-    using SimpleLRUCache = DB::LRUCache<int, int>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<int>(2));
     lru_cache.set(2, std::make_shared<int>(3));
-    SimpleLRUCache::MappedPtr value = lru_cache.get(1);
+    SimpleCacheBase::MappedPtr value = lru_cache.get(1);
     ASSERT_TRUE(value != nullptr);
     ASSERT_EQ(*value, 2);
 
@@ -49,8 +49,8 @@ struct ValueWeight
 
 TEST(LRUCache, evictOnSize)
 {
-    using SimpleLRUCache = DB::LRUCache<int, size_t>;
-    auto lru_cache = SimpleLRUCache(20, 3);
+    using SimpleCacheBase = DB::CacheBase<int, size_t>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 20, /*max_elements_size*/ 3, "LRU");
     lru_cache.set(1, std::make_shared<size_t>(2));
     lru_cache.set(2, std::make_shared<size_t>(3));
     lru_cache.set(3, std::make_shared<size_t>(4));
@@ -65,8 +65,8 @@ TEST(LRUCache, evictOnSize)
 
 TEST(LRUCache, evictOnWeight)
 {
-    using SimpleLRUCache = DB::LRUCache<int, size_t, std::hash<int>, ValueWeight>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     lru_cache.set(1, std::make_shared<size_t>(2));
     lru_cache.set(2, std::make_shared<size_t>(3));
     lru_cache.set(3, std::make_shared<size_t>(4));
@@ -86,8 +86,8 @@ TEST(LRUCache, evictOnWeight)
 
 TEST(LRUCache, getOrSet)
 {
-    using SimpleLRUCache = DB::LRUCache<int, size_t, std::hash<int>, ValueWeight>;
-    auto lru_cache = SimpleLRUCache(10, 10);
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto lru_cache = SimpleCacheBase(/*max_size*/ 10, /*max_elements_size*/ 10, "LRU");
     size_t x = 10;
     auto load_func = [&] { return std::make_shared<size_t>(x); };
     auto [value, loaded] = lru_cache.getOrSet(1, load_func);
diff --git a/src/Common/tests/gtest_lru_file_cache.cpp b/src/Common/tests/gtest_lru_file_cache.cpp
index 2f268e217df..bb454cc41eb 100644
--- a/src/Common/tests/gtest_lru_file_cache.cpp
+++ b/src/Common/tests/gtest_lru_file_cache.cpp
@@ -1,7 +1,7 @@
 #include <iomanip>
 #include <iostream>
 #include <gtest/gtest.h>
-#include <Common/LRUFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileSegment.h>
 #include <Common/CurrentThread.h>
 #include <Common/filesystemHelpers.h>
@@ -47,7 +47,7 @@ std::vector<DB::FileSegmentPtr> fromHolder(const DB::FileSegmentsHolder & holder
     return std::vector<DB::FileSegmentPtr>(holder.file_segments.begin(), holder.file_segments.end());
 }
 
-String getFileSegmentPath(const String & base_path, const DB::IFileCache::Key & key, size_t offset)
+String getFileSegmentPath(const String & base_path, const DB::FileCache::Key & key, size_t offset)
 {
     auto key_str = key.toString();
     return fs::path(base_path) / key_str.substr(0, 3) / key_str / DB::toString(offset);
@@ -80,12 +80,12 @@ void complete(const DB::FileSegmentsHolder & holder)
     {
         ASSERT_TRUE(file_segment->getOrSetDownloader() == DB::FileSegment::getCallerId());
         prepareAndDownload(file_segment);
-        file_segment->complete(DB::FileSegment::State::DOWNLOADED);
+        file_segment->completeWithState(DB::FileSegment::State::DOWNLOADED);
     }
 }
 
 
-TEST(LRUFileCache, get)
+TEST(FileCache, get)
 {
     if (fs::exists(cache_base_path))
         fs::remove_all(cache_base_path);
@@ -103,7 +103,7 @@ TEST(LRUFileCache, get)
     DB::FileCacheSettings settings;
     settings.max_size = 30;
     settings.max_elements = 5;
-    auto cache = DB::LRUFileCache(cache_base_path, settings);
+    auto cache = DB::FileCache(cache_base_path, settings);
     cache.initialize();
     auto key = cache.hash("key1");
 
@@ -125,7 +125,7 @@ TEST(LRUFileCache, get)
         assertRange(2, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADING);
 
         download(segments[0]);
-        segments[0]->complete(DB::FileSegment::State::DOWNLOADED);
+        segments[0]->completeWithState(DB::FileSegment::State::DOWNLOADED);
         assertRange(3, segments[0], DB::FileSegment::Range(0, 9), DB::FileSegment::State::DOWNLOADED);
     }
 
@@ -146,7 +146,7 @@ TEST(LRUFileCache, get)
 
         ASSERT_TRUE(segments[1]->getOrSetDownloader() == DB::FileSegment::getCallerId());
         prepareAndDownload(segments[1]);
-        segments[1]->complete(DB::FileSegment::State::DOWNLOADED);
+        segments[1]->completeWithState(DB::FileSegment::State::DOWNLOADED);
         assertRange(6, segments[1], DB::FileSegment::Range(10, 14), DB::FileSegment::State::DOWNLOADED);
     }
 
@@ -203,7 +203,7 @@ TEST(LRUFileCache, get)
         ASSERT_TRUE(segments[2]->getOrSetDownloader() == DB::FileSegment::getCallerId());
         prepareAndDownload(segments[2]);
 
-        segments[2]->complete(DB::FileSegment::State::DOWNLOADED);
+        segments[2]->completeWithState(DB::FileSegment::State::DOWNLOADED);
 
         assertRange(14, segments[3], DB::FileSegment::Range(17, 20), DB::FileSegment::State::DOWNLOADED);
 
@@ -244,7 +244,7 @@ TEST(LRUFileCache, get)
         ASSERT_TRUE(segments[3]->getOrSetDownloader() == DB::FileSegment::getCallerId());
         prepareAndDownload(segments[3]);
 
-        segments[3]->complete(DB::FileSegment::State::DOWNLOADED);
+        segments[3]->completeWithState(DB::FileSegment::State::DOWNLOADED);
         ASSERT_TRUE(segments[3]->state() == DB::FileSegment::State::DOWNLOADED);
     }
 
@@ -267,8 +267,8 @@ TEST(LRUFileCache, get)
         ASSERT_TRUE(segments[2]->getOrSetDownloader() == DB::FileSegment::getCallerId());
         prepareAndDownload(segments[0]);
         prepareAndDownload(segments[2]);
-        segments[0]->complete(DB::FileSegment::State::DOWNLOADED);
-        segments[2]->complete(DB::FileSegment::State::DOWNLOADED);
+        segments[0]->completeWithState(DB::FileSegment::State::DOWNLOADED);
+        segments[2]->completeWithState(DB::FileSegment::State::DOWNLOADED);
     }
 
     /// Current cache:    [____][_]  [][___][__]
@@ -290,8 +290,8 @@ TEST(LRUFileCache, get)
         ASSERT_TRUE(s1[0]->getOrSetDownloader() == DB::FileSegment::getCallerId());
         prepareAndDownload(s5[0]);
         prepareAndDownload(s1[0]);
-        s5[0]->complete(DB::FileSegment::State::DOWNLOADED);
-        s1[0]->complete(DB::FileSegment::State::DOWNLOADED);
+        s5[0]->completeWithState(DB::FileSegment::State::DOWNLOADED);
+        s1[0]->completeWithState(DB::FileSegment::State::DOWNLOADED);
 
         /// Current cache:    [___]       [_][___][_]   [__]
         ///                   ^   ^       ^  ^   ^  ^   ^  ^
@@ -393,7 +393,7 @@ TEST(LRUFileCache, get)
         }
 
         prepareAndDownload(segments[2]);
-        segments[2]->complete(DB::FileSegment::State::DOWNLOADED);
+        segments[2]->completeWithState(DB::FileSegment::State::DOWNLOADED);
         ASSERT_TRUE(segments[2]->state() == DB::FileSegment::State::DOWNLOADED);
 
         other_1.join();
@@ -458,7 +458,7 @@ TEST(LRUFileCache, get)
 
             ASSERT_TRUE(segments_2[1]->getOrSetDownloader() == DB::FileSegment::getCallerId());
             prepareAndDownload(segments_2[1]);
-            segments_2[1]->complete(DB::FileSegment::State::DOWNLOADED);
+            segments_2[1]->completeWithState(DB::FileSegment::State::DOWNLOADED);
         });
 
         {
@@ -479,7 +479,7 @@ TEST(LRUFileCache, get)
     {
         /// Test LRUCache::restore().
 
-        auto cache2 = DB::LRUFileCache(cache_base_path, settings);
+        auto cache2 = DB::FileCache(cache_base_path, settings);
         cache2.initialize();
 
         auto holder1 = cache2.getOrSet(key, 2, 28, false); /// Get [2, 29]
@@ -499,7 +499,7 @@ TEST(LRUFileCache, get)
 
         auto settings2 = settings;
         settings2.max_file_segment_size = 10;
-        auto cache2 = DB::LRUFileCache(caches_dir / "cache2", settings2);
+        auto cache2 = DB::FileCache(caches_dir / "cache2", settings2);
         cache2.initialize();
 
         auto holder1 = cache2.getOrSet(key, 0, 25, false); /// Get [0, 24]
diff --git a/src/Common/tests/gtest_pod_array.cpp b/src/Common/tests/gtest_pod_array.cpp
index b5ec45c3e5d..82a6f7589b8 100644
--- a/src/Common/tests/gtest_pod_array.cpp
+++ b/src/Common/tests/gtest_pod_array.cpp
@@ -484,6 +484,35 @@ TEST(Common, PODArrayInsertFromItself)
     }
 }
 
+TEST(Common, PODArrayAssign)
+{
+    {
+        PaddedPODArray<UInt64> array;
+        array.push_back(1);
+        array.push_back(2);
+
+        array.assign({1, 2, 3});
+
+        ASSERT_EQ(array.size(), 3);
+        ASSERT_EQ(array, PaddedPODArray<UInt64>({1, 2, 3}));
+    }
+    {
+        PaddedPODArray<UInt64> array;
+        array.push_back(1);
+        array.push_back(2);
+
+        array.assign({});
+
+        ASSERT_TRUE(array.empty());
+    }
+    {
+        PaddedPODArray<UInt64> array;
+        array.assign({});
+
+        ASSERT_TRUE(array.empty());
+    }
+}
+
 TEST(Common, PODNoOverallocation)
 {
     /// Check that PaddedPODArray allocates for smaller number of elements than the power of two due to padding.
diff --git a/src/Common/tests/gtest_slru_cahce.cpp b/src/Common/tests/gtest_slru_cahce.cpp
new file mode 100644
index 00000000000..66df0dbec77
--- /dev/null
+++ b/src/Common/tests/gtest_slru_cahce.cpp
@@ -0,0 +1,210 @@
+#include <iomanip>
+#include <iostream>
+#include <gtest/gtest.h>
+#include <Common/CacheBase.h>
+
+TEST(SLRUCache, set)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    auto w = slru_cache.weight();
+    auto n = slru_cache.count();
+    ASSERT_EQ(w, 2);
+    ASSERT_EQ(n, 2);
+}
+
+TEST(SLRUCache, update)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(1, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_TRUE(*value == 3);
+}
+
+TEST(SLRUCache, get)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 2);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 3);
+}
+
+TEST(SLRUCache, remove)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 2);
+
+    slru_cache.remove(2);
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, removeFromProtected)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/2, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(1, std::make_shared<int>(3));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 3);
+
+    slru_cache.remove(1);
+    value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+
+    slru_cache.set(1, std::make_shared<int>(4));
+    slru_cache.set(1, std::make_shared<int>(5));
+
+    slru_cache.set(2, std::make_shared<int>(6));
+    slru_cache.set(3, std::make_shared<int>(7));
+
+    value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 5);
+
+    value = slru_cache.get(3);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 7);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, reset)
+{
+    using SimpleCacheBase = DB::CacheBase<int, int>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<int>(2));
+    slru_cache.set(2, std::make_shared<int>(3));
+
+    slru_cache.set(2, std::make_shared<int>(4)); /// add to protected_queue
+
+    slru_cache.reset();
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+struct ValueWeight
+{
+    size_t operator()(const size_t & x) const { return x; }
+};
+
+TEST(SLRUCache, evictOnElements)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/1, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(2, std::make_shared<size_t>(3));
+
+    auto n = slru_cache.count();
+    ASSERT_EQ(n, 1);
+
+    auto w = slru_cache.weight();
+    ASSERT_EQ(w, 3);
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_TRUE(*value == 3);
+}
+
+
+TEST(SLRUCache, evictOnWeight)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(2, std::make_shared<size_t>(3));
+    slru_cache.set(3, std::make_shared<size_t>(4));
+    slru_cache.set(4, std::make_shared<size_t>(5));
+
+    auto n = slru_cache.count();
+    ASSERT_EQ(n, 2);
+
+    auto w = slru_cache.weight();
+    ASSERT_EQ(w, 9);
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, evictFromProtectedPart)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(1, std::make_shared<size_t>(2));
+
+    slru_cache.set(2, std::make_shared<size_t>(5));
+    slru_cache.set(2, std::make_shared<size_t>(5));
+
+    slru_cache.set(3, std::make_shared<size_t>(5));
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value == nullptr);
+}
+
+TEST(SLRUCache, evictStreamProtected)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    slru_cache.set(1, std::make_shared<size_t>(2));
+    slru_cache.set(1, std::make_shared<size_t>(2));
+
+    slru_cache.set(2, std::make_shared<size_t>(3));
+    slru_cache.set(2, std::make_shared<size_t>(3));
+
+    for (int key = 3; key < 10; ++key)
+    {
+        slru_cache.set(key, std::make_shared<size_t>(1 + key % 5));
+    }
+
+    auto value = slru_cache.get(1);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 2);
+
+    value = slru_cache.get(2);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_EQ(*value, 3);
+}
+
+TEST(SLRUCache, getOrSet)
+{
+    using SimpleCacheBase = DB::CacheBase<int, size_t, std::hash<int>, ValueWeight>;
+    auto slru_cache = SimpleCacheBase(/*max_size=*/10, /*max_elements_size=*/0, "SLRU", /*size_ratio*/0.5);
+    size_t x = 5;
+    auto load_func = [&] { return std::make_shared<size_t>(x); };
+    auto [value, loaded] = slru_cache.getOrSet(1, load_func);
+    ASSERT_TRUE(value != nullptr);
+    ASSERT_TRUE(*value == 5);
+}
diff --git a/src/Common/tests/gtest_wide_integer.cpp b/src/Common/tests/gtest_wide_integer.cpp
index 4021ae0ea91..fa614e9390a 100644
--- a/src/Common/tests/gtest_wide_integer.cpp
+++ b/src/Common/tests/gtest_wide_integer.cpp
@@ -61,8 +61,11 @@ GTEST_TEST(WideInteger, Conversions)
     ASSERT_EQ(zero, minus_one);
 
     zero += minus_one;
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    ASSERT_EQ(0, memcmp(&zero, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(zero)));
+#else
     ASSERT_EQ(0, memcmp(&zero, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(zero)));
-
+#endif
     zero += 2;
     ASSERT_EQ(zero, 0);
 
@@ -156,8 +159,11 @@ GTEST_TEST(WideInteger, Arithmetic)
     ASSERT_EQ(zero, minus_one);
 
     zero += minus_one;
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    ASSERT_EQ(0, memcmp(&zero, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(zero)));
+#else
     ASSERT_EQ(0, memcmp(&zero, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(zero)));
-
+#endif
     zero += 2;
     ASSERT_EQ(zero, 0);
 
@@ -236,8 +242,12 @@ GTEST_TEST(WideInteger, Shift)
     Int128 x = 1;
 
     auto y = x << 64;
-    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00", sizeof(Int128)));
 
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", sizeof(Int128)));
+#else
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00", sizeof(Int128)));
+#endif
     auto z = y << 11;
     ASSERT_EQ(toString(z), "37778931862957161709568");
 
@@ -250,8 +260,11 @@ GTEST_TEST(WideInteger, Shift)
     x = -1;
     y = x << 16;
 
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    ASSERT_EQ(0, memcmp(&y, "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+#else
     ASSERT_EQ(0, memcmp(&y, "\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
-
+#endif
     y >>= 16;
     ASSERT_EQ(0, memcmp(&y, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
 
@@ -259,10 +272,18 @@ GTEST_TEST(WideInteger, Shift)
     ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
 
     y >>= 32;
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    ASSERT_EQ(0, memcmp(&y, "\xFF\xFF\xFF\xFF\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+#else
     ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+#endif
 
     y <<= 64;
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\x00\x00\x00\x00", sizeof(Int128)));
+#else
     ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF", sizeof(Int128)));
+#endif
 }
 
 
diff --git a/src/Common/waitForPid.cpp b/src/Common/waitForPid.cpp
index fc0df5d7211..dd431e15062 100644
--- a/src/Common/waitForPid.cpp
+++ b/src/Common/waitForPid.cpp
@@ -17,6 +17,17 @@
     eintr_wrapper_result; \
 })
 
+namespace DB
+{
+
+enum PollPidResult
+{
+    RESTART,
+    FAILED
+};
+
+}
+
 #if defined(OS_LINUX)
 
 #include <poll.h>
@@ -43,16 +54,9 @@ namespace DB
 
 static int syscall_pidfd_open(pid_t pid)
 {
-    // pidfd_open cannot be interrupted, no EINTR handling
     return syscall(SYS_pidfd_open, pid, 0);
 }
 
-static int dir_pidfd_open(pid_t pid)
-{
-    std::string path = "/proc/" + std::to_string(pid);
-    return HANDLE_EINTR(open(path.c_str(), O_DIRECTORY));
-}
-
 static bool supportsPidFdOpen()
 {
     VersionNumber pidfd_open_minimal_version(5, 3, 0);
@@ -60,36 +64,52 @@ static bool supportsPidFdOpen()
     return linux_version >= pidfd_open_minimal_version;
 }
 
-static int pidFdOpen(pid_t pid)
+static PollPidResult pollPid(pid_t pid, int timeout_in_ms)
 {
-    // use pidfd_open or just plain old /proc/[pid] open for Linux
+    int pid_fd = 0;
+
     if (supportsPidFdOpen())
     {
-        return syscall_pidfd_open(pid);
+        // pidfd_open cannot be interrupted, no EINTR handling
+
+        pid_fd = syscall_pidfd_open(pid);
+
+        if (pid_fd < 0)
+        {
+            if (errno == ESRCH)
+                return PollPidResult::RESTART;
+
+            return PollPidResult::FAILED;
+        }
     }
     else
     {
-        return dir_pidfd_open(pid);
-    }
-}
+        std::string path = "/proc/" + std::to_string(pid);
+        pid_fd = HANDLE_EINTR(open(path.c_str(), O_DIRECTORY));
+
+        if (pid_fd < 0)
+        {
+            if (errno == ENOENT)
+                return PollPidResult::RESTART;
+
+            return PollPidResult::FAILED;
+        }
+    }
 
-static int pollPid(pid_t pid, int timeout_in_ms)
-{
     struct pollfd pollfd;
-
-    int pid_fd = pidFdOpen(pid);
-    if (pid_fd == -1)
-    {
-        return false;
-    }
     pollfd.fd = pid_fd;
     pollfd.events = POLLIN;
-    int ready = poll(&pollfd, 1, timeout_in_ms);
-    int save_errno = errno;
+
+    int ready = HANDLE_EINTR(poll(&pollfd, 1, timeout_in_ms));
+
+    if (ready <= 0)
+        return PollPidResult::FAILED;
+
     close(pid_fd);
-    errno = save_errno;
-    return ready;
+
+    return PollPidResult::RESTART;
 }
+
 #elif defined(OS_DARWIN) || defined(OS_FREEBSD)
 
 #pragma clang diagnostic ignored "-Wreserved-identifier"
@@ -100,38 +120,32 @@ static int pollPid(pid_t pid, int timeout_in_ms)
 namespace DB
 {
 
-static int pollPid(pid_t pid, int timeout_in_ms)
+static PollPidResult pollPid(pid_t pid, int timeout_in_ms)
 {
-    int status = 0;
-    int kq = HANDLE_EINTR(kqueue());
+    int kq = kqueue();
     if (kq == -1)
-    {
-        return false;
-    }
+        return PollPidResult::FAILED;
+
     struct kevent change = {.ident = NULL};
     EV_SET(&change, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL);
-    int result = HANDLE_EINTR(kevent(kq, &change, 1, NULL, 0, NULL));
-    if (result == -1)
+
+    int event_add_result = HANDLE_EINTR(kevent(kq, &change, 1, NULL, 0, NULL));
+    if (event_add_result == -1)
     {
-        if (errno != ESRCH)
-        {
-            return false;
-        }
-        // check if pid already died while we called kevent()
-        if (waitpid(pid, &status, WNOHANG) == pid)
-        {
-            return true;
-        }
-        return false;
+        if (errno == ESRCH)
+            return PollPidResult::RESTART;
+
+        return PollPidResult::FAILED;
     }
 
     struct kevent event = {.ident = NULL};
     struct timespec remaining_timespec = {.tv_sec = timeout_in_ms / 1000, .tv_nsec = (timeout_in_ms % 1000) * 1000000};
-    int ready = kevent(kq, nullptr, 0, &event, 1, &remaining_timespec);
-    int save_errno = errno;
+    int ready = HANDLE_EINTR(kevent(kq, nullptr, 0, &event, 1, &remaining_timespec));
+    PollPidResult result = ready < 0 ? PollPidResult::FAILED : PollPidResult::RESTART;
+
     close(kq);
-    errno = save_errno;
-    return ready;
+
+    return result;
 }
 #else
     #error "Unsupported OS type"
@@ -148,7 +162,7 @@ bool waitForPid(pid_t pid, size_t timeout_in_seconds)
         /// If there is no timeout before signal try to waitpid 1 time without block so we can avoid sending
         /// signal if process is already normally terminated.
 
-        int waitpid_res = waitpid(pid, &status, WNOHANG);
+        int waitpid_res = HANDLE_EINTR(waitpid(pid, &status, WNOHANG));
         bool process_terminated_normally = (waitpid_res == pid);
         return process_terminated_normally;
     }
@@ -159,34 +173,24 @@ bool waitForPid(pid_t pid, size_t timeout_in_seconds)
     int timeout_in_ms = timeout_in_seconds * 1000;
     while (timeout_in_ms > 0)
     {
-        int waitpid_res = waitpid(pid, &status, WNOHANG);
+        int waitpid_res = HANDLE_EINTR(waitpid(pid, &status, WNOHANG));
         bool process_terminated_normally = (waitpid_res == pid);
         if (process_terminated_normally)
-        {
             return true;
-        }
-        else if (waitpid_res == 0)
-        {
-            watch.restart();
-            int ready = pollPid(pid, timeout_in_ms);
-            if (ready <= 0)
-            {
-                if (errno == EINTR || errno == EAGAIN)
-                {
-                    timeout_in_ms -= watch.elapsedMilliseconds();
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            continue;
-        }
-        else if (waitpid_res == -1 && errno != EINTR)
-        {
+
+        if (waitpid_res != 0)
             return false;
-        }
+
+        watch.restart();
+
+        PollPidResult result = pollPid(pid, timeout_in_ms);
+
+        if (result == PollPidResult::FAILED)
+            return false;
+
+        timeout_in_ms -= watch.elapsedMilliseconds();
     }
+
     return false;
 }
 
diff --git a/src/Common/waitForPid.h b/src/Common/waitForPid.h
index 71c1a74712c..85a0d2c8dd9 100644
--- a/src/Common/waitForPid.h
+++ b/src/Common/waitForPid.h
@@ -4,8 +4,8 @@
 namespace DB
 {
 /*
- * Waits for a specific pid with timeout, using modern Linux and OSX facilities
- * Returns `true` if process terminated successfully or `false` otherwise
+ * Waits for a specific pid with timeout
+ * Returns `true` if process terminated successfully in specified timeout or `false` otherwise
  */
 bool waitForPid(pid_t pid, size_t timeout_in_seconds);
 
diff --git a/src/Compression/CompressedReadBufferBase.cpp b/src/Compression/CompressedReadBufferBase.cpp
index 2c85dc6d9a9..9101caf568e 100644
--- a/src/Compression/CompressedReadBufferBase.cpp
+++ b/src/Compression/CompressedReadBufferBase.cpp
@@ -1,5 +1,6 @@
 #include "CompressedReadBufferBase.h"
 
+#include <bit>
 #include <cstring>
 #include <cassert>
 #include <city.h>
@@ -93,8 +94,8 @@ static void validateChecksum(char * data, size_t size, const Checksum expected_c
     }
 
     /// Check if the difference caused by single bit flip in stored checksum.
-    size_t difference = __builtin_popcountll(expected_checksum.first ^ calculated_checksum.first)
-        + __builtin_popcountll(expected_checksum.second ^ calculated_checksum.second);
+    size_t difference = std::popcount(expected_checksum.first ^ calculated_checksum.first)
+        + std::popcount(expected_checksum.second ^ calculated_checksum.second);
 
     if (difference == 1)
     {
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 89004cec057..017c82701f5 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -292,7 +292,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
     const char * dest_start = dest;
 
     const UInt32 items_count = source_size / sizeof(ValueType);
-    unalignedStore<UInt32>(dest, items_count);
+    unalignedStoreLE<UInt32>(dest, items_count);
     dest += sizeof(items_count);
 
     ValueType prev_value{};
@@ -300,8 +300,8 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     if (source < source_end)
     {
-        prev_value = unalignedLoad<ValueType>(source);
-        unalignedStore<ValueType>(dest, prev_value);
+        prev_value = unalignedLoadLE<ValueType>(source);
+        unalignedStoreLE<ValueType>(dest, prev_value);
 
         source += sizeof(prev_value);
         dest += sizeof(prev_value);
@@ -309,10 +309,10 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 
     if (source < source_end)
     {
-        const ValueType curr_value = unalignedLoad<ValueType>(source);
+        const ValueType curr_value = unalignedLoadLE<ValueType>(source);
 
         prev_delta = curr_value - prev_value;
-        unalignedStore<UnsignedDeltaType>(dest, prev_delta);
+        unalignedStoreLE<UnsignedDeltaType>(dest, prev_delta);
 
         source += sizeof(curr_value);
         dest += sizeof(prev_delta);
@@ -324,7 +324,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
     int item = 2;
     for (; source < source_end; source += sizeof(ValueType), ++item)
     {
-        const ValueType curr_value = unalignedLoad<ValueType>(source);
+        const ValueType curr_value = unalignedLoadLE<ValueType>(source);
 
         const UnsignedDeltaType delta = curr_value - prev_value;
         const UnsignedDeltaType double_delta = delta - prev_delta;
@@ -368,7 +368,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(UInt32) > source_end)
         return;
 
-    const UInt32 items_count = unalignedLoad<UInt32>(source);
+    const UInt32 items_count = unalignedLoadLE<UInt32>(source);
     source += sizeof(items_count);
 
     ValueType prev_value{};
@@ -378,10 +378,10 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(ValueType) > source_end || items_count < 1)
         return;
 
-    prev_value = unalignedLoad<ValueType>(source);
+    prev_value = unalignedLoadLE<ValueType>(source);
     if (dest + sizeof(prev_value) > output_end)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-    unalignedStore<ValueType>(dest, prev_value);
+    unalignedStoreLE<ValueType>(dest, prev_value);
 
     source += sizeof(prev_value);
     dest += sizeof(prev_value);
@@ -390,11 +390,11 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
     if (source + sizeof(UnsignedDeltaType) > source_end || items_count < 2)
         return;
 
-    prev_delta = unalignedLoad<UnsignedDeltaType>(source);
+    prev_delta = unalignedLoadLE<UnsignedDeltaType>(source);
     prev_value = prev_value + static_cast<ValueType>(prev_delta);
     if (dest + sizeof(prev_value) > output_end)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-    unalignedStore<ValueType>(dest, prev_value);
+    unalignedStoreLE<ValueType>(dest, prev_value);
 
     source += sizeof(prev_delta);
     dest += sizeof(prev_value);
@@ -427,7 +427,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest,
         const ValueType curr_value = prev_value + delta;
         if (dest + sizeof(curr_value) > output_end)
             throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
-        unalignedStore<ValueType>(dest, curr_value);
+        unalignedStoreLE<ValueType>(dest, curr_value);
         dest += sizeof(curr_value);
 
         prev_delta = curr_value - prev_value;
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 4631a666830..0ca3e5660e0 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -208,7 +208,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     const UInt32 items_count = source_size / sizeof(T);
 
-    unalignedStore<UInt32>(dest, items_count);
+    unalignedStoreLE<UInt32>(dest, items_count);
     dest += sizeof(items_count);
 
     T prev_value{};
@@ -217,8 +217,8 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     if (source < source_end)
     {
-        prev_value = unalignedLoad<T>(source);
-        unalignedStore<T>(dest, prev_value);
+        prev_value = unalignedLoadLE<T>(source);
+        unalignedStoreLE<T>(dest, prev_value);
 
         source += sizeof(prev_value);
         dest += sizeof(prev_value);
@@ -228,7 +228,7 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest,
 
     while (source < source_end)
     {
-        const T curr_value = unalignedLoad<T>(source);
+        const T curr_value = unalignedLoadLE<T>(source);
         source += sizeof(curr_value);
 
         const auto xored_data = curr_value ^ prev_value;
@@ -274,7 +274,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     if (source + sizeof(UInt32) > source_end)
         return;
 
-    const UInt32 items_count = unalignedLoad<UInt32>(source);
+    const UInt32 items_count = unalignedLoadLE<UInt32>(source);
     source += sizeof(items_count);
 
     T prev_value{};
@@ -283,8 +283,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     if (source + sizeof(T) > source_end || items_count < 1)
         return;
 
-    prev_value = unalignedLoad<T>(source);
-    unalignedStore<T>(dest, prev_value);
+    prev_value = unalignedLoadLE<T>(source);
+    unalignedStoreLE<T>(dest, prev_value);
 
     source += sizeof(prev_value);
     dest += sizeof(prev_value);
@@ -326,7 +326,7 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
         }
         // else: 0b0 prefix - use prev_value
 
-        unalignedStore<T>(dest, curr_value);
+        unalignedStoreLE<T>(dest, curr_value);
         dest += sizeof(curr_value);
 
         prev_xored_info = curr_xored_info;
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index 0efa98fbd82..9ed37c2d676 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -8,6 +8,7 @@
 #include <Parsers/ASTFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Core/Types.h>
+#include <bit>
 
 
 namespace DB
@@ -413,7 +414,7 @@ UInt32 getValuableBitsNumber(UInt64 min, UInt64 max)
 {
     UInt64 diff_bits = min ^ max;
     if (diff_bits)
-        return 64 - __builtin_clzll(diff_bits);
+        return 64 - std::countl_zero(diff_bits);
     return 0;
 }
 
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index c48ca99d452..4c2b95682b3 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -86,8 +86,8 @@ UInt32 ICompressionCodec::compress(const char * source, UInt32 source_size, char
     UInt8 header_size = getHeaderSize();
     /// Write data from header_size
     UInt32 compressed_bytes_written = doCompressData(source, source_size, &dest[header_size]);
-    unalignedStore<UInt32>(&dest[1], compressed_bytes_written + header_size);
-    unalignedStore<UInt32>(&dest[5], source_size);
+    unalignedStoreLE<UInt32>(&dest[1], compressed_bytes_written + header_size);
+    unalignedStoreLE<UInt32>(&dest[5], source_size);
     return header_size + compressed_bytes_written;
 }
 
@@ -112,7 +112,7 @@ UInt32 ICompressionCodec::decompress(const char * source, UInt32 source_size, ch
 
 UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 {
-    UInt32 compressed_block_size = unalignedLoad<UInt32>(&source[1]);
+    UInt32 compressed_block_size = unalignedLoadLE<UInt32>(&source[1]);
     if (compressed_block_size == 0)
         throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with compressed block size 0");
     return compressed_block_size;
@@ -121,7 +121,7 @@ UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 
 UInt32 ICompressionCodec::readDecompressedBlockSize(const char * source)
 {
-    UInt32 decompressed_block_size = unalignedLoad<UInt32>(&source[5]);
+    UInt32 decompressed_block_size = unalignedLoadLE<UInt32>(&source[5]);
     if (decompressed_block_size == 0)
         throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with decompressed block size 0");
     return decompressed_block_size;
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 77050908265..b634a3137cd 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -175,7 +175,7 @@ private:
             throw std::runtime_error("No more data to read");
         }
 
-        current_value = unalignedLoad<T>(data);
+        current_value = unalignedLoadLE<T>(data);
         data = reinterpret_cast<const char *>(data) + sizeof(T);
     }
 };
@@ -371,7 +371,7 @@ CodecTestSequence makeSeq(Args && ... args)
     char * write_pos = data.data();
     for (const auto & v : vals)
     {
-        unalignedStore<T>(write_pos, v);
+        unalignedStoreLE<T>(write_pos, v);
         write_pos += sizeof(v);
     }
 
@@ -393,7 +393,7 @@ CodecTestSequence generateSeq(Generator gen, const char* gen_name, B Begin = 0,
     {
         const T v = gen(static_cast<T>(i));
 
-        unalignedStore<T>(write_pos, v);
+        unalignedStoreLE<T>(write_pos, v);
         write_pos += sizeof(v);
     }
 
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index 4733adcf67a..3e03ee0d6f4 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -36,7 +36,7 @@ void CoordinationSettings::loadFromConfig(const String & config_elem, const Poco
 }
 
 
-const String KeeperConfigurationAndSettings::DEFAULT_FOUR_LETTER_WORD_CMD = "conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr";
+const String KeeperConfigurationAndSettings::DEFAULT_FOUR_LETTER_WORD_CMD = "conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv";
 
 KeeperConfigurationAndSettings::KeeperConfigurationAndSettings()
     : server_id(NOT_EXIST)
diff --git a/src/Coordination/FourLetterCommand.cpp b/src/Coordination/FourLetterCommand.cpp
index cec107806b7..c33630a913b 100644
--- a/src/Coordination/FourLetterCommand.cpp
+++ b/src/Coordination/FourLetterCommand.cpp
@@ -2,6 +2,7 @@
 
 #include <Coordination/KeeperDispatcher.h>
 #include <Server/KeeperTCPHandler.h>
+#include <Common/ZooKeeper/IKeeper.h>
 #include <Common/logger_useful.h>
 #include <Poco/Environment.h>
 #include <Poco/Path.h>
@@ -132,6 +133,9 @@ void FourLetterCommandFactory::registerCommands(KeeperDispatcher & keeper_dispat
         FourLetterCommandPtr recovery_command = std::make_shared<RecoveryCommand>(keeper_dispatcher);
         factory.registerCommand(recovery_command);
 
+        FourLetterCommandPtr api_version_command = std::make_shared<ApiVersionCommand>(keeper_dispatcher);
+        factory.registerCommand(api_version_command);
+
         factory.initializeAllowList(keeper_dispatcher);
         factory.setInitialize(true);
     }
@@ -463,4 +467,9 @@ String RecoveryCommand::run()
     return "ok";
 }
 
+String ApiVersionCommand::run()
+{
+    return toString(static_cast<uint8_t>(Coordination::current_keeper_api_version));
+}
+
 }
diff --git a/src/Coordination/FourLetterCommand.h b/src/Coordination/FourLetterCommand.h
index b5d08f4c250..8a98b94b33a 100644
--- a/src/Coordination/FourLetterCommand.h
+++ b/src/Coordination/FourLetterCommand.h
@@ -315,4 +315,16 @@ struct RecoveryCommand : public IFourLetterCommand
     String run() override;
     ~RecoveryCommand() override = default;
 };
+
+struct ApiVersionCommand : public IFourLetterCommand
+{
+    explicit ApiVersionCommand(KeeperDispatcher & keeper_dispatcher_)
+        : IFourLetterCommand(keeper_dispatcher_)
+    {
+    }
+
+    String name() override { return "apiv"; }
+    String run() override;
+    ~ApiVersionCommand() override = default;
+};
 }
diff --git a/src/Coordination/KeeperConstants.h b/src/Coordination/KeeperConstants.h
new file mode 100644
index 00000000000..eb75fda4547
--- /dev/null
+++ b/src/Coordination/KeeperConstants.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <IO/WriteHelpers.h>
+
+namespace DB
+{
+
+enum class KeeperApiVersion : uint8_t
+{
+    ZOOKEEPER_COMPATIBLE = 0,
+    WITH_FILTERED_LIST
+};
+
+inline constexpr auto current_keeper_api_version = KeeperApiVersion::WITH_FILTERED_LIST;
+
+const std::string keeper_system_path = "/keeper";
+const std::string keeper_api_version_path = keeper_system_path + "/api_version";
+
+using PathWithData = std::pair<std::string_view, std::string>;
+const std::vector<PathWithData> child_system_paths_with_data
+{
+    {keeper_api_version_path, toString(static_cast<uint8_t>(current_keeper_api_version))}
+};
+
+}
diff --git a/src/Coordination/KeeperContext.h b/src/Coordination/KeeperContext.h
new file mode 100644
index 00000000000..64fa8cea6ec
--- /dev/null
+++ b/src/Coordination/KeeperContext.h
@@ -0,0 +1,23 @@
+#pragma once
+
+namespace DB
+{
+
+struct KeeperContext
+{
+    enum class Phase : uint8_t
+    {
+        INIT,
+        RUNNING,
+        SHUTDOWN
+    };
+
+    Phase server_state{Phase::INIT};
+
+    bool ignore_system_path_on_startup{false};
+    bool digest_enabled{true};
+};
+
+using KeeperContextPtr = std::shared_ptr<KeeperContext>;
+
+}
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 8261f5d1e26..8850e33f9c4 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -20,6 +20,7 @@
 #include <libnuraft/raft_server.hxx>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
+#include <Common/LockMemoryExceptionInThread.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/Stopwatch.h>
 
@@ -106,20 +107,32 @@ KeeperServer::KeeperServer(
     SnapshotsQueue & snapshots_queue_)
     : server_id(configuration_and_settings_->server_id)
     , coordination_settings(configuration_and_settings_->coordination_settings)
-    , state_machine(nuraft::cs_new<KeeperStateMachine>(
-          responses_queue_,
-          snapshots_queue_,
-          configuration_and_settings_->snapshot_storage_path,
-          coordination_settings,
-          checkAndGetSuperdigest(configuration_and_settings_->super_digest),
-          config.getBool("keeper_server.digest_enabled", false)))
-    , state_manager(nuraft::cs_new<KeeperStateManager>(
-          server_id, "keeper_server", configuration_and_settings_->log_storage_path, configuration_and_settings_->state_file_path, config, coordination_settings))
     , log(&Poco::Logger::get("KeeperServer"))
-    , is_recovering(config.has("keeper_server.force_recovery") && config.getBool("keeper_server.force_recovery"))
+    , is_recovering(config.getBool("keeper_server.force_recovery", false))
+    , keeper_context{std::make_shared<KeeperContext>()}
+    , create_snapshot_on_exit(config.getBool("keeper_server.create_snapshot_on_exit", true))
 {
     if (coordination_settings->quorum_reads)
         LOG_WARNING(log, "Quorum reads enabled, Keeper will work slower.");
+
+    keeper_context->digest_enabled = config.getBool("keeper_server.digest_enabled", false);
+    keeper_context->ignore_system_path_on_startup = config.getBool("keeper_server.ignore_system_path_on_startup", false);
+
+    state_machine = nuraft::cs_new<KeeperStateMachine>(
+        responses_queue_,
+        snapshots_queue_,
+        configuration_and_settings_->snapshot_storage_path,
+        coordination_settings,
+        keeper_context,
+        checkAndGetSuperdigest(configuration_and_settings_->super_digest));
+
+    state_manager = nuraft::cs_new<KeeperStateManager>(
+        server_id,
+        "keeper_server",
+        configuration_and_settings_->log_storage_path,
+        configuration_and_settings_->state_file_path,
+        config,
+        coordination_settings);
 }
 
 /**
@@ -162,6 +175,17 @@ struct KeeperServer::KeeperRaftServer : public nuraft::raft_server
         reconfigure(new_config);
     }
 
+    void commit_in_bg() override
+    {
+        // For NuRaft, if any commit fails (uncaught exception) the whole server aborts as a safety
+        // This includes failed allocation which can produce an unknown state for the storage,
+        // making it impossible to handle correctly.
+        // We block the memory tracker for all the commit operations (including KeeperStateMachine::commit)
+        // assuming that the allocations are small
+        LockMemoryExceptionInThread blocker{VariableContext::Global};
+        nuraft::raft_server::commit_in_bg();
+    }
+
     using nuraft::raft_server::raft_server;
 
     // peers are initially marked as responding because at least one cycle
@@ -341,6 +365,8 @@ void KeeperServer::startup(const Poco::Util::AbstractConfiguration & config, boo
     last_local_config = state_manager->parseServersConfiguration(config, true).cluster_config;
 
     launchRaftServer(enable_ipv6);
+
+    keeper_context->server_state = KeeperContext::Phase::RUNNING;
 }
 
 void KeeperServer::shutdownRaftServer()
@@ -354,6 +380,12 @@ void KeeperServer::shutdownRaftServer()
     }
 
     raft_instance->shutdown();
+
+    keeper_context->server_state = KeeperContext::Phase::SHUTDOWN;
+
+    if (create_snapshot_on_exit)
+        raft_instance->create_snapshot();
+
     raft_instance.reset();
 
     if (asio_listener)
@@ -560,6 +592,19 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
                 entry = nuraft::cs_new<nuraft::log_entry>(entry->get_term(), getZooKeeperLogEntry(request_for_session), entry->get_val_type());
                 break;
             }
+            case nuraft::cb_func::AppendLogFailed:
+            {
+                // we are relying on the fact that request are being processed under a mutex
+                // and not a RW lock
+                auto & entry = *static_cast<LogEntryPtr *>(param->ctx);
+
+                assert(entry->get_val_type() == nuraft::app_log);
+
+                auto & entry_buf = entry->get_buf();
+                auto request_for_session = state_machine->parseRequest(entry_buf);
+                state_machine->rollbackRequest(request_for_session, true);
+                break;
+            }
             default:
                 break;
         }
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index f6524ce97a1..1fb3e579214 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -9,6 +9,7 @@
 #include <libnuraft/raft_server.hxx>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Coordination/Keeper4LWInfo.h>
+#include <Coordination/KeeperContext.h>
 
 namespace DB
 {
@@ -61,6 +62,10 @@ private:
 
     std::atomic_bool is_recovering = false;
 
+    std::shared_ptr<KeeperContext> keeper_context;
+
+    const bool create_snapshot_on_exit;
+
 public:
     KeeperServer(
         const KeeperConfigurationAndSettingsPtr & settings_,
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index 07d351cb73c..1e3f37b617f 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -13,6 +13,8 @@
 #include <filesystem>
 #include <memory>
 #include <Common/logger_useful.h>
+#include "Coordination/KeeperContext.h"
+#include <Coordination/KeeperConstants.h>
 
 namespace DB
 {
@@ -144,8 +146,34 @@ namespace
     }
 }
 
+namespace
+{
 
-void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out)
+enum class PathMatchResult
+{
+    NOT_MATCH,
+    EXACT,
+    IS_CHILD
+};
+
+PathMatchResult matchPath(const std::string_view path, const std::string_view match_to)
+{
+    using enum PathMatchResult;
+
+    auto [first_it, second_it] = std::mismatch(path.begin(), path.end(), match_to.begin(), match_to.end());
+
+    if (second_it != match_to.end())
+        return NOT_MATCH;
+
+    if (first_it == path.end())
+        return EXACT;
+
+    return *first_it == '/' ? IS_CHILD : NOT_MATCH;
+}
+
+}
+
+void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out, KeeperContextPtr keeper_context)
 {
     writeBinary(static_cast<uint8_t>(snapshot.version), out);
     serializeSnapshotMetadata(snapshot.snapshot_meta, out);
@@ -153,7 +181,7 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
     if (snapshot.version >= SnapshotVersion::V5)
     {
         writeBinary(snapshot.zxid, out);
-        if (snapshot.storage->digest_enabled)
+        if (keeper_context->digest_enabled)
         {
             writeBinary(static_cast<uint8_t>(KeeperStorage::CURRENT_DIGEST_VERSION), out);
             writeBinary(snapshot.nodes_digest, out);
@@ -182,12 +210,21 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
     }
 
     /// Serialize data tree
-    writeBinary(snapshot.snapshot_container_size, out);
+    writeBinary(snapshot.snapshot_container_size - child_system_paths_with_data.size(), out);
     size_t counter = 0;
     for (auto it = snapshot.begin; counter < snapshot.snapshot_container_size; ++counter)
     {
         const auto & path = it->key;
+
+        // write only the root system path because of digest
+        if (matchPath(path.toView(), keeper_system_path) == PathMatchResult::IS_CHILD)
+        {
+            ++it;
+            continue;
+        }
+
         const auto & node = it->value;
+
         /// Benign race condition possible while taking snapshot: NuRaft decide to create snapshot at some log id
         /// and only after some time we lock storage and enable snapshot mode. So snapshot_container_size can be
         /// slightly bigger than required.
@@ -241,7 +278,7 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
     }
 }
 
-void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserialization_result, ReadBuffer & in)
+void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserialization_result, ReadBuffer & in, KeeperContextPtr keeper_context)
 {
     uint8_t version;
     readBinary(version, in);
@@ -252,7 +289,7 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
     deserialization_result.snapshot_meta = deserializeSnapshotMetadata(in);
     KeeperStorage & storage = *deserialization_result.storage;
 
-    bool recalculate_digest = storage.digest_enabled;
+    bool recalculate_digest = keeper_context->digest_enabled;
     if (version >= SnapshotVersion::V5)
     {
         readBinary(storage.zxid, in);
@@ -316,19 +353,55 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
     if (recalculate_digest)
         storage.nodes_digest = 0;
 
-    size_t current_size = 0;
-    while (current_size < snapshot_container_size)
+    const auto is_node_empty = [](const auto & node)
+    {
+        return node.getData().empty() && node.stat == Coordination::Stat{};
+    };
+
+    for (size_t nodes_read = 0; nodes_read < snapshot_container_size; ++nodes_read)
     {
         std::string path;
         readBinary(path, in);
         KeeperStorage::Node node{};
         readNode(node, in, current_version, storage.acl_map);
+
+        using enum PathMatchResult;
+        auto match_result = matchPath(path, keeper_system_path);
+
+        const std::string error_msg = fmt::format("Cannot read node on path {} from a snapshot because it is used as a system node", path);
+        if (match_result == IS_CHILD)
+        {
+            if (keeper_context->ignore_system_path_on_startup || keeper_context->server_state != KeeperContext::Phase::INIT)
+            {
+                LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "{}. Ignoring it", error_msg);
+                continue;
+            }
+            else
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "{}. Ignoring it can lead to data loss. "
+                    "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true",
+                    error_msg);
+        }
+        else if (match_result == EXACT && !is_node_empty(node))
+        {
+            if (keeper_context->ignore_system_path_on_startup || keeper_context->server_state != KeeperContext::Phase::INIT)
+            {
+                LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "{}. Ignoring it", error_msg);
+                node = KeeperStorage::Node{};
+            }
+            else
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "{}. Ignoring it can lead to data loss. "
+                    "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true",
+                    error_msg);
+        }
+
         storage.container.insertOrReplace(path, node);
         if (node.stat.ephemeralOwner != 0)
             storage.ephemerals[node.stat.ephemeralOwner].insert(path);
 
-        current_size++;
-
         if (recalculate_digest)
             storage.nodes_digest += node.getDigest(path);
     }
@@ -451,16 +524,16 @@ KeeperStorageSnapshot::~KeeperStorageSnapshot()
 KeeperSnapshotManager::KeeperSnapshotManager(
     const std::string & snapshots_path_,
     size_t snapshots_to_keep_,
+    const KeeperContextPtr & keeper_context_,
     bool compress_snapshots_zstd_,
     const std::string & superdigest_,
-    size_t storage_tick_time_,
-    const bool digest_enabled_)
+    size_t storage_tick_time_)
     : snapshots_path(snapshots_path_)
     , snapshots_to_keep(snapshots_to_keep_)
     , compress_snapshots_zstd(compress_snapshots_zstd_)
     , superdigest(superdigest_)
     , storage_tick_time(storage_tick_time_)
-    , digest_enabled(digest_enabled_)
+    , keeper_context(keeper_context_)
 {
     namespace fs = std::filesystem;
 
@@ -554,7 +627,7 @@ nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::serializeSnapshotToBuffer(con
     else
         compressed_writer = std::make_unique<CompressedWriteBuffer>(*writer);
 
-    KeeperStorageSnapshot::serialize(snapshot, *compressed_writer);
+    KeeperStorageSnapshot::serialize(snapshot, *compressed_writer, keeper_context);
     compressed_writer->finalize();
     return buffer_raw_ptr->getBuffer();
 }
@@ -562,12 +635,13 @@ nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::serializeSnapshotToBuffer(con
 
 bool KeeperSnapshotManager::isZstdCompressed(nuraft::ptr<nuraft::buffer> buffer)
 {
-    static constexpr uint32_t ZSTD_COMPRESSED_MAGIC = 0xFD2FB528;
+    static constexpr unsigned char ZSTD_COMPRESSED_MAGIC[4] = {0x28, 0xB5, 0x2F, 0xFD};
+
     ReadBufferFromNuraftBuffer reader(buffer);
-    uint32_t magic_from_buffer;
+    unsigned char magic_from_buffer[4]{};
     reader.readStrict(reinterpret_cast<char *>(&magic_from_buffer), sizeof(magic_from_buffer));
     buffer->pos(0);
-    return magic_from_buffer == ZSTD_COMPRESSED_MAGIC;
+    return memcmp(magic_from_buffer, ZSTD_COMPRESSED_MAGIC, 4) == 0;
 }
 
 SnapshotDeserializationResult KeeperSnapshotManager::deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const
@@ -583,8 +657,9 @@ SnapshotDeserializationResult KeeperSnapshotManager::deserializeSnapshotFromBuff
         compressed_reader = std::make_unique<CompressedReadBuffer>(*reader);
 
     SnapshotDeserializationResult result;
-    result.storage = std::make_unique<KeeperStorage>(storage_tick_time, superdigest, digest_enabled);
-    KeeperStorageSnapshot::deserialize(result, *compressed_reader);
+    result.storage = std::make_unique<KeeperStorage>(storage_tick_time, superdigest, keeper_context, /* initialize_system_nodes */ false);
+    KeeperStorageSnapshot::deserialize(result, *compressed_reader, keeper_context);
+    result.storage->initializeSystemNodes();
     return result;
 }
 
@@ -629,7 +704,7 @@ std::pair<std::string, std::error_code> KeeperSnapshotManager::serializeSnapshot
     else
         compressed_writer = std::make_unique<CompressedWriteBuffer>(*writer);
 
-    KeeperStorageSnapshot::serialize(snapshot, *compressed_writer);
+    KeeperStorageSnapshot::serialize(snapshot, *compressed_writer, keeper_context);
     compressed_writer->finalize();
     compressed_writer->sync();
 
diff --git a/src/Coordination/KeeperSnapshotManager.h b/src/Coordination/KeeperSnapshotManager.h
index 57174cbc6f5..4984e54f15f 100644
--- a/src/Coordination/KeeperSnapshotManager.h
+++ b/src/Coordination/KeeperSnapshotManager.h
@@ -5,6 +5,7 @@
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 #include <libnuraft/nuraft.hxx>
+#include <Coordination/KeeperContext.h>
 
 namespace DB
 {
@@ -55,9 +56,9 @@ public:
 
     ~KeeperStorageSnapshot();
 
-    static void serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out);
+    static void serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out, KeeperContextPtr keeper_context);
 
-    static void deserialize(SnapshotDeserializationResult & deserialization_result, ReadBuffer & in);
+    static void deserialize(SnapshotDeserializationResult & deserialization_result, ReadBuffer & in, KeeperContextPtr keeper_context);
 
     KeeperStorage * storage;
 
@@ -99,10 +100,10 @@ public:
     KeeperSnapshotManager(
         const std::string & snapshots_path_,
         size_t snapshots_to_keep_,
+        const KeeperContextPtr & keeper_context_,
         bool compress_snapshots_zstd_ = true,
         const std::string & superdigest_ = "",
-        size_t storage_tick_time_ = 500,
-        bool digest_enabled_ = true);
+        size_t storage_tick_time_ = 500);
 
     /// Restore storage from latest available snapshot
     SnapshotDeserializationResult restoreFromLatestSnapshot();
@@ -168,7 +169,8 @@ private:
     const std::string superdigest;
     /// Storage sessions timeout check interval (also for deserializatopn)
     size_t storage_tick_time;
-    const bool digest_enabled;
+
+    KeeperContextPtr keeper_context;
 };
 
 /// Keeper create snapshots in background thread. KeeperStateMachine just create
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index 3c899a268d8..90f108dadb6 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -41,22 +41,22 @@ KeeperStateMachine::KeeperStateMachine(
     SnapshotsQueue & snapshots_queue_,
     const std::string & snapshots_path_,
     const CoordinationSettingsPtr & coordination_settings_,
-    const std::string & superdigest_,
-    const bool digest_enabled_)
+    const KeeperContextPtr & keeper_context_,
+    const std::string & superdigest_)
     : coordination_settings(coordination_settings_)
     , snapshot_manager(
           snapshots_path_,
           coordination_settings->snapshots_to_keep,
+          keeper_context_,
           coordination_settings->compress_snapshots_with_zstd_format,
           superdigest_,
-          coordination_settings->dead_session_check_period_ms.totalMilliseconds(),
-          digest_enabled_)
+          coordination_settings->dead_session_check_period_ms.totalMilliseconds())
     , responses_queue(responses_queue_)
     , snapshots_queue(snapshots_queue_)
     , last_committed_idx(0)
     , log(&Poco::Logger::get("KeeperStateMachine"))
     , superdigest(superdigest_)
-    , digest_enabled(digest_enabled_)
+    , keeper_context(keeper_context_)
 {
 }
 
@@ -109,7 +109,7 @@ void KeeperStateMachine::init()
 
     if (!storage)
         storage = std::make_unique<KeeperStorage>(
-            coordination_settings->dead_session_check_period_ms.totalMilliseconds(), superdigest, digest_enabled);
+            coordination_settings->dead_session_check_period_ms.totalMilliseconds(), superdigest, keeper_context);
 }
 
 namespace
@@ -125,9 +125,8 @@ void assertDigest(
     {
         LOG_FATAL(
             &Poco::Logger::get("KeeperStateMachine"),
-            "Digest for nodes is not matching after {} request of type '{}'.\nExpected digest - {}, actual digest - {} (digest version "
-            "{}). Keeper will "
-            "terminate to avoid inconsistencies.\nExtra information about the request:\n{}",
+            "Digest for nodes is not matching after {} request of type '{}'.\nExpected digest - {}, actual digest - {} (digest "
+            "{}). Keeper will terminate to avoid inconsistencies.\nExtra information about the request:\n{}",
             committing ? "committing" : "preprocessing",
             request.getOpNum(),
             first.value,
@@ -196,15 +195,23 @@ void KeeperStateMachine::preprocess(const KeeperStorage::RequestForSession & req
         return;
 
     std::lock_guard lock(storage_and_responses_lock);
-    storage->preprocessRequest(
-        request_for_session.request,
-        request_for_session.session_id,
-        request_for_session.time,
-        request_for_session.zxid,
-        true /* check_acl */,
-        request_for_session.digest);
+    try
+    {
+        storage->preprocessRequest(
+            request_for_session.request,
+            request_for_session.session_id,
+            request_for_session.time,
+            request_for_session.zxid,
+            true /* check_acl */,
+            request_for_session.digest);
+    }
+    catch (...)
+    {
+        rollbackRequest(request_for_session, true);
+        throw;
+    }
 
-    if (digest_enabled && request_for_session.digest)
+    if (keeper_context->digest_enabled && request_for_session.digest)
         assertDigest(*request_for_session.digest, storage->getNodesDigest(false), *request_for_session.request, false);
 }
 
@@ -253,10 +260,8 @@ nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, n
                     response_for_session.session_id);
             }
 
-        if (digest_enabled && request_for_session.digest)
-        {
+        if (keeper_context->digest_enabled && request_for_session.digest)
             assertDigest(*request_for_session.digest, storage->getNodesDigest(true), *request_for_session.request, true);
-        }
     }
 
     ProfileEvents::increment(ProfileEvents::KeeperCommits);
@@ -313,11 +318,16 @@ void KeeperStateMachine::rollback(uint64_t log_idx, nuraft::buffer & data)
     if (!request_for_session.zxid)
         request_for_session.zxid = log_idx;
 
+    rollbackRequest(request_for_session, false);
+}
+
+void KeeperStateMachine::rollbackRequest(const KeeperStorage::RequestForSession & request_for_session, bool allow_missing)
+{
     if (request_for_session.request->getOpNum() == Coordination::OpNum::SessionID)
         return;
 
     std::lock_guard lock(storage_and_responses_lock);
-    storage->rollbackRequest(request_for_session.zxid);
+    storage->rollbackRequest(request_for_session.zxid, allow_missing);
 }
 
 nuraft::ptr<nuraft::snapshot> KeeperStateMachine::last_snapshot()
@@ -385,7 +395,14 @@ void KeeperStateMachine::create_snapshot(nuraft::snapshot & s, nuraft::async_res
     };
 
 
-    LOG_DEBUG(log, "In memory snapshot {} created, queueing task to flash to disk", s.get_last_log_idx());
+    if (keeper_context->server_state == KeeperContext::Phase::SHUTDOWN)
+    {
+        LOG_INFO(log, "Creating a snapshot during shutdown because 'create_snapshot_on_exit' is enabled.");
+        snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
+        return;
+    }
+
+    LOG_DEBUG(log, "In memory snapshot {} created, queueing task to flush to disk", s.get_last_log_idx());
     /// Flush snapshot to disk in a separate thread.
     if (!snapshots_queue.push(std::move(snapshot_task)))
         LOG_WARNING(log, "Cannot push snapshot task into queue");
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index c80b35bb704..9ddc4372d3b 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -6,6 +6,7 @@
 #include <libnuraft/nuraft.hxx>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/logger_useful.h>
+#include <Coordination/KeeperContext.h>
 
 
 namespace DB
@@ -24,8 +25,8 @@ public:
         SnapshotsQueue & snapshots_queue_,
         const std::string & snapshots_path_,
         const CoordinationSettingsPtr & coordination_settings_,
-        const std::string & superdigest_ = "",
-        bool digest_enabled_ = true);
+        const KeeperContextPtr & keeper_context_,
+        const std::string & superdigest_ = "");
 
     /// Read state from the latest snapshot
     void init();
@@ -43,6 +44,10 @@ public:
 
     void rollback(uint64_t log_idx, nuraft::buffer & data) override;
 
+    // allow_missing - whether the transaction we want to rollback can be missing from storage
+    // (can happen in case of exception during preprocessing)
+    void rollbackRequest(const KeeperStorage::RequestForSession & request_for_session, bool allow_missing);
+
     uint64_t last_commit_index() override { return last_committed_idx; }
 
     /// Apply preliminarily saved (save_logical_snp_obj) snapshot to our state.
@@ -140,7 +145,7 @@ private:
     /// Special part of ACL system -- superdigest specified in server config.
     const std::string superdigest;
 
-    const bool digest_enabled;
+    KeeperContextPtr keeper_context;
 };
 
 }
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index fd1fab5b6b0..693a1b16f0d 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -6,7 +6,7 @@
 #include <boost/algorithm/string.hpp>
 #include <Poco/Base64Encoder.h>
 #include <Poco/SHA1Engine.h>
-#include "Common/ZooKeeper/ZooKeeperCommon.h"
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/SipHash.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -14,7 +14,9 @@
 #include <Common/hex.h>
 #include <Common/logger_useful.h>
 #include <Common/setThreadName.h>
+#include <Common/LockMemoryExceptionInThread.h>
 #include <Coordination/pathUtils.h>
+#include <Coordination/KeeperConstants.h>
 #include <sstream>
 #include <iomanip>
 #include <mutex>
@@ -226,12 +228,67 @@ void KeeperStorage::Node::shallowCopy(const KeeperStorage::Node & other)
     cached_digest = other.cached_digest;
 }
 
-KeeperStorage::KeeperStorage(int64_t tick_time_ms, const String & superdigest_, const bool digest_enabled_)
-    : session_expiry_queue(tick_time_ms), digest_enabled(digest_enabled_), superdigest(superdigest_)
+KeeperStorage::KeeperStorage(
+    int64_t tick_time_ms, const String & superdigest_, const KeeperContextPtr & keeper_context_, const bool initialize_system_nodes)
+    : session_expiry_queue(tick_time_ms), keeper_context(keeper_context_), superdigest(superdigest_)
 {
     Node root_node;
     container.insert("/", root_node);
-    nodes_digest += root_node.getDigest("/");
+    addDigest(root_node, "/");
+
+    if (initialize_system_nodes)
+        initializeSystemNodes();
+}
+
+void KeeperStorage::initializeSystemNodes()
+{
+    if (initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "KeeperStorage system nodes initialized twice");
+
+    // insert root system path if it isn't already inserted
+    if (container.find(keeper_system_path) == container.end())
+    {
+        Node system_node;
+        container.insert(keeper_system_path, system_node);
+        // store digest for the empty node because we won't update
+        // its stats
+        addDigest(system_node, keeper_system_path);
+
+        // update root and the digest based on it
+        auto current_root_it = container.find("/");
+        assert(current_root_it != container.end());
+        removeDigest(current_root_it->value, "/");
+        auto updated_root_it = container.updateValue(
+            "/",
+            [](auto & node)
+            {
+                ++node.stat.numChildren;
+                node.addChild(getBaseName(keeper_system_path));
+            }
+        );
+        addDigest(updated_root_it->value, "/");
+    }
+
+    // insert child system nodes
+    for (const auto & [path, data] : child_system_paths_with_data)
+    {
+        assert(keeper_api_version_path.starts_with(keeper_system_path));
+        Node child_system_node;
+        child_system_node.setData(data);
+        auto [map_key, _] = container.insert(std::string{path}, child_system_node);
+        /// Take child path from key owned by map.
+        auto child_path = getBaseName(map_key->getKey());
+        container.updateValue(
+            parentPath(StringRef(path)),
+            [child_path](auto & parent)
+            {
+                // don't update stats so digest is okay
+                parent.addChild(child_path);
+            }
+        );
+    }
+
+    initialized = true;
 }
 
 template <class... Ts>
@@ -309,10 +366,10 @@ void KeeperStorage::UncommittedState::addDeltas(std::vector<Delta> new_deltas)
 {
     for (auto & delta : new_deltas)
     {
-        if (!delta.path.empty())
-            applyDelta(delta);
+        const auto & added_delta = deltas.emplace_back(std::move(delta));
 
-        deltas.push_back(std::move(delta));
+        if (!added_delta.path.empty())
+            applyDelta(added_delta);
     }
 }
 
@@ -610,7 +667,7 @@ struct KeeperStorageRequestProcessor
     explicit KeeperStorageRequestProcessor(const Coordination::ZooKeeperRequestPtr & zk_request_) : zk_request(zk_request_) { }
     virtual Coordination::ZooKeeperResponsePtr process(KeeperStorage & storage, int64_t zxid) const = 0;
     virtual std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & /*storage*/, int64_t /*zxid*/, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/) const
+    preprocess(KeeperStorage & /*storage*/, int64_t /*zxid*/, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const
     {
         return {};
     }
@@ -658,21 +715,34 @@ struct KeeperStorageSyncRequestProcessor final : public KeeperStorageRequestProc
 namespace
 {
 
-    Coordination::ACLs getNodeACLs(KeeperStorage & storage, StringRef path, bool is_local)
+Coordination::ACLs getNodeACLs(KeeperStorage & storage, StringRef path, bool is_local)
+{
+    if (is_local)
     {
-        if (is_local)
-        {
-            auto node_it = storage.container.find(path);
-            if (node_it == storage.container.end())
-                return {};
+        auto node_it = storage.container.find(path);
+        if (node_it == storage.container.end())
+            return {};
 
-            return storage.acl_map.convertNumber(node_it->value.acl_id);
-        }
-
-        return storage.uncommitted_state.getACLs(path);
+        return storage.acl_map.convertNumber(node_it->value.acl_id);
     }
 
+    return storage.uncommitted_state.getACLs(path);
 }
+
+void handleSystemNodeModification(const KeeperContext & keeper_context, std::string_view error_msg)
+{
+    if (keeper_context.server_state == KeeperContext::Phase::INIT && !keeper_context.ignore_system_path_on_startup)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "{}. Ignoring it can lead to data loss. "
+            "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true.",
+            error_msg);
+
+    LOG_ERROR(&Poco::Logger::get("KeeperStorage"), fmt::runtime(error_msg));
+}
+
+}
+
 bool KeeperStorage::checkACL(StringRef path, int32_t permission, int64_t session_id, bool is_local)
 {
     const auto node_acls = getNodeACLs(*this, path, is_local);
@@ -726,7 +796,7 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
     }
 
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t time, uint64_t & digest) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t time, uint64_t & digest, const KeeperContext & keeper_context) const override
     {
         Coordination::ZooKeeperCreateRequest & request = dynamic_cast<Coordination::ZooKeeperCreateRequest &>(*zk_request);
 
@@ -752,6 +822,14 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
             path_created += seq_num_str.str();
         }
 
+        if (path_created.starts_with(keeper_system_path))
+        {
+            auto error_msg = fmt::format("Trying to create a node inside the internal Keeper path ({}) which is not allowed. Path: {}", keeper_system_path, path_created);
+
+            handleSystemNodeModification(keeper_context, error_msg);
+            return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
+        }
+
         if (storage.uncommitted_state.getNode(path_created))
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNODEEXISTS}};
 
@@ -839,10 +917,13 @@ struct KeeperStorageGetRequestProcessor final : public KeeperStorageRequestProce
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         Coordination::ZooKeeperGetRequest & request = dynamic_cast<Coordination::ZooKeeperGetRequest &>(*zk_request);
 
+        if (request.path == Coordination::keeper_api_version_path)
+            return {};
+
         if (!storage.uncommitted_state.getNode(request.path))
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
 
@@ -905,12 +986,20 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
 
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & digest) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & digest, const KeeperContext & keeper_context) const override
     {
         Coordination::ZooKeeperRemoveRequest & request = dynamic_cast<Coordination::ZooKeeperRemoveRequest &>(*zk_request);
 
         std::vector<KeeperStorage::Delta> new_deltas;
 
+        if (request.path.starts_with(keeper_system_path))
+        {
+            auto error_msg = fmt::format("Trying to delete an internal Keeper path ({}) which is not allowed", request.path);
+
+            handleSystemNodeModification(keeper_context, error_msg);
+            return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
+        }
+
         const auto update_parent_pzxid = [&]()
         {
             auto parent_path = parentPath(request.path);
@@ -987,7 +1076,7 @@ struct KeeperStorageExistsRequestProcessor final : public KeeperStorageRequestPr
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         Coordination::ZooKeeperExistsRequest & request = dynamic_cast<Coordination::ZooKeeperExistsRequest &>(*zk_request);
 
@@ -1051,12 +1140,20 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
 
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t time, uint64_t & digest) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t time, uint64_t & digest, const KeeperContext & keeper_context) const override
     {
         Coordination::ZooKeeperSetRequest & request = dynamic_cast<Coordination::ZooKeeperSetRequest &>(*zk_request);
 
         std::vector<KeeperStorage::Delta> new_deltas;
 
+        if (request.path.starts_with(keeper_system_path))
+        {
+            auto error_msg = fmt::format("Trying to update an internal Keeper path ({}) which is not allowed", request.path);
+
+            handleSystemNodeModification(keeper_context, error_msg);
+            return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
+        }
+
         if (!storage.uncommitted_state.getNode(request.path))
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
 
@@ -1135,7 +1232,7 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
 
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         Coordination::ZooKeeperListRequest & request = dynamic_cast<Coordination::ZooKeeperListRequest &>(*zk_request);
 
@@ -1187,7 +1284,9 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
 
                 auto list_request_type = ALL;
                 if (auto * filtered_list = dynamic_cast<Coordination::ZooKeeperFilteredListRequest *>(&request))
+                {
                     list_request_type = filtered_list->list_request_type;
+                }
 
                 if (list_request_type == ALL)
                     return true;
@@ -1234,7 +1333,7 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
 
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         Coordination::ZooKeeperCheckRequest & request = dynamic_cast<Coordination::ZooKeeperCheckRequest &>(*zk_request);
 
@@ -1312,10 +1411,18 @@ struct KeeperStorageSetACLRequestProcessor final : public KeeperStorageRequestPr
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t /*time*/, uint64_t & digest) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t /*time*/, uint64_t & digest, const KeeperContext & keeper_context) const override
     {
         Coordination::ZooKeeperSetACLRequest & request = dynamic_cast<Coordination::ZooKeeperSetACLRequest &>(*zk_request);
 
+        if (request.path.starts_with(keeper_system_path))
+        {
+            auto error_msg = fmt::format("Trying to update an internal Keeper path ({}) which is not allowed", request.path);
+
+            handleSystemNodeModification(keeper_context, error_msg);
+            return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
+        }
+
         auto & uncommitted_state = storage.uncommitted_state;
         if (!uncommitted_state.getNode(request.path))
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
@@ -1386,7 +1493,7 @@ struct KeeperStorageGetACLRequestProcessor final : public KeeperStorageRequestPr
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         Coordination::ZooKeeperGetACLRequest & request = dynamic_cast<Coordination::ZooKeeperGetACLRequest &>(*zk_request);
 
@@ -1483,14 +1590,14 @@ struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestPro
     }
 
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t time, uint64_t & digest) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t time, uint64_t & digest, const KeeperContext & keeper_context) const override
     {
         std::vector<Coordination::Error> response_errors;
         response_errors.reserve(concrete_requests.size());
         uint64_t current_digest = digest;
         for (size_t i = 0; i < concrete_requests.size(); ++i)
         {
-            auto new_deltas = concrete_requests[i]->preprocess(storage, zxid, session_id, time, current_digest);
+            auto new_deltas = concrete_requests[i]->preprocess(storage, zxid, session_id, time, current_digest, keeper_context);
 
             if (!new_deltas.empty())
             {
@@ -1609,7 +1716,7 @@ struct KeeperStorageAuthRequestProcessor final : public KeeperStorageRequestProc
 {
     using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::vector<KeeperStorage::Delta>
-    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t /*time*/, uint64_t & /*digest*/) const override
+    preprocess(KeeperStorage & storage, int64_t zxid, int64_t session_id, int64_t /*time*/, uint64_t & /*digest*/, const KeeperContext & /*keeper_context*/) const override
     {
         Coordination::ZooKeeperAuthRequest & auth_request = dynamic_cast<Coordination::ZooKeeperAuthRequest &>(*zk_request);
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
@@ -1725,7 +1832,7 @@ KeeperStorageRequestProcessorsFactory::KeeperStorageRequestProcessorsFactory()
 
 UInt64 KeeperStorage::calculateNodesDigest(UInt64 current_digest, const std::vector<Delta> & new_deltas) const
 {
-    if (!digest_enabled)
+    if (!keeper_context->digest_enabled)
         return current_digest;
 
     std::unordered_map<std::string, std::shared_ptr<Node>> updated_nodes;
@@ -1792,6 +1899,9 @@ void KeeperStorage::preprocessRequest(
     bool check_acl,
     std::optional<Digest> digest)
 {
+    if (!initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "KeeperStorage system nodes are not initialized");
+
     int64_t last_zxid = getNextZXID() - 1;
 
     if (uncommitted_transactions.empty())
@@ -1816,7 +1926,7 @@ void KeeperStorage::preprocessRequest(
     TransactionInfo transaction{.zxid = new_last_zxid};
     uint64_t new_digest = getNodesDigest(false).value;
     SCOPE_EXIT({
-        if (digest_enabled)
+        if (keeper_context->digest_enabled)
             // if the version of digest we got from the leader is the same as the one this instances has, we can simply copy the value
             // and just check the digest on the commit
             // a mistake can happen while applying the changes to the uncommitted_state so for now let's just recalculate the digest here also
@@ -1867,7 +1977,7 @@ void KeeperStorage::preprocessRequest(
         return;
     }
 
-    new_deltas = request_processor->preprocess(*this, transaction.zxid, session_id, time, new_digest);
+    new_deltas = request_processor->preprocess(*this, transaction.zxid, session_id, time, new_digest, *keeper_context);
 }
 
 KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(
@@ -1877,6 +1987,9 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(
     bool check_acl,
     bool is_local)
 {
+    if (!initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "KeeperStorage system nodes are not initialized");
+
     if (new_last_zxid)
     {
         if (uncommitted_transactions.empty())
@@ -1968,8 +2081,10 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(
         {
             if (response->error == Coordination::Error::ZOK)
             {
-                auto & watches_type
-                    = zk_request->getOpNum() == Coordination::OpNum::List || zk_request->getOpNum() == Coordination::OpNum::SimpleList
+                static constexpr std::array list_requests{
+                    Coordination::OpNum::List, Coordination::OpNum::SimpleList, Coordination::OpNum::FilteredList};
+
+                auto & watches_type = std::find(list_requests.begin(), list_requests.end(), zk_request->getOpNum()) != list_requests.end()
                     ? list_watches
                     : watches;
 
@@ -1999,19 +2114,35 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(
     return results;
 }
 
-void KeeperStorage::rollbackRequest(int64_t rollback_zxid)
+void KeeperStorage::rollbackRequest(int64_t rollback_zxid, bool allow_missing)
 {
+    if (allow_missing && (uncommitted_transactions.empty() || uncommitted_transactions.back().zxid < rollback_zxid))
+        return;
+
     if (uncommitted_transactions.empty() || uncommitted_transactions.back().zxid != rollback_zxid)
+    {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR, "Trying to rollback invalid ZXID ({}). It should be the last preprocessed.", rollback_zxid);
+    }
 
-    uncommitted_transactions.pop_back();
-    uncommitted_state.rollback(rollback_zxid);
+    // if an exception occurs during rollback, the best option is to terminate because we can end up in an inconsistent state
+    // we block memory tracking so we can avoid terminating if we're rollbacking because of memory limit
+    LockMemoryExceptionInThread blocker{VariableContext::Global};
+    try
+    {
+        uncommitted_transactions.pop_back();
+        uncommitted_state.rollback(rollback_zxid);
+    }
+    catch (...)
+    {
+        LOG_FATAL(&Poco::Logger::get("KeeperStorage"), "Failed to rollback log. Terminating to avoid incosistencies");
+        std::terminate();
+    }
 }
 
 KeeperStorage::Digest KeeperStorage::getNodesDigest(bool committed) const
 {
-    if (!digest_enabled)
+    if (!keeper_context->digest_enabled)
         return {.version = DigestVersion::NO_DIGEST};
 
     if (committed || uncommitted_transactions.empty())
@@ -2022,13 +2153,13 @@ KeeperStorage::Digest KeeperStorage::getNodesDigest(bool committed) const
 
 void KeeperStorage::removeDigest(const Node & node, const std::string_view path)
 {
-    if (digest_enabled)
+    if (keeper_context->digest_enabled)
         nodes_digest -= node.getDigest(path);
 }
 
 void KeeperStorage::addDigest(const Node & node, const std::string_view path)
 {
-    if (digest_enabled)
+    if (keeper_context->digest_enabled)
     {
         node.invalidateDigestCache();
         nodes_digest += node.getDigest(path);
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index f4fccd95adb..d160971f4ac 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -9,6 +9,7 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Coordination/KeeperContext.h>
 
 #include <absl/container/flat_hash_set.h>
 
@@ -72,10 +73,11 @@ public:
     enum DigestVersion : uint8_t
     {
         NO_DIGEST = 0,
-        V0 = 1
+        V1 = 1,
+        V2 = 2  // added system nodes that modify the digest on startup so digest from V0 is invalid
     };
 
-    static constexpr auto CURRENT_DIGEST_VERSION = DigestVersion::V0;
+    static constexpr auto CURRENT_DIGEST_VERSION = DigestVersion::V2;
 
     struct ResponseForSession
     {
@@ -336,11 +338,15 @@ public:
 
     Digest getNodesDigest(bool committed) const;
 
-    const bool digest_enabled;
+    KeeperContextPtr keeper_context;
 
     const String superdigest;
 
-    KeeperStorage(int64_t tick_time_ms, const String & superdigest_, bool digest_enabled_);
+    bool initialized{false};
+
+    KeeperStorage(int64_t tick_time_ms, const String & superdigest_, const KeeperContextPtr & keeper_context_, bool initialize_system_nodes = true);
+
+    void initializeSystemNodes();
 
     /// Allocate new session id with the specified timeouts
     int64_t getSessionID(int64_t session_timeout_ms)
@@ -375,7 +381,7 @@ public:
         int64_t new_last_zxid,
         bool check_acl = true,
         std::optional<Digest> digest = std::nullopt);
-    void rollbackRequest(int64_t rollback_zxid);
+    void rollbackRequest(int64_t rollback_zxid, bool allow_missing);
 
     void finalize();
 
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index 20c33880139..4beb40f6efd 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -2,6 +2,7 @@
 #include <gtest/gtest.h>
 #include "Common/ZooKeeper/IKeeper.h"
 
+#include "Coordination/KeeperContext.h"
 #include "Coordination/KeeperStorage.h"
 #include "Core/Defines.h"
 #include "IO/WriteHelpers.h"
@@ -63,7 +64,10 @@ struct CompressionParam
 };
 
 class CoordinationTest : public ::testing::TestWithParam<CompressionParam>
-{};
+{
+protected:
+    DB::KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>();
+};
 
 TEST_P(CoordinationTest, BuildTest)
 {
@@ -1083,9 +1087,9 @@ TEST_P(CoordinationTest, TestStorageSnapshotSimple)
 {
     auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
 
-    DB::KeeperStorage storage(500, "", true);
+    DB::KeeperStorage storage(500, "", keeper_context);
     addNode(storage, "/hello", "world", 1);
     addNode(storage, "/hello/somepath", "somedata", 3);
     storage.session_id_counter = 5;
@@ -1099,7 +1103,7 @@ TEST_P(CoordinationTest, TestStorageSnapshotSimple)
 
     EXPECT_EQ(snapshot.snapshot_meta->get_last_log_idx(), 2);
     EXPECT_EQ(snapshot.session_id, 7);
-    EXPECT_EQ(snapshot.snapshot_container_size, 3);
+    EXPECT_EQ(snapshot.snapshot_container_size, 5);
     EXPECT_EQ(snapshot.session_and_timeout.size(), 2);
 
     auto buf = manager.serializeSnapshotToBuffer(snapshot);
@@ -1111,8 +1115,8 @@ TEST_P(CoordinationTest, TestStorageSnapshotSimple)
 
     auto [restored_storage, snapshot_meta, _] = manager.deserializeSnapshotFromBuffer(debuf);
 
-    EXPECT_EQ(restored_storage->container.size(), 3);
-    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 1);
+    EXPECT_EQ(restored_storage->container.size(), 5);
+    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 2);
     EXPECT_EQ(restored_storage->container.getValue("/hello").getChildren().size(), 1);
     EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").getChildren().size(), 0);
 
@@ -1131,9 +1135,9 @@ TEST_P(CoordinationTest, TestStorageSnapshotMoreWrites)
 {
     auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
 
-    DB::KeeperStorage storage(500, "", true);
+    DB::KeeperStorage storage(500, "", keeper_context);
     storage.getSessionID(130);
 
     for (size_t i = 0; i < 50; ++i)
@@ -1143,14 +1147,14 @@ TEST_P(CoordinationTest, TestStorageSnapshotMoreWrites)
 
     DB::KeeperStorageSnapshot snapshot(&storage, 50);
     EXPECT_EQ(snapshot.snapshot_meta->get_last_log_idx(), 50);
-    EXPECT_EQ(snapshot.snapshot_container_size, 51);
+    EXPECT_EQ(snapshot.snapshot_container_size, 53);
 
     for (size_t i = 50; i < 100; ++i)
     {
         addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
     }
 
-    EXPECT_EQ(storage.container.size(), 101);
+    EXPECT_EQ(storage.container.size(), 103);
 
     auto buf = manager.serializeSnapshotToBuffer(snapshot);
     manager.serializeSnapshotBufferToDisk(*buf, 50);
@@ -1160,7 +1164,7 @@ TEST_P(CoordinationTest, TestStorageSnapshotMoreWrites)
     auto debuf = manager.deserializeSnapshotBufferFromDisk(50);
     auto [restored_storage, meta, _] = manager.deserializeSnapshotFromBuffer(debuf);
 
-    EXPECT_EQ(restored_storage->container.size(), 51);
+    EXPECT_EQ(restored_storage->container.size(), 53);
     for (size_t i = 0; i < 50; ++i)
     {
         EXPECT_EQ(restored_storage->container.getValue("/hello_" + std::to_string(i)).getData(), "world_" + std::to_string(i));
@@ -1172,9 +1176,9 @@ TEST_P(CoordinationTest, TestStorageSnapshotManySnapshots)
 {
     auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
 
-    DB::KeeperStorage storage(500, "", true);
+    DB::KeeperStorage storage(500, "", keeper_context);
     storage.getSessionID(130);
 
     for (size_t j = 1; j <= 5; ++j)
@@ -1199,7 +1203,7 @@ TEST_P(CoordinationTest, TestStorageSnapshotManySnapshots)
 
     auto [restored_storage, meta, _] = manager.restoreFromLatestSnapshot();
 
-    EXPECT_EQ(restored_storage->container.size(), 251);
+    EXPECT_EQ(restored_storage->container.size(), 253);
 
     for (size_t i = 0; i < 250; ++i)
     {
@@ -1211,8 +1215,8 @@ TEST_P(CoordinationTest, TestStorageSnapshotMode)
 {
     auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
-    DB::KeeperStorage storage(500, "", true);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
+    DB::KeeperStorage storage(500, "", keeper_context);
     for (size_t i = 0; i < 50; ++i)
     {
         addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
@@ -1233,16 +1237,16 @@ TEST_P(CoordinationTest, TestStorageSnapshotMode)
             if (i % 2 == 0)
                 storage.container.erase("/hello_" + std::to_string(i));
         }
-        EXPECT_EQ(storage.container.size(), 26);
-        EXPECT_EQ(storage.container.snapshotSizeWithVersion().first, 102);
+        EXPECT_EQ(storage.container.size(), 28);
+        EXPECT_EQ(storage.container.snapshotSizeWithVersion().first, 104);
         EXPECT_EQ(storage.container.snapshotSizeWithVersion().second, 1);
         auto buf = manager.serializeSnapshotToBuffer(snapshot);
         manager.serializeSnapshotBufferToDisk(*buf, 50);
     }
     EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin" + params.extension));
-    EXPECT_EQ(storage.container.size(), 26);
+    EXPECT_EQ(storage.container.size(), 28);
     storage.clearGarbageAfterSnapshot();
-    EXPECT_EQ(storage.container.snapshotSizeWithVersion().first, 26);
+    EXPECT_EQ(storage.container.snapshotSizeWithVersion().first, 28);
     for (size_t i = 0; i < 50; ++i)
     {
         if (i % 2 != 0)
@@ -1264,8 +1268,8 @@ TEST_P(CoordinationTest, TestStorageSnapshotBroken)
 {
     auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
-    DB::KeeperStorage storage(500, "", true);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
+    DB::KeeperStorage storage(500, "", keeper_context);
     for (size_t i = 0; i < 50; ++i)
     {
         addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
@@ -1304,7 +1308,7 @@ nuraft::ptr<nuraft::log_entry> getLogEntryFromZKRequest(size_t term, int64_t ses
     return nuraft::cs_new<nuraft::log_entry>(term, buffer);
 }
 
-void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs, bool enable_compression)
+void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs, bool enable_compression, Coordination::KeeperContextPtr keeper_context)
 {
     using namespace Coordination;
     using namespace DB;
@@ -1314,7 +1318,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
 
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context);
     state_machine->init();
     DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true, enable_compression);
     changelog.init(state_machine->last_commit_index() + 1, settings->reserved_log_items);
@@ -1355,7 +1359,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     }
 
     SnapshotsQueue snapshots_queue1{1};
-    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, "./snapshots", settings);
+    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, "./snapshots", settings, keeper_context);
     restore_machine->init();
     EXPECT_EQ(restore_machine->last_commit_index(), total_logs - total_logs % settings->snapshot_distance);
 
@@ -1397,63 +1401,63 @@ TEST_P(CoordinationTest, TestStateMachineAndLogStore)
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 37, params.enable_compression);
+        testLogAndStateMachine(settings, 37, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 11, params.enable_compression);
+        testLogAndStateMachine(settings, 11, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40, params.enable_compression);
+        testLogAndStateMachine(settings, 40, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 20;
         settings->rotate_log_storage_interval = 30;
-        testLogAndStateMachine(settings, 40, params.enable_compression);
+        testLogAndStateMachine(settings, 40, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 0;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40, params.enable_compression);
+        testLogAndStateMachine(settings, 40, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 1;
         settings->reserved_log_items = 1;
         settings->rotate_log_storage_interval = 32;
-        testLogAndStateMachine(settings, 32, params.enable_compression);
+        testLogAndStateMachine(settings, 32, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 7;
         settings->rotate_log_storage_interval = 1;
-        testLogAndStateMachine(settings, 33, params.enable_compression);
+        testLogAndStateMachine(settings, 33, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 33, params.enable_compression);
+        testLogAndStateMachine(settings, 33, params.enable_compression, keeper_context);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 45, params.enable_compression);
+        testLogAndStateMachine(settings, 45, params.enable_compression, keeper_context);
     }
 }
 
@@ -1467,7 +1471,7 @@ TEST_P(CoordinationTest, TestEphemeralNodeRemove)
 
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings, keeper_context);
     state_machine->init();
 
     std::shared_ptr<ZooKeeperCreateRequest> request_c = std::make_shared<ZooKeeperCreateRequest>();
@@ -1634,9 +1638,9 @@ TEST_P(CoordinationTest, TestStorageSnapshotDifferentCompressions)
     auto params = GetParam();
 
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
 
-    DB::KeeperStorage storage(500, "", true);
+    DB::KeeperStorage storage(500, "", keeper_context);
     addNode(storage, "/hello", "world", 1);
     addNode(storage, "/hello/somepath", "somedata", 3);
     storage.session_id_counter = 5;
@@ -1652,14 +1656,14 @@ TEST_P(CoordinationTest, TestStorageSnapshotDifferentCompressions)
     manager.serializeSnapshotBufferToDisk(*buf, 2);
     EXPECT_TRUE(fs::exists("./snapshots/snapshot_2.bin" + params.extension));
 
-    DB::KeeperSnapshotManager new_manager("./snapshots", 3, !params.enable_compression);
+    DB::KeeperSnapshotManager new_manager("./snapshots", 3, keeper_context, !params.enable_compression);
 
     auto debuf = new_manager.deserializeSnapshotBufferFromDisk(2);
 
     auto [restored_storage, snapshot_meta, _] = new_manager.deserializeSnapshotFromBuffer(debuf);
 
-    EXPECT_EQ(restored_storage->container.size(), 3);
-    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 1);
+    EXPECT_EQ(restored_storage->container.size(), 5);
+    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 2);
     EXPECT_EQ(restored_storage->container.getValue("/hello").getChildren().size(), 1);
     EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").getChildren().size(), 0);
 
@@ -1786,9 +1790,9 @@ TEST_P(CoordinationTest, TestStorageSnapshotEqual)
     std::optional<UInt128> snapshot_hash;
     for (size_t i = 0; i < 15; ++i)
     {
-        DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+        DB::KeeperSnapshotManager manager("./snapshots", 3, keeper_context, params.enable_compression);
 
-        DB::KeeperStorage storage(500, "", true);
+        DB::KeeperStorage storage(500, "", keeper_context);
         addNode(storage, "/hello", "");
         for (size_t j = 0; j < 5000; ++j)
         {
@@ -1859,7 +1863,7 @@ TEST_P(CoordinationTest, TestUncommittedStateBasicCrud)
     using namespace DB;
     using namespace Coordination;
 
-    DB::KeeperStorage storage{500, "", true};
+    DB::KeeperStorage storage{500, "", keeper_context};
 
     constexpr std::string_view path = "/test";
 
@@ -1976,32 +1980,35 @@ TEST_P(CoordinationTest, TestListRequestTypes)
     using namespace DB;
     using namespace Coordination;
 
-    KeeperStorage storage{500, "", true};
+    KeeperStorage storage{500, "", keeper_context};
 
     int64_t zxid = 0;
 
-    static constexpr std::string_view path = "/test";
+    static constexpr std::string_view test_path = "/list_request_type/node";
 
-    const auto create_path = [&](bool is_ephemeral)
+    const auto create_path = [&](const auto & path, bool is_ephemeral, bool is_sequential = true)
     {
         const auto create_request = std::make_shared<ZooKeeperCreateRequest>();
         int new_zxid = ++zxid;
         create_request->path = path;
-        create_request->is_sequential = true;
+        create_request->is_sequential = is_sequential;
         create_request->is_ephemeral = is_ephemeral;
         storage.preprocessRequest(create_request, 1, 0, new_zxid);
         auto responses = storage.processRequest(create_request, 1, new_zxid);
 
         EXPECT_GE(responses.size(), 1);
+        EXPECT_EQ(responses[0].response->error, Coordination::Error::ZOK) << "Failed to create " << path;
         const auto & create_response = dynamic_cast<ZooKeeperCreateResponse &>(*responses[0].response);
         return create_response.path_created;
     };
 
+    create_path(parentPath(StringRef{test_path}).toString(), false, false);
+
     static constexpr size_t persistent_num = 5;
     std::unordered_set<std::string> expected_persistent_children;
     for (size_t i = 0; i < persistent_num; ++i)
     {
-        expected_persistent_children.insert(getBaseName(create_path(false)).toString());
+        expected_persistent_children.insert(getBaseName(create_path(test_path, false)).toString());
     }
     ASSERT_EQ(expected_persistent_children.size(), persistent_num);
 
@@ -2009,7 +2016,7 @@ TEST_P(CoordinationTest, TestListRequestTypes)
     std::unordered_set<std::string> expected_ephemeral_children;
     for (size_t i = 0; i < ephemeral_num; ++i)
     {
-        expected_ephemeral_children.insert(getBaseName(create_path(true)).toString());
+        expected_ephemeral_children.insert(getBaseName(create_path(test_path, true)).toString());
     }
     ASSERT_EQ(expected_ephemeral_children.size(), ephemeral_num);
 
@@ -2017,7 +2024,7 @@ TEST_P(CoordinationTest, TestListRequestTypes)
     {
         const auto list_request = std::make_shared<ZooKeeperFilteredListRequest>();
         int new_zxid = ++zxid;
-        list_request->path = parentPath(StringRef{path}).toString();
+        list_request->path = parentPath(StringRef{test_path}).toString();
         list_request->list_request_type = list_request_type;
         storage.preprocessRequest(list_request, 1, 0, new_zxid);
         auto responses = storage.processRequest(list_request, 1, new_zxid);
@@ -2120,6 +2127,20 @@ TEST_P(CoordinationTest, TestDurableState)
     }
 }
 
+TEST_P(CoordinationTest, TestCurrentApiVersion)
+{
+    using namespace Coordination;
+    KeeperStorage storage{500, "", keeper_context};
+    auto request = std::make_shared<ZooKeeperGetRequest>();
+    request->path = DB::keeper_api_version_path;
+    auto responses = storage.processRequest(request, 0, std::nullopt, true, true);
+    const auto & get_response = getSingleResponse<ZooKeeperGetResponse>(responses);
+    uint8_t keeper_version{0};
+    DB::ReadBufferFromOwnString buf(get_response.data);
+    DB::readIntText(keeper_version, buf);
+    EXPECT_EQ(keeper_version, static_cast<uint8_t>(current_keeper_api_version));
+}
+
 INSTANTIATE_TEST_SUITE_P(CoordinationTestSuite,
     CoordinationTest,
     ::testing::ValuesIn(std::initializer_list<CompressionParam>{
diff --git a/src/Core/BackgroundSchedulePool.cpp b/src/Core/BackgroundSchedulePool.cpp
index 6f5a5a1fa54..b7a33c4930d 100644
--- a/src/Core/BackgroundSchedulePool.cpp
+++ b/src/Core/BackgroundSchedulePool.cpp
@@ -73,6 +73,11 @@ bool BackgroundSchedulePoolTaskInfo::activateAndSchedule()
     return true;
 }
 
+std::unique_lock<std::mutex> BackgroundSchedulePoolTaskInfo::getExecLock()
+{
+    return std::unique_lock{exec_mutex};
+}
+
 void BackgroundSchedulePoolTaskInfo::execute()
 {
     Stopwatch watch;
diff --git a/src/Core/BackgroundSchedulePool.h b/src/Core/BackgroundSchedulePool.h
index ebd0d52ee20..36cbad145c9 100644
--- a/src/Core/BackgroundSchedulePool.h
+++ b/src/Core/BackgroundSchedulePool.h
@@ -121,6 +121,10 @@ public:
     /// get Coordination::WatchCallback needed for notifications from ZooKeeper watches.
     Coordination::WatchCallback getWatchCallback();
 
+    /// Returns lock that protects from concurrent task execution.
+    /// This lock should not be held for a long time.
+    std::unique_lock<std::mutex> getExecLock();
+
 private:
     friend class TaskNotification;
     friend class BackgroundSchedulePool;
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index 34e6c08c718..3b7595eb886 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -8,6 +8,7 @@
 
 #include <Common/assert_cast.h>
 
+#include <Columns/ColumnAggregateFunction.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnSparse.h>
 
@@ -68,9 +69,27 @@ static ReturnType checkColumnStructure(const ColumnWithTypeAndName & actual, con
                 actual_column = &column_sparse->getValuesColumn();
     }
 
-    if (actual_column->getName() != expected.column->getName())
-        return onError<ReturnType>("Block structure mismatch in " + std::string(context_description) + " stream: different columns:\n"
-            + actual.dumpStructure() + "\n" + expected.dumpStructure(), code);
+    const auto * actual_column_maybe_agg = typeid_cast<const ColumnAggregateFunction *>(actual_column);
+    const auto * expected_column_maybe_agg = typeid_cast<const ColumnAggregateFunction *>(expected.column.get());
+    if (actual_column_maybe_agg && expected_column_maybe_agg)
+    {
+        if (!actual_column_maybe_agg->getAggregateFunction()->haveSameStateRepresentation(*expected_column_maybe_agg->getAggregateFunction()))
+            return onError<ReturnType>(
+                fmt::format(
+                    "Block structure mismatch in {} stream: different columns:\n{}\n{}",
+                    context_description,
+                    actual.dumpStructure(),
+                    expected.dumpStructure()),
+                code);
+    }
+    else if (actual_column->getName() != expected.column->getName())
+        return onError<ReturnType>(
+            fmt::format(
+                "Block structure mismatch in {} stream: different columns:\n{}\n{}",
+                context_description,
+                actual.dumpStructure(),
+                expected.dumpStructure()),
+            code);
 
     if (isColumnConst(*actual.column) && isColumnConst(*expected.column))
     {
diff --git a/src/Core/Joins.cpp b/src/Core/Joins.cpp
new file mode 100644
index 00000000000..1cd7215335f
--- /dev/null
+++ b/src/Core/Joins.cpp
@@ -0,0 +1,79 @@
+#include <Core/Joins.h>
+
+namespace DB
+{
+
+const char * toString(JoinKind kind)
+{
+    switch (kind)
+    {
+        case JoinKind::Inner: return "INNER";
+        case JoinKind::Left: return "LEFT";
+        case JoinKind::Right: return "RIGHT";
+        case JoinKind::Full: return "FULL";
+        case JoinKind::Cross: return "CROSS";
+        case JoinKind::Comma: return "COMMA";
+    }
+};
+
+const char * toString(JoinStrictness strictness)
+{
+    switch (strictness)
+    {
+        case JoinStrictness::Unspecified: return "UNSPECIFIED";
+        case JoinStrictness::RightAny: return "RIGHT_ANY";
+        case JoinStrictness::Any: return "ANY";
+        case JoinStrictness::All: return "ALL";
+        case JoinStrictness::Asof: return "ASOF";
+        case JoinStrictness::Semi: return "SEMI";
+        case JoinStrictness::Anti: return "ANTI";
+    }
+}
+
+const char * toString(JoinLocality locality)
+{
+    switch (locality)
+    {
+        case JoinLocality::Unspecified: return "UNSPECIFIED";
+        case JoinLocality::Local: return "LOCAL";
+        case JoinLocality::Global: return "GLOBAL";
+    }
+}
+
+const char * toString(ASOFJoinInequality asof_join_inequality)
+{
+    switch (asof_join_inequality)
+    {
+        case ASOFJoinInequality::None: return "NONE";
+        case ASOFJoinInequality::Less: return "LESS";
+        case ASOFJoinInequality::Greater: return "GREATER";
+        case ASOFJoinInequality::LessOrEquals: return "LESS_OR_EQUALS";
+        case ASOFJoinInequality::GreaterOrEquals: return "GREATER_OR_EQUALS";
+    }
+}
+
+const char * toString(JoinAlgorithm join_algorithm)
+{
+    switch (join_algorithm)
+    {
+        case JoinAlgorithm::DEFAULT: return "DEFAULT";
+        case JoinAlgorithm::AUTO: return "AUTO";
+        case JoinAlgorithm::HASH: return "HASH";
+        case JoinAlgorithm::PARTIAL_MERGE: return "PARTIAL_MERGE";
+        case JoinAlgorithm::PREFER_PARTIAL_MERGE: return "PREFER_PARTIAL_MERGE";
+        case JoinAlgorithm::PARALLEL_HASH: return "PARALLEL_HASH";
+        case JoinAlgorithm::DIRECT: return "DIRECT";
+        case JoinAlgorithm::FULL_SORTING_MERGE: return "FULL_SORTING_MERGE";
+    }
+}
+
+const char * toString(JoinTableSide join_table_side)
+{
+    switch (join_table_side)
+    {
+        case JoinTableSide::Left: return "LEFT";
+        case JoinTableSide::Right: return "RIGHT";
+    }
+}
+
+}
diff --git a/src/Core/Joins.h b/src/Core/Joins.h
new file mode 100644
index 00000000000..7c91c5a5c16
--- /dev/null
+++ b/src/Core/Joins.h
@@ -0,0 +1,119 @@
+#pragma once
+
+#include <string_view>
+
+namespace DB
+{
+
+/// Join method.
+enum class JoinKind
+{
+    Inner, /// Leave only rows that was JOINed.
+    Left, /// If in "right" table there is no corresponding rows, use default values instead.
+    Right,
+    Full,
+    Cross, /// Direct product. Strictness and condition doesn't matter.
+    Comma /// Same as direct product. Intended to be converted to INNER JOIN with conditions from WHERE.
+};
+
+const char * toString(JoinKind kind);
+
+inline constexpr bool isLeft(JoinKind kind)         { return kind == JoinKind::Left; }
+inline constexpr bool isRight(JoinKind kind)        { return kind == JoinKind::Right; }
+inline constexpr bool isInner(JoinKind kind)        { return kind == JoinKind::Inner; }
+inline constexpr bool isFull(JoinKind kind)         { return kind == JoinKind::Full; }
+inline constexpr bool isCrossOrComma(JoinKind kind) { return kind == JoinKind::Comma || kind == JoinKind::Cross; }
+inline constexpr bool isRightOrFull(JoinKind kind)  { return kind == JoinKind::Right || kind == JoinKind::Full; }
+inline constexpr bool isLeftOrFull(JoinKind kind)   { return kind == JoinKind::Left  || kind == JoinKind::Full; }
+inline constexpr bool isInnerOrRight(JoinKind kind) { return kind == JoinKind::Inner || kind == JoinKind::Right; }
+inline constexpr bool isInnerOrLeft(JoinKind kind)  { return kind == JoinKind::Inner || kind == JoinKind::Left; }
+
+/// Allows more optimal JOIN for typical cases.
+enum class JoinStrictness
+{
+    Unspecified,
+    RightAny, /// Old ANY JOIN. If there are many suitable rows in right table, use any from them to join.
+    Any, /// Semi Join with any value from filtering table. For LEFT JOIN with Any and RightAny are the same.
+    All, /// If there are many suitable rows to join, use all of them and replicate rows of "left" table (usual semantic of JOIN).
+    Asof, /// For the last JOIN column, pick the latest value
+    Semi, /// LEFT or RIGHT. SEMI LEFT JOIN filters left table by values exists in right table. SEMI RIGHT - otherwise.
+    Anti, /// LEFT or RIGHT. Same as SEMI JOIN but filter values that are NOT exists in other table.
+};
+
+const char * toString(JoinStrictness strictness);
+
+/// Algorithm for distributed query processing.
+enum class JoinLocality
+{
+    Unspecified,
+    Local, /// Perform JOIN, using only data available on same servers (co-located data).
+    Global /// Collect and merge data from remote servers, and broadcast it to each server.
+};
+
+const char * toString(JoinLocality locality);
+
+/// ASOF JOIN inequality type
+enum class ASOFJoinInequality
+{
+    None,
+    Less,
+    Greater,
+    LessOrEquals,
+    GreaterOrEquals,
+};
+
+const char * toString(ASOFJoinInequality asof_join_inequality);
+
+inline constexpr ASOFJoinInequality getASOFJoinInequality(std::string_view func_name)
+{
+    ASOFJoinInequality inequality = ASOFJoinInequality::None;
+
+    if (func_name == "less")
+        inequality = ASOFJoinInequality::Less;
+    else if (func_name == "greater")
+        inequality = ASOFJoinInequality::Greater;
+    else if (func_name == "lessOrEquals")
+        inequality = ASOFJoinInequality::LessOrEquals;
+    else if (func_name == "greaterOrEquals")
+        inequality = ASOFJoinInequality::GreaterOrEquals;
+
+    return inequality;
+}
+
+inline constexpr ASOFJoinInequality reverseASOFJoinInequality(ASOFJoinInequality inequality)
+{
+    if (inequality == ASOFJoinInequality::Less)
+        return ASOFJoinInequality::Greater;
+    else if (inequality == ASOFJoinInequality::Greater)
+        return ASOFJoinInequality::Less;
+    else if (inequality == ASOFJoinInequality::LessOrEquals)
+        return ASOFJoinInequality::GreaterOrEquals;
+    else if (inequality == ASOFJoinInequality::GreaterOrEquals)
+        return ASOFJoinInequality::LessOrEquals;
+
+    return ASOFJoinInequality::None;
+}
+
+enum class JoinAlgorithm
+{
+    DEFAULT = 0,
+    AUTO,
+    HASH,
+    PARTIAL_MERGE,
+    PREFER_PARTIAL_MERGE,
+    PARALLEL_HASH,
+    DIRECT,
+    FULL_SORTING_MERGE,
+};
+
+const char * toString(JoinAlgorithm join_algorithm);
+
+enum class JoinTableSide
+{
+    Left,
+    Right
+};
+
+const char * toString(JoinTableSide join_table_side);
+
+}
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
index 584720694d7..7e6ae4f5f82 100644
--- a/src/Core/ProtocolDefines.h
+++ b/src/Core/ProtocolDefines.h
@@ -52,10 +52,19 @@
 /// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
 /// later is just a number for server version (one number instead of commit SHA)
 /// for simplicity (sometimes it may be more convenient in some use cases).
-#define DBMS_TCP_PROTOCOL_VERSION 54457
+#define DBMS_TCP_PROTOCOL_VERSION 54460
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS_IN_INSERT 54456
 
 #define DBMS_MIN_PROTOCOL_VERSION_WITH_VIEW_IF_PERMITTED 54457
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM 54458
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY 54458
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS 54459
+
+/// The server will send query elapsed run time in the Progress packet.
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS 54460
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 48f574ae0fd..e95d1f3e81d 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -212,7 +212,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     \
     M(Bool, insert_deduplicate, true, "For INSERT queries in the replicated table, specifies that deduplication of insertings blocks should be performed", 0) \
     \
-    M(UInt64, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled.", 0) \
+    M(UInt64Auto, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled.", 0) \
     M(Milliseconds, insert_quorum_timeout, 600000, "", 0) \
     M(Bool, insert_quorum_parallel, true, "For quorum INSERT queries - enable to make parallel inserts without linearizability", 0) \
     M(UInt64, select_sequential_consistency, 0, "For SELECT queries from the replicated table, throw an exception if the replica does not have a chunk written with the quorum; do not read the parts that have not yet been written with the quorum.", 0) \
@@ -247,7 +247,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     \
     M(Bool, join_use_nulls, false, "Use NULLs for non-joined rows of outer JOINs for types that can be inside Nullable. If false, use default value of corresponding columns data type.", IMPORTANT) \
     \
-    M(JoinStrictness, join_default_strictness, JoinStrictness::ALL, "Set default strictness in JOIN query. Possible values: empty string, 'ANY', 'ALL'. If empty, query without strictness will throw exception.", 0) \
+    M(JoinStrictness, join_default_strictness, JoinStrictness::All, "Set default strictness in JOIN query. Possible values: empty string, 'ANY', 'ALL'. If empty, query without strictness will throw exception.", 0) \
     M(Bool, any_join_distinct_right_table_keys, false, "Enable old ANY JOIN logic with many-to-one left-to-right table keys mapping for all ANY JOINs. It leads to confusing not equal results for 't1 ANY LEFT JOIN t2' and 't2 ANY RIGHT JOIN t1'. ANY RIGHT JOIN needs one-to-many keys mapping to be consistent with LEFT one.", IMPORTANT) \
     \
     M(UInt64, preferred_block_size_bytes, 1000000, "", 0) \
@@ -280,6 +280,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(UInt64, http_max_fields, 1000000, "Maximum number of fields in HTTP header", 0) \
     M(UInt64, http_max_field_name_size, 1048576, "Maximum length of field name in HTTP header", 0) \
     M(UInt64, http_max_field_value_size, 1048576, "Maximum length of field value in HTTP header", 0) \
+    M(UInt64, http_max_chunk_size, 100_GiB, "Maximum value of a chunk size in HTTP chunked transfer encoding", 0) \
     M(Bool, http_skip_not_found_url_for_globs, true, "Skip url's for globs with HTTP_NOT_FOUND error", 0) \
     M(Bool, optimize_throw_if_noop, false, "If setting is enabled and OPTIMIZE query didn't actually assign a merge then an explanatory exception is thrown", 0) \
     M(Bool, use_index_for_in_with_subqueries, true, "Try using an index if there is a subquery or a table expression on the right side of the IN operator.", 0) \
@@ -408,6 +409,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(UInt64, low_cardinality_max_dictionary_size, 8192, "Maximum size (in rows) of shared global dictionary for LowCardinality type.", 0) \
     M(Bool, low_cardinality_use_single_dictionary_for_part, false, "LowCardinality type serialization setting. If is true, than will use additional keys when global dictionary overflows. Otherwise, will create several shared dictionaries.", 0) \
     M(Bool, decimal_check_overflow, true, "Check overflow of decimal arithmetic/comparison operations", 0) \
+    M(Bool, allow_custom_error_code_in_throwif, false, "Enable custom error code in function throwIf(). If true, thrown exceptions may have unexpected error codes.", 0) \
     \
     M(Bool, prefer_localhost_replica, true, "If it's true then queries will be always sent to local replica (if it exists). If it's false then replica to send a query will be chosen between local and remote ones according to load_balancing", 0) \
     M(UInt64, max_fetch_partition_retries_count, 5, "Amount of retries while fetching partition from another host.", 0) \
@@ -538,11 +540,12 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, engine_file_allow_create_multiple_files, false, "Enables or disables creating a new file on each insert in file engine tables if format has suffix.", 0) \
     M(Bool, allow_experimental_database_replicated, false, "Allow to create databases with Replicated engine", 0) \
     M(UInt64, database_replicated_initial_query_timeout_sec, 300, "How long initial DDL query should wait for Replicated database to precess previous DDL queue entries", 0) \
+    M(Bool, database_replicated_enforce_synchronous_settings, false, "Enforces synchronous waiting for some queries (see also database_atomic_wait_for_drop_and_detach_synchronously, mutation_sync, replication_alter_partitions_sync). Not recommended to enable these settings.", 0) \
     M(UInt64, max_distributed_depth, 5, "Maximum distributed query depth", 0) \
     M(Bool, database_replicated_always_detach_permanently, false, "Execute DETACH TABLE as DETACH TABLE PERMANENTLY if database engine is Replicated", 0) \
     M(Bool, database_replicated_allow_only_replicated_engine, false, "Allow to create only Replicated tables in database with engine Replicated", 0) \
     M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result", 0) \
-    M(UInt64, distributed_ddl_entry_format_version, 2, "Version of DDL entry to write into ZooKeeper", 0) \
+    M(UInt64, distributed_ddl_entry_format_version, 3, "Compatibility version of distributed DDL (ON CLUSTER) queries", 0) \
     \
     M(UInt64, external_storage_max_read_rows, 0, "Limit maximum number of rows when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializedMySQL. If equal to 0, this setting is disabled", 0) \
     M(UInt64, external_storage_max_read_bytes, 0, "Limit maximum number of bytes when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializedMySQL. If equal to 0, this setting is disabled", 0)  \
@@ -557,6 +560,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, query_plan_enable_optimizations, true, "Apply optimizations to query plan", 0) \
     M(UInt64, query_plan_max_optimizations_to_apply, 10000, "Limit the total number of optimizations applied to query plan. If zero, ignored. If limit reached, throw exception", 0) \
     M(Bool, query_plan_filter_push_down, true, "Allow to push down filter by predicate query plan step", 0) \
+    M(Bool, query_plan_optimize_primary_key, true, "Analyze primary key using query plan (instead of AST)", 0) \
     M(UInt64, regexp_max_matches_per_row, 1000, "Max matches of any single regexp per row, used to safeguard 'extractAllGroupsHorizontal' against consuming too much memory with greedy RE.", 0) \
     \
     M(UInt64, limit, 0, "Limit on read rows from the most 'end' result for select query, default 0 means no limit length", 0) \
@@ -589,6 +593,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, enable_filesystem_cache_on_write_operations, false, "Write into cache on write operations. To actually work this setting requires be added to disk config too", 0) \
     M(Bool, enable_filesystem_cache_log, false, "Allows to record the filesystem caching log for each query", 0) \
     M(Bool, read_from_filesystem_cache_if_exists_otherwise_bypass_cache, false, "", 0) \
+    M(Bool, enable_filesystem_cache_on_lower_level, true, "If read buffer supports caching inside threadpool, allow it to do it, otherwise cache outside ot threadpool. Do not use this setting, it is needed for testing", 0) \
     M(Bool, skip_download_if_exceeds_query_cache, true, "Skip download from remote filesystem if exceeds query cache size", 0) \
     M(UInt64, max_query_cache_size, (128UL * 1024 * 1024 * 1024), "Max remote filesystem cache size that can be used by a single query", 0) \
     \
@@ -606,6 +611,12 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, allow_deprecated_database_ordinary, false, "Allow to create databases with deprecated Ordinary engine", 0) \
     M(Bool, allow_deprecated_syntax_for_merge_tree, false, "Allow to create *MergeTree tables with deprecated engine definition syntax", 0) \
     \
+    M(Bool, schema_inference_use_cache_for_file, true, "Use cache in schema inference while using file table function", 0) \
+    M(Bool, schema_inference_use_cache_for_s3, true, "Use cache in schema inference while using s3 table function", 0) \
+    M(Bool, schema_inference_use_cache_for_hdfs, true, "Use cache in schema inference while using hdfs table function", 0) \
+    M(Bool, schema_inference_use_cache_for_url, true, "Use cache in schema inference while using url table function", 0) \
+    M(Bool, schema_inference_cache_require_modification_time_for_url, true, "Use schema from cache for URL with last modification time validation (for urls with Last-Modified header)", 0) \
+    \
     M(String, compatibility, "", "Changes other settings according to provided ClickHouse version. If we know that we changed some behaviour in ClickHouse by changing some settings in some version, this compatibility setting will control these settings", 0) \
     \
     M(Map, additional_table_filters, "", "Additional filter expression which would be applied after reading from specified table. Syntax: {'table1': 'expression', 'database.table2': 'expression'}", 0) \
@@ -626,6 +637,7 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, compatibility_ignore_auto_increment_in_create_table, false, "Ignore AUTO_INCREMENT keyword in column declaration if true, otherwise return error. It simplifies migration from MySQL", 0) \
     M(Bool, multiple_joins_try_to_keep_original_names, false, "Do not add aliases to top level expression list on multiple joins rewrite", 0) \
     M(Bool, optimize_distinct_in_order, true, "Enable DISTINCT optimization if some columns in DISTINCT form a prefix of sorting. For example, prefix of sorting key in merge tree or ORDER BY statement", 0) \
+    M(Bool, optimize_sorting_by_input_stream_properties, true, "Optimize sorting by sorting properties of input stream", 0) \
     // End of COMMON_SETTINGS
     // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS and move obsolete settings to OBSOLETE_SETTINGS.
 
@@ -704,7 +716,12 @@ static constexpr UInt64 operator""_GiB(unsigned long long value)
     M(Bool, input_format_orc_skip_columns_with_unsupported_types_in_schema_inference, false, "Skip columns with unsupported types while schema inference for format ORC", 0) \
     M(Bool, input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference, false, "Skip columns with unsupported types while schema inference for format Arrow", 0) \
     M(String, column_names_for_schema_inference, "", "The list of column names to use in schema inference for formats without column names. The format: 'column1,column2,column3,...'", 0) \
+    M(String, schema_inference_hints, "", "The list of column names and types to use in schema inference for formats without column names. The format: 'column_name1 column_type1, column_name2 column_type2, ...'", 0) \
     M(Bool, input_format_json_read_bools_as_numbers, true, "Allow to parse bools as numbers in JSON input formats", 0) \
+    M(Bool, input_format_json_try_infer_numbers_from_strings, true, "Try to infer numbers from string fields while schema inference", 0) \
+    M(Bool, input_format_try_infer_integers, true, "Try to infer numbers from string fields while schema inference in text formats", 0) \
+    M(Bool, input_format_try_infer_dates, true, "Try to infer dates from string fields while schema inference in text formats", 0) \
+    M(Bool, input_format_try_infer_datetimes, true, "Try to infer datetimes from string fields while schema inference in text formats", 0) \
     M(Bool, input_format_protobuf_flatten_google_wrappers, false, "Enable Google wrappers for regular non-nested columns, e.g. google.protobuf.StringValue 'str' for String column 'str'. For Nullable columns empty wrappers are recognized as defaults, and missing as nulls", 0) \
     M(Bool, output_format_protobuf_nullables_with_google_wrappers, false, "When serializing Nullable columns with Google wrappers, serialize default values as empty wrappers. If turned off, default and null values are not serialized", 0) \
     M(UInt64, input_format_csv_skip_first_lines, 0, "Skip specified number of lines at the beginning of data in CSV format", 0) \
diff --git a/src/Core/SettingsChangesHistory.h b/src/Core/SettingsChangesHistory.h
index ba60fb99308..8d0e69f4b29 100644
--- a/src/Core/SettingsChangesHistory.h
+++ b/src/Core/SettingsChangesHistory.h
@@ -81,7 +81,8 @@ static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> sett
         {"22.7", {{"cross_to_inner_join_rewrite", 1, 2, "Force rewrite comma join to inner"},
                   {"enable_positional_arguments", false, true, "Enable positional arguments feature by default"},
                   {"format_csv_allow_single_quotes", true, false, "Most tools don't treat single quote in CSV specially, don't do it by default too"}}},
-        {"22.6", {{"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"}}},
+        {"22.6", {{"output_format_json_named_tuples_as_objects", false, true, "Allow to serialize named tuples as JSON objects in JSON formats by default"},
+                  {"input_format_skip_unknown_fields", false, true, "Optimize reading subset of columns for some input formats"}}},
         {"22.5", {{"memory_overcommit_ratio_denominator", 0, 1073741824, "Enable memory overcommit feature by default"},
                   {"memory_overcommit_ratio_denominator_for_user", 0, 1073741824, "Enable memory overcommit feature by default"}}},
         {"22.4", {{"allow_settings_after_format_in_insert", true, false, "Do not allow SETTINGS after FORMAT for INSERT queries because ClickHouse interpret SETTINGS as some values, which is misleading"}}},
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index b832096c86c..616026520db 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -26,8 +26,8 @@ IMPLEMENT_SETTING_ENUM(LoadBalancing, ErrorCodes::UNKNOWN_LOAD_BALANCING,
 
 IMPLEMENT_SETTING_ENUM(JoinStrictness, ErrorCodes::UNKNOWN_JOIN,
     {{"",    JoinStrictness::Unspecified},
-     {"ALL", JoinStrictness::ALL},
-     {"ANY", JoinStrictness::ANY}})
+     {"ALL", JoinStrictness::All},
+     {"ANY", JoinStrictness::Any}})
 
 
 IMPLEMENT_SETTING_MULTI_ENUM(JoinAlgorithm, ErrorCodes::UNKNOWN_JOIN,
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index b8a2bdb48b0..308d53ff690 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -1,12 +1,14 @@
 #pragma once
 
 #include <Core/SettingsFields.h>
+#include <Core/Joins.h>
 #include <QueryPipeline/SizeLimits.h>
 #include <Formats/FormatSettings.h>
 
 
 namespace DB
 {
+
 enum class LoadBalancing
 {
     /// among replicas with a minimum number of errors selected randomly
@@ -26,28 +28,8 @@ enum class LoadBalancing
 
 DECLARE_SETTING_ENUM(LoadBalancing)
 
-
-enum class JoinStrictness
-{
-    Unspecified = 0, /// Query JOIN without strictness will throw Exception.
-    ALL, /// Query JOIN without strictness -> ALL JOIN ...
-    ANY, /// Query JOIN without strictness -> ANY JOIN ...
-};
-
 DECLARE_SETTING_ENUM(JoinStrictness)
 
-enum class JoinAlgorithm
-{
-    DEFAULT = 0,
-    AUTO,
-    HASH,
-    PARTIAL_MERGE,
-    PREFER_PARTIAL_MERGE,
-    PARALLEL_HASH,
-    DIRECT,
-    FULL_SORTING_MERGE,
-};
-
 DECLARE_SETTING_MULTI_ENUM(JoinAlgorithm)
 
 
@@ -200,4 +182,5 @@ DECLARE_SETTING_ENUM_WITH_RENAME(EnumComparingMode, FormatSettings::EnumComparin
 DECLARE_SETTING_ENUM_WITH_RENAME(EscapingRule, FormatSettings::EscapingRule)
 
 DECLARE_SETTING_ENUM_WITH_RENAME(MsgPackUUIDRepresentation, FormatSettings::MsgPackUUIDRepresentation)
+
 }
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index d77a510d7f9..5b1b6b10cc2 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -153,6 +153,9 @@ template struct SettingFieldNumber<Int64>;
 template struct SettingFieldNumber<float>;
 template struct SettingFieldNumber<bool>;
 
+template struct SettingAutoWrapper<SettingFieldNumber<UInt64>>;
+template struct SettingAutoWrapper<SettingFieldNumber<Int64>>;
+template struct SettingAutoWrapper<SettingFieldNumber<float>>;
 
 namespace
 {
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 20f2b34084e..f01ac37d3cc 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -58,11 +58,82 @@ using SettingFieldInt64 = SettingFieldNumber<Int64>;
 using SettingFieldFloat = SettingFieldNumber<float>;
 using SettingFieldBool = SettingFieldNumber<bool>;
 
-
-/** Unlike SettingFieldUInt64, supports the value of 'auto' - the number of processor cores without taking into account SMT.
-  * A value of 0 is also treated as auto.
-  * When serializing, `auto` is written in the same way as 0.
+/** Wraps any SettingField to support special value 'auto' that can be checked with `is_auto` flag.
+  * Note about serialization:
+  * The new versions with `SettingsWriteFormat::STRINGS_WITH_FLAGS` serialize values as a string.
+  * In legacy SettingsWriteFormat mode, functions `read/writeBinary` would serialize values as a binary, and 'is_auto' would be ignored.
+  * It's possible to upgrade settings from regular type to wrapped ones and keep compatibility with old versions,
+  * but when serializing 'auto' old version will see binary representation of the default value.
   */
+template <typename Base>
+struct SettingAutoWrapper
+{
+    constexpr static auto keyword = "auto";
+    static bool isAuto(const Field & f) { return f.getType() == Field::Types::String && f.safeGet<const String &>() == keyword; }
+    static bool isAuto(const String & str) { return str == keyword; }
+
+    using Type = typename Base::Type;
+
+    Base base;
+    bool is_auto = false;
+    bool changed = false;
+
+    explicit SettingAutoWrapper() : is_auto(true) {}
+    explicit SettingAutoWrapper(Type val) : is_auto(false) { base = Base(val); }
+
+    explicit SettingAutoWrapper(const Field & f)
+        : is_auto(isAuto(f))
+    {
+        if (!is_auto)
+            base = Base(f);
+    }
+
+    SettingAutoWrapper & operator=(const Field & f)
+    {
+        changed = true;
+        if (is_auto = isAuto(f); !is_auto)
+            base = f;
+        return *this;
+    }
+
+    explicit operator Field() const { return is_auto ? Field(keyword) : Field(base); }
+
+    String toString() const { return is_auto ? keyword : base.toString(); }
+
+    void parseFromString(const String & str)
+    {
+        changed = true;
+        if (is_auto = isAuto(str); !is_auto)
+            base.parseFromString(str);
+    }
+
+    void writeBinary(WriteBuffer & out) const
+    {
+        if (is_auto)
+            Base().writeBinary(out); /// serialize default value
+        else
+            base.writeBinary(out);
+    }
+
+    /*
+     * That it is fine to reset `is_auto` here and to use default value in case `is_auto`
+     * because settings will be serialized only if changed.
+     * If they were changed they were requested to use explicit value instead of `auto`.
+     * And so interactions between client-server, and server-server (distributed queries), should be OK.
+     */
+    void readBinary(ReadBuffer & in) { changed = true; is_auto = false; base.readBinary(in); }
+
+    Type valueOr(Type default_value) const { return is_auto ? default_value : base.value; }
+};
+
+using SettingFieldUInt64Auto = SettingAutoWrapper<SettingFieldUInt64>;
+using SettingFieldInt64Auto = SettingAutoWrapper<SettingFieldInt64>;
+using SettingFieldFloatAuto = SettingAutoWrapper<SettingFieldFloat>;
+
+/* Similar to SettingFieldUInt64Auto with small differences to behave like regular UInt64, supported to compatibility.
+ * When setting to 'auto' it becomes equal to  the number of processor cores without taking into account SMT.
+ * A value of 0 is also treated as 'auto', so 'auto' is parsed and serialized in the same way as 0.
+ */
 struct SettingFieldMaxThreads
 {
     bool is_auto;
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index ff81f69383c..59018fb13b4 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -42,6 +42,22 @@ void SortColumnDescription::explain(JSONBuilder::JSONMap & map) const
     map.add("With Fill", with_fill);
 }
 
+bool SortDescription::hasPrefix(const SortDescription & prefix) const
+{
+    if (prefix.empty())
+        return true;
+
+    if (prefix.size() > size())
+        return false;
+
+    for (size_t i = 0; i < prefix.size(); ++i)
+    {
+        if ((*this)[i] != prefix[i])
+            return false;
+    }
+    return true;
+}
+
 #if USE_EMBEDDED_COMPILER
 
 static CHJIT & getJITInstance()
diff --git a/src/Core/SortDescription.h b/src/Core/SortDescription.h
index 6c19ce36115..0025e44b489 100644
--- a/src/Core/SortDescription.h
+++ b/src/Core/SortDescription.h
@@ -8,8 +8,7 @@
 #include <Core/SettingsEnums.h>
 #include <Common/IntervalKind.h>
 #include <DataTypes/IDataType.h>
-
-class Collator;
+#include <Columns/Collator.h>
 
 namespace DB
 {
@@ -65,9 +64,18 @@ struct SortColumnDescription
     {
     }
 
-    bool operator == (const SortColumnDescription & other) const
+    static bool compareCollators(const std::shared_ptr<Collator> & a, const std::shared_ptr<Collator> & b)
     {
-        return column_name == other.column_name && direction == other.direction && nulls_direction == other.nulls_direction;
+        if (unlikely(a && b))
+            return *a == *b;
+
+        return a == b;
+    }
+
+    bool operator==(const SortColumnDescription & other) const
+    {
+        return column_name == other.column_name && direction == other.direction && nulls_direction == other.nulls_direction
+            && compareCollators(collator, other.collator);
     }
 
     bool operator != (const SortColumnDescription & other) const
@@ -89,6 +97,13 @@ struct SortColumnDescriptionWithColumnIndex
         : base(std::move(description_)), column_number(column_number_)
     {
     }
+
+    bool operator==(const SortColumnDescriptionWithColumnIndex & other) const
+    {
+        return base == other.base && column_number == other.column_number;
+    }
+
+    bool operator!=(const SortColumnDescriptionWithColumnIndex & other) const { return !(*this == other); }
 };
 
 class CompiledSortDescriptionFunctionHolder;
@@ -104,6 +119,8 @@ public:
     std::shared_ptr<CompiledSortDescriptionFunctionHolder> compiled_sort_description_holder;
     size_t min_count_to_compile_sort_description = 3;
     bool compile_sort_description = false;
+
+    bool hasPrefix(const SortDescription & prefix) const;
 };
 
 /** Compile sort description for header_types.
diff --git a/src/Core/examples/coro.cpp b/src/Core/examples/coro.cpp
index 956b4e988e4..370820a228d 100644
--- a/src/Core/examples/coro.cpp
+++ b/src/Core/examples/coro.cpp
@@ -12,7 +12,7 @@
 #if defined(__clang__)
 #include <experimental/coroutine>
 
-namespace std
+namespace std // NOLINT(cert-dcl58-cpp)
 {
     using namespace experimental::coroutines_v1;
 }
@@ -97,14 +97,14 @@ struct Task
     static bool resumeImpl(Task *r)
     {
         if (r->value)
-        return false;
+            return false;
 
         auto & next = r->my.promise().next;
 
         if (next)
         {
             if (resumeImpl(next.promise().r))
-            return true;
+                return true;
             next = {};
         }
 
@@ -183,7 +183,7 @@ int main()
         auto t = foo("foo");
         std::cout << ".. started" << std::endl;
         while (t.resume())
-        std::cout << ".. yielded" << std::endl;
+            std::cout << ".. yielded" << std::endl;
         std::cout << ".. done: " << t.res() << std::endl;
     }
     catch (DB::Exception & e)
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 1d6acc7eac3..c89f55092f8 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -1013,11 +1013,23 @@ void BaseDaemon::setupWatchdog()
         /// If streaming compression of logs is used then we write watchdog logs to cerr
         if (config().getRawString("logger.stream_compress", "false") == "true")
         {
-            Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+            Poco::AutoPtr<OwnPatternFormatter> pf;
+            if (config().getString("logger.formatting", "") == "json")
+                pf = new OwnJSONPatternFormatter;
+            else
+                pf = new OwnPatternFormatter;
             Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel(std::cerr));
             logger().setChannel(log);
         }
 
+        /// Cuncurrent writing logs to the same file from two threads is questionable on its own,
+        ///  but rotating them from two threads is disastrous.
+        if (auto * channel = dynamic_cast<DB::OwnSplitChannel *>(logger().getChannel()))
+        {
+            channel->setChannelProperty("log", Poco::FileChannel::PROP_ROTATION, "never");
+            channel->setChannelProperty("log", Poco::FileChannel::PROP_ROTATEONOPEN, "false");
+        }
+
         logger().information(fmt::format("Will watch for the process with pid {}", pid));
 
         /// Forward signals to the child process.
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index c65a30b80ac..8c0f0b95025 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -119,7 +119,40 @@ Field DataTypeAggregateFunction::getDefault() const
 
 bool DataTypeAggregateFunction::equals(const IDataType & rhs) const
 {
-    return typeid(rhs) == typeid(*this) && getNameWithoutVersion() == typeid_cast<const DataTypeAggregateFunction &>(rhs).getNameWithoutVersion();
+    if (typeid(rhs) != typeid(*this))
+        return false;
+
+    auto lhs_state_type = function->getNormalizedStateType();
+    auto rhs_state_type = typeid_cast<const DataTypeAggregateFunction &>(rhs).function->getNormalizedStateType();
+
+    if (typeid(lhs_state_type.get()) != typeid(rhs_state_type.get()))
+        return false;
+
+    if (const auto * lhs_state = typeid_cast<const DataTypeAggregateFunction *>(lhs_state_type.get()))
+    {
+        const auto & rhs_state = typeid_cast<const DataTypeAggregateFunction &>(*rhs_state_type);
+
+        if (lhs_state->function->getName() != rhs_state.function->getName())
+            return false;
+
+        if (lhs_state->parameters.size() != rhs_state.parameters.size())
+            return false;
+
+        for (size_t i = 0; i < lhs_state->parameters.size(); ++i)
+            if (lhs_state->parameters[i] != rhs_state.parameters[i])
+                return false;
+
+        if (lhs_state->argument_types.size() != rhs_state.argument_types.size())
+            return false;
+
+        for (size_t i = 0; i < lhs_state->argument_types.size(); ++i)
+            if (!lhs_state->argument_types[i]->equals(*rhs_state.argument_types[i]))
+                return false;
+
+        return true;
+    }
+
+    return lhs_state_type->equals(*rhs_state_type);
 }
 
 
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index dd08656dccc..9f60210f8d6 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -119,7 +119,6 @@ void DataTypeFactory::registerDataType(const String & family_name, Value creator
         throw Exception("DataTypeFactory: the data type family name '" + family_name + "' is not unique",
             ErrorCodes::LOGICAL_ERROR);
 
-
     if (case_sensitiveness == CaseInsensitive
         && !case_insensitive_data_types.emplace(family_name_lowercase, creator).second)
         throw Exception("DataTypeFactory: the case insensitive data type family name '" + family_name + "' is not unique",
diff --git a/src/DataTypes/DataTypeFactory.h b/src/DataTypes/DataTypeFactory.h
index 704d8926bf0..f452f6167c7 100644
--- a/src/DataTypes/DataTypeFactory.h
+++ b/src/DataTypes/DataTypeFactory.h
@@ -25,7 +25,7 @@ class DataTypeFactory final : private boost::noncopyable, public IFactoryWithAli
 private:
     using SimpleCreator = std::function<DataTypePtr()>;
     using DataTypesDictionary = std::unordered_map<String, Value>;
-    using CreatorWithCustom = std::function<std::pair<DataTypePtr,DataTypeCustomDescPtr>(const ASTPtr & parameters)>;
+    using CreatorWithCustom = std::function<std::pair<DataTypePtr, DataTypeCustomDescPtr>(const ASTPtr & parameters)>;
     using SimpleCreatorWithCustom = std::function<std::pair<DataTypePtr,DataTypeCustomDescPtr>()>;
 
 public:
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index 1ef86a8c12f..ef05cd440c0 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -2,6 +2,7 @@
 #include <base/range.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
 #include <Core/Field.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
@@ -270,6 +271,7 @@ size_t DataTypeTuple::getSizeOfValueInMemory() const
 SerializationPtr DataTypeTuple::doGetDefaultSerialization() const
 {
     SerializationTuple::ElementSerializations serializations(elems.size());
+
     for (size_t i = 0; i < elems.size(); ++i)
     {
         String elem_name = have_explicit_names ? names[i] : toString(i + 1);
@@ -302,7 +304,27 @@ MutableSerializationInfoPtr DataTypeTuple::createSerializationInfo(const Seriali
     for (const auto & elem : elems)
         infos.push_back(elem->createSerializationInfo(settings));
 
-    return std::make_shared<SerializationInfoTuple>(std::move(infos), settings);
+    return std::make_shared<SerializationInfoTuple>(std::move(infos), names, settings);
+}
+
+SerializationInfoPtr DataTypeTuple::getSerializationInfo(const IColumn & column) const
+{
+    if (const auto * column_const = checkAndGetColumn<ColumnConst>(&column))
+        return getSerializationInfo(column_const->getDataColumn());
+
+    MutableSerializationInfos infos;
+    infos.reserve(elems.size());
+
+    const auto & column_tuple = assert_cast<const ColumnTuple &>(column);
+    assert(elems.size() == column_tuple.getColumns().size());
+
+    for (size_t i = 0; i < elems.size(); ++i)
+    {
+        auto element_info = elems[i]->getSerializationInfo(column_tuple.getColumn(i));
+        infos.push_back(const_pointer_cast<SerializationInfo>(element_info));
+    }
+
+    return std::make_shared<SerializationInfoTuple>(std::move(infos), names, SerializationInfo::Settings{});
 }
 
 
diff --git a/src/DataTypes/DataTypeTuple.h b/src/DataTypes/DataTypeTuple.h
index eed04631528..5abec18bd3b 100644
--- a/src/DataTypes/DataTypeTuple.h
+++ b/src/DataTypes/DataTypeTuple.h
@@ -23,6 +23,7 @@ private:
     DataTypes elems;
     Strings names;
     bool have_explicit_names;
+
 public:
     static constexpr bool is_parametric = true;
 
@@ -55,6 +56,7 @@ public:
     SerializationPtr doGetDefaultSerialization() const override;
     SerializationPtr getSerialization(const SerializationInfo & info) const override;
     MutableSerializationInfoPtr createSerializationInfo(const SerializationInfo::Settings & settings) const override;
+    SerializationInfoPtr getSerializationInfo(const IColumn & column) const override;
 
     const DataTypePtr & getElement(size_t i) const { return elems[i]; }
     const DataTypes & getElements() const { return elems; }
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index f2bb878a533..cb3bab5c653 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -179,12 +179,19 @@ void IDataType::setCustomization(DataTypeCustomDescPtr custom_desc_) const
         custom_serialization = std::move(custom_desc_->serialization);
 }
 
-MutableSerializationInfoPtr IDataType::createSerializationInfo(
-    const SerializationInfo::Settings & settings) const
+MutableSerializationInfoPtr IDataType::createSerializationInfo(const SerializationInfo::Settings & settings) const
 {
     return std::make_shared<SerializationInfo>(ISerialization::Kind::DEFAULT, settings);
 }
 
+SerializationInfoPtr IDataType::getSerializationInfo(const IColumn & column) const
+{
+    if (const auto * column_const = checkAndGetColumn<ColumnConst>(&column))
+        return getSerializationInfo(column_const->getDataColumn());
+
+    return std::make_shared<SerializationInfo>(ISerialization::getKind(column), SerializationInfo::Settings{});
+}
+
 SerializationPtr IDataType::getDefaultSerialization() const
 {
     if (custom_serialization)
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index a26c703cd8a..0174ca426c2 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -101,8 +101,8 @@ public:
 
     Names getSubcolumnNames() const;
 
-    virtual MutableSerializationInfoPtr createSerializationInfo(
-        const SerializationInfo::Settings & settings) const;
+    virtual MutableSerializationInfoPtr createSerializationInfo(const SerializationInfo::Settings & settings) const;
+    virtual SerializationInfoPtr getSerializationInfo(const IColumn & column) const;
 
     /// TODO: support more types.
     virtual bool supportsSparseSerialization() const { return !haveSubtypes(); }
@@ -599,3 +599,26 @@ template <typename T> inline constexpr bool IsDataTypeEnum<DataTypeEnum<T>> = tr
     M(Float32) \
     M(Float64)
 }
+
+/// See https://fmt.dev/latest/api.html#formatting-user-defined-types
+template <>
+struct fmt::formatter<DB::DataTypePtr>
+{
+    constexpr static auto parse(format_parse_context & ctx)
+    {
+        const auto * it = ctx.begin();
+        const auto * end = ctx.end();
+
+        /// Only support {}.
+        if (it != end && *it != '}')
+            throw format_error("invalid format");
+
+        return it;
+    }
+
+    template <typename FormatContext>
+    auto format(const DB::DataTypePtr & type, FormatContext & ctx)
+    {
+        return format_to(ctx.out(), "{}", type->getName());
+    }
+};
diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
index 7df4a956c1a..e6e6fdba5dc 100644
--- a/src/DataTypes/Serializations/ISerialization.cpp
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -224,8 +224,10 @@ String ISerialization::getSubcolumnNameForStream(const SubstreamPath & path, siz
 
 void ISerialization::addToSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path, ColumnPtr column)
 {
-    if (cache && !path.empty())
-        cache->emplace(getSubcolumnNameForStream(path), column);
+    if (!cache || path.empty())
+        return;
+
+    cache->emplace(getSubcolumnNameForStream(path), column);
 }
 
 ColumnPtr ISerialization::getFromSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path)
@@ -234,10 +236,7 @@ ColumnPtr ISerialization::getFromSubstreamsCache(SubstreamsCache * cache, const
         return nullptr;
 
     auto it = cache->find(getSubcolumnNameForStream(path));
-    if (it == cache->end())
-        return nullptr;
-
-    return it->second;
+    return it == cache->end() ? nullptr : it->second;
 }
 
 bool ISerialization::isSpecialCompressionAllowed(const SubstreamPath & path)
diff --git a/src/DataTypes/Serializations/SerializationInfo.cpp b/src/DataTypes/Serializations/SerializationInfo.cpp
index a0dc20b6479..1b845533aaf 100644
--- a/src/DataTypes/Serializations/SerializationInfo.cpp
+++ b/src/DataTypes/Serializations/SerializationInfo.cpp
@@ -1,9 +1,9 @@
 #include <DataTypes/Serializations/SerializationInfo.h>
-#include <DataTypes/NestedUtils.h>
 #include <Columns/ColumnSparse.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/VarInt.h>
+#include <Core/Block.h>
 #include <base/EnumReflection.h>
 
 #include <Poco/JSON/JSON.h>
@@ -47,12 +47,25 @@ void SerializationInfo::Data::add(const Data & other)
     num_defaults += other.num_defaults;
 }
 
+void SerializationInfo::Data::addDefaults(size_t length)
+{
+    num_rows += length;
+    num_defaults += length;
+}
+
 SerializationInfo::SerializationInfo(ISerialization::Kind kind_, const Settings & settings_)
     : settings(settings_)
     , kind(kind_)
 {
 }
 
+SerializationInfo::SerializationInfo(ISerialization::Kind kind_, const Settings & settings_, const Data & data_)
+    : settings(settings_)
+    , kind(kind_)
+    , data(data_)
+{
+}
+
 void SerializationInfo::add(const IColumn & column)
 {
     data.add(column);
@@ -67,6 +80,13 @@ void SerializationInfo::add(const SerializationInfo & other)
         kind = chooseKind(data, settings);
 }
 
+void SerializationInfo::addDefaults(size_t length)
+{
+    data.addDefaults(length);
+    if (settings.choose_kind)
+        kind = chooseKind(data, settings);
+}
+
 void SerializationInfo::replaceData(const SerializationInfo & other)
 {
     data = other.data;
@@ -74,9 +94,7 @@ void SerializationInfo::replaceData(const SerializationInfo & other)
 
 MutableSerializationInfoPtr SerializationInfo::clone() const
 {
-    auto res = std::make_shared<SerializationInfo>(kind, settings);
-    res->data = data;
-    return res;
+    return std::make_shared<SerializationInfo>(kind, settings, data);
 }
 
 void SerializationInfo::serialializeKindBinary(WriteBuffer & out) const
@@ -221,13 +239,8 @@ void SerializationInfoByName::readJSON(ReadBuffer & in)
                     "Missed field '{}' in SerializationInfo of columns", KEY_NAME);
 
             auto name = elem_object->getValue<String>(KEY_NAME);
-            auto it = find(name);
-
-            if (it == end())
-                throw Exception(ErrorCodes::CORRUPTED_DATA,
-                    "There is no column {} in serialization infos", name);
-
-            it->second->fromJSON(*elem_object);
+            if (auto it = find(name); it != end())
+                it->second->fromJSON(*elem_object);
         }
     }
 }
diff --git a/src/DataTypes/Serializations/SerializationInfo.h b/src/DataTypes/Serializations/SerializationInfo.h
index d83fc16f2f6..a4a5685253f 100644
--- a/src/DataTypes/Serializations/SerializationInfo.h
+++ b/src/DataTypes/Serializations/SerializationInfo.h
@@ -34,6 +34,7 @@ public:
 
         void add(const IColumn & column);
         void add(const Data & other);
+        void addDefaults(size_t length);
     };
 
     struct Settings
@@ -45,6 +46,7 @@ public:
     };
 
     SerializationInfo(ISerialization::Kind kind_, const Settings & settings_);
+    SerializationInfo(ISerialization::Kind kind_, const Settings & settings_, const Data & data_);
 
     virtual ~SerializationInfo() = default;
 
@@ -52,7 +54,9 @@ public:
 
     virtual void add(const IColumn & column);
     virtual void add(const SerializationInfo & other);
+    virtual void addDefaults(size_t length);
     virtual void replaceData(const SerializationInfo & other);
+
     virtual std::shared_ptr<SerializationInfo> clone() const;
 
     virtual void serialializeKindBinary(WriteBuffer & out) const;
@@ -61,6 +65,7 @@ public:
     virtual Poco::JSON::Object toJSON() const;
     virtual void fromJSON(const Poco::JSON::Object & object);
 
+    void setKind(ISerialization::Kind kind_) { kind = kind_; }
     const Settings & getSettings() const { return settings; }
     const Data & getData() const { return data; }
     ISerialization::Kind getKind() const { return kind; }
diff --git a/src/DataTypes/Serializations/SerializationInfoTuple.cpp b/src/DataTypes/Serializations/SerializationInfoTuple.cpp
index 803302f9642..d0fa5572a48 100644
--- a/src/DataTypes/Serializations/SerializationInfoTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationInfoTuple.cpp
@@ -13,10 +13,14 @@ namespace ErrorCodes
 }
 
 SerializationInfoTuple::SerializationInfoTuple(
-    MutableSerializationInfos elems_, const Settings & settings_)
+    MutableSerializationInfos elems_, Names names_, const Settings & settings_)
     : SerializationInfo(ISerialization::Kind::DEFAULT, settings_)
     , elems(std::move(elems_))
+    , names(std::move(names_))
 {
+    assert(names.size() == elems.size());
+    for (size_t i = 0; i < names.size(); ++i)
+        name_to_elem[names[i]] = elems[i];
 }
 
 bool SerializationInfoTuple::hasCustomSerialization() const
@@ -40,22 +44,34 @@ void SerializationInfoTuple::add(const SerializationInfo & other)
 {
     SerializationInfo::add(other);
 
-    const auto & info_tuple = assert_cast<const SerializationInfoTuple &>(other);
-    assert(elems.size() == info_tuple.elems.size());
+    const auto & other_info = assert_cast<const SerializationInfoTuple &>(other);
+    for (const auto & [name, elem] : name_to_elem)
+    {
+        auto it = other_info.name_to_elem.find(name);
+        if (it != other_info.name_to_elem.end())
+            elem->add(*it->second);
+        else
+            elem->addDefaults(other_info.getData().num_rows);
+    }
+}
 
-    for (size_t i = 0; i < elems.size(); ++i)
-        elems[i]->add(*info_tuple.elems[i]);
+void SerializationInfoTuple::addDefaults(size_t length)
+{
+    for (const auto & elem : elems)
+        elem->addDefaults(length);
 }
 
 void SerializationInfoTuple::replaceData(const SerializationInfo & other)
 {
     SerializationInfo::add(other);
 
-    const auto & info_tuple = assert_cast<const SerializationInfoTuple &>(other);
-    assert(elems.size() == info_tuple.elems.size());
-
-    for (size_t i = 0; i < elems.size(); ++i)
-        elems[i]->replaceData(*info_tuple.elems[i]);
+    const auto & other_info = assert_cast<const SerializationInfoTuple &>(other);
+    for (const auto & [name, elem] : name_to_elem)
+    {
+        auto it = other_info.name_to_elem.find(name);
+        if (it != other_info.name_to_elem.end())
+            elem->replaceData(*it->second);
+    }
 }
 
 MutableSerializationInfoPtr SerializationInfoTuple::clone() const
@@ -65,7 +81,7 @@ MutableSerializationInfoPtr SerializationInfoTuple::clone() const
     for (const auto & elem : elems)
         elems_cloned.push_back(elem->clone());
 
-    return std::make_shared<SerializationInfoTuple>(std::move(elems_cloned), settings);
+    return std::make_shared<SerializationInfoTuple>(std::move(elems_cloned), names, settings);
 }
 
 void SerializationInfoTuple::serialializeKindBinary(WriteBuffer & out) const
@@ -99,7 +115,7 @@ void SerializationInfoTuple::fromJSON(const Poco::JSON::Object & object)
 
     if (!object.has("subcolumns"))
         throw Exception(ErrorCodes::CORRUPTED_DATA,
-            "Missed field '{}' in SerializationInfo of columns SerializationInfoTuple");
+            "Missed field 'subcolumns' in SerializationInfo of columns SerializationInfoTuple");
 
     auto subcolumns = object.getArray("subcolumns");
     if (elems.size() != subcolumns->size())
diff --git a/src/DataTypes/Serializations/SerializationInfoTuple.h b/src/DataTypes/Serializations/SerializationInfoTuple.h
index d196f80393e..b01c629d2ff 100644
--- a/src/DataTypes/Serializations/SerializationInfoTuple.h
+++ b/src/DataTypes/Serializations/SerializationInfoTuple.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <Core/Names.h>
 #include <DataTypes/Serializations/SerializationInfo.h>
 
 namespace DB
@@ -7,25 +8,32 @@ namespace DB
 class SerializationInfoTuple : public SerializationInfo
 {
 public:
-    SerializationInfoTuple(MutableSerializationInfos elems_, const Settings & settings_);
+    SerializationInfoTuple(MutableSerializationInfos elems_, Names names_, const Settings & settings_);
 
     bool hasCustomSerialization() const override;
+
     void add(const IColumn & column) override;
     void add(const SerializationInfo & other) override;
+    void addDefaults(size_t length) override;
     void replaceData(const SerializationInfo & other) override;
 
     MutableSerializationInfoPtr clone() const override;
+
     void serialializeKindBinary(WriteBuffer & out) const override;
     void deserializeFromKindsBinary(ReadBuffer & in) override;
 
     Poco::JSON::Object toJSON() const override;
     void fromJSON(const Poco::JSON::Object & object) override;
 
-    MutableSerializationInfoPtr getElementInfo(size_t i) const { return elems[i]; }
+    const MutableSerializationInfoPtr & getElementInfo(size_t i) const { return elems[i]; }
     ISerialization::Kind getElementKind(size_t i) const { return elems[i]->getKind(); }
 
 private:
     MutableSerializationInfos elems;
+    Names names;
+
+    using NameToElem = std::unordered_map<String, MutableSerializationInfoPtr>;
+    NameToElem name_to_elem;
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index 8dc15fc9841..8138b15c9af 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -135,20 +135,21 @@ void SerializationTuple::deserializeText(IColumn & column, ReadBuffer & istr, co
             }
             elems[i]->deserializeTextQuoted(extractElementColumn(column, i), istr, settings);
         }
-    });
 
-    // Special format for one element tuple (1,)
-    if (1 == elems.size())
-    {
+        // Special format for one element tuple (1,)
+        if (1 == elems.size())
+        {
+            skipWhitespaceIfAny(istr);
+            // Allow both (1) and (1,)
+            checkChar(',', istr);
+        }
+
         skipWhitespaceIfAny(istr);
-        // Allow both (1) and (1,)
-        checkChar(',', istr);
-    }
-    skipWhitespaceIfAny(istr);
-    assertChar(')', istr);
+        assertChar(')', istr);
 
-    if (whole && !istr.eof())
-        throwUnexpectedDataAfterParsedValue(column, istr, settings, "Tuple");
+        if (whole && !istr.eof())
+            throwUnexpectedDataAfterParsedValue(column, istr, settings, "Tuple");
+    });
 }
 
 void SerializationTuple::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -213,19 +214,18 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
                 auto & element_column = extractElementColumn(column, element_pos);
                 elems[element_pos]->deserializeTextJSON(element_column, istr, settings);
             }
-        });
 
-        skipWhitespaceIfAny(istr);
-        assertChar('}', istr);
+            skipWhitespaceIfAny(istr);
+            assertChar('}', istr);
+        });
     }
     else
     {
-        const size_t size = elems.size();
         assertChar('[', istr);
 
         addElementSafe(elems.size(), column, [&]
         {
-            for (size_t i = 0; i < size; ++i)
+            for (size_t i = 0; i < elems.size(); ++i)
             {
                 skipWhitespaceIfAny(istr);
                 if (i != 0)
@@ -235,10 +235,10 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
                 }
                 elems[i]->deserializeTextJSON(extractElementColumn(column, i), istr, settings);
             }
-        });
 
-        skipWhitespaceIfAny(istr);
-        assertChar(']', istr);
+            skipWhitespaceIfAny(istr);
+            assertChar(']', istr);
+        });
     }
 }
 
diff --git a/src/DataTypes/transformTypesRecursively.cpp b/src/DataTypes/transformTypesRecursively.cpp
new file mode 100644
index 00000000000..3544c7e477d
--- /dev/null
+++ b/src/DataTypes/transformTypesRecursively.cpp
@@ -0,0 +1,178 @@
+#include <DataTypes/transformTypesRecursively.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNullable.h>
+
+
+namespace DB
+{
+
+void transformTypesRecursively(DataTypes & types, std::function<void(DataTypes &)> transform_simple_types, std::function<void(DataTypes &)> transform_complex_types)
+{
+    {
+        /// Arrays
+        bool have_array = false;
+        bool all_arrays = true;
+        DataTypes nested_types;
+        for (const auto & type : types)
+        {
+            if (const DataTypeArray * type_array = typeid_cast<const DataTypeArray *>(type.get()))
+            {
+                have_array = true;
+                nested_types.push_back(type_array->getNestedType());
+            }
+            else
+                all_arrays = false;
+        }
+
+        if (have_array)
+        {
+            if (all_arrays)
+            {
+                transformTypesRecursively(nested_types, transform_simple_types, transform_complex_types);
+                for (size_t i = 0; i != types.size(); ++i)
+                    types[i] = std::make_shared<DataTypeArray>(nested_types[i]);
+            }
+
+            if (transform_complex_types)
+                transform_complex_types(types);
+
+            return;
+        }
+    }
+
+    {
+        /// Tuples
+        bool have_tuple = false;
+        bool all_tuples = true;
+        size_t tuple_size = 0;
+
+        std::vector<DataTypes> nested_types;
+
+        for (const auto & type : types)
+        {
+            if (const DataTypeTuple * type_tuple = typeid_cast<const DataTypeTuple *>(type.get()))
+            {
+                if (!have_tuple)
+                {
+                    tuple_size = type_tuple->getElements().size();
+                    nested_types.resize(tuple_size);
+                    for (size_t elem_idx = 0; elem_idx < tuple_size; ++elem_idx)
+                        nested_types[elem_idx].reserve(types.size());
+                }
+                else if (tuple_size != type_tuple->getElements().size())
+                    return;
+
+                have_tuple = true;
+
+                for (size_t elem_idx = 0; elem_idx < tuple_size; ++elem_idx)
+                    nested_types[elem_idx].emplace_back(type_tuple->getElements()[elem_idx]);
+            }
+            else
+                all_tuples = false;
+        }
+
+        if (have_tuple)
+        {
+            if (all_tuples)
+            {
+                std::vector<DataTypes> transposed_nested_types(types.size());
+                for (size_t elem_idx = 0; elem_idx < tuple_size; ++elem_idx)
+                {
+                    transformTypesRecursively(nested_types[elem_idx], transform_simple_types, transform_complex_types);
+                    for (size_t i = 0; i != types.size(); ++i)
+                        transposed_nested_types[i].push_back(nested_types[elem_idx][i]);
+                }
+
+                for (size_t i = 0; i != types.size(); ++i)
+                    types[i] = std::make_shared<DataTypeTuple>(transposed_nested_types[i]);
+            }
+
+            if (transform_complex_types)
+                transform_complex_types(types);
+
+            return;
+        }
+    }
+
+    {
+        /// Maps
+        bool have_maps = false;
+        bool all_maps = true;
+        DataTypes key_types;
+        DataTypes value_types;
+        key_types.reserve(types.size());
+        value_types.reserve(types.size());
+
+        for (const auto & type : types)
+        {
+            if (const DataTypeMap * type_map = typeid_cast<const DataTypeMap *>(type.get()))
+            {
+                have_maps = true;
+                key_types.emplace_back(type_map->getKeyType());
+                value_types.emplace_back(type_map->getValueType());
+            }
+            else
+                all_maps = false;
+        }
+
+        if (have_maps)
+        {
+            if (all_maps)
+            {
+                transformTypesRecursively(key_types, transform_simple_types, transform_complex_types);
+                transformTypesRecursively(value_types, transform_simple_types, transform_complex_types);
+
+                for (size_t i = 0; i != types.size(); ++i)
+                    types[i] = std::make_shared<DataTypeMap>(key_types[i], value_types[i]);
+            }
+
+            if (transform_complex_types)
+                transform_complex_types(types);
+
+            return;
+        }
+    }
+
+    {
+        /// Nullable
+        bool have_nullable = false;
+        std::vector<UInt8> is_nullable;
+        is_nullable.reserve(types.size());
+        DataTypes nested_types;
+        nested_types.reserve(types.size());
+        for (const auto & type : types)
+        {
+            if (const DataTypeNullable * type_nullable = typeid_cast<const DataTypeNullable *>(type.get()))
+            {
+                have_nullable = true;
+                is_nullable.push_back(1);
+                nested_types.push_back(type_nullable->getNestedType());
+            }
+            else
+            {
+                is_nullable.push_back(0);
+                nested_types.push_back(type);
+            }
+        }
+
+        if (have_nullable)
+        {
+            transformTypesRecursively(nested_types, transform_simple_types, transform_complex_types);
+            for (size_t i = 0; i != types.size(); ++i)
+            {
+                if (is_nullable[i])
+                    types[i] = makeNullable(nested_types[i]);
+                else
+                    types[i] = nested_types[i];
+            }
+
+            return;
+        }
+    }
+
+    transform_simple_types(types);
+}
+
+}
diff --git a/src/DataTypes/transformTypesRecursively.h b/src/DataTypes/transformTypesRecursively.h
new file mode 100644
index 00000000000..5cb8f095494
--- /dev/null
+++ b/src/DataTypes/transformTypesRecursively.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <DataTypes/IDataType.h>
+#include <functional>
+
+namespace DB
+{
+
+/// Function that applies custom transformation functions to provided types recursively.
+/// Implementation is similar to function getLeastSuperType:
+/// If all types are Array/Map/Tuple/Nullable, this function will be called to nested types.
+/// If not all types are the same complex type (Array/Map/Tuple), this function won't be called to nested types.
+/// Function transform_simple_types will be applied to resulting simple types after all recursive calls.
+/// Function transform_complex_types will be applied to complex types (Array/Map/Tuple) after recursive call to their nested types.
+void transformTypesRecursively(DataTypes & types, std::function<void(DataTypes &)> transform_simple_types, std::function<void(DataTypes &)> transform_complex_types);
+
+}
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 92dae025dae..759f4b9276c 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -6,6 +6,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Parsers/formatAST.h>
 #include <Common/atomicRename.h>
+#include <Common/filesystemHelpers.h>
 #include <Storages/StorageMaterializedView.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
@@ -117,13 +118,19 @@ void DatabaseAtomic::dropTable(ContextPtr local_context, const String & table_na
     if (table)
         table->dropInnerTableIfAny(sync, local_context);
     else
-        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist",
-                        backQuote(getDatabaseName()), backQuote(table_name));
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist", backQuote(getDatabaseName()), backQuote(table_name));
 
+    dropTableImpl(local_context, table_name, sync);
+}
+
+void DatabaseAtomic::dropTableImpl(ContextPtr local_context, const String & table_name, bool sync)
+{
     String table_metadata_path = getObjectMetadataPath(table_name);
     String table_metadata_path_drop;
+    StoragePtr table;
     {
         std::lock_guard lock(mutex);
+        table = getTableUnlocked(table_name);
         table_metadata_path_drop = DatabaseCatalog::instance().getPathForDroppedMetadata(table->getStorageID());
         auto txn = local_context->getZooKeeperMetadataTransaction();
         if (txn && !local_context->isInternalSubquery())
@@ -416,15 +423,15 @@ UUID DatabaseAtomic::tryGetTableUUID(const String & table_name) const
     return UUIDHelpers::Nil;
 }
 
-void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool force_restore, bool /*force_attach*/)
+void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, LoadingStrictnessLevel mode)
 {
-    if (!force_restore)
+    if (mode < LoadingStrictnessLevel::FORCE_RESTORE)
         return;
 
     /// Recreate symlinks to table data dirs in case of force restore, because some of them may be broken
     for (const auto & table_path : fs::directory_iterator(path_to_table_symlinks))
     {
-        if (!fs::is_symlink(table_path))
+        if (!FS::isSymlink(table_path))
         {
             throw Exception(ErrorCodes::ABORTED,
                 "'{}' is not a symlink. Atomic database should contains only symlinks.", std::string(table_path.path()));
@@ -435,17 +442,17 @@ void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool f
 }
 
 void DatabaseAtomic::loadStoredObjects(
-    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+    ContextMutablePtr local_context, LoadingStrictnessLevel mode, bool skip_startup_tables)
 {
-    beforeLoadingMetadata(local_context, force_restore, force_attach);
-    DatabaseOrdinary::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+    beforeLoadingMetadata(local_context, mode);
+    DatabaseOrdinary::loadStoredObjects(local_context, mode, skip_startup_tables);
 }
 
-void DatabaseAtomic::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+void DatabaseAtomic::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
 {
-    DatabaseOrdinary::startupTables(thread_pool, force_restore, force_attach);
+    DatabaseOrdinary::startupTables(thread_pool, mode);
 
-    if (!force_restore)
+    if (mode < LoadingStrictnessLevel::FORCE_RESTORE)
         return;
 
     NameToPathMap table_names;
@@ -495,7 +502,7 @@ void DatabaseAtomic::tryCreateMetadataSymlink()
     fs::path metadata_symlink(path_to_metadata_symlink);
     if (fs::exists(metadata_symlink))
     {
-        if (!fs::is_symlink(metadata_symlink))
+        if (!FS::isSymlink(metadata_symlink))
             throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Directory {} exists", path_to_metadata_symlink);
     }
     else
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index 6cb2226a7f8..cb275812098 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -36,6 +36,7 @@ public:
             bool dictionary) override;
 
     void dropTable(ContextPtr context, const String & table_name, bool sync) override;
+    void dropTableImpl(ContextPtr context, const String & table_name, bool sync);
 
     void attachTable(ContextPtr context, const String & name, const StoragePtr & table, const String & relative_table_path) override;
     StoragePtr detachTable(ContextPtr context, const String & name) override;
@@ -47,11 +48,11 @@ public:
 
     DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel mode, bool skip_startup_tables) override;
 
-    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+    void beforeLoadingMetadata(ContextMutablePtr context, LoadingStrictnessLevel mode) override;
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 6213fa62e3c..c16de2d33a5 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -16,6 +16,7 @@
 #include <Storages/ExternalDataSourceConfiguration.h>
 #include <Common/logger_useful.h>
 #include <Common/Macros.h>
+#include <Common/filesystemHelpers.h>
 
 #include "config_core.h"
 
@@ -60,8 +61,43 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
+void cckMetadataPathForOrdinary(const ASTCreateQuery & create, const String & metadata_path)
+{
+    const String & engine_name = create.storage->engine->name;
+    const String & database_name = create.getDatabase();
+
+    if (engine_name != "Ordinary")
+        return;
+
+    if (!FS::isSymlink(metadata_path))
+        return;
+
+    String target_path = FS::readSymlink(metadata_path).string();
+    fs::path path_to_remove = metadata_path;
+    if (path_to_remove.filename().empty())
+        path_to_remove = path_to_remove.parent_path();
+
+    /// Before 20.7 metadata/db_name.sql file might absent and Ordinary database was attached if there's metadata/db_name/ dir.
+    /// Between 20.7 and 22.7 metadata/db_name.sql was created in this case as well.
+    /// Since 20.7 `default` database is created with Atomic engine on the very first server run.
+    /// The problem is that if server crashed during the very first run and metadata/db_name/ -> store/whatever symlink was created
+    /// then it's considered as Ordinary database. And it even works somehow
+    /// until background task tries to remove unused dir from store/...
+    throw Exception(ErrorCodes::CANNOT_CREATE_DATABASE,
+                    "Metadata directory {} for Ordinary database {} is a symbolic link to {}. "
+                    "It may be a result of manual intervention, crash on very first server start or a bug. "
+                    "Database cannot be attached (it's kind of protection from potential data loss). "
+                    "Metadata directory must not be a symlink and must contain tables metadata files itself. "
+                    "You have to resolve this manually. It can be done like this: rm {}; sudo -u clickhouse mv {} {};",
+                    metadata_path, database_name, target_path,
+                    quoteString(path_to_remove.string()), quoteString(target_path), quoteString(path_to_remove.string()));
+
+}
+
 DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context)
 {
+    cckMetadataPathForOrdinary(create, metadata_path);
+
     /// Creates store/xxx/ for Atomic
     fs::create_directories(fs::path(metadata_path).parent_path());
 
@@ -127,19 +163,6 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
             throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE,
                             "Ordinary database engine is deprecated (see also allow_deprecated_database_ordinary setting)");
 
-        /// Before 20.7 metadata/db_name.sql file might absent and Ordinary database was attached if there's metadata/db_name/ dir.
-        /// Between 20.7 and 22.7 metadata/db_name.sql was created in this case as well.
-        /// Since 20.7 `default` database is created with Atomic engine on the very first server run.
-        /// The problem is that if server crashed during the very first run and metadata/db_name/ -> store/whatever symlink was created
-        /// then it's considered as Ordinary database. And it even works somehow
-        /// until background task tries to remove onused dir from store/...
-        if (fs::is_symlink(metadata_path))
-            throw Exception(ErrorCodes::CANNOT_CREATE_DATABASE, "Metadata directory {} for Ordinary database {} is a symbolic link to {}. "
-                            "It may be a result of manual intervention, crash on very first server start or a bug. "
-                            "Database cannot be attached (it's kind of protection from potential data loss). "
-                            "Metadata directory must not be a symlink and must contain tables metadata files itself. "
-                            "You have to resolve this manually.",
-                            metadata_path, database_name, fs::read_symlink(metadata_path).string());
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
     }
 
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index 3a1b3009878..9aa65602835 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -38,7 +38,7 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 
 void DatabaseLazy::loadStoredObjects(
-    ContextMutablePtr local_context, bool /* force_restore */, bool /*force_attach*/, bool /* skip_startup_tables */)
+    ContextMutablePtr local_context, LoadingStrictnessLevel /*mode*/, bool /* skip_startup_tables */)
 {
     iterateMetadataFiles(local_context, [this, &local_context](const String & file_name)
     {
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index d3c3ed2843b..b01038073ef 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -26,7 +26,7 @@ public:
 
     bool canContainDistributedTables() const override { return false; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel /*mode*/, bool skip_startup_tables) override;
 
     void createTable(
         ContextPtr context,
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index fe229ba6ee9..b5bb6c7c759 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -230,7 +230,7 @@ void DatabaseOnDisk::createTable(
 
 /// If the table was detached permanently we will have a flag file with
 /// .sql.detached extension, is not needed anymore since we attached the table back
-void DatabaseOnDisk::removeDetachedPermanentlyFlag(ContextPtr, const String & table_name, const String & table_metadata_path, bool) const
+void DatabaseOnDisk::removeDetachedPermanentlyFlag(ContextPtr, const String & table_name, const String & table_metadata_path, bool)
 {
     try
     {
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index 90aba6be169..0db6a94b86d 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -94,7 +94,7 @@ protected:
     virtual void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                                    const String & table_metadata_tmp_path, const String & table_metadata_path, ContextPtr query_context);
 
-    virtual void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const;
+    virtual void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach);
     virtual void setDetachedTableNotInUseForce(const UUID & /*uuid*/) {}
 
     const String metadata_path;
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 18b70222382..017199fe44a 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -81,7 +81,7 @@ DatabaseOrdinary::DatabaseOrdinary(
 }
 
 void DatabaseOrdinary::loadStoredObjects(
-    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+    ContextMutablePtr local_context, LoadingStrictnessLevel mode, bool skip_startup_tables)
 {
     /** Tables load faster if they are loaded in sorted (by name) order.
       * Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
@@ -89,6 +89,7 @@ void DatabaseOrdinary::loadStoredObjects(
       */
 
     ParsedTablesMetadata metadata;
+    bool force_attach = LoadingStrictnessLevel::FORCE_ATTACH <= mode;
     loadTablesMetadata(local_context, metadata, force_attach);
 
     size_t total_tables = metadata.parsed_tables.size() - metadata.total_dictionaries;
@@ -118,7 +119,7 @@ void DatabaseOrdinary::loadStoredObjects(
         {
             pool.scheduleOrThrowOnError([&]()
             {
-                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+                loadTableFromMetadata(local_context, path, name, ast, mode);
 
                 /// Messages, so that it's not boring to wait for the server to load for a long time.
                 logAboutProgress(log, ++dictionaries_processed, metadata.total_dictionaries, watch);
@@ -140,7 +141,7 @@ void DatabaseOrdinary::loadStoredObjects(
         {
             pool.scheduleOrThrowOnError([&]()
             {
-                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+                loadTableFromMetadata(local_context, path, name, ast, mode);
 
                 /// Messages, so that it's not boring to wait for the server to load for a long time.
                 logAboutProgress(log, ++tables_processed, total_tables, watch);
@@ -153,7 +154,7 @@ void DatabaseOrdinary::loadStoredObjects(
     if (!skip_startup_tables)
     {
         /// After all tables was basically initialized, startup them.
-        startupTables(pool, force_restore, force_attach);
+        startupTables(pool, mode);
     }
 }
 
@@ -198,6 +199,7 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
                 if (fs::exists(full_path.string() + detached_suffix))
                 {
                     const std::string table_name = unescapeForFileName(file_name.substr(0, file_name.size() - 4));
+                    permanently_detached_tables.push_back(table_name);
                     LOG_DEBUG(log, "Skipping permanently detached table {}.", backQuote(table_name));
                     return;
                 }
@@ -238,7 +240,8 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
              TSA_SUPPRESS_WARNING_FOR_READ(database_name), tables_in_database, dictionaries_in_database);
 }
 
-void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore)
+void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast,
+    LoadingStrictnessLevel mode)
 {
     assert(name.database == TSA_SUPPRESS_WARNING_FOR_READ(database_name));
     const auto & create_query = ast->as<const ASTCreateQuery &>();
@@ -248,11 +251,10 @@ void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, co
         create_query,
         *this,
         name.database,
-        file_path,
-        force_restore);
+        file_path, LoadingStrictnessLevel::FORCE_RESTORE <= mode);
 }
 
-void DatabaseOrdinary::startupTables(ThreadPool & thread_pool, bool /*force_restore*/, bool /*force_attach*/)
+void DatabaseOrdinary::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel /*mode*/)
 {
     LOG_INFO(log, "Starting up tables.");
 
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index 6e524ae18b0..f9aa3214ef5 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -21,21 +21,24 @@ public:
 
     String getEngineName() const override { return "Ordinary"; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel mode, bool skip_startup_tables) override;
 
     bool supportsLoadingInTopologicalOrder() const override { return true; }
 
     void loadTablesMetadata(ContextPtr context, ParsedTablesMetadata & metadata, bool is_startup) override;
 
-    void loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore) override;
+    void loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast,
+        LoadingStrictnessLevel mode) override;
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     void alterTable(
         ContextPtr context,
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
+    Strings getNamesOfPermanentlyDetachedTables() const override { return permanently_detached_tables; }
+
 protected:
     virtual void commitAlterTable(
         const StorageID & table_id,
@@ -43,6 +46,8 @@ protected:
         const String & table_metadata_path,
         const String & statement,
         ContextPtr query_context);
+
+    Strings permanently_detached_tables;
 };
 
 }
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index a7ad632efff..1e2c21ecfbd 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -48,10 +48,12 @@ namespace ErrorCodes
     extern const int CANNOT_RESTORE_TABLE;
 }
 
+static constexpr const char * REPLICATED_DATABASE_MARK = "DatabaseReplicated";
 static constexpr const char * DROPPED_MARK = "DROPPED";
 static constexpr const char * BROKEN_TABLES_SUFFIX = "_broken_tables";
 static constexpr const char * BROKEN_REPLICATED_TABLES_SUFFIX = "_broken_replicated_tables";
 
+static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 
 zkutil::ZooKeeperPtr DatabaseReplicated::getZooKeeper() const
 {
@@ -63,6 +65,13 @@ static inline String getHostID(ContextPtr global_context, const UUID & db_uuid)
     return Cluster::Address::toString(getFQDNOrHostName(), global_context->getTCPPort()) + ':' + toString(db_uuid);
 }
 
+static inline UInt64 getMetadataHash(const String & table_name, const String & metadata)
+{
+    SipHash hash;
+    hash.update(table_name);
+    hash.update(metadata);
+    return hash.get64();
+}
 
 DatabaseReplicated::~DatabaseReplicated() = default;
 
@@ -80,6 +89,7 @@ DatabaseReplicated::DatabaseReplicated(
     , shard_name(shard_name_)
     , replica_name(replica_name_)
     , db_settings(std::move(db_settings_))
+    , tables_metadata_digest(0)
 {
     if (zookeeper_path.empty() || shard_name.empty() || replica_name.empty())
         throw Exception("ZooKeeper path, shard and replica names must be non-empty", ErrorCodes::BAD_ARGUMENTS);
@@ -116,13 +126,30 @@ std::pair<String, String> DatabaseReplicated::parseFullReplicaName(const String
     return {shard, replica};
 }
 
-ClusterPtr DatabaseReplicated::getCluster() const
+ClusterPtr DatabaseReplicated::tryGetCluster() const
 {
     std::lock_guard lock{mutex};
     if (cluster)
         return cluster;
 
-    cluster = getClusterImpl();
+    /// Database is probably not created or not initialized yet, it's ok to return nullptr
+    if (is_readonly)
+        return cluster;
+
+    try
+    {
+        /// A quick fix for stateless tests with DatabaseReplicated. Its ZK
+        /// node can be destroyed at any time. If another test lists
+        /// system.clusters to get client command line suggestions, it will
+        /// get an error when trying to get the info about DB from ZK.
+        /// Just ignore these inaccessible databases. A good example of a
+        /// failing test is `01526_client_start_and_exit`.
+        cluster = getClusterImpl();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+    }
     return cluster;
 }
 
@@ -232,7 +259,7 @@ void DatabaseReplicated::fillClusterAuthInfo(String collection_name, const Poco:
     cluster_auth_info.cluster_secure_connection = config_ref.getBool(config_prefix + ".cluster_secure_connection", false);
 }
 
-void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
+void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessLevel mode)
 {
     try
     {
@@ -250,27 +277,48 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
         }
 
         replica_path = fs::path(zookeeper_path) / "replicas" / getFullReplicaName();
+        bool is_create_query = mode == LoadingStrictnessLevel::CREATE;
 
         String replica_host_id;
         if (current_zookeeper->tryGet(replica_path, replica_host_id))
         {
+            if (replica_host_id == DROPPED_MARK && !is_create_query)
+            {
+                LOG_WARNING(log, "Database {} exists locally, but marked dropped in ZooKeeper ({}). "
+                                 "Will not try to start it up", getDatabaseName(), replica_path);
+                is_probably_dropped = true;
+                return;
+            }
+
             String host_id = getHostID(getContext(), db_uuid);
-            if (replica_host_id != host_id)
-                throw Exception(ErrorCodes::REPLICA_IS_ALREADY_EXIST,
-                                "Replica {} of shard {} of replicated database at {} already exists. Replica host ID: '{}', current host ID: '{}'",
-                                replica_name, shard_name, zookeeper_path, replica_host_id, host_id);
+            if (is_create_query || replica_host_id != host_id)
+            {
+                throw Exception(
+                    ErrorCodes::REPLICA_IS_ALREADY_EXIST,
+                    "Replica {} of shard {} of replicated database at {} already exists. Replica host ID: '{}', current host ID: '{}'",
+                    replica_name, shard_name, zookeeper_path, replica_host_id, host_id);
+            }
+        }
+        else if (is_create_query)
+        {
+            /// Create new replica. Throws if replica with the same name already exists
+            createReplicaNodesInZooKeeper(current_zookeeper);
         }
         else
         {
-            /// Throws if replica with the same name already exists
-            createReplicaNodesInZooKeeper(current_zookeeper);
+            /// It's not CREATE query, but replica does not exist. Probably it was dropped.
+            /// Do not create anything, continue as readonly.
+            LOG_WARNING(log, "Database {} exists locally, but its replica does not exist in ZooKeeper ({}). "
+                             "Assuming it was dropped, will not try to start it up", getDatabaseName(), replica_path);
+            is_probably_dropped = true;
+            return;
         }
 
         is_readonly = false;
     }
     catch (...)
     {
-        if (!force_attach)
+        if (mode < LoadingStrictnessLevel::FORCE_ATTACH)
             throw;
 
         /// It's server startup, ignore error.
@@ -284,7 +332,7 @@ bool DatabaseReplicated::createDatabaseNodesInZooKeeper(const zkutil::ZooKeeperP
     current_zookeeper->createAncestors(zookeeper_path);
 
     Coordination::Requests ops;
-    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, REPLICATED_DATABASE_MARK, zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/replicas", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/counter", "", zkutil::CreateMode::Persistent));
@@ -306,10 +354,42 @@ bool DatabaseReplicated::createDatabaseNodesInZooKeeper(const zkutil::ZooKeeperP
 
     /// Other codes are unexpected, will throw
     zkutil::KeeperMultiException::check(res, ops, responses);
-    assert(false);
+    chassert(false);
     __builtin_unreachable();
 }
 
+bool DatabaseReplicated::looksLikeReplicatedDatabasePath(const ZooKeeperPtr & current_zookeeper, const String & path)
+{
+    Coordination::Stat stat;
+    String maybe_database_mark;
+    if (!current_zookeeper->tryGet(path, maybe_database_mark, &stat))
+        return false;
+    if (maybe_database_mark.starts_with(REPLICATED_DATABASE_MARK))
+        return true;
+    if (maybe_database_mark.empty())
+        return false;
+
+    /// Old versions did not have REPLICATED_DATABASE_MARK. Check specific nodes exist and add mark.
+    Coordination::Requests ops;
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/log", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/replicas", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/counter", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/metadata", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/max_log_ptr", -1));
+    ops.emplace_back(zkutil::makeCheckRequest(path + "/logs_to_keep", -1));
+    ops.emplace_back(zkutil::makeSetRequest(path, REPLICATED_DATABASE_MARK, stat.version));
+    Coordination::Responses responses;
+    auto res = current_zookeeper->tryMulti(ops, responses);
+    if (res == Coordination::Error::ZOK)
+        return true;
+
+    /// Recheck database mark (just in case of concurrent update).
+    if (!current_zookeeper->tryGet(path, maybe_database_mark, &stat))
+        return false;
+
+    return maybe_database_mark.starts_with(REPLICATED_DATABASE_MARK);
+}
+
 void DatabaseReplicated::createEmptyLogEntry(const ZooKeeperPtr & current_zookeeper)
 {
     /// On replica creation add empty entry to log. Can be used to trigger some actions on other replicas (e.g. update cluster info).
@@ -319,11 +399,17 @@ void DatabaseReplicated::createEmptyLogEntry(const ZooKeeperPtr & current_zookee
 
 bool DatabaseReplicated::waitForReplicaToProcessAllEntries(UInt64 timeout_ms)
 {
+    if (!ddl_worker)
+        return false;
     return ddl_worker->waitForReplicaToProcessAllEntries(timeout_ms);
 }
 
 void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPtr & current_zookeeper)
 {
+    if (!looksLikeReplicatedDatabasePath(current_zookeeper, zookeeper_path))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot add new database replica: provided path {} "
+                        "already contains some data and it does not look like Replicated database path.", zookeeper_path);
+
     /// Write host name to replica_path, it will protect from multiple replicas with the same name
     auto host_id = getHostID(getContext(), db_uuid);
 
@@ -334,6 +420,7 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
         Coordination::Requests ops;
         ops.emplace_back(zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/digest", "0", zkutil::CreateMode::Persistent));
         /// In addition to creating the replica nodes, we record the max_log_ptr at the instant where
         /// we declared ourself as an existing replica. We'll need this during recoverLostReplica to
         /// notify other nodes that issued new queries while this node was recovering.
@@ -354,25 +441,89 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
     createEmptyLogEntry(current_zookeeper);
 }
 
-void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool /*force_restore*/, bool force_attach)
+void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr /*context*/, LoadingStrictnessLevel mode)
 {
-    tryConnectToZooKeeperAndInitDatabase(force_attach);
+    tryConnectToZooKeeperAndInitDatabase(mode);
 }
 
 void DatabaseReplicated::loadStoredObjects(
-    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+    ContextMutablePtr local_context, LoadingStrictnessLevel mode, bool skip_startup_tables)
 {
-    beforeLoadingMetadata(local_context, force_restore, force_attach);
-    DatabaseAtomic::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+    beforeLoadingMetadata(local_context, mode);
+    DatabaseAtomic::loadStoredObjects(local_context, mode, skip_startup_tables);
 }
 
-void DatabaseReplicated::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+UInt64 DatabaseReplicated::getMetadataHash(const String & table_name) const
 {
-    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
+    return DB::getMetadataHash(table_name, readMetadataFile(table_name));
+}
+
+void DatabaseReplicated::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
+{
+    DatabaseAtomic::startupTables(thread_pool, mode);
+
+    /// TSA: No concurrent writes are possible during loading
+    UInt64 digest = 0;
+    for (const auto & table : TSA_SUPPRESS_WARNING_FOR_READ(tables))
+        digest += getMetadataHash(table.first);
+
+    LOG_DEBUG(log, "Calculated metadata digest of {} tables: {}", TSA_SUPPRESS_WARNING_FOR_READ(tables).size(), digest);
+    chassert(!TSA_SUPPRESS_WARNING_FOR_READ(tables_metadata_digest));
+    TSA_SUPPRESS_WARNING_FOR_WRITE(tables_metadata_digest) = digest;
+
     ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
+    if (is_probably_dropped)
+        return;
     ddl_worker->startup();
 }
 
+bool DatabaseReplicated::checkDigestValid(const ContextPtr & local_context, bool debug_check /* = true */) const
+{
+    if (debug_check)
+    {
+        /// Reduce number of debug checks
+        if (thread_local_rng() % 16)
+            return true;
+    }
+
+    LOG_TEST(log, "Current in-memory metadata digest: {}", tables_metadata_digest);
+
+    /// Database is probably being dropped
+    if (!local_context->getZooKeeperMetadataTransaction() && !ddl_worker->isCurrentlyActive())
+        return true;
+
+    UInt64 local_digest = 0;
+    {
+        std::lock_guard lock{mutex};
+        for (const auto & table : TSA_SUPPRESS_WARNING_FOR_READ(tables))
+            local_digest += getMetadataHash(table.first);
+    }
+
+    if (local_digest != tables_metadata_digest)
+    {
+        LOG_ERROR(log, "Digest of local metadata ({}) is not equal to in-memory digest ({})", local_digest, tables_metadata_digest);
+        return false;
+    }
+
+    /// Do not check digest in Keeper after internal subquery, it's probably not committed yet
+    if (local_context->isInternalSubquery())
+        return true;
+
+    /// Check does not make sense to check digest in Keeper during recovering
+    if (is_recovering)
+        return true;
+
+    String zk_digest = getZooKeeper()->get(replica_path + "/digest");
+    String local_digest_str = toString(local_digest);
+    if (zk_digest != local_digest_str)
+    {
+        LOG_ERROR(log, "Digest of local metadata ({}) is not equal to digest in Keeper ({})", local_digest_str, zk_digest);
+        return false;
+    }
+
+    return true;
+}
+
 void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_context) const
 {
     /// Replicas will set correct name of current database in query context (database name can be different on replicas)
@@ -512,7 +663,7 @@ static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context
         return UUIDHelpers::Nil;
     if (!startsWith(create.storage->engine->name, "Replicated") || !endsWith(create.storage->engine->name, "MergeTree"))
         return UUIDHelpers::Nil;
-    assert(create.uuid != UUIDHelpers::Nil);
+    chassert(create.uuid != UUIDHelpers::Nil);
     return create.uuid;
 }
 
@@ -532,9 +683,6 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     else
         LOG_WARNING(log, "Will recover replica with staled log pointer {} from log pointer {}", our_log_ptr, max_log_ptr);
 
-    if (new_replica && !empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "It's new replica, but database is not empty");
-
     auto table_name_to_metadata = tryGetConsistentMetadataSnapshot(current_zookeeper, max_log_ptr);
 
     /// For ReplicatedMergeTree tables we can compare only UUIDs to ensure that it's the same table.
@@ -578,7 +726,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         auto in_zk = table_name_to_metadata.find(name);
         if (in_zk == table_name_to_metadata.end() || in_zk->second != readMetadataFile(name))
         {
-            /// Local table does not exits in ZooKeeper or has different metadata
+            /// Local table does not exist in ZooKeeper or has different metadata
             tables_to_detach.emplace_back(std::move(name));
         }
     }
@@ -640,7 +788,13 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             assert(db_name < to_database_name);
             DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(to_database_name, to_name);
             auto to_db_ptr = DatabaseCatalog::instance().getDatabase(to_database_name);
-            DatabaseAtomic::renameTable(make_query_context(), broken_table_name, *to_db_ptr, to_name, false, false);
+
+            std::lock_guard lock{metadata_mutex};
+            UInt64 new_digest = tables_metadata_digest;
+            new_digest -= getMetadataHash(broken_table_name);
+            DatabaseAtomic::renameTable(make_query_context(), broken_table_name, *to_db_ptr, to_name, /* exchange */ false, /* dictionary */ false);
+            tables_metadata_digest = new_digest;
+            assert(checkDigestValid(getContext()));
             ++moved_tables;
         };
 
@@ -649,9 +803,24 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             LOG_DEBUG(log, "Will DROP TABLE {}, because it does not store data on disk and can be safely dropped", backQuoteIfNeed(table_name));
             dropped_tables.push_back(tryGetTableUUID(table_name));
             dropped_dictionaries += table->isDictionary();
-
             table->flushAndShutdown();
-            DatabaseAtomic::dropTable(make_query_context(), table_name, true);
+
+            if (table->getName() == "MaterializedView" || table->getName() == "WindowView")
+            {
+                /// We have to drop MV inner table, so MV will not try to do it implicitly breaking some invariants.
+                /// Also we have to commit metadata transaction, because it's not committed by default for inner tables of MVs.
+                /// Yep, I hate inner tables of materialized views.
+                auto mv_drop_inner_table_context = make_query_context();
+                table->dropInnerTableIfAny(sync, mv_drop_inner_table_context);
+                mv_drop_inner_table_context->getZooKeeperMetadataTransaction()->commit();
+            }
+
+            std::lock_guard lock{metadata_mutex};
+            UInt64 new_digest = tables_metadata_digest;
+            new_digest -= getMetadataHash(table_name);
+            DatabaseAtomic::dropTableImpl(make_query_context(), table_name, /* sync */ true);
+            tables_metadata_digest = new_digest;
+            assert(checkDigestValid(getContext()));
         }
         else if (!table->supportsReplication())
         {
@@ -677,7 +846,15 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         /// TODO Maybe we should do it in two steps: rename all tables to temporary names and then rename them to actual names?
         DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::min(from, to));
         DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::max(from, to));
+
+        std::lock_guard lock{metadata_mutex};
+        UInt64 new_digest = tables_metadata_digest;
+        String statement = readMetadataFile(from);
+        new_digest -= DB::getMetadataHash(from, statement);
+        new_digest += DB::getMetadataHash(to, statement);
         DatabaseAtomic::renameTable(make_query_context(), from, *this, to, false, false);
+        tables_metadata_digest = new_digest;
+        assert(checkDigestValid(getContext()));
     }
 
     for (const auto & id : dropped_tables)
@@ -712,6 +889,10 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
                 LOG_INFO(log, "Marked recovered {} as finished", entry_name);
         }
     }
+
+    std::lock_guard lock{metadata_mutex};
+    chassert(checkDigestValid(getContext()));
+    current_zookeeper->set(replica_path + "/digest", toString(tables_metadata_digest));
 }
 
 std::map<String, String> DatabaseReplicated::tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr)
@@ -749,8 +930,8 @@ std::map<String, String> DatabaseReplicated::tryGetConsistentMetadataSnapshot(co
         }
         else
         {
-            assert(max_log_ptr == new_max_log_ptr);
-            assert(table_names.size() != table_name_to_metadata.size());
+            chassert(max_log_ptr == new_max_log_ptr);
+            chassert(table_names.size() != table_name_to_metadata.size());
             LOG_DEBUG(log, "Cannot get metadata of some tables due to ZooKeeper error, will retry");
         }
     }
@@ -801,6 +982,8 @@ void DatabaseReplicated::drop(ContextPtr context_)
 
 void DatabaseReplicated::stopReplication()
 {
+    if (is_probably_dropped)
+        return;
     if (ddl_worker)
         ddl_worker->shutdown();
 }
@@ -817,12 +1000,29 @@ void DatabaseReplicated::dropTable(ContextPtr local_context, const String & tabl
 {
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn || startsWith(table_name, ".inner_id."));
-    if (txn && txn->isInitialQuery())
+    if (txn && txn->isInitialQuery() && !txn->isCreateOrReplaceQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::dropTable(local_context, table_name, sync);
+
+    auto table = tryGetTable(table_name, getContext());
+    if (table->getName() == "MaterializedView" || table->getName() == "WindowView")
+    {
+        /// Avoid recursive locking of metadata_mutex
+        table->dropInnerTableIfAny(sync, local_context);
+    }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= getMetadataHash(table_name);
+    if (txn && !txn->isCreateOrReplaceQuery())
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
+    DatabaseAtomic::dropTableImpl(local_context, table_name, sync);
+    tables_metadata_digest = new_digest;
+
+    assert(checkDigestValid(local_context));
 }
 
 void DatabaseReplicated::renameTable(ContextPtr local_context, const String & table_name, IDatabase & to_database,
@@ -831,31 +1031,51 @@ void DatabaseReplicated::renameTable(ContextPtr local_context, const String & ta
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(txn);
 
+    if (this != &to_database)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases is not supported for Replicated engine");
+    if (table_name == to_table_name)
+        throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot rename table to itself");
+    if (!isTableExist(table_name, local_context))
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_name);
+    if (exchange && !to_database.isTableExist(to_table_name, local_context))
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
+
+    String statement = readMetadataFile(table_name);
+    String statement_to;
+    if (exchange)
+        statement_to = readMetadataFile(to_table_name);
+
     if (txn->isInitialQuery())
     {
-        if (this != &to_database)
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases is not supported for Replicated engine");
-        if (table_name == to_table_name)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot rename table to itself");
-        if (!isTableExist(table_name, local_context))
-            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_name);
-        if (exchange && !to_database.isTableExist(to_table_name, local_context))
-            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
-
-        String statement = readMetadataFile(table_name);
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         String metadata_zk_path_to = zookeeper_path + "/metadata/" + escapeForFileName(to_table_name);
-        txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
+        if (!txn->isCreateOrReplaceQuery())
+            txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
+
         if (exchange)
         {
-            String statement_to = readMetadataFile(to_table_name);
             txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path_to, -1));
-            txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement_to, zkutil::CreateMode::Persistent));
+            if (!txn->isCreateOrReplaceQuery())
+                txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement_to, zkutil::CreateMode::Persistent));
         }
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path_to, statement, zkutil::CreateMode::Persistent));
     }
 
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= DB::getMetadataHash(table_name, statement);
+    new_digest += DB::getMetadataHash(to_table_name, statement);
+    if (exchange)
+    {
+        new_digest -= DB::getMetadataHash(to_table_name, statement_to);
+        new_digest += DB::getMetadataHash(table_name, statement_to);
+    }
+    if (txn)
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(local_context));
 }
 
 void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
@@ -864,14 +1084,24 @@ void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const S
 {
     auto txn = query_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
-    if (txn && txn->isInitialQuery())
+
+    String statement = getObjectDefinitionFromCreateQuery(query.clone());
+    if (txn && txn->isInitialQuery() && !txn->isCreateOrReplaceQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(query.getTable());
-        String statement = getObjectDefinitionFromCreateQuery(query.clone());
         /// zk::multi(...) will throw if `metadata_zk_path` exists
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest += DB::getMetadataHash(query.getTable(), statement);
+    if (txn && !txn->isCreateOrReplaceQuery())
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::commitCreateTable(query, table, table_metadata_tmp_path, table_metadata_path, query_context);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(query_context));
 }
 
 void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
@@ -879,12 +1109,23 @@ void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
                                           const String & statement, ContextPtr query_context)
 {
     auto txn = query_context->getZooKeeperMetadataTransaction();
+    assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_id.table_name);
         txn->addOp(zkutil::makeSetRequest(metadata_zk_path, statement, -1));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= getMetadataHash(table_id.table_name);
+    new_digest += DB::getMetadataHash(table_id.table_name, statement);
+    if (txn)
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, query_context);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(query_context));
 }
 
 void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const String & table_name)
@@ -898,10 +1139,19 @@ void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    new_digest -= getMetadataHash(table_name);
+    if (txn)
+        txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+
     DatabaseAtomic::detachTablePermanently(local_context, table_name);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(local_context));
 }
 
-void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach) const
+void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach)
 {
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
@@ -911,14 +1161,26 @@ void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context,
         String statement = readMetadataFile(table_name);
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
     }
+
+    std::lock_guard lock{metadata_mutex};
+    UInt64 new_digest = tables_metadata_digest;
+    if (attach)
+    {
+        new_digest += getMetadataHash(table_name);
+        if (txn)
+            txn->addOp(zkutil::makeSetRequest(replica_path + "/digest", toString(new_digest), -1));
+    }
+
     DatabaseAtomic::removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, attach);
+    tables_metadata_digest = new_digest;
+    assert(checkDigestValid(local_context));
 }
 
 
 String DatabaseReplicated::readMetadataFile(const String & table_name) const
 {
     String statement;
-    ReadBufferFromFile in(getObjectMetadataPath(table_name), 4096);
+    ReadBufferFromFile in(getObjectMetadataPath(table_name), METADATA_FILE_BUFFER_SIZE);
     readStringUntilEOF(statement, in);
     return statement;
 }
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 07014702067..3aeec42b271 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -40,7 +40,7 @@ public:
                           const String & table_metadata_tmp_path, const String & table_metadata_path,
                           const String & statement, ContextPtr query_context) override;
     void detachTablePermanently(ContextPtr context, const String & table_name) override;
-    void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const override;
+    void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) override;
 
     bool waitForReplicaToProcessAllEntries(UInt64 timeout_ms);
 
@@ -60,15 +60,15 @@ public:
     const String & getZooKeeperPath() const { return zookeeper_path; }
 
     /// Returns cluster consisting of database replicas
-    ClusterPtr getCluster() const;
+    ClusterPtr tryGetCluster() const;
 
     void drop(ContextPtr /*context*/) override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr context, LoadingStrictnessLevel mode, bool skip_startup_tables) override;
 
-    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+    void beforeLoadingMetadata(ContextMutablePtr context, LoadingStrictnessLevel mode) override;
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     void shutdown() override;
 
@@ -78,8 +78,9 @@ public:
     friend struct DatabaseReplicatedTask;
     friend class DatabaseReplicatedDDLWorker;
 private:
-    void tryConnectToZooKeeperAndInitDatabase(bool force_attach);
+    void tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessLevel mode);
     bool createDatabaseNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
+    static bool looksLikeReplicatedDatabasePath(const ZooKeeperPtr & current_zookeeper, const String & path);
     void createReplicaNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
 
     struct
@@ -110,6 +111,9 @@ private:
         return is_recovering && typeid_cast<DatabaseAtomic *>(&to_database);
     }
 
+    UInt64 getMetadataHash(const String & table_name) const;
+    bool checkDigestValid(const ContextPtr & local_context, bool debug_check = true) const TSA_REQUIRES(metadata_mutex);
+
     String zookeeper_path;
     String shard_name;
     String replica_name;
@@ -119,10 +123,20 @@ private:
     zkutil::ZooKeeperPtr getZooKeeper() const;
 
     std::atomic_bool is_readonly = true;
+    std::atomic_bool is_probably_dropped = false;
     std::atomic_bool is_recovering = false;
     std::unique_ptr<DatabaseReplicatedDDLWorker> ddl_worker;
     UInt32 max_log_ptr_at_creation = 0;
 
+    /// Usually operation with metadata are single-threaded because of the way replication works,
+    /// but StorageReplicatedMergeTree may call alterTable outside from DatabaseReplicatedDDLWorker causing race conditions.
+    std::mutex metadata_mutex;
+
+    /// Sum of hashes of pairs (table_name, table_create_statement).
+    /// We calculate this sum from local metadata files and compare it will value in ZooKeeper.
+    /// It allows to detect if metadata is broken and recover replica.
+    UInt64 tables_metadata_digest TSA_GUARDED_BY(metadata_mutex);
+
     mutable ClusterPtr cluster;
 };
 
diff --git a/src/Databases/DatabaseReplicatedSettings.h b/src/Databases/DatabaseReplicatedSettings.h
index 8bed1ababf6..c19ec1fb7a4 100644
--- a/src/Databases/DatabaseReplicatedSettings.h
+++ b/src/Databases/DatabaseReplicatedSettings.h
@@ -12,6 +12,7 @@ class ASTStorage;
     M(UInt64, max_replication_lag_to_enqueue, 10, "Replica will throw exception on attempt to execute query if its replication lag greater", 0) \
     M(UInt64, wait_entry_commited_timeout_sec, 3600, "Replicas will try to cancel query if timeout exceed, but initiator host has not executed it yet", 0) \
     M(String, collection_name, "", "A name of a collection defined in server's config where all info for cluster authentication is defined", 0) \
+    M(Bool, check_consistency, true, "Check consistency of local metadata and metadata in Keeper, do replica recovery on inconsistency", 0) \
 
 
 DECLARE_SETTINGS_TRAITS(DatabaseReplicatedSettingsTraits, LIST_OF_DATABASE_REPLICATED_SETTINGS)
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 96b4e273ce7..63d5af8da3d 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -32,9 +32,10 @@ bool DatabaseReplicatedDDLWorker::initializeMainThread()
     {
         try
         {
+            chassert(!database->is_probably_dropped);
             auto zookeeper = getAndSetZooKeeper();
             if (database->is_readonly)
-                database->tryConnectToZooKeeperAndInitDatabase(false);
+                database->tryConnectToZooKeeperAndInitDatabase(LoadingStrictnessLevel::ATTACH);
             initializeReplication();
             initialized = true;
             return true;
@@ -65,8 +66,34 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
     UInt32 our_log_ptr = parse<UInt32>(log_ptr_str);
     UInt32 max_log_ptr = parse<UInt32>(zookeeper->get(database->zookeeper_path + "/max_log_ptr"));
     logs_to_keep = parse<UInt32>(zookeeper->get(database->zookeeper_path + "/logs_to_keep"));
-    if (our_log_ptr == 0 || our_log_ptr + logs_to_keep < max_log_ptr)
+
+    UInt64 digest;
+    String digest_str;
+    UInt64 local_digest;
+    if (zookeeper->tryGet(database->replica_path + "/digest", digest_str))
     {
+        digest = parse<UInt64>(digest_str);
+        std::lock_guard lock{database->metadata_mutex};
+        local_digest = database->tables_metadata_digest;
+    }
+    else
+    {
+        /// Database was created by old ClickHouse versions, let's create the node
+        std::lock_guard lock{database->metadata_mutex};
+        digest = local_digest = database->tables_metadata_digest;
+        digest_str = toString(digest);
+        zookeeper->create(database->replica_path + "/digest", digest_str, zkutil::CreateMode::Persistent);
+    }
+
+    bool is_new_replica = our_log_ptr == 0;
+    bool lost_according_to_log_ptr = our_log_ptr + logs_to_keep < max_log_ptr;
+    bool lost_according_to_digest = database->db_settings.check_consistency && local_digest != digest;
+
+    if (is_new_replica || lost_according_to_log_ptr || lost_according_to_digest)
+    {
+        if (!is_new_replica)
+            LOG_WARNING(log, "Replica seems to be lost: our_log_ptr={}, max_log_ptr={}, local_digest={}, zk_digest={}",
+                        our_log_ptr, max_log_ptr, local_digest, digest);
         database->recoverLostReplica(zookeeper, our_log_ptr, max_log_ptr);
         zookeeper->set(database->replica_path + "/log_ptr", toString(max_log_ptr));
         initializeLogPointer(DDLTaskBase::getLogEntryName(max_log_ptr));
@@ -77,6 +104,10 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
         last_skipped_entry_name.emplace(log_entry_name);
         initializeLogPointer(log_entry_name);
     }
+
+    std::lock_guard lock{database->metadata_mutex};
+    if (!database->checkDigestValid(context))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent database metadata after reconnection to ZooKeeper");
 }
 
 String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)
@@ -93,7 +124,7 @@ bool DatabaseReplicatedDDLWorker::waitForReplicaToProcessAllEntries(UInt64 timeo
     const auto max_log_ptr_path = database->zookeeper_path + "/max_log_ptr";
     UInt32 our_log_ptr = parse<UInt32>(zookeeper->get(our_log_ptr_path));
     UInt32 max_log_ptr = parse<UInt32>(zookeeper->get(max_log_ptr_path));
-    assert(our_log_ptr <= max_log_ptr);
+    chassert(our_log_ptr <= max_log_ptr);
 
     /// max_log_ptr is the number of the last successfully executed request on the initiator
     /// The log could contain other entries which are not committed yet
@@ -108,7 +139,6 @@ bool DatabaseReplicatedDDLWorker::waitForReplicaToProcessAllEntries(UInt64 timeo
         std::unique_lock lock{mutex};
         bool processed = wait_current_task_change.wait_for(lock, std::chrono::milliseconds(timeout_ms), [&]()
         {
-            assert(zookeeper->expired() || current_task <= max_log);
             return zookeeper->expired() || current_task == max_log || stop_flag;
         });
 
@@ -181,6 +211,7 @@ String DatabaseReplicatedDDLWorker::enqueueQueryImpl(const ZooKeeperPtr & zookee
     /// Create status dirs
     ops.emplace_back(zkutil::makeCreateRequest(node_path + "/active", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(node_path + "/finished", "", zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(node_path + "/synced", "", zkutil::CreateMode::Persistent));
     zookeeper->multi(ops);
 
 
@@ -206,7 +237,7 @@ String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entr
     auto task = std::make_unique<DatabaseReplicatedTask>(entry_name, entry_path, database);
     task->entry = entry;
     task->parseQueryFromEntry(context);
-    assert(!task->entry.query.empty());
+    chassert(!task->entry.query.empty());
     assert(!zookeeper->exists(task->getFinishedNodePath()));
     task->is_initial_query = true;
 
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 72155bc818c..65dfb80846d 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include <base/types.h>
+#include <Core/UUID.h>
+#include <Databases/LoadingStrictnessLevel.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <Interpreters/Context_fwd.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/ThreadPool.h>
-#include <Core/UUID.h>
 
 #include <ctime>
 #include <functional>
@@ -132,18 +133,15 @@ public:
     /// You can call only once, right after the object is created.
     virtual void loadStoredObjects( /// NOLINT
         ContextMutablePtr /*context*/,
-        bool /*force_restore*/,
-        bool /*force_attach*/ = false,
-        bool /* skip_startup_tables */ = false)
+        LoadingStrictnessLevel /*mode*/,
+        bool /* skip_startup_tables */)
     {
     }
 
     virtual bool supportsLoadingInTopologicalOrder() const { return false; }
 
     virtual void beforeLoadingMetadata(
-        ContextMutablePtr /*context*/,
-        bool /*force_restore*/,
-        bool /*force_attach*/)
+        ContextMutablePtr /*context*/, LoadingStrictnessLevel /*mode*/)
     {
     }
 
@@ -152,12 +150,13 @@ public:
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
     }
 
-    virtual void loadTableFromMetadata(ContextMutablePtr /*local_context*/, const String & /*file_path*/, const QualifiedTableName & /*name*/, const ASTPtr & /*ast*/, bool /*force_restore*/)
+    virtual void loadTableFromMetadata(ContextMutablePtr /*local_context*/, const String & /*file_path*/, const QualifiedTableName & /*name*/, const ASTPtr & /*ast*/,
+        LoadingStrictnessLevel /*mode*/)
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
     }
 
-    virtual void startupTables(ThreadPool & /*thread_pool*/, bool /*force_restore*/, bool /*force_attach*/) {}
+    virtual void startupTables(ThreadPool & /*thread_pool*/, LoadingStrictnessLevel /*mode*/) {}
 
     /// Check the existence of the table in memory (attached).
     virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
@@ -223,6 +222,13 @@ public:
         throw Exception("There is no DETACH TABLE PERMANENTLY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    /// Returns list of table names that were permanently detached.
+    /// This list may not be updated in runtime and may be filled only on server startup
+    virtual Strings getNamesOfPermanentlyDetachedTables() const
+    {
+        throw Exception("Cannot get names of permanently detached tables for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     /// Rename the table and possibly move the table to another database.
     virtual void renameTable(
         ContextPtr /*context*/,
diff --git a/src/Databases/LoadingStrictnessLevel.cpp b/src/Databases/LoadingStrictnessLevel.cpp
new file mode 100644
index 00000000000..8d491ca5689
--- /dev/null
+++ b/src/Databases/LoadingStrictnessLevel.cpp
@@ -0,0 +1,28 @@
+#include <Databases/LoadingStrictnessLevel.h>
+#include <cassert>
+
+namespace DB
+{
+
+LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore)
+{
+    if (force_restore)
+    {
+        assert(attach);
+        assert(force_attach);
+        return LoadingStrictnessLevel::FORCE_RESTORE;
+    }
+
+    if (force_attach)
+    {
+        assert(attach);
+        return LoadingStrictnessLevel::FORCE_ATTACH;
+    }
+
+    if (attach)
+        return LoadingStrictnessLevel::ATTACH;
+
+    return LoadingStrictnessLevel::CREATE;
+}
+
+}
diff --git a/src/Databases/LoadingStrictnessLevel.h b/src/Databases/LoadingStrictnessLevel.h
new file mode 100644
index 00000000000..b6449a0a9fd
--- /dev/null
+++ b/src/Databases/LoadingStrictnessLevel.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace DB
+{
+
+/// Strictness mode for loading a table or database
+enum class LoadingStrictnessLevel
+{
+    /// Do all possible sanity checks
+    CREATE = 0,
+    /// Expect existing paths on FS and in ZK for ATTACH query
+    ATTACH = 1,
+    /// We ignore some error on server startup
+    FORCE_ATTACH = 2,
+    /// Skip all sanity checks (if force_restore_data flag exists)
+    FORCE_RESTORE = 3,
+};
+
+LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore);
+
+}
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
index 230a0b4d4a4..91dbadca409 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
@@ -63,11 +63,11 @@ void DatabaseMaterializedMySQL::setException(const std::exception_ptr & exceptio
     exception = exception_;
 }
 
-void DatabaseMaterializedMySQL::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+void DatabaseMaterializedMySQL::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
 {
-    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
+    DatabaseAtomic::startupTables(thread_pool, mode);
 
-    if (!force_attach)
+    if (mode < LoadingStrictnessLevel::FORCE_ATTACH)
         materialize_thread.assertMySQLAvailable();
 
     materialize_thread.startSynchronization();
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.h b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
index a6810f29d87..27a7ddc8acf 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
@@ -48,7 +48,7 @@ protected:
 public:
     String getEngineName() const override { return "MaterializedMySQL"; }
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 95098ba9cbd..01c342c1771 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -398,7 +398,7 @@ String DatabaseMySQL::getMetadataPath() const
     return metadata_path;
 }
 
-void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/, bool /* skip_startup_tables */)
+void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/, bool /* skip_startup_tables */)
 {
 
     std::lock_guard<std::mutex> lock{mutex};
diff --git a/src/Databases/MySQL/DatabaseMySQL.h b/src/Databases/MySQL/DatabaseMySQL.h
index 542cd65c1f1..5d0a366e5e6 100644
--- a/src/Databases/MySQL/DatabaseMySQL.h
+++ b/src/Databases/MySQL/DatabaseMySQL.h
@@ -76,7 +76,7 @@ public:
 
     void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/, bool skip_startup_tables) override;
 
     StoragePtr detachTable(ContextPtr context, const String & table_name) override;
 
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index 08a0859e6db..523cc7041be 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -125,9 +125,9 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
 }
 
 
-void DatabaseMaterializedPostgreSQL::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+void DatabaseMaterializedPostgreSQL::startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode)
 {
-    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
+    DatabaseAtomic::startupTables(thread_pool, mode);
     startup_task->activateAndSchedule();
 }
 
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
index ac2bcedca60..6363e8e07c4 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
@@ -40,7 +40,7 @@ public:
 
     String getMetadataPath() const override { return metadata_path; }
 
-    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, LoadingStrictnessLevel mode) override;
 
     DatabaseTablesIteratorPtr
     getTablesIterator(ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index c4b815c0c9f..8e89765b635 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -290,7 +290,7 @@ void DatabasePostgreSQL::drop(ContextPtr /*context*/)
 }
 
 
-void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, bool, bool /*force_attach*/, bool /* skip_startup_tables */)
+void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, LoadingStrictnessLevel /*mode*/, bool /* skip_startup_tables */)
 {
     {
         std::lock_guard<std::mutex> lock{mutex};
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index fe4dff2ca93..d70e529e4a6 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -45,7 +45,7 @@ public:
 
     bool empty() const override;
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
+    void loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/, bool skip_startup_tables) override;
 
     DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
index 7e9b83d423a..1114206d469 100644
--- a/src/Databases/TablesLoader.cpp
+++ b/src/Databases/TablesLoader.cpp
@@ -62,11 +62,10 @@ void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, Atomic
     }
 }
 
-TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_, bool force_attach_)
+TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, LoadingStrictnessLevel strictness_mode_)
 : global_context(global_context_)
 , databases(std::move(databases_))
-, force_restore(force_restore_)
-, force_attach(force_attach_)
+, strictness_mode(strictness_mode_)
 {
     metadata.default_database = global_context->getCurrentDatabase();
     log = &Poco::Logger::get("TablesLoader");
@@ -83,7 +82,7 @@ void TablesLoader::loadTables()
         if (need_resolve_dependencies && database.second->supportsLoadingInTopologicalOrder())
             databases_to_load.push_back(database.first);
         else
-            database.second->loadStoredObjects(global_context, force_restore, force_attach, true);
+            database.second->loadStoredObjects(global_context, strictness_mode, /* skip_startup_tables */ true);
     }
 
     if (databases_to_load.empty())
@@ -92,8 +91,9 @@ void TablesLoader::loadTables()
     /// Read and parse metadata from Ordinary, Atomic, Materialized*, Replicated, etc databases. Build dependency graph.
     for (auto & database_name : databases_to_load)
     {
-        databases[database_name]->beforeLoadingMetadata(global_context, force_restore, force_attach);
-        databases[database_name]->loadTablesMetadata(global_context, metadata, force_attach);
+        databases[database_name]->beforeLoadingMetadata(global_context, strictness_mode);
+        bool is_startup = LoadingStrictnessLevel::FORCE_ATTACH <= strictness_mode;
+        databases[database_name]->loadTablesMetadata(global_context, metadata, is_startup);
     }
 
     LOG_INFO(log, "Parsed metadata of {} tables in {} databases in {} sec",
@@ -119,7 +119,7 @@ void TablesLoader::startupTables()
 {
     /// Startup tables after all tables are loaded. Background tasks (merges, mutations, etc) may slow down data parts loading.
     for (auto & database : databases)
-        database.second->startupTables(pool, force_restore, force_attach);
+        database.second->startupTables(pool, strictness_mode);
 }
 
 
@@ -253,7 +253,7 @@ void TablesLoader::startLoadingIndependentTables(ThreadPool & pool, size_t level
         pool.scheduleOrThrowOnError([this, load_context, total_tables, &table_name]()
         {
             const auto & path_and_query = metadata.parsed_tables[table_name];
-            databases[table_name.database]->loadTableFromMetadata(load_context, path_and_query.path, table_name, path_and_query.ast, force_restore);
+            databases[table_name.database]->loadTableFromMetadata(load_context, path_and_query.path, table_name, path_and_query.ast, strictness_mode);
             logAboutProgress(log, ++tables_processed, total_tables, stopwatch);
         });
     }
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
index 43e8bfdb92c..7a29d0e3958 100644
--- a/src/Databases/TablesLoader.h
+++ b/src/Databases/TablesLoader.h
@@ -1,14 +1,15 @@
 #pragma once
-#include <Core/Types.h>
-#include <Core/QualifiedTableName.h>
-#include <Parsers/IAST_fwd.h>
-#include <Interpreters/Context_fwd.h>
-#include <Common/ThreadPool.h>
-#include <Common/Stopwatch.h>
 #include <map>
+#include <mutex>
 #include <unordered_map>
 #include <unordered_set>
-#include <mutex>
+#include <Core/QualifiedTableName.h>
+#include <Core/Types.h>
+#include <Databases/LoadingStrictnessLevel.h>
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST_fwd.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 
 namespace Poco
 {
@@ -78,7 +79,7 @@ class TablesLoader
 public:
     using Databases = std::map<String, DatabasePtr>;
 
-    TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_ = false, bool force_attach_ = false);
+    TablesLoader(ContextMutablePtr global_context_, Databases databases_, LoadingStrictnessLevel strictness_mode_);
     TablesLoader() = delete;
 
     void loadTables();
@@ -87,8 +88,7 @@ public:
 private:
     ContextMutablePtr global_context;
     Databases databases;
-    bool force_restore;
-    bool force_attach;
+    LoadingStrictnessLevel strictness_mode;
 
     Strings databases_to_load;
     ParsedTablesMetadata metadata;
diff --git a/src/Dictionaries/CassandraDictionarySource.h b/src/Dictionaries/CassandraDictionarySource.h
index e73383aa75c..2591b33c638 100644
--- a/src/Dictionaries/CassandraDictionarySource.h
+++ b/src/Dictionaries/CassandraDictionarySource.h
@@ -8,6 +8,7 @@
 #include "IDictionarySource.h"
 #include "ExternalQueryBuilder.h"
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Poco/Logger.h>
 #include <mutex>
 
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index 1a3f3f0edc4..b1c47561948 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -29,7 +29,7 @@ namespace ErrorCodes
 }
 
 static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "db", "database", "table",
+    "host", "port", "user", "password", "quota_key", "db", "database", "table",
     "update_field", "update_lag", "invalidate_query", "query", "where", "name", "secure"};
 
 namespace
@@ -54,6 +54,7 @@ namespace
             configuration.db,
             configuration.user,
             configuration.password,
+            configuration.quota_key,
             "", /* cluster */
             "", /* cluster_secret */
             "ClickHouseDictionarySource",
@@ -237,6 +238,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
         std::string host = config.getString(settings_config_prefix + ".host", "localhost");
         std::string user = config.getString(settings_config_prefix + ".user", "default");
         std::string password =  config.getString(settings_config_prefix + ".password", "");
+        std::string quota_key =  config.getString(settings_config_prefix + ".quota_key", "");
         std::string db = config.getString(settings_config_prefix + ".db", default_database);
         std::string table = config.getString(settings_config_prefix + ".table", "");
         UInt16 port = static_cast<UInt16>(config.getUInt(settings_config_prefix + ".port", default_port));
@@ -252,6 +254,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             host = configuration.host;
             user = configuration.username;
             password = configuration.password;
+            quota_key = configuration.quota_key;
             db = configuration.database;
             table = configuration.table;
             port = configuration.port;
@@ -261,6 +264,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             .host = host,
             .user = user,
             .password = password,
+            .quota_key = quota_key,
             .db = db,
             .table = table,
             .query = config.getString(settings_config_prefix + ".query", ""),
@@ -284,6 +288,9 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
         else
         {
             context = Context::createCopy(global_context);
+
+            if (created_from_ddl)
+                context->getRemoteHostFilter().checkHostAndPort(configuration.host, toString(configuration.port));
         }
 
         context->applySettingsChanges(readSettingsFromDictionaryConfig(config, config_prefix));
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index 007e3e8b29d..7bf6b805c03 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -23,6 +23,7 @@ public:
         const std::string host;
         const std::string user;
         const std::string password;
+        const std::string quota_key;
         const std::string db;
         const std::string table;
         const std::string query;
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 5624f9595d7..3ba82164eb2 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -167,6 +167,12 @@ void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
     }
 }
 
+bool DictionaryStructure::hasAttribute(const std::string & attribute_name) const
+{
+    auto it = attribute_name_to_index.find(attribute_name);
+    return it != attribute_name_to_index.end();
+}
+
 const DictionaryAttribute & DictionaryStructure::getAttribute(const std::string & attribute_name) const
 {
     auto it = attribute_name_to_index.find(attribute_name);
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index bb4c306affa..327606e97f7 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -127,6 +127,7 @@ struct DictionaryStructure final
     DataTypes getKeyTypes() const;
     void validateKeyTypes(const DataTypes & key_types) const;
 
+    bool hasAttribute(const std::string & attribute_name) const;
     const DictionaryAttribute & getAttribute(const std::string & attribute_name) const;
     const DictionaryAttribute & getAttribute(const std::string & attribute_name, const DataTypePtr & type) const;
 
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 6ecc216e370..189ea2a7bca 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -171,13 +171,13 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
     auto requested_keys = requested_keys_extractor.extractAllKeys();
     size_t requested_keys_size = requested_keys.size();
 
-    HashMap<KeyType, size_t> requested_key_to_index;
+    HashMap<KeyType, PaddedPODArray<size_t>> requested_key_to_index;
     requested_key_to_index.reserve(requested_keys_size);
 
     for (size_t i = 0; i < requested_keys.size(); ++i)
     {
         auto requested_key = requested_keys[i];
-        requested_key_to_index[requested_key] = i;
+        requested_key_to_index[requested_key].push_back(i);
     }
 
     auto result = ColumnUInt8::create(requested_keys_size, false);
@@ -208,10 +208,13 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
             const auto * it = requested_key_to_index.find(block_key);
             assert(it);
 
-            size_t result_data_found_index = it->getMapped();
-            /// block_keys_size cannot be used, due to duplicates.
-            keys_found += !result_data[result_data_found_index];
-            result_data[result_data_found_index] = true;
+            auto & result_data_found_indexes = it->getMapped();
+            for (size_t result_data_found_index : result_data_found_indexes)
+            {
+                /// block_keys_size cannot be used, due to duplicates.
+                keys_found += !result_data[result_data_found_index];
+                result_data[result_data_found_index] = true;
+            }
 
             block_keys_extractor.rollbackCurrentKey();
         }
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index d45213fa7f8..39e034a071f 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -32,8 +32,7 @@ HTTPDictionarySource::HTTPDictionarySource(
     const Configuration & configuration_,
     const Poco::Net::HTTPBasicCredentials & credentials_,
     Block & sample_block_,
-    ContextPtr context_,
-    bool created_from_ddl)
+    ContextPtr context_)
     : log(&Poco::Logger::get("HTTPDictionarySource"))
     , update_time(std::chrono::system_clock::from_time_t(0))
     , dict_struct(dict_struct_)
@@ -42,9 +41,6 @@ HTTPDictionarySource::HTTPDictionarySource(
     , context(context_)
     , timeouts(ConnectionTimeouts::getHTTPTimeouts(context))
 {
-    if (created_from_ddl)
-        context->getRemoteHostFilter().checkURL(Poco::URI(configuration.url));
-
     credentials.setUsername(credentials_.getUsername());
     credentials.setPassword(credentials_.getPassword());
 }
@@ -303,7 +299,10 @@ void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
 
         auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
 
-        return std::make_unique<HTTPDictionarySource>(dict_struct, configuration, credentials, sample_block, context, created_from_ddl);
+        if (created_from_ddl)
+            context->getRemoteHostFilter().checkURL(Poco::URI(configuration.url));
+
+        return std::make_unique<HTTPDictionarySource>(dict_struct, configuration, credentials, sample_block, context);
     };
     factory.registerSource("http", create_table_source);
 }
diff --git a/src/Dictionaries/HTTPDictionarySource.h b/src/Dictionaries/HTTPDictionarySource.h
index 71351cd9987..86e3836f2dc 100644
--- a/src/Dictionaries/HTTPDictionarySource.h
+++ b/src/Dictionaries/HTTPDictionarySource.h
@@ -37,8 +37,7 @@ public:
         const Configuration & configuration,
         const Poco::Net::HTTPBasicCredentials & credentials_,
         Block & sample_block_,
-        ContextPtr context_,
-        bool created_from_ddl);
+        ContextPtr context_);
 
     HTTPDictionarySource(const HTTPDictionarySource & other);
     HTTPDictionarySource & operator=(const HTTPDictionarySource &) = delete;
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 3f3c60206d6..d82f89b7473 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -5,16 +5,19 @@
 
 #include <Core/Names.h>
 #include <Columns/ColumnsNumber.h>
+#include <Core/ColumnsWithTypeAndName.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/StorageID.h>
+#include <Interpreters/IKeyValueEntity.h>
 #include <Interpreters/castColumn.h>
+#include <Interpreters/JoinUtils.h>
 #include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <DataTypes/IDataType.h>
 
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
@@ -52,7 +55,7 @@ enum class DictionarySpecialKeyType
 /**
  * Base class for Dictionaries implementation.
  */
-class IDictionary : public IExternalLoadable
+class IDictionary : public IExternalLoadable, public IKeyValueEntity
 {
 public:
     explicit IDictionary(const StorageID & dictionary_id_)
@@ -290,6 +293,107 @@ public:
         return dictionary_comment;
     }
 
+    /// IKeyValueEntity implementation
+    Names getPrimaryKey() const  override { return getStructure().getKeysNames(); }
+
+    Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & out_null_map, const Names & result_names) const override
+    {
+        if (keys.empty())
+            return Chunk(getSampleBlock(result_names).cloneEmpty().getColumns(), 0);
+
+        const auto & dictionary_structure = getStructure();
+
+        /// Split column keys and types into separate vectors, to use in `IDictionary::getColumns`
+        Columns key_columns;
+        DataTypes key_types;
+        for (const auto & key : keys)
+        {
+            key_columns.emplace_back(key.column);
+            key_types.emplace_back(key.type);
+        }
+
+        /// Fill null map
+        {
+            out_null_map.clear();
+
+            auto mask = hasKeys(key_columns, key_types);
+            const auto & mask_data = mask->getData();
+
+            out_null_map.resize(mask_data.size(), 0);
+            std::copy(mask_data.begin(), mask_data.end(), out_null_map.begin());
+        }
+
+        Names attribute_names;
+        DataTypes result_types;
+        if (!result_names.empty())
+        {
+            for (const auto & attr_name : result_names)
+            {
+                if (!dictionary_structure.hasAttribute(attr_name))
+                    continue; /// skip keys
+                const auto & attr = dictionary_structure.getAttribute(attr_name);
+                attribute_names.emplace_back(attr.name);
+                result_types.emplace_back(attr.type);
+            }
+        }
+        else
+        {
+            /// If result_names is empty, then use all attributes from dictionary_structure
+            for (const auto & attr : dictionary_structure.attributes)
+            {
+                attribute_names.emplace_back(attr.name);
+                result_types.emplace_back(attr.type);
+            }
+        }
+
+        Columns default_cols(result_types.size());
+        for (size_t i = 0; i < result_types.size(); ++i)
+            /// Dictinonary may have non-standart default values specified
+            default_cols[i] = result_types[i]->createColumnConstWithDefaultValue(out_null_map.size());
+
+        Columns result_columns = getColumns(attribute_names, result_types, key_columns, key_types, default_cols);
+
+        /// Result block should consist of key columns and then attributes
+        for (const auto & key_col : key_columns)
+        {
+            /// Insert default values for keys that were not found
+            ColumnPtr filtered_key_col = JoinCommon::filterWithBlanks(key_col, out_null_map);
+            result_columns.insert(result_columns.begin(), filtered_key_col);
+        }
+
+        size_t num_rows = result_columns[0]->size();
+        return Chunk(std::move(result_columns), num_rows);
+    }
+
+    Block getSampleBlock(const Names & result_names) const override
+    {
+        const auto & dictionary_structure = getStructure();
+        const auto & key_types = dictionary_structure.getKeyTypes();
+        const auto & key_names = dictionary_structure.getKeysNames();
+
+        Block sample_block;
+
+        for (size_t i = 0; i < key_types.size(); ++i)
+            sample_block.insert(ColumnWithTypeAndName(nullptr, key_types.at(i), key_names.at(i)));
+
+        if (result_names.empty())
+        {
+            for (const auto & attr : dictionary_structure.attributes)
+                sample_block.insert(ColumnWithTypeAndName(nullptr, attr.type, attr.name));
+        }
+        else
+        {
+            for (const auto & attr_name : result_names)
+            {
+                if (!dictionary_structure.hasAttribute(attr_name))
+                    continue; /// skip keys
+                const auto & attr = dictionary_structure.getAttribute(attr_name);
+                sample_block.insert(ColumnWithTypeAndName(nullptr, attr.type, attr_name));
+            }
+        }
+        return sample_block;
+    }
+
 private:
     mutable std::mutex mutex;
     mutable StorageID dictionary_id TSA_GUARDED_BY(mutex);
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index 936bbd72299..7eb4d803fe8 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -12,8 +12,6 @@
 #include <Dictionaries/DictionaryStructure.h>
 #include <Dictionaries/registerDictionaries.h>
 
-namespace fs = std::filesystem;
-
 namespace DB
 {
 
@@ -44,19 +42,21 @@ LibraryDictionarySource::LibraryDictionarySource(
     if (created_from_ddl && !fileOrSymlinkPathStartsWith(path, dictionaries_lib_path))
         throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", path, dictionaries_lib_path);
 
+    namespace fs = std::filesystem;
+
     if (!fs::exists(path))
         throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "LibraryDictionarySource: Can't load library {}: file doesn't exist", path);
 
     description.init(sample_block);
 
-    LibraryBridgeHelper::LibraryInitData library_data
+    ExternalDictionaryLibraryBridgeHelper::LibraryInitData library_data
     {
         .library_path = path,
         .library_settings = getLibrarySettingsString(config, config_prefix + ".settings"),
         .dict_attributes = getDictAttributesString()
     };
 
-    bridge_helper = std::make_shared<LibraryBridgeHelper>(context, description.sample_block, dictionary_id, library_data);
+    bridge_helper = std::make_shared<ExternalDictionaryLibraryBridgeHelper>(context, description.sample_block, dictionary_id, library_data);
 
     if (!bridge_helper->initLibrary())
         throw Exception(ErrorCodes::EXTERNAL_LIBRARY_ERROR, "Failed to create shared library from path: {}", path);
@@ -87,7 +87,7 @@ LibraryDictionarySource::LibraryDictionarySource(const LibraryDictionarySource &
     , context(other.context)
     , description{other.description}
 {
-    bridge_helper = std::make_shared<LibraryBridgeHelper>(context, description.sample_block, dictionary_id, other.bridge_helper->getLibraryData());
+    bridge_helper = std::make_shared<ExternalDictionaryLibraryBridgeHelper>(context, description.sample_block, dictionary_id, other.bridge_helper->getLibraryData());
     if (!bridge_helper->cloneLibrary(other.dictionary_id))
         throw Exception(ErrorCodes::EXTERNAL_LIBRARY_ERROR, "Failed to clone library");
 }
diff --git a/src/Dictionaries/LibraryDictionarySource.h b/src/Dictionaries/LibraryDictionarySource.h
index 09f95b17dab..57ab9976a3b 100644
--- a/src/Dictionaries/LibraryDictionarySource.h
+++ b/src/Dictionaries/LibraryDictionarySource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <BridgeHelper/LibraryBridgeHelper.h>
+#include <BridgeHelper/ExternalDictionaryLibraryBridgeHelper.h>
 #include <Common/LocalDateTime.h>
 #include <Core/UUID.h>
 #include "DictionaryStructure.h"
@@ -28,7 +28,7 @@ namespace ErrorCodes
 }
 
 class CStringsHolder;
-using LibraryBridgeHelperPtr = std::shared_ptr<LibraryBridgeHelper>;
+using ExternalDictionaryLibraryBridgeHelperPtr = std::shared_ptr<ExternalDictionaryLibraryBridgeHelper>;
 
 class LibraryDictionarySource final : public IDictionarySource
 {
@@ -85,7 +85,7 @@ private:
     Block sample_block;
     ContextPtr context;
 
-    LibraryBridgeHelperPtr bridge_helper;
+    ExternalDictionaryLibraryBridgeHelperPtr bridge_helper;
     ExternalResultDescription description;
 };
 
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index 6a1bfceaec7..1ede0ec5045 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -20,7 +20,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         Block & sample_block,
         ContextPtr context,
         const std::string & /* default_database */,
-        bool /* created_from_ddl */)
+        bool created_from_ddl)
     {
         const auto config_prefix = root_config_prefix + ".mongodb";
         ExternalDataSourceConfiguration configuration;
@@ -39,6 +39,9 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
             configuration.database = config.getString(config_prefix + ".db", "");
         }
 
+        if (created_from_ddl)
+            context->getRemoteHostFilter().checkHostAndPort(configuration.host, toString(configuration.port));
+
         return std::make_unique<MongoDBDictionarySource>(dict_struct,
             config.getString(config_prefix + ".uri", ""),
             configuration.host,
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index a5807f58f8a..6fb4dffc5e7 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -78,6 +78,9 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
                               : std::nullopt;
         if (named_collection)
         {
+            if (created_from_ddl)
+                global_context->getRemoteHostFilter().checkHostAndPort(configuration.host, toString(configuration.port));
+
             mysql_settings.applyChanges(named_collection->settings_changes);
             configuration.set(named_collection->configuration);
             configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
@@ -90,6 +93,12 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
         }
         else
         {
+            if (created_from_ddl)
+            {
+                for (auto & address : configuration.addresses)
+                    global_context->getRemoteHostFilter().checkHostAndPort(address.first, toString(address.second));
+            }
+
             configuration.database = config.getString(settings_config_prefix + ".db", "");
             configuration.table = config.getString(settings_config_prefix + ".table", "");
             pool = std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
diff --git a/src/Dictionaries/PolygonDictionaryUtils.cpp b/src/Dictionaries/PolygonDictionaryUtils.cpp
index 313743c09b6..c28c7c15aa7 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.cpp
+++ b/src/Dictionaries/PolygonDictionaryUtils.cpp
@@ -131,7 +131,6 @@ void SlabsPolygonIndex::indexBuild(const std::vector<Polygon> & polygons)
     /** Map of interesting edge ids to the index of left x, the index of right x */
     std::vector<size_t> edge_left(m, n), edge_right(m, n);
 
-    size_t total_index_edges = 0;
     size_t edges_it = 0;
     for (size_t l = 0, r = 1; r < sorted_x.size(); ++l, ++r)
     {
@@ -170,12 +169,10 @@ void SlabsPolygonIndex::indexBuild(const std::vector<Polygon> & polygons)
             if (l & 1)
             {
                 edges_index_tree[l++].emplace_back(all_edges[i]);
-                ++total_index_edges;
             }
             if (r & 1)
             {
                 edges_index_tree[--r].emplace_back(all_edges[i]);
-                ++total_index_edges;
             }
         }
     }
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index 42884278e7d..9153b9cb05d 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -185,13 +185,21 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
                                  Block & sample_block,
                                  ContextPtr context,
                                  const std::string & /* default_database */,
-                                 bool /* created_from_ddl */) -> DictionarySourcePtr
+                                 [[maybe_unused]] bool created_from_ddl) -> DictionarySourcePtr
     {
 #if USE_LIBPQXX
         const auto settings_config_prefix = config_prefix + ".postgresql";
         auto has_config_key = [](const String & key) { return dictionary_allowed_keys.contains(key) || key.starts_with("replica"); };
         auto configuration = getExternalDataSourceConfigurationByPriority(config, settings_config_prefix, context, has_config_key);
         const auto & settings = context->getSettingsRef();
+
+        if (created_from_ddl)
+        {
+            for (const auto & replicas : configuration.replicas_configurations)
+                for (const auto & replica : replicas.second)
+                    context->getRemoteHostFilter().checkHostAndPort(replica.host, toString(replica.port));
+        }
+
         auto pool = std::make_shared<postgres::PoolWithFailover>(
             configuration.replicas_configurations,
             settings.postgresql_connection_pool_size,
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index 459c4c44668..5f73352a4c9 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -34,6 +34,8 @@ namespace ProfileEvents
     extern const Event AIOWriteBytes;
     extern const Event AIORead;
     extern const Event AIOReadBytes;
+    extern const Event FileSync;
+    extern const Event FileSyncElapsedMicroseconds;
 }
 
 namespace DB
@@ -544,6 +546,9 @@ public:
                 file_path,
                 std::to_string(bytes_written));
 
+        ProfileEvents::increment(ProfileEvents::FileSync);
+
+        Stopwatch watch;
         #if defined(OS_DARWIN)
         if (::fsync(file.fd) < 0)
             throwFromErrnoWithPath("Cannot fsync " + file_path, file_path, ErrorCodes::CANNOT_FSYNC);
@@ -551,6 +556,7 @@ public:
         if (::fdatasync(file.fd) < 0)
             throwFromErrnoWithPath("Cannot fdatasync " + file_path, file_path, ErrorCodes::CANNOT_FSYNC);
         #endif
+        ProfileEvents::increment(ProfileEvents::FileSyncElapsedMicroseconds, watch.elapsedMicroseconds());
 
         current_block_index += buffer_size_in_blocks;
 
diff --git a/src/Disks/DiskCacheWrapper.cpp b/src/Disks/DiskCacheWrapper.cpp
deleted file mode 100644
index 45c98224966..00000000000
--- a/src/Disks/DiskCacheWrapper.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-#include "DiskCacheWrapper.h"
-#include <IO/copyData.h>
-#include <IO/ReadBufferFromFileDecorator.h>
-#include <IO/WriteBufferFromFileDecorator.h>
-#include <Common/quoteString.h>
-#include <condition_variable>
-
-namespace DB
-{
-/**
- * This buffer writes to cache, but after finalize() copy written file from cache to disk.
- */
-class WritingToCacheWriteBuffer final : public WriteBufferFromFileDecorator
-{
-public:
-    WritingToCacheWriteBuffer(
-        std::unique_ptr<WriteBufferFromFileBase> impl_,
-        std::function<std::unique_ptr<ReadBuffer>()> create_read_buffer_,
-        std::function<std::unique_ptr<WriteBuffer>()> create_write_buffer_)
-        : WriteBufferFromFileDecorator(std::move(impl_))
-        , create_read_buffer(std::move(create_read_buffer_))
-        , create_write_buffer(std::move(create_write_buffer_))
-    {
-    }
-
-    ~WritingToCacheWriteBuffer() override
-    {
-        try
-        {
-            finalize();
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-
-    void preFinalize() override
-    {
-        impl->next();
-        impl->preFinalize();
-        impl->finalize();
-
-        read_buffer = create_read_buffer();
-        write_buffer = create_write_buffer();
-        copyData(*read_buffer, *write_buffer);
-        write_buffer->next();
-        write_buffer->preFinalize();
-
-        is_prefinalized = true;
-    }
-
-    void finalizeImpl() override
-    {
-        if (!is_prefinalized)
-            preFinalize();
-
-        write_buffer->finalize();
-    }
-
-private:
-    std::function<std::unique_ptr<ReadBuffer>()> create_read_buffer;
-    std::function<std::unique_ptr<WriteBuffer>()> create_write_buffer;
-    std::unique_ptr<ReadBuffer> read_buffer;
-    std::unique_ptr<WriteBuffer> write_buffer;
-
-    bool is_prefinalized = false;
-};
-
-enum FileDownloadStatus
-{
-    NONE,
-    DOWNLOADING,
-    DOWNLOADED,
-    ERROR
-};
-
-struct FileDownloadMetadata
-{
-    /// Thread waits on this condition if download process is in progress.
-    std::condition_variable condition;
-    FileDownloadStatus status = NONE;
-};
-
-DiskCacheWrapper::DiskCacheWrapper(
-    std::shared_ptr<IDisk> delegate_, std::shared_ptr<DiskLocal> cache_disk_, std::function<bool(const String &)> cache_file_predicate_)
-    : DiskDecorator(delegate_), cache_disk(cache_disk_), cache_file_predicate(cache_file_predicate_)
-{
-}
-
-std::shared_ptr<FileDownloadMetadata> DiskCacheWrapper::acquireDownloadMetadata(const String & path) const
-{
-    std::lock_guard lock{mutex};
-
-    auto it = file_downloads.find(path);
-    if (it != file_downloads.end())
-        if (auto x = it->second.lock())
-            return x;
-
-    std::shared_ptr<FileDownloadMetadata> metadata(
-        new FileDownloadMetadata,
-        [this, path] (FileDownloadMetadata * p)
-        {
-            std::lock_guard erase_lock{mutex};
-            file_downloads.erase(path);
-            delete p;
-        });
-
-    file_downloads.emplace(path, metadata);
-
-    return metadata;
-}
-
-std::unique_ptr<ReadBufferFromFileBase>
-DiskCacheWrapper::readFile(
-    const String & path,
-    const ReadSettings & settings,
-    std::optional<size_t> read_hint,
-    std::optional<size_t> file_size) const
-{
-    if (!cache_file_predicate(path))
-        return DiskDecorator::readFile(path, settings, read_hint, file_size);
-
-    LOG_TEST(log, "Read file {} from cache", backQuote(path));
-
-    if (cache_disk->exists(path))
-        return cache_disk->readFile(path, settings, read_hint, file_size);
-
-    auto metadata = acquireDownloadMetadata(path);
-
-    {
-        std::unique_lock<std::mutex> lock{mutex};
-
-        if (metadata->status == NONE)
-        {
-            /// This thread will responsible for file downloading to cache.
-            metadata->status = DOWNLOADING;
-            LOG_TEST(log, "File {} doesn't exist in cache. Will download it", backQuote(path));
-        }
-        else if (metadata->status == DOWNLOADING)
-        {
-            LOG_TEST(log, "Waiting for file {} download to cache", backQuote(path));
-            metadata->condition.wait(lock, [metadata] { return metadata->status == DOWNLOADED || metadata->status == ERROR; });
-        }
-    }
-
-    auto current_read_settings = settings;
-    /// Do not use RemoteFSReadMethod::threadpool for index and mark files.
-    /// Here it does not make sense since the files are small.
-    /// Note: enabling `threadpool` read requires to call setReadUntilEnd().
-    current_read_settings.remote_fs_method = RemoteFSReadMethod::read;
-    /// Disable data cache.
-    current_read_settings.enable_filesystem_cache = false;
-
-    if (metadata->status == DOWNLOADING)
-    {
-        FileDownloadStatus result_status = DOWNLOADED;
-
-        if (!cache_disk->exists(path))
-        {
-            try
-            {
-                auto dir_path = directoryPath(path);
-                if (!cache_disk->exists(dir_path))
-                    cache_disk->createDirectories(dir_path);
-
-                auto tmp_path = path + ".tmp";
-                {
-                    auto src_buffer = DiskDecorator::readFile(path, current_read_settings, read_hint, file_size);
-
-                    WriteSettings write_settings;
-                    write_settings.enable_filesystem_cache_on_write_operations = false;
-
-                    auto dst_buffer = cache_disk->writeFile(tmp_path, settings.local_fs_buffer_size, WriteMode::Rewrite, write_settings);
-                    copyData(*src_buffer, *dst_buffer);
-                }
-                cache_disk->moveFile(tmp_path, path);
-
-                LOG_TEST(log, "File {} downloaded to cache", backQuote(path));
-            }
-            catch (...)
-            {
-                tryLogCurrentException("DiskCache", "Failed to download file + " + backQuote(path) + " to cache");
-                result_status = ERROR;
-            }
-        }
-
-        /// Notify all waiters that file download is finished.
-        std::unique_lock<std::mutex> lock{mutex};
-
-        metadata->status = result_status;
-        lock.unlock();
-        metadata->condition.notify_all();
-    }
-
-    if (metadata->status == DOWNLOADED)
-        return cache_disk->readFile(path, settings, read_hint, file_size);
-
-    return DiskDecorator::readFile(path, current_read_settings, read_hint, file_size);
-}
-
-std::unique_ptr<WriteBufferFromFileBase>
-DiskCacheWrapper::writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings & settings)
-{
-    if (!cache_file_predicate(path))
-        return DiskDecorator::writeFile(path, buf_size, mode, settings);
-
-    WriteSettings current_settings = settings;
-    /// There are two different cache implementations. Disable second one if the first is enabled.
-    /// The first will soon be removed, this disabling is temporary.
-    current_settings.enable_filesystem_cache_on_write_operations = false;
-
-    LOG_TEST(log, "Write file {} to cache", backQuote(path));
-
-    auto dir_path = directoryPath(path);
-    if (!cache_disk->exists(dir_path))
-        cache_disk->createDirectories(dir_path);
-
-    return std::make_unique<WritingToCacheWriteBuffer>(
-        cache_disk->writeFile(path, buf_size, mode, current_settings),
-        [this, path]()
-        {
-            /// Copy file from cache to actual disk when cached buffer is finalized.
-            return cache_disk->readFile(path, ReadSettings(), /* read_hint= */ {}, /* file_size= */ {});
-        },
-        [this, path, buf_size, mode, current_settings]()
-        {
-            return DiskDecorator::writeFile(path, buf_size, mode, current_settings);
-        });
-}
-
-void DiskCacheWrapper::clearDirectory(const String & path)
-{
-    if (cache_disk->exists(path))
-        cache_disk->clearDirectory(path);
-    DiskDecorator::clearDirectory(path);
-}
-
-void DiskCacheWrapper::moveDirectory(const String & from_path, const String & to_path)
-{
-    if (cache_disk->exists(from_path))
-    {
-        /// Destination directory may not be empty if previous directory move attempt was failed.
-        if (cache_disk->exists(to_path) && cache_disk->isDirectory(to_path))
-            cache_disk->clearDirectory(to_path);
-
-        cache_disk->moveDirectory(from_path, to_path);
-    }
-    DiskDecorator::moveDirectory(from_path, to_path);
-}
-
-void DiskCacheWrapper::moveFile(const String & from_path, const String & to_path)
-{
-    if (cache_disk->exists(from_path))
-    {
-        auto dir_path = directoryPath(to_path);
-        if (!cache_disk->exists(dir_path))
-            cache_disk->createDirectories(dir_path);
-
-        cache_disk->moveFile(from_path, to_path);
-    }
-    DiskDecorator::moveFile(from_path, to_path);
-}
-
-void DiskCacheWrapper::replaceFile(const String & from_path, const String & to_path)
-{
-    if (cache_disk->exists(from_path))
-    {
-        auto dir_path = directoryPath(to_path);
-        if (!cache_disk->exists(dir_path))
-            cache_disk->createDirectories(dir_path);
-
-        cache_disk->replaceFile(from_path, to_path);
-    }
-    DiskDecorator::replaceFile(from_path, to_path);
-}
-
-void DiskCacheWrapper::removeFile(const String & path)
-{
-    cache_disk->removeFileIfExists(path);
-    DiskDecorator::removeFile(path);
-}
-
-void DiskCacheWrapper::removeFileIfExists(const String & path)
-{
-    cache_disk->removeFileIfExists(path);
-    DiskDecorator::removeFileIfExists(path);
-}
-
-void DiskCacheWrapper::removeDirectory(const String & path)
-{
-    if (cache_disk->exists(path))
-        cache_disk->removeDirectory(path);
-
-    DiskDecorator::removeDirectory(path);
-}
-
-void DiskCacheWrapper::removeRecursive(const String & path)
-{
-    if (cache_disk->exists(path))
-        cache_disk->removeRecursive(path);
-    DiskDecorator::removeRecursive(path);
-}
-
-void DiskCacheWrapper::removeSharedFile(const String & path, bool keep_s3)
-{
-    if (cache_disk->exists(path))
-        cache_disk->removeSharedFile(path, keep_s3);
-    DiskDecorator::removeSharedFile(path, keep_s3);
-}
-
-void DiskCacheWrapper::removeSharedRecursive(const String & path, bool keep_all, const NameSet & files_to_keep)
-{
-    if (cache_disk->exists(path))
-        cache_disk->removeSharedRecursive(path, keep_all, files_to_keep);
-    DiskDecorator::removeSharedRecursive(path, keep_all, files_to_keep);
-}
-
-
-void DiskCacheWrapper::removeSharedFiles(const RemoveBatchRequest & files, bool keep_all, const NameSet & files_to_keep)
-{
-    for (const auto & file : files)
-    {
-        if (cache_disk->exists(file.path))
-        {
-            bool keep_file = keep_all || files_to_keep.contains(fs::path(file.path).filename());
-            cache_disk->removeSharedFile(file.path, keep_file);
-        }
-    }
-
-    DiskDecorator::removeSharedFiles(files, keep_all, files_to_keep);
-}
-
-void DiskCacheWrapper::createHardLink(const String & src_path, const String & dst_path)
-{
-    /// Don't create hardlinks for cache files to shadow directory as it just waste cache disk space.
-    if (cache_disk->exists(src_path) && !dst_path.starts_with("shadow/"))
-    {
-        auto dir_path = directoryPath(dst_path);
-        if (!cache_disk->exists(dir_path))
-            cache_disk->createDirectories(dir_path);
-
-        cache_disk->createHardLink(src_path, dst_path);
-    }
-    DiskDecorator::createHardLink(src_path, dst_path);
-}
-
-void DiskCacheWrapper::createDirectory(const String & path)
-{
-    cache_disk->createDirectory(path);
-    DiskDecorator::createDirectory(path);
-}
-
-void DiskCacheWrapper::createDirectories(const String & path)
-{
-    cache_disk->createDirectories(path);
-    DiskDecorator::createDirectories(path);
-}
-
-ReservationPtr DiskCacheWrapper::reserve(UInt64 bytes)
-{
-    auto ptr = DiskDecorator::reserve(bytes);
-    if (ptr)
-    {
-        auto disk_ptr = std::static_pointer_cast<DiskCacheWrapper>(shared_from_this());
-        return std::make_unique<ReservationDelegate>(std::move(ptr), disk_ptr);
-    }
-    return ptr;
-}
-
-}
diff --git a/src/Disks/DiskCacheWrapper.h b/src/Disks/DiskCacheWrapper.h
deleted file mode 100644
index f4bd443a551..00000000000
--- a/src/Disks/DiskCacheWrapper.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-#include <Common/logger_useful.h>
-#include "DiskDecorator.h"
-#include "DiskLocal.h"
-
-namespace DB
-{
-struct FileDownloadMetadata;
-
-/**
- * Simple cache wrapper.
- * Tries to cache files matched by predicate to given local disk (cache disk).
- *
- * When writeFile() is invoked wrapper firstly writes file to cache.
- * After write buffer is finalized actual file is stored to underlying disk.
- *
- * When readFile() is invoked and file exists in cache wrapper reads this file from cache.
- * If file doesn't exist wrapper downloads this file from underlying disk to cache.
- * readFile() invocation is thread-safe.
- */
-class DiskCacheWrapper : public DiskDecorator
-{
-public:
-    DiskCacheWrapper(
-        std::shared_ptr<IDisk> delegate_,
-        std::shared_ptr<DiskLocal> cache_disk_,
-        std::function<bool(const String &)> cache_file_predicate_);
-    void createDirectory(const String & path) override;
-    void createDirectories(const String & path) override;
-    void clearDirectory(const String & path) override;
-    void moveDirectory(const String & from_path, const String & to_path) override;
-    void moveFile(const String & from_path, const String & to_path) override;
-    void replaceFile(const String & from_path, const String & to_path) override;
-
-    std::unique_ptr<ReadBufferFromFileBase> readFile(
-        const String & path,
-        const ReadSettings & settings,
-        std::optional<size_t> read_hint,
-        std::optional<size_t> file_size) const override;
-
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode, const WriteSettings &) override;
-
-    void removeFile(const String & path) override;
-    void removeFileIfExists(const String & path) override;
-    void removeDirectory(const String & path) override;
-    void removeRecursive(const String & path) override;
-    void removeSharedFile(const String & path, bool keep_s3) override;
-
-    void removeSharedRecursive(const String & path, bool keep_all, const NameSet & files_to_keep) override;
-    void removeSharedFiles(const RemoveBatchRequest & files, bool keep_all, const NameSet & files_to_keep) override;
-    void createHardLink(const String & src_path, const String & dst_path) override;
-    ReservationPtr reserve(UInt64 bytes) override;
-
-private:
-    std::shared_ptr<FileDownloadMetadata> acquireDownloadMetadata(const String & path) const;
-
-    /// Disk to cache files.
-    std::shared_ptr<DiskLocal> cache_disk;
-    /// Cache only files satisfies predicate.
-    const std::function<bool(const String &)> cache_file_predicate;
-    /// Contains information about currently running file downloads to cache.
-    mutable std::unordered_map<String, std::weak_ptr<FileDownloadMetadata>> file_downloads;
-    /// Protects concurrent downloading files to cache.
-    mutable std::mutex mutex;
-
-    Poco::Logger * log = &Poco::Logger::get("DiskCache");
-};
-
-}
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 52e323487f2..f61496ab078 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -236,9 +236,9 @@ void DiskDecorator::applyNewSettings(const Poco::Util::AbstractConfiguration & c
     delegate->applyNewSettings(config, context, config_prefix, map);
 }
 
-DiskObjectStoragePtr DiskDecorator::createDiskObjectStorage(const String & name)
+DiskObjectStoragePtr DiskDecorator::createDiskObjectStorage()
 {
-    return delegate->createDiskObjectStorage(name);
+    return delegate->createDiskObjectStorage();
 }
 
 }
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index 1eac37e13f3..2298ab56f68 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -83,13 +83,14 @@ public:
     void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String & config_prefix, const DisksMap & map) override;
 
     bool supportsCache() const override { return delegate->supportsCache(); }
-    String getCacheBasePath() const override { return delegate->getCacheBasePath(); }
+    const String & getCacheBasePath() const override { return delegate->getCacheBasePath(); }
 
     StoredObjects getStorageObjects(const String & path) const override { return delegate->getStorageObjects(path); }
-    DiskObjectStoragePtr createDiskObjectStorage(const String &) override;
-
     void getRemotePathsRecursive(const String & path, std::vector<LocalPathWithObjectStoragePaths> & paths_map) override { return delegate->getRemotePathsRecursive(path, paths_map); }
 
+    DiskObjectStoragePtr createDiskObjectStorage() override;
+    NameSet getCacheLayersNames() const override { return delegate->getCacheLayersNames(); }
+
     MetadataStoragePtr getMetadataStorage() override { return delegate->getMetadataStorage(); }
 
     std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & file_paths) const override { return delegate->getSerializedMetadata(file_paths); }
@@ -97,8 +98,15 @@ public:
     UInt32 getRefCount(const String & path) const override { return delegate->getRefCount(path); }
 
     void syncRevision(UInt64 revision) override { delegate->syncRevision(revision); }
+
     UInt64 getRevision() const override { return delegate->getRevision(); }
 
+    bool supportsStat() const override { return delegate->supportsStat(); }
+    struct stat stat(const String & path) const override { return delegate->stat(path); }
+
+    bool supportsChmod() const override { return delegate->supportsChmod(); }
+    void chmod(const String & path, mode_t mode) override { delegate->chmod(path, mode); }
+
 protected:
     Executor & getExecutor() override;
 
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index e793f4dfb5a..9015154a343 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -8,9 +8,14 @@
 #include <Common/quoteString.h>
 #include <Common/atomicRename.h>
 #include <Disks/IO/createReadBufferFromFileBase.h>
+#include <Disks/ObjectStorages/LocalObjectStorage.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Disks/ObjectStorages/FakeMetadataStorageFromDisk.h>
 
 #include <fstream>
 #include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 
 #include <Disks/DiskFactory.h>
 #include <Disks/DiskMemory.h>
@@ -39,6 +44,7 @@ namespace ErrorCodes
     extern const int CANNOT_UNLINK;
     extern const int CANNOT_RMDIR;
     extern const int BAD_ARGUMENTS;
+    extern const int CANNOT_STAT;
 }
 
 std::mutex DiskLocal::reservation_mutex;
@@ -595,6 +601,26 @@ catch (...)
     return false;
 }
 
+DiskObjectStoragePtr DiskLocal::createDiskObjectStorage()
+{
+    auto object_storage = std::make_shared<LocalObjectStorage>();
+    auto metadata_storage = std::make_shared<FakeMetadataStorageFromDisk>(
+        /* metadata_storage */std::static_pointer_cast<DiskLocal>(shared_from_this()),
+        object_storage,
+        /* object_storage_root_path */getPath());
+
+    return std::make_shared<DiskObjectStorage>(
+        getName(),
+        disk_path,
+        "Local",
+        metadata_storage,
+        object_storage,
+        DiskType::Local,
+        false,
+        /* threadpool_size */16
+    );
+}
+
 bool DiskLocal::setup()
 {
     try
@@ -671,6 +697,23 @@ bool DiskLocal::setup()
     return true;
 }
 
+struct stat DiskLocal::stat(const String & path) const
+{
+    struct stat st;
+    auto full_path = fs::path(disk_path) / path;
+    if (::stat(full_path.string().c_str(), &st) == 0)
+        return st;
+    DB::throwFromErrnoWithPath("Cannot stat file: " + path, path, DB::ErrorCodes::CANNOT_STAT);
+}
+
+void DiskLocal::chmod(const String & path, mode_t mode)
+{
+    auto full_path = fs::path(disk_path) / path;
+    if (::chmod(full_path.string().c_str(), mode) == 0)
+        return;
+    DB::throwFromErrnoWithPath("Cannot chmod file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
 void registerDiskLocal(DiskFactory & factory)
 {
     auto creator = [](const String & name,
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 0db9d8d467c..9d3ce1d36b1 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -122,6 +122,14 @@ public:
     bool canRead() const noexcept;
     bool canWrite() const noexcept;
 
+    DiskObjectStoragePtr createDiskObjectStorage() override;
+
+    bool supportsStat() const override { return true; }
+    struct stat stat(const String & path) const override;
+
+    bool supportsChmod() const override { return true; }
+    void chmod(const String & path, mode_t mode) override;
+
 private:
     std::optional<UInt64> tryReserve(UInt64 bytes);
 
diff --git a/src/Disks/DiskRestartProxy.cpp b/src/Disks/DiskRestartProxy.cpp
index 01c9b176853..bd4705f3c2d 100644
--- a/src/Disks/DiskRestartProxy.cpp
+++ b/src/Disks/DiskRestartProxy.cpp
@@ -312,7 +312,7 @@ bool DiskRestartProxy::checkUniqueId(const String & id) const
     return DiskDecorator::checkUniqueId(id);
 }
 
-String DiskRestartProxy::getCacheBasePath() const
+const String & DiskRestartProxy::getCacheBasePath() const
 {
     ReadLock lock (mutex);
     return DiskDecorator::getCacheBasePath();
diff --git a/src/Disks/DiskRestartProxy.h b/src/Disks/DiskRestartProxy.h
index 07c2b808a04..7ab6b4d74af 100644
--- a/src/Disks/DiskRestartProxy.h
+++ b/src/Disks/DiskRestartProxy.h
@@ -64,7 +64,8 @@ public:
     void truncateFile(const String & path, size_t size) override;
     String getUniqueId(const String & path) const override;
     bool checkUniqueId(const String & id) const override;
-    String getCacheBasePath() const override;
+
+    const String & getCacheBasePath() const override;
     StoredObjects getStorageObjects(const String & path) const override;
     void getRemotePathsRecursive(const String & path, std::vector<LocalPathWithObjectStoragePaths> & paths_map) override;
 
diff --git a/src/Disks/DiskSelector.cpp b/src/Disks/DiskSelector.cpp
index e4d50b9a36f..d1a53afc376 100644
--- a/src/Disks/DiskSelector.cpp
+++ b/src/Disks/DiskSelector.cpp
@@ -16,9 +16,18 @@ namespace ErrorCodes
 {
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
     extern const int UNKNOWN_DISK;
+    extern const int LOGICAL_ERROR;
 }
 
-DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
+
+void DiskSelector::assertInitialized() const
+{
+    if (!is_initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DiskSelector not initialized");
+}
+
+
+void DiskSelector::initialize(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
@@ -46,12 +55,16 @@ DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, con
             std::make_shared<DiskLocal>(
                 default_disk_name, context->getPath(), 0, context, config.getUInt("local_disk_check_period_ms", 0)));
     }
+
+    is_initialized = true;
 }
 
 
 DiskSelectorPtr DiskSelector::updateFromConfig(
     const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context) const
 {
+    assertInitialized();
+
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
 
@@ -110,10 +123,33 @@ DiskSelectorPtr DiskSelector::updateFromConfig(
 
 DiskPtr DiskSelector::get(const String & name) const
 {
+    assertInitialized();
     auto it = disks.find(name);
     if (it == disks.end())
         throw Exception("Unknown disk " + name, ErrorCodes::UNKNOWN_DISK);
     return it->second;
 }
 
+
+const DisksMap & DiskSelector::getDisksMap() const
+{
+    assertInitialized();
+    return disks;
+}
+
+
+void DiskSelector::addToDiskMap(const String & name, DiskPtr disk)
+{
+    assertInitialized();
+    disks.emplace(name, disk);
+}
+
+
+void DiskSelector::shutdown()
+{
+    assertInitialized();
+    for (auto & e : disks)
+        e.second->shutdown();
+}
+
 }
diff --git a/src/Disks/DiskSelector.h b/src/Disks/DiskSelector.h
index a2fce4b14d1..a760b3819ca 100644
--- a/src/Disks/DiskSelector.h
+++ b/src/Disks/DiskSelector.h
@@ -18,9 +18,11 @@ using DiskSelectorPtr = std::shared_ptr<const DiskSelector>;
 class DiskSelector
 {
 public:
-    DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context);
+    DiskSelector() = default;
     DiskSelector(const DiskSelector & from) = default;
 
+    void initialize(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context);
+
     DiskSelectorPtr updateFromConfig(
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
@@ -31,20 +33,17 @@ public:
     DiskPtr get(const String & name) const;
 
     /// Get all disks with names
-    const DisksMap & getDisksMap() const { return disks; }
-    void addToDiskMap(const String & name, DiskPtr disk)
-    {
-        disks.emplace(name, disk);
-    }
+    const DisksMap & getDisksMap() const;
 
-    void shutdown()
-    {
-        for (auto & e : disks)
-            e.second->shutdown();
-    }
+    void addToDiskMap(const String & name, DiskPtr disk);
+
+    void shutdown();
 
 private:
     DisksMap disks;
+    bool is_initialized = false;
+
+    void assertInitialized() const;
 };
 
 }
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
index 435f427b05a..2bb4be8f5c9 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -14,6 +14,7 @@ enum class DiskType
     Encrypted,
     WebServer,
     AzureBlobStorage,
+    Cache,
 };
 
 inline String toString(DiskType disk_type)
@@ -34,6 +35,8 @@ inline String toString(DiskType disk_type)
             return "web";
         case DiskType::AzureBlobStorage:
             return "azure_blob_storage";
+        case DiskType::Cache:
+            return "cache";
     }
     __builtin_unreachable();
 }
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
deleted file mode 100644
index b6cda8288d7..00000000000
--- a/src/Disks/DiskWebServer.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-#include "DiskWebServer.h"
-
-#include <Common/logger_useful.h>
-#include <Common/escapeForFileName.h>
-
-#include <IO/ConnectionTimeoutsContext.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
-#include <IO/SeekAvoidingReadBuffer.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-
-#include <Disks/IDisk.h>
-#include <Disks/ObjectStorages/IObjectStorage.h>
-#include <IO/ReadBufferFromFile.h>
-
-#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
-
-#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
-#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
-
-#include <Storages/MergeTree/MergeTreeData.h>
-
-#include <Poco/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int FILE_DOESNT_EXIST;
-    extern const int DIRECTORY_DOESNT_EXIST;
-    extern const int NETWORK_ERROR;
-}
-
-
-void DiskWebServer::initialize(const String & uri_path) const
-{
-    std::vector<String> directories_to_load;
-    LOG_TRACE(log, "Loading metadata for directory: {}", uri_path);
-    try
-    {
-        Poco::Net::HTTPBasicCredentials credentials{};
-        ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_path) / ".index"),
-                                            Poco::Net::HTTPRequest::HTTP_GET,
-                                            ReadWriteBufferFromHTTP::OutStreamCallback(),
-                                            ConnectionTimeouts::getHTTPTimeouts(getContext()),
-                                            credentials);
-        String file_name;
-        FileData file_data{};
-
-        String dir_name = fs::path(uri_path.substr(url.size())) / "";
-        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
-
-        while (!metadata_buf.eof())
-        {
-            readText(file_name, metadata_buf);
-            assertChar('\t', metadata_buf);
-
-            bool is_directory;
-            readBoolText(is_directory, metadata_buf);
-            if (!is_directory)
-            {
-                assertChar('\t', metadata_buf);
-                readIntText(file_data.size, metadata_buf);
-            }
-            assertChar('\n', metadata_buf);
-
-            file_data.type = is_directory ? FileType::Directory : FileType::File;
-            String file_path = fs::path(uri_path) / file_name;
-            if (file_data.type == FileType::Directory)
-            {
-                directories_to_load.push_back(file_path);
-            }
-
-            file_path = file_path.substr(url.size());
-            files.emplace(std::make_pair(file_path, file_data));
-            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
-        }
-
-        files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
-    }
-    catch (Exception & e)
-    {
-        e.addMessage("while loading disk metadata");
-        throw;
-    }
-
-    for (const auto & directory_path : directories_to_load)
-        initialize(directory_path);
-}
-
-
-class DiskWebServerDirectoryIterator final : public IDirectoryIterator
-{
-public:
-    explicit DiskWebServerDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
-        : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin()) {}
-
-    void next() override { ++iter; }
-
-    bool isValid() const override { return iter != dir_file_paths.end(); }
-
-    String path() const override { return iter->string(); }
-
-    String name() const override { return iter->filename(); }
-
-private:
-    std::vector<fs::path> dir_file_paths;
-    std::vector<fs::path>::iterator iter;
-};
-
-
-DiskWebServer::DiskWebServer(
-            const String & disk_name_,
-            const String & url_,
-            ContextPtr context_,
-            size_t min_bytes_for_seek_)
-        : WithContext(context_->getGlobalContext())
-        , log(&Poco::Logger::get("DiskWeb"))
-        , url(url_)
-        , name(disk_name_)
-        , min_bytes_for_seek(min_bytes_for_seek_)
-{
-}
-
-
-bool DiskWebServer::exists(const String & path) const
-{
-    LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
-
-    if (files.find(path) != files.end())
-        return true;
-
-    if (path.ends_with(MergeTreeData::FORMAT_VERSION_FILE_NAME) && files.find(fs::path(path).parent_path() / "") == files.end())
-    {
-        try
-        {
-            initialize(fs::path(url) / fs::path(path).parent_path());
-            return files.find(path) != files.end();
-        }
-        catch (...)
-        {
-            const auto message = getCurrentExceptionMessage(false);
-            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
-            if (can_throw)
-                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
-
-            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
-            return false;
-        }
-    }
-
-    return false;
-}
-
-
-std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & path, const ReadSettings & read_settings, std::optional<size_t>, std::optional<size_t>) const
-{
-    LOG_TRACE(log, "Read from path: {}", path);
-    auto iter = files.find(path);
-    if (iter == files.end())
-        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
-
-    auto fs_path = fs::path(url) / path;
-    auto remote_path = fs_path.parent_path() / (escapeForFileName(fs_path.stem()) + fs_path.extension().string());
-    remote_path = remote_path.string().substr(url.size());
-
-    StoredObjects objects;
-    objects.emplace_back(remote_path, iter->second.size);
-
-    auto web_impl = std::make_unique<ReadBufferFromWebServerGather>(url, objects, getContext(), read_settings);
-
-    if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
-    {
-        auto reader = IObjectStorage::getThreadPoolReader();
-        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(web_impl), min_bytes_for_seek);
-    }
-    else
-    {
-        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(web_impl));
-        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), min_bytes_for_seek);
-    }
-}
-
-
-DirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path) const
-{
-    std::vector<fs::path> dir_file_paths;
-    if (files.find(path) == files.end())
-    {
-        try
-        {
-            initialize(fs::path(url) / path);
-        }
-        catch (...)
-        {
-            const auto message = getCurrentExceptionMessage(false);
-            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
-            if (can_throw)
-                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
-
-            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
-            return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
-        }
-    }
-
-    if (files.find(path) == files.end())
-        throw Exception("Directory '" + path + "' does not exist", ErrorCodes::DIRECTORY_DOESNT_EXIST);
-
-    for (const auto & file : files)
-        if (parentPath(file.first) == path)
-            dir_file_paths.emplace_back(file.first);
-
-    LOG_TRACE(log, "Iterate directory {} with {} files", path, dir_file_paths.size());
-    return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
-}
-
-
-size_t DiskWebServer::getFileSize(const String & path) const
-{
-    auto iter = files.find(path);
-    if (iter == files.end())
-        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
-
-    return iter->second.size;
-}
-
-
-bool DiskWebServer::isFile(const String & path) const
-{
-    auto iter = files.find(path);
-    if (iter == files.end())
-        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
-
-    return iter->second.type == FileType::File;
-}
-
-
-bool DiskWebServer::isDirectory(const String & path) const
-{
-    auto iter = files.find(path);
-    if (iter == files.end())
-        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
-
-    return iter->second.type == FileType::Directory;
-}
-
-
-void registerDiskWebServer(DiskFactory & factory)
-{
-    auto creator = [](const String & disk_name,
-                      const Poco::Util::AbstractConfiguration & config,
-                      const String & config_prefix,
-                      ContextPtr context,
-                      const DisksMap & /*map*/) -> DiskPtr
-    {
-        String uri{config.getString(config_prefix + ".endpoint")};
-        if (!uri.ends_with('/'))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
-        try
-        {
-            Poco::URI poco_uri(uri);
-        }
-        catch (const Poco::Exception & e)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
-        }
-
-        return std::make_shared<DiskWebServer>(disk_name, uri, context, config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
-    };
-
-    factory.registerDiskType("web", creator);
-}
-
-}
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
deleted file mode 100644
index 4dc476894f9..00000000000
--- a/src/Disks/DiskWebServer.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#pragma once
-
-#include <IO/WriteBufferFromFile.h>
-#include <Core/UUID.h>
-#include <set>
-
-#include <Interpreters/Context_fwd.h>
-#include <Disks/IDisk.h>
-#include <IO/ReadBufferFromFile.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-/*
- * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
- *
- *   <storage_configuration>
- *       <disks>
- *           <web>
- *               <type>web</type>
- *               <endpoint>https://clickhouse-datasets.s3.amazonaws.com/disk-with-static-files-tests/test-hits/</endpoint>
- *           </web>
- *       </disks>
- *       <policies>
- *           <web>
- *               <volumes>
- *                   <main>
- *                       <disk>web</disk>
- *                   </main>
- *               </volumes>
- *           </web>
- *       </policies>
- *   </storage_configuration>
- *
- * If query fails with `DB:Exception Unreachable URL` -- may help to adjust settings: http_connection_timeout, http_receive_timeout, keep_alive_timeout.
- *
- * To get files for upload run:
- * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
- * (--metadata-path can be found in query: `select data_paths from system.tables where name='<table_name>';`) /// NOLINT
- *
- * When loading files by <endpoint> they must be loaded into <endpoint>/store/ path, but config must conrain only <endpoint>.
- *
- * If url is not reachable on disk load when server is starting up tables, then all errors are caught.
- * If in this case there were errors, tables can be reloaded (become visible) via detach table table_name -> attach table table_name.
- * If metadata was successfully loaded at server startup, then tables are available straight away.
-**/
-class DiskWebServer : public IDisk, WithContext
-{
-
-public:
-    DiskWebServer(const String & disk_name_,
-                  const String & url_,
-                  ContextPtr context,
-                  size_t min_bytes_for_seek_);
-
-    bool supportZeroCopyReplication() const override { return false; }
-
-    DiskType getType() const override { return DiskType::WebServer; }
-
-    bool isRemote() const override { return true; }
-
-    std::unique_ptr<ReadBufferFromFileBase> readFile(const String & path,
-                                                     const ReadSettings & settings,
-                                                     std::optional<size_t> read_hint,
-                                                     std::optional<size_t> file_size) const override;
-
-    /// Disk info
-
-    const String & getName() const final override { return name; }
-
-    const String & getPath() const final override { return url; }
-
-    bool isReadOnly() const override { return true; }
-
-    UInt64 getTotalSpace() const final override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getAvailableSpace() const final override { return std::numeric_limits<UInt64>::max(); }
-    UInt64 getUnreservedSpace() const final override { return std::numeric_limits<UInt64>::max(); }
-
-    /// Read-only part
-
-    bool exists(const String & path) const override;
-
-    bool isFile(const String & path) const override;
-
-    size_t getFileSize(const String & path) const override;
-
-    void listFiles(const String & /* path */, std::vector<String> & /* file_names */) const override { }
-
-    void setReadOnly(const String & /* path */) override {}
-
-    bool isDirectory(const String & path) const override;
-
-    DirectoryIteratorPtr iterateDirectory(const String & /* path */) const override;
-
-    Poco::Timestamp getLastModified(const String &) const override { return Poco::Timestamp{}; }
-
-    time_t getLastChanged(const String &) const override { return {}; }
-
-    /// Write and modification part
-
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String &, size_t, WriteMode, const WriteSettings &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void moveFile(const String &, const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void replaceFile(const String &, const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeFile(const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeFileIfExists(const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    ReservationPtr reserve(UInt64 /*bytes*/) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeRecursive(const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeSharedFile(const String &, bool) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeSharedFileIfExists(const String &, bool) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeSharedRecursive(const String &, bool, const NameSet &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void clearDirectory(const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void moveDirectory(const String &, const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void removeDirectory(const String &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    void setLastModified(const String &, const Poco::Timestamp &) override
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-    }
-
-    StoredObjects getStorageObjects(const String &) const override { return {}; }
-
-    void getRemotePathsRecursive(const String &, std::vector<LocalPathWithObjectStoragePaths> &) override {}
-
-    /// Create part
-
-    void createFile(const String &) final override {}
-
-    void createDirectory(const String &) override {}
-
-    void createDirectories(const String &) override {}
-
-    void createHardLink(const String &, const String &) override {}
-
-private:
-    void initialize(const String & uri_path) const;
-
-    enum class FileType
-    {
-        File,
-        Directory
-    };
-
-    struct FileData
-    {
-        FileType type{};
-        size_t size = 0;
-    };
-
-    using Files = std::unordered_map<String, FileData>; /// file path -> file data
-    mutable Files files;
-
-    Poco::Logger * log;
-    String url;
-    String name;
-
-    size_t min_bytes_for_seek;
-};
-
-}
diff --git a/src/Disks/FakeDiskTransaction.h b/src/Disks/FakeDiskTransaction.h
index 6d61ac752f2..e80b45a94ec 100644
--- a/src/Disks/FakeDiskTransaction.h
+++ b/src/Disks/FakeDiskTransaction.h
@@ -112,6 +112,11 @@ public:
         disk.setLastModified(path, timestamp);
     }
 
+    void chmod(const String & path, mode_t mode) override
+    {
+        disk.chmod(path, mode);
+    }
+
     void setReadOnly(const std::string & path) override
     {
         disk.setReadOnly(path);
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 2337fa00af5..3e2b7535fcc 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -102,8 +102,8 @@ class IDisk : public Space
 {
 public:
     /// Default constructor.
-    explicit IDisk(std::unique_ptr<Executor> executor_ = std::make_unique<SyncExecutor>())
-        : executor(std::move(executor_))
+    explicit IDisk(std::shared_ptr<Executor> executor_ = std::make_shared<SyncExecutor>())
+        : executor(executor_)
     {
     }
 
@@ -193,6 +193,7 @@ public:
         const WriteSettings & settings = {}) = 0;
 
     /// Remove file. Throws exception if file doesn't exists or it's a directory.
+    /// Return whether file was finally removed. (For remote disks it is not always removed).
     virtual void removeFile(const String & path) = 0;
 
     /// Remove file if it exists.
@@ -220,10 +221,15 @@ public:
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
     virtual void removeSharedFileIfExists(const String & path, bool /* keep_shared_data */) { removeFileIfExists(path); }
 
-    virtual String getCacheBasePath() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "There is no cache path"); }
+    virtual const String & getCacheBasePath() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "There is no cache path"); }
 
     virtual bool supportsCache() const { return false; }
 
+    virtual NameSet getCacheLayersNames() const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method `getCacheLayersNames()` is not implemented for disk: {}", getType());
+    }
+
     /// Returns a list of storage objects (contains path, size, ...).
     /// (A list is returned because for Log family engines there might
     /// be multiple files in remote fs for single clickhouse file.
@@ -343,7 +349,10 @@ public:
     /// Return current disk revision.
     virtual UInt64 getRevision() const { return 0; }
 
-    virtual DiskObjectStoragePtr createDiskObjectStorage(const String &)
+    /// Create disk object storage according to disk type.
+    /// For example for DiskLocal create DiskObjectStorage(LocalObjectStorage),
+    /// for DiskObjectStorage create just a copy.
+    virtual DiskObjectStoragePtr createDiskObjectStorage()
     {
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
@@ -351,6 +360,12 @@ public:
             getType());
     }
 
+    virtual bool supportsStat() const { return false; }
+    virtual struct stat stat(const String & /*path*/) const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk does not support stat"); }
+
+    virtual bool supportsChmod() const { return false; }
+    virtual void chmod(const String & /*path*/, mode_t /*mode*/) { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk does not support chmod"); }
+
 protected:
     friend class DiskDecorator;
 
@@ -363,7 +378,7 @@ protected:
     void copyThroughBuffers(const String & from_path, const std::shared_ptr<IDisk> & to_disk, const String & to_path, bool copy_root_dir = true);
 
 private:
-    std::unique_ptr<Executor> executor;
+    std::shared_ptr<Executor> executor;
 };
 
 using Disks = std::vector<DiskPtr>;
diff --git a/src/Disks/IDiskTransaction.h b/src/Disks/IDiskTransaction.h
index 74fbe8919fe..572d86dcfdb 100644
--- a/src/Disks/IDiskTransaction.h
+++ b/src/Disks/IDiskTransaction.h
@@ -103,6 +103,9 @@ public:
     /// Set last modified time to file or directory at `path`.
     virtual void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) = 0;
 
+    /// Just chmod.
+    virtual void chmod(const String & path, mode_t mode) = 0;
+
     /// Set file at `path` as read-only.
     virtual void setReadOnly(const std::string & path) = 0;
 
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
index f58e91669c4..cbfcbdf7b88 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
@@ -2,8 +2,8 @@
 
 #include <Common/Stopwatch.h>
 #include <Common/logger_useful.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <IO/ReadSettings.h>
 
 
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
index 3734509a605..879658e239f 100644
--- a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
@@ -23,7 +23,7 @@ struct ReadSettings;
 *
 * Buffers chain for diskWeb:
 * AsynchronousIndirectReadBufferFromRemoteFS -> ReadBufferFromRemoteFS ->
-* -> ReadIndirectBufferFromWebServer -> ReadBufferFromHttp -> ReadBufferFromIStream.
+* -> ReadIndirectBufferFromWebServer -> ReadBufferFromHTTP -> ReadBufferFromIStream.
 *
 * We pass either `memory` or `prefetch_buffer` through all this chain and return it back.
 */
@@ -53,6 +53,8 @@ public:
 
     size_t getFileSize() override;
 
+    bool isIntegratedWithFilesystemCache() const override { return true; }
+
 private:
     bool nextImpl() override;
 
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
similarity index 69%
rename from src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
rename to src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
index a3d5cfc408d..d3777fbcbd4 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
@@ -1,4 +1,4 @@
-#include "CachedReadBufferFromRemoteFS.h"
+#include "CachedOnDiskReadBufferFromFile.h"
 
 #include <Disks/IO/createReadBufferFromFileBase.h>
 #include <IO/ReadBufferFromFile.h>
@@ -31,64 +31,73 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_SEEK_THROUGH_FILE;
+    extern const int CANNOT_USE_CACHE;
     extern const int LOGICAL_ERROR;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
-CachedReadBufferFromRemoteFS::CachedReadBufferFromRemoteFS(
-    const String & remote_fs_object_path_,
+CachedOnDiskReadBufferFromFile::CachedOnDiskReadBufferFromFile(
+    const String & source_file_path_,
+    const FileCache::Key & cache_key_,
     FileCachePtr cache_,
-    RemoteFSFileReaderCreator remote_file_reader_creator_,
+    ImplementationBufferCreator implementation_buffer_creator_,
     const ReadSettings & settings_,
     const String & query_id_,
-    size_t read_until_position_)
-    : SeekableReadBuffer(nullptr, 0)
+    size_t file_size_,
+    bool allow_seeks_after_first_read_,
+    bool use_external_buffer_,
+    std::optional<size_t> read_until_position_)
+    : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0, file_size_)
 #ifndef NDEBUG
-    , log(&Poco::Logger::get("CachedReadBufferFromRemoteFS(" + remote_fs_object_path_ + ")"))
+    , log(&Poco::Logger::get("CachedOnDiskReadBufferFromFile(" + source_file_path_ + ")"))
 #else
-    , log(&Poco::Logger::get("CachedReadBufferFromRemoteFS"))
+    , log(&Poco::Logger::get("CachedOnDiskReadBufferFromFile"))
 #endif
-    , cache_key(cache_->hash(remote_fs_object_path_))
-    , remote_fs_object_path(remote_fs_object_path_)
+    , cache_key(cache_key_)
+    , source_file_path(source_file_path_)
     , cache(cache_)
     , settings(settings_)
-    , read_until_position(read_until_position_)
-    , remote_file_reader_creator(remote_file_reader_creator_)
+    , read_until_position(read_until_position_ ? *read_until_position_ : file_size_)
+    , implementation_buffer_creator(implementation_buffer_creator_)
     , query_id(query_id_)
     , enable_logging(!query_id.empty() && settings_.enable_filesystem_cache_log)
     , current_buffer_id(getRandomASCIIString(8))
+    , allow_seeks_after_first_read(allow_seeks_after_first_read_)
+    , use_external_buffer(use_external_buffer_)
     , query_context_holder(cache_->getQueryContextHolder(query_id, settings_))
-    , is_persistent(false) /// Unused for now, see PR 36171
+    , is_persistent(settings_.is_file_cache_persistent)
 {
 }
 
-void CachedReadBufferFromRemoteFS::appendFilesystemCacheLog(
-    const FileSegment::Range & file_segment_range, CachedReadBufferFromRemoteFS::ReadType type)
+void CachedOnDiskReadBufferFromFile::appendFilesystemCacheLog(
+    const FileSegment::Range & file_segment_range, CachedOnDiskReadBufferFromFile::ReadType type)
 {
     FilesystemCacheLogElement elem
     {
         .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
         .query_id = query_id,
-        .source_file_path = remote_fs_object_path,
+        .source_file_path = source_file_path,
         .file_segment_range = { file_segment_range.left, file_segment_range.right },
         .requested_range = { first_offset, read_until_position },
         .file_segment_size = file_segment_range.size(),
         .cache_attempted = true,
         .read_buffer_id = current_buffer_id,
-        .profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(current_file_segment_counters.getPartiallyAtomicSnapshot()),
+        .profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(
+            current_file_segment_counters.getPartiallyAtomicSnapshot()),
     };
 
     current_file_segment_counters.reset();
 
     switch (type)
     {
-        case CachedReadBufferFromRemoteFS::ReadType::CACHED:
-            elem.read_type = FilesystemCacheLogElement::ReadType::READ_FROM_CACHE;
+        case CachedOnDiskReadBufferFromFile::ReadType::CACHED:
+            elem.cache_type = FilesystemCacheLogElement::CacheType::READ_FROM_CACHE;
             break;
-        case CachedReadBufferFromRemoteFS::ReadType::REMOTE_FS_READ_BYPASS_CACHE:
-            elem.read_type = FilesystemCacheLogElement::ReadType::READ_FROM_FS_BYPASSING_CACHE;
+        case CachedOnDiskReadBufferFromFile::ReadType::REMOTE_FS_READ_BYPASS_CACHE:
+            elem.cache_type = FilesystemCacheLogElement::CacheType::READ_FROM_FS_BYPASSING_CACHE;
             break;
-        case CachedReadBufferFromRemoteFS::ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE:
-            elem.read_type = FilesystemCacheLogElement::ReadType::READ_FROM_FS_AND_DOWNLOADED_TO_CACHE;
+        case CachedOnDiskReadBufferFromFile::ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE:
+            elem.cache_type = FilesystemCacheLogElement::CacheType::READ_FROM_FS_AND_DOWNLOADED_TO_CACHE;
             break;
     }
 
@@ -96,8 +105,13 @@ void CachedReadBufferFromRemoteFS::appendFilesystemCacheLog(
         cache_log->add(elem);
 }
 
-void CachedReadBufferFromRemoteFS::initialize(size_t offset, size_t size)
+void CachedOnDiskReadBufferFromFile::initialize(size_t offset, size_t size)
 {
+    if (initialized)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Caching buffer already initialized");
+
+    implementation_buffer.reset();
+
     if (settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
     {
         file_segments_holder.emplace(cache->get(cache_key, offset, size));
@@ -114,13 +128,18 @@ void CachedReadBufferFromRemoteFS::initialize(size_t offset, size_t size)
     if (file_segments_holder->file_segments.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "List of file segments cannot be empty");
 
-    LOG_TEST(log, "Having {} file segments to read", file_segments_holder->file_segments.size());
+    LOG_TEST(
+        log,
+        "Having {} file segments to read: {}, current offset: {}",
+        file_segments_holder->file_segments.size(), file_segments_holder->toString(), file_offset_of_buffer_end);
+
     current_file_segment_it = file_segments_holder->file_segments.begin();
 
     initialized = true;
 }
 
-SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getCacheReadBuffer(size_t offset) const
+CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
+CachedOnDiskReadBufferFromFile::getCacheReadBuffer(size_t offset) const
 {
     auto path = cache->getPathInLocalCache(cache_key, offset, is_persistent);
 
@@ -129,14 +148,15 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getCacheReadBuffer(size_t of
     local_read_settings.local_fs_method = LocalFSReadMethod::pread;
 
     auto buf = createReadBufferFromFileBase(path, local_read_settings);
-    auto * from_fd = dynamic_cast<ReadBufferFromFileDescriptor*>(buf.get());
-    if (from_fd && from_fd->getFileSize() == 0)
+
+    if (getFileSizeFromReadBuffer(*buf) == 0)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read from an empty cache file: {}", path);
 
     return buf;
 }
 
-SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getRemoteFSReadBuffer(FileSegmentPtr & file_segment, ReadType read_type_)
+CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
+CachedOnDiskReadBufferFromFile::getRemoteFSReadBuffer(FileSegmentPtr & file_segment, ReadType read_type_)
 {
     switch (read_type_)
     {
@@ -160,11 +180,17 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getRemoteFSReadBuffer(FileSe
 
             auto remote_fs_segment_reader = file_segment->getRemoteFileReader();
 
-            if (remote_fs_segment_reader)
-                return remote_fs_segment_reader;
+            if (!remote_fs_segment_reader)
+            {
+                remote_fs_segment_reader = implementation_buffer_creator();
 
-            remote_fs_segment_reader = remote_file_reader_creator();
-            file_segment->setRemoteFileReader(remote_fs_segment_reader);
+                if (!remote_fs_segment_reader->supportsRightBoundedReads())
+                    throw Exception(
+                        ErrorCodes::CANNOT_USE_CACHE,
+                        "Cache cannot be used with a ReadBuffer which does not support right bounded reads");
+
+                file_segment->setRemoteFileReader(remote_fs_segment_reader);
+            }
 
             return remote_fs_segment_reader;
         }
@@ -175,15 +201,24 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getRemoteFSReadBuffer(FileSe
             if (remote_file_reader && remote_file_reader->getFileOffsetOfBufferEnd() == file_offset_of_buffer_end)
                 return remote_file_reader;
 
-            remote_file_reader = remote_file_reader_creator();
+            auto remote_fs_segment_reader = file_segment->extractRemoteFileReader();
+            if (remote_fs_segment_reader)
+                remote_file_reader = remote_fs_segment_reader;
+            else
+                remote_file_reader = implementation_buffer_creator();
+
             return remote_file_reader;
         }
         default:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot use remote filesystem reader with read type: {}", toString(read_type));
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Cannot use remote filesystem reader with read type: {}",
+                toString(read_type));
     }
 }
 
-SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(FileSegmentPtr & file_segment)
+CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
+CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegmentPtr & file_segment)
 {
     auto range = file_segment->range();
 
@@ -191,6 +226,7 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
     size_t wait_download_tries = 0;
 
     auto download_state = file_segment->state();
+    LOG_TEST(log, "getReadBufferForFileSegment: {}", file_segment->getInfoForLog());
 
     if (settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
     {
@@ -201,6 +237,7 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
         }
         else
         {
+            LOG_DEBUG(log, "Bypassing cache because `read_from_filesystem_cache_if_exists_otherwise_bypass_cache` option is used");
             read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
             return getRemoteFSReadBuffer(file_segment, read_type);
         }
@@ -212,6 +249,7 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
         {
             case FileSegment::State::SKIP_CACHE:
             {
+                LOG_DEBUG(log, "Bypassing cache because file segment state is `SKIP_CACHE`");
                 read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
                 return getRemoteFSReadBuffer(file_segment, read_type);
             }
@@ -220,7 +258,8 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
                 size_t download_offset = file_segment->getDownloadOffset();
                 bool can_start_from_cache = download_offset > file_offset_of_buffer_end;
 
-                /// If file segment is being downloaded but we can already read from already downloaded part, do that.
+                /// If file segment is being downloaded but we can already read
+                /// from already downloaded part, do that.
                 if (can_start_from_cache)
                 {
                     ///                      segment{k} state: DOWNLOADING
@@ -241,6 +280,7 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
                 }
                 else
                 {
+                    LOG_DEBUG(log, "Retries to wait for file segment download exceeded ({})", wait_download_tries);
                     download_state = FileSegment::State::SKIP_CACHE;
                 }
 
@@ -274,7 +314,10 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
                     size_t download_offset = file_segment->getDownloadOffset();
                     bool can_start_from_cache = download_offset > file_offset_of_buffer_end;
 
-                    LOG_TEST(log, "Current download offset: {}, file offset of buffer end: {}", download_offset, file_offset_of_buffer_end);
+                    LOG_TEST(
+                        log,
+                        "Current download offset: {}, file offset of buffer end: {}",
+                        download_offset, file_offset_of_buffer_end);
 
                     if (can_start_from_cache)
                     {
@@ -329,6 +372,9 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
                 }
                 else
                 {
+                    LOG_DEBUG(
+                        log,
+                        "Bypassing cache because file segment state is `PARTIALLY_DOWNLOADED_NO_CONTINUATION` and downloaded part already used");
                     read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
                     return getRemoteFSReadBuffer(file_segment, read_type);
                 }
@@ -337,7 +383,8 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getReadBufferForFileSegment(
     }
 }
 
-SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getImplementationBuffer(FileSegmentPtr & file_segment)
+CachedOnDiskReadBufferFromFile::ImplementationBufferPtr
+CachedOnDiskReadBufferFromFile::getImplementationBuffer(FileSegmentPtr & file_segment)
 {
     assert(!file_segment->isDownloader());
     assert(file_offset_of_buffer_end >= file_segment->range().left);
@@ -350,7 +397,8 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getImplementationBuffer(File
     auto read_buffer_for_file_segment = getReadBufferForFileSegment(file_segment);
 
     watch.stop();
-    current_file_segment_counters.increment(ProfileEvents::FileSegmentWaitReadBufferMicroseconds, watch.elapsedMicroseconds());
+    current_file_segment_counters.increment(
+        ProfileEvents::FileSegmentWaitReadBufferMicroseconds, watch.elapsedMicroseconds());
 
     [[maybe_unused]] auto download_current_segment = read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
     assert(download_current_segment == file_segment->isDownloader());
@@ -372,14 +420,13 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getImplementationBuffer(File
         case ReadType::CACHED:
         {
 #ifndef NDEBUG
-            auto * file_reader = dynamic_cast<ReadBufferFromFileDescriptor *>(read_buffer_for_file_segment.get());
-            size_t file_size = file_reader->getFileSize();
-
+            size_t file_size = getFileSizeFromReadBuffer(*read_buffer_for_file_segment);
             if (file_size == 0 || range.left + file_size <= file_offset_of_buffer_end)
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR,
                     "Unexpected state of cache file. Cache file size: {}, cache file offset: {}, "
-                    "expected file size to be non-zero and file downloaded size to exceed current file read offset (expected: {} > {})",
+                    "expected file size to be non-zero and file downloaded size to exceed "
+                    "current file read offset (expected: {} > {})",
                     file_size,
                     range.left,
                     range.left + file_size,
@@ -416,22 +463,22 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getImplementationBuffer(File
             else
             {
                 read_buffer_for_file_segment->seek(file_offset_of_buffer_end, SEEK_SET);
+
+                assert(static_cast<size_t>(read_buffer_for_file_segment->getPosition()) == file_offset_of_buffer_end);
+                assert(static_cast<size_t>(read_buffer_for_file_segment->getFileOffsetOfBufferEnd()) == file_offset_of_buffer_end);
             }
 
             auto download_offset = file_segment->getDownloadOffset();
             if (download_offset != static_cast<size_t>(read_buffer_for_file_segment->getPosition()))
             {
-                auto impl_range = read_buffer_for_file_segment->getRemainingReadRange();
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR,
-                    "Buffer's offsets mismatch; cached buffer offset: {}, download_offset: {}, position: {}, implementation buffer offset: "
-                    "{}, "
-                    "implementation buffer reading until: {}, file segment info: {}",
+                    "Buffer's offsets mismatch; cached buffer offset: {}, download_offset: {}, "
+                    "position: {}, implementation buffer remaining read range: {}, file segment info: {}",
                     file_offset_of_buffer_end,
                     download_offset,
                     read_buffer_for_file_segment->getPosition(),
-                    impl_range.left,
-                    *impl_range.right,
+                    read_buffer_for_file_segment->getRemainingReadRange().toString(),
                     file_segment->getInfoForLog());
             }
 
@@ -442,7 +489,7 @@ SeekableReadBufferPtr CachedReadBufferFromRemoteFS::getImplementationBuffer(File
     return read_buffer_for_file_segment;
 }
 
-bool CachedReadBufferFromRemoteFS::completeFileSegmentAndGetNext()
+bool CachedOnDiskReadBufferFromFile::completeFileSegmentAndGetNext()
 {
     LOG_TEST(log, "Completed segment: {}", (*current_file_segment_it)->range().toString());
 
@@ -481,7 +528,7 @@ bool CachedReadBufferFromRemoteFS::completeFileSegmentAndGetNext()
     return true;
 }
 
-CachedReadBufferFromRemoteFS::~CachedReadBufferFromRemoteFS()
+CachedOnDiskReadBufferFromFile::~CachedOnDiskReadBufferFromFile()
 {
     if (enable_logging
         && file_segments_holder
@@ -491,12 +538,13 @@ CachedReadBufferFromRemoteFS::~CachedReadBufferFromRemoteFS()
     }
 }
 
-void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
+void CachedOnDiskReadBufferFromFile::predownload(FileSegmentPtr & file_segment)
 {
     Stopwatch predownload_watch(CLOCK_MONOTONIC);
     SCOPE_EXIT({
         predownload_watch.stop();
-        current_file_segment_counters.increment(ProfileEvents::FileSegmentPredownloadMicroseconds, predownload_watch.elapsedMicroseconds());
+        current_file_segment_counters.increment(
+            ProfileEvents::FileSegmentPredownloadMicroseconds, predownload_watch.elapsedMicroseconds());
     });
 
     if (bytes_to_predownload)
@@ -532,8 +580,8 @@ void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
                 if (bytes_to_predownload)
                     throw Exception(
                         ErrorCodes::LOGICAL_ERROR,
-                        "Failed to predownload remaining {} bytes. Current file segment: {}, current download offset: {}, expected: {}, "
-                        "eof: {}",
+                        "Failed to predownload remaining {} bytes. Current file segment: {}, "
+                        "current download offset: {}, expected: {}, eof: {}",
                         bytes_to_predownload,
                         current_range.toString(),
                         file_segment->getDownloadOffset(),
@@ -551,8 +599,8 @@ void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
                         || download_offset != file_offset_of_buffer_end)
                         throw Exception(
                             ErrorCodes::LOGICAL_ERROR,
-                            "Buffer's offsets mismatch after predownloading; download offset: {}, cached buffer offset: {}, implementation "
-                            "buffer offset: {}, "
+                            "Buffer's offsets mismatch after predownloading; download offset: {}, "
+                            "cached buffer offset: {}, implementation buffer offset: {}, "
                             "file segment info: {}",
                             download_offset,
                             file_offset_of_buffer_end,
@@ -585,8 +633,9 @@ void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
                 }
                 else
                 {
+                    LOG_TEST(log, "Bypassing cache because writeCache method failed");
                     read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
-                    file_segment->complete(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+                    file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
 
                     continue_predownload = false;
                 }
@@ -610,8 +659,9 @@ void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
                 /// TODO: allow seek more than once with seek avoiding.
 
                 bytes_to_predownload = 0;
-                file_segment->complete(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+                file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
 
+                LOG_TEST(log, "Bypassing cache because space reservation failed");
                 read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
 
                 swap(*implementation_buffer);
@@ -626,7 +676,8 @@ void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
 
                 LOG_TEST(
                     log,
-                    "Predownload failed because of space limit. Will read from remote filesystem starting from offset: {}",
+                    "Predownload failed because of space limit. "
+                    "Will read from remote filesystem starting from offset: {}",
                     file_offset_of_buffer_end);
 
                 break;
@@ -635,7 +686,7 @@ void CachedReadBufferFromRemoteFS::predownload(FileSegmentPtr & file_segment)
     }
 }
 
-bool CachedReadBufferFromRemoteFS::updateImplementationBufferIfNeeded()
+bool CachedOnDiskReadBufferFromFile::updateImplementationBufferIfNeeded()
 {
     auto & file_segment = *current_file_segment_it;
     auto current_read_range = file_segment->range();
@@ -661,8 +712,26 @@ bool CachedReadBufferFromRemoteFS::updateImplementationBufferIfNeeded()
         ///                     ^
         ///                     file_offset_of_buffer_end
 
-        auto download_offset = file_segment->getDownloadOffset();
-        if (download_offset == file_offset_of_buffer_end)
+        size_t download_offset = file_segment->getDownloadOffset();
+        bool cached_part_is_finished = download_offset == file_offset_of_buffer_end;
+
+#ifndef NDEBUG
+        size_t cache_file_size = getFileSizeFromReadBuffer(*implementation_buffer);
+        size_t cache_file_read_offset = implementation_buffer->getFileOffsetOfBufferEnd();
+        size_t implementation_buffer_finished = cache_file_size == cache_file_read_offset;
+
+        if (cached_part_is_finished != implementation_buffer_finished)
+        {
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Incorrect state of buffers. Current download offset: {}, file offset of buffer end: {}, "
+                "cache file size: {}, cache file offset: {}, file segment info: {}",
+                download_offset, file_offset_of_buffer_end, cache_file_size, cache_file_read_offset,
+                file_segment->getInfoForLog());
+        }
+#endif
+
+        if (cached_part_is_finished)
         {
             /// TODO: makes sense to reuse local file reader if we return here with CACHED read type again?
             implementation_buffer = getImplementationBuffer(*current_file_segment_it);
@@ -670,8 +739,12 @@ bool CachedReadBufferFromRemoteFS::updateImplementationBufferIfNeeded()
             return true;
         }
         else if (download_offset < file_offset_of_buffer_end)
+        {
             throw Exception(
-                ErrorCodes::LOGICAL_ERROR, "Expected {} >= {} ({})", download_offset, file_offset_of_buffer_end, getInfoForLog());
+                ErrorCodes::LOGICAL_ERROR,
+                "Expected {} >= {} ({})",
+                download_offset, file_offset_of_buffer_end, getInfoForLog());
+        }
     }
 
     if (read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE)
@@ -695,7 +768,7 @@ bool CachedReadBufferFromRemoteFS::updateImplementationBufferIfNeeded()
     return true;
 }
 
-bool CachedReadBufferFromRemoteFS::writeCache(char * data, size_t size, size_t offset, FileSegment & file_segment)
+bool CachedOnDiskReadBufferFromFile::writeCache(char * data, size_t size, size_t offset, FileSegment & file_segment)
 {
     Stopwatch watch(CLOCK_MONOTONIC);
 
@@ -723,7 +796,7 @@ bool CachedReadBufferFromRemoteFS::writeCache(char * data, size_t size, size_t o
     return true;
 }
 
-bool CachedReadBufferFromRemoteFS::nextImpl()
+bool CachedOnDiskReadBufferFromFile::nextImpl()
 {
     try
     {
@@ -736,12 +809,18 @@ bool CachedReadBufferFromRemoteFS::nextImpl()
     }
 }
 
-bool CachedReadBufferFromRemoteFS::nextImplStep()
+bool CachedOnDiskReadBufferFromFile::nextImplStep()
 {
     last_caller_id = FileSegment::getCallerId();
 
     assertCorrectness();
 
+    if (file_offset_of_buffer_end == read_until_position)
+    {
+        LOG_TEST(log, "Read finished on offset {}", file_offset_of_buffer_end);
+        return false;
+    }
+
     if (!initialized)
         initialize(file_offset_of_buffer_end, getTotalSizeToRead());
 
@@ -795,6 +874,7 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
     }
 
     assert(!internal_buffer.empty());
+
     swap(*implementation_buffer);
 
     auto & file_segment = *current_file_segment_it;
@@ -802,11 +882,12 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
 
     LOG_TEST(
         log,
-        "Current segment: {}, downloader: {}, current count: {}, position: {}",
+        "Current segment: {}, downloader: {}, current count: {}, position: {}, read range: {}",
         current_read_range.toString(),
         file_segment->getDownloader(),
         implementation_buffer->count(),
-        implementation_buffer->getPosition());
+        implementation_buffer->getPosition(),
+        implementation_buffer->getRemainingReadRange().toString());
 
     assert(current_read_range.left <= file_offset_of_buffer_end);
     assert(current_read_range.right >= file_offset_of_buffer_end);
@@ -835,13 +916,23 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
     if (!result)
     {
 #ifndef NDEBUG
-        if (auto * cache_file_reader = dynamic_cast<ReadBufferFromFileDescriptor *>(implementation_buffer.get()))
+        if (read_type == ReadType::CACHED)
         {
-            auto cache_file_size = cache_file_reader->getFileSize();
+            size_t cache_file_size = getFileSizeFromReadBuffer(*implementation_buffer);
             if (cache_file_size == 0)
+            {
                 throw Exception(
-                    ErrorCodes::LOGICAL_ERROR, "Attempt to read from an empty cache file: {} (just before actual read)", cache_file_size);
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Attempt to read from an empty cache file: {} (just before actual read)",
+                    cache_file_size);
+            }
         }
+        else
+        {
+            assert(file_offset_of_buffer_end == static_cast<size_t>(implementation_buffer->getFileOffsetOfBufferEnd()));
+        }
+
+        assert(!implementation_buffer->hasPendingData());
 #endif
 
         Stopwatch watch(CLOCK_MONOTONIC);
@@ -854,6 +945,12 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
 
         size = implementation_buffer->buffer().size();
 
+        LOG_TEST(
+            log,
+            "Read {} bytes, read type {}, position: {}, offset: {}, remaining read range: {}",
+            size, toString(read_type), implementation_buffer->getPosition(),
+            implementation_buffer->getFileOffsetOfBufferEnd(), implementation_buffer->getRemainingReadRange().toString());
+
         if (read_type == ReadType::CACHED)
         {
             ProfileEvents::increment(ProfileEvents::CachedReadBufferReadFromCacheBytes, size);
@@ -888,12 +985,13 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
                 else
                 {
                     assert(file_segment->state() == FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+                    LOG_TEST(log, "Bypassing cache because writeCache method failed");
                 }
             }
             else
             {
                 LOG_DEBUG(log, "No space left in cache, will continue without cache download");
-                file_segment->complete(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
+                file_segment->completeWithState(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
             }
 
             if (!success)
@@ -903,20 +1001,22 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
             }
         }
 
-        /// - If last file segment was read from remote fs, then we read up to segment->range().right, but
-        /// the requested right boundary could be segment->range().left < requested_right_boundary <  segment->range().right.
+        /// - If last file segment was read from remote fs, then we read up to segment->range().right,
+        /// but the requested right boundary could be
+        /// segment->range().left < requested_right_boundary <  segment->range().right.
         /// Therefore need to resize to a smaller size. And resize must be done after write into cache.
-        /// - If last file segment was read from local fs, then we could read more than file_segemnt->range().right, so resize is also needed.
+        /// - If last file segment was read from local fs, then we could read more than
+        /// file_segemnt->range().right, so resize is also needed.
         if (std::next(current_file_segment_it) == file_segments_holder->file_segments.end())
         {
-            size_t remaining_size_to_read = std::min(current_read_range.right, read_until_position - 1) - file_offset_of_buffer_end + 1;
+            size_t remaining_size_to_read
+                = std::min(current_read_range.right, read_until_position - 1) - file_offset_of_buffer_end + 1;
             size = std::min(size, remaining_size_to_read);
             assert(implementation_buffer->buffer().size() >= nextimpl_working_buffer_offset + size);
             implementation_buffer->buffer().resize(nextimpl_working_buffer_offset + size);
         }
 
         file_offset_of_buffer_end += size;
-
     }
 
     swap(*implementation_buffer);
@@ -931,8 +1031,9 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
     LOG_TEST(
         log,
         "Key: {}. Returning with {} bytes, buffer position: {} (offset: {}, predownloaded: {}), "
-        "buffer available: {}, current range: {}, current offset: {}, file segment state: {}, download offset: {}, read_type: {}, "
-        "reading until position: {}, started with offset: {}, remaining ranges: {}",
+        "buffer available: {}, current range: {}, current offset: {}, file segment state: {}, "
+        "download offset: {}, read_type: {}, reading until position: {}, started with offset: {}, "
+        "remaining ranges: {}",
         getHexUIntLowercase(cache_key),
         working_buffer.size(),
         getPosition(),
@@ -950,39 +1051,114 @@ bool CachedReadBufferFromRemoteFS::nextImplStep()
 
     if (size == 0 && file_offset_of_buffer_end < read_until_position)
     {
-        std::optional<size_t> cache_file_size;
-        if (auto * cache_file_reader = dynamic_cast<ReadBufferFromFileDescriptor *>(implementation_buffer.get()))
-            cache_file_size = cache_file_reader->getFileSize();
+        size_t cache_file_size = getFileSizeFromReadBuffer(*implementation_buffer);
+        auto cache_file_path = getFileNameFromReadBuffer(*implementation_buffer);
 
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
-            "Having zero bytes, but range is not finished: file offset: {}, reading until: {}, read type: {}, cache file size: {}",
+            "Having zero bytes, but range is not finished: file offset: {}, starting offset: {}, "
+            "reading until: {}, read type: {}, cache file size: {}, cache file path: {}, "
+            "cache file offset: {}, current file segment: {}",
             file_offset_of_buffer_end,
+            first_offset,
             read_until_position,
             toString(read_type),
-            cache_file_size ? std::to_string(*cache_file_size) : "None");
+            cache_file_size ? std::to_string(cache_file_size) : "None",
+            cache_file_path,
+            implementation_buffer->getFileOffsetOfBufferEnd(),
+            file_segment->getInfoForLog());
     }
 
     return result;
 }
 
-off_t CachedReadBufferFromRemoteFS::seek(off_t offset, int whence)
+off_t CachedOnDiskReadBufferFromFile::seek(off_t offset, int whence)
 {
-    if (initialized)
-        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Seek is allowed only before first read attempt from the buffer");
+    if (initialized && !allow_seeks_after_first_read)
+    {
+        throw Exception(
+            ErrorCodes::CANNOT_SEEK_THROUGH_FILE,
+            "Seek is allowed only before first read attempt from the buffer");
+    }
 
-    if (whence != SEEK_SET)
+    size_t new_pos = offset;
+
+    if (allow_seeks_after_first_read)
+    {
+        if (whence != SEEK_SET && whence != SEEK_CUR)
+        {
+            throw Exception("Expected SEEK_SET or SEEK_CUR as whence", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        }
+
+        if (whence == SEEK_CUR)
+        {
+            new_pos = file_offset_of_buffer_end - (working_buffer.end() - pos) + offset;
+        }
+
+        if (new_pos + (working_buffer.end() - pos) == file_offset_of_buffer_end)
+            return new_pos;
+
+        if (file_offset_of_buffer_end - working_buffer.size() <= new_pos && new_pos <= file_offset_of_buffer_end)
+        {
+            pos = working_buffer.end() - file_offset_of_buffer_end + new_pos;
+            assert(pos >= working_buffer.begin());
+            assert(pos <= working_buffer.end());
+            return new_pos;
+        }
+    }
+    else if (whence != SEEK_SET)
+    {
         throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET allowed");
+    }
 
-    first_offset = offset;
-    file_offset_of_buffer_end = offset;
-    size_t size = getTotalSizeToRead();
-    initialize(offset, size);
+    first_offset = file_offset_of_buffer_end = new_pos;
+    resetWorkingBuffer();
 
-    return offset;
+    // if (file_segments_holder && current_file_segment_it != file_segments_holder->file_segments.end())
+    // {
+    //      auto & file_segments = file_segments_holder->file_segments;
+    //      LOG_TRACE(
+    //          log,
+    //          "Having {} file segments to read: {}, current offset: {}",
+    //          file_segments_holder->file_segments.size(), file_segments_holder->toString(), file_offset_of_buffer_end);
+
+    //      auto it = std::upper_bound(
+    //          file_segments.begin(),
+    //          file_segments.end(),
+    //          new_pos,
+    //          [](size_t pos, const FileSegmentPtr & file_segment) { return pos < file_segment->range().right; });
+
+    //      if (it != file_segments.end())
+    //      {
+    //          if (it != file_segments.begin() && (*std::prev(it))->range().right == new_pos)
+    //              current_file_segment_it = std::prev(it);
+    //          else
+    //              current_file_segment_it = it;
+
+    //          [[maybe_unused]] const auto & file_segment = *current_file_segment_it;
+    //          assert(file_offset_of_buffer_end <= file_segment->range().right);
+    //          assert(file_offset_of_buffer_end >= file_segment->range().left);
+
+    //          resetWorkingBuffer();
+    //          swap(*implementation_buffer);
+    //          implementation_buffer->seek(file_offset_of_buffer_end, SEEK_SET);
+    //          swap(*implementation_buffer);
+
+    //          LOG_TRACE(log, "Found suitable file segment: {}", file_segment->range().toString());
+
+    //          LOG_TRACE(log, "seek2 Internal buffer size: {}", internal_buffer.size());
+    //          return new_pos;
+    //      }
+    // }
+
+    file_segments_holder.reset();
+    implementation_buffer.reset();
+    initialized = false;
+
+    return new_pos;
 }
 
-size_t CachedReadBufferFromRemoteFS::getTotalSizeToRead()
+size_t CachedOnDiskReadBufferFromFile::getTotalSizeToRead()
 {
     /// Last position should be guaranteed to be set, as at least we always know file size.
     if (!read_until_position)
@@ -991,22 +1167,34 @@ size_t CachedReadBufferFromRemoteFS::getTotalSizeToRead()
     /// On this level should be guaranteed that read size is non-zero.
     if (file_offset_of_buffer_end >= read_until_position)
         throw Exception(
-            ErrorCodes::LOGICAL_ERROR, "Read boundaries mismatch. Expected {} < {}", file_offset_of_buffer_end, read_until_position);
+            ErrorCodes::LOGICAL_ERROR,
+            "Read boundaries mismatch. Expected {} < {}",
+            file_offset_of_buffer_end, read_until_position);
 
     return read_until_position - file_offset_of_buffer_end;
 }
 
-void CachedReadBufferFromRemoteFS::setReadUntilPosition(size_t)
+void CachedOnDiskReadBufferFromFile::setReadUntilPosition(size_t position)
 {
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Method `setReadUntilPosition()` not allowed");
+    if (!allow_seeks_after_first_read)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Method `setReadUntilPosition()` not allowed");
+
+    read_until_position = position;
+    initialized = false;
+    implementation_buffer.reset();
 }
 
-off_t CachedReadBufferFromRemoteFS::getPosition()
+void CachedOnDiskReadBufferFromFile::setReadUntilEnd()
+{
+    setReadUntilPosition(getFileSize());
+}
+
+off_t CachedOnDiskReadBufferFromFile::getPosition()
 {
     return file_offset_of_buffer_end - available();
 }
 
-std::optional<size_t> CachedReadBufferFromRemoteFS::getLastNonDownloadedOffset() const
+std::optional<size_t> CachedOnDiskReadBufferFromFile::getLastNonDownloadedOffset() const
 {
     if (!file_segments_holder)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "File segments holder not initialized");
@@ -1022,31 +1210,32 @@ std::optional<size_t> CachedReadBufferFromRemoteFS::getLastNonDownloadedOffset()
     return std::nullopt;
 }
 
-void CachedReadBufferFromRemoteFS::assertCorrectness() const
+void CachedOnDiskReadBufferFromFile::assertCorrectness() const
 {
-    if (IFileCache::isReadOnly() && !settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
+    if (FileCache::isReadOnly()
+        && !settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache usage is not allowed");
 }
 
-String CachedReadBufferFromRemoteFS::getInfoForLog()
+String CachedOnDiskReadBufferFromFile::getInfoForLog()
 {
     String implementation_buffer_read_range_str;
     if (implementation_buffer)
-    {
-        auto read_range = implementation_buffer->getRemainingReadRange();
-        implementation_buffer_read_range_str
-            = std::to_string(read_range.left) + '-' + (read_range.right ? std::to_string(*read_range.right) : "None");
-    }
+        implementation_buffer_read_range_str = implementation_buffer->getRemainingReadRange().toString();
     else
         implementation_buffer_read_range_str = "None";
 
-    auto current_file_segment_info
-        = current_file_segment_it == file_segments_holder->file_segments.end() ? "None" : (*current_file_segment_it)->getInfoForLog();
+    String current_file_segment_info;
+    if (current_file_segment_it == file_segments_holder->file_segments.end())
+        current_file_segment_info = (*current_file_segment_it)->getInfoForLog();
+    else
+        current_file_segment_info = "None";
 
     return fmt::format(
-        "Buffer path: {}, hash key: {}, file_offset_of_buffer_end: {}, internal buffer remaining read range: {}, "
+        "Buffer path: {}, hash key: {}, file_offset_of_buffer_end: {}, "
+        "internal buffer remaining read range: {}, "
         "read_type: {}, last caller: {}, file segment info: {}",
-        remote_fs_object_path,
+        source_file_path,
         getHexUIntLowercase(cache_key),
         file_offset_of_buffer_end,
         implementation_buffer_read_range_str,
diff --git a/src/Disks/IO/CachedReadBufferFromRemoteFS.h b/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
similarity index 64%
rename from src/Disks/IO/CachedReadBufferFromRemoteFS.h
rename to src/Disks/IO/CachedOnDiskReadBufferFromFile.h
index aff29dd200c..365496c6d06 100644
--- a/src/Disks/IO/CachedReadBufferFromRemoteFS.h
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
+#include <Common/logger_useful.h>
 #include <IO/SeekableReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadSettings.h>
-#include <Common/logger_useful.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <Interpreters/FilesystemCacheLog.h>
 #include <Common/FileSegment.h>
 
@@ -17,20 +18,25 @@ extern const Metric FilesystemCacheReadBuffers;
 namespace DB
 {
 
-class CachedReadBufferFromRemoteFS : public SeekableReadBuffer
+class CachedOnDiskReadBufferFromFile : public ReadBufferFromFileBase
 {
 public:
-    using RemoteFSFileReaderCreator = std::function<FileSegment::RemoteFileReaderPtr()>;
+    using ImplementationBufferPtr = std::shared_ptr<ReadBufferFromFileBase>;
+    using ImplementationBufferCreator = std::function<ImplementationBufferPtr()>;
 
-    CachedReadBufferFromRemoteFS(
-        const String & remote_fs_object_path_,
+    CachedOnDiskReadBufferFromFile(
+        const String & source_file_path_,
+        const FileCache::Key & cache_key_,
         FileCachePtr cache_,
-        RemoteFSFileReaderCreator remote_file_reader_creator_,
+        ImplementationBufferCreator implementation_buffer_creator_,
         const ReadSettings & settings_,
         const String & query_id_,
-        size_t read_until_position_);
+        size_t file_size_,
+        bool allow_seeks_after_first_read_,
+        bool use_external_buffer_,
+        std::optional<size_t> read_until_position_ = std::nullopt);
 
-    ~CachedReadBufferFromRemoteFS() override;
+    ~CachedOnDiskReadBufferFromFile() override;
 
     bool nextImpl() override;
 
@@ -44,6 +50,10 @@ public:
 
     void setReadUntilPosition(size_t position) override;
 
+    void setReadUntilEnd() override;
+
+    String getFileName() const override { return source_file_path; }
+
     enum class ReadType
     {
         CACHED,
@@ -54,11 +64,11 @@ public:
 private:
     void initialize(size_t offset, size_t size);
 
-    SeekableReadBufferPtr getImplementationBuffer(FileSegmentPtr & file_segment);
+    ImplementationBufferPtr getImplementationBuffer(FileSegmentPtr & file_segment);
 
-    SeekableReadBufferPtr getReadBufferForFileSegment(FileSegmentPtr & file_segment);
+    ImplementationBufferPtr getReadBufferForFileSegment(FileSegmentPtr & file_segment);
 
-    SeekableReadBufferPtr getCacheReadBuffer(size_t offset) const;
+    ImplementationBufferPtr getCacheReadBuffer(size_t offset) const;
 
     std::optional<size_t> getLastNonDownloadedOffset() const;
 
@@ -70,7 +80,7 @@ private:
 
     void assertCorrectness() const;
 
-    SeekableReadBufferPtr getRemoteFSReadBuffer(FileSegmentPtr & file_segment, ReadType read_type_);
+    std::shared_ptr<ReadBufferFromFileBase> getRemoteFSReadBuffer(FileSegmentPtr & file_segment, ReadType read_type_);
 
     size_t getTotalSizeToRead();
 
@@ -81,8 +91,9 @@ private:
     bool writeCache(char * data, size_t size, size_t offset, FileSegment & file_segment);
 
     Poco::Logger * log;
-    IFileCache::Key cache_key;
-    String remote_fs_object_path;
+    FileCache::Key cache_key;
+    String source_file_path;
+
     FileCachePtr cache;
     ReadSettings settings;
 
@@ -90,7 +101,7 @@ private:
     size_t file_offset_of_buffer_end = 0;
     size_t bytes_to_predownload = 0;
 
-    RemoteFSFileReaderCreator remote_file_reader_creator;
+    ImplementationBufferCreator implementation_buffer_creator;
 
     /// Remote read buffer, which can only be owned by current buffer.
     FileSegment::RemoteFileReaderPtr remote_file_reader;
@@ -98,7 +109,7 @@ private:
     std::optional<FileSegmentsHolder> file_segments_holder;
     FileSegments::iterator current_file_segment_it;
 
-    SeekableReadBufferPtr implementation_buffer;
+    ImplementationBufferPtr implementation_buffer;
     bool initialized = false;
 
     ReadType read_type = ReadType::REMOTE_FS_READ_BYPASS_CACHE;
@@ -125,10 +136,12 @@ private:
     bool enable_logging = false;
     String current_buffer_id;
 
+    bool allow_seeks_after_first_read;
+    [[maybe_unused]]bool use_external_buffer;
     CurrentMetrics::Increment metric_increment{CurrentMetrics::FilesystemCacheReadBuffers};
     ProfileEvents::Counters current_file_segment_counters;
 
-    IFileCache::QueryContextHolder query_context_holder;
+    FileCache::QueryContextHolder query_context_holder;
 
     bool is_persistent;
 };
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
new file mode 100644
index 00000000000..300ce774d61
--- /dev/null
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
@@ -0,0 +1,180 @@
+#include "CachedOnDiskWriteBufferFromFile.h"
+
+#include <Common/FileCacheFactory.h>
+#include <Common/FileSegment.h>
+#include <Common/logger_useful.h>
+#include <Interpreters/FilesystemCacheLog.h>
+#include <Interpreters/Context.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event CachedWriteBufferCacheWriteBytes;
+    extern const Event CachedWriteBufferCacheWriteMicroseconds;
+}
+
+namespace DB
+{
+
+namespace
+{
+    class SwapHelper
+    {
+    public:
+        SwapHelper(WriteBuffer & b1_, WriteBuffer & b2_) : b1(b1_), b2(b2_) { b1.swap(b2); }
+        ~SwapHelper() { b1.swap(b2); }
+
+    private:
+        WriteBuffer & b1;
+        WriteBuffer & b2;
+    };
+}
+
+CachedOnDiskWriteBufferFromFile::CachedOnDiskWriteBufferFromFile(
+    std::unique_ptr<WriteBuffer> impl_,
+    FileCachePtr cache_,
+    const String & source_path_,
+    const FileCache::Key & key_,
+    bool is_persistent_cache_file_,
+    const String & query_id_,
+    const WriteSettings & settings_)
+    : WriteBufferFromFileDecorator(std::move(impl_))
+    , log(&Poco::Logger::get("CachedOnDiskWriteBufferFromFile"))
+    , cache(cache_)
+    , source_path(source_path_)
+    , key(key_)
+    , is_persistent_cache_file(is_persistent_cache_file_)
+    , query_id(query_id_)
+    , enable_cache_log(!query_id_.empty() && settings_.enable_filesystem_cache_log)
+    , cache_log(Context::getGlobalContextInstance()->getFilesystemCacheLog())
+{
+}
+
+void CachedOnDiskWriteBufferFromFile::nextImpl()
+{
+    size_t size = offset();
+
+    try
+    {
+        SwapHelper swap(*this, *impl);
+        /// Write data to the underlying buffer.
+        impl->next();
+    }
+    catch (...)
+    {
+        /// If something was already written to cache, remove it.
+        cache_writer.reset();
+        cache->removeIfExists(key);
+
+        throw;
+    }
+
+    /// Write data to cache.
+    cacheData(working_buffer.begin(), size);
+    current_download_offset += size;
+}
+
+void CachedOnDiskWriteBufferFromFile::cacheData(char * data, size_t size)
+{
+    if (stop_caching)
+        return;
+
+    if (!cache_writer)
+    {
+        cache_writer = std::make_unique<FileSegmentRangeWriter>(
+            cache.get(), key, [this](const FileSegment & file_segment) { appendFilesystemCacheLog(file_segment); });
+    }
+
+    Stopwatch watch(CLOCK_MONOTONIC);
+
+    try
+    {
+        if (!cache_writer->write(data, size, current_download_offset, is_persistent_cache_file))
+        {
+            LOG_INFO(log, "Write-through cache is stopped as cache limit is reached and nothing can be evicted");
+
+            /// No space left, disable caching.
+            stop_caching = true;
+            return;
+        }
+    }
+    catch (ErrnoException & e)
+    {
+        int code = e.getErrno();
+        if (code == /* No space left on device */28 || code == /* Quota exceeded */122)
+        {
+            LOG_INFO(log, "Insert into cache is skipped due to insufficient disk space. ({})", e.displayText());
+            return;
+        }
+
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return;
+    }
+
+    ProfileEvents::increment(ProfileEvents::CachedWriteBufferCacheWriteBytes, size);
+    ProfileEvents::increment(ProfileEvents::CachedWriteBufferCacheWriteMicroseconds, watch.elapsedMicroseconds());
+}
+
+void CachedOnDiskWriteBufferFromFile::appendFilesystemCacheLog(const FileSegment & file_segment)
+{
+    if (cache_log)
+    {
+        auto file_segment_range = file_segment.range();
+        FilesystemCacheLogElement elem
+        {
+            .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
+            .query_id = query_id,
+            .source_file_path = source_path,
+            .file_segment_range = { file_segment_range.left, file_segment_range.right },
+            .requested_range = {},
+            .cache_type = FilesystemCacheLogElement::CacheType::WRITE_THROUGH_CACHE,
+            .file_segment_size = file_segment_range.size(),
+            .cache_attempted = false,
+            .read_buffer_id = {},
+            .profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(current_file_segment_counters.getPartiallyAtomicSnapshot()),
+        };
+
+        current_file_segment_counters.reset();
+
+        cache_log->add(elem);
+    }
+}
+
+void CachedOnDiskWriteBufferFromFile::finalizeImpl()
+{
+    try
+    {
+        SwapHelper swap(*this, *impl);
+        impl->finalize();
+    }
+    catch (...)
+    {
+        if (cache_writer)
+        {
+            try
+            {
+                cache_writer->finalize();
+                cache_writer.reset();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+
+        throw;
+    }
+
+    if (cache_writer)
+    {
+        cache_writer->finalize();
+        cache_writer.reset();
+    }
+}
+
+}
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
new file mode 100644
index 00000000000..abc50078874
--- /dev/null
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <IO/WriteBufferFromFileDecorator.h>
+#include <IO/WriteSettings.h>
+#include <Common/FileCache.h>
+#include <Interpreters/FilesystemCacheLog.h>
+
+namespace Poco
+{
+class Logger;
+}
+
+namespace DB
+{
+
+/**
+ *  Write buffer for filesystem caching on write operations.
+ */
+class FileSegmentRangeWriter;
+
+class CachedOnDiskWriteBufferFromFile final : public WriteBufferFromFileDecorator
+{
+public:
+    CachedOnDiskWriteBufferFromFile(
+        std::unique_ptr<WriteBuffer> impl_,
+        FileCachePtr cache_,
+        const String & source_path_,
+        const FileCache::Key & key_,
+        bool is_persistent_cache_file_,
+        const String & query_id_,
+        const WriteSettings & settings_);
+
+    void nextImpl() override;
+
+    void finalizeImpl() override;
+
+private:
+    void cacheData(char * data, size_t size);
+    void appendFilesystemCacheLog(const FileSegment & file_segment);
+
+    Poco::Logger * log;
+
+    FileCachePtr cache;
+    String source_path;
+    FileCache::Key key;
+
+    bool is_persistent_cache_file;
+    size_t current_download_offset = 0;
+    const String query_id;
+
+    bool enable_cache_log;
+    std::shared_ptr<FilesystemCacheLog> cache_log;
+
+    bool stop_caching = false;
+
+    ProfileEvents::Counters current_file_segment_counters;
+    std::unique_ptr<FileSegmentRangeWriter> cache_writer;
+};
+
+}
diff --git a/src/IO/ReadBufferFromAzureBlobStorage.cpp b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
similarity index 92%
rename from src/IO/ReadBufferFromAzureBlobStorage.cpp
rename to src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
index 3e6581cd786..b5347280497 100644
--- a/src/IO/ReadBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
@@ -2,7 +2,7 @@
 
 #if USE_AZURE_BLOB_STORAGE
 
-#include <IO/ReadBufferFromAzureBlobStorage.h>
+#include <Disks/IO/ReadBufferFromAzureBlobStorage.h>
 #include <IO/ReadBufferFromString.h>
 #include <Common/logger_useful.h>
 #include <Common/Throttler.h>
@@ -47,6 +47,19 @@ ReadBufferFromAzureBlobStorage::ReadBufferFromAzureBlobStorage(
     }
 }
 
+SeekableReadBuffer::Range ReadBufferFromAzureBlobStorage::getRemainingReadRange() const
+{
+    return Range{
+        .left = static_cast<size_t>(offset),
+        .right = read_until_position ? std::optional{read_until_position - 1} : std::nullopt
+    };
+}
+
+void ReadBufferFromAzureBlobStorage::setReadUntilPosition(size_t position)
+{
+    read_until_position = position;
+    initialized = false;
+}
 
 bool ReadBufferFromAzureBlobStorage::nextImpl()
 {
diff --git a/src/IO/ReadBufferFromAzureBlobStorage.h b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
similarity index 90%
rename from src/IO/ReadBufferFromAzureBlobStorage.h
rename to src/Disks/IO/ReadBufferFromAzureBlobStorage.h
index 5396fcf9719..c7bab346618 100644
--- a/src/IO/ReadBufferFromAzureBlobStorage.h
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
@@ -36,6 +36,12 @@ public:
 
     String getFileName() const override { return path; }
 
+    void setReadUntilPosition(size_t position) override;
+
+    Range getRemainingReadRange() const override;
+
+    bool supportsRightBoundedReads() const override { return true; }
+
 private:
 
     void initialize();
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index 14614871185..148a20a7ba0 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -1,28 +1,13 @@
 #include "ReadBufferFromRemoteFSGather.h"
 
 #include <IO/SeekableReadBuffer.h>
-#include <Disks/IO/ReadBufferFromWebServer.h>
 
-#if USE_AWS_S3
-#include <IO/ReadBufferFromS3.h>
-#endif
-
-#if USE_AZURE_BLOB_STORAGE
-#include <IO/ReadBufferFromAzureBlobStorage.h>
-#endif
-
-#if USE_HDFS
-#include <Storages/HDFS/ReadBufferFromHDFS.h>
-#endif
-
-#include <Disks/IO/CachedReadBufferFromRemoteFS.h>
+#include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
 #include <Common/logger_useful.h>
-#include <filesystem>
 #include <iostream>
 #include <Common/hex.h>
 #include <Interpreters/FilesystemCacheLog.h>
-
-namespace fs = std::filesystem;
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -33,6 +18,26 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
+    ReadBufferCreator && read_buffer_creator_,
+    const StoredObjects & blobs_to_read_,
+    const ReadSettings & settings_)
+    : ReadBuffer(nullptr, 0)
+    , read_buffer_creator(std::move(read_buffer_creator_))
+    , blobs_to_read(blobs_to_read_)
+    , settings(settings_)
+    , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr ? CurrentThread::getQueryId() : "")
+    , log(&Poco::Logger::get("ReadBufferFromRemoteFSGather"))
+    , enable_cache_log(!query_id.empty() && settings.enable_filesystem_cache_log)
+{
+    if (blobs_to_read.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read zero number of objects");
+
+    with_cache = settings.remote_fs_cache
+        && settings.enable_filesystem_cache
+        && (!FileCache::isReadOnly() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache);
+}
+
 SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(const String & path, size_t file_size)
 {
     if (!current_file_path.empty() && !with_cache && enable_cache_log)
@@ -44,100 +49,27 @@ SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(c
     current_file_size = file_size;
     total_bytes_read_from_current_file = 0;
 
-    return createImplementationBufferImpl(path, file_size);
-}
-
-#if USE_AWS_S3
-SeekableReadBufferPtr ReadBufferFromS3Gather::createImplementationBufferImpl(const String & path, size_t file_size)
-{
-    auto remote_file_reader_creator = [=, this]()
-    {
-        return std::make_unique<ReadBufferFromS3>(
-            client_ptr,
-            bucket,
-            path,
-            version_id,
-            max_single_read_retries,
-            settings,
-            /* use_external_buffer */true,
-            /* offset */0,
-            read_until_position,
-            /* restricted_seek */true);
-    };
+    size_t current_read_until_position = read_until_position ? read_until_position : file_size;
+    auto current_read_buffer_creator = [path, current_read_until_position, this]() { return read_buffer_creator(path, current_read_until_position); };
 
     if (with_cache)
     {
-        return std::make_shared<CachedReadBufferFromRemoteFS>(
+        auto cache_key = settings.remote_fs_cache->hash(path);
+        return std::make_shared<CachedOnDiskReadBufferFromFile>(
             path,
+            cache_key,
             settings.remote_fs_cache,
-            remote_file_reader_creator,
+            std::move(current_read_buffer_creator),
             settings,
             query_id,
-            read_until_position ? read_until_position : file_size);
+            file_size,
+            /* allow_seeks */false,
+            /* use_external_buffer */true,
+            read_until_position ? std::optional<size_t>(read_until_position) : std::nullopt);
     }
 
-    return remote_file_reader_creator();
+    return current_read_buffer_creator();
 }
-#endif
-
-
-#if USE_AZURE_BLOB_STORAGE
-SeekableReadBufferPtr ReadBufferFromAzureBlobStorageGather::createImplementationBufferImpl(const String & path, size_t /* file_size */)
-{
-    return std::make_unique<ReadBufferFromAzureBlobStorage>(
-        blob_container_client,
-        path,
-        settings,
-        max_single_read_retries,
-        max_single_download_retries,
-        /* use_external_buffer */true,
-        read_until_position);
-}
-#endif
-
-
-SeekableReadBufferPtr ReadBufferFromWebServerGather::createImplementationBufferImpl(const String & path, size_t /* file_size */)
-{
-    return std::make_unique<ReadBufferFromWebServer>(
-        fs::path(uri) / path,
-        context,
-        settings,
-        /* use_external_buffer */true,
-        read_until_position);
-}
-
-
-#if USE_HDFS
-SeekableReadBufferPtr ReadBufferFromHDFSGather::createImplementationBufferImpl(const String & path, size_t /* file_size */)
-{
-    size_t begin_of_path = path.find('/', path.find("//") + 2);
-    auto hdfs_path = path.substr(begin_of_path);
-    auto hdfs_uri = path.substr(0, begin_of_path);
-    LOG_TEST(log, "HDFS uri: {}, path: {}", hdfs_path, hdfs_uri);
-
-    return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, hdfs_path, config, settings);
-}
-#endif
-
-
-ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
-    const StoredObjects & blobs_to_read_,
-    const ReadSettings & settings_)
-    : ReadBuffer(nullptr, 0)
-    , blobs_to_read(blobs_to_read_)
-    , settings(settings_)
-    , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr ? CurrentThread::getQueryId() : "")
-    , log(&Poco::Logger::get("ReadBufferFromRemoteFSGather"))
-    , enable_cache_log(!query_id.empty() && settings.enable_filesystem_cache_log)
-{
-    if (blobs_to_read.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read zero number of objects");
-
-    with_cache = settings.remote_fs_cache
-        && settings.enable_filesystem_cache
-        && (!IFileCache::isReadOnly() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache);
-}
-
 
 void ReadBufferFromRemoteFSGather::appendFilesystemCacheLog()
 {
@@ -147,7 +79,7 @@ void ReadBufferFromRemoteFSGather::appendFilesystemCacheLog()
         .query_id = query_id,
         .source_file_path = current_file_path,
         .file_segment_range = { 0, current_file_size },
-        .read_type = FilesystemCacheLogElement::ReadType::READ_FROM_FS_BYPASSING_CACHE,
+        .cache_type = FilesystemCacheLogElement::CacheType::READ_FROM_FS_BYPASSING_CACHE,
         .file_segment_size = total_bytes_read_from_current_file,
         .cache_attempted = false,
     };
@@ -156,7 +88,6 @@ void ReadBufferFromRemoteFSGather::appendFilesystemCacheLog()
         cache_log->add(elem);
 }
 
-
 IAsynchronousReader::Result ReadBufferFromRemoteFSGather::readInto(char * data, size_t size, size_t offset, size_t ignore)
 {
     /**
@@ -178,7 +109,6 @@ IAsynchronousReader::Result ReadBufferFromRemoteFSGather::readInto(char * data,
     return {0, 0};
 }
 
-
 void ReadBufferFromRemoteFSGather::initialize()
 {
     /// One clickhouse file can be split into multiple files in remote fs.
@@ -206,7 +136,6 @@ void ReadBufferFromRemoteFSGather::initialize()
     current_buf = nullptr;
 }
 
-
 bool ReadBufferFromRemoteFSGather::nextImpl()
 {
     /// Find first available buffer that fits to given offset.
@@ -232,7 +161,6 @@ bool ReadBufferFromRemoteFSGather::nextImpl()
     return readImpl();
 }
 
-
 bool ReadBufferFromRemoteFSGather::moveToNextBuffer()
 {
     /// If there is no available buffers - nothing to read.
@@ -247,7 +175,6 @@ bool ReadBufferFromRemoteFSGather::moveToNextBuffer()
     return true;
 }
 
-
 bool ReadBufferFromRemoteFSGather::readImpl()
 {
     swap(*current_buf);
@@ -294,13 +221,11 @@ bool ReadBufferFromRemoteFSGather::readImpl()
     return result;
 }
 
-
 size_t ReadBufferFromRemoteFSGather::getFileOffsetOfBufferEnd() const
 {
     return file_offset_of_buffer_end;
 }
 
-
 void ReadBufferFromRemoteFSGather::setReadUntilPosition(size_t position)
 {
     if (position != read_until_position)
@@ -310,7 +235,6 @@ void ReadBufferFromRemoteFSGather::setReadUntilPosition(size_t position)
     }
 }
 
-
 void ReadBufferFromRemoteFSGather::reset()
 {
     current_buf.reset();
@@ -321,7 +245,6 @@ String ReadBufferFromRemoteFSGather::getFileName() const
     return current_file_path;
 }
 
-
 size_t ReadBufferFromRemoteFSGather::getFileSize() const
 {
     size_t size = 0;
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index e065c714e04..4ed61501281 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -6,12 +6,6 @@
 #include <IO/AsynchronousReader.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 
-#if USE_AZURE_BLOB_STORAGE
-#include <azure/storage/blobs.hpp>
-#endif
-
-namespace Aws { namespace S3 { class S3Client; } }
-
 namespace Poco { class Logger; }
 
 namespace DB
@@ -21,12 +15,15 @@ namespace DB
  * Remote disk might need to split one clickhouse file into multiple files in remote fs.
  * This class works like a proxy to allow transition from one file into multiple.
  */
-class ReadBufferFromRemoteFSGather : public ReadBuffer
+class ReadBufferFromRemoteFSGather final : public ReadBuffer
 {
 friend class ReadIndirectBufferFromRemoteFS;
 
 public:
+    using ReadBufferCreator = std::function<std::shared_ptr<ReadBufferFromFileBase>(const std::string & path, size_t read_until_position)>;
+
     ReadBufferFromRemoteFSGather(
+        ReadBufferCreator && read_buffer_creator_,
         const StoredObjects & blobs_to_read_,
         const ReadSettings & settings_);
 
@@ -50,8 +47,20 @@ public:
 
     size_t getImplementationBufferOffset() const;
 
-protected:
-    virtual SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) = 0;
+private:
+    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size);
+
+    bool nextImpl() override;
+
+    void initialize();
+
+    bool readImpl();
+
+    bool moveToNextBuffer();
+
+    void appendFilesystemCacheLog();
+
+    ReadBufferCreator read_buffer_creator;
 
     StoredObjects blobs_to_read;
 
@@ -68,19 +77,6 @@ protected:
 
     Poco::Logger * log;
 
-private:
-    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t file_size);
-
-    bool nextImpl() override;
-
-    void initialize();
-
-    bool readImpl();
-
-    bool moveToNextBuffer();
-
-    void appendFilesystemCacheLog();
-
     SeekableReadBufferPtr current_buf;
 
     size_t current_buf_idx = 0;
@@ -99,108 +95,4 @@ private:
     bool enable_cache_log = false;
 };
 
-
-#if USE_AWS_S3
-/// Reads data from S3 using stored paths in metadata.
-class ReadBufferFromS3Gather final : public ReadBufferFromRemoteFSGather
-{
-public:
-    ReadBufferFromS3Gather(
-        std::shared_ptr<const Aws::S3::S3Client> client_ptr_,
-        const String & bucket_,
-        const String & version_id_,
-        const StoredObjects & blobs_to_read_,
-        size_t max_single_read_retries_,
-        const ReadSettings & settings_)
-        : ReadBufferFromRemoteFSGather(blobs_to_read_, settings_)
-        , client_ptr(std::move(client_ptr_))
-        , bucket(bucket_)
-        , version_id(version_id_)
-        , max_single_read_retries(max_single_read_retries_)
-    {
-    }
-
-    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
-
-private:
-    std::shared_ptr<const Aws::S3::S3Client> client_ptr;
-    String bucket;
-    String version_id;
-    UInt64 max_single_read_retries;
-};
-#endif
-
-
-#if USE_AZURE_BLOB_STORAGE
-/// Reads data from AzureBlob Storage using paths stored in metadata.
-class ReadBufferFromAzureBlobStorageGather final : public ReadBufferFromRemoteFSGather
-{
-public:
-    ReadBufferFromAzureBlobStorageGather(
-        std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
-        const StoredObjects & blobs_to_read_,
-        size_t max_single_read_retries_,
-        size_t max_single_download_retries_,
-        const ReadSettings & settings_)
-        : ReadBufferFromRemoteFSGather(blobs_to_read_, settings_)
-        , blob_container_client(blob_container_client_)
-        , max_single_read_retries(max_single_read_retries_)
-        , max_single_download_retries(max_single_download_retries_)
-    {
-    }
-
-    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
-
-private:
-    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client;
-    size_t max_single_read_retries;
-    size_t max_single_download_retries;
-};
-#endif
-
-
-class ReadBufferFromWebServerGather final : public ReadBufferFromRemoteFSGather
-{
-public:
-    ReadBufferFromWebServerGather(
-            const String & uri_,
-            const StoredObjects & blobs_to_read_,
-            ContextPtr context_,
-            const ReadSettings & settings_)
-        : ReadBufferFromRemoteFSGather(blobs_to_read_, settings_)
-        , uri(uri_)
-        , context(context_)
-    {
-    }
-
-    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
-
-private:
-    String uri;
-    ContextPtr context;
-};
-
-
-#if USE_HDFS
-/// Reads data from HDFS using stored paths in metadata.
-class ReadBufferFromHDFSGather final : public ReadBufferFromRemoteFSGather
-{
-public:
-    ReadBufferFromHDFSGather(
-            const Poco::Util::AbstractConfiguration & config_,
-            const StoredObjects & blobs_to_read_,
-            const ReadSettings & settings_)
-        : ReadBufferFromRemoteFSGather(blobs_to_read_, settings_)
-        , config(config_)
-    {
-    }
-
-    SeekableReadBufferPtr createImplementationBufferImpl(const String & path, size_t file_size) override;
-
-private:
-    const Poco::Util::AbstractConfiguration & config;
-};
-
-#endif
-
 }
diff --git a/src/Disks/IO/ReadBufferFromWebServer.cpp b/src/Disks/IO/ReadBufferFromWebServer.cpp
index b9614601a72..948b595b3c5 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.cpp
+++ b/src/Disks/IO/ReadBufferFromWebServer.cpp
@@ -27,7 +27,7 @@ ReadBufferFromWebServer::ReadBufferFromWebServer(
     const ReadSettings & settings_,
     bool use_external_buffer_,
     size_t read_until_position_)
-    : SeekableReadBuffer(nullptr, 0)
+    : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0)
     , log(&Poco::Logger::get("ReadBufferFromWebServer"))
     , context(context_)
     , url(url_)
@@ -82,6 +82,22 @@ std::unique_ptr<ReadBuffer> ReadBufferFromWebServer::initialize()
 }
 
 
+void ReadBufferFromWebServer::setReadUntilPosition(size_t position)
+{
+    read_until_position = position;
+    impl.reset();
+}
+
+
+SeekableReadBuffer::Range ReadBufferFromWebServer::getRemainingReadRange() const
+{
+    return Range{
+        .left = static_cast<size_t>(offset),
+        .right = read_until_position ? std::optional{read_until_position - 1} : std::nullopt
+    };
+}
+
+
 bool ReadBufferFromWebServer::nextImpl()
 {
     if (read_until_position)
diff --git a/src/Disks/IO/ReadBufferFromWebServer.h b/src/Disks/IO/ReadBufferFromWebServer.h
index 1e4219d53ee..03cd107bf9a 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.h
+++ b/src/Disks/IO/ReadBufferFromWebServer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/SeekableReadBuffer.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadSettings.h>
 #include <Interpreters/Context.h>
@@ -15,7 +15,7 @@ namespace DB
  *
  * Usage: ReadIndirectBufferFromRemoteFS -> SeekAvoidingReadBuffer -> ReadBufferFromWebServer -> ReadWriteBufferFromHTTP.
  */
-class ReadBufferFromWebServer : public SeekableReadBuffer
+class ReadBufferFromWebServer : public ReadBufferFromFileBase
 {
 public:
     explicit ReadBufferFromWebServer(
@@ -31,8 +31,16 @@ public:
 
     off_t getPosition() override;
 
+    String getFileName() const override { return url; }
+
+    void setReadUntilPosition(size_t position) override;
+
     size_t getFileOffsetOfBufferEnd() const override { return offset; }
 
+    Range getRemainingReadRange() const override;
+
+    bool supportsRightBoundedReads() const override { return true; }
+
 private:
     std::unique_ptr<ReadBuffer> initialize();
 
diff --git a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
index f27d67fc5fb..fcd463a92c8 100644
--- a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
@@ -30,6 +30,8 @@ public:
 
     void setReadUntilEnd() override;
 
+    bool isIntegratedWithFilesystemCache() const override { return true; }
+
     size_t getFileSize() override;
 
 private:
diff --git a/src/Disks/IO/ThreadPoolReader.cpp b/src/Disks/IO/ThreadPoolReader.cpp
index 2004ffbea83..8e51b1bbfbd 100644
--- a/src/Disks/IO/ThreadPoolReader.cpp
+++ b/src/Disks/IO/ThreadPoolReader.cpp
@@ -1,4 +1,5 @@
 #include "ThreadPoolReader.h"
+#include <Common/VersionNumber.h>
 #include <Common/assert_cast.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
@@ -7,6 +8,7 @@
 #include <Common/setThreadName.h>
 #include <Common/MemorySanitizer.h>
 #include <Common/CurrentThread.h>
+#include <Poco/Environment.h>
 #include <base/errnoToString.h>
 #include <Poco/Event.h>
 #include <future>
@@ -71,6 +73,16 @@ namespace ErrorCodes
 
 }
 
+#if defined(OS_LINUX)
+/// According to man, Linux 5.9 and 5.10 have a bug in preadv2() with the RWF_NOWAIT.
+/// https://manpages.debian.org/testing/manpages-dev/preadv2.2.en.html#BUGS
+/// We also disable it for older Linux kernels, because according to user's reports, RedHat-patched kernels might be also affected.
+static bool hasBugInPreadV2()
+{
+    VersionNumber linux_version(Poco::Environment::osVersion());
+    return linux_version < VersionNumber{5, 11, 0};
+}
+#endif
 
 ThreadPoolReader::ThreadPoolReader(size_t pool_size, size_t queue_size_)
     : pool(pool_size, pool_size, queue_size_)
@@ -88,7 +100,11 @@ std::future<IAsynchronousReader::Result> ThreadPoolReader::submit(Request reques
     /// Check if data is already in page cache with preadv2 syscall.
 
     /// We don't want to depend on new Linux kernel.
-    static std::atomic<bool> has_pread_nowait_support{true};
+    /// But kernels 5.9 and 5.10 have a bug where preadv2() with the
+    /// RWF_NOWAIT flag may return 0 even when not at end of file.
+    /// It can't be distinguished from the real eof, so we have to
+    /// disable pread with nowait.
+    static std::atomic<bool> has_pread_nowait_support = !hasBugInPreadV2();
 
     if (has_pread_nowait_support.load(std::memory_order_relaxed))
     {
diff --git a/src/IO/WriteBufferFromAzureBlobStorage.cpp b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
similarity index 97%
rename from src/IO/WriteBufferFromAzureBlobStorage.cpp
rename to src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
index bc7b505cd91..8130d742ee5 100644
--- a/src/IO/WriteBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
@@ -2,7 +2,7 @@
 
 #if USE_AZURE_BLOB_STORAGE
 
-#include <IO/WriteBufferFromAzureBlobStorage.h>
+#include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
 #include <Common/Throttler.h>
diff --git a/src/IO/WriteBufferFromAzureBlobStorage.h b/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
similarity index 100%
rename from src/IO/WriteBufferFromAzureBlobStorage.h
rename to src/Disks/IO/WriteBufferFromAzureBlobStorage.h
diff --git a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
index bf99934dd73..a909e8f109c 100644
--- a/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
@@ -1,11 +1,5 @@
 #include "WriteIndirectBufferFromRemoteFS.h"
 
-#include <IO/WriteBufferFromS3.h>
-#include <IO/WriteBufferFromAzureBlobStorage.h>
-#include <Storages/HDFS/WriteBufferFromHDFS.h>
-#include <IO/WriteBufferFromHTTP.h>
-
-
 namespace DB
 {
 
diff --git a/src/Disks/LocalDirectorySyncGuard.cpp b/src/Disks/LocalDirectorySyncGuard.cpp
index 2610cd7c37f..843d1c1ed43 100644
--- a/src/Disks/LocalDirectorySyncGuard.cpp
+++ b/src/Disks/LocalDirectorySyncGuard.cpp
@@ -1,6 +1,8 @@
 #include <Disks/LocalDirectorySyncGuard.h>
+#include <Common/ProfileEvents.h>
 #include <Common/Exception.h>
 #include <Disks/IDisk.h>
+#include <Common/Stopwatch.h>
 #include <fcntl.h> // O_RDWR
 
 /// OSX does not have O_DIRECTORY
@@ -8,6 +10,12 @@
 #define O_DIRECTORY O_RDWR
 #endif
 
+namespace ProfileEvents
+{
+    extern const Event DirectorySync;
+    extern const Event DirectorySyncElapsedMicroseconds;
+}
+
 namespace DB
 {
 
@@ -29,8 +37,12 @@ LocalDirectorySyncGuard::LocalDirectorySyncGuard(const String & full_path)
 
 LocalDirectorySyncGuard::~LocalDirectorySyncGuard()
 {
+    ProfileEvents::increment(ProfileEvents::DirectorySync);
+
     try
     {
+        Stopwatch watch;
+
 #if defined(OS_DARWIN)
         if (fcntl(fd, F_FULLFSYNC, 0))
             throwFromErrno("Cannot fcntl(F_FULLFSYNC)", ErrorCodes::CANNOT_FSYNC);
@@ -40,6 +52,8 @@ LocalDirectorySyncGuard::~LocalDirectorySyncGuard()
 #endif
         if (-1 == ::close(fd))
             throw Exception("Cannot close file", ErrorCodes::CANNOT_CLOSE_FILE);
+
+        ProfileEvents::increment(ProfileEvents::DirectorySyncElapsedMicroseconds, watch.elapsedMicroseconds());
     }
     catch (...)
     {
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
index 37fbc0fb05c..7c88ea70cec 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -3,12 +3,13 @@
 #if USE_AZURE_BLOB_STORAGE
 
 #include <Common/getRandomASCIIString.h>
-#include <IO/ReadBufferFromAzureBlobStorage.h>
-#include <IO/WriteBufferFromAzureBlobStorage.h>
+#include <Disks/IO/ReadBufferFromAzureBlobStorage.h>
+#include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
+#include <Common/logger_useful.h>
 
 
 namespace DB
@@ -29,6 +30,7 @@ AzureObjectStorage::AzureObjectStorage(
     : name(name_)
     , client(std::move(client_))
     , settings(std::move(settings_))
+    , log(&Poco::Logger::get("AzureObjectStorage"))
 {
 }
 
@@ -79,11 +81,24 @@ std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObjects( /// NOL
 {
     ReadSettings disk_read_settings = patchSettings(read_settings);
     auto settings_ptr = settings.get();
-    auto reader_impl = std::make_unique<ReadBufferFromAzureBlobStorageGather>(
-        client.get(),
+
+    auto read_buffer_creator =
+        [this, settings_ptr, disk_read_settings]
+        (const std::string & path, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+    {
+        return std::make_unique<ReadBufferFromAzureBlobStorage>(
+            client.get(),
+            path,
+            disk_read_settings,
+            settings_ptr->max_single_read_retries,
+            settings_ptr->max_single_download_retries,
+            /* use_external_buffer */true,
+            read_until_position);
+    };
+
+    auto reader_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
+        std::move(read_buffer_creator),
         objects,
-        settings_ptr->max_single_read_retries,
-        settings_ptr->max_single_download_retries,
         disk_read_settings);
 
     if (disk_read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
@@ -110,6 +125,8 @@ std::unique_ptr<WriteBufferFromFileBase> AzureObjectStorage::writeObject( /// NO
     if (mode != WriteMode::Rewrite)
         throw Exception("Azure storage doesn't support append", ErrorCodes::UNSUPPORTED_METHOD);
 
+    LOG_TEST(log, "Writing file: {}", object.absolute_path);
+
     auto buffer = std::make_unique<WriteBufferFromAzureBlobStorage>(
         client.get(),
         object.absolute_path,
@@ -138,6 +155,7 @@ void AzureObjectStorage::listPrefix(const std::string & path, RelativePathsWithS
 void AzureObjectStorage::removeObject(const StoredObject & object)
 {
     const auto & path = object.absolute_path;
+    LOG_TEST(log, "Removing single object: {}", path);
     auto client_ptr = client.get();
     auto delete_info = client_ptr->DeleteBlob(path);
     if (!delete_info.Value.Deleted)
@@ -149,6 +167,7 @@ void AzureObjectStorage::removeObjects(const StoredObjects & objects)
     auto client_ptr = client.get();
     for (const auto & object : objects)
     {
+        LOG_TEST(log, "Removing object: {} (total: {})", object.absolute_path, objects.size());
         auto delete_info = client_ptr->DeleteBlob(object.absolute_path);
         if (!delete_info.Value.Deleted)
             throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Failed to delete file in AzureBlob Storage: {}", object.absolute_path);
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index 34b3d86b355..9b5a16f6be5 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -12,6 +12,14 @@
 #include <Common/getRandomASCIIString.h>
 #include <Common/MultiVersion.h>
 
+#if USE_AZURE_BLOB_STORAGE
+#include <azure/storage/blobs.hpp>
+#endif
+
+namespace Poco
+{
+class Logger;
+}
 
 namespace DB
 {
@@ -119,6 +127,8 @@ private:
     /// client used to access the files in the Blob Storage cloud
     MultiVersion<Azure::Storage::Blobs::BlobContainerClient> client;
     MultiVersion<AzureObjectStorageSettings> settings;
+
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
index dc70008649e..8ec93aedfef 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
@@ -105,18 +105,6 @@ void registerDiskAzureBlobStorage(DiskFactory & factory)
 
         azure_blob_storage_disk->startup(context);
 
-#ifdef NDEBUG
-        bool use_cache = true;
-#else
-        /// Current cache implementation lead to allocations in destructor of
-        /// read buffer.
-        bool use_cache = false;
-#endif
-        if (config.getBool(config_prefix + ".cache_enabled", use_cache))
-        {
-            String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
-            azure_blob_storage_disk = wrapWithCache(azure_blob_storage_disk, "azure-blob-storage-cache", cache_path, metadata_path);
-        }
         return std::make_shared<DiskRestartProxy>(azure_blob_storage_disk);
     };
 
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
new file mode 100644
index 00000000000..f24b81bf2de
--- /dev/null
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
@@ -0,0 +1,304 @@
+#include "CachedObjectStorage.h"
+
+#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
+#include <IO/BoundedReadBuffer.h>
+#include <Disks/IO/CachedOnDiskWriteBufferFromFile.h>
+#include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
+#include <Common/FileCache.h>
+#include <Common/FileCacheFactory.h>
+#include <Common/CurrentThread.h>
+#include <Common/logger_useful.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+CachedObjectStorage::CachedObjectStorage(
+    ObjectStoragePtr object_storage_,
+    FileCachePtr cache_,
+    const FileCacheSettings & cache_settings_,
+    const std::string & cache_config_name_)
+    : object_storage(object_storage_)
+    , cache(cache_)
+    , cache_settings(cache_settings_)
+    , cache_config_name(cache_config_name_)
+    , log(&Poco::Logger::get(getName()))
+{
+    cache->initialize();
+}
+
+FileCache::Key CachedObjectStorage::getCacheKey(const std::string & path) const
+{
+    return cache->hash(path);
+}
+
+String CachedObjectStorage::getCachePath(const std::string & path) const
+{
+    FileCache::Key cache_key = getCacheKey(path);
+    return cache->getPathInLocalCache(cache_key);
+}
+
+std::string CachedObjectStorage::generateBlobNameForPath(const std::string & path)
+{
+    return object_storage->generateBlobNameForPath(path);
+}
+
+ReadSettings CachedObjectStorage::patchSettings(const ReadSettings & read_settings) const
+{
+    ReadSettings modified_settings{read_settings};
+    modified_settings.remote_fs_cache = cache;
+
+    if (FileCache::isReadOnly())
+        modified_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
+
+    return IObjectStorage::patchSettings(modified_settings);
+}
+
+void CachedObjectStorage::startup()
+{
+    object_storage->startup();
+}
+
+bool CachedObjectStorage::exists(const StoredObject & object) const
+{
+    return object_storage->exists(object);
+}
+
+std::unique_ptr<ReadBufferFromFileBase> CachedObjectStorage::readObjects( /// NOLINT
+    const StoredObjects & objects,
+    const ReadSettings & read_settings,
+    std::optional<size_t> read_hint,
+    std::optional<size_t> file_size) const
+{
+    if (objects.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Received empty list of objects to read");
+
+    assert(!objects[0].getPathKeyForCache().empty());
+
+    /// Add cache relating settings to ReadSettings.
+    auto modified_read_settings = patchSettings(read_settings);
+    auto implementation_buffer = object_storage->readObjects(objects, modified_read_settings, read_hint, file_size);
+
+    /// If underlying read buffer does caching on its own, do not wrap it in caching buffer.
+    if (implementation_buffer->isIntegratedWithFilesystemCache()
+        && modified_read_settings.enable_filesystem_cache_on_lower_level)
+    {
+        return implementation_buffer;
+    }
+    else
+    {
+        if (!file_size)
+            file_size = implementation_buffer->getFileSize();
+
+        auto implementation_buffer_creator = [objects, modified_read_settings, read_hint, file_size, this]()
+        {
+            return std::make_unique<BoundedReadBuffer>(
+                object_storage->readObjects(objects, modified_read_settings, read_hint, file_size));
+        };
+
+        /// TODO: A test is needed for the case of non-s3 storage and *Log family engines.
+        std::string path = objects[0].absolute_path;
+        FileCache::Key key = getCacheKey(objects[0].getPathKeyForCache());
+
+        return std::make_unique<CachedOnDiskReadBufferFromFile>(
+            path,
+            key,
+            cache,
+            implementation_buffer_creator,
+            modified_read_settings,
+            CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() ? std::string(CurrentThread::getQueryId()) : "",
+            file_size.value(),
+            /* allow_seeks */true,
+            /* use_external_buffer */false);
+    }
+}
+
+std::unique_ptr<ReadBufferFromFileBase> CachedObjectStorage::readObject( /// NOLINT
+    const StoredObject & object,
+    const ReadSettings & read_settings,
+    std::optional<size_t> read_hint,
+    std::optional<size_t> file_size) const
+{
+    /// Add cache relating settings to ReadSettings.
+    auto modified_read_settings = patchSettings(read_settings);
+    auto implementation_buffer = object_storage->readObject(object, read_settings, read_hint, file_size);
+
+    /// If underlying read buffer does caching on its own, do not wrap it in caching buffer.
+    if (implementation_buffer->isIntegratedWithFilesystemCache()
+        && modified_read_settings.enable_filesystem_cache_on_lower_level)
+    {
+        return implementation_buffer;
+    }
+    else
+    {
+        if (!file_size)
+            file_size = implementation_buffer->getFileSize();
+
+        auto implementation_buffer_creator = [object, read_settings, read_hint, file_size, this]()
+        {
+            return std::make_unique<BoundedReadBuffer>(object_storage->readObject(object, read_settings, read_hint, file_size));
+        };
+
+        FileCache::Key key = getCacheKey(object.getPathKeyForCache());
+        LOG_TEST(log, "Reading from file `{}` with cache key `{}`", object.absolute_path, key.toString());
+        return std::make_unique<CachedOnDiskReadBufferFromFile>(
+            object.absolute_path,
+            key,
+            cache,
+            implementation_buffer_creator,
+            read_settings,
+            CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() ? std::string(CurrentThread::getQueryId()) : "",
+            file_size.value(),
+            /* allow_seeks */true,
+            /* use_external_buffer */false);
+    }
+}
+
+
+std::unique_ptr<WriteBufferFromFileBase> CachedObjectStorage::writeObject( /// NOLINT
+    const StoredObject & object,
+    WriteMode mode, // Cached doesn't support append, only rewrite
+    std::optional<ObjectAttributes> attributes,
+    FinalizeCallback && finalize_callback,
+    size_t buf_size,
+    const WriteSettings & write_settings)
+{
+    /// Add cache relating settings to WriteSettings.
+    auto modified_write_settings = IObjectStorage::patchSettings(write_settings);
+    auto implementation_buffer = object_storage->writeObject(object, mode, attributes, std::move(finalize_callback), buf_size, modified_write_settings);
+
+    bool cache_on_write = modified_write_settings.enable_filesystem_cache_on_write_operations
+        && FileCacheFactory::instance().getSettings(cache->getBasePath()).cache_on_write_operations
+        && fs::path(object.absolute_path).extension() != ".tmp";
+
+    auto path_key_for_cache = object.getPathKeyForCache();
+    /// Need to remove even if cache_on_write == false.
+    removeCacheIfExists(path_key_for_cache);
+
+    if (cache_on_write)
+    {
+        auto key = getCacheKey(path_key_for_cache);
+        LOG_TEST(log, "Caching file `{}` to `{}` with key {}", object.absolute_path, getCachePath(path_key_for_cache), key.toString());
+
+        return std::make_unique<CachedOnDiskWriteBufferFromFile>(
+            std::move(implementation_buffer),
+            cache,
+            implementation_buffer->getFileName(),
+            key,
+            modified_write_settings.is_file_cache_persistent,
+            CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() ? std::string(CurrentThread::getQueryId()) : "",
+            modified_write_settings);
+    }
+
+    return implementation_buffer;
+}
+
+void CachedObjectStorage::removeCacheIfExists(const std::string & path_key_for_cache)
+{
+    if (path_key_for_cache.empty())
+        return;
+
+    /// Add try catch?
+    cache->removeIfExists(getCacheKey(path_key_for_cache));
+}
+
+void CachedObjectStorage::removeObject(const StoredObject & object)
+{
+    removeCacheIfExists(object.getPathKeyForCache());
+    object_storage->removeObject(object);
+}
+
+void CachedObjectStorage::removeObjects(const StoredObjects & objects)
+{
+    for (const auto & object : objects)
+        removeCacheIfExists(object.getPathKeyForCache());
+
+    object_storage->removeObjects(objects);
+}
+
+void CachedObjectStorage::removeObjectIfExists(const StoredObject & object)
+{
+    removeCacheIfExists(object.getPathKeyForCache());
+    object_storage->removeObjectIfExists(object);
+}
+
+void CachedObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
+{
+    for (const auto & object : objects)
+        removeCacheIfExists(object.getPathKeyForCache());
+
+    object_storage->removeObjectsIfExist(objects);
+}
+
+ReadSettings CachedObjectStorage::getAdjustedSettingsFromMetadataFile(const ReadSettings & settings, const std::string & path) const
+{
+    ReadSettings new_settings{settings};
+    new_settings.is_file_cache_persistent = isFileWithPersistentCache(path) && cache_settings.do_not_evict_index_and_mark_files;
+    return new_settings;
+}
+
+WriteSettings CachedObjectStorage::getAdjustedSettingsFromMetadataFile(const WriteSettings & settings, const std::string & path) const
+{
+    WriteSettings new_settings{settings};
+    new_settings.is_file_cache_persistent = isFileWithPersistentCache(path) && cache_settings.do_not_evict_index_and_mark_files;
+    return new_settings;
+}
+
+void CachedObjectStorage::copyObjectToAnotherObjectStorage( // NOLINT
+    const StoredObject & object_from,
+    const StoredObject & object_to,
+    IObjectStorage & object_storage_to,
+    std::optional<ObjectAttributes> object_to_attributes)
+{
+    object_storage->copyObjectToAnotherObjectStorage(object_from, object_to, object_storage_to, object_to_attributes);
+}
+
+void CachedObjectStorage::copyObject( // NOLINT
+    const StoredObject & object_from, const StoredObject & object_to, std::optional<ObjectAttributes> object_to_attributes)
+{
+    object_storage->copyObject(object_from, object_to, object_to_attributes);
+}
+
+std::unique_ptr<IObjectStorage> CachedObjectStorage::cloneObjectStorage(
+    const std::string & new_namespace,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix,
+    ContextPtr context)
+{
+    return object_storage->cloneObjectStorage(new_namespace, config, config_prefix, context);
+}
+
+void CachedObjectStorage::listPrefix(const std::string & path, RelativePathsWithSize & children) const
+{
+    object_storage->listPrefix(path, children);
+}
+
+ObjectMetadata CachedObjectStorage::getObjectMetadata(const std::string & path) const
+{
+    return object_storage->getObjectMetadata(path);
+}
+
+void CachedObjectStorage::shutdown()
+{
+    object_storage->shutdown();
+}
+
+void CachedObjectStorage::applyNewSettings(
+    const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, ContextPtr context)
+{
+    object_storage->applyNewSettings(config, config_prefix, context);
+}
+
+String CachedObjectStorage::getObjectsNamespace() const
+{
+    return object_storage->getObjectsNamespace();
+}
+
+}
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
new file mode 100644
index 00000000000..f99addb97d4
--- /dev/null
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
@@ -0,0 +1,126 @@
+#pragma once
+
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Common/FileCache.h>
+#include <Common/FileCacheSettings.h>
+
+namespace Poco
+{
+class Logger;
+}
+
+namespace DB
+{
+
+/**
+ * Wraps another object storage and add a caching layer for it.
+ */
+class CachedObjectStorage final : public IObjectStorage
+{
+public:
+    CachedObjectStorage(ObjectStoragePtr object_storage_, FileCachePtr cache_, const FileCacheSettings & cache_settings_, const String & cache_config_name_);
+
+    std::string getName() const override { return fmt::format("CachedObjectStorage-{}({})", cache_config_name, object_storage->getName()); }
+
+    bool exists(const StoredObject & object) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
+        const StoredObject & object,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObjects( /// NOLINT
+        const StoredObjects & objects,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    std::unique_ptr<WriteBufferFromFileBase> writeObject( /// NOLINT
+        const StoredObject & object,
+        WriteMode mode,
+        std::optional<ObjectAttributes> attributes = {},
+        FinalizeCallback && finalize_callback = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        const WriteSettings & write_settings = {}) override;
+
+    void removeObject(const StoredObject & object) override;
+
+    void removeObjects(const StoredObjects & objects) override;
+
+    void removeObjectIfExists(const StoredObject & object) override;
+
+    void removeObjectsIfExist(const StoredObjects & objects) override;
+
+    void copyObject( /// NOLINT
+        const StoredObject & object_from,
+        const StoredObject & object_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    void copyObjectToAnotherObjectStorage( /// NOLINT
+        const StoredObject & object_from,
+        const StoredObject & object_to,
+        IObjectStorage & object_storage_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    std::unique_ptr<IObjectStorage> cloneObjectStorage(
+        const std::string & new_namespace,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ContextPtr context) override;
+
+    void listPrefix(const std::string & path, RelativePathsWithSize & children) const override;
+
+    ObjectMetadata getObjectMetadata(const std::string & path) const override;
+
+    void shutdown() override;
+
+    void startup() override;
+
+    void applyNewSettings(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ContextPtr context) override;
+
+    String getObjectsNamespace() const override;
+
+    const String & getCacheBasePath() const override { return cache->getBasePath(); }
+
+    std::string generateBlobNameForPath(const std::string & path) override;
+
+    bool isRemote() const override { return object_storage->isRemote(); }
+
+    void removeCacheIfExists(const std::string & path_key_for_cache) override;
+
+    bool supportsCache() const override { return true; }
+
+    std::string getUniqueId(const std::string & path) const override { return object_storage->getUniqueId(path); }
+
+    bool isReadOnly() const override { return object_storage->isReadOnly(); }
+
+    const std::string & getCacheConfigName() const { return cache_config_name; }
+
+    ObjectStoragePtr getWrappedObjectStorage() { return object_storage; }
+
+    bool supportParallelWrite() const override { return object_storage->supportParallelWrite(); }
+
+    ReadSettings getAdjustedSettingsFromMetadataFile(const ReadSettings & settings, const std::string & path) const override;
+
+    WriteSettings getAdjustedSettingsFromMetadataFile(const WriteSettings & settings, const std::string & path) const override;
+
+private:
+    FileCache::Key getCacheKey(const std::string & path) const;
+
+    String getCachePath(const std::string & path) const;
+
+    ReadSettings patchSettings(const ReadSettings & read_settings) const override;
+
+    ObjectStoragePtr object_storage;
+    FileCachePtr cache;
+    FileCacheSettings cache_settings;
+    std::string cache_config_name;
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp b/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
new file mode 100644
index 00000000000..84b95bd3d16
--- /dev/null
+++ b/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
@@ -0,0 +1,65 @@
+#include <Common/FileCacheSettings.h>
+#include <Common/FileCacheFactory.h>
+#include <Common/FileCache.h>
+#include <Common/logger_useful.h>
+#include <Common/assert_cast.h>
+#include <Disks/DiskFactory.h>
+#include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Interpreters/Context.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+void registerDiskCache(DiskFactory & factory)
+{
+    auto creator = [](const String & name,
+                    const Poco::Util::AbstractConfiguration & config,
+                    const String & config_prefix,
+                    ContextPtr context,
+                    const DisksMap & map) -> DiskPtr
+    {
+        auto disk_name = config.getString(config_prefix + ".disk", "");
+        if (disk_name.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Disk Cache requires `disk` field in config");
+
+        auto disk_it = map.find(disk_name);
+        if (disk_it == map.end())
+        {
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Cannot wrap disk `{}` with cache layer `{}`: there is no such disk (it should be initialized before cache disk)",
+                disk_name, name);
+        }
+
+        FileCacheSettings file_cache_settings;
+        file_cache_settings.loadFromConfig(config, config_prefix);
+
+        auto cache_base_path = config.getString(config_prefix + ".path", fs::path(context->getPath()) / "disks" / name / "cache/");
+        if (!fs::exists(cache_base_path))
+            fs::create_directories(cache_base_path);
+
+        auto disk = disk_it->second;
+
+        auto cache = FileCacheFactory::instance().getOrCreate(cache_base_path, file_cache_settings, name);
+        auto disk_object_storage = disk->createDiskObjectStorage();
+
+        disk_object_storage->wrapWithCache(cache, file_cache_settings, name);
+
+        LOG_INFO(
+            &Poco::Logger::get("DiskCache"),
+            "Registered cached disk (`{}`) with structure: {}",
+            name, assert_cast<DiskObjectStorage *>(disk_object_storage.get())->getStructure());
+
+        return disk_object_storage;
+    };
+
+    factory.registerDiskType("cache", creator);
+}
+
+}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index 0b7d16bd895..75579247752 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -9,11 +9,9 @@
 #include <Common/createHardLink.h>
 #include <Common/quoteString.h>
 #include <Common/logger_useful.h>
-#include <Common/checkStackSize.h>
-#include <boost/algorithm/string.hpp>
 #include <Common/filesystemHelpers.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
+#include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
 #include <Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h>
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/FakeDiskTransaction.h>
@@ -93,6 +91,12 @@ DiskTransactionPtr DiskObjectStorage::createObjectStorageTransaction()
         send_metadata ? metadata_helper.get() : nullptr);
 }
 
+std::shared_ptr<Executor> DiskObjectStorage::getAsyncExecutor(const std::string & log_name, size_t size)
+{
+    static auto reader = std::make_shared<AsyncThreadPoolExecutor>(log_name, size);
+    return reader;
+}
+
 DiskObjectStorage::DiskObjectStorage(
     const String & name_,
     const String & object_storage_root_path_,
@@ -102,7 +106,7 @@ DiskObjectStorage::DiskObjectStorage(
     DiskType disk_type_,
     bool send_metadata_,
     uint64_t thread_pool_size_)
-    : IDisk(std::make_unique<AsyncThreadPoolExecutor>(log_name, thread_pool_size_))
+    : IDisk(getAsyncExecutor(log_name, thread_pool_size_))
     , name(name_)
     , object_storage_root_path(object_storage_root_path_)
     , log (&Poco::Logger::get("DiskObjectStorage(" + log_name + ")"))
@@ -260,7 +264,7 @@ bool DiskObjectStorage::checkUniqueId(const String & id) const
     if (!id.starts_with(object_storage_root_path))
         return false;
 
-    auto object = StoredObject::create(*object_storage, id, {}, true);
+    auto object = StoredObject::create(*object_storage, id, {}, {}, true);
     return object_storage->exists(object);
 }
 
@@ -367,6 +371,18 @@ time_t DiskObjectStorage::getLastChanged(const String & path) const
     return metadata_storage->getLastChanged(path);
 }
 
+struct stat DiskObjectStorage::stat(const String & path) const
+{
+    return metadata_storage->stat(path);
+}
+
+void DiskObjectStorage::chmod(const String & path, mode_t mode)
+{
+    auto transaction = createObjectStorageTransaction();
+    transaction->chmod(path, mode);
+    transaction->commit();
+}
+
 void DiskObjectStorage::shutdown()
 {
     LOG_INFO(log, "Shutting down disk {}", name);
@@ -440,12 +456,17 @@ bool DiskObjectStorage::supportsCache() const
     return object_storage->supportsCache();
 }
 
-DiskObjectStoragePtr DiskObjectStorage::createDiskObjectStorage(const String & name_)
+bool DiskObjectStorage::isReadOnly() const
+{
+    return object_storage->isReadOnly();
+}
+
+DiskObjectStoragePtr DiskObjectStorage::createDiskObjectStorage()
 {
     return std::make_shared<DiskObjectStorage>(
-        name_,
+        getName(),
         object_storage_root_path,
-        name,
+        getName(),
         metadata_storage,
         object_storage,
         disk_type,
@@ -453,6 +474,24 @@ DiskObjectStoragePtr DiskObjectStorage::createDiskObjectStorage(const String & n
         threadpool_size);
 }
 
+void DiskObjectStorage::wrapWithCache(FileCachePtr cache, const FileCacheSettings & cache_settings, const String & layer_name)
+{
+    object_storage = std::make_shared<CachedObjectStorage>(object_storage, cache, cache_settings, layer_name);
+}
+
+NameSet DiskObjectStorage::getCacheLayersNames() const
+{
+    NameSet cache_layers;
+    auto current_object_storage = object_storage;
+    while (current_object_storage->supportsCache())
+    {
+        auto * cached_object_storage = assert_cast<CachedObjectStorage *>(current_object_storage.get());
+        cache_layers.insert(cached_object_storage->getCacheConfigName());
+        current_object_storage = cached_object_storage->getWrappedObjectStorage();
+    }
+    return cache_layers;
+}
+
 std::unique_ptr<ReadBufferFromFileBase> DiskObjectStorage::readFile(
     const String & path,
     const ReadSettings & settings,
@@ -461,7 +500,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskObjectStorage::readFile(
 {
     return object_storage->readObjects(
         metadata_storage->getStorageObjects(path),
-        settings,
+        object_storage->getAdjustedSettingsFromMetadataFile(settings, path),
         read_hint,
         file_size);
 }
@@ -475,7 +514,11 @@ std::unique_ptr<WriteBufferFromFileBase> DiskObjectStorage::writeFile(
     LOG_TEST(log, "Write file: {}", path);
 
     auto transaction = createObjectStorageTransaction();
-    auto result = transaction->writeFile(path, buf_size, mode, settings);
+    auto result = transaction->writeFile(
+        path,
+        buf_size,
+        mode,
+        object_storage->getAdjustedSettingsFromMetadataFile(settings, path));
 
     return result;
 }
@@ -557,5 +600,4 @@ DiskObjectStorageReservation::~DiskObjectStorageReservation()
     }
 }
 
-
 }
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.h b/src/Disks/ObjectStorages/DiskObjectStorage.h
index 9494f421e6a..1b53cd514a0 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.h
@@ -45,7 +45,7 @@ public:
 
     bool supportZeroCopyReplication() const override { return true; }
 
-    bool supportParallelWrite() const override { return true; }
+    bool supportParallelWrite() const override { return object_storage->supportParallelWrite(); }
 
     const String & getName() const override { return name; }
 
@@ -55,7 +55,7 @@ public:
 
     void getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithObjectStoragePaths> & paths_map) override;
 
-    std::string getCacheBasePath() const override
+    const std::string & getCacheBasePath() const override
     {
         return object_storage->getCacheBasePath();
     }
@@ -164,10 +164,38 @@ public:
 
     UInt64 getRevision() const override;
 
-    DiskObjectStoragePtr createDiskObjectStorage(const String & name_) override;
+    DiskObjectStoragePtr createDiskObjectStorage() override;
 
     bool supportsCache() const override;
 
+    /// Is object storage read only?
+    /// For example: WebObjectStorage is read only as it allows to read from a web server
+    /// with static files, so only read-only operations are allowed for this storage.
+    bool isReadOnly() const override;
+
+    /// Add a cache layer.
+    /// Example: DiskObjectStorage(S3ObjectStorage) -> DiskObjectStorage(CachedObjectStorage(S3ObjectStorage))
+    /// There can be any number of cache layers:
+    /// DiskObjectStorage(CachedObjectStorage(...CacheObjectStorage(S3ObjectStorage)...))
+    void wrapWithCache(FileCachePtr cache, const FileCacheSettings & cache_settings, const String & layer_name);
+
+    /// Get structure of object storage this disk works with. Examples:
+    /// DiskObjectStorage(S3ObjectStorage)
+    /// DiskObjectStorage(CachedObjectStorage(S3ObjectStorage))
+    /// DiskObjectStorage(CachedObjectStorage(CachedObjectStorage(S3ObjectStorage)))
+    String getStructure() const { return fmt::format("DiskObjectStorage-{}({})", getName(), object_storage->getName()); }
+
+    /// Get names of all cache layers. Name is how cache is defined in configuration file.
+    NameSet getCacheLayersNames() const override;
+
+    static std::shared_ptr<Executor> getAsyncExecutor(const std::string & log_name, size_t size);
+
+    bool supportsStat() const override { return metadata_storage->supportsStat(); }
+    struct stat stat(const String & path) const override;
+
+    bool supportsChmod() const override { return metadata_storage->supportsChmod(); }
+    void chmod(const String & path, mode_t mode) override;
+
 private:
 
     /// Create actual disk object storage transaction for operations
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
index b8ab2f49202..3f69e79c645 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
@@ -1,35 +1,12 @@
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Common/getRandomASCIIString.h>
-#include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
-#include <Common/FileCacheSettings.h>
+#include <Disks/DiskLocal.h>
+#include <Poco/Util/AbstractConfiguration.h>
 #include <Interpreters/Context.h>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-std::shared_ptr<DiskCacheWrapper> wrapWithCache(
-    std::shared_ptr<IDisk> disk, String cache_name, String cache_path, String metadata_path)
-{
-    if (metadata_path == cache_path)
-        throw Exception("Metadata and cache paths should be different: " + metadata_path, ErrorCodes::BAD_ARGUMENTS);
-
-    auto cache_disk = std::make_shared<DiskLocal>(cache_name, cache_path, 0);
-    auto cache_file_predicate = [] (const String & path)
-    {
-        return path.ends_with("idx") // index files.
-                || path.ends_with("mrk") || path.ends_with("mrk2") || path.ends_with("mrk3") /// mark files.
-                || path.ends_with("txt") || path.ends_with("dat");
-    };
-
-    return std::make_shared<DiskCacheWrapper>(disk, cache_disk, cache_file_predicate);
-}
-
 static String getDiskMetadataPath(
     const String & name,
     const Poco::Util::AbstractConfiguration & config,
@@ -52,39 +29,12 @@ std::pair<String, DiskPtr> prepareForLocalMetadata(
     return std::make_pair(metadata_path, metadata_disk);
 }
 
-
-FileCachePtr getCachePtrForDisk(
-    const String & name,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    ContextPtr context)
+bool isFileWithPersistentCache(const String & path)
 {
-    bool data_cache_enabled = config.getBool(config_prefix + ".data_cache_enabled", false);
-    if (!data_cache_enabled)
-        return nullptr;
-
-    auto cache_base_path = config.getString(config_prefix + ".data_cache_path", fs::path(context->getPath()) / "disks" / name / "data_cache/");
-    if (!fs::exists(cache_base_path))
-        fs::create_directories(cache_base_path);
-
-    auto metadata_path = getDiskMetadataPath(name, config, config_prefix, context);
-    if (metadata_path == cache_base_path)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Metadata path and cache base path must be different: {}", metadata_path);
-
-    FileCacheSettings file_cache_settings;
-    file_cache_settings.loadFromConfig(config, config_prefix);
-
-    auto cache = FileCacheFactory::instance().getOrCreate(cache_base_path, file_cache_settings, name);
-    cache->initialize();
-
-    auto * log = &Poco::Logger::get("Disk(" + name + ")");
-    LOG_INFO(log, "Disk registered with cache path: {}. Cache size: {}, max cache elements size: {}, max_file_segment_size: {}",
-             cache_base_path,
-             file_cache_settings.max_size ? toString(file_cache_settings.max_size) : "UNLIMITED",
-             file_cache_settings.max_elements ? toString(file_cache_settings.max_elements) : "UNLIMITED",
-             file_cache_settings.max_file_segment_size);
-
-    return cache;
+    auto path_extension = std::filesystem::path(path).extension();
+    return path_extension == ".idx" // index files.
+            || path_extension == ".mrk" || path_extension == ".mrk2" || path_extension == ".mrk3" /// mark files.
+            || path_extension == ".txt" || path_extension == ".dat";
 }
 
 }
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageCommon.h b/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
index 9cc3b971865..56c73649c1f 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
@@ -8,27 +8,16 @@
 #include <Common/getRandomASCIIString.h>
 
 #include <Disks/IDisk.h>
-#include <Disks/DiskCacheWrapper.h>
 
 namespace DB
 {
 
-std::shared_ptr<DiskCacheWrapper> wrapWithCache(
-    std::shared_ptr<IDisk> disk,
-    String cache_name,
-    String cache_path,
-    String metadata_path);
-
 std::pair<String, DiskPtr> prepareForLocalMetadata(
     const String & name,
     const Poco::Util::AbstractConfiguration & config,
     const String & config_prefix,
     ContextPtr context);
 
-FileCachePtr getCachePtrForDisk(
-    const String & name,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    ContextPtr context);
+bool isFileWithPersistentCache(const String & path);
 
 }
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
index bce8d6cf7d0..65f0d24035a 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
@@ -430,6 +430,7 @@ void DiskObjectStorageRemoteMetadataRestoreHelper::processRestoreFiles(
 
         disk->createDirectories(directoryPath(path));
         auto relative_key = shrinkKey(source_path, key);
+        auto full_path = fs::path(disk->object_storage_root_path) / relative_key;
 
         StoredObject object_from{key};
         StoredObject object_to{fs::path(disk->object_storage_root_path) / relative_key};
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
index 6e807747478..28015ff0b04 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
@@ -109,7 +109,6 @@ struct RemoveObjectStorageOperation final : public IDiskObjectStorageOperation
             if (hardlink_count == 0)
             {
                 objects_to_remove = objects;
-                remove_from_cache = true;
             }
         }
         catch (const Exception & e)
@@ -136,12 +135,6 @@ struct RemoveObjectStorageOperation final : public IDiskObjectStorageOperation
     {
         if (!delete_metadata_only && !objects_to_remove.empty())
             object_storage.removeObjects(objects_to_remove);
-
-        if (remove_from_cache)
-        {
-            for (const auto & object : objects_to_remove)
-                object_storage.removeCacheIfExists(object.getPathKeyForCache());
-        }
     }
 };
 
@@ -186,9 +179,7 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
                 if (hardlink_count == 0)
                 {
                     objects_to_remove[path_to_remove] = objects_paths;
-                    objects_to_remove_from_cache.insert(objects_to_remove_from_cache.end(), objects_paths.begin(), objects_paths.end());
                 }
-
             }
             catch (const Exception & e)
             {
@@ -237,9 +228,6 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
             }
             object_storage.removeObjects(remove_from_remote);
         }
-
-        for (const auto & object : objects_to_remove_from_cache)
-            object_storage.removeCacheIfExists(object.getPathKeyForCache());
     }
 };
 
@@ -613,6 +601,15 @@ void DiskObjectStorageTransaction::setLastModified(const std::string & path, con
         }));
 }
 
+void DiskObjectStorageTransaction::chmod(const String & path, mode_t mode)
+{
+    operations_to_execute.emplace_back(
+        std::make_unique<PureMetadataObjectStorageOperation>(object_storage, metadata_storage, [path, mode](MetadataTransactionPtr tx)
+        {
+            tx->chmod(path, mode);
+        }));
+}
+
 void DiskObjectStorageTransaction::createFile(const std::string & path)
 {
     operations_to_execute.emplace_back(
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
index ceed79a23b7..9c42203b613 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.h
@@ -109,6 +109,7 @@ public:
     void removeSharedFiles(const RemoveBatchRequest & files, bool keep_all_batch_data, const NameSet & file_names_remove_metadata_only) override;
 
     void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override;
+    void chmod(const String & path, mode_t mode) override;
     void setReadOnly(const std::string & path) override;
     void createHardLink(const std::string & src_path, const std::string & dst_path) override;
 };
diff --git a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp
index d1413bd4e88..383bbebd880 100644
--- a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp
+++ b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.cpp
@@ -95,17 +95,15 @@ StoredObjects FakeMetadataStorageFromDisk::getStorageObjects(const std::string &
     std::string blob_name = object_storage->generateBlobNameForPath(path);
 
     std::string object_path = fs::path(object_storage_root_path) / blob_name;
-    size_t object_size = getFileSize(object_path);
+    size_t object_size = getFileSize(path);
 
-    auto object = StoredObject::create(*object_storage, object_path, object_size);
+    auto object = StoredObject::create(*object_storage, object_path, object_size, /* exists */true);
     return {std::move(object)};
 }
 
 uint32_t FakeMetadataStorageFromDisk::getHardlinkCount(const std::string & path) const
 {
-    size_t ref_count = disk->getRefCount(path);
-    assert(ref_count > 0);
-    return ref_count - 1;
+    return disk->getRefCount(path);
 }
 
 const IMetadataStorage & FakeMetadataStorageFromDiskTransaction::getStorageForNonTransactionalReads() const
diff --git a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
index 6d5ae12a157..b1c8340ef1b 100644
--- a/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/FakeMetadataStorageFromDisk.h
@@ -42,6 +42,12 @@ public:
 
     time_t getLastChanged(const std::string & path) const override;
 
+    bool supportsChmod() const override { return disk->supportsChmod(); }
+
+    bool supportsStat() const override { return disk->supportsStat(); }
+
+    struct stat stat(const String & path) const override { return disk->stat(path); }
+
     std::vector<std::string> listDirectory(const std::string & path) const override;
 
     DirectoryIteratorPtr iterateDirectory(const std::string & path) const override;
@@ -89,6 +95,10 @@ public:
 
     void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override;
 
+    bool supportsChmod() const override { return disk->supportsChmod(); }
+
+    void chmod(const String & path, mode_t mode) override { disk->chmod(path, mode); }
+
     void setReadOnly(const std::string & path) override;
 
     void unlinkFile(const std::string & path) override;
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
index 4ffbf5b2ceb..78bbed21e39 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
@@ -61,7 +61,19 @@ std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObjects( /// NOLI
     std::optional<size_t>,
     std::optional<size_t>) const
 {
-    auto hdfs_impl = std::make_unique<ReadBufferFromHDFSGather>(config, objects, patchSettings(read_settings));
+    auto disk_read_settings = patchSettings(read_settings);
+    auto read_buffer_creator =
+        [this, disk_read_settings]
+        (const std::string & path, size_t /* read_until_position */) -> std::shared_ptr<ReadBufferFromFileBase>
+    {
+        size_t begin_of_path = path.find('/', path.find("//") + 2);
+        auto hdfs_path = path.substr(begin_of_path);
+        auto hdfs_uri = path.substr(0, begin_of_path);
+
+        return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, hdfs_path, config, disk_read_settings);
+    };
+
+    auto hdfs_impl = std::make_unique<ReadBufferFromRemoteFSGather>(std::move(read_buffer_creator), objects, disk_read_settings);
     auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(hdfs_impl));
     return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings->min_bytes_for_seek);
 }
diff --git a/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp b/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
index e0cea249d00..a2e9fb3e4ad 100644
--- a/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
+++ b/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
@@ -38,7 +38,7 @@ void registerDiskHDFS(DiskFactory & factory)
         /// FIXME Cache currently unsupported :(
         ObjectStoragePtr hdfs_storage = std::make_unique<HDFSObjectStorage>(uri, std::move(settings), config);
 
-        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context_);
+        auto [_, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context_);
 
         auto metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, uri);
         uint64_t copy_thread_pool_size = config.getUInt(config_prefix + ".thread_pool_size", 16);
@@ -53,20 +53,6 @@ void registerDiskHDFS(DiskFactory & factory)
             /* send_metadata = */ false,
             copy_thread_pool_size);
 
-#ifdef NDEBUG
-        bool use_cache = true;
-#else
-        /// Current S3 cache implementation lead to allocations in destructor of
-        /// read buffer.
-        bool use_cache = false;
-#endif
-
-        if (config.getBool(config_prefix + ".cache_enabled", use_cache))
-        {
-            String cache_path = config.getString(config_prefix + ".cache_path", context_->getPath() + "disks/" + name + "/cache/");
-            disk_result = wrapWithCache(disk_result, "hdfs-cache", cache_path, metadata_path);
-        }
-
         return std::make_shared<DiskRestartProxy>(disk_result);
     };
 
diff --git a/src/Disks/ObjectStorages/IMetadataStorage.h b/src/Disks/ObjectStorages/IMetadataStorage.h
index a941f1ca514..300d8ec59b9 100644
--- a/src/Disks/ObjectStorages/IMetadataStorage.h
+++ b/src/Disks/ObjectStorages/IMetadataStorage.h
@@ -37,6 +37,9 @@ public:
 
     virtual void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) = 0;
 
+    virtual bool supportsChmod() const = 0;
+    virtual void chmod(const String & path, mode_t mode) = 0;
+
     virtual void setReadOnly(const std::string & path) = 0;
 
     virtual void unlinkFile(const std::string & path) = 0;
@@ -85,8 +88,6 @@ using MetadataTransactionPtr = std::shared_ptr<IMetadataTransaction>;
 /// small amounts of data (strings).
 class IMetadataStorage : private boost::noncopyable
 {
-friend class MetadataStorageFromDiskTransaction;
-
 public:
     virtual MetadataTransactionPtr createTransaction() const = 0;
 
@@ -107,6 +108,11 @@ public:
 
     virtual time_t getLastChanged(const std::string & path) const = 0;
 
+    virtual bool supportsChmod() const = 0;
+
+    virtual bool supportsStat() const = 0;
+    virtual struct stat stat(const String & path) const = 0;
+
     virtual std::vector<std::string> listDirectory(const std::string & path) const = 0;
 
     virtual DirectoryIteratorPtr iterateDirectory(const std::string & path) const = 0;
diff --git a/src/Disks/ObjectStorages/IObjectStorage.cpp b/src/Disks/ObjectStorages/IObjectStorage.cpp
index f3ac94768d8..1a128770015 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/IObjectStorage.cpp
@@ -4,6 +4,7 @@
 #include <IO/copyData.h>
 #include <Interpreters/Context.h>
 
+
 namespace DB
 {
 
@@ -43,9 +44,9 @@ void IObjectStorage::copyObjectToAnotherObjectStorage( // NOLINT
     out->finalize();
 }
 
-std::string IObjectStorage::getCacheBasePath() const
+const std::string & IObjectStorage::getCacheBasePath() const
 {
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getCacheBasePath() is not implemented for {}", getName());
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getCacheBasePath() is not implemented for object storage");
 }
 
 void IObjectStorage::applyRemoteThrottlingSettings(ContextPtr context)
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index 1ab2d75ff86..ae5a2587ddd 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -16,6 +16,7 @@
 #include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
 #include <Disks/ObjectStorages/StoredObject.h>
 #include <Common/ThreadPool.h>
+#include <Common/FileCache.h>
 #include <Disks/WriteMode.h>
 
 
@@ -40,8 +41,6 @@ struct RelativePathWithSize
 using RelativePathsWithSize = std::vector<RelativePathWithSize>;
 
 
-using StoredObjects = std::vector<StoredObject>;
-
 struct ObjectMetadata
 {
     uint64_t size_bytes;
@@ -127,7 +126,7 @@ public:
     virtual ~IObjectStorage() = default;
 
     /// Path to directory with objects cache
-    virtual std::string getCacheBasePath() const;
+    virtual const std::string & getCacheBasePath() const;
 
     static AsynchronousReaderPtr getThreadPoolReader();
 
@@ -169,13 +168,21 @@ public:
 
     virtual bool supportsCache() const { return false; }
 
+    virtual bool isReadOnly() const { return false; }
+
+    virtual bool supportParallelWrite() const { return false; }
+
+    virtual ReadSettings getAdjustedSettingsFromMetadataFile(const ReadSettings & settings, const std::string & /* path */) const { return settings; }
+
+    virtual WriteSettings getAdjustedSettingsFromMetadataFile(const WriteSettings & settings, const std::string & /* path */) const { return settings; }
+
 protected:
     /// Should be called from implementation of applyNewSettings()
     void applyRemoteThrottlingSettings(ContextPtr context);
 
     /// Should be used by implementation of read* and write* methods
-    ReadSettings patchSettings(const ReadSettings & read_settings) const;
-    WriteSettings patchSettings(const WriteSettings & write_settings) const;
+    virtual ReadSettings patchSettings(const ReadSettings & read_settings) const;
+    virtual WriteSettings patchSettings(const WriteSettings & write_settings) const;
 
 private:
     mutable std::mutex throttlers_mutex;
diff --git a/src/Disks/ObjectStorages/LocalObjectStorage.cpp b/src/Disks/ObjectStorages/LocalObjectStorage.cpp
index c052f2f0d77..a25f2ba18c4 100644
--- a/src/Disks/ObjectStorages/LocalObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/LocalObjectStorage.cpp
@@ -1,7 +1,7 @@
 #include <Disks/ObjectStorages/LocalObjectStorage.h>
 
 #include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileCacheFactory.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
@@ -107,6 +107,10 @@ void LocalObjectStorage::listPrefix(const std::string & path, RelativePathsWithS
 
 void LocalObjectStorage::removeObject(const StoredObject & object)
 {
+    /// For local object storage files are actually removed when "metadata" is removed.
+    if (!exists(object))
+        return;
+
     if (0 != unlink(object.absolute_path.data()))
         throwFromErrnoWithPath("Cannot unlink file " + object.absolute_path, object.absolute_path, ErrorCodes::CANNOT_UNLINK);
 }
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp b/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
index 489772647d1..cdd0fdc8457 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.cpp
@@ -250,6 +250,11 @@ void MetadataStorageFromDiskTransaction::setLastModified(const std::string & pat
     addOperation(std::make_unique<SetLastModifiedOperation>(path, timestamp, *metadata_storage.getDisk()));
 }
 
+void MetadataStorageFromDiskTransaction::chmod(const String & path, mode_t mode)
+{
+    addOperation(std::make_unique<ChmodOperation>(path, mode, *metadata_storage.getDisk()));
+}
+
 void MetadataStorageFromDiskTransaction::unlinkFile(const std::string & path)
 {
     addOperation(std::make_unique<UnlinkFileOperation>(path, *metadata_storage.getDisk()));
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
index 104e9d54bff..8c1fb6edd14 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
@@ -39,6 +39,12 @@ public:
 
     time_t getLastChanged(const std::string & path) const override;
 
+    bool supportsChmod() const override { return disk->supportsChmod(); }
+
+    bool supportsStat() const override { return disk->supportsStat(); }
+
+    struct stat stat(const String & path) const override { return disk->stat(path); }
+
     std::vector<std::string> listDirectory(const std::string & path) const override;
 
     DirectoryIteratorPtr iterateDirectory(const std::string & path) const override;
@@ -94,6 +100,10 @@ public:
 
     void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override;
 
+    bool supportsChmod() const override { return metadata_storage.supportsChmod(); }
+
+    void chmod(const String & path, mode_t mode) override;
+
     void setReadOnly(const std::string & path) override;
 
     void unlinkFile(const std::string & path) override;
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.cpp b/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.cpp
index 72da240cf8a..4a3f76cb2aa 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.cpp
@@ -36,6 +36,24 @@ void SetLastModifiedOperation::undo()
     disk.setLastModified(path, old_timestamp);
 }
 
+ChmodOperation::ChmodOperation(const std::string & path_, mode_t mode_, IDisk & disk_)
+    : path(path_)
+    , mode(mode_)
+    , disk(disk_)
+{
+}
+
+void ChmodOperation::execute(std::unique_lock<std::shared_mutex> &)
+{
+    old_mode = disk.stat(path).st_mode;
+    disk.chmod(path, mode);
+}
+
+void ChmodOperation::undo()
+{
+    disk.chmod(path, old_mode);
+}
+
 UnlinkFileOperation::UnlinkFileOperation(const std::string & path_, IDisk & disk_)
     : path(path_)
     , disk(disk_)
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h b/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h
index 5f8e772ebc7..0bce6141301 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDiskTransactionOperations.h
@@ -37,6 +37,21 @@ private:
     IDisk & disk;
 };
 
+struct ChmodOperation final : public IMetadataOperation
+{
+    ChmodOperation(const std::string & path_, mode_t mode_, IDisk & disk_);
+
+    void execute(std::unique_lock<std::shared_mutex> & metadata_lock) override;
+
+    void undo() override;
+
+private:
+    std::string path;
+    mode_t mode;
+    mode_t old_mode;
+    IDisk & disk;
+};
+
 
 struct UnlinkFileOperation final : public IMetadataOperation
 {
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index d36bf655c02..a18275ff5ff 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -24,8 +24,6 @@
 #include <aws/s3/model/UploadPartCopyRequest.h>
 #include <aws/s3/model/AbortMultipartUploadRequest.h>
 
-#include <Common/IFileCache.h>
-#include <Common/FileCacheFactory.h>
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
 #include <Common/MultiVersion.h>
@@ -115,23 +113,6 @@ bool S3ObjectStorage::exists(const StoredObject & object) const
     return true;
 }
 
-String S3ObjectStorage::getCacheBasePath() const
-{
-    if (!cache)
-        return "";
-
-    return cache->getBasePath();
-}
-
-void S3ObjectStorage::removeCacheIfExists(const std::string & path_key)
-{
-    if (!cache || path_key.empty())
-        return;
-
-    IFileCache::Key key = cache->hash(path_key);
-    cache->removeIfExists(key);
-}
-
 std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
     const StoredObjects & objects,
     const ReadSettings & read_settings,
@@ -144,12 +125,26 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
 
     auto settings_ptr = s3_settings.get();
 
-    auto s3_impl = std::make_unique<ReadBufferFromS3Gather>(
-        client.get(),
-        bucket,
-        version_id,
+    auto read_buffer_creator =
+        [this, settings_ptr, disk_read_settings]
+        (const std::string & path, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+    {
+        return std::make_shared<ReadBufferFromS3>(
+            client.get(),
+            bucket,
+            path,
+            version_id,
+            settings_ptr->s3_settings.max_single_read_retries,
+            disk_read_settings,
+            /* use_external_buffer */true,
+            /* offset */0,
+            read_until_position,
+            /* restricted_seek */true);
+    };
+
+    auto s3_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
+        std::move(read_buffer_creator),
         objects,
-        settings_ptr->s3_settings.max_single_read_retries,
         disk_read_settings);
 
     if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
@@ -193,10 +188,6 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
     if (mode != WriteMode::Rewrite)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "S3 doesn't support append to files");
 
-    bool cache_on_write = cache
-         && write_settings.enable_filesystem_cache_on_write_operations
-         && FileCacheFactory::instance().getSettings(getCacheBasePath()).cache_on_write_operations;
-
     auto settings_ptr = s3_settings.get();
     auto s3_buffer = std::make_unique<WriteBufferFromS3>(
         client.get(),
@@ -206,9 +197,7 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
         attributes,
         buf_size,
         threadPoolCallbackRunner(getThreadPoolWriter()),
-        disk_write_settings,
-        cache_on_write ? cache : nullptr);
-
+        disk_write_settings);
 
     return std::make_unique<WriteIndirectBufferFromRemoteFS>(
         std::move(s3_buffer), std::move(finalize_callback), object.absolute_path);
@@ -481,19 +470,6 @@ void S3ObjectStorage::copyObject( // NOLINT
     }
 }
 
-ReadSettings S3ObjectStorage::patchSettings(const ReadSettings & read_settings) const
-{
-    ReadSettings settings{read_settings};
-    if (cache)
-    {
-        if (IFileCache::isReadOnly())
-            settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
-
-        settings.remote_fs_cache = cache;
-    }
-    return IObjectStorage::patchSettings(settings);
-}
-
 void S3ObjectStorage::setNewSettings(std::unique_ptr<S3ObjectStorageSettings> && s3_settings_)
 {
     s3_settings.set(std::move(s3_settings_));
@@ -535,7 +511,7 @@ std::unique_ptr<IObjectStorage> S3ObjectStorage::cloneObjectStorage(
     return std::make_unique<S3ObjectStorage>(
         getClient(config, config_prefix, context),
         getSettings(config, config_prefix, context),
-        version_id, s3_capabilities, new_namespace, nullptr);
+        version_id, s3_capabilities, new_namespace);
 }
 
 }
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index 8f20671d841..63b254b719a 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -48,14 +48,12 @@ public:
         std::unique_ptr<S3ObjectStorageSettings> && s3_settings_,
         String version_id_,
         const S3Capabilities & s3_capabilities_,
-        String bucket_,
-        FileCachePtr cache_)
+        String bucket_)
         : bucket(bucket_)
         , client(std::move(client_))
         , s3_settings(std::move(s3_settings_))
         , s3_capabilities(s3_capabilities_)
         , version_id(std::move(version_id_))
-        , cache(cache_)
     {
     }
 
@@ -136,15 +134,9 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    bool supportsCache() const override { return true; }
-
-    void removeCacheIfExists(const std::string & path_key) override;
-
-    String getCacheBasePath() const override;
+    bool supportParallelWrite() const override { return true; }
 
 private:
-    ReadSettings patchSettings(const ReadSettings & read_settings) const;
-
     void setNewSettings(std::unique_ptr<S3ObjectStorageSettings> && s3_settings_);
 
     void setNewClient(std::unique_ptr<Aws::S3::S3Client> && client_);
@@ -177,8 +169,6 @@ private:
     S3Capabilities s3_capabilities;
 
     const String version_id;
-
-    FileCachePtr cache;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
index f946e9757c1..37d23d87c0f 100644
--- a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
+++ b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
@@ -9,14 +9,8 @@
 #if USE_AWS_S3
 
 #include <aws/core/client/DefaultRetryStrategy.h>
-
 #include <base/getFQDNOrHostName.h>
 
-#include <Common/FileCacheFactory.h>
-
-#include <IO/S3Common.h>
-
-#include <Disks/DiskCacheWrapper.h>
 #include <Disks/DiskRestartProxy.h>
 #include <Disks/DiskLocal.h>
 #include <Disks/ObjectStorages/DiskObjectStorage.h>
@@ -27,6 +21,7 @@
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
 #include <Disks/ObjectStorages/S3/diskSettings.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <IO/S3Common.h>
 
 #include <Storages/StorageS3Settings.h>
 
@@ -120,7 +115,8 @@ void registerDiskS3(DiskFactory & factory)
                       const Poco::Util::AbstractConfiguration & config,
                       const String & config_prefix,
                       ContextPtr context,
-                      const DisksMap & /*map*/) -> DiskPtr {
+                      const DisksMap & /*map*/) -> DiskPtr
+    {
         S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
 
         if (uri.key.empty())
@@ -132,14 +128,12 @@ void registerDiskS3(DiskFactory & factory)
         auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
 
         auto metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, uri.key);
-
-        FileCachePtr cache = getCachePtrForDisk(name, config, config_prefix, context);
         S3Capabilities s3_capabilities = getCapabilitiesFromConfig(config, config_prefix);
 
         auto s3_storage = std::make_unique<S3ObjectStorage>(
             getClient(config, config_prefix, context),
             getSettings(config, config_prefix, context),
-            uri.version_id, s3_capabilities, uri.bucket, cache);
+            uri.version_id, s3_capabilities, uri.bucket);
 
         bool skip_access_check = config.getBool(config_prefix + ".skip_access_check", false);
 
@@ -184,20 +178,6 @@ void registerDiskS3(DiskFactory & factory)
 
         std::shared_ptr<IDisk> disk_result = s3disk;
 
-#ifdef NDEBUG
-        bool use_cache = true;
-#else
-        /// Current S3 cache implementation lead to allocations in destructor of
-        /// read buffer.
-        bool use_cache = false;
-#endif
-
-        if (config.getBool(config_prefix + ".cache_enabled", use_cache))
-        {
-            String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
-            disk_result = wrapWithCache(disk_result, "s3-cache", cache_path, metadata_path);
-        }
-
         return std::make_shared<DiskRestartProxy>(disk_result);
     };
     factory.registerDiskType("s3", creator);
diff --git a/src/Disks/ObjectStorages/StoredObject.cpp b/src/Disks/ObjectStorages/StoredObject.cpp
index 1341f468bf2..9f7cc303e1b 100644
--- a/src/Disks/ObjectStorages/StoredObject.cpp
+++ b/src/Disks/ObjectStorages/StoredObject.cpp
@@ -27,12 +27,12 @@ std::string StoredObject::getPathKeyForCache() const
 }
 
 StoredObject StoredObject::create(
-    const IObjectStorage & object_storage, const std::string & object_path, size_t object_size, bool object_bypasses_cache)
+    const IObjectStorage & object_storage, const std::string & object_path, size_t object_size, bool exists, bool object_bypasses_cache)
 {
     if (object_bypasses_cache)
         return StoredObject(object_path, object_size, {});
 
-    auto path_key_for_cache_creator = [&object_storage](const std::string & path) -> String
+    PathKeyForCacheCreator path_key_for_cache_creator = [&object_storage](const std::string & path) -> std::string
     {
         try
         {
@@ -49,6 +49,11 @@ StoredObject StoredObject::create(
         }
     };
 
+    if (exists)
+    {
+        path_key_for_cache_creator = [path = path_key_for_cache_creator(object_path)](const std::string &) { return path; };
+    }
+
     return StoredObject(object_path, object_size, std::move(path_key_for_cache_creator));
 }
 
diff --git a/src/Disks/ObjectStorages/StoredObject.h b/src/Disks/ObjectStorages/StoredObject.h
index 0b8028b6ef6..acb8a5fd127 100644
--- a/src/Disks/ObjectStorages/StoredObject.h
+++ b/src/Disks/ObjectStorages/StoredObject.h
@@ -20,6 +20,7 @@ struct StoredObject
         const IObjectStorage & object_storage,
         const std::string & object_path,
         size_t object_size = 0,
+        bool exists = false,
         bool object_bypasses_cache = false);
 
     /// Optional hint for cache. Use delayed initialization
@@ -33,4 +34,6 @@ struct StoredObject
         PathKeyForCacheCreator && path_key_for_cache_creator_ = {});
 };
 
+using StoredObjects = std::vector<StoredObject>;
+
 }
diff --git a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
new file mode 100644
index 00000000000..23edb8ccae8
--- /dev/null
+++ b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
@@ -0,0 +1,276 @@
+#include "MetadataStorageFromStaticFilesWebServer.h"
+#include <Disks/IDisk.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int NETWORK_ERROR;
+}
+
+class DiskWebServerDirectoryIterator final : public IDirectoryIterator
+{
+public:
+    explicit DiskWebServerDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
+        : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin()) {}
+
+    void next() override { ++iter; }
+
+    bool isValid() const override { return iter != dir_file_paths.end(); }
+
+    String path() const override { return iter->string(); }
+
+    String name() const override { return iter->filename(); }
+
+private:
+    std::vector<fs::path> dir_file_paths;
+    std::vector<fs::path>::iterator iter;
+};
+
+
+MetadataStorageFromStaticFilesWebServer::MetadataStorageFromStaticFilesWebServer(
+    const WebObjectStorage & object_storage_)
+    : object_storage(object_storage_)
+{
+}
+
+MetadataTransactionPtr MetadataStorageFromStaticFilesWebServer::createTransaction() const
+{
+    return std::make_shared<MetadataStorageFromStaticFilesWebServerTransaction>(*this);
+}
+
+const std::string & MetadataStorageFromStaticFilesWebServer::getPath() const
+{
+    return root_path;
+}
+
+bool MetadataStorageFromStaticFilesWebServer::exists(const std::string & path) const
+{
+    return object_storage.files.contains(path);
+}
+
+void MetadataStorageFromStaticFilesWebServer::assertExists(const std::string & path) const
+{
+    initializeIfNeeded(path);
+
+    if (!exists(path))
+#ifdef NDEBUG
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "There is no path {}", path);
+#else
+    {
+        std::string all_files;
+        for (const auto & [file, _] : object_storage.files)
+        {
+            if (!all_files.empty())
+                all_files += ", ";
+            all_files += file;
+        }
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "There is no path {} (available files: {})", path, all_files);
+    }
+#endif
+}
+
+bool MetadataStorageFromStaticFilesWebServer::isFile(const std::string & path) const
+{
+    assertExists(path);
+    return object_storage.files.at(path).type == WebObjectStorage::FileType::File;
+}
+
+bool MetadataStorageFromStaticFilesWebServer::isDirectory(const std::string & path) const
+{
+    assertExists(path);
+    return object_storage.files.at(path).type == WebObjectStorage::FileType::Directory;
+}
+
+uint64_t MetadataStorageFromStaticFilesWebServer::getFileSize(const String & path) const
+{
+    assertExists(path);
+    return object_storage.files.at(path).size;
+}
+
+StoredObjects MetadataStorageFromStaticFilesWebServer::getStorageObjects(const std::string & path) const
+{
+    assertExists(path);
+    return {StoredObject::create(object_storage, path, object_storage.files.at(path).size, true)};
+}
+
+std::vector<std::string> MetadataStorageFromStaticFilesWebServer::listDirectory(const std::string & path) const
+{
+    std::vector<std::string> result;
+    for (const auto & [file_path, _] : object_storage.files)
+    {
+        if (file_path.starts_with(path))
+            result.push_back(file_path);
+    }
+    return result;
+}
+
+bool MetadataStorageFromStaticFilesWebServer::initializeIfNeeded(const std::string & path) const
+{
+    if (object_storage.files.find(path) == object_storage.files.end())
+    {
+        try
+        {
+            object_storage.initialize(fs::path(object_storage.url) / path);
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return false;
+        }
+    }
+
+    return true;
+}
+
+DirectoryIteratorPtr MetadataStorageFromStaticFilesWebServer::iterateDirectory(const std::string & path) const
+{
+    std::vector<fs::path> dir_file_paths;
+
+    if (!initializeIfNeeded(path))
+        return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+
+    assertExists(path);
+
+    for (const auto & [file_path, _] : object_storage.files)
+        if (parentPath(file_path) == path)
+            dir_file_paths.emplace_back(file_path);
+
+    LOG_TRACE(object_storage.log, "Iterate directory {} with {} files", path, dir_file_paths.size());
+    return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+}
+
+std::string MetadataStorageFromStaticFilesWebServer::readFileToString(const std::string &) const
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+Poco::Timestamp MetadataStorageFromStaticFilesWebServer::getLastModified(const std::string &) const
+{
+    return {};
+}
+
+time_t MetadataStorageFromStaticFilesWebServer::getLastChanged(const std::string &) const
+{
+    return {};
+}
+
+uint32_t MetadataStorageFromStaticFilesWebServer::getHardlinkCount(const std::string &) const
+{
+    return 1;
+}
+
+const IMetadataStorage & MetadataStorageFromStaticFilesWebServerTransaction::getStorageForNonTransactionalReads() const
+{
+    return metadata_storage;
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::writeStringToFile(const std::string &, const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::setLastModified(const std::string &, const Poco::Timestamp &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::unlinkFile(const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::removeRecursive(const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::removeDirectory(const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::moveFile(const std::string &, const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::moveDirectory(const std::string &, const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::replaceFile(const std::string &, const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::setReadOnly(const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::createHardLink(const std::string &, const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::addBlobToMetadata(const std::string &, const std::string &, uint64_t)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::unlinkMetadata(const std::string &)
+{
+    WebObjectStorage::throwNotAllowed();
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::createDirectory(const std::string &)
+{
+    /// Noop.
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::createDirectoryRecursive(const std::string &)
+{
+    /// Noop.
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::createEmptyMetadataFile(const std::string & /* path */)
+{
+    /// Noop.
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::createMetadataFile(
+    const std::string & /* path */, const std::string & /* blob_name */, uint64_t /* size_in_bytes */)
+{
+    /// Noop.
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::commit()
+{
+    /// Noop.
+}
+
+std::unordered_map<String, String> MetadataStorageFromStaticFilesWebServer::getSerializedMetadata(const std::vector<String> &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "getSerializedMetadata is not implemented for MetadataStorageFromStaticFilesWebServer");
+}
+
+void MetadataStorageFromStaticFilesWebServerTransaction::chmod(const String &, mode_t)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "chmod is not implemented for MetadataStorageFromStaticFilesWebServer");
+}
+
+}
diff --git a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h
new file mode 100644
index 00000000000..67b9a6f6bf4
--- /dev/null
+++ b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h
@@ -0,0 +1,119 @@
+#pragma once
+
+#include <Disks/ObjectStorages/IMetadataStorage.h>
+#include <Disks/ObjectStorages/MetadataFromDiskTransactionState.h>
+#include <Disks/ObjectStorages/Web/WebObjectStorage.h>
+#include <Disks/IDisk.h>
+
+
+namespace DB
+{
+
+class MetadataStorageFromStaticFilesWebServer final : public IMetadataStorage
+{
+private:
+    friend class MetadataStorageFromStaticFilesWebServerTransaction;
+
+    const WebObjectStorage & object_storage;
+    std::string root_path;
+
+    void assertExists(const std::string & path) const;
+
+    bool initializeIfNeeded(const std::string & path) const;
+
+public:
+    explicit MetadataStorageFromStaticFilesWebServer(const WebObjectStorage & object_storage_);
+
+    MetadataTransactionPtr createTransaction() const override;
+
+    const std::string & getPath() const override;
+
+    bool exists(const std::string & path) const override;
+
+    bool isFile(const std::string & path) const override;
+
+    bool isDirectory(const std::string & path) const override;
+
+    uint64_t getFileSize(const String & path) const override;
+
+    Poco::Timestamp getLastModified(const std::string & path) const override;
+
+    time_t getLastChanged(const std::string & path) const override;
+
+    std::vector<std::string> listDirectory(const std::string & path) const override;
+
+    DirectoryIteratorPtr iterateDirectory(const std::string & path) const override;
+
+    std::string readFileToString(const std::string & path) const override;
+
+    std::unordered_map<String, String> getSerializedMetadata(const std::vector<String> & file_paths) const override;
+
+    uint32_t getHardlinkCount(const std::string & path) const override;
+
+    StoredObjects getStorageObjects(const std::string & path) const override;
+
+    std::string getObjectStorageRootPath() const override { return ""; }
+
+    bool supportsChmod() const override { return false; }
+
+    bool supportsStat() const override { return false; }
+
+    struct stat stat(const String &) const override { return {}; }
+};
+
+class MetadataStorageFromStaticFilesWebServerTransaction final : public IMetadataTransaction
+{
+private:
+    DiskPtr disk;
+    const MetadataStorageFromStaticFilesWebServer & metadata_storage;
+
+public:
+    explicit MetadataStorageFromStaticFilesWebServerTransaction(
+        const MetadataStorageFromStaticFilesWebServer & metadata_storage_)
+        : metadata_storage(metadata_storage_)
+    {}
+
+    ~MetadataStorageFromStaticFilesWebServerTransaction() override = default;
+
+    const IMetadataStorage & getStorageForNonTransactionalReads() const override;
+
+    void commit() override;
+
+    void writeStringToFile(const std::string & path, const std::string & data) override;
+
+    void createEmptyMetadataFile(const std::string & path) override;
+
+    void createMetadataFile(const std::string & path, const std::string & blob_name, uint64_t size_in_bytes) override;
+
+    void addBlobToMetadata(const std::string & path, const std::string & blob_name, uint64_t size_in_bytes) override;
+
+    void setLastModified(const std::string & path, const Poco::Timestamp & timestamp) override;
+
+    void setReadOnly(const std::string & path) override;
+
+    void unlinkFile(const std::string & path) override;
+
+    void createDirectory(const std::string & path) override;
+
+    void createDirectoryRecursive(const std::string & path) override;
+
+    void removeDirectory(const std::string & path) override;
+
+    void removeRecursive(const std::string & path) override;
+
+    void createHardLink(const std::string & path_from, const std::string & path_to) override;
+
+    void moveFile(const std::string & path_from, const std::string & path_to) override;
+
+    void moveDirectory(const std::string & path_from, const std::string & path_to) override;
+
+    void replaceFile(const std::string & path_from, const std::string & path_to) override;
+
+    void unlinkMetadata(const std::string & path) override;
+
+    bool supportsChmod() const override { return false; }
+
+    void chmod(const String &, mode_t) override;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
new file mode 100644
index 00000000000..3c7ce47340d
--- /dev/null
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
@@ -0,0 +1,274 @@
+#include <Disks/ObjectStorages/Web/WebObjectStorage.h>
+
+#include <Common/logger_useful.h>
+#include <Common/escapeForFileName.h>
+
+#include <IO/ConnectionTimeoutsContext.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/SeekAvoidingReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/ReadBufferFromWebServer.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+
+#include <Storages/MergeTree/MergeTreeData.h>
+
+#include <Poco/Exception.h>
+#include <filesystem>
+
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int NETWORK_ERROR;
+}
+
+void WebObjectStorage::initialize(const String & uri_path) const
+{
+    std::vector<String> directories_to_load;
+    LOG_TRACE(log, "Loading metadata for directory: {}", uri_path);
+
+    try
+    {
+        Poco::Net::HTTPBasicCredentials credentials{};
+        ReadWriteBufferFromHTTP metadata_buf(
+            Poco::URI(fs::path(uri_path) / ".index"),
+            Poco::Net::HTTPRequest::HTTP_GET,
+            ReadWriteBufferFromHTTP::OutStreamCallback(),
+            ConnectionTimeouts::getHTTPTimeouts(getContext()),
+            credentials);
+
+        String file_name;
+        FileData file_data{};
+
+        String dir_name = fs::path(uri_path.substr(url.size())) / "";
+        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
+
+        while (!metadata_buf.eof())
+        {
+            readText(file_name, metadata_buf);
+            assertChar('\t', metadata_buf);
+
+            bool is_directory;
+            readBoolText(is_directory, metadata_buf);
+            if (!is_directory)
+            {
+                assertChar('\t', metadata_buf);
+                readIntText(file_data.size, metadata_buf);
+            }
+            assertChar('\n', metadata_buf);
+
+            file_data.type = is_directory ? FileType::Directory : FileType::File;
+            String file_path = fs::path(uri_path) / file_name;
+            if (file_data.type == FileType::Directory)
+            {
+                directories_to_load.push_back(file_path);
+            }
+
+            file_path = file_path.substr(url.size());
+            files.emplace(std::make_pair(file_path, file_data));
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
+        }
+
+        files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
+    }
+    catch (Exception & e)
+    {
+        e.addMessage("while loading disk metadata");
+        throw;
+    }
+
+    for (const auto & directory_path : directories_to_load)
+        initialize(directory_path);
+}
+
+
+WebObjectStorage::WebObjectStorage(
+    const String & url_,
+    ContextPtr context_)
+    : WithContext(context_->getBufferContext())
+    , url(url_)
+    , log(&Poco::Logger::get("WebObjectStorage"))
+{
+}
+
+bool WebObjectStorage::exists(const StoredObject & object) const
+{
+    const auto & path = object.absolute_path;
+
+    LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
+
+    if (files.find(path) != files.end())
+        return true;
+
+    if (path.ends_with(MergeTreeData::FORMAT_VERSION_FILE_NAME) && files.find(fs::path(path).parent_path() / "") == files.end())
+    {
+        try
+        {
+            initialize(fs::path(url) / fs::path(path).parent_path());
+            return files.find(path) != files.end();
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return false;
+        }
+    }
+
+    return false;
+}
+
+std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObjects( /// NOLINT
+    const StoredObjects & objects,
+    const ReadSettings & read_settings,
+    std::optional<size_t> read_hint,
+    std::optional<size_t> file_size) const
+{
+    if (objects.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "WebObjectStorage support read only from single object");
+
+    return readObject(objects[0], read_settings, read_hint, file_size);
+
+}
+
+std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
+    const StoredObject & object,
+    const ReadSettings & read_settings,
+    std::optional<size_t>,
+    std::optional<size_t>) const
+{
+    const auto & path = object.absolute_path;
+    LOG_TRACE(log, "Read from path: {}", path);
+
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    auto fs_path = fs::path(url) / path;
+    auto remote_path = fs_path.parent_path() / (escapeForFileName(fs_path.stem()) + fs_path.extension().string());
+    remote_path = remote_path.string().substr(url.size());
+
+    StoredObjects objects;
+    objects.emplace_back(remote_path, iter->second.size);
+
+    auto read_buffer_creator =
+         [this, read_settings]
+         (const std::string & path_, size_t read_until_position) -> std::shared_ptr<ReadBufferFromFileBase>
+     {
+         return std::make_shared<ReadBufferFromWebServer>(
+             fs::path(url) / path_,
+             getContext(),
+             read_settings,
+             /* use_external_buffer */true,
+             read_until_position);
+     };
+
+    auto web_impl = std::make_unique<ReadBufferFromRemoteFSGather>(std::move(read_buffer_creator), objects, read_settings);
+
+    if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
+    {
+        auto reader = IObjectStorage::getThreadPoolReader();
+        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(web_impl), min_bytes_for_seek);
+    }
+    else
+    {
+        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(web_impl));
+        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), min_bytes_for_seek);
+    }
+}
+
+void WebObjectStorage::listPrefix(const std::string & path, RelativePathsWithSize & children) const
+{
+    for (const auto & [file_path, file_info] : files)
+    {
+        if (file_info.type == FileType::File && file_path.starts_with(path))
+        {
+            children.emplace_back(file_path, file_info.size);
+        }
+    }
+}
+
+void WebObjectStorage::throwNotAllowed()
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Only read-only operations are supported");
+}
+
+std::unique_ptr<WriteBufferFromFileBase> WebObjectStorage::writeObject( /// NOLINT
+    const StoredObject & /* object */,
+    WriteMode /* mode */,
+    std::optional<ObjectAttributes> /* attributes */,
+    FinalizeCallback && /* finalize_callback */,
+    size_t /* buf_size */,
+    const WriteSettings & /* write_settings */)
+{
+    throwNotAllowed();
+}
+
+void WebObjectStorage::removeObject(const StoredObject &)
+{
+    throwNotAllowed();
+}
+
+void WebObjectStorage::removeObjects(const StoredObjects &)
+{
+    throwNotAllowed();
+}
+
+void WebObjectStorage::removeObjectIfExists(const StoredObject &)
+{
+    throwNotAllowed();
+}
+
+void WebObjectStorage::removeObjectsIfExist(const StoredObjects &)
+{
+    throwNotAllowed();
+}
+
+void WebObjectStorage::copyObject(const StoredObject &, const StoredObject &, std::optional<ObjectAttributes>) // NOLINT
+{
+    throwNotAllowed();
+}
+
+void WebObjectStorage::shutdown()
+{
+}
+
+void WebObjectStorage::startup()
+{
+}
+
+void WebObjectStorage::applyNewSettings(
+    const Poco::Util::AbstractConfiguration & /* config */, const std::string & /* config_prefix */, ContextPtr /* context */)
+{
+}
+
+ObjectMetadata WebObjectStorage::getObjectMetadata(const std::string & /* path */) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Metadata is not supported for {}", getName());
+}
+
+std::unique_ptr<IObjectStorage> WebObjectStorage::cloneObjectStorage(
+    const std::string & /* new_namespace */,
+    const Poco::Util::AbstractConfiguration & /* config */,
+    const std::string & /* config_prefix */, ContextPtr /* context */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "cloneObjectStorage() is not implemented for WebObjectStorage");
+}
+
+}
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.h b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
new file mode 100644
index 00000000000..fd9e9e9ce42
--- /dev/null
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
@@ -0,0 +1,118 @@
+#pragma once
+
+#include <Common/config.h>
+
+#include <Disks/ObjectStorages/IObjectStorage.h>
+
+namespace Poco
+{
+class Logger;
+}
+
+namespace DB
+{
+
+class WebObjectStorage : public IObjectStorage, WithContext
+{
+    friend class MetadataStorageFromStaticFilesWebServer;
+    friend class MetadataStorageFromStaticFilesWebServerTransaction;
+
+public:
+    WebObjectStorage(const String & url_, ContextPtr context_);
+
+    std::string getName() const override { return "WebObjectStorage"; }
+
+    bool exists(const StoredObject & object) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
+        const StoredObject & object,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    std::unique_ptr<ReadBufferFromFileBase> readObjects( /// NOLINT
+        const StoredObjects & objects,
+        const ReadSettings & read_settings = ReadSettings{},
+        std::optional<size_t> read_hint = {},
+        std::optional<size_t> file_size = {}) const override;
+
+    /// Open the file for write and return WriteBufferFromFileBase object.
+    std::unique_ptr<WriteBufferFromFileBase> writeObject( /// NOLINT
+        const StoredObject & object,
+        WriteMode mode,
+        std::optional<ObjectAttributes> attributes = {},
+        FinalizeCallback && finalize_callback = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        const WriteSettings & write_settings = {}) override;
+
+    void listPrefix(const std::string & path, RelativePathsWithSize & children) const override;
+
+    void removeObject(const StoredObject & object) override;
+
+    void removeObjects(const StoredObjects &  objects) override;
+
+    void removeObjectIfExists(const StoredObject & object) override;
+
+    void removeObjectsIfExist(const StoredObjects & objects) override;
+
+    ObjectMetadata getObjectMetadata(const std::string & path) const override;
+
+    void copyObject( /// NOLINT
+        const StoredObject & object_from,
+        const StoredObject & object_to,
+        std::optional<ObjectAttributes> object_to_attributes = {}) override;
+
+    void shutdown() override;
+
+    void startup() override;
+
+    void applyNewSettings(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ContextPtr context) override;
+
+    String getObjectsNamespace() const override { return ""; }
+
+    std::unique_ptr<IObjectStorage> cloneObjectStorage(
+        const std::string & new_namespace,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ContextPtr context) override;
+
+    bool supportsAppend() const override { return false; }
+
+    std::string generateBlobNameForPath(const std::string & path) override { return path; }
+
+    bool isRemote() const override { return true; }
+
+    bool isReadOnly() const override { return true; }
+
+protected:
+    void initialize(const String & uri_path) const;
+
+    [[noreturn]] static void throwNotAllowed();
+
+    enum class FileType
+    {
+        File,
+        Directory
+    };
+
+    struct FileData
+    {
+        FileType type{};
+        size_t size = 0;
+    };
+
+    using Files = std::unordered_map<String, FileData>; /// file path -> file data
+    mutable Files files;
+
+    String url;
+
+private:
+    Poco::Logger * log;
+
+    size_t min_bytes_for_seek;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/Web/registerDiskWebServer.cpp b/src/Disks/ObjectStorages/Web/registerDiskWebServer.cpp
new file mode 100644
index 00000000000..1051440e16c
--- /dev/null
+++ b/src/Disks/ObjectStorages/Web/registerDiskWebServer.cpp
@@ -0,0 +1,58 @@
+#include <Poco/Exception.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Disks/DiskFactory.h>
+#include <Disks/ObjectStorages/Web/WebObjectStorage.h>
+#include <Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Common/assert_cast.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+void registerDiskWebServer(DiskFactory & factory)
+{
+    auto creator = [](const String & disk_name,
+                      const Poco::Util::AbstractConfiguration & config,
+                      const String & config_prefix,
+                      ContextPtr context,
+                      const DisksMap & /*map*/) -> DiskPtr
+    {
+        String uri{config.getString(config_prefix + ".endpoint")};
+
+        if (!uri.ends_with('/'))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
+        try
+        {
+            Poco::URI poco_uri(uri);
+        }
+        catch (const Poco::Exception & e)
+        {
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
+        }
+
+        auto object_storage = std::make_shared<WebObjectStorage>(uri, context);
+        auto metadata_storage = std::make_shared<MetadataStorageFromStaticFilesWebServer>(assert_cast<const WebObjectStorage &>(*object_storage));
+        std::string root_path;
+
+        return std::make_shared<DiskObjectStorage>(
+            disk_name,
+            root_path,
+            "DiskWebServer",
+            metadata_storage,
+            object_storage,
+            DiskType::WebServer,
+            /* send_metadata */false,
+            /* threadpool_size */16);
+    };
+
+    factory.registerDiskType("web", creator);
+}
+
+}
diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp
index 88c3fdde1e0..b43efbba78e 100644
--- a/src/Disks/registerDisks.cpp
+++ b/src/Disks/registerDisks.cpp
@@ -28,6 +28,7 @@ void registerDiskHDFS(DiskFactory & factory);
 
 void registerDiskWebServer(DiskFactory & factory);
 
+void registerDiskCache(DiskFactory & factory);
 
 void registerDisks()
 {
@@ -53,6 +54,8 @@ void registerDisks()
 #endif
 
     registerDiskWebServer(factory);
+
+    registerDiskCache(factory);
 }
 
 }
diff --git a/src/Formats/EscapingRuleUtils.cpp b/src/Formats/EscapingRuleUtils.cpp
index 5aab8909a0c..a5c4dd1dd47 100644
--- a/src/Formats/EscapingRuleUtils.cpp
+++ b/src/Formats/EscapingRuleUtils.cpp
@@ -9,8 +9,12 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/getLeastSupertype.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeObject.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <DataTypes/transformTypesRecursively.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
@@ -255,7 +259,220 @@ String readStringByEscapingRule(ReadBuffer & buf, FormatSettings::EscapingRule e
     return readByEscapingRule<true>(buf, escaping_rule, format_settings);
 }
 
-static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
+void transformInferredTypesIfNeededImpl(DataTypes & types, const FormatSettings & settings, bool is_json, const std::unordered_set<const IDataType *> * numbers_parsed_from_json_strings = nullptr)
+{
+    /// Do nothing if we didn't try to infer something special.
+    if (!settings.try_infer_integers && !settings.try_infer_dates && !settings.try_infer_datetimes && !is_json)
+        return;
+
+    auto transform_simple_types = [&](DataTypes & data_types)
+    {
+        /// If we have floats and integers convert them all to float.
+        if (settings.try_infer_integers)
+        {
+            bool have_floats = false;
+            bool have_integers = false;
+            for (const auto & type : data_types)
+            {
+                have_floats |= isFloat(type);
+                have_integers |= isInteger(type) && !isBool(type);
+            }
+
+            if (have_floats && have_integers)
+            {
+                for (auto & type : data_types)
+                {
+                    if (isInteger(type))
+                        type = std::make_shared<DataTypeFloat64>();
+                }
+            }
+        }
+
+        /// If we have only dates and datetimes, convert dates to datetime.
+        /// If we have date/datetimes and smth else, convert them to string, because
+        /// There is a special case when we inferred both Date/DateTime and Int64 from Strings,
+        /// for example: "arr: ["2020-01-01", "2000"]" -> Tuple(Date, Int64),
+        /// so if we have Date/DateTime and smth else (not only String) we should
+        /// convert Date/DateTime back to String, so then we will be able to
+        /// convert Int64 back to String as well.
+        if (settings.try_infer_dates || settings.try_infer_datetimes)
+        {
+            bool have_dates = false;
+            bool have_datetimes = false;
+            bool all_dates_or_datetimes = true;
+
+            for (const auto & type : data_types)
+            {
+                have_dates |= isDate(type);
+                have_datetimes |= isDateTime64(type);
+                all_dates_or_datetimes &= isDate(type) || isDateTime64(type);
+            }
+
+            if (!all_dates_or_datetimes && (have_dates || have_datetimes))
+            {
+                for (auto & type : data_types)
+                {
+                    if (isDate(type) || isDateTime64(type))
+                        type = std::make_shared<DataTypeString>();
+                }
+            }
+            else if (have_dates && have_datetimes)
+            {
+                for (auto & type : data_types)
+                {
+                    if (isDate(type))
+                        type = std::make_shared<DataTypeDateTime64>(9);
+                }
+            }
+        }
+
+        if (!is_json)
+            return;
+
+        /// Check settings specific for JSON formats.
+
+        /// If we have numbers and strings, convert numbers to strings.
+        if (settings.json.try_infer_numbers_from_strings)
+        {
+            bool have_strings = false;
+            bool have_numbers = false;
+            for (const auto & type : data_types)
+            {
+                have_strings |= isString(type);
+                have_numbers |= isNumber(type);
+            }
+
+            if (have_strings && have_numbers)
+            {
+                for (auto & type : data_types)
+                {
+                    if (isNumber(type) && (!numbers_parsed_from_json_strings || numbers_parsed_from_json_strings->contains(type.get())))
+                        type = std::make_shared<DataTypeString>();
+                }
+            }
+        }
+
+        if (settings.json.read_bools_as_numbers)
+        {
+            /// Note that have_floats and have_integers both cannot be
+            /// equal to true as in one of previous checks we convert
+            /// integers to floats if we have both.
+            bool have_floats = false;
+            bool have_integers = false;
+            bool have_bools = false;
+            for (const auto & type : data_types)
+            {
+                have_floats |= isFloat(type);
+                have_integers |= isInteger(type) && !isBool(type);
+                have_bools |= isBool(type);
+            }
+
+            if (have_bools && (have_integers || have_floats))
+            {
+                for (auto & type : data_types)
+                {
+                    if (isBool(type))
+                    {
+                        if (have_integers)
+                            type = std::make_shared<DataTypeInt64>();
+                        else
+                            type = std::make_shared<DataTypeFloat64>();
+                    }
+                }
+            }
+        }
+    };
+
+    auto transform_complex_types = [&](DataTypes & data_types)
+    {
+        if (!is_json)
+            return;
+
+        bool have_maps = false;
+        bool have_objects = false;
+        bool are_maps_equal = true;
+        DataTypePtr first_map_type;
+        for (const auto & type : data_types)
+        {
+            if (isMap(type))
+            {
+                if (!have_maps)
+                {
+                    first_map_type = type;
+                    have_maps = true;
+                }
+                else
+                {
+                    are_maps_equal &= type->equals(*first_map_type);
+                }
+            }
+            else if (isObject(type))
+            {
+                have_objects = true;
+            }
+        }
+
+        if (have_maps && (have_objects || !are_maps_equal))
+        {
+            for (auto & type : data_types)
+            {
+                if (isMap(type))
+                    type = std::make_shared<DataTypeObject>("json", true);
+            }
+        }
+    };
+
+    transformTypesRecursively(types, transform_simple_types, transform_complex_types);
+}
+
+void transformInferredTypesIfNeeded(DataTypes & types, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule)
+{
+    transformInferredTypesIfNeededImpl(types, settings, escaping_rule == FormatSettings::EscapingRule::JSON);
+}
+
+void transformInferredTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule)
+{
+    DataTypes types = {first, second};
+    transformInferredTypesIfNeeded(types, settings, escaping_rule);
+    first = std::move(types[0]);
+    second = std::move(types[1]);
+}
+
+void transformInferredJSONTypesIfNeeded(DataTypes & types, const FormatSettings & settings, const std::unordered_set<const IDataType *> * numbers_parsed_from_json_strings)
+{
+    transformInferredTypesIfNeededImpl(types, settings, true, numbers_parsed_from_json_strings);
+}
+
+void transformInferredJSONTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings)
+{
+    DataTypes types = {first, second};
+    transformInferredJSONTypesIfNeeded(types, settings);
+    first = std::move(types[0]);
+    second = std::move(types[1]);
+}
+
+DataTypePtr tryInferDateOrDateTime(const std::string_view & field, const FormatSettings & settings)
+{
+    if (settings.try_infer_dates)
+    {
+        ReadBufferFromString buf(field);
+        DayNum tmp;
+        if (tryReadDateText(tmp, buf) && buf.eof())
+            return makeNullable(std::make_shared<DataTypeDate>());
+    }
+
+    if (settings.try_infer_datetimes)
+    {
+        ReadBufferFromString buf(field);
+        DateTime64 tmp;
+        if (tryReadDateTime64Text(tmp, 9, buf) && buf.eof())
+            return makeNullable(std::make_shared<DataTypeDateTime64>(9));
+    }
+
+    return nullptr;
+}
+
+static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBufferFromString & buf, const FormatSettings & settings)
 {
     if (buf.eof())
         return nullptr;
@@ -279,7 +496,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             else
                 first = false;
 
-            auto nested_type = determineDataTypeForSingleFieldImpl(buf);
+            auto nested_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!nested_type)
                 return nullptr;
 
@@ -294,6 +511,8 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
         if (nested_types.empty())
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeNothing>());
 
+        transformInferredTypesIfNeeded(nested_types, settings);
+
         auto least_supertype = tryGetLeastSupertype(nested_types);
         if (!least_supertype)
             return nullptr;
@@ -320,7 +539,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             else
                 first = false;
 
-            auto nested_type = determineDataTypeForSingleFieldImpl(buf);
+            auto nested_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!nested_type)
                 return nullptr;
 
@@ -355,7 +574,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             else
                 first = false;
 
-            auto key_type = determineDataTypeForSingleFieldImpl(buf);
+            auto key_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!key_type)
                 return nullptr;
 
@@ -366,7 +585,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
                 return nullptr;
             skipWhitespaceIfAny(buf);
 
-            auto value_type = determineDataTypeForSingleFieldImpl(buf);
+            auto value_type = determineDataTypeForSingleFieldImpl(buf, settings);
             if (!value_type)
                 return nullptr;
 
@@ -382,6 +601,9 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
         if (key_types.empty())
             return std::make_shared<DataTypeMap>(std::make_shared<DataTypeNothing>(), std::make_shared<DataTypeNothing>());
 
+        transformInferredTypesIfNeeded(key_types, settings);
+        transformInferredTypesIfNeeded(value_types, settings);
+
         auto key_least_supertype = tryGetLeastSupertype(key_types);
 
         auto value_least_supertype = tryGetLeastSupertype(value_types);
@@ -398,9 +620,11 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
     if (*buf.position() == '\'')
     {
         ++buf.position();
+        String field;
         while (!buf.eof())
         {
             char * next_pos = find_first_symbols<'\\', '\''>(buf.position(), buf.buffer().end());
+            field.append(buf.position(), next_pos);
             buf.position() = next_pos;
 
             if (!buf.hasPendingData())
@@ -409,6 +633,7 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             if (*buf.position() == '\'')
                 break;
 
+            field.push_back(*buf.position());
             if (*buf.position() == '\\')
                 ++buf.position();
         }
@@ -417,6 +642,9 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
             return nullptr;
 
         ++buf.position();
+        if (auto type = tryInferDateOrDateTime(field, settings))
+            return type;
+
         return std::make_shared<DataTypeString>();
     }
 
@@ -430,15 +658,29 @@ static DataTypePtr determineDataTypeForSingleFieldImpl(ReadBuffer & buf)
 
     /// Number
     Float64 tmp;
+    auto * pos_before_float = buf.position();
     if (tryReadFloatText(tmp, buf))
+    {
+        if (settings.try_infer_integers)
+        {
+            auto * float_end_pos = buf.position();
+            buf.position() = pos_before_float;
+            Int64 tmp_int;
+            if (tryReadIntText(tmp_int, buf) && buf.position() == float_end_pos)
+                return std::make_shared<DataTypeInt64>();
+
+            buf.position() = float_end_pos;
+        }
+
         return std::make_shared<DataTypeFloat64>();
+    }
 
     return nullptr;
 }
 
-static DataTypePtr determineDataTypeForSingleField(ReadBuffer & buf)
+static DataTypePtr determineDataTypeForSingleField(ReadBufferFromString & buf, const FormatSettings & settings)
 {
-    return makeNullableRecursivelyAndCheckForNothing(determineDataTypeForSingleFieldImpl(buf));
+    return makeNullableRecursivelyAndCheckForNothing(determineDataTypeForSingleFieldImpl(buf, settings));
 }
 
 DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSettings & format_settings, FormatSettings::EscapingRule escaping_rule)
@@ -448,11 +690,11 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
         case FormatSettings::EscapingRule::Quoted:
         {
             ReadBufferFromString buf(field);
-            auto type = determineDataTypeForSingleField(buf);
+            auto type = determineDataTypeForSingleField(buf, format_settings);
             return buf.eof() ? type : nullptr;
         }
         case FormatSettings::EscapingRule::JSON:
-            return JSONUtils::getDataTypeFromField(field);
+            return JSONUtils::getDataTypeFromField(field, format_settings);
         case FormatSettings::EscapingRule::CSV:
         {
             if (!format_settings.csv.input_format_use_best_effort_in_schema_inference)
@@ -466,9 +708,13 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
 
             if (field.size() > 1 && ((field.front() == '\'' && field.back() == '\'') || (field.front() == '"' && field.back() == '"')))
             {
-                ReadBufferFromString buf(std::string_view(field.data() + 1, field.size() - 2));
+                auto data = std::string_view(field.data() + 1, field.size() - 2);
+                if (auto date_type = tryInferDateOrDateTime(data, format_settings))
+                    return date_type;
+
+                ReadBufferFromString buf(data);
                 /// Try to determine the type of value inside quotes
-                auto type = determineDataTypeForSingleField(buf);
+                auto type = determineDataTypeForSingleField(buf, format_settings);
 
                 if (!type)
                     return nullptr;
@@ -481,6 +727,14 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
             }
 
             /// Case when CSV value is not in quotes. Check if it's a number, and if not, determine it's as a string.
+            if (format_settings.try_infer_integers)
+            {
+                ReadBufferFromString buf(field);
+                Int64 tmp_int;
+                if (tryReadIntText(tmp_int, buf) && buf.eof())
+                    return makeNullable(std::make_shared<DataTypeInt64>());
+            }
+
             ReadBufferFromString buf(field);
             Float64 tmp;
             if (tryReadFloatText(tmp, buf) && buf.eof())
@@ -500,8 +754,11 @@ DataTypePtr determineDataTypeByEscapingRule(const String & field, const FormatSe
             if (field == format_settings.bool_false_representation || field == format_settings.bool_true_representation)
                 return DataTypeFactory::instance().get("Nullable(Bool)");
 
+            if (auto date_type = tryInferDateOrDateTime(field, format_settings))
+                return date_type;
+
             ReadBufferFromString buf(field);
-            auto type = determineDataTypeForSingleField(buf);
+            auto type = determineDataTypeForSingleField(buf, format_settings);
             if (!buf.eof())
                 return makeNullable(std::make_shared<DataTypeString>());
 
diff --git a/src/Formats/EscapingRuleUtils.h b/src/Formats/EscapingRuleUtils.h
index 1ce04a8d1b7..ad4ce65a430 100644
--- a/src/Formats/EscapingRuleUtils.h
+++ b/src/Formats/EscapingRuleUtils.h
@@ -60,4 +60,21 @@ DataTypes determineDataTypesByEscapingRule(const std::vector<String> & fields, c
 DataTypePtr getDefaultDataTypeForEscapingRule(FormatSettings::EscapingRule escaping_rule);
 DataTypes getDefaultDataTypeForEscapingRules(const std::vector<FormatSettings::EscapingRule> & escaping_rules);
 
+/// Try to infer Date or Datetime from string if corresponding settings are enabled.
+DataTypePtr tryInferDateOrDateTime(const std::string_view & field, const FormatSettings & settings);
+
+/// Check if we need to transform types inferred from data and transform it if necessary.
+/// It's used when we try to infer some not ordinary types from another types.
+/// For example dates from strings, we should check if dates were inferred from all strings
+/// in the same way and if not, transform inferred dates back to strings.
+/// For example, if we have array of strings and we tried to infer dates from them,
+/// to make the result type Array(Date) we should ensure that all strings were
+/// successfully parsed as dated and if not, convert all dates back to strings and make result type Array(String).
+void transformInferredTypesIfNeeded(DataTypes & types, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule = FormatSettings::EscapingRule::Escaped);
+void transformInferredTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings, FormatSettings::EscapingRule escaping_rule = FormatSettings::EscapingRule::Escaped);
+
+/// Same as transformInferredTypesIfNeeded but takes into account settings that are special for JSON formats.
+void transformInferredJSONTypesIfNeeded(DataTypes & types, const FormatSettings & settings, const std::unordered_set<const IDataType *> * numbers_parsed_from_json_strings = nullptr);
+void transformInferredJSONTypesIfNeeded(DataTypePtr & first, DataTypePtr & second, const FormatSettings & settings);
+
 }
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 50d2ee12082..149ce1711ca 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -94,6 +94,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.json.quote_64bit_integers = settings.output_format_json_quote_64bit_integers;
     format_settings.json.quote_denormals = settings.output_format_json_quote_denormals;
     format_settings.json.read_bools_as_numbers = settings.input_format_json_read_bools_as_numbers;
+    format_settings.json.try_infer_numbers_from_strings = settings.input_format_json_try_infer_numbers_from_strings;
     format_settings.null_as_default = settings.input_format_null_as_default;
     format_settings.decimal_trailing_zeros = settings.output_format_decimal_trailing_zeros;
     format_settings.parquet.row_group_size = settings.output_format_parquet_row_group_size;
@@ -158,6 +159,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.msgpack.output_uuid_representation = settings.output_format_msgpack_uuid_representation;
     format_settings.max_rows_to_read_for_schema_inference = settings.input_format_max_rows_to_read_for_schema_inference;
     format_settings.column_names_for_schema_inference = settings.column_names_for_schema_inference;
+    format_settings.schema_inference_hints = settings.schema_inference_hints;
     format_settings.mysql_dump.table_name = settings.input_format_mysql_dump_table_name;
     format_settings.mysql_dump.map_column_names = settings.input_format_mysql_dump_map_column_names;
     format_settings.sql_insert.max_batch_size = settings.output_format_sql_insert_max_batch_size;
@@ -165,6 +167,9 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.sql_insert.table_name = settings.output_format_sql_insert_table_name;
     format_settings.sql_insert.use_replace = settings.output_format_sql_insert_use_replace;
     format_settings.sql_insert.quote_names = settings.output_format_sql_insert_quote_names;
+    format_settings.try_infer_integers = settings.input_format_try_infer_integers;
+    format_settings.try_infer_dates = settings.input_format_try_infer_dates;
+    format_settings.try_infer_datetimes = settings.input_format_try_infer_datetimes;
 
     /// Validate avro_schema_registry_url with RemoteHostFilter when non-empty and in Server context
     if (format_settings.schema.is_server)
@@ -398,7 +403,10 @@ SchemaReaderPtr FormatFactory::getSchemaReader(
         throw Exception("FormatFactory: Format " + name + " doesn't support schema inference.", ErrorCodes::LOGICAL_ERROR);
 
     auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
-    return schema_reader_creator(buf, format_settings);
+    auto schema_reader = schema_reader_creator(buf, format_settings);
+    if (schema_reader->needContext())
+        schema_reader->setContext(context);
+    return schema_reader;
 }
 
 ExternalSchemaReaderPtr FormatFactory::getExternalSchemaReader(
@@ -565,6 +573,25 @@ bool FormatFactory::checkIfFormatSupportsSubsetOfColumns(const String & name) co
     return target.supports_subset_of_columns;
 }
 
+void FormatFactory::registerAdditionalInfoForSchemaCacheGetter(
+    const String & name, AdditionalInfoForSchemaCacheGetter additional_info_for_schema_cache_getter)
+{
+    auto & target = dict[name].additional_info_for_schema_cache_getter;
+    if (target)
+        throw Exception("FormatFactory: additional info for schema cache getter " + name + " is already registered", ErrorCodes::LOGICAL_ERROR);
+    target = std::move(additional_info_for_schema_cache_getter);
+}
+
+String FormatFactory::getAdditionalInfoForSchemaCache(const String & name, ContextPtr context, const std::optional<FormatSettings> & format_settings_)
+{
+    const auto & additional_info_getter = getCreators(name).additional_info_for_schema_cache_getter;
+    if (!additional_info_getter)
+        return "";
+
+    auto format_settings = format_settings_ ? *format_settings_ : getFormatSettings(context);
+    return additional_info_getter(format_settings);
+}
+
 bool FormatFactory::isInputFormat(const String & name) const
 {
     auto it = dict.find(name);
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 260f8197d5e..44b49fd6dc5 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -100,6 +100,13 @@ private:
     using SchemaReaderCreator = std::function<SchemaReaderPtr(ReadBuffer & in, const FormatSettings & settings)>;
     using ExternalSchemaReaderCreator = std::function<ExternalSchemaReaderPtr(const FormatSettings & settings)>;
 
+    /// Some formats can extract different schemas from the same source depending on
+    /// some settings. To process this case in schema cache we should add some additional
+    /// information to a cache key. This getter should return some string with information
+    /// about such settings. For example, for Protobuf format it's the path to the schema
+    /// and the name of the message.
+    using AdditionalInfoForSchemaCacheGetter = std::function<String(const FormatSettings & settings)>;
+
     struct Creators
     {
         InputCreator input_creator;
@@ -111,6 +118,7 @@ private:
         bool supports_subset_of_columns{false};
         NonTrivialPrefixAndSuffixChecker non_trivial_prefix_and_suffix_checker;
         AppendSupportChecker append_support_checker;
+        AdditionalInfoForSchemaCacheGetter additional_info_for_schema_cache_getter;
     };
 
     using FormatsDictionary = std::unordered_map<String, Creators>;
@@ -202,6 +210,9 @@ public:
     bool checkIfFormatHasExternalSchemaReader(const String & name) const;
     bool checkIfFormatHasAnySchemaReader(const String & name) const;
 
+    void registerAdditionalInfoForSchemaCacheGetter(const String & name, AdditionalInfoForSchemaCacheGetter additional_info_for_schema_cache_getter);
+    String getAdditionalInfoForSchemaCache(const String & name, ContextPtr context, const std::optional<FormatSettings> & format_settings_ = std::nullopt);
+
     const FormatsDictionary & getAllFormats() const
     {
         return dict;
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index b7c55d11beb..a2bb28d4aff 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -38,6 +38,11 @@ struct FormatSettings
     UInt64 max_rows_to_read_for_schema_inference = 100;
 
     String column_names_for_schema_inference;
+    String schema_inference_hints;
+
+    bool try_infer_integers = false;
+    bool try_infer_dates = false;
+    bool try_infer_datetimes = false;
 
     enum class DateTimeInputFormat
     {
@@ -142,6 +147,7 @@ struct FormatSettings
         bool named_tuples_as_objects = false;
         bool serialize_as_strings = false;
         bool read_bools_as_numbers = true;
+        bool try_infer_numbers_from_strings = false;
     } json;
 
     struct
diff --git a/src/Formats/JSONUtils.cpp b/src/Formats/JSONUtils.cpp
index 1ac58760516..895833abf4d 100644
--- a/src/Formats/JSONUtils.cpp
+++ b/src/Formats/JSONUtils.cpp
@@ -1,6 +1,7 @@
 #include <IO/ReadHelpers.h>
 #include <Formats/JSONUtils.h>
 #include <Formats/ReadSchemaUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferValidUTF8.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
@@ -121,7 +122,7 @@ namespace JSONUtils
     }
 
     template <class Element>
-    DataTypePtr getDataTypeFromFieldImpl(const Element & field)
+    DataTypePtr getDataTypeFromFieldImpl(const Element & field, const FormatSettings & settings, std::unordered_set<const IDataType *> & numbers_parsed_from_json_strings)
     {
         if (field.isNull())
             return nullptr;
@@ -129,11 +130,48 @@ namespace JSONUtils
         if (field.isBool())
             return DataTypeFactory::instance().get("Nullable(Bool)");
 
-        if (field.isInt64() || field.isUInt64() || field.isDouble())
+        if (field.isInt64() || field.isUInt64())
+        {
+            if (settings.try_infer_integers)
+                return makeNullable(std::make_shared<DataTypeInt64>());
+
+            return makeNullable(std::make_shared<DataTypeFloat64>());
+        }
+
+        if (field.isDouble())
             return makeNullable(std::make_shared<DataTypeFloat64>());
 
         if (field.isString())
+        {
+            if (auto date_type = tryInferDateOrDateTime(field.getString(), settings))
+                return date_type;
+
+            if (!settings.json.try_infer_numbers_from_strings)
+                return makeNullable(std::make_shared<DataTypeString>());
+
+            ReadBufferFromString buf(field.getString());
+
+            if (settings.try_infer_integers)
+            {
+                Int64 tmp_int;
+                if (tryReadIntText(tmp_int, buf) && buf.eof())
+                {
+                    auto type = std::make_shared<DataTypeInt64>();
+                    numbers_parsed_from_json_strings.insert(type.get());
+                    return makeNullable(type);
+                }
+            }
+
+            Float64 tmp;
+            if (tryReadFloatText(tmp, buf) && buf.eof())
+            {
+                auto type = std::make_shared<DataTypeFloat64>();
+                numbers_parsed_from_json_strings.insert(type.get());
+                return makeNullable(type);
+            }
+
             return makeNullable(std::make_shared<DataTypeString>());
+        }
 
         if (field.isArray())
         {
@@ -145,20 +183,32 @@ namespace JSONUtils
 
             DataTypes nested_data_types;
             /// If this array contains fields with different types we will treat it as Tuple.
-            bool is_tuple = false;
+            bool are_types_the_same = true;
             for (const auto element : array)
             {
-                auto type = getDataTypeFromFieldImpl(element);
+                auto type = getDataTypeFromFieldImpl(element, settings, numbers_parsed_from_json_strings);
                 if (!type)
                     return nullptr;
 
-                if (!nested_data_types.empty() && type->getName() != nested_data_types.back()->getName())
-                    is_tuple = true;
+                if (!nested_data_types.empty() && !type->equals(*nested_data_types.back()))
+                    are_types_the_same = false;
 
                 nested_data_types.push_back(std::move(type));
             }
 
-            if (is_tuple)
+            if (!are_types_the_same)
+            {
+                auto nested_types_copy = nested_data_types;
+                transformInferredJSONTypesIfNeeded(nested_types_copy, settings, &numbers_parsed_from_json_strings);
+                are_types_the_same = true;
+                for (size_t i = 1; i < nested_types_copy.size(); ++i)
+                    are_types_the_same &= nested_types_copy[i]->equals(*nested_types_copy[i - 1]);
+
+                if (are_types_the_same)
+                    nested_data_types = std::move(nested_types_copy);
+            }
+
+            if (!are_types_the_same)
                 return std::make_shared<DataTypeTuple>(nested_data_types);
 
             return std::make_shared<DataTypeArray>(nested_data_types.back());
@@ -167,38 +217,35 @@ namespace JSONUtils
         if (field.isObject())
         {
             auto object = field.getObject();
-            DataTypePtr value_type;
-            bool is_object = false;
+            DataTypes value_types;
+            bool have_object_value = false;
             for (const auto key_value_pair : object)
             {
-                auto type = getDataTypeFromFieldImpl(key_value_pair.second);
+                auto type = getDataTypeFromFieldImpl(key_value_pair.second, settings, numbers_parsed_from_json_strings);
                 if (!type)
                     continue;
 
                 if (isObject(type))
                 {
-                    is_object = true;
+                    have_object_value = true;
                     break;
                 }
 
-                if (!value_type)
-                {
-                    value_type = type;
-                }
-                else if (!value_type->equals(*type))
-                {
-                    is_object = true;
-                    break;
-                }
+                value_types.push_back(type);
             }
 
-            if (is_object)
+            if (value_types.empty())
+                return nullptr;
+
+            transformInferredJSONTypesIfNeeded(value_types, settings, &numbers_parsed_from_json_strings);
+            bool are_types_equal = true;
+            for (size_t i = 1; i < value_types.size(); ++i)
+                are_types_equal &= value_types[i]->equals(*value_types[0]);
+
+            if (have_object_value || !are_types_equal)
                 return std::make_shared<DataTypeObject>("json", true);
 
-            if (value_type)
-                return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), value_type);
-
-            return nullptr;
+            return std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), value_types[0]);
         }
 
         throw Exception{ErrorCodes::INCORRECT_DATA, "Unexpected JSON type"};
@@ -215,18 +262,19 @@ namespace JSONUtils
 #endif
     }
 
-    DataTypePtr getDataTypeFromField(const String & field)
+    DataTypePtr getDataTypeFromField(const String & field, const FormatSettings & settings)
     {
         auto [parser, element] = getJSONParserAndElement();
         bool parsed = parser.parse(field, element);
         if (!parsed)
             throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse JSON object here: {}", field);
 
-        return getDataTypeFromFieldImpl(element);
+        std::unordered_set<const IDataType *> numbers_parsed_from_json_strings;
+        return getDataTypeFromFieldImpl(element, settings, numbers_parsed_from_json_strings);
     }
 
     template <class Extractor, const char opening_bracket, const char closing_bracket>
-    static DataTypes determineColumnDataTypesFromJSONEachRowDataImpl(ReadBuffer & in, bool /*json_strings*/, Extractor & extractor)
+    static DataTypes determineColumnDataTypesFromJSONEachRowDataImpl(ReadBuffer & in, const FormatSettings & settings, bool /*json_strings*/, Extractor & extractor)
     {
         String line = readJSONEachRowLineIntoStringImpl<opening_bracket, closing_bracket>(in);
         auto [parser, element] = getJSONParserAndElement();
@@ -238,8 +286,9 @@ namespace JSONUtils
 
         DataTypes data_types;
         data_types.reserve(fields.size());
+        std::unordered_set<const IDataType *> numbers_parsed_from_json_strings;
         for (const auto & field : fields)
-            data_types.push_back(getDataTypeFromFieldImpl(field));
+            data_types.push_back(getDataTypeFromFieldImpl(field, settings, numbers_parsed_from_json_strings));
 
         /// TODO: For JSONStringsEachRow/JSONCompactStringsEach all types will be strings.
         ///       Should we try to parse data inside strings somehow in this case?
@@ -284,11 +333,11 @@ namespace JSONUtils
         std::vector<String> column_names;
     };
 
-    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, bool json_strings)
+    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings)
     {
         JSONEachRowFieldsExtractor extractor;
         auto data_types
-            = determineColumnDataTypesFromJSONEachRowDataImpl<JSONEachRowFieldsExtractor, '{', '}'>(in, json_strings, extractor);
+            = determineColumnDataTypesFromJSONEachRowDataImpl<JSONEachRowFieldsExtractor, '{', '}'>(in, settings, json_strings, extractor);
         NamesAndTypesList result;
         for (size_t i = 0; i != extractor.column_names.size(); ++i)
             result.emplace_back(extractor.column_names[i], data_types[i]);
@@ -313,10 +362,10 @@ namespace JSONUtils
         }
     };
 
-    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, bool json_strings)
+    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings)
     {
         JSONCompactEachRowFieldsExtractor extractor;
-        return determineColumnDataTypesFromJSONEachRowDataImpl<JSONCompactEachRowFieldsExtractor, '[', ']'>(in, json_strings, extractor);
+        return determineColumnDataTypesFromJSONEachRowDataImpl<JSONCompactEachRowFieldsExtractor, '[', ']'>(in, settings, json_strings, extractor);
     }
 
 
@@ -529,7 +578,12 @@ namespace JSONUtils
             writeObjectStart(out, 2);
 
             writeTitle<true>("name", out, 3);
-            writeDoubleQuoted(fields[i].name, out);
+
+            /// The field names are pre-escaped to be put into JSON string literal.
+            writeChar('"', out);
+            writeString(fields[i].name, out);
+            writeChar('"', out);
+
             writeFieldDelimiter(out);
             writeTitle<true>("type", out, 3);
             writeJSONString(fields[i].type->getName(), out, settings);
diff --git a/src/Formats/JSONUtils.h b/src/Formats/JSONUtils.h
index f2aba3cbcb5..b4ab6a29c93 100644
--- a/src/Formats/JSONUtils.h
+++ b/src/Formats/JSONUtils.h
@@ -22,16 +22,16 @@ namespace JSONUtils
     /// Parse JSON from string and convert it's type to ClickHouse type. Make the result type always Nullable.
     /// JSON array with different nested types is treated as Tuple.
     /// If cannot convert (for example when field contains null), return nullptr.
-    DataTypePtr getDataTypeFromField(const String & field);
+    DataTypePtr getDataTypeFromField(const String & field, const FormatSettings & settings);
 
     /// Read row in JSONEachRow format and try to determine type for each field.
     /// Return list of names and types.
     /// If cannot determine the type of some field, return nullptr for it.
-    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, bool json_strings);
+    NamesAndTypesList readRowAndGetNamesAndDataTypesForJSONEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings);
 
     /// Read row in JSONCompactEachRow format and try to determine type for each field.
     /// If cannot determine the type of some field, return nullptr for it.
-    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, bool json_strings);
+    DataTypes readRowAndGetDataTypesForJSONCompactEachRow(ReadBuffer & in, const FormatSettings & settings, bool json_strings);
 
     bool nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl(ReadBuffer & buf);
 
diff --git a/src/Formats/NativeWriter.cpp b/src/Formats/NativeWriter.cpp
index 77692eec6b6..9d4cfb68d56 100644
--- a/src/Formats/NativeWriter.cpp
+++ b/src/Formats/NativeWriter.cpp
@@ -103,7 +103,7 @@ void NativeWriter::write(const Block & block)
             mark.offset_in_decompressed_block = ostr_concrete->getRemainingBytes();
         }
 
-        ColumnWithTypeAndName column = block.safeGetByPosition(i);
+        auto column = block.safeGetByPosition(i);
 
         /// Send data to old clients without low cardinality type.
         if (remove_low_cardinality || (client_revision && client_revision < DBMS_MIN_REVISION_WITH_LOW_CARDINALITY_TYPE))
@@ -145,7 +145,7 @@ void NativeWriter::write(const Block & block)
         SerializationPtr serialization;
         if (client_revision >= DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION)
         {
-            auto info = column.column->getSerializationInfo();
+            auto info = column.type->getSerializationInfo(*column.column);
             serialization = column.type->getSerialization(*info);
 
             bool has_custom = info->hasCustomSerialization();
diff --git a/src/Formats/ReadSchemaUtils.cpp b/src/Formats/ReadSchemaUtils.cpp
index 058f9b7059b..22eef5bd75b 100644
--- a/src/Formats/ReadSchemaUtils.cpp
+++ b/src/Formats/ReadSchemaUtils.cpp
@@ -1,4 +1,3 @@
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -75,12 +74,13 @@ ColumnsDescription readSchemaFromFormat(
         SchemaReaderPtr schema_reader;
         size_t max_rows_to_read = format_settings ? format_settings->max_rows_to_read_for_schema_inference : context->getSettingsRef().input_format_max_rows_to_read_for_schema_inference;
         size_t iterations = 0;
+        ColumnsDescription cached_columns;
         while (true)
         {
             bool is_eof = false;
             try
             {
-                buf = read_buffer_iterator();
+                buf = read_buffer_iterator(cached_columns);
                 if (!buf)
                     break;
                 is_eof = buf->eof();
@@ -88,8 +88,13 @@ ColumnsDescription readSchemaFromFormat(
             catch (...)
             {
                 auto exception_message = getCurrentExceptionMessage(false);
-                throw Exception(ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE, "Cannot extract table structure from {} format file: {}. You can specify the structure manually", format_name, exception_message);
+                throw Exception(
+                    ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                    "Cannot extract table structure from {} format file:\n{}\nYou can specify the structure manually",
+                    format_name,
+                    exception_message);
             }
+
             ++iterations;
 
             if (is_eof)
@@ -137,6 +142,9 @@ ColumnsDescription readSchemaFromFormat(
             }
         }
 
+        if (!cached_columns.empty())
+            return cached_columns;
+
         if (names_and_types.empty())
             throw Exception(ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE, "All attempts to extract table structure from files failed. Errors:{}\nYou can specify the structure manually", exception_messages);
 
@@ -231,4 +239,37 @@ NamesAndTypesList getNamesAndRecursivelyNullableTypes(const Block & header)
     return result;
 }
 
+String getKeyForSchemaCache(const String & source, const String & format, const std::optional<FormatSettings> & format_settings, const ContextPtr & context)
+{
+    return getKeysForSchemaCache({source}, format, format_settings, context).front();
+}
+
+static String makeSchemaCacheKey(const String & source, const String & format, const String & additional_format_info)
+{
+    return source + "@@" + format + "@@" + additional_format_info;
+}
+
+void splitSchemaCacheKey(const String & key, String & source, String & format, String & additional_format_info)
+{
+    size_t additional_format_info_pos = key.rfind("@@");
+    additional_format_info = key.substr(additional_format_info_pos + 2, key.size() - additional_format_info_pos - 2);
+    size_t format_pos = key.rfind("@@", additional_format_info_pos - 1);
+    format = key.substr(format_pos + 2, additional_format_info_pos - format_pos - 2);
+    source = key.substr(0, format_pos);
+}
+
+Strings getKeysForSchemaCache(const Strings & sources, const String & format, const std::optional<FormatSettings> & format_settings, const ContextPtr & context)
+{
+    /// For some formats data schema depends on some settings, so it's possible that
+    /// two queries to the same source will get two different schemas. To process this
+    /// case we add some additional information specific for the format to the cache key.
+    /// For example, for Protobuf format additional information is the path to the schema
+    /// and message name.
+    String additional_format_info = FormatFactory::instance().getAdditionalInfoForSchemaCache(format, context, format_settings);
+    Strings cache_keys;
+    cache_keys.reserve(sources.size());
+    std::transform(sources.begin(), sources.end(), std::back_inserter(cache_keys), [&](const auto & source){ return makeSchemaCacheKey(source, format, additional_format_info); });
+    return cache_keys;
+}
+
 }
diff --git a/src/Formats/ReadSchemaUtils.h b/src/Formats/ReadSchemaUtils.h
index b7558d5c22b..56b48823464 100644
--- a/src/Formats/ReadSchemaUtils.h
+++ b/src/Formats/ReadSchemaUtils.h
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-using ReadBufferIterator = std::function<std::unique_ptr<ReadBuffer>()>;
+using ReadBufferIterator = std::function<std::unique_ptr<ReadBuffer>(ColumnsDescription &)>;
 
 /// Try to determine the schema of the data in specifying format.
 /// For formats that have an external schema reader, it will
@@ -46,4 +46,9 @@ DataTypePtr makeNullableRecursivelyAndCheckForNothing(DataTypePtr type);
 /// Call makeNullableRecursivelyAndCheckForNothing for all types
 /// in the block and return names and types.
 NamesAndTypesList getNamesAndRecursivelyNullableTypes(const Block & header);
+
+String getKeyForSchemaCache(const String & source, const String & format, const std::optional<FormatSettings> & format_settings, const ContextPtr & context);
+Strings getKeysForSchemaCache(const Strings & sources, const String & format, const std::optional<FormatSettings> & format_settings, const ContextPtr & context);
+
+void splitSchemaCacheKey(const String & key, String & source, String & format, String & additional_format_info);
 }
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index 208b3e6a77e..1bc95b49dbe 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -6,13 +6,14 @@ add_subdirectory(divide)
 include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions .)
 
-list(REMOVE_ITEM clickhouse_functions_sources IFunction.cpp FunctionFactory.cpp FunctionHelpers.cpp)
-list(REMOVE_ITEM clickhouse_functions_headers IFunction.h FunctionFactory.h FunctionHelpers.h)
+list(REMOVE_ITEM clickhouse_functions_sources IFunction.cpp FunctionFactory.cpp FunctionHelpers.cpp extractTimeZoneFromFunctionArguments.cpp FunctionsLogical.cpp)
+list(REMOVE_ITEM clickhouse_functions_headers IFunction.h FunctionFactory.h FunctionHelpers.h extractTimeZoneFromFunctionArguments.h FunctionsLogical.h)
 
-add_library(clickhouse_functions ${clickhouse_functions_sources})
+add_library(clickhouse_functions_obj OBJECT ${clickhouse_functions_sources})
 
-target_link_libraries(clickhouse_functions
-    PUBLIC
+list (APPEND OBJECT_LIBS $<TARGET_OBJECTS:clickhouse_functions_obj>)
+
+list (APPEND PUBLIC_LIBS
         ch_contrib::wyhash
         ch_contrib::cityhash
         ch_contrib::farmhash
@@ -24,27 +25,28 @@ target_link_libraries(clickhouse_functions
         ch_contrib::metrohash
         ch_contrib::murmurhash
         ch_contrib::hashidsxx
+)
 
-    PRIVATE
+list (APPEND PRIVATE_LIBS
         ch_contrib::zlib
         boost::filesystem
         divide_impl
 )
 
 if (TARGET OpenSSL::Crypto)
-    target_link_libraries(clickhouse_functions PUBLIC OpenSSL::Crypto)
+    list (APPEND PUBLIC_LIBS OpenSSL::Crypto)
 endif()
 
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
+    target_compile_options(clickhouse_functions_obj PRIVATE "-g0")
 endif()
 
 if (TARGET ch_contrib::icu)
-    target_link_libraries (clickhouse_functions PRIVATE ch_contrib::icu)
+    list (APPEND PRIVATE_LIBS ch_contrib::icu)
 endif ()
 
 if (TARGET ch_contrib::fastops)
-    target_link_libraries (clickhouse_functions PRIVATE ch_contrib::fastops)
+    list (APPEND PRIVATE_LIBS ch_contrib::fastops)
 endif ()
 
 if (ENABLE_EXAMPLES)
@@ -52,45 +54,46 @@ if (ENABLE_EXAMPLES)
 endif ()
 
 if (TARGET ch_contrib::llvm)
-    target_link_libraries(clickhouse_functions PRIVATE ch_contrib::llvm)
+    list (APPEND PRIVATE_LIBS ch_contrib::llvm)
 endif ()
 
 if (TARGET ch_contrib::base64)
-    target_link_libraries(clickhouse_functions PRIVATE ch_contrib::base64)
+    list (APPEND PRIVATE_LIBS ch_contrib::base64)
 endif()
 
-target_link_libraries(clickhouse_functions PRIVATE ch_contrib::lz4)
+list (APPEND PRIVATE_LIBS ch_contrib::lz4)
 
 if (ENABLE_NLP)
-    target_link_libraries(clickhouse_functions PRIVATE ch_contrib::cld2)
+    list (APPEND PRIVATE_LIBS ch_contrib::cld2)
 endif()
 
 if (TARGET ch_contrib::h3)
-    target_link_libraries (clickhouse_functions PRIVATE ch_contrib::h3)
+    list (APPEND PRIVATE_LIBS ch_contrib::h3)
 endif()
 
 if (TARGET ch_contrib::vectorscan)
-    target_link_libraries(clickhouse_functions PRIVATE ch_contrib::vectorscan)
+    list (APPEND PRIVATE_LIBS ch_contrib::vectorscan)
 endif()
 
 if (TARGET ch_contrib::simdjson)
-    target_link_libraries(clickhouse_functions PRIVATE ch_contrib::simdjson)
+    list (APPEND PRIVATE_LIBS ch_contrib::simdjson)
 endif()
 
 if (TARGET ch_contrib::rapidjson)
-    target_link_libraries(clickhouse_functions PRIVATE ch_contrib::rapidjson)
+    list (APPEND PRIVATE_LIBS ch_contrib::rapidjson)
 endif()
 
 add_subdirectory(GatherUtils)
-target_link_libraries(clickhouse_functions PRIVATE clickhouse_functions_gatherutils)
+list (APPEND PRIVATE_LIBS clickhouse_functions_gatherutils)
 
 add_subdirectory(URL)
-target_link_libraries(clickhouse_functions PRIVATE clickhouse_functions_url)
+list (APPEND OBJECT_LIBS $<TARGET_OBJECTS:clickhouse_functions_url>)
 
 add_subdirectory(array)
-target_link_libraries(clickhouse_functions PRIVATE clickhouse_functions_array)
+list (APPEND OBJECT_LIBS $<TARGET_OBJECTS:clickhouse_functions_array>)
 
 add_subdirectory(JSONPath)
+list (APPEND PRIVATE_LIBS clickhouse_functions_jsonpath)
 
 # Signed integer overflow on user-provided data inside boost::geometry - ignore.
 set_source_files_properties("pointInPolygon.cpp" PROPERTIES COMPILE_FLAGS -fno-sanitize=signed-integer-overflow)
@@ -98,3 +101,15 @@ set_source_files_properties("pointInPolygon.cpp" PROPERTIES COMPILE_FLAGS -fno-s
 if (ENABLE_FUZZING)
     add_compile_definitions(FUZZING_MODE=1)
 endif ()
+
+target_link_libraries(clickhouse_functions_obj PUBLIC ${PUBLIC_LIBS} PRIVATE ${PRIVATE_LIBS})
+
+if (USE_STATIC_LIBRARIES OR NOT SPLIT_SHARED_LIBRARIES)
+    # Used to forward the linking information to the final binaries such as clickhouse / unit_tests_dbms,
+    # since such information are lost after we convert to OBJECT target
+    add_library(clickhouse_functions INTERFACE)
+    target_link_libraries(clickhouse_functions INTERFACE ${OBJECT_LIBS} ${PUBLIC_LIBS} ${PRIVATE_LIBS})
+else()
+    add_library(clickhouse_functions SHARED ${OBJECT_LIBS})
+    target_link_libraries(clickhouse_functions PUBLIC ${PUBLIC_LIBS} PRIVATE ${PRIVATE_LIBS})
+endif ()
diff --git a/src/Functions/CRC.cpp b/src/Functions/CRC.cpp
index b7c6c1195ea..10045a246c0 100644
--- a/src/Functions/CRC.cpp
+++ b/src/Functions/CRC.cpp
@@ -143,7 +143,7 @@ void registerFunctionCRCImpl(FunctionFactory & factory)
     factory.registerFunction<T>(T::name, FunctionFactory::CaseInsensitive);
 }
 
-void registerFunctionCRC(FunctionFactory & factory)
+REGISTER_FUNCTION(CRC)
 {
     registerFunctionCRCImpl<FunctionCRC32ZLIB>(factory);
     registerFunctionCRCImpl<FunctionCRC32IEEE>(factory);
diff --git a/src/Functions/CastOverloadResolver.cpp b/src/Functions/CastOverloadResolver.cpp
index fd6fecc37d6..761e49fe7bd 100644
--- a/src/Functions/CastOverloadResolver.cpp
+++ b/src/Functions/CastOverloadResolver.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerCastOverloadResolvers(FunctionFactory & factory)
+REGISTER_FUNCTION(CastOverloadResolvers)
 {
     factory.registerFunction<CastInternalOverloadResolver<CastType::nonAccurate>>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<CastInternalOverloadResolver<CastType::accurate>>();
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 4aaaf37e6cf..fa13008f352 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -39,6 +39,7 @@
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
+#include <Interpreters/Context.h>
 
 #if USE_EMBEDDED_COMPILER
 #    pragma GCC diagnostic push
@@ -1179,6 +1180,21 @@ public:
                 {
                     if constexpr (IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType>)
                     {
+                        if constexpr (is_division)
+                        {
+                            if (context->getSettingsRef().decimal_check_overflow)
+                            {
+                                /// Check overflow by using operands scale (based on big decimal division implementation details):
+                                /// big decimal arithmetic is based on big integers, decimal operands are converted to big integers
+                                /// i.e. int_operand = decimal_operand*10^scale
+                                /// For division, left operand will be scaled by right operand scale also to do big integer division,
+                                /// BigInt result = left*10^(left_scale + right_scale) / right * 10^right_scale
+                                /// So, we can check upfront possible overflow just by checking max scale used for left operand
+                                /// Note: it doesn't detect all possible overflow during big decimal division
+                                if (left.getScale() + right.getScale() > ResultDataType::maxPrecision())
+                                    throw Exception("Overflow during decimal division", ErrorCodes::DECIMAL_OVERFLOW);
+                            }
+                        }
                         ResultDataType result_type = decimalResultType<is_multiply, is_division>(left, right);
                         type_res = std::make_shared<ResultDataType>(result_type.getPrecision(), result_type.getScale());
                     }
diff --git a/src/Functions/FunctionChar.cpp b/src/Functions/FunctionChar.cpp
index f50e212d9b2..c022fda04c8 100644
--- a/src/Functions/FunctionChar.cpp
+++ b/src/Functions/FunctionChar.cpp
@@ -113,7 +113,7 @@ private:
     }
 };
 
-void registerFunctionChar(FunctionFactory & factory)
+REGISTER_FUNCTION(Char)
 {
     factory.registerFunction<FunctionChar>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index fbfc9e9bc1f..c0c000452fc 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -611,7 +611,7 @@ public:
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         if (!isNativeNumber(arguments[1].type))
-            throw Exception("Second argument for function " + getName() + " (delta) must be number",
+            throw Exception("Second argument for function " + getName() + " (delta) must be a number",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         if (arguments.size() == 2)
@@ -627,7 +627,7 @@ public:
             {
                 throw Exception(
                     "Function " + getName() + " supports 2 or 3 arguments. The 1st argument "
-                    "must be of type Date or DateTime. The 2nd argument must be number. "
+                    "must be of type Date or DateTime. The 2nd argument must be a number. "
                     "The 3rd argument (optional) must be "
                     "a constant string with timezone name. The timezone argument is allowed "
                     "only when the 1st argument has the type DateTime",
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index 7385de807a1..c4ac409ca04 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -44,7 +44,7 @@ public:
 };
 
 
-void registerFunctionFQDN(FunctionFactory & factory)
+REGISTER_FUNCTION(FQDN)
 {
     factory.registerFunction<FunctionFQDN>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionFQDN>("fullHostName");
diff --git a/src/Functions/FunctionFactory.h b/src/Functions/FunctionFactory.h
index 13b14559ec4..6758592558c 100644
--- a/src/Functions/FunctionFactory.h
+++ b/src/Functions/FunctionFactory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Interpreters/Context_fwd.h>
+#include <Common/register_objects.h>
 #include <Common/IFactoryWithAliases.h>
 #include <Functions/IFunction.h>
 #include <Functions/IFunctionAdaptors.h>
diff --git a/src/Functions/FunctionFile.cpp b/src/Functions/FunctionFile.cpp
index c85051e61c0..f65d8900351 100644
--- a/src/Functions/FunctionFile.cpp
+++ b/src/Functions/FunctionFile.cpp
@@ -1,7 +1,10 @@
+#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
 #include <Columns/IColumn.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/copyData.h>
@@ -19,6 +22,7 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
     extern const int NOT_IMPLEMENTED;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int DATABASE_ACCESS_DENIED;
 }
 
@@ -30,21 +34,41 @@ public:
     static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionFile>(context_); }
     explicit FunctionFile(ContextPtr context_) : WithContext(context_) {}
 
+    bool isVariadic() const override { return true; }
     String getName() const override { return name; }
-    size_t getNumberOfArguments() const override { return 1; }
+    size_t getNumberOfArguments() const override { return 0; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
+        if (arguments.empty() || arguments.size() > 2)
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Number of arguments for function {} doesn't match: passed {}, should be 1 or 2",
+                getName(), toString(arguments.size()));
+
         if (!isString(arguments[0].type))
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is only implemented for type String", getName());
 
+        if (arguments.size() == 2)
+        {
+            if (arguments[1].type->onlyNull())
+                return makeNullable(std::make_shared<DataTypeString>());
+
+            if (!isString(arguments[1].type))
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} only accepts String or Null as second argument", getName());
+        }
+
         return std::make_shared<DataTypeString>();
     }
 
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const ColumnPtr column = arguments[0].column;
         const ColumnString * column_src = checkAndGetColumn<ColumnString>(column.get());
@@ -53,6 +77,31 @@ public:
                 fmt::format("Illegal column {} of argument of function {}", arguments[0].column->getName(), getName()),
                 ErrorCodes::ILLEGAL_COLUMN);
 
+        String default_result;
+
+        ColumnUInt8::MutablePtr col_null_map_to;
+        ColumnUInt8::Container * vec_null_map_to [[maybe_unused]] = nullptr;
+
+        if (arguments.size() == 2)
+        {
+            if (result_type->isNullable())
+            {
+                col_null_map_to = ColumnUInt8::create(input_rows_count, false);
+                vec_null_map_to = &col_null_map_to->getData();
+            }
+            else
+            {
+                const auto & default_column = arguments[1].column;
+                const ColumnConst * default_col = checkAndGetColumn<ColumnConst>(default_column.get());
+
+                if (!default_col)
+                    throw Exception(
+                        "Illegal column " + arguments[1].column->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN);
+
+                default_result = default_col->getValue<String>();
+            }
+        }
+
         auto result = ColumnString::create();
         auto & res_chars = result->getChars();
         auto & res_offsets = result->getOffsets();
@@ -77,24 +126,40 @@ public:
             /// Otherwise it will not allow to work with symlinks in `user_files_path` directory.
             file_path = fs::absolute(file_path).lexically_normal();
 
-            if (need_check && file_path.string().find(user_files_absolute_path_string) != 0)
-                throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED, "File is not inside {}", user_files_absolute_path.string());
+            try
+            {
+                if (need_check && file_path.string().find(user_files_absolute_path_string) != 0)
+                    throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED, "File is not inside {}", user_files_absolute_path.string());
 
-            ReadBufferFromFile in(file_path);
-            WriteBufferFromVector out(res_chars, AppendModeTag{});
-            copyData(in, out);
-            out.finalize();
+                ReadBufferFromFile in(file_path);
+                WriteBufferFromVector out(res_chars, AppendModeTag{});
+                copyData(in, out);
+                out.finalize();
+            }
+            catch (...)
+            {
+                if (arguments.size() == 1)
+                    throw;
+
+                if (vec_null_map_to)
+                    (*vec_null_map_to)[row] = true;
+                else
+                    res_chars.insert(default_result.data(), default_result.data() + default_result.size());
+            }
 
             res_chars.push_back(0);
             res_offsets[row] = res_chars.size();
         }
 
+        if (vec_null_map_to)
+            return ColumnNullable::create(std::move(result), std::move(col_null_map_to));
+
         return result;
     }
 };
 
 
-void registerFunctionFile(FunctionFactory & factory)
+REGISTER_FUNCTION(File)
 {
     factory.registerFunction<FunctionFile>();
 }
diff --git a/src/Functions/FunctionHashID.cpp b/src/Functions/FunctionHashID.cpp
index bd875a9d4ff..829b3d9d2f6 100644
--- a/src/Functions/FunctionHashID.cpp
+++ b/src/Functions/FunctionHashID.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFunctionHashID(FunctionFactory & factory)
+REGISTER_FUNCTION(HashID)
 {
     factory.registerFunction<FunctionHashID>();
 }
diff --git a/src/Functions/FunctionHashID.h b/src/Functions/FunctionHashID.h
index 30f08c96eca..e469381a784 100644
--- a/src/Functions/FunctionHashID.h
+++ b/src/Functions/FunctionHashID.h
@@ -52,6 +52,7 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
@@ -69,7 +70,7 @@ public:
         if (arguments.size() > 1)
         {
             const auto & hash_col = arguments[1];
-            if (!isString(hash_col.type) || !isColumnConst(*hash_col.column.get()))
+            if (!isString(hash_col.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Second argument of function {} must be String, got {}",
@@ -80,7 +81,7 @@ public:
         if (arguments.size() > 2)
         {
             const auto & min_length_col = arguments[2];
-            if (!isUInt8(min_length_col.type) || !isColumnConst(*min_length_col.column.get()))
+            if (!isUInt8(min_length_col.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Third argument of function {} must be UInt8, got {}",
@@ -91,7 +92,7 @@ public:
         if (arguments.size() > 3)
         {
             const auto & alphabet_col = arguments[3];
-            if (!isString(alphabet_col.type) || !isColumnConst(*alphabet_col.column.get()))
+            if (!isString(alphabet_col.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Fourth argument of function {} must be String, got {}",
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index da1061e4b3e..825ae6a665a 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -96,7 +96,7 @@ FunctionBasePtr JoinGetOverloadResolver<or_null>::buildImpl(const ColumnsWithTyp
     return std::make_unique<FunctionJoinGet<or_null>>(getContext(), table_lock, storage_join, attr_name, argument_types, return_type);
 }
 
-void registerFunctionJoinGet(FunctionFactory & factory)
+REGISTER_FUNCTION(JoinGet)
 {
     // joinGet
     factory.registerFunction<JoinGetOverloadResolver<false>>();
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index 9d98f0c929d..496564b0b55 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -46,7 +46,7 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isNativeNumber(arguments.front()))
-            throw Exception{"Argument for function " + getName() + " must be number", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception{"Argument for function " + getName() + " must be a number", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
         return std::make_shared<DataTypeUInt8>();
     }
diff --git a/src/Functions/FunctionSQLJSON.cpp b/src/Functions/FunctionSQLJSON.cpp
index a316d9de7ab..e9d179ad6ae 100644
--- a/src/Functions/FunctionSQLJSON.cpp
+++ b/src/Functions/FunctionSQLJSON.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionsSQLJSON(FunctionFactory & factory)
+REGISTER_FUNCTION(SQLJSON)
 {
     factory.registerFunction<FunctionSQLJSON<NameJSONExists, JSONExistsImpl>>();
     factory.registerFunction<FunctionSQLJSON<NameJSONQuery, JSONQueryImpl>>();
diff --git a/src/Functions/FunctionShowCertificate.cpp b/src/Functions/FunctionShowCertificate.cpp
index e978f77244c..2e2b7506803 100644
--- a/src/Functions/FunctionShowCertificate.cpp
+++ b/src/Functions/FunctionShowCertificate.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFunctionShowCertificate(FunctionFactory & factory)
+REGISTER_FUNCTION(ShowCertificate)
 {
     factory.registerFunction<FunctionShowCertificate>();
 }
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index b12fcc00014..0d8e5a5546a 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -167,8 +167,8 @@ private:
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
                 {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "encryption mode string"},
-                {"input", &isStringOrFixedString<IDataType>, nullptr, "plaintext"},
-                {"key", &isStringOrFixedString<IDataType>, nullptr, "encryption key binary string"},
+                {"input", &isStringOrFixedString<IDataType>, {}, "plaintext"},
+                {"key", &isStringOrFixedString<IDataType>, {}, "encryption key binary string"},
             },
             optional_args
         );
@@ -439,8 +439,8 @@ private:
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
                 {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "decryption mode string"},
-                {"input", nullptr, nullptr, "ciphertext"},
-                {"key", &isStringOrFixedString<IDataType>, nullptr, "decryption key binary string"},
+                {"input", &isStringOrFixedString<IDataType>, {}, "ciphertext"},
+                {"key", &isStringOrFixedString<IDataType>, {}, "decryption key binary string"},
             },
             optional_args
         );
diff --git a/src/Functions/FunctionsBase58.cpp b/src/Functions/FunctionsBase58.cpp
index a336fbe6b07..3aa141c3dde 100644
--- a/src/Functions/FunctionsBase58.cpp
+++ b/src/Functions/FunctionsBase58.cpp
@@ -3,12 +3,12 @@
 
 namespace DB
 {
-void registerFunctionBase58Encode(FunctionFactory & factory)
+REGISTER_FUNCTION(Base58Encode)
 {
     factory.registerFunction<FunctionBase58Conversion<Base58Encode>>();
 }
 
-void registerFunctionBase58Decode(FunctionFactory & factory)
+REGISTER_FUNCTION(Base58Decode)
 {
     factory.registerFunction<FunctionBase58Conversion<Base58Decode>>();
 }
diff --git a/src/Functions/FunctionsBinaryRepresentation.cpp b/src/Functions/FunctionsBinaryRepresentation.cpp
index a13558133d3..d53963ace8a 100644
--- a/src/Functions/FunctionsBinaryRepresentation.cpp
+++ b/src/Functions/FunctionsBinaryRepresentation.cpp
@@ -621,7 +621,7 @@ public:
     }
 };
 
-void registerFunctionsBinaryRepr(FunctionFactory & factory)
+REGISTER_FUNCTION(BinaryRepr)
 {
     factory.registerFunction<EncodeToBinaryRepresentation<HexImpl>>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<DecodeFromBinaryRepresentation<UnhexImpl>>(FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/FunctionsBitToArray.cpp b/src/Functions/FunctionsBitToArray.cpp
index 76496b102cd..f154884a0fd 100644
--- a/src/Functions/FunctionsBitToArray.cpp
+++ b/src/Functions/FunctionsBitToArray.cpp
@@ -8,6 +8,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/WriteHelpers.h>
+#include <bit>
 
 
 namespace DB
@@ -285,7 +286,7 @@ public:
             {
                 while (x)
                 {
-                    result_array_values_data.push_back(getTrailingZeroBitsUnsafe(x));
+                    result_array_values_data.push_back(std::countr_zero(x));
                     x &= (x - 1);
                 }
             }
@@ -329,7 +330,7 @@ public:
 
 }
 
-void registerFunctionsBitToArray(FunctionFactory & factory)
+REGISTER_FUNCTION(BitToArray)
 {
     factory.registerFunction<FunctionBitPositionsToArray>();
     factory.registerFunction<FunctionBitmaskToArray>();
diff --git a/src/Functions/FunctionsBitmap.cpp b/src/Functions/FunctionsBitmap.cpp
index 159d0ff6777..5dcc20c3dfb 100644
--- a/src/Functions/FunctionsBitmap.cpp
+++ b/src/Functions/FunctionsBitmap.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-void registerFunctionsBitmap(FunctionFactory & factory)
+REGISTER_FUNCTION(Bitmap)
 {
     factory.registerFunction<FunctionBitmapBuild>();
     factory.registerFunction<FunctionBitmapToArray>();
diff --git a/src/Functions/FunctionsCharsetClassification.cpp b/src/Functions/FunctionsCharsetClassification.cpp
index af6c1de2768..a25da8f6c13 100644
--- a/src/Functions/FunctionsCharsetClassification.cpp
+++ b/src/Functions/FunctionsCharsetClassification.cpp
@@ -143,7 +143,7 @@ struct NameDetectLanguageUnknown
 using FunctionDetectCharset = FunctionTextClassificationString<CharsetClassificationImpl<false>, NameDetectCharset>;
 using FunctionDetectLanguageUnknown = FunctionTextClassificationString<CharsetClassificationImpl<true>, NameDetectLanguageUnknown>;
 
-void registerFunctionDetectCharset(FunctionFactory & factory)
+REGISTER_FUNCTION(DetectCharset)
 {
     factory.registerFunction<FunctionDetectCharset>();
     factory.registerFunction<FunctionDetectLanguageUnknown>();
diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index 1fdbbf3e9bb..eaf62e232f7 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -1128,7 +1128,7 @@ public:
 struct NameFunctionIPv4NumToString { static constexpr auto name = "IPv4NumToString"; };
 struct NameFunctionIPv4NumToStringClassC { static constexpr auto name = "IPv4NumToStringClassC"; };
 
-void registerFunctionsCoding(FunctionFactory & factory)
+REGISTER_FUNCTION(Coding)
 {
     factory.registerFunction<FunctionCutIPv6>();
     factory.registerFunction<FunctionIPv4ToIPv6>();
diff --git a/src/Functions/FunctionsCodingUUID.cpp b/src/Functions/FunctionsCodingUUID.cpp
index 5ac1d585325..9309c4cdbeb 100644
--- a/src/Functions/FunctionsCodingUUID.cpp
+++ b/src/Functions/FunctionsCodingUUID.cpp
@@ -229,7 +229,7 @@ public:
     }
 };
 
-void registerFunctionsCodingUUID(FunctionFactory & factory)
+REGISTER_FUNCTION(CodingUUID)
 {
     factory.registerFunction<FunctionUUIDNumToString>();
     factory.registerFunction<FunctionUUIDStringToNum>();
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index 7f8e9148032..dc0235f810f 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -5,11 +5,7 @@
 namespace DB
 {
 
-void registerFunctionFixedString(FunctionFactory & factory);
-
-void registerCastOverloadResolvers(FunctionFactory & factory);
-
-void registerFunctionsConversion(FunctionFactory & factory)
+REGISTER_FUNCTION(Conversion)
 {
     factory.registerFunction<FunctionToUInt8>();
     factory.registerFunction<FunctionToUInt16>();
@@ -41,12 +37,8 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionToUUID>();
     factory.registerFunction<FunctionToString>();
 
-    registerFunctionFixedString(factory);
-
     factory.registerFunction<FunctionToUnixTimestamp>();
 
-    registerCastOverloadResolvers(factory);
-
     factory.registerFunction<FunctionToUInt8OrZero>();
     factory.registerFunction<FunctionToUInt16OrZero>();
     factory.registerFunction<FunctionToUInt32OrZero>();
@@ -111,6 +103,9 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionParseDateTime64BestEffort>();
     factory.registerFunction<FunctionParseDateTime64BestEffortOrZero>();
     factory.registerFunction<FunctionParseDateTime64BestEffortOrNull>();
+    factory.registerFunction<FunctionParseDateTime64BestEffortUS>();
+    factory.registerFunction<FunctionParseDateTime64BestEffortUSOrZero>();
+    factory.registerFunction<FunctionParseDateTime64BestEffortUSOrNull>();
 
     factory.registerFunction<FunctionConvert<DataTypeInterval, NameToIntervalNanosecond, PositiveMonotonicity>>();
     factory.registerFunction<FunctionConvert<DataTypeInterval, NameToIntervalMicrosecond, PositiveMonotonicity>>();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index b666602e366..d888a181d7a 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -191,27 +191,29 @@ struct ConvertImpl
                 vec_null_map_to = &col_null_map_to->getData();
             }
 
-            bool result_is_bool = isBool(result_type);
-            for (size_t i = 0; i < input_rows_count; ++i)
+            if constexpr (std::is_same_v<ToDataType, DataTypeUInt8>)
             {
-                if constexpr (std::is_same_v<ToDataType, DataTypeUInt8>)
+                if (isBool(result_type))
                 {
-                    if (result_is_bool)
+                    for (size_t i = 0; i < input_rows_count; ++i)
                     {
                         vec_to[i] = vec_from[i] != FromFieldType(0);
-                        continue;
                     }
+                    goto done;
                 }
+            }
 
-                if constexpr (std::is_same_v<FromDataType, DataTypeUUID> != std::is_same_v<ToDataType, DataTypeUUID>)
+            if constexpr (std::is_same_v<FromDataType, DataTypeUUID> != std::is_same_v<ToDataType, DataTypeUUID>)
+            {
+                throw Exception("Conversion between numeric types and UUID is not supported. Probably the passed UUID is unquoted", ErrorCodes::NOT_IMPLEMENTED);
+            }
+            else
+            {
+                if constexpr (IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
                 {
-                    throw Exception("Conversion between numeric types and UUID is not supported. Probably the passed UUID is unquoted", ErrorCodes::NOT_IMPLEMENTED);
-                }
-                else
-                {
-                    if constexpr (IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
+                    if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
                     {
-                        if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                        for (size_t i = 0; i < input_rows_count; ++i)
                         {
                             ToFieldType result;
                             bool convert_result = false;
@@ -231,7 +233,10 @@ struct ConvertImpl
                                 (*vec_null_map_to)[i] = true;
                             }
                         }
-                        else
+                    }
+                    else
+                    {
+                        for (size_t i = 0; i < input_rows_count; ++i)
                         {
                             if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
                                 vec_to[i] = convertDecimals<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), col_to->getScale());
@@ -243,10 +248,13 @@ struct ConvertImpl
                                 throw Exception("Unsupported data type in conversion function", ErrorCodes::CANNOT_CONVERT_TYPE);
                         }
                     }
-                    else
+                }
+                else
+                {
+                    /// If From Data is Nan or Inf and we convert to integer type, throw exception
+                    if constexpr (std::is_floating_point_v<FromFieldType> && !std::is_floating_point_v<ToFieldType>)
                     {
-                        /// If From Data is Nan or Inf and we convert to integer type, throw exception
-                        if constexpr (std::is_floating_point_v<FromFieldType> && !std::is_floating_point_v<ToFieldType>)
+                        for (size_t i = 0; i < input_rows_count; ++i)
                         {
                             if (!isFinite(vec_from[i]))
                             {
@@ -254,15 +262,46 @@ struct ConvertImpl
                                 {
                                     vec_to[i] = 0;
                                     (*vec_null_map_to)[i] = true;
-                                    continue;
                                 }
                                 else
                                     throw Exception("Unexpected inf or nan to integer conversion", ErrorCodes::CANNOT_CONVERT_TYPE);
                             }
-                        }
+                            else
+                            {
+                                if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>
+                                        || std::is_same_v<Additions, AccurateConvertStrategyAdditions>)
+                                {
+                                    bool convert_result = accurate::convertNumeric(vec_from[i], vec_to[i]);
 
-                        if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>
-                                || std::is_same_v<Additions, AccurateConvertStrategyAdditions>)
+                                    if (!convert_result)
+                                    {
+                                        if (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                                        {
+                                            vec_to[i] = 0;
+                                            (*vec_null_map_to)[i] = true;
+                                        }
+                                        else
+                                        {
+                                            throw Exception(
+                                                "Value in column " + named_from.column->getName() + " cannot be safely converted into type "
+                                                    + result_type->getName(),
+                                                ErrorCodes::CANNOT_CONVERT_TYPE);
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    vec_to[i] = static_cast<ToFieldType>(vec_from[i]);
+                                }
+                            }
+                        }
+                        goto done;
+                    }
+
+                    if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>
+                            || std::is_same_v<Additions, AccurateConvertStrategyAdditions>)
+                    {
+                        for (size_t i = 0; i < input_rows_count; ++i)
                         {
                             bool convert_result = accurate::convertNumeric(vec_from[i], vec_to[i]);
 
@@ -282,14 +321,38 @@ struct ConvertImpl
                                 }
                             }
                         }
+                    }
+                    else
+                    {
+                        if constexpr (std::is_same_v<FromDataType, DataTypeUInt64> && std::is_same_v<ToDataType, DataTypeFloat32>)
+                        {
+                            /// Turns out that when ClickHouse is compiled with AVX1 or AVX2 instructions, Clang's autovectorizer produces
+                            /// code for UInt64-to-Float23 conversion which is only ~50% as fast as scalar code. Interestingly, scalar code
+                            /// is equally fast than code compiled for SSE4.2, so we might as well disable vectorization. This situation
+                            /// may change with AVX512 which has a dediated instruction for that usecase (_mm512_cvtepi64_ps).
+#if defined(__x86_64__)
+#  ifdef __clang__
+#    pragma clang loop vectorize(disable) interleave(disable)
+#  endif
+#endif
+                            for (size_t i = 0; i < input_rows_count; ++i)
+                            {
+                                vec_to[i] = static_cast<ToFieldType>(vec_from[i]);
+                            }
+                        }
                         else
                         {
-                            vec_to[i] = static_cast<ToFieldType>(vec_from[i]);
+                            for (size_t i = 0; i < input_rows_count; ++i)
+                            {
+                                vec_to[i] = static_cast<ToFieldType>(vec_from[i]);
+                            }
                         }
                     }
                 }
             }
 
+done:
+
             if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
                 return ColumnNullable::create(std::move(col_to), std::move(col_null_map_to));
             else
@@ -536,8 +599,9 @@ template <typename Name> struct ConvertImpl<DataTypeFloat32, DataTypeDateTime, N
 template <typename Name> struct ConvertImpl<DataTypeFloat64, DataTypeDateTime, Name>
     : DateTimeTransformImpl<DataTypeFloat64, DataTypeDateTime, ToDateTimeTransform64Signed<Float64, UInt32>> {};
 
-const time_t LUT_MIN_TIME = -1420070400l;       // 1925-01-01 UTC
-const time_t LUT_MAX_TIME = 9877248000l;        // 2282-12-31 UTC
+const time_t LUT_MIN_TIME = -2208988800l;           //  1900-01-01 UTC
+
+const time_t LUT_MAX_TIME = 10413791999l;           // 2299-12-31 UTC
 
 /** Conversion of numeric to DateTime64
   */
@@ -1273,9 +1337,18 @@ struct ConvertThroughParsing
                 }
                 else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
                 {
-                    time_t res;
-                    parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
-                    convertFromTime<ToDataType>(vec_to[i],res);
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parsed = tryParseDateTime64BestEffortUS(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        convertFromTime<ToDataType>(vec_to[i],res);
+                    }
                 }
                 else
                 {
@@ -2462,6 +2535,9 @@ struct NameParseDateTime32BestEffortOrNull { static constexpr auto name = "parse
 struct NameParseDateTime64BestEffort { static constexpr auto name = "parseDateTime64BestEffort"; };
 struct NameParseDateTime64BestEffortOrZero { static constexpr auto name = "parseDateTime64BestEffortOrZero"; };
 struct NameParseDateTime64BestEffortOrNull { static constexpr auto name = "parseDateTime64BestEffortOrNull"; };
+struct NameParseDateTime64BestEffortUS { static constexpr auto name = "parseDateTime64BestEffortUS"; };
+struct NameParseDateTime64BestEffortUSOrZero { static constexpr auto name = "parseDateTime64BestEffortUSOrZero"; };
+struct NameParseDateTime64BestEffortUSOrNull { static constexpr auto name = "parseDateTime64BestEffortUSOrNull"; };
 
 
 using FunctionParseDateTimeBestEffort = FunctionConvertFromString<
@@ -2492,6 +2568,14 @@ using FunctionParseDateTime64BestEffortOrZero = FunctionConvertFromString<
 using FunctionParseDateTime64BestEffortOrNull = FunctionConvertFromString<
     DataTypeDateTime64, NameParseDateTime64BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
 
+using FunctionParseDateTime64BestEffortUS = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTime64BestEffortUSOrZero = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTime64BestEffortUSOrNull = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
+
+
 class ExecutableFunctionCast : public IExecutableFunction
 {
 public:
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.cpp b/src/Functions/FunctionsEmbeddedDictionaries.cpp
index eeaea9a32a5..570f717f3f6 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.cpp
+++ b/src/Functions/FunctionsEmbeddedDictionaries.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionsEmbeddedDictionaries(FunctionFactory & factory)
+REGISTER_FUNCTION(EmbeddedDictionaries)
 {
     factory.registerFunction<FunctionRegionToCity>();
     factory.registerFunction<FunctionRegionToArea>();
diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index 0cd56f87df4..371b838635b 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionsExternalDictionaries(FunctionFactory & factory)
+REGISTER_FUNCTION(ExternalDictionaries)
 {
     factory.registerFunction<FunctionDictHas>();
     factory.registerFunction<FunctionDictGetUInt8>();
diff --git a/src/Functions/FunctionsHashing.cpp b/src/Functions/FunctionsHashing.cpp
index 901234e5443..31ffae2d98a 100644
--- a/src/Functions/FunctionsHashing.cpp
+++ b/src/Functions/FunctionsHashing.cpp
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-void registerFunctionsHashing(FunctionFactory & factory)
+REGISTER_FUNCTION(Hashing)
 {
 #if USE_SSL
     factory.registerFunction<FunctionMD4>();
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index c6e66a3d46d..862592254c1 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -31,12 +31,14 @@
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeMap.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
+#include <Columns/ColumnMap.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/PerformanceAdaptors.h>
@@ -1085,6 +1087,16 @@ private:
                 executeForArgument(tuple_types[i].get(), tmp.get(), vec_to, is_first);
             }
         }
+        else if (const auto * map = checkAndGetColumn<ColumnMap>(column))
+        {
+            const auto & type_map = assert_cast<const DataTypeMap &>(*type);
+            executeForArgument(type_map.getNestedType().get(), map->getNestedColumnPtr().get(), vec_to, is_first);
+        }
+        else if (const auto * const_map = checkAndGetColumnConstData<ColumnMap>(column))
+        {
+            const auto & type_map = assert_cast<const DataTypeMap &>(*type);
+            executeForArgument(type_map.getNestedType().get(), const_map->getNestedColumnPtr().get(), vec_to, is_first);
+        }
         else
         {
             if (is_first)
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index 9ab27c2976a..6beb8155965 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -1443,7 +1443,7 @@ public:
     }
 };
 
-void registerFunctionsJSON(FunctionFactory & factory)
+REGISTER_FUNCTION(JSON)
 {
     factory.registerFunction<JSONOverloadResolver<NameJSONHas, JSONHasImpl>>();
     factory.registerFunction<JSONOverloadResolver<NameIsValidJSON, IsValidJSONImpl>>();
diff --git a/src/Functions/FunctionsLanguageClassification.cpp b/src/Functions/FunctionsLanguageClassification.cpp
index 521a4b0301e..18579e674ec 100644
--- a/src/Functions/FunctionsLanguageClassification.cpp
+++ b/src/Functions/FunctionsLanguageClassification.cpp
@@ -221,7 +221,7 @@ struct NameDetectLanguage
 
 using FunctionDetectLanguage = FunctionTextClassificationString<FunctionDetectLanguageImpl, NameDetectLanguage>;
 
-void registerFunctionsDetectLanguage(FunctionFactory & factory)
+REGISTER_FUNCTION(DetectLanguage)
 {
     factory.registerFunction<FunctionDetectLanguage>();
     factory.registerFunction<FunctionDetectLanguageMixed>();
diff --git a/src/Functions/FunctionsLogical.cpp b/src/Functions/FunctionsLogical.cpp
index 392cbac8a1b..05ec1e54c94 100644
--- a/src/Functions/FunctionsLogical.cpp
+++ b/src/Functions/FunctionsLogical.cpp
@@ -22,7 +22,7 @@
 namespace DB
 {
 
-void registerFunctionsLogical(FunctionFactory & factory)
+REGISTER_FUNCTION(Logical)
 {
     factory.registerFunction<FunctionAnd>();
     factory.registerFunction<FunctionOr>();
diff --git a/src/Functions/FunctionsProgrammingClassification.cpp b/src/Functions/FunctionsProgrammingClassification.cpp
index 2c95e22f239..8a552a30e65 100644
--- a/src/Functions/FunctionsProgrammingClassification.cpp
+++ b/src/Functions/FunctionsProgrammingClassification.cpp
@@ -112,7 +112,7 @@ struct NameDetectProgrammingLanguage
 
 using FunctionDetectProgrammingLanguage = FunctionTextClassificationString<FunctionDetectProgrammingLanguageImpl, NameDetectProgrammingLanguage>;
 
-void registerFunctionDetectProgrammingLanguage(FunctionFactory & factory)
+REGISTER_FUNCTION(DetectProgrammingLanguage)
 {
     factory.registerFunction<FunctionDetectProgrammingLanguage>();
 }
diff --git a/src/Functions/FunctionsRound.cpp b/src/Functions/FunctionsRound.cpp
index c5ad27a0b90..a08ebbaf038 100644
--- a/src/Functions/FunctionsRound.cpp
+++ b/src/Functions/FunctionsRound.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionsRound(FunctionFactory & factory)
+REGISTER_FUNCTION(Round)
 {
     factory.registerFunction<FunctionRound>("round", FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionRoundBankers>("roundBankers", FunctionFactory::CaseSensitive);
diff --git a/src/Functions/FunctionsStringArray.cpp b/src/Functions/FunctionsStringArray.cpp
index 0e73d6a33f5..660de15973f 100644
--- a/src/Functions/FunctionsStringArray.cpp
+++ b/src/Functions/FunctionsStringArray.cpp
@@ -27,7 +27,7 @@ DataTypePtr FunctionArrayStringConcat::getReturnTypeImpl(const DataTypes & argum
     return std::make_shared<DataTypeString>();
 }
 
-void registerFunctionsStringArray(FunctionFactory & factory)
+REGISTER_FUNCTION(StringArray)
 {
     factory.registerFunction<FunctionExtractAll>();
     factory.registerFunction<FunctionAlphaTokens>();
diff --git a/src/Functions/FunctionsStringHash.cpp b/src/Functions/FunctionsStringHash.cpp
index 46b5562ae75..e7dbe4087f2 100644
--- a/src/Functions/FunctionsStringHash.cpp
+++ b/src/Functions/FunctionsStringHash.cpp
@@ -743,7 +743,7 @@ using FunctionWordShingleMinHashArgUTF8
 using FunctionWordShingleMinHashArgCaseInsensitiveUTF8
 = FunctionsStringHash<MinHashImpl<true, false, true>, NameWordShingleMinHashArgCaseInsensitiveUTF8, false, true>;
 
-void registerFunctionsStringHash(FunctionFactory & factory)
+REGISTER_FUNCTION(StringHash)
 {
     factory.registerFunction<FunctionNgramSimHash>();
     factory.registerFunction<FunctionNgramSimHashCaseInsensitive>();
diff --git a/src/Functions/FunctionsStringSimilarity.cpp b/src/Functions/FunctionsStringSimilarity.cpp
index ee3bce4c0db..d1bb77d6d40 100644
--- a/src/Functions/FunctionsStringSimilarity.cpp
+++ b/src/Functions/FunctionsStringSimilarity.cpp
@@ -530,7 +530,7 @@ using FunctionNgramSearchUTF8 = FunctionsStringSimilarity<NgramDistanceImpl<3, U
 using FunctionNgramSearchCaseInsensitiveUTF8 = FunctionsStringSimilarity<NgramDistanceImpl<3, UInt32, true, true, false>, NameNgramSearchUTF8CaseInsensitive>;
 
 
-void registerFunctionsStringSimilarity(FunctionFactory & factory)
+REGISTER_FUNCTION(StringSimilarity)
 {
     factory.registerFunction<FunctionNgramDistance>();
     factory.registerFunction<FunctionNgramDistanceCaseInsensitive>();
diff --git a/src/Functions/FunctionsTimeWindow.cpp b/src/Functions/FunctionsTimeWindow.cpp
index 5022c42bc79..61d4f694a61 100644
--- a/src/Functions/FunctionsTimeWindow.cpp
+++ b/src/Functions/FunctionsTimeWindow.cpp
@@ -684,7 +684,7 @@ ColumnPtr FunctionTimeWindow<type>::executeImpl(const ColumnsWithTypeAndName & a
     return TimeWindowImpl<type>::dispatchForColumns(arguments, name);
 }
 
-void registerFunctionsTimeWindow(FunctionFactory& factory)
+REGISTER_FUNCTION(TimeWindow)
 {
     factory.registerFunction<FunctionTumble>();
     factory.registerFunction<FunctionHop>();
diff --git a/src/Functions/FunctionsTonalityClassification.cpp b/src/Functions/FunctionsTonalityClassification.cpp
index 2d8e47b9bcb..308f7264c49 100644
--- a/src/Functions/FunctionsTonalityClassification.cpp
+++ b/src/Functions/FunctionsTonalityClassification.cpp
@@ -81,7 +81,7 @@ struct NameDetectTonality
 
 using FunctionDetectTonality = FunctionTextClassificationFloat<FunctionDetectTonalityImpl, NameDetectTonality>;
 
-void registerFunctionDetectTonality(FunctionFactory & factory)
+REGISTER_FUNCTION(DetectTonality)
 {
     factory.registerFunction<FunctionDetectTonality>();
 }
diff --git a/src/Functions/FunctionsTransactionCounters.cpp b/src/Functions/FunctionsTransactionCounters.cpp
index f28cfb60dfa..b60a59a3432 100644
--- a/src/Functions/FunctionsTransactionCounters.cpp
+++ b/src/Functions/FunctionsTransactionCounters.cpp
@@ -61,7 +61,7 @@ public:
 
 }
 
-void registerFunctionsTransactionCounters(FunctionFactory & factory)
+REGISTER_FUNCTION(TransactionCounters)
 {
     factory.registerFunction<FunctionTransactionID>();
     factory.registerFunction<FunctionTransactionLatestSnapshot>();
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 5be2ea3c5e3..c1c6606e40f 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -2,7 +2,6 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Common/LRUCache.h>
 #include <Common/SipHash.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
diff --git a/src/Functions/IFunctionAdaptors.h b/src/Functions/IFunctionAdaptors.h
index dfb90fd3975..dbcc07af57a 100644
--- a/src/Functions/IFunctionAdaptors.h
+++ b/src/Functions/IFunctionAdaptors.h
@@ -141,6 +141,8 @@ public:
 
     void getLambdaArgumentTypesImpl(DataTypes & arguments) const override { function->getLambdaArgumentTypes(arguments); }
 
+    const IFunction * getFunction() const { return function.get(); }
+
 private:
     std::shared_ptr<IFunction> function;
 };
diff --git a/src/Functions/JSONPath/CMakeLists.txt b/src/Functions/JSONPath/CMakeLists.txt
index bdc826008eb..3a3e313fe52 100644
--- a/src/Functions/JSONPath/CMakeLists.txt
+++ b/src/Functions/JSONPath/CMakeLists.txt
@@ -6,7 +6,6 @@ add_library(clickhouse_functions_jsonpath ${clickhouse_functions_jsonpath_source
 
 target_link_libraries(clickhouse_functions_jsonpath PRIVATE dbms)
 target_link_libraries(clickhouse_functions_jsonpath PRIVATE clickhouse_parsers)
-target_link_libraries(clickhouse_functions PRIVATE clickhouse_functions_jsonpath)
 
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
     target_compile_options(clickhouse_functions_jsonpath PRIVATE "-g0")
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 78ce2627c35..d5465dc3498 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -476,8 +476,7 @@ struct MatchImpl
             }
             else
             {
-                cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle, regexp);
-
+                regexp = cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle);
                 regexp->getAnalyzeResult(required_substr, is_trivial, required_substring_is_prefix);
 
                 if (required_substr.empty())
@@ -589,8 +588,7 @@ struct MatchImpl
             }
             else
             {
-                cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle, regexp);
-
+                regexp = cache.getOrSet<is_like, /*no_capture*/ true, case_insensitive>(needle);
                 regexp->getAnalyzeResult(required_substr, is_trivial, required_substring_is_prefix);
 
                 if (required_substr.empty())
diff --git a/src/Functions/MultiMatchAllIndicesImpl.h b/src/Functions/MultiMatchAllIndicesImpl.h
index 5c5de846a3f..e19d1691c6a 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -86,9 +86,10 @@ struct MultiMatchAllIndicesImpl
             return;
         }
 
-        const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices=*/true, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ true, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
         hs_scratch_t * scratch = nullptr;
-        hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+        hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
         if (err != HS_SUCCESS)
             throw Exception("Could not clone scratch space for hyperscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -114,7 +115,7 @@ struct MultiMatchAllIndicesImpl
                 throw Exception("Too long string to search", ErrorCodes::TOO_MANY_BYTES);
             /// scan, check, update the offsets array and the offset of haystack.
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + offset,
                 length,
                 0,
@@ -197,9 +198,10 @@ struct MultiMatchAllIndicesImpl
 
             checkHyperscanRegexp(needles, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
 
-            const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices=*/true, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ true, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
             hs_scratch_t * scratch = nullptr;
-            hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+            hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
             if (err != HS_SUCCESS)
                 throw Exception("Could not clone scratch space for hyperscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -224,7 +226,7 @@ struct MultiMatchAllIndicesImpl
 
             /// scan, check, update the offsets array and the offset of haystack.
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + prev_haystack_offset,
                 cur_haystack_length,
                 0,
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index 0490a81d707..a5d5a354290 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -100,9 +100,11 @@ struct MultiMatchAnyImpl
             return;
         }
 #if USE_VECTORSCAN
-        const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+        MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
+
         hs_scratch_t * scratch = nullptr;
-        hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+        hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
         if (err != HS_SUCCESS)
             throw Exception("Could not clone scratch space for vectorscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -133,7 +135,7 @@ struct MultiMatchAnyImpl
             /// zero the result, scan, check, update the offset.
             res[i] = 0;
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + offset,
                 length,
                 0,
@@ -155,7 +157,7 @@ struct MultiMatchAnyImpl
         memset(accum.data(), 0, accum.size());
         for (size_t j = 0; j < needles.size(); ++j)
         {
-            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, std::string(needles[j].data(), needles[j].size()), nullptr, accum);
+            MatchImpl<Name, MatchTraits::Syntax::Re2, MatchTraits::Case::Sensitive, MatchTraits::Result::DontNegate>::vectorConstant(haystack_data, haystack_offsets, String(needles[j].data(), needles[j].size()), nullptr, accum);
             for (size_t i = 0; i < res.size(); ++i)
             {
                 if constexpr (FindAny)
@@ -224,9 +226,10 @@ struct MultiMatchAnyImpl
 
             checkHyperscanRegexp(needles, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
 
-            const auto & hyperscan_regex = MultiRegexps::get</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::DeferredConstructedRegexpsPtr deferred_constructed_regexps = MultiRegexps::getOrSet</*SaveIndices*/ FindAnyIndex, WithEditDistance>(needles, edit_distance);
+            MultiRegexps::Regexps * regexps = deferred_constructed_regexps->get();
             hs_scratch_t * scratch = nullptr;
-            hs_error_t err = hs_clone_scratch(hyperscan_regex->getScratch(), &scratch);
+            hs_error_t err = hs_clone_scratch(regexps->getScratch(), &scratch);
 
             if (err != HS_SUCCESS)
                 throw Exception("Could not clone scratch space for vectorscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@@ -256,7 +259,7 @@ struct MultiMatchAnyImpl
             /// zero the result, scan, check, update the offset.
             res[i] = 0;
             err = hs_scan(
-                hyperscan_regex->getDB(),
+                regexps->getDB(),
                 reinterpret_cast<const char *>(haystack_data.data()) + prev_haystack_offset,
                 cur_haystack_length,
                 0,
diff --git a/src/Functions/Regexps.h b/src/Functions/Regexps.h
index b932b14a6a9..08c819fae99 100644
--- a/src/Functions/Regexps.h
+++ b/src/Functions/Regexps.h
@@ -12,7 +12,9 @@
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/ProfileEvents.h>
 #include <Common/config.h>
+#include <base/defines.h>
 #include <base/StringRef.h>
+#include <boost/container_hash/hash.hpp>
 
 #include "config_functions.h"
 
@@ -41,7 +43,7 @@ using Regexp = OptimizedRegularExpressionSingleThreaded;
 using RegexpPtr = std::shared_ptr<Regexp>;
 
 template <bool like, bool no_capture, bool case_insensitive>
-inline Regexp createRegexp(const std::string & pattern)
+inline Regexp createRegexp(const String & pattern)
 {
     int flags = OptimizedRegularExpression::RE_DOT_NL;
     if constexpr (no_capture)
@@ -66,39 +68,32 @@ public:
     using RegexpPtr = std::shared_ptr<Regexp>;
 
     template <bool like, bool no_capture, bool case_insensitive>
-    void getOrSet(const String & pattern, RegexpPtr & regexp)
+    RegexpPtr getOrSet(const String & pattern)
     {
-        StringAndRegexp & bucket = known_regexps[hasher(pattern) % max_regexp_cache_size];
+        Bucket & bucket = known_regexps[hasher(pattern) % CACHE_SIZE];
 
-        if (likely(bucket.regexp != nullptr))
-        {
-            if (pattern == bucket.pattern)
-                regexp = bucket.regexp;
-            else
-            {
-                regexp = std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern));
-                bucket = {pattern, regexp};
-            }
-        }
+        if (bucket.regexp == nullptr) [[unlikely]]
+            /// insert new entry
+            bucket = {pattern, std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern))};
         else
-        {
-            regexp = std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern));
-            bucket = {pattern, regexp};
-        }
+            if (pattern != bucket.pattern)
+                /// replace existing entry
+                bucket = {pattern, std::make_shared<Regexp>(createRegexp<like, no_capture, case_insensitive>(pattern))};
+
+        return bucket.regexp;
     }
 
 private:
-    constexpr static size_t max_regexp_cache_size = 100; // collision probability
+    constexpr static size_t CACHE_SIZE = 100; /// collision probability
 
-    std::hash<std::string> hasher;
-    struct StringAndRegexp
+    std::hash<String> hasher;
+    struct Bucket
     {
-        std::string pattern;
-        RegexpPtr regexp;
+        String pattern;   /// key
+        RegexpPtr regexp; /// value
     };
-    using CacheTable = std::array<StringAndRegexp, max_regexp_cache_size>;
+    using CacheTable = std::array<Bucket, CACHE_SIZE>;
     CacheTable known_regexps;
-
 };
 
 }
@@ -136,35 +131,29 @@ private:
     ScratchPtr scratch;
 };
 
-class RegexpsConstructor
+class DeferredConstructedRegexps
 {
 public:
-    RegexpsConstructor() = default;
+    explicit DeferredConstructedRegexps(std::function<Regexps()> constructor_)
+        : constructor(std::move(constructor_))
+    {}
 
-    void setConstructor(std::function<Regexps()> constructor_) { constructor = std::move(constructor_); }
-
-    Regexps * operator()()
+    Regexps * get()
     {
         std::lock_guard lock(mutex);
-        if (regexp)
-            return &*regexp;
-        regexp = constructor();
-        return &*regexp;
+        if (regexps)
+            return &*regexps;
+        regexps = constructor();
+        return &*regexps;
     }
 
 private:
-    std::function<Regexps()> constructor;
-    std::optional<Regexps> regexp;
+    std::function<Regexps()> constructor TSA_GUARDED_BY(mutex);
+    std::optional<Regexps> regexps TSA_GUARDED_BY(mutex);
     std::mutex mutex;
 };
 
-struct Pool
-{
-    /// Mutex for finding in map.
-    std::mutex mutex;
-    /// Patterns + possible edit_distance to database and scratch.
-    std::map<std::pair<std::vector<String>, std::optional<UInt32>>, RegexpsConstructor> storage;
-};
+using DeferredConstructedRegexpsPtr = std::shared_ptr<DeferredConstructedRegexps>;
 
 template <bool save_indices, bool WithEditDistance>
 inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[maybe_unused]] std::optional<UInt32> edit_distance)
@@ -186,9 +175,9 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
         ext_exprs_ptrs.reserve(str_patterns.size());
     }
 
-    for (const StringRef ref : str_patterns)
+    for (std::string_view ref : str_patterns)
     {
-        patterns.push_back(ref.data);
+        patterns.push_back(ref.data());
         /* Flags below are the pattern matching flags.
          * HS_FLAG_DOTALL is a compile flag where matching a . will not exclude newlines. This is a good
          * performance practice according to Hyperscan API. https://intel.github.io/hyperscan/dev-reference/performance.html#dot-all-mode
@@ -251,11 +240,9 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
         CompilerError error(compile_error);
 
         if (error->expression < 0)
-            throw Exception(String(error->message), ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, String(error->message));
         else
-            throw Exception(
-                "Pattern '" + str_patterns[error->expression] + "' failed with error '" + String(error->message),
-                ErrorCodes::BAD_ARGUMENTS);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Pattern '{}' failed with error '{}'", str_patterns[error->expression], String(error->message));
     }
 
     ProfileEvents::increment(ProfileEvents::RegexpCreated);
@@ -267,45 +254,90 @@ inline Regexps constructRegexps(const std::vector<String> & str_patterns, [[mayb
 
     /// If not HS_SUCCESS, it is guaranteed that the memory would not be allocated for scratch.
     if (err != HS_SUCCESS)
-        throw Exception("Could not allocate scratch space for hyperscan", ErrorCodes::CANNOT_ALLOCATE_MEMORY);
+        throw Exception(ErrorCodes::CANNOT_ALLOCATE_MEMORY, "Could not allocate scratch space for hyperscan");
 
     return {db, scratch};
 }
 
-/// If WithEditDistance is False, edit_distance must be nullopt
-/// Also, we use templates here because each instantiation of function
-/// template has its own copy of local static variables which must not be the same
-/// for different hyperscan compilations.
-template <bool save_indices, bool WithEditDistance>
-inline Regexps * get(const std::vector<std::string_view> & patterns, std::optional<UInt32> edit_distance)
+/// Maps string pattern vectors + edit distance to compiled vectorscan regexps. Uses the same eviction mechanism as the LocalCacheTable for
+/// re2 patterns. Because vectorscan regexes are overall more heavy-weight (more expensive compilation, regexes can grow up to multiple
+/// MBs, usage of scratch space), 1. GlobalCacheTable is a global singleton and, as a result, needs locking 2. the pattern compilation is
+/// done outside GlobalCacheTable's lock, at the cost of another level of locking.
+struct GlobalCacheTable
 {
-    static Pool known_regexps; /// Different variables for different pattern parameters, thread-safe in C++11
+    constexpr static size_t CACHE_SIZE = 500; /// collision probability
+
+    struct Bucket
+    {
+        std::vector<String> patterns;          /// key
+        std::optional<UInt32> edit_distance;   /// key
+        /// The compiled patterns and their state (vectorscan 'database' + scratch space) are wrapped in a shared_ptr. Refcounting guarantees
+        /// that eviction of a pattern does not affect parallel threads still using the pattern.
+        DeferredConstructedRegexpsPtr regexps; /// value
+    };
+
+    std::array<Bucket, CACHE_SIZE> known_regexps TSA_GUARDED_BY(mutex);
+    std::mutex mutex;
+
+    static size_t getBucketIndexFor(const std::vector<String> patterns, std::optional<UInt32> edit_distance)
+    {
+        size_t hash = 0;
+        for (const auto & pattern : patterns)
+            boost::hash_combine(hash, pattern);
+        boost::hash_combine(hash, edit_distance);
+        return hash % CACHE_SIZE;
+    }
+};
+
+/// If WithEditDistance is False, edit_distance must be nullopt. Also, we use templates here because each instantiation of function template
+/// has its own copy of local static variables which must not be the same for different hyperscan compilations.
+template <bool save_indices, bool WithEditDistance>
+inline DeferredConstructedRegexpsPtr getOrSet(const std::vector<std::string_view> & patterns, std::optional<UInt32> edit_distance)
+{
+    static GlobalCacheTable pool; /// Different variables for different pattern parameters, thread-safe in C++11
 
     std::vector<String> str_patterns;
     str_patterns.reserve(patterns.size());
     for (const auto & pattern : patterns)
-        str_patterns.emplace_back(std::string(pattern.data(), pattern.size()));
+        str_patterns.emplace_back(String(pattern));
 
-    /// Get the lock for finding database.
-    std::unique_lock lock(known_regexps.mutex);
+    size_t bucket_idx = GlobalCacheTable::getBucketIndexFor(str_patterns, edit_distance);
 
-    auto it = known_regexps.storage.find({str_patterns, edit_distance});
+    /// Lock cache to find compiled regexp for given pattern vector + edit distance.
+    std::lock_guard lock(pool.mutex);
 
-    /// If not found, compile and let other threads wait.
-    if (known_regexps.storage.end() == it)
+    GlobalCacheTable::Bucket & bucket = pool.known_regexps[bucket_idx];
+
+    /// Pattern compilation is expensive and we don't want to block other threads reading from / inserting into the cache while we hold the
+    /// cache lock during pattern compilation. Therefore, when a cache entry is created or replaced, only set the regexp constructor method
+    /// and compile outside the cache lock.
+    /// Note that the string patterns and the edit distance is passed into the constructor lambda by value, i.e. copied - it is not an
+    /// option to reference the corresponding string patterns / edit distance key in the cache table bucket because the cache entry may
+    /// already be evicted at the time the compilation starts.
+
+    if (bucket.regexps == nullptr) [[unlikely]]
     {
-        it = known_regexps.storage
-                 .emplace(std::piecewise_construct, std::make_tuple(std::move(str_patterns), edit_distance), std::make_tuple())
-                 .first;
-        it->second.setConstructor([&str_patterns = it->first.first, edit_distance]()
-        {
-            return constructRegexps<save_indices, WithEditDistance>(str_patterns, edit_distance);
-        });
+        /// insert new entry
+        auto deferred_constructed_regexps = std::make_shared<DeferredConstructedRegexps>(
+                [str_patterns, edit_distance]()
+                {
+                    return constructRegexps<save_indices, WithEditDistance>(str_patterns, edit_distance);
+                });
+        bucket = {std::move(str_patterns), edit_distance, deferred_constructed_regexps};
     }
+    else
+        if (bucket.patterns != str_patterns || bucket.edit_distance != edit_distance)
+        {
+            /// replace existing entry
+            auto deferred_constructed_regexps = std::make_shared<DeferredConstructedRegexps>(
+                    [str_patterns, edit_distance]()
+                    {
+                        return constructRegexps<save_indices, WithEditDistance>(str_patterns, edit_distance);
+                    });
+            bucket = {std::move(str_patterns), edit_distance, deferred_constructed_regexps};
+        }
 
-    /// Unlock before possible construction.
-    lock.unlock();
-    return it->second();
+    return bucket.regexps;
 }
 
 }
diff --git a/src/Functions/SubtractSubSeconds.cpp b/src/Functions/SubtractSubSeconds.cpp
index ac3a66bfc2d..b1c47700d13 100644
--- a/src/Functions/SubtractSubSeconds.cpp
+++ b/src/Functions/SubtractSubSeconds.cpp
@@ -6,19 +6,19 @@ namespace DB
 {
 
 using FunctionSubtractNanoseconds = FunctionDateOrDateTimeAddInterval<SubtractNanosecondsImpl>;
-void registerFunctionSubtractNanoseconds(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractNanoseconds)
 {
     factory.registerFunction<FunctionSubtractNanoseconds>();
 }
 
 using FunctionSubtractMicroseconds = FunctionDateOrDateTimeAddInterval<SubtractMicrosecondsImpl>;
-void registerFunctionSubtractMicroseconds(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractMicroseconds)
 {
     factory.registerFunction<FunctionSubtractMicroseconds>();
 }
 
 using FunctionSubtractMilliseconds = FunctionDateOrDateTimeAddInterval<SubtractMillisecondsImpl>;
-void registerFunctionSubtractMilliseconds(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractMilliseconds)
 {
     factory.registerFunction<FunctionSubtractMilliseconds>();
 }
diff --git a/src/Functions/URL/CMakeLists.txt b/src/Functions/URL/CMakeLists.txt
index 28a72651315..6328476543d 100644
--- a/src/Functions/URL/CMakeLists.txt
+++ b/src/Functions/URL/CMakeLists.txt
@@ -1,6 +1,6 @@
 include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions_url .)
-add_library(clickhouse_functions_url ${clickhouse_functions_url_sources} ${clickhouse_functions_url_headers})
+add_library(clickhouse_functions_url OBJECT ${clickhouse_functions_url_sources} ${clickhouse_functions_url_headers})
 target_link_libraries(clickhouse_functions_url PRIVATE dbms)
 
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
@@ -10,6 +10,7 @@ endif()
 # TODO: move Functions/Regexps.h to some lib and use here
 if (TARGET ch_contrib::vectorscan)
     target_link_libraries(clickhouse_functions_url PRIVATE ch_contrib::vectorscan)
+    list (APPEND PRIVATE_LIBS ch_contrib::vectorscan PARENT_SCOPE)
 endif()
 
 if (USE_GPERF)
diff --git a/src/Functions/URL/URLHierarchy.cpp b/src/Functions/URL/URLHierarchy.cpp
index e21450847b7..c0c3a7e5b37 100644
--- a/src/Functions/URL/URLHierarchy.cpp
+++ b/src/Functions/URL/URLHierarchy.cpp
@@ -104,7 +104,7 @@ public:
 struct NameURLPathHierarchy { static constexpr auto name = "URLPathHierarchy"; };
 using FunctionURLPathHierarchy = FunctionTokens<URLPathHierarchyImpl>;
 
-void registerFunctionURLPathHierarchy(FunctionFactory & factory)
+REGISTER_FUNCTION(URLPathHierarchy)
 {
     factory.registerFunction<FunctionURLPathHierarchy>();
 }
diff --git a/src/Functions/URL/URLPathHierarchy.cpp b/src/Functions/URL/URLPathHierarchy.cpp
index 6f8832ddf65..c00e61e67fd 100644
--- a/src/Functions/URL/URLPathHierarchy.cpp
+++ b/src/Functions/URL/URLPathHierarchy.cpp
@@ -106,7 +106,7 @@ public:
 struct NameURLHierarchy { static constexpr auto name = "URLHierarchy"; };
 using FunctionURLHierarchy = FunctionTokens<URLHierarchyImpl>;
 
-void registerFunctionURLHierarchy(FunctionFactory & factory)
+REGISTER_FUNCTION(URLHierarchy)
 {
     factory.registerFunction<FunctionURLHierarchy>();
 }
diff --git a/src/Functions/URL/basename.cpp b/src/Functions/URL/basename.cpp
index f97724020cb..6992f924ef2 100644
--- a/src/Functions/URL/basename.cpp
+++ b/src/Functions/URL/basename.cpp
@@ -34,7 +34,7 @@ struct ExtractBasename
 struct NameBasename { static constexpr auto name = "basename"; };
 using FunctionBasename = FunctionStringToString<ExtractSubstringImpl<ExtractBasename>, NameBasename>;
 
-void registerFunctionBasename(FunctionFactory & factory)
+REGISTER_FUNCTION(Basename)
 {
     factory.registerFunction<FunctionBasename>();
 }
diff --git a/src/Functions/URL/cutFragment.cpp b/src/Functions/URL/cutFragment.cpp
index 28ab287282d..3b99edf61a3 100644
--- a/src/Functions/URL/cutFragment.cpp
+++ b/src/Functions/URL/cutFragment.cpp
@@ -8,7 +8,7 @@ namespace DB
 struct NameCutFragment { static constexpr auto name = "cutFragment"; };
 using FunctionCutFragment = FunctionStringToString<CutSubstringImpl<ExtractFragment<false>>, NameCutFragment>;
 
-void registerFunctionCutFragment(FunctionFactory & factory)
+REGISTER_FUNCTION(CutFragment)
 {
     factory.registerFunction<FunctionCutFragment>();
 }
diff --git a/src/Functions/URL/cutQueryString.cpp b/src/Functions/URL/cutQueryString.cpp
index 44179a91f20..2886adc2e36 100644
--- a/src/Functions/URL/cutQueryString.cpp
+++ b/src/Functions/URL/cutQueryString.cpp
@@ -8,7 +8,7 @@ namespace DB
 struct NameCutQueryString { static constexpr auto name = "cutQueryString"; };
 using FunctionCutQueryString = FunctionStringToString<CutSubstringImpl<ExtractQueryString<false>>, NameCutQueryString>;
 
-void registerFunctionCutQueryString(FunctionFactory & factory)
+REGISTER_FUNCTION(CutQueryString)
 {
     factory.registerFunction<FunctionCutQueryString>();
 }
diff --git a/src/Functions/URL/cutQueryStringAndFragment.cpp b/src/Functions/URL/cutQueryStringAndFragment.cpp
index 0678fa8b6e9..4116b352542 100644
--- a/src/Functions/URL/cutQueryStringAndFragment.cpp
+++ b/src/Functions/URL/cutQueryStringAndFragment.cpp
@@ -8,7 +8,7 @@ namespace DB
 struct NameCutQueryStringAndFragment { static constexpr auto name = "cutQueryStringAndFragment"; };
 using FunctionCutQueryStringAndFragment = FunctionStringToString<CutSubstringImpl<ExtractQueryStringAndFragment<false>>, NameCutQueryStringAndFragment>;
 
-void registerFunctionCutQueryStringAndFragment(FunctionFactory & factory)
+REGISTER_FUNCTION(CutQueryStringAndFragment)
 {
     factory.registerFunction<FunctionCutQueryStringAndFragment>();
 }
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
index 82eb366dae6..dddfbe4f4dd 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
@@ -35,7 +35,7 @@ using FunctionCutToFirstSignificantSubdomain = FunctionStringToString<ExtractSub
 struct NameCutToFirstSignificantSubdomainWithWWW { static constexpr auto name = "cutToFirstSignificantSubdomainWithWWW"; };
 using FunctionCutToFirstSignificantSubdomainWithWWW = FunctionStringToString<ExtractSubstringImpl<CutToFirstSignificantSubdomain<false>>, NameCutToFirstSignificantSubdomainWithWWW>;
 
-void registerFunctionCutToFirstSignificantSubdomain(FunctionFactory & factory)
+REGISTER_FUNCTION(CutToFirstSignificantSubdomain)
 {
     factory.registerFunction<FunctionCutToFirstSignificantSubdomain>();
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainWithWWW>();
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
index 7532ddd00f2..a2e51200910 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomainCustom.cpp
@@ -34,7 +34,7 @@ using FunctionCutToFirstSignificantSubdomainCustom = FunctionCutToFirstSignifica
 struct NameCutToFirstSignificantSubdomainCustomWithWWW { static constexpr auto name = "cutToFirstSignificantSubdomainCustomWithWWW"; };
 using FunctionCutToFirstSignificantSubdomainCustomWithWWW = FunctionCutToFirstSignificantSubdomainCustomImpl<CutToFirstSignificantSubdomainCustom<false>, NameCutToFirstSignificantSubdomainCustomWithWWW>;
 
-void registerFunctionCutToFirstSignificantSubdomainCustom(FunctionFactory & factory)
+REGISTER_FUNCTION(CutToFirstSignificantSubdomainCustom)
 {
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainCustom>();
     factory.registerFunction<FunctionCutToFirstSignificantSubdomainCustomWithWWW>();
diff --git a/src/Functions/URL/cutURLParameter.cpp b/src/Functions/URL/cutURLParameter.cpp
index 2ff7c3e33d9..6077b068bd0 100644
--- a/src/Functions/URL/cutURLParameter.cpp
+++ b/src/Functions/URL/cutURLParameter.cpp
@@ -77,7 +77,7 @@ struct CutURLParameterImpl
 struct NameCutURLParameter { static constexpr auto name = "cutURLParameter"; };
 using FunctionCutURLParameter = FunctionsStringSearchToString<CutURLParameterImpl, NameCutURLParameter>;
 
-void registerFunctionCutURLParameter(FunctionFactory & factory)
+REGISTER_FUNCTION(CutURLParameter)
 {
     factory.registerFunction<FunctionCutURLParameter>();
 }
diff --git a/src/Functions/URL/cutWWW.cpp b/src/Functions/URL/cutWWW.cpp
index 9b55b0929b0..992d5128440 100644
--- a/src/Functions/URL/cutWWW.cpp
+++ b/src/Functions/URL/cutWWW.cpp
@@ -54,7 +54,7 @@ struct ExtractWWW
 struct NameCutWWW { static constexpr auto name = "cutWWW"; };
 using FunctionCutWWW = FunctionStringToString<CutSubstringImpl<ExtractWWW>, NameCutWWW>;
 
-void registerFunctionCutWWW(FunctionFactory & factory)
+REGISTER_FUNCTION(CutWWW)
 {
     factory.registerFunction<FunctionCutWWW>();
 }
diff --git a/src/Functions/URL/decodeURLComponent.cpp b/src/Functions/URL/decodeURLComponent.cpp
index a4c9e1f4eec..eb44ca005a8 100644
--- a/src/Functions/URL/decodeURLComponent.cpp
+++ b/src/Functions/URL/decodeURLComponent.cpp
@@ -172,7 +172,7 @@ using FunctionEncodeURLComponent = FunctionStringToString<CodeURLComponentImpl<e
 using FunctionDecodeURLFormComponent = FunctionStringToString<CodeURLComponentImpl<decode, true>, NameDecodeURLFormComponent>;
 using FunctionEncodeURLFormComponent = FunctionStringToString<CodeURLComponentImpl<encode, true>, NameEncodeURLFormComponent>;
 
-void registerFunctionEncodeAndDecodeURLComponent(FunctionFactory & factory)
+REGISTER_FUNCTION(EncodeAndDecodeURLComponent)
 {
     factory.registerFunction<FunctionDecodeURLComponent>();
     factory.registerFunction<FunctionEncodeURLComponent>();
diff --git a/src/Functions/URL/domain.cpp b/src/Functions/URL/domain.cpp
index 339d3366a34..1d781b37943 100644
--- a/src/Functions/URL/domain.cpp
+++ b/src/Functions/URL/domain.cpp
@@ -10,7 +10,7 @@ struct NameDomain { static constexpr auto name = "domain"; };
 using FunctionDomain = FunctionStringToString<ExtractSubstringImpl<ExtractDomain<false>>, NameDomain>;
 
 
-void registerFunctionDomain(FunctionFactory & factory)
+REGISTER_FUNCTION(Domain)
 {
     factory.registerFunction<FunctionDomain>();
 }
diff --git a/src/Functions/URL/domainWithoutWWW.cpp b/src/Functions/URL/domainWithoutWWW.cpp
index 2fcf88009a1..53ff5bc919e 100644
--- a/src/Functions/URL/domainWithoutWWW.cpp
+++ b/src/Functions/URL/domainWithoutWWW.cpp
@@ -9,7 +9,7 @@ struct NameDomainWithoutWWW { static constexpr auto name = "domainWithoutWWW"; }
 using FunctionDomainWithoutWWW = FunctionStringToString<ExtractSubstringImpl<ExtractDomain<true>>, NameDomainWithoutWWW>;
 
 
-void registerFunctionDomainWithoutWWW(FunctionFactory & factory)
+REGISTER_FUNCTION(DomainWithoutWWW)
 {
     factory.registerFunction<FunctionDomainWithoutWWW>();
 }
diff --git a/src/Functions/URL/extractURLParameter.cpp b/src/Functions/URL/extractURLParameter.cpp
index 983426ef0fc..f75875e0200 100644
--- a/src/Functions/URL/extractURLParameter.cpp
+++ b/src/Functions/URL/extractURLParameter.cpp
@@ -92,7 +92,7 @@ struct ExtractURLParameterImpl
 struct NameExtractURLParameter { static constexpr auto name = "extractURLParameter"; };
 using FunctionExtractURLParameter = FunctionsStringSearchToString<ExtractURLParameterImpl, NameExtractURLParameter>;
 
-void registerFunctionExtractURLParameter(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractURLParameter)
 {
     factory.registerFunction<FunctionExtractURLParameter>();
 }
diff --git a/src/Functions/URL/extractURLParameterNames.cpp b/src/Functions/URL/extractURLParameterNames.cpp
index 377e969a6b7..f274547ed4e 100644
--- a/src/Functions/URL/extractURLParameterNames.cpp
+++ b/src/Functions/URL/extractURLParameterNames.cpp
@@ -89,7 +89,7 @@ public:
 struct NameExtractURLParameterNames { static constexpr auto name = "extractURLParameterNames"; };
 using FunctionExtractURLParameterNames = FunctionTokens<ExtractURLParameterNamesImpl>;
 
-void registerFunctionExtractURLParameterNames(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractURLParameterNames)
 {
     factory.registerFunction<FunctionExtractURLParameterNames>();
 }
diff --git a/src/Functions/URL/extractURLParameters.cpp b/src/Functions/URL/extractURLParameters.cpp
index fb595c23170..15b564fc947 100644
--- a/src/Functions/URL/extractURLParameters.cpp
+++ b/src/Functions/URL/extractURLParameters.cpp
@@ -97,7 +97,7 @@ public:
 struct NameExtractURLParameters { static constexpr auto name = "extractURLParameters"; };
 using FunctionExtractURLParameters = FunctionTokens<ExtractURLParametersImpl>;
 
-void registerFunctionExtractURLParameters(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractURLParameters)
 {
     factory.registerFunction<FunctionExtractURLParameters>();
 }
diff --git a/src/Functions/URL/firstSignificantSubdomain.cpp b/src/Functions/URL/firstSignificantSubdomain.cpp
index 87659940938..d3aeb90771f 100644
--- a/src/Functions/URL/firstSignificantSubdomain.cpp
+++ b/src/Functions/URL/firstSignificantSubdomain.cpp
@@ -10,7 +10,7 @@ struct NameFirstSignificantSubdomain { static constexpr auto name = "firstSignif
 
 using FunctionFirstSignificantSubdomain = FunctionStringToString<ExtractSubstringImpl<ExtractFirstSignificantSubdomain<true>>, NameFirstSignificantSubdomain>;
 
-void registerFunctionFirstSignificantSubdomain(FunctionFactory & factory)
+REGISTER_FUNCTION(FirstSignificantSubdomain)
 {
     factory.registerFunction<FunctionFirstSignificantSubdomain>();
 }
diff --git a/src/Functions/URL/firstSignificantSubdomainCustom.cpp b/src/Functions/URL/firstSignificantSubdomainCustom.cpp
index 675b4a346de..f43b42d0309 100644
--- a/src/Functions/URL/firstSignificantSubdomainCustom.cpp
+++ b/src/Functions/URL/firstSignificantSubdomainCustom.cpp
@@ -10,7 +10,7 @@ struct NameFirstSignificantSubdomainCustom { static constexpr auto name = "first
 
 using FunctionFirstSignificantSubdomainCustom = FunctionCutToFirstSignificantSubdomainCustomImpl<ExtractFirstSignificantSubdomain<true>, NameFirstSignificantSubdomainCustom>;
 
-void registerFunctionFirstSignificantSubdomainCustom(FunctionFactory & factory)
+REGISTER_FUNCTION(FirstSignificantSubdomainCustom)
 {
     factory.registerFunction<FunctionFirstSignificantSubdomainCustom>();
 }
diff --git a/src/Functions/URL/fragment.cpp b/src/Functions/URL/fragment.cpp
index 181ee6ce72c..262c1a4c7a6 100644
--- a/src/Functions/URL/fragment.cpp
+++ b/src/Functions/URL/fragment.cpp
@@ -8,7 +8,7 @@ namespace DB
 struct NameFragment { static constexpr auto name = "fragment"; };
 using FunctionFragment = FunctionStringToString<ExtractSubstringImpl<ExtractFragment<true>>, NameFragment>;
 
-void registerFunctionFragment(FunctionFactory & factory)
+REGISTER_FUNCTION(Fragment)
 {
     factory.registerFunction<FunctionFragment>();
 }
diff --git a/src/Functions/URL/netloc.cpp b/src/Functions/URL/netloc.cpp
index 723eea138c3..5c23f7cc06d 100644
--- a/src/Functions/URL/netloc.cpp
+++ b/src/Functions/URL/netloc.cpp
@@ -132,7 +132,7 @@ struct ExtractNetloc
 struct NameNetloc { static constexpr auto name = "netloc"; };
 using FunctionNetloc = FunctionStringToString<ExtractSubstringImpl<ExtractNetloc>, NameNetloc>;
 
-void registerFunctionNetloc(FunctionFactory & factory)
+REGISTER_FUNCTION(Netloc)
 {
     factory.registerFunction<FunctionNetloc>();
 }
diff --git a/src/Functions/URL/path.cpp b/src/Functions/URL/path.cpp
index c3037956118..ccc7dedb724 100644
--- a/src/Functions/URL/path.cpp
+++ b/src/Functions/URL/path.cpp
@@ -11,7 +11,7 @@ namespace DB
 struct NamePath { static constexpr auto name = "path"; };
 using FunctionPath = FunctionStringToString<ExtractSubstringImpl<ExtractPath<false>>, NamePath>;
 
-void registerFunctionPath(FunctionFactory & factory)
+REGISTER_FUNCTION(Path)
 {
     factory.registerFunction<FunctionPath>();
 }
diff --git a/src/Functions/URL/pathFull.cpp b/src/Functions/URL/pathFull.cpp
index f37c42e3753..002770e812a 100644
--- a/src/Functions/URL/pathFull.cpp
+++ b/src/Functions/URL/pathFull.cpp
@@ -10,7 +10,7 @@ namespace DB
 struct NamePathFull { static constexpr auto name = "pathFull"; };
 using FunctionPathFull = FunctionStringToString<ExtractSubstringImpl<ExtractPath<true>>, NamePathFull>;
 
-void registerFunctionPathFull(FunctionFactory & factory)
+REGISTER_FUNCTION(PathFull)
 {
     factory.registerFunction<FunctionPathFull>();
 }
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index 3bbcdcea560..85b060ca987 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -121,7 +121,7 @@ private:
     }
 };
 
-void registerFunctionPort(FunctionFactory & factory)
+REGISTER_FUNCTION(Port)
 {
     factory.registerFunction<FunctionPort>();
 }
diff --git a/src/Functions/URL/protocol.cpp b/src/Functions/URL/protocol.cpp
index 2948b044d70..6bed71207f6 100644
--- a/src/Functions/URL/protocol.cpp
+++ b/src/Functions/URL/protocol.cpp
@@ -9,7 +9,7 @@ namespace DB
 struct NameProtocol { static constexpr auto name = "protocol"; };
 using FunctionProtocol = FunctionStringToString<ExtractSubstringImpl<ExtractProtocol>, NameProtocol>;
 
-void registerFunctionProtocol(FunctionFactory & factory)
+REGISTER_FUNCTION(Protocol)
 {
     factory.registerFunction<FunctionProtocol>();
 }
diff --git a/src/Functions/URL/queryString.cpp b/src/Functions/URL/queryString.cpp
index 7edf212415d..7069ce46b38 100644
--- a/src/Functions/URL/queryString.cpp
+++ b/src/Functions/URL/queryString.cpp
@@ -8,7 +8,7 @@ namespace DB
 struct NameQueryString { static constexpr auto name = "queryString"; };
 using FunctionQueryString = FunctionStringToString<ExtractSubstringImpl<ExtractQueryString<true>>, NameQueryString>;
 
-void registerFunctionQueryString(FunctionFactory & factory)
+REGISTER_FUNCTION(QueryString)
 {
     factory.registerFunction<FunctionQueryString>();
 }
diff --git a/src/Functions/URL/queryStringAndFragment.cpp b/src/Functions/URL/queryStringAndFragment.cpp
index 18f14f9a2b9..367a95acbdc 100644
--- a/src/Functions/URL/queryStringAndFragment.cpp
+++ b/src/Functions/URL/queryStringAndFragment.cpp
@@ -8,7 +8,7 @@ namespace DB
 struct NameQueryStringAndFragment { static constexpr auto name = "queryStringAndFragment"; };
 using FunctionQueryStringAndFragment = FunctionStringToString<ExtractSubstringImpl<ExtractQueryStringAndFragment<true>>, NameQueryStringAndFragment>;
 
-void registerFunctionQueryStringAndFragment(FunctionFactory & factory)
+REGISTER_FUNCTION(QueryStringAndFragment)
 {
     factory.registerFunction<FunctionQueryStringAndFragment>();
 }
diff --git a/src/Functions/URL/registerFunctionsURL.cpp b/src/Functions/URL/registerFunctionsURL.cpp
deleted file mode 100644
index 91142a593f2..00000000000
--- a/src/Functions/URL/registerFunctionsURL.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionProtocol(FunctionFactory & factory);
-void registerFunctionDomain(FunctionFactory & factory);
-void registerFunctionDomainWithoutWWW(FunctionFactory & factory);
-void registerFunctionFirstSignificantSubdomain(FunctionFactory & factory);
-void registerFunctionFirstSignificantSubdomainCustom(FunctionFactory & factory);
-void registerFunctionTopLevelDomain(FunctionFactory & factory);
-void registerFunctionPort(FunctionFactory & factory);
-void registerFunctionPath(FunctionFactory & factory);
-void registerFunctionPathFull(FunctionFactory & factory);
-void registerFunctionQueryString(FunctionFactory & factory);
-void registerFunctionFragment(FunctionFactory & factory);
-void registerFunctionQueryStringAndFragment(FunctionFactory & factory);
-void registerFunctionExtractURLParameter(FunctionFactory & factory);
-void registerFunctionExtractURLParameters(FunctionFactory & factory);
-void registerFunctionExtractURLParameterNames(FunctionFactory & factory);
-void registerFunctionURLHierarchy(FunctionFactory & factory);
-void registerFunctionURLPathHierarchy(FunctionFactory & factory);
-void registerFunctionCutToFirstSignificantSubdomain(FunctionFactory & factory);
-void registerFunctionCutToFirstSignificantSubdomainCustom(FunctionFactory & factory);
-void registerFunctionCutWWW(FunctionFactory & factory);
-void registerFunctionCutQueryString(FunctionFactory & factory);
-void registerFunctionCutFragment(FunctionFactory & factory);
-void registerFunctionCutQueryStringAndFragment(FunctionFactory & factory);
-void registerFunctionCutURLParameter(FunctionFactory & factory);
-void registerFunctionEncodeAndDecodeURLComponent(FunctionFactory & factory);
-void registerFunctionNetloc(FunctionFactory & factory);
-
-void registerFunctionsURL(FunctionFactory & factory)
-{
-    registerFunctionProtocol(factory);
-    registerFunctionDomain(factory);
-    registerFunctionDomainWithoutWWW(factory);
-    registerFunctionFirstSignificantSubdomain(factory);
-    registerFunctionFirstSignificantSubdomainCustom(factory);
-    registerFunctionTopLevelDomain(factory);
-    registerFunctionPort(factory);
-    registerFunctionPath(factory);
-    registerFunctionPathFull(factory);
-    registerFunctionQueryString(factory);
-    registerFunctionFragment(factory);
-    registerFunctionQueryStringAndFragment(factory);
-    registerFunctionExtractURLParameter(factory);
-    registerFunctionExtractURLParameters(factory);
-    registerFunctionExtractURLParameterNames(factory);
-    registerFunctionURLHierarchy(factory);
-    registerFunctionURLPathHierarchy(factory);
-    registerFunctionCutToFirstSignificantSubdomain(factory);
-    registerFunctionCutToFirstSignificantSubdomainCustom(factory);
-    registerFunctionCutWWW(factory);
-    registerFunctionCutQueryString(factory);
-    registerFunctionCutFragment(factory);
-    registerFunctionCutQueryStringAndFragment(factory);
-    registerFunctionCutURLParameter(factory);
-    registerFunctionEncodeAndDecodeURLComponent(factory);
-    registerFunctionNetloc(factory);
-}
-
-}
-
diff --git a/src/Functions/URL/topLevelDomain.cpp b/src/Functions/URL/topLevelDomain.cpp
index ade9439d8ec..23ba5201c18 100644
--- a/src/Functions/URL/topLevelDomain.cpp
+++ b/src/Functions/URL/topLevelDomain.cpp
@@ -43,7 +43,7 @@ struct ExtractTopLevelDomain
 struct NameTopLevelDomain { static constexpr auto name = "topLevelDomain"; };
 using FunctionTopLevelDomain = FunctionStringToString<ExtractSubstringImpl<ExtractTopLevelDomain>, NameTopLevelDomain>;
 
-void registerFunctionTopLevelDomain(FunctionFactory & factory)
+REGISTER_FUNCTION(TopLevelDomain)
 {
     factory.registerFunction<FunctionTopLevelDomain>();
 }
diff --git a/src/Functions/abs.cpp b/src/Functions/abs.cpp
index f8c68c0ded2..67aa5ec6e90 100644
--- a/src/Functions/abs.cpp
+++ b/src/Functions/abs.cpp
@@ -50,7 +50,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameAbs>
     }
 };
 
-void registerFunctionAbs(FunctionFactory & factory)
+REGISTER_FUNCTION(Abs)
 {
     factory.registerFunction<FunctionAbs>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/acos.cpp b/src/Functions/acos.cpp
index 62e68b5c17b..1fbd636f14e 100644
--- a/src/Functions/acos.cpp
+++ b/src/Functions/acos.cpp
@@ -12,7 +12,7 @@ using FunctionAcos = FunctionMathUnary<UnaryFunctionVectorized<AcosName, acos>>;
 
 }
 
-void registerFunctionAcos(FunctionFactory & factory)
+REGISTER_FUNCTION(Acos)
 {
     factory.registerFunction<FunctionAcos>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/acosh.cpp b/src/Functions/acosh.cpp
index 20473faafc7..5b071da9c40 100644
--- a/src/Functions/acosh.cpp
+++ b/src/Functions/acosh.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionAcosh(FunctionFactory & factory)
+REGISTER_FUNCTION(Acosh)
 {
     factory.registerFunction<FunctionAcosh>();
 }
diff --git a/src/Functions/addDays.cpp b/src/Functions/addDays.cpp
index c86d7cfb2c1..75559963379 100644
--- a/src/Functions/addDays.cpp
+++ b/src/Functions/addDays.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddDays = FunctionDateOrDateTimeAddInterval<AddDaysImpl>;
 
-void registerFunctionAddDays(FunctionFactory & factory)
+REGISTER_FUNCTION(AddDays)
 {
     factory.registerFunction<FunctionAddDays>();
 }
diff --git a/src/Functions/addHours.cpp b/src/Functions/addHours.cpp
index cc526e6c8dc..d72a8624431 100644
--- a/src/Functions/addHours.cpp
+++ b/src/Functions/addHours.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddHours = FunctionDateOrDateTimeAddInterval<AddHoursImpl>;
 
-void registerFunctionAddHours(FunctionFactory & factory)
+REGISTER_FUNCTION(AddHours)
 {
     factory.registerFunction<FunctionAddHours>();
 }
diff --git a/src/Functions/addMinutes.cpp b/src/Functions/addMinutes.cpp
index b7920490a83..afd10219b1e 100644
--- a/src/Functions/addMinutes.cpp
+++ b/src/Functions/addMinutes.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddMinutes = FunctionDateOrDateTimeAddInterval<AddMinutesImpl>;
 
-void registerFunctionAddMinutes(FunctionFactory & factory)
+REGISTER_FUNCTION(AddMinutes)
 {
     factory.registerFunction<FunctionAddMinutes>();
 }
diff --git a/src/Functions/addMonths.cpp b/src/Functions/addMonths.cpp
index c74a8ecb08b..c604d64bec6 100644
--- a/src/Functions/addMonths.cpp
+++ b/src/Functions/addMonths.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddMonths = FunctionDateOrDateTimeAddInterval<AddMonthsImpl>;
 
-void registerFunctionAddMonths(FunctionFactory & factory)
+REGISTER_FUNCTION(AddMonths)
 {
     factory.registerFunction<FunctionAddMonths>();
 }
diff --git a/src/Functions/addQuarters.cpp b/src/Functions/addQuarters.cpp
index 9b5e3556ff3..36a9a56987b 100644
--- a/src/Functions/addQuarters.cpp
+++ b/src/Functions/addQuarters.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddQuarters = FunctionDateOrDateTimeAddInterval<AddQuartersImpl>;
 
-void registerFunctionAddQuarters(FunctionFactory & factory)
+REGISTER_FUNCTION(AddQuarters)
 {
     factory.registerFunction<FunctionAddQuarters>();
 }
diff --git a/src/Functions/addSeconds.cpp b/src/Functions/addSeconds.cpp
index 8ba229e238c..9a869236e97 100644
--- a/src/Functions/addSeconds.cpp
+++ b/src/Functions/addSeconds.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddSeconds = FunctionDateOrDateTimeAddInterval<AddSecondsImpl>;
 
-void registerFunctionAddSeconds(FunctionFactory & factory)
+REGISTER_FUNCTION(AddSeconds)
 {
     factory.registerFunction<FunctionAddSeconds>();
 }
diff --git a/src/Functions/addSubSeconds.cpp b/src/Functions/addSubSeconds.cpp
index cb5ffce61e3..fa901ad4dcd 100644
--- a/src/Functions/addSubSeconds.cpp
+++ b/src/Functions/addSubSeconds.cpp
@@ -6,19 +6,19 @@ namespace DB
 {
 
 using FunctionAddNanoseconds = FunctionDateOrDateTimeAddInterval<AddNanosecondsImpl>;
-void registerFunctionAddNanoseconds(FunctionFactory & factory)
+REGISTER_FUNCTION(AddNanoseconds)
 {
     factory.registerFunction<FunctionAddNanoseconds>();
 }
 
 using FunctionAddMicroseconds = FunctionDateOrDateTimeAddInterval<AddMicrosecondsImpl>;
-void registerFunctionAddMicroseconds(FunctionFactory & factory)
+REGISTER_FUNCTION(AddMicroseconds)
 {
     factory.registerFunction<FunctionAddMicroseconds>();
 }
 
 using FunctionAddMilliseconds = FunctionDateOrDateTimeAddInterval<AddMillisecondsImpl>;
-void registerFunctionAddMilliseconds(FunctionFactory & factory)
+REGISTER_FUNCTION(AddMilliseconds)
 {
     factory.registerFunction<FunctionAddMilliseconds>();
 }
diff --git a/src/Functions/addWeeks.cpp b/src/Functions/addWeeks.cpp
index 2b83f61f45c..366d85c4def 100644
--- a/src/Functions/addWeeks.cpp
+++ b/src/Functions/addWeeks.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddWeeks = FunctionDateOrDateTimeAddInterval<AddWeeksImpl>;
 
-void registerFunctionAddWeeks(FunctionFactory & factory)
+REGISTER_FUNCTION(AddWeeks)
 {
     factory.registerFunction<FunctionAddWeeks>();
 }
diff --git a/src/Functions/addYears.cpp b/src/Functions/addYears.cpp
index 24364154c23..ca2b55e9da2 100644
--- a/src/Functions/addYears.cpp
+++ b/src/Functions/addYears.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionAddYears = FunctionDateOrDateTimeAddInterval<AddYearsImpl>;
 
-void registerFunctionAddYears(FunctionFactory & factory)
+REGISTER_FUNCTION(AddYears)
 {
     factory.registerFunction<FunctionAddYears>();
 }
diff --git a/src/Functions/addressToLine.cpp b/src/Functions/addressToLine.cpp
index 2e731539636..42f9be23c38 100644
--- a/src/Functions/addressToLine.cpp
+++ b/src/Functions/addressToLine.cpp
@@ -58,7 +58,7 @@ protected:
 
 }
 
-void registerFunctionAddressToLine(FunctionFactory & factory)
+REGISTER_FUNCTION(AddressToLine)
 {
     factory.registerFunction<FunctionAddressToLine>();
 }
diff --git a/src/Functions/addressToLineWithInlines.cpp b/src/Functions/addressToLineWithInlines.cpp
index ea2adcd140c..9a7b0858b87 100644
--- a/src/Functions/addressToLineWithInlines.cpp
+++ b/src/Functions/addressToLineWithInlines.cpp
@@ -89,7 +89,7 @@ private:
 
 }
 
-void registerFunctionAddressToLineWithInlines(FunctionFactory & factory)
+REGISTER_FUNCTION(AddressToLineWithInlines)
 {
     factory.registerFunction<FunctionAddressToLineWithInlines>();
 }
diff --git a/src/Functions/addressToSymbol.cpp b/src/Functions/addressToSymbol.cpp
index fd26ebce0f1..99988ee82f6 100644
--- a/src/Functions/addressToSymbol.cpp
+++ b/src/Functions/addressToSymbol.cpp
@@ -94,7 +94,7 @@ public:
 
 }
 
-void registerFunctionAddressToSymbol(FunctionFactory & factory)
+REGISTER_FUNCTION(AddressToSymbol)
 {
     factory.registerFunction<FunctionAddressToSymbol>();
 }
diff --git a/src/Functions/aes_decrypt_mysql.cpp b/src/Functions/aes_decrypt_mysql.cpp
index 764fcf06c1a..8ba7eaa8e80 100644
--- a/src/Functions/aes_decrypt_mysql.cpp
+++ b/src/Functions/aes_decrypt_mysql.cpp
@@ -19,7 +19,7 @@ struct DecryptMySQLModeImpl
 namespace DB
 {
 
-void registerFunctionAESDecryptMysql(FunctionFactory & factory)
+REGISTER_FUNCTION(AESDecryptMysql)
 {
     factory.registerFunction<FunctionDecrypt<DecryptMySQLModeImpl>>();
 }
diff --git a/src/Functions/aes_encrypt_mysql.cpp b/src/Functions/aes_encrypt_mysql.cpp
index 1d84824d9d6..24d618b5a86 100644
--- a/src/Functions/aes_encrypt_mysql.cpp
+++ b/src/Functions/aes_encrypt_mysql.cpp
@@ -19,7 +19,7 @@ struct EncryptMySQLModeImpl
 namespace DB
 {
 
-void registerFunctionAESEncryptMysql(FunctionFactory & factory)
+REGISTER_FUNCTION(AESEncryptMysql)
 {
     factory.registerFunction<FunctionEncrypt<EncryptMySQLModeImpl>>();
 }
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 1661ec8fb0e..9fe141458fb 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -115,7 +115,7 @@ private:
 
 }
 
-void registerFunctionAppendTrailingCharIfAbsent(FunctionFactory & factory)
+REGISTER_FUNCTION(AppendTrailingCharIfAbsent)
 {
     factory.registerFunction<FunctionAppendTrailingCharIfAbsent>();
 }
diff --git a/src/Functions/array/CMakeLists.txt b/src/Functions/array/CMakeLists.txt
index 6b4a8122d16..98335dbb8e7 100644
--- a/src/Functions/array/CMakeLists.txt
+++ b/src/Functions/array/CMakeLists.txt
@@ -1,6 +1,6 @@
 include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions_array .)
-add_library(clickhouse_functions_array ${clickhouse_functions_array_sources} ${clickhouse_functions_array_headers})
+add_library(clickhouse_functions_array OBJECT ${clickhouse_functions_array_sources} ${clickhouse_functions_array_headers})
 target_link_libraries(clickhouse_functions_array PRIVATE dbms clickhouse_functions_gatherutils)
 
 if (OMIT_HEAVY_DEBUG_SYMBOLS)
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index f220117407c..551f0a6625b 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -100,7 +100,7 @@ private:
 };
 
 
-void registerFunctionArray(FunctionFactory & factory)
+REGISTER_FUNCTION(Array)
 {
     factory.registerFunction<FunctionArray>();
 }
diff --git a/src/Functions/array/arrayAUC.cpp b/src/Functions/array/arrayAUC.cpp
index 1af0ca331a7..78c6fae59ca 100644
--- a/src/Functions/array/arrayAUC.cpp
+++ b/src/Functions/array/arrayAUC.cpp
@@ -140,7 +140,7 @@ public:
 /// auc(array_score, array_label) - Calculate AUC with array of score and label
 using FunctionArrayAUC = FunctionArrayScalarProduct<ArrayAUCImpl, NameArrayAUC>;
 
-void registerFunctionArrayAUC(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayAUC)
 {
     factory.registerFunction<FunctionArrayAUC>();
 }
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 9c18c6213de..7b72060f0c0 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -387,7 +387,7 @@ using FunctionArrayAverage = FunctionArrayMapped<ArrayAggregateImpl<AggregateOpe
 struct NameArrayProduct { static constexpr auto name = "arrayProduct"; };
 using FunctionArrayProduct = FunctionArrayMapped<ArrayAggregateImpl<AggregateOperation::product>, NameArrayProduct>;
 
-void registerFunctionArrayAggregation(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayAggregation)
 {
     factory.registerFunction<FunctionArrayMin>();
     factory.registerFunction<FunctionArrayMax>();
diff --git a/src/Functions/array/arrayAll.cpp b/src/Functions/array/arrayAll.cpp
index 0f7ae797dc9..960f1f59fc0 100644
--- a/src/Functions/array/arrayAll.cpp
+++ b/src/Functions/array/arrayAll.cpp
@@ -86,7 +86,7 @@ struct ArrayAllImpl
 struct NameArrayAll { static constexpr auto name = "arrayAll"; };
 using FunctionArrayAll = FunctionArrayMapped<ArrayAllImpl, NameArrayAll>;
 
-void registerFunctionArrayAll(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayAll)
 {
     factory.registerFunction<FunctionArrayAll>();
 }
diff --git a/src/Functions/array/arrayCompact.cpp b/src/Functions/array/arrayCompact.cpp
index 8abce7288d2..5c899d4d97e 100644
--- a/src/Functions/array/arrayCompact.cpp
+++ b/src/Functions/array/arrayCompact.cpp
@@ -162,7 +162,7 @@ struct ArrayCompactImpl
 struct NameArrayCompact { static constexpr auto name = "arrayCompact"; };
 using FunctionArrayCompact = FunctionArrayMapped<ArrayCompactImpl, NameArrayCompact>;
 
-void registerFunctionArrayCompact(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayCompact)
 {
     factory.registerFunction<FunctionArrayCompact>();
 }
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 0a8f289ab3f..1878cc27323 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -98,7 +98,7 @@ public:
 };
 
 
-void registerFunctionArrayConcat(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayConcat)
 {
     factory.registerFunction<FunctionArrayConcat>();
 }
diff --git a/src/Functions/array/arrayCount.cpp b/src/Functions/array/arrayCount.cpp
index df45783323b..cb902206e8b 100644
--- a/src/Functions/array/arrayCount.cpp
+++ b/src/Functions/array/arrayCount.cpp
@@ -83,7 +83,7 @@ struct ArrayCountImpl
 struct NameArrayCount { static constexpr auto name = "arrayCount"; };
 using FunctionArrayCount = FunctionArrayMapped<ArrayCountImpl, NameArrayCount>;
 
-void registerFunctionArrayCount(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayCount)
 {
     factory.registerFunction<FunctionArrayCount>();
 }
diff --git a/src/Functions/array/arrayCumSum.cpp b/src/Functions/array/arrayCumSum.cpp
index 98ffa09820b..3bb733482b6 100644
--- a/src/Functions/array/arrayCumSum.cpp
+++ b/src/Functions/array/arrayCumSum.cpp
@@ -162,7 +162,7 @@ struct ArrayCumSumImpl
 struct NameArrayCumSum { static constexpr auto name = "arrayCumSum"; };
 using FunctionArrayCumSum = FunctionArrayMapped<ArrayCumSumImpl, NameArrayCumSum>;
 
-void registerFunctionArrayCumSum(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayCumSum)
 {
     factory.registerFunction<FunctionArrayCumSum>();
 }
diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index cd8393b7a5f..1e27b773141 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -126,7 +126,7 @@ struct ArrayCumSumNonNegativeImpl
 struct NameArrayCumSumNonNegative { static constexpr auto name = "arrayCumSumNonNegative"; };
 using FunctionArrayCumSumNonNegative = FunctionArrayMapped<ArrayCumSumNonNegativeImpl, NameArrayCumSumNonNegative>;
 
-void registerFunctionArrayCumSumNonNegative(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayCumSumNonNegative)
 {
     factory.registerFunction<FunctionArrayCumSumNonNegative>();
 }
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index 8af0e8b04f9..118fe87270b 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -84,7 +84,7 @@ struct ArrayDifferenceImpl
                 }
                 else
                 {
-                    dst[pos] = curr - prev;
+                    dst[pos] = static_cast<Result>(curr) - static_cast<Result>(prev);
                 }
 
                 prev = curr;
@@ -155,7 +155,7 @@ struct ArrayDifferenceImpl
 struct NameArrayDifference { static constexpr auto name = "arrayDifference"; };
 using FunctionArrayDifference = FunctionArrayMapped<ArrayDifferenceImpl, NameArrayDifference>;
 
-void registerFunctionArrayDifference(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayDifference)
 {
     factory.registerFunction<FunctionArrayDifference>();
 }
diff --git a/src/Functions/array/arrayDistinct.cpp b/src/Functions/array/arrayDistinct.cpp
index e71a582bbe0..46b0efd2634 100644
--- a/src/Functions/array/arrayDistinct.cpp
+++ b/src/Functions/array/arrayDistinct.cpp
@@ -289,7 +289,7 @@ void FunctionArrayDistinct::executeHashed(
 }
 
 
-void registerFunctionArrayDistinct(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayDistinct)
 {
     factory.registerFunction<FunctionArrayDistinct>();
 }
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index d8e44dc297d..a7b27bae268 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -475,10 +475,11 @@ ColumnPtr FunctionArrayElement::executeNumberConst(
 
     auto col_res = ColumnVector<DataType>::create();
 
-    if (index.getType() == Field::Types::UInt64)
+    if (index.getType() == Field::Types::UInt64
+        || (index.getType() == Field::Types::Int64 && get<Int64>(index) >= 0))
     {
         ArrayElementNumImpl<DataType>::template vectorConst<false>(
-            col_nested->getData(), col_array->getOffsets(), safeGet<UInt64>(index) - 1, col_res->getData(), builder);
+            col_nested->getData(), col_array->getOffsets(), get<UInt64>(index) - 1, col_res->getData(), builder);
     }
     else if (index.getType() == Field::Types::Int64)
     {
@@ -537,12 +538,13 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
 
     auto col_res = ColumnString::create();
 
-    if (index.getType() == Field::Types::UInt64)
+    if (index.getType() == Field::Types::UInt64
+        || (index.getType() == Field::Types::Int64 && get<Int64>(index) >= 0))
         ArrayElementStringImpl::vectorConst<false>(
             col_nested->getChars(),
             col_array->getOffsets(),
             col_nested->getOffsets(),
-            safeGet<UInt64>(index) - 1,
+            get<UInt64>(index) - 1,
             col_res->getChars(),
             col_res->getOffsets(),
             builder);
@@ -551,7 +553,7 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
             col_nested->getChars(),
             col_array->getOffsets(),
             col_nested->getOffsets(),
-            -(UInt64(safeGet<Int64>(index)) + 1),
+            -(UInt64(get<Int64>(index)) + 1),
             col_res->getChars(),
             col_res->getOffsets(),
             builder);
@@ -600,12 +602,13 @@ ColumnPtr FunctionArrayElement::executeGenericConst(
     const auto & col_nested = col_array->getData();
     auto col_res = col_nested.cloneEmpty();
 
-    if (index.getType() == Field::Types::UInt64)
+    if (index.getType() == Field::Types::UInt64
+        || (index.getType() == Field::Types::Int64 && get<Int64>(index) >= 0))
         ArrayElementGenericImpl::vectorConst<false>(
-            col_nested, col_array->getOffsets(), safeGet<UInt64>(index) - 1, *col_res, builder);
+            col_nested, col_array->getOffsets(), get<UInt64>(index) - 1, *col_res, builder);
     else if (index.getType() == Field::Types::Int64)
         ArrayElementGenericImpl::vectorConst<true>(
-            col_nested, col_array->getOffsets(), -(static_cast<UInt64>(safeGet<Int64>(index) + 1)), *col_res, builder);
+            col_nested, col_array->getOffsets(), -(static_cast<UInt64>(get<Int64>(index) + 1)), *col_res, builder);
     else
         throw Exception("Illegal type of array index", ErrorCodes::LOGICAL_ERROR);
 
@@ -1203,7 +1206,7 @@ ColumnPtr FunctionArrayElement::perform(const ColumnsWithTypeAndName & arguments
 }
 
 
-void registerFunctionArrayElement(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayElement)
 {
     factory.registerFunction<FunctionArrayElement>();
 }
diff --git a/src/Functions/array/arrayEnumerate.cpp b/src/Functions/array/arrayEnumerate.cpp
index f7b6a7e9547..b20f91fe2dd 100644
--- a/src/Functions/array/arrayEnumerate.cpp
+++ b/src/Functions/array/arrayEnumerate.cpp
@@ -76,7 +76,7 @@ public:
 };
 
 
-void registerFunctionArrayEnumerate(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayEnumerate)
 {
     factory.registerFunction<FunctionArrayEnumerate>();
 }
diff --git a/src/Functions/array/arrayEnumerateDense.cpp b/src/Functions/array/arrayEnumerateDense.cpp
index 4539aed18ab..6f82bbed448 100644
--- a/src/Functions/array/arrayEnumerateDense.cpp
+++ b/src/Functions/array/arrayEnumerateDense.cpp
@@ -14,7 +14,7 @@ public:
     using Base::create;
 };
 
-void registerFunctionArrayEnumerateDense(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayEnumerateDense)
 {
     factory.registerFunction<FunctionArrayEnumerateDense>();
 }
diff --git a/src/Functions/array/arrayEnumerateDenseRanked.cpp b/src/Functions/array/arrayEnumerateDenseRanked.cpp
index 735211fb3df..8799612de00 100644
--- a/src/Functions/array/arrayEnumerateDenseRanked.cpp
+++ b/src/Functions/array/arrayEnumerateDenseRanked.cpp
@@ -14,7 +14,7 @@ public:
     using Base::create;
 };
 
-void registerFunctionArrayEnumerateDenseRanked(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayEnumerateDenseRanked)
 {
     factory.registerFunction<FunctionArrayEnumerateDenseRanked>();
 }
diff --git a/src/Functions/array/arrayEnumerateUniq.cpp b/src/Functions/array/arrayEnumerateUniq.cpp
index 848b29064c4..e25a07450f0 100644
--- a/src/Functions/array/arrayEnumerateUniq.cpp
+++ b/src/Functions/array/arrayEnumerateUniq.cpp
@@ -20,7 +20,7 @@ public:
     using Base::create;
 };
 
-void registerFunctionArrayEnumerateUniq(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayEnumerateUniq)
 {
     factory.registerFunction<FunctionArrayEnumerateUniq>();
 }
diff --git a/src/Functions/array/arrayEnumerateUniqRanked.cpp b/src/Functions/array/arrayEnumerateUniqRanked.cpp
index 2cd1fe40c2e..42e3d989f62 100644
--- a/src/Functions/array/arrayEnumerateUniqRanked.cpp
+++ b/src/Functions/array/arrayEnumerateUniqRanked.cpp
@@ -14,7 +14,7 @@ public:
     using Base::create;
 };
 
-void registerFunctionArrayEnumerateUniqRanked(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayEnumerateUniqRanked)
 {
     factory.registerFunction<FunctionArrayEnumerateUniqRanked>();
 }
diff --git a/src/Functions/array/arrayExists.cpp b/src/Functions/array/arrayExists.cpp
index ea39cc0dc0b..c1731b05229 100644
--- a/src/Functions/array/arrayExists.cpp
+++ b/src/Functions/array/arrayExists.cpp
@@ -87,7 +87,7 @@ struct ArrayExistsImpl
 struct NameArrayExists { static constexpr auto name = "arrayExists"; };
 using FunctionArrayExists = FunctionArrayMapped<ArrayExistsImpl, NameArrayExists>;
 
-void registerFunctionArrayExists(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayExists)
 {
     factory.registerFunction<FunctionArrayExists>();
 }
diff --git a/src/Functions/array/arrayFill.cpp b/src/Functions/array/arrayFill.cpp
index 22b9e9a657b..bd424c3f474 100644
--- a/src/Functions/array/arrayFill.cpp
+++ b/src/Functions/array/arrayFill.cpp
@@ -129,7 +129,7 @@ struct NameArrayReverseFill { static constexpr auto name = "arrayReverseFill"; }
 using FunctionArrayFill = FunctionArrayMapped<ArrayFillImpl<false>, NameArrayFill>;
 using FunctionArrayReverseFill = FunctionArrayMapped<ArrayFillImpl<true>, NameArrayReverseFill>;
 
-void registerFunctionsArrayFill(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayFill)
 {
     factory.registerFunction<FunctionArrayFill>();
     factory.registerFunction<FunctionArrayReverseFill>();
diff --git a/src/Functions/array/arrayFilter.cpp b/src/Functions/array/arrayFilter.cpp
index 89a9de44532..b66c8570f11 100644
--- a/src/Functions/array/arrayFilter.cpp
+++ b/src/Functions/array/arrayFilter.cpp
@@ -74,7 +74,7 @@ struct ArrayFilterImpl
 struct NameArrayFilter { static constexpr auto name = "arrayFilter"; };
 using FunctionArrayFilter = FunctionArrayMapped<ArrayFilterImpl, NameArrayFilter>;
 
-void registerFunctionArrayFilter(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayFilter)
 {
     factory.registerFunction<FunctionArrayFilter>();
 }
diff --git a/src/Functions/array/arrayFirstLast.cpp b/src/Functions/array/arrayFirstLast.cpp
index c9a8d2ba497..8160234a6b0 100644
--- a/src/Functions/array/arrayFirstLast.cpp
+++ b/src/Functions/array/arrayFirstLast.cpp
@@ -194,7 +194,7 @@ struct NameArrayLastOrNull { static constexpr auto name = "arrayLastOrNull"; };
 using ArrayLastOrNullImpl = ArrayFirstLastImpl<ArrayFirstLastStrategy::Last, ArrayFirstLastElementNotExistsStrategy::Null>;
 using FunctionArrayLastOrNull = FunctionArrayMapped<ArrayLastOrNullImpl, NameArrayLastOrNull>;
 
-void registerFunctionArrayFirst(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayFirst)
 {
     factory.registerFunction<FunctionArrayFirst>();
     factory.registerFunction<FunctionArrayFirstOrNull>();
diff --git a/src/Functions/array/arrayFirstLastIndex.cpp b/src/Functions/array/arrayFirstLastIndex.cpp
index 9392cbdc840..f7355eb2b38 100644
--- a/src/Functions/array/arrayFirstLastIndex.cpp
+++ b/src/Functions/array/arrayFirstLastIndex.cpp
@@ -128,7 +128,7 @@ struct NameArrayLastIndex { static constexpr auto name = "arrayLastIndex"; };
 using ArrayLastIndexImpl = ArrayFirstLastIndexImpl<ArrayFirstLastIndexStrategy::Last>;
 using FunctionArrayLastIndex = FunctionArrayMapped<ArrayLastIndexImpl, NameArrayLastIndex>;
 
-void registerFunctionArrayFirstIndex(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayFirstIndex)
 {
     factory.registerFunction<FunctionArrayFirstIndex>();
     factory.registerFunction<FunctionArrayLastIndex>();
diff --git a/src/Functions/array/arrayFlatten.cpp b/src/Functions/array/arrayFlatten.cpp
index 929ad041b9a..b1f9399776e 100644
--- a/src/Functions/array/arrayFlatten.cpp
+++ b/src/Functions/array/arrayFlatten.cpp
@@ -121,7 +121,7 @@ private:
 };
 
 
-void registerFunctionArrayFlatten(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayFlatten)
 {
     factory.registerFunction<ArrayFlatten>();
     factory.registerAlias("flatten", "arrayFlatten", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index f1b849b64f0..4ed946d8bb3 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -585,7 +585,7 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
 }
 
 
-void registerFunctionArrayIntersect(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayIntersect)
 {
     factory.registerFunction<FunctionArrayIntersect>();
 }
diff --git a/src/Functions/array/arrayJoin.cpp b/src/Functions/array/arrayJoin.cpp
index 6d9950d9110..3230886c731 100644
--- a/src/Functions/array/arrayJoin.cpp
+++ b/src/Functions/array/arrayJoin.cpp
@@ -69,7 +69,7 @@ public:
 };
 
 
-void registerFunctionArrayJoin(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayJoin)
 {
     factory.registerFunction<FunctionArrayJoin>();
 }
diff --git a/src/Functions/array/arrayMap.cpp b/src/Functions/array/arrayMap.cpp
index ec1973d573b..216d488a360 100644
--- a/src/Functions/array/arrayMap.cpp
+++ b/src/Functions/array/arrayMap.cpp
@@ -34,7 +34,7 @@ struct ArrayMapImpl
 struct NameArrayMap { static constexpr auto name = "arrayMap"; };
 using FunctionArrayMap = FunctionArrayMapped<ArrayMapImpl, NameArrayMap>;
 
-void registerFunctionArrayMap(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayMap)
 {
     factory.registerFunction<FunctionArrayMap>();
 }
diff --git a/src/Functions/array/arrayPopBack.cpp b/src/Functions/array/arrayPopBack.cpp
index 0b532c22661..b2e80302f9a 100644
--- a/src/Functions/array/arrayPopBack.cpp
+++ b/src/Functions/array/arrayPopBack.cpp
@@ -13,7 +13,7 @@ public:
     FunctionArrayPopBack() : FunctionArrayPop(false, name) {}
 };
 
-void registerFunctionArrayPopBack(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayPopBack)
 {
     factory.registerFunction<FunctionArrayPopBack>();
 }
diff --git a/src/Functions/array/arrayPopFront.cpp b/src/Functions/array/arrayPopFront.cpp
index 57eedf9b44a..4e7798c3b8a 100644
--- a/src/Functions/array/arrayPopFront.cpp
+++ b/src/Functions/array/arrayPopFront.cpp
@@ -13,7 +13,7 @@ public:
     FunctionArrayPopFront() : FunctionArrayPop(true, name) {}
 };
 
-void registerFunctionArrayPopFront(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayPopFront)
 {
     factory.registerFunction<FunctionArrayPopFront>();
 }
diff --git a/src/Functions/array/arrayPushBack.cpp b/src/Functions/array/arrayPushBack.cpp
index 3171bca9d2c..e9651ed187b 100644
--- a/src/Functions/array/arrayPushBack.cpp
+++ b/src/Functions/array/arrayPushBack.cpp
@@ -13,7 +13,7 @@ public:
     FunctionArrayPushBack() : FunctionArrayPush(false, name) {}
 };
 
-void registerFunctionArrayPushBack(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayPushBack)
 {
     factory.registerFunction<FunctionArrayPushBack>();
 }
diff --git a/src/Functions/array/arrayPushFront.cpp b/src/Functions/array/arrayPushFront.cpp
index d12dfe02af1..993883d93b6 100644
--- a/src/Functions/array/arrayPushFront.cpp
+++ b/src/Functions/array/arrayPushFront.cpp
@@ -15,7 +15,7 @@ public:
 };
 
 
-void registerFunctionArrayPushFront(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayPushFront)
 {
     factory.registerFunction<FunctionArrayPushFront>();
 }
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index b706cfa42b3..fd16f1fc986 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -198,7 +198,7 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
 }
 
 
-void registerFunctionArrayReduce(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayReduce)
 {
     factory.registerFunction<FunctionArrayReduce>();
 }
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index b92bfb04fe5..d2a382e86ba 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -391,7 +391,7 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(
 }
 
 
-void registerFunctionArrayReduceInRanges(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayReduceInRanges)
 {
     factory.registerFunction<FunctionArrayReduceInRanges>();
 }
diff --git a/src/Functions/array/arrayResize.cpp b/src/Functions/array/arrayResize.cpp
index 1e6dcfbf069..9aa06918659 100644
--- a/src/Functions/array/arrayResize.cpp
+++ b/src/Functions/array/arrayResize.cpp
@@ -132,7 +132,7 @@ public:
 };
 
 
-void registerFunctionArrayResize(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayResize)
 {
     factory.registerFunction<FunctionArrayResize>();
 }
diff --git a/src/Functions/array/arrayReverse.cpp b/src/Functions/array/arrayReverse.cpp
index a517080ff2c..88703cbb032 100644
--- a/src/Functions/array/arrayReverse.cpp
+++ b/src/Functions/array/arrayReverse.cpp
@@ -247,7 +247,7 @@ bool FunctionArrayReverse::executeString(const IColumn & src_data, const ColumnA
 }
 
 
-void registerFunctionArrayReverse(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayReverse)
 {
     factory.registerFunction<FunctionArrayReverse>();
 }
diff --git a/src/Functions/array/arraySlice.cpp b/src/Functions/array/arraySlice.cpp
index 7a2e97de78a..9d7efd8fccf 100644
--- a/src/Functions/array/arraySlice.cpp
+++ b/src/Functions/array/arraySlice.cpp
@@ -150,7 +150,7 @@ public:
 };
 
 
-void registerFunctionArraySlice(FunctionFactory & factory)
+REGISTER_FUNCTION(ArraySlice)
 {
     factory.registerFunction<FunctionArraySlice>();
 }
diff --git a/src/Functions/array/arraySort.cpp b/src/Functions/array/arraySort.cpp
index 5421185211e..34c2881a413 100644
--- a/src/Functions/array/arraySort.cpp
+++ b/src/Functions/array/arraySort.cpp
@@ -67,7 +67,7 @@ struct NameArrayReverseSort { static constexpr auto name = "arrayReverseSort"; }
 using FunctionArraySort = FunctionArrayMapped<ArraySortImpl<true>, NameArraySort>;
 using FunctionArrayReverseSort = FunctionArrayMapped<ArraySortImpl<false>, NameArrayReverseSort>;
 
-void registerFunctionsArraySort(FunctionFactory & factory)
+REGISTER_FUNCTION(ArraySort)
 {
     factory.registerFunction<FunctionArraySort>();
     factory.registerFunction<FunctionArrayReverseSort>();
diff --git a/src/Functions/array/arraySplit.cpp b/src/Functions/array/arraySplit.cpp
index c818be97f60..caa6438adb1 100644
--- a/src/Functions/array/arraySplit.cpp
+++ b/src/Functions/array/arraySplit.cpp
@@ -116,7 +116,7 @@ struct NameArrayReverseSplit { static constexpr auto name = "arrayReverseSplit";
 using FunctionArraySplit = FunctionArrayMapped<ArraySplitImpl<false>, NameArraySplit>;
 using FunctionArrayReverseSplit = FunctionArrayMapped<ArraySplitImpl<true>, NameArrayReverseSplit>;
 
-void registerFunctionsArraySplit(FunctionFactory & factory)
+REGISTER_FUNCTION(ArraySplit)
 {
     factory.registerFunction<FunctionArraySplit>();
     factory.registerFunction<FunctionArrayReverseSplit>();
diff --git a/src/Functions/array/arrayUniq.cpp b/src/Functions/array/arrayUniq.cpp
index 8d3393c43c4..ff75efaae71 100644
--- a/src/Functions/array/arrayUniq.cpp
+++ b/src/Functions/array/arrayUniq.cpp
@@ -315,7 +315,7 @@ void FunctionArrayUniq::executeHashed(
 }
 
 
-void registerFunctionArrayUniq(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayUniq)
 {
     factory.registerFunction<FunctionArrayUniq>();
 }
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index a178147837c..2feac209b22 100644
--- a/src/Functions/array/arrayWithConstant.cpp
+++ b/src/Functions/array/arrayWithConstant.cpp
@@ -78,7 +78,7 @@ public:
     }
 };
 
-void registerFunctionArrayWithConstant(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayWithConstant)
 {
     factory.registerFunction<FunctionArrayWithConstant>();
 }
diff --git a/src/Functions/array/arrayZip.cpp b/src/Functions/array/arrayZip.cpp
index 6e77d9a5442..a56a8843e9b 100644
--- a/src/Functions/array/arrayZip.cpp
+++ b/src/Functions/array/arrayZip.cpp
@@ -93,7 +93,7 @@ public:
     }
 };
 
-void registerFunctionArrayZip(FunctionFactory & factory)
+REGISTER_FUNCTION(ArrayZip)
 {
     factory.registerFunction<FunctionArrayZip>();
 }
diff --git a/src/Functions/array/countEqual.cpp b/src/Functions/array/countEqual.cpp
index 4c0fc495f38..a68042f9dea 100644
--- a/src/Functions/array/countEqual.cpp
+++ b/src/Functions/array/countEqual.cpp
@@ -7,7 +7,7 @@ struct NameCountEqual { static constexpr auto name = "countEqual"; };
 
 using FunctionCountEqual = FunctionArrayIndex<CountEqualAction, NameCountEqual>;
 
-void registerFunctionCountEqual(FunctionFactory & factory)
+REGISTER_FUNCTION(CountEqual)
 {
     factory.registerFunction<FunctionCountEqual>();
 }
diff --git a/src/Functions/array/emptyArray.cpp b/src/Functions/array/emptyArray.cpp
index 28e9b5ca2e2..aeb7f83c6c5 100644
--- a/src/Functions/array/emptyArray.cpp
+++ b/src/Functions/array/emptyArray.cpp
@@ -55,7 +55,7 @@ void registerFunction(FunctionFactory & factory)
 
 }
 
-void registerFunctionsEmptyArray(FunctionFactory & factory)
+REGISTER_FUNCTION(EmptyArray)
 {
     registerFunction<FunctionEmptyArray<DataTypeUInt8>>(factory);
     registerFunction<FunctionEmptyArray<DataTypeUInt16>>(factory);
diff --git a/src/Functions/array/emptyArrayToSingle.cpp b/src/Functions/array/emptyArrayToSingle.cpp
index d6501216bd8..3fc8f6caa54 100644
--- a/src/Functions/array/emptyArrayToSingle.cpp
+++ b/src/Functions/array/emptyArrayToSingle.cpp
@@ -417,7 +417,7 @@ ColumnPtr FunctionEmptyArrayToSingle::executeImpl(const ColumnsWithTypeAndName &
 }
 
 
-void registerFunctionEmptyArrayToSingle(FunctionFactory & factory)
+REGISTER_FUNCTION(EmptyArrayToSingle)
 {
     factory.registerFunction<FunctionEmptyArrayToSingle>();
 }
diff --git a/src/Functions/array/has.cpp b/src/Functions/array/has.cpp
index 1a00c44671e..f08a4f29d2d 100644
--- a/src/Functions/array/has.cpp
+++ b/src/Functions/array/has.cpp
@@ -8,5 +8,5 @@ struct NameHas { static constexpr auto name = "has"; };
 /// has(arr, x) - whether there is an element x in the array.
 using FunctionHas = FunctionArrayIndex<HasAction, NameHas>;
 
-void registerFunctionHas(FunctionFactory & factory) { factory.registerFunction<FunctionHas>(); }
+REGISTER_FUNCTION(Has) { factory.registerFunction<FunctionHas>(); }
 }
diff --git a/src/Functions/array/hasAll.cpp b/src/Functions/array/hasAll.cpp
index c1959515e9f..7136db67ebc 100644
--- a/src/Functions/array/hasAll.cpp
+++ b/src/Functions/array/hasAll.cpp
@@ -14,7 +14,7 @@ public:
     FunctionArrayHasAll() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::All, name) {}
 };
 
-void registerFunctionHasAll(FunctionFactory & factory)
+REGISTER_FUNCTION(HasAll)
 {
     factory.registerFunction<FunctionArrayHasAll>();
 }
diff --git a/src/Functions/array/hasAny.cpp b/src/Functions/array/hasAny.cpp
index fac810c7ba1..6ec87a6ff34 100644
--- a/src/Functions/array/hasAny.cpp
+++ b/src/Functions/array/hasAny.cpp
@@ -14,7 +14,7 @@ public:
     FunctionArrayHasAny() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::Any, name) {}
 };
 
-void registerFunctionHasAny(FunctionFactory & factory)
+REGISTER_FUNCTION(HasAny)
 {
     factory.registerFunction<FunctionArrayHasAny>();
 }
diff --git a/src/Functions/array/hasSubstr.cpp b/src/Functions/array/hasSubstr.cpp
index 886f82f577b..4553026f2fa 100644
--- a/src/Functions/array/hasSubstr.cpp
+++ b/src/Functions/array/hasSubstr.cpp
@@ -14,7 +14,7 @@ public:
     FunctionArrayHasSubstr() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::Substr, name) {}
 };
 
-void registerFunctionHasSubstr(FunctionFactory & factory)
+REGISTER_FUNCTION(HasSubstr)
 {
     factory.registerFunction<FunctionArrayHasSubstr>();
 }
diff --git a/src/Functions/array/indexOf.cpp b/src/Functions/array/indexOf.cpp
index 6ab87e6182c..9e61d22bc68 100644
--- a/src/Functions/array/indexOf.cpp
+++ b/src/Functions/array/indexOf.cpp
@@ -9,7 +9,7 @@ struct NameIndexOf { static constexpr auto name = "indexOf"; };
 /// doesn't.
 using FunctionIndexOf = FunctionArrayIndex<IndexOfAction, NameIndexOf>;
 
-void registerFunctionIndexOf(FunctionFactory & factory)
+REGISTER_FUNCTION(IndexOf)
 {
     factory.registerFunction<FunctionIndexOf>();
 }
diff --git a/src/Functions/array/length.cpp b/src/Functions/array/length.cpp
index 3e41f9e3a38..dca38474ab0 100644
--- a/src/Functions/array/length.cpp
+++ b/src/Functions/array/length.cpp
@@ -53,7 +53,7 @@ struct NameLength
 
 using FunctionLength = FunctionStringOrArrayToT<LengthImpl, NameLength, UInt64, false>;
 
-void registerFunctionLength(FunctionFactory & factory)
+REGISTER_FUNCTION(Length)
 {
     factory.registerFunction<FunctionLength>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index f743cfb5b5d..dccb8001c1c 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -448,7 +448,7 @@ private:
 
 }
 
-void registerFunctionMapOp(FunctionFactory & factory)
+REGISTER_FUNCTION(MapOp)
 {
     factory.registerFunction<FunctionMapOp<OpTypes::ADD>>();
     factory.registerFunction<FunctionMapOp<OpTypes::SUBTRACT>>();
diff --git a/src/Functions/array/mapPopulateSeries.cpp b/src/Functions/array/mapPopulateSeries.cpp
index 8b4a1dda197..8814ce26189 100644
--- a/src/Functions/array/mapPopulateSeries.cpp
+++ b/src/Functions/array/mapPopulateSeries.cpp
@@ -496,7 +496,7 @@ private:
     }
 };
 
-void registerFunctionMapPopulateSeries(FunctionFactory & factory)
+REGISTER_FUNCTION(MapPopulateSeries)
 {
     factory.registerFunction<FunctionMapPopulateSeries>();
 }
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index 47e28da536a..6b3d8ad1139 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -455,7 +455,7 @@ private:
 };
 
 
-void registerFunctionRange(FunctionFactory & factory)
+REGISTER_FUNCTION(Range)
 {
     factory.registerFunction<FunctionRange>();
 }
diff --git a/src/Functions/array/registerFunctionsArray.cpp b/src/Functions/array/registerFunctionsArray.cpp
deleted file mode 100644
index 3bb27cbadf9..00000000000
--- a/src/Functions/array/registerFunctionsArray.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-namespace DB
-{
-class FunctionFactory;
-
-void registerFunctionArray(FunctionFactory &);
-void registerFunctionArrayElement(FunctionFactory &);
-void registerFunctionArrayResize(FunctionFactory &);
-void registerFunctionHas(FunctionFactory &);
-void registerFunctionHasAll(FunctionFactory &);
-void registerFunctionHasAny(FunctionFactory &);
-void registerFunctionHasSubstr(FunctionFactory &);
-void registerFunctionIndexOf(FunctionFactory &);
-void registerFunctionCountEqual(FunctionFactory &);
-void registerFunctionArrayIntersect(FunctionFactory &);
-void registerFunctionArrayPushFront(FunctionFactory &);
-void registerFunctionArrayPushBack(FunctionFactory &);
-void registerFunctionArrayPopFront(FunctionFactory &);
-void registerFunctionArrayPopBack(FunctionFactory &);
-void registerFunctionArrayConcat(FunctionFactory &);
-void registerFunctionArraySlice(FunctionFactory &);
-void registerFunctionArrayReverse(FunctionFactory &);
-void registerFunctionArrayReduce(FunctionFactory &);
-void registerFunctionRange(FunctionFactory &);
-void registerFunctionsEmptyArray(FunctionFactory &);
-void registerFunctionEmptyArrayToSingle(FunctionFactory &);
-void registerFunctionArrayEnumerate(FunctionFactory &);
-void registerFunctionArrayEnumerateUniq(FunctionFactory &);
-void registerFunctionArrayEnumerateDense(FunctionFactory &);
-void registerFunctionArrayEnumerateUniqRanked(FunctionFactory &);
-void registerFunctionArrayEnumerateDenseRanked(FunctionFactory &);
-void registerFunctionArrayUniq(FunctionFactory &);
-void registerFunctionArrayDistinct(FunctionFactory &);
-void registerFunctionArrayFlatten(FunctionFactory &);
-void registerFunctionArrayWithConstant(FunctionFactory &);
-void registerFunctionArrayZip(FunctionFactory &);
-void registerFunctionArrayAUC(FunctionFactory &);
-void registerFunctionArrayReduceInRanges(FunctionFactory &);
-void registerFunctionMapOp(FunctionFactory &);
-void registerFunctionMapPopulateSeries(FunctionFactory &);
-
-void registerFunctionsArray(FunctionFactory & factory)
-{
-    registerFunctionArray(factory);
-    registerFunctionArrayElement(factory);
-    registerFunctionArrayResize(factory);
-    registerFunctionHas(factory);
-    registerFunctionHasAll(factory);
-    registerFunctionHasAny(factory);
-    registerFunctionHasSubstr(factory);
-    registerFunctionIndexOf(factory);
-    registerFunctionCountEqual(factory);
-    registerFunctionArrayIntersect(factory);
-    registerFunctionArrayPushFront(factory);
-    registerFunctionArrayPushBack(factory);
-    registerFunctionArrayPopFront(factory);
-    registerFunctionArrayPopBack(factory);
-    registerFunctionArrayConcat(factory);
-    registerFunctionArraySlice(factory);
-    registerFunctionArrayReverse(factory);
-    registerFunctionArrayReduce(factory);
-    registerFunctionArrayReduceInRanges(factory);
-    registerFunctionRange(factory);
-    registerFunctionsEmptyArray(factory);
-    registerFunctionEmptyArrayToSingle(factory);
-    registerFunctionArrayEnumerate(factory);
-    registerFunctionArrayEnumerateUniq(factory);
-    registerFunctionArrayEnumerateDense(factory);
-    registerFunctionArrayEnumerateUniqRanked(factory);
-    registerFunctionArrayEnumerateDenseRanked(factory);
-    registerFunctionArrayUniq(factory);
-    registerFunctionArrayDistinct(factory);
-    registerFunctionArrayFlatten(factory);
-    registerFunctionArrayWithConstant(factory);
-    registerFunctionArrayZip(factory);
-    registerFunctionArrayAUC(factory);
-    registerFunctionMapOp(factory);
-    registerFunctionMapPopulateSeries(factory);
-}
-
-}
diff --git a/src/Functions/asin.cpp b/src/Functions/asin.cpp
index 92391fdef70..a02175367b0 100644
--- a/src/Functions/asin.cpp
+++ b/src/Functions/asin.cpp
@@ -12,7 +12,7 @@ using FunctionAsin = FunctionMathUnary<UnaryFunctionVectorized<AsinName, asin>>;
 
 }
 
-void registerFunctionAsin(FunctionFactory & factory)
+REGISTER_FUNCTION(Asin)
 {
     factory.registerFunction<FunctionAsin>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/asinh.cpp b/src/Functions/asinh.cpp
index fd2ac6c7a9f..6af832ae07c 100644
--- a/src/Functions/asinh.cpp
+++ b/src/Functions/asinh.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionAsinh(FunctionFactory & factory)
+REGISTER_FUNCTION(Asinh)
 {
     factory.registerFunction<FunctionAsinh>();
 }
diff --git a/src/Functions/assumeNotNull.cpp b/src/Functions/assumeNotNull.cpp
index 8f999af9ef0..4dd88163ecb 100644
--- a/src/Functions/assumeNotNull.cpp
+++ b/src/Functions/assumeNotNull.cpp
@@ -63,7 +63,7 @@ public:
 
 }
 
-void registerFunctionAssumeNotNull(FunctionFactory & factory)
+REGISTER_FUNCTION(AssumeNotNull)
 {
     factory.registerFunction<FunctionAssumeNotNull>();
 }
diff --git a/src/Functions/atan.cpp b/src/Functions/atan.cpp
index be0af8a9108..b735846fea7 100644
--- a/src/Functions/atan.cpp
+++ b/src/Functions/atan.cpp
@@ -12,7 +12,7 @@ using FunctionAtan = FunctionMathUnary<UnaryFunctionVectorized<AtanName, atan>>;
 
 }
 
-void registerFunctionAtan(FunctionFactory & factory)
+REGISTER_FUNCTION(Atan)
 {
     factory.registerFunction<FunctionAtan>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/atan2.cpp b/src/Functions/atan2.cpp
index 0e363440d09..c6a9f70286c 100644
--- a/src/Functions/atan2.cpp
+++ b/src/Functions/atan2.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionAtan2(FunctionFactory & factory)
+REGISTER_FUNCTION(Atan2)
 {
     factory.registerFunction<FunctionAtan2>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/atanh.cpp b/src/Functions/atanh.cpp
index a8154c719fc..fab25414725 100644
--- a/src/Functions/atanh.cpp
+++ b/src/Functions/atanh.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionAtanh(FunctionFactory & factory)
+REGISTER_FUNCTION(Atanh)
 {
     factory.registerFunction<FunctionAtanh>();
 }
diff --git a/src/Functions/bar.cpp b/src/Functions/bar.cpp
index 0b5e48de067..982e1ff3a25 100644
--- a/src/Functions/bar.cpp
+++ b/src/Functions/bar.cpp
@@ -129,7 +129,7 @@ public:
 
 }
 
-void registerFunctionBar(FunctionFactory & factory)
+REGISTER_FUNCTION(Bar)
 {
     factory.registerFunction<FunctionBar>();
 }
diff --git a/src/Functions/base64Decode.cpp b/src/Functions/base64Decode.cpp
index 027fef73911..8922e1e0095 100644
--- a/src/Functions/base64Decode.cpp
+++ b/src/Functions/base64Decode.cpp
@@ -6,7 +6,7 @@
 
 namespace DB
 {
-void registerFunctionBase64Decode(FunctionFactory & factory)
+REGISTER_FUNCTION(Base64Decode)
 {
     tb64ini(0, 0);
     factory.registerFunction<FunctionBase64Conversion<Base64Decode>>();
diff --git a/src/Functions/base64Encode.cpp b/src/Functions/base64Encode.cpp
index 3e456e50379..14523f8b0f3 100644
--- a/src/Functions/base64Encode.cpp
+++ b/src/Functions/base64Encode.cpp
@@ -8,7 +8,7 @@
 
 namespace DB
 {
-void registerFunctionBase64Encode(FunctionFactory & factory)
+REGISTER_FUNCTION(Base64Encode)
 {
     tb64ini(0, 0);
     factory.registerFunction<FunctionBase64Conversion<Base64Encode>>();
diff --git a/src/Functions/bitAnd.cpp b/src/Functions/bitAnd.cpp
index 63f92839638..2e3b79c6710 100644
--- a/src/Functions/bitAnd.cpp
+++ b/src/Functions/bitAnd.cpp
@@ -42,7 +42,7 @@ using FunctionBitAnd = BinaryArithmeticOverloadResolver<BitAndImpl, NameBitAnd,
 
 }
 
-void registerFunctionBitAnd(FunctionFactory & factory)
+REGISTER_FUNCTION(BitAnd)
 {
     factory.registerFunction<FunctionBitAnd>();
 }
diff --git a/src/Functions/bitBoolMaskAnd.cpp b/src/Functions/bitBoolMaskAnd.cpp
index ec208615363..2a0735e5ac8 100644
--- a/src/Functions/bitBoolMaskAnd.cpp
+++ b/src/Functions/bitBoolMaskAnd.cpp
@@ -47,7 +47,7 @@ using FunctionBitBoolMaskAnd = BinaryArithmeticOverloadResolver<BitBoolMaskAndIm
 
 }
 
-void registerFunctionBitBoolMaskAnd(FunctionFactory & factory)
+REGISTER_FUNCTION(BitBoolMaskAnd)
 {
     factory.registerFunction<FunctionBitBoolMaskAnd>();
 }
diff --git a/src/Functions/bitBoolMaskOr.cpp b/src/Functions/bitBoolMaskOr.cpp
index 595417d04b4..e0acde17a62 100644
--- a/src/Functions/bitBoolMaskOr.cpp
+++ b/src/Functions/bitBoolMaskOr.cpp
@@ -47,7 +47,7 @@ using FunctionBitBoolMaskOr = BinaryArithmeticOverloadResolver<BitBoolMaskOrImpl
 
 }
 
-void registerFunctionBitBoolMaskOr(FunctionFactory & factory)
+REGISTER_FUNCTION(BitBoolMaskOr)
 {
     factory.registerFunction<FunctionBitBoolMaskOr>();
 }
diff --git a/src/Functions/bitCount.cpp b/src/Functions/bitCount.cpp
index 84743ae24ed..d425dd1dca2 100644
--- a/src/Functions/bitCount.cpp
+++ b/src/Functions/bitCount.cpp
@@ -53,7 +53,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameBitCount>
     }
 };
 
-void registerFunctionBitCount(FunctionFactory & factory)
+REGISTER_FUNCTION(BitCount)
 {
     factory.registerFunction<FunctionBitCount>();
 }
diff --git a/src/Functions/bitHammingDistance.cpp b/src/Functions/bitHammingDistance.cpp
index afc281e7e76..75928c2a8af 100644
--- a/src/Functions/bitHammingDistance.cpp
+++ b/src/Functions/bitHammingDistance.cpp
@@ -1,5 +1,6 @@
 #include <Functions/FunctionBinaryArithmetic.h>
 #include <Functions/FunctionFactory.h>
+#include <bit>
 
 namespace DB
 {
@@ -14,7 +15,7 @@ struct BitHammingDistanceImpl
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
     {
         UInt64 res = static_cast<UInt64>(a) ^ static_cast<UInt64>(b);
-        return __builtin_popcountll(res);
+        return std::popcount(res);
     }
 
 #if USE_EMBEDDED_COMPILER
@@ -28,7 +29,7 @@ struct NameBitHammingDistance
 };
 using FunctionBitHammingDistance = BinaryArithmeticOverloadResolver<BitHammingDistanceImpl, NameBitHammingDistance>;
 
-void registerFunctionBitHammingDistance(FunctionFactory & factory)
+REGISTER_FUNCTION(BitHammingDistance)
 {
     factory.registerFunction<FunctionBitHammingDistance>();
 }
diff --git a/src/Functions/bitNot.cpp b/src/Functions/bitNot.cpp
index 3e1e69fccc2..b13becedc31 100644
--- a/src/Functions/bitNot.cpp
+++ b/src/Functions/bitNot.cpp
@@ -51,7 +51,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameBitNot>
     }
 };
 
-void registerFunctionBitNot(FunctionFactory & factory)
+REGISTER_FUNCTION(BitNot)
 {
     factory.registerFunction<FunctionBitNot>();
 }
diff --git a/src/Functions/bitOr.cpp b/src/Functions/bitOr.cpp
index 65847e93b8b..40d5f41884e 100644
--- a/src/Functions/bitOr.cpp
+++ b/src/Functions/bitOr.cpp
@@ -41,7 +41,7 @@ using FunctionBitOr = BinaryArithmeticOverloadResolver<BitOrImpl, NameBitOr, tru
 
 }
 
-void registerFunctionBitOr(FunctionFactory & factory)
+REGISTER_FUNCTION(BitOr)
 {
     factory.registerFunction<FunctionBitOr>();
 }
diff --git a/src/Functions/bitRotateLeft.cpp b/src/Functions/bitRotateLeft.cpp
index 2cddb93e333..8b99d45d9f0 100644
--- a/src/Functions/bitRotateLeft.cpp
+++ b/src/Functions/bitRotateLeft.cpp
@@ -48,7 +48,7 @@ using FunctionBitRotateLeft = BinaryArithmeticOverloadResolver<BitRotateLeftImpl
 
 }
 
-void registerFunctionBitRotateLeft(FunctionFactory & factory)
+REGISTER_FUNCTION(BitRotateLeft)
 {
     factory.registerFunction<FunctionBitRotateLeft>();
 }
diff --git a/src/Functions/bitRotateRight.cpp b/src/Functions/bitRotateRight.cpp
index 66664c4ab8d..0d84fbd9f64 100644
--- a/src/Functions/bitRotateRight.cpp
+++ b/src/Functions/bitRotateRight.cpp
@@ -47,7 +47,7 @@ using FunctionBitRotateRight = BinaryArithmeticOverloadResolver<BitRotateRightIm
 
 }
 
-void registerFunctionBitRotateRight(FunctionFactory & factory)
+REGISTER_FUNCTION(BitRotateRight)
 {
     factory.registerFunction<FunctionBitRotateRight>();
 }
diff --git a/src/Functions/bitShiftLeft.cpp b/src/Functions/bitShiftLeft.cpp
index 83a31ddc122..b53c2b05da0 100644
--- a/src/Functions/bitShiftLeft.cpp
+++ b/src/Functions/bitShiftLeft.cpp
@@ -159,7 +159,7 @@ using FunctionBitShiftLeft = BinaryArithmeticOverloadResolver<BitShiftLeftImpl,
 
 }
 
-void registerFunctionBitShiftLeft(FunctionFactory & factory)
+REGISTER_FUNCTION(BitShiftLeft)
 {
     factory.registerFunction<FunctionBitShiftLeft>();
 }
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index d12847c5df8..8134a64ac53 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -138,7 +138,7 @@ using FunctionBitShiftRight = BinaryArithmeticOverloadResolver<BitShiftRightImpl
 
 }
 
-void registerFunctionBitShiftRight(FunctionFactory & factory)
+REGISTER_FUNCTION(BitShiftRight)
 {
     factory.registerFunction<FunctionBitShiftRight>();
 }
diff --git a/src/Functions/bitSlice.cpp b/src/Functions/bitSlice.cpp
index 7d9b48acc89..c2392760194 100644
--- a/src/Functions/bitSlice.cpp
+++ b/src/Functions/bitSlice.cpp
@@ -419,7 +419,7 @@ public:
 };
 
 
-void registerFunctionBitSlice(FunctionFactory & factory)
+REGISTER_FUNCTION(BitSlice)
 {
     factory.registerFunction<FunctionBitSlice>();
 }
diff --git a/src/Functions/bitSwapLastTwo.cpp b/src/Functions/bitSwapLastTwo.cpp
index 566e6a47352..e7f07160693 100644
--- a/src/Functions/bitSwapLastTwo.cpp
+++ b/src/Functions/bitSwapLastTwo.cpp
@@ -62,7 +62,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameBitSwapLastTwo>
     }
 };
 
-void registerFunctionBitSwapLastTwo(FunctionFactory & factory)
+REGISTER_FUNCTION(BitSwapLastTwo)
 {
     factory.registerFunction<FunctionBitSwapLastTwo>();
 }
diff --git a/src/Functions/bitTest.cpp b/src/Functions/bitTest.cpp
index 9c12268d2ef..ac21423ced6 100644
--- a/src/Functions/bitTest.cpp
+++ b/src/Functions/bitTest.cpp
@@ -39,7 +39,7 @@ using FunctionBitTest = BinaryArithmeticOverloadResolver<BitTestImpl, NameBitTes
 
 }
 
-void registerFunctionBitTest(FunctionFactory & factory)
+REGISTER_FUNCTION(BitTest)
 {
     factory.registerFunction<FunctionBitTest>();
 }
diff --git a/src/Functions/bitTestAll.cpp b/src/Functions/bitTestAll.cpp
index 901fd600106..a2dcef3eb96 100644
--- a/src/Functions/bitTestAll.cpp
+++ b/src/Functions/bitTestAll.cpp
@@ -17,7 +17,7 @@ using FunctionBitTestAll = FunctionBitTestMany<BitTestAllImpl, NameBitTestAll>;
 
 }
 
-void registerFunctionBitTestAll(FunctionFactory & factory)
+REGISTER_FUNCTION(BitTestAll)
 {
     factory.registerFunction<FunctionBitTestAll>();
 }
diff --git a/src/Functions/bitTestAny.cpp b/src/Functions/bitTestAny.cpp
index 6874e74e2be..6b20d6c184c 100644
--- a/src/Functions/bitTestAny.cpp
+++ b/src/Functions/bitTestAny.cpp
@@ -17,7 +17,7 @@ using FunctionBitTestAny = FunctionBitTestMany<BitTestAnyImpl, NameBitTestAny>;
 
 }
 
-void registerFunctionBitTestAny(FunctionFactory & factory)
+REGISTER_FUNCTION(BitTestAny)
 {
     factory.registerFunction<FunctionBitTestAny>();
 }
diff --git a/src/Functions/bitWrapperFunc.cpp b/src/Functions/bitWrapperFunc.cpp
index f47ffbfe883..83c89c753fc 100644
--- a/src/Functions/bitWrapperFunc.cpp
+++ b/src/Functions/bitWrapperFunc.cpp
@@ -50,7 +50,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameBitWrapperFunc>
     }
 };
 
-void registerFunctionBitWrapperFunc(FunctionFactory & factory)
+REGISTER_FUNCTION(BitWrapperFunc)
 {
     factory.registerFunction<FunctionBitWrapperFunc>();
 }
diff --git a/src/Functions/bitXor.cpp b/src/Functions/bitXor.cpp
index 8f3b6a1f9ca..89aaf5eadd1 100644
--- a/src/Functions/bitXor.cpp
+++ b/src/Functions/bitXor.cpp
@@ -41,7 +41,7 @@ using FunctionBitXor = BinaryArithmeticOverloadResolver<BitXorImpl, NameBitXor,
 
 }
 
-void registerFunctionBitXor(FunctionFactory & factory)
+REGISTER_FUNCTION(BitXor)
 {
     factory.registerFunction<FunctionBitXor>();
 }
diff --git a/src/Functions/blockNumber.cpp b/src/Functions/blockNumber.cpp
index a62a0ac873f..0a8e51206a6 100644
--- a/src/Functions/blockNumber.cpp
+++ b/src/Functions/blockNumber.cpp
@@ -68,7 +68,7 @@ public:
 
 }
 
-void registerFunctionBlockNumber(FunctionFactory & factory)
+REGISTER_FUNCTION(BlockNumber)
 {
     factory.registerFunction<FunctionBlockNumber>();
 }
diff --git a/src/Functions/blockSerializedSize.cpp b/src/Functions/blockSerializedSize.cpp
index dd4fd1a4588..d406984c51c 100644
--- a/src/Functions/blockSerializedSize.cpp
+++ b/src/Functions/blockSerializedSize.cpp
@@ -66,7 +66,7 @@ public:
 
 }
 
-void registerFunctionBlockSerializedSize(FunctionFactory & factory)
+REGISTER_FUNCTION(BlockSerializedSize)
 {
     factory.registerFunction<FunctionBlockSerializedSize>();
 }
diff --git a/src/Functions/blockSize.cpp b/src/Functions/blockSize.cpp
index a5e87f58d98..af3c4ed27b4 100644
--- a/src/Functions/blockSize.cpp
+++ b/src/Functions/blockSize.cpp
@@ -56,7 +56,7 @@ public:
 
 }
 
-void registerFunctionBlockSize(FunctionFactory & factory)
+REGISTER_FUNCTION(BlockSize)
 {
     factory.registerFunction<FunctionBlockSize>();
 }
diff --git a/src/Functions/byteSize.cpp b/src/Functions/byteSize.cpp
index 03ac85b7cfc..93a3a86641a 100644
--- a/src/Functions/byteSize.cpp
+++ b/src/Functions/byteSize.cpp
@@ -80,7 +80,7 @@ public:
 
 }
 
-void registerFunctionByteSize(FunctionFactory & factory)
+REGISTER_FUNCTION(ByteSize)
 {
     factory.registerFunction<FunctionByteSize>();
 }
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index e06a01431da..b198d60eb7d 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -107,7 +107,7 @@ private:
 
 }
 
-void registerFunctionCaseWithExpression(FunctionFactory & factory)
+REGISTER_FUNCTION(CaseWithExpression)
 {
     factory.registerFunction<FunctionCaseWithExpression>();
 
diff --git a/src/Functions/castOrDefault.cpp b/src/Functions/castOrDefault.cpp
index 2e9f13545fd..1f527b7ec23 100644
--- a/src/Functions/castOrDefault.cpp
+++ b/src/Functions/castOrDefault.cpp
@@ -363,7 +363,7 @@ using FunctionToDecimal256OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal
 
 using FunctionToUUIDOrDefault = FunctionCastOrDefaultTyped<DataTypeUUID, NameToUUIDOrDefault>;
 
-void registerFunctionCastOrDefault(FunctionFactory & factory)
+REGISTER_FUNCTION(CastOrDefault)
 {
     factory.registerFunction<FunctionCastOrDefault>();
 
diff --git a/src/Functions/cbrt.cpp b/src/Functions/cbrt.cpp
index 94c8627c320..0b9f0d5a0b6 100644
--- a/src/Functions/cbrt.cpp
+++ b/src/Functions/cbrt.cpp
@@ -11,7 +11,7 @@ using FunctionCbrt = FunctionMathUnary<UnaryFunctionVectorized<CbrtName, cbrt>>;
 
 }
 
-void registerFunctionCbrt(FunctionFactory & factory)
+REGISTER_FUNCTION(Cbrt)
 {
     factory.registerFunction<FunctionCbrt>();
 }
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index b2b234df515..aafbcd7d714 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -174,7 +174,7 @@ private:
 
 }
 
-void registerFunctionCoalesce(FunctionFactory & factory)
+REGISTER_FUNCTION(Coalesce)
 {
     factory.registerFunction<FunctionCoalesce>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index e11071265ce..3b02f2c0b78 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -228,7 +228,7 @@ private:
 
 }
 
-void registerFunctionsConcat(FunctionFactory & factory)
+REGISTER_FUNCTION(Concat)
 {
     factory.registerFunction<ConcatOverloadResolver>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionConcatAssumeInjective>();
diff --git a/src/Functions/connectionId.cpp b/src/Functions/connectionId.cpp
index 69c8b9e86ea..b9d772e3871 100644
--- a/src/Functions/connectionId.cpp
+++ b/src/Functions/connectionId.cpp
@@ -31,7 +31,7 @@ public:
     }
 };
 
-void registerFunctionConnectionId(FunctionFactory & factory)
+REGISTER_FUNCTION(ConnectionId)
 {
     factory.registerFunction<FunctionConnectionId>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("connection_id", "connectionID", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/convertCharset.cpp b/src/Functions/convertCharset.cpp
index ccfb28ad7ef..49faae521f7 100644
--- a/src/Functions/convertCharset.cpp
+++ b/src/Functions/convertCharset.cpp
@@ -214,7 +214,7 @@ public:
 
 }
 
-void registerFunctionConvertCharset(FunctionFactory & factory)
+REGISTER_FUNCTION(ConvertCharset)
 {
     factory.registerFunction<FunctionConvertCharset>();
 }
diff --git a/src/Functions/cos.cpp b/src/Functions/cos.cpp
index e18524dd56b..e7c9d7759ed 100644
--- a/src/Functions/cos.cpp
+++ b/src/Functions/cos.cpp
@@ -11,7 +11,7 @@ using FunctionCos = FunctionMathUnary<UnaryFunctionVectorized<CosName, cos>>;
 
 }
 
-void registerFunctionCos(FunctionFactory & factory)
+REGISTER_FUNCTION(Cos)
 {
     factory.registerFunction<FunctionCos>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/cosh.cpp b/src/Functions/cosh.cpp
index 88753fcb95b..54b52051aab 100644
--- a/src/Functions/cosh.cpp
+++ b/src/Functions/cosh.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionCosh(FunctionFactory & factory)
+REGISTER_FUNCTION(Cosh)
 {
     factory.registerFunction<FunctionCosh>();
 }
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 47877f042b9..e5142a89689 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -142,7 +142,7 @@ private:
 
 }
 
-void registerFunctionCountDigits(FunctionFactory & factory)
+REGISTER_FUNCTION(CountDigits)
 {
     factory.registerFunction<FunctionCountDigits>();
 }
diff --git a/src/Functions/countMatches.cpp b/src/Functions/countMatches.cpp
index e1ad445befb..d8948f85d44 100644
--- a/src/Functions/countMatches.cpp
+++ b/src/Functions/countMatches.cpp
@@ -20,7 +20,7 @@ struct FunctionCountMatchesCaseInsensitive
 namespace DB
 {
 
-void registerFunctionCountMatches(FunctionFactory & factory)
+REGISTER_FUNCTION(CountMatches)
 {
     factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseSensitive>>(FunctionFactory::CaseSensitive);
     factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseInsensitive>>(FunctionFactory::CaseSensitive);
diff --git a/src/Functions/countSubstrings.cpp b/src/Functions/countSubstrings.cpp
index 1bf95f9526f..ba8d150fb41 100644
--- a/src/Functions/countSubstrings.cpp
+++ b/src/Functions/countSubstrings.cpp
@@ -17,7 +17,7 @@ using FunctionCountSubstrings = FunctionsStringSearch<CountSubstringsImpl<NameCo
 
 }
 
-void registerFunctionCountSubstrings(FunctionFactory & factory)
+REGISTER_FUNCTION(CountSubstrings)
 {
     factory.registerFunction<FunctionCountSubstrings>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/countSubstringsCaseInsensitive.cpp b/src/Functions/countSubstringsCaseInsensitive.cpp
index fa234953cc3..ada8cf77bc9 100644
--- a/src/Functions/countSubstringsCaseInsensitive.cpp
+++ b/src/Functions/countSubstringsCaseInsensitive.cpp
@@ -17,7 +17,7 @@ using FunctionCountSubstringsCaseInsensitive = FunctionsStringSearch<CountSubstr
 
 }
 
-void registerFunctionCountSubstringsCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(CountSubstringsCaseInsensitive)
 {
     factory.registerFunction<FunctionCountSubstringsCaseInsensitive>();
 }
diff --git a/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp b/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp
index 93f77fddd7f..3f71bca63d2 100644
--- a/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp
+++ b/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp
@@ -18,7 +18,7 @@ using FunctionCountSubstringsCaseInsensitiveUTF8 = FunctionsStringSearch<
 
 }
 
-void registerFunctionCountSubstringsCaseInsensitiveUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(CountSubstringsCaseInsensitiveUTF8)
 {
     factory.registerFunction<FunctionCountSubstringsCaseInsensitiveUTF8>();
 }
diff --git a/src/Functions/currentDatabase.cpp b/src/Functions/currentDatabase.cpp
index c5f559d0838..981b324fb51 100644
--- a/src/Functions/currentDatabase.cpp
+++ b/src/Functions/currentDatabase.cpp
@@ -51,7 +51,7 @@ public:
 
 }
 
-void registerFunctionCurrentDatabase(FunctionFactory & factory)
+REGISTER_FUNCTION(CurrentDatabase)
 {
     factory.registerFunction<FunctionCurrentDatabase>();
     factory.registerFunction<FunctionCurrentDatabase>("DATABASE", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/currentProfiles.cpp b/src/Functions/currentProfiles.cpp
index 22d6af2f16e..eee458f4f63 100644
--- a/src/Functions/currentProfiles.cpp
+++ b/src/Functions/currentProfiles.cpp
@@ -79,7 +79,7 @@ namespace
     };
 }
 
-void registerFunctionCurrentProfiles(FunctionFactory & factory)
+REGISTER_FUNCTION(CurrentProfiles)
 {
     factory.registerFunction<FunctionCurrentProfiles<Kind::CURRENT_PROFILES>>();
     factory.registerFunction<FunctionCurrentProfiles<Kind::ENABLED_PROFILES>>();
diff --git a/src/Functions/currentRoles.cpp b/src/Functions/currentRoles.cpp
index 69f3061064a..45d2000d088 100644
--- a/src/Functions/currentRoles.cpp
+++ b/src/Functions/currentRoles.cpp
@@ -81,7 +81,7 @@ namespace
     };
 }
 
-void registerFunctionCurrentRoles(FunctionFactory & factory)
+REGISTER_FUNCTION(CurrentRoles)
 {
     factory.registerFunction<FunctionCurrentRoles<Kind::CURRENT_ROLES>>();
     factory.registerFunction<FunctionCurrentRoles<Kind::ENABLED_ROLES>>();
diff --git a/src/Functions/currentUser.cpp b/src/Functions/currentUser.cpp
index efa6e2cad2a..67b5d7626bf 100644
--- a/src/Functions/currentUser.cpp
+++ b/src/Functions/currentUser.cpp
@@ -51,7 +51,7 @@ public:
 
 }
 
-void registerFunctionCurrentUser(FunctionFactory & factory)
+REGISTER_FUNCTION(CurrentUser)
 {
     factory.registerFunction<FunctionCurrentUser>();
     factory.registerAlias("user", FunctionCurrentUser::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index e778e4dc6a9..27948a35f57 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -114,7 +114,7 @@ public:
             dispatchForColumns<ToRelativeWeekNumImpl>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "day" || unit == "dd" || unit == "d")
             dispatchForColumns<ToRelativeDayNumImpl>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "hour" || unit == "hh")
+        else if (unit == "hour" || unit == "hh" || unit == "h")
             dispatchForColumns<ToRelativeHourNumImpl>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "minute" || unit == "mi" || unit == "n")
             dispatchForColumns<ToRelativeMinuteNumImpl>(x, y, timezone_x, timezone_y, res->getData());
@@ -261,7 +261,7 @@ private:
 
 }
 
-void registerFunctionDateDiff(FunctionFactory & factory)
+REGISTER_FUNCTION(DateDiff)
 {
     factory.registerFunction<FunctionDateDiff>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/dateName.cpp b/src/Functions/dateName.cpp
index 91ea8995777..8f551dfd136 100644
--- a/src/Functions/dateName.cpp
+++ b/src/Functions/dateName.cpp
@@ -343,7 +343,7 @@ private:
 
 }
 
-void registerFunctionDateName(FunctionFactory & factory)
+REGISTER_FUNCTION(DateName)
 {
     factory.registerFunction<FunctionDateNameImpl>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index da6a4839ca0..bb891ac702f 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -153,7 +153,7 @@ private:
 
 }
 
-void registerFunctionDateTrunc(FunctionFactory & factory)
+REGISTER_FUNCTION(DateTrunc)
 {
     factory.registerFunction<FunctionDateTrunc>(FunctionFactory::CaseInsensitive);
 
diff --git a/src/Functions/decodeXMLComponent.cpp b/src/Functions/decodeXMLComponent.cpp
index 79af3024c09..80d1b5c3d79 100644
--- a/src/Functions/decodeXMLComponent.cpp
+++ b/src/Functions/decodeXMLComponent.cpp
@@ -231,7 +231,7 @@ namespace
 
 }
 
-void registerFunctionDecodeXMLComponent(FunctionFactory & factory)
+REGISTER_FUNCTION(DecodeXMLComponent)
 {
     factory.registerFunction<FunctionDecodeXMLComponent>();
 }
diff --git a/src/Functions/decrypt.cpp b/src/Functions/decrypt.cpp
index 1cbda0dba99..da794116a41 100644
--- a/src/Functions/decrypt.cpp
+++ b/src/Functions/decrypt.cpp
@@ -19,7 +19,7 @@ struct DecryptImpl
 namespace DB
 {
 
-void registerFunctionDecrypt(FunctionFactory & factory)
+REGISTER_FUNCTION(Decrypt)
 {
     factory.registerFunction<FunctionDecrypt<DecryptImpl>>();
 }
diff --git a/src/Functions/defaultValueOfArgumentType.cpp b/src/Functions/defaultValueOfArgumentType.cpp
index f4031692b4b..2ad75a9add4 100644
--- a/src/Functions/defaultValueOfArgumentType.cpp
+++ b/src/Functions/defaultValueOfArgumentType.cpp
@@ -56,7 +56,7 @@ public:
 
 }
 
-void registerFunctionDefaultValueOfArgumentType(FunctionFactory & factory)
+REGISTER_FUNCTION(DefaultValueOfArgumentType)
 {
     factory.registerFunction<FunctionDefaultValueOfArgumentType>();
 }
diff --git a/src/Functions/defaultValueOfTypeName.cpp b/src/Functions/defaultValueOfTypeName.cpp
index 2efbaef46c5..b20048bbde7 100644
--- a/src/Functions/defaultValueOfTypeName.cpp
+++ b/src/Functions/defaultValueOfTypeName.cpp
@@ -63,7 +63,7 @@ public:
 
 }
 
-void registerFunctionDefaultValueOfTypeName(FunctionFactory & factory)
+REGISTER_FUNCTION(DefaultValueOfTypeName)
 {
     factory.registerFunction<FunctionDefaultValueOfTypeName>();
 }
diff --git a/src/Functions/degrees.cpp b/src/Functions/degrees.cpp
index 543b7ac7315..2881f8d2df6 100644
--- a/src/Functions/degrees.cpp
+++ b/src/Functions/degrees.cpp
@@ -21,7 +21,7 @@ namespace
     using FunctionDegrees = FunctionMathUnary<UnaryFunctionVectorized<DegreesName, degrees>>;
 }
 
-void registerFunctionDegrees(FunctionFactory & factory)
+REGISTER_FUNCTION(Degrees)
 {
     factory.registerFunction<FunctionDegrees>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/demange.cpp b/src/Functions/demange.cpp
index ecf6661d20d..9026790f740 100644
--- a/src/Functions/demange.cpp
+++ b/src/Functions/demange.cpp
@@ -96,7 +96,7 @@ public:
 
 }
 
-void registerFunctionDemangle(FunctionFactory & factory)
+REGISTER_FUNCTION(Demangle)
 {
     factory.registerFunction<FunctionDemangle>();
 }
diff --git a/src/Functions/divide.cpp b/src/Functions/divide.cpp
index 7b8fcf94313..1d042e19b9f 100644
--- a/src/Functions/divide.cpp
+++ b/src/Functions/divide.cpp
@@ -36,7 +36,7 @@ struct DivideFloatingImpl
 struct NameDivide { static constexpr auto name = "divide"; };
 using FunctionDivide = BinaryArithmeticOverloadResolver<DivideFloatingImpl, NameDivide>;
 
-void registerFunctionDivide(FunctionFactory & factory)
+REGISTER_FUNCTION(Divide)
 {
     factory.registerFunction<FunctionDivide>();
 }
diff --git a/src/Functions/dumpColumnStructure.cpp b/src/Functions/dumpColumnStructure.cpp
index 8435aa4b1aa..11c0cb81922 100644
--- a/src/Functions/dumpColumnStructure.cpp
+++ b/src/Functions/dumpColumnStructure.cpp
@@ -54,7 +54,7 @@ public:
 
 }
 
-void registerFunctionDumpColumnStructure(FunctionFactory & factory)
+REGISTER_FUNCTION(DumpColumnStructure)
 {
     factory.registerFunction<FunctionDumpColumnStructure>();
 }
diff --git a/src/Functions/empty.cpp b/src/Functions/empty.cpp
index d53f3585158..51811d21a0c 100644
--- a/src/Functions/empty.cpp
+++ b/src/Functions/empty.cpp
@@ -17,7 +17,7 @@ using FunctionEmpty = FunctionStringOrArrayToT<EmptyImpl<false>, NameEmpty, UInt
 
 }
 
-void registerFunctionEmpty(FunctionFactory & factory)
+REGISTER_FUNCTION(Empty)
 {
     factory.registerFunction<FunctionEmpty>();
 }
diff --git a/src/Functions/encodeXMLComponent.cpp b/src/Functions/encodeXMLComponent.cpp
index 380d0da69ac..5d31d7f463d 100644
--- a/src/Functions/encodeXMLComponent.cpp
+++ b/src/Functions/encodeXMLComponent.cpp
@@ -137,7 +137,7 @@ namespace
 
 }
 
-void registerFunctionEncodeXMLComponent(FunctionFactory & factory)
+REGISTER_FUNCTION(EncodeXMLComponent)
 {
     factory.registerFunction<FunctionEncodeXMLComponent>();
 }
diff --git a/src/Functions/encrypt.cpp b/src/Functions/encrypt.cpp
index 807443a2fb8..dc68b650d74 100644
--- a/src/Functions/encrypt.cpp
+++ b/src/Functions/encrypt.cpp
@@ -19,7 +19,7 @@ struct EncryptImpl
 namespace DB
 {
 
-void registerFunctionEncrypt(FunctionFactory & factory)
+REGISTER_FUNCTION(Encrypt)
 {
     factory.registerFunction<FunctionEncrypt<EncryptImpl>>();
 }
diff --git a/src/Functions/endsWith.cpp b/src/Functions/endsWith.cpp
index 5f32fbbe200..308eb67e4b8 100644
--- a/src/Functions/endsWith.cpp
+++ b/src/Functions/endsWith.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionEndsWith = FunctionStartsEndsWith<NameEndsWith>;
 
-void registerFunctionEndsWith(FunctionFactory & factory)
+REGISTER_FUNCTION(EndsWith)
 {
     factory.registerFunction<FunctionEndsWith>();
 }
diff --git a/src/Functions/equals.cpp b/src/Functions/equals.cpp
index 868a491050d..de1cf623ea6 100644
--- a/src/Functions/equals.cpp
+++ b/src/Functions/equals.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionEquals = FunctionComparison<EqualsOp, NameEquals>;
 
-void registerFunctionEquals(FunctionFactory & factory)
+REGISTER_FUNCTION(Equals)
 {
     factory.registerFunction<FunctionEquals>();
 }
diff --git a/src/Functions/erf.cpp b/src/Functions/erf.cpp
index cb9428a3dbd..3e5ee9fa724 100644
--- a/src/Functions/erf.cpp
+++ b/src/Functions/erf.cpp
@@ -11,7 +11,7 @@ using FunctionErf = FunctionMathUnary<UnaryFunctionVectorized<ErfName, std::erf>
 
 }
 
-void registerFunctionErf(FunctionFactory & factory)
+REGISTER_FUNCTION(Erf)
 {
     factory.registerFunction<FunctionErf>();
 }
diff --git a/src/Functions/erfc.cpp b/src/Functions/erfc.cpp
index 48707ff26d6..7596d18ebde 100644
--- a/src/Functions/erfc.cpp
+++ b/src/Functions/erfc.cpp
@@ -11,7 +11,7 @@ using FunctionErfc = FunctionMathUnary<UnaryFunctionVectorized<ErfcName, std::er
 
 }
 
-void registerFunctionErfc(FunctionFactory & factory)
+REGISTER_FUNCTION(Erfc)
 {
     factory.registerFunction<FunctionErfc>();
 }
diff --git a/src/Functions/errorCodeToName.cpp b/src/Functions/errorCodeToName.cpp
index f447621c23c..1736311c6cc 100644
--- a/src/Functions/errorCodeToName.cpp
+++ b/src/Functions/errorCodeToName.cpp
@@ -54,7 +54,7 @@ public:
 };
 
 
-void registerFunctionErrorCodeToName(FunctionFactory & factory)
+REGISTER_FUNCTION(ErrorCodeToName)
 {
     factory.registerFunction<FunctionErrorCodeToName>();
 }
diff --git a/src/Functions/evalMLMethod.cpp b/src/Functions/evalMLMethod.cpp
index 876fec39c7b..003aaa2d312 100644
--- a/src/Functions/evalMLMethod.cpp
+++ b/src/Functions/evalMLMethod.cpp
@@ -92,7 +92,7 @@ public:
 
 }
 
-void registerFunctionEvalMLMethod(FunctionFactory & factory)
+REGISTER_FUNCTION(EvalMLMethod)
 {
     factory.registerFunction<FunctionEvalMLMethod>();
 }
diff --git a/src/Functions/exp.cpp b/src/Functions/exp.cpp
index c6eb3335f25..71037692f15 100644
--- a/src/Functions/exp.cpp
+++ b/src/Functions/exp.cpp
@@ -34,7 +34,7 @@ using FunctionExp = FunctionMathUnary<UnaryFunctionVectorized<ExpName, exp>>;
 
 }
 
-void registerFunctionExp(FunctionFactory & factory)
+REGISTER_FUNCTION(Exp)
 {
     factory.registerFunction<FunctionExp>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/exp10.cpp b/src/Functions/exp10.cpp
index abd0755c245..a21350c532c 100644
--- a/src/Functions/exp10.cpp
+++ b/src/Functions/exp10.cpp
@@ -12,7 +12,7 @@ using FunctionExp10 = FunctionMathUnary<UnaryFunctionVectorized<Exp10Name, preci
 
 }
 
-void registerFunctionExp10(FunctionFactory & factory)
+REGISTER_FUNCTION(Exp10)
 {
     factory.registerFunction<FunctionExp10>();
 }
diff --git a/src/Functions/exp2.cpp b/src/Functions/exp2.cpp
index 8825b849346..aff84f65e23 100644
--- a/src/Functions/exp2.cpp
+++ b/src/Functions/exp2.cpp
@@ -11,7 +11,7 @@ using FunctionExp2 = FunctionMathUnary<UnaryFunctionVectorized<Exp2Name, exp2>>;
 
 }
 
-void registerFunctionExp2(FunctionFactory & factory)
+REGISTER_FUNCTION(Exp2)
 {
     factory.registerFunction<FunctionExp2>();
 }
diff --git a/src/Functions/extract.cpp b/src/Functions/extract.cpp
index f5917015e27..5d539e03dae 100644
--- a/src/Functions/extract.cpp
+++ b/src/Functions/extract.cpp
@@ -65,7 +65,7 @@ using FunctionExtract = FunctionsStringSearchToString<ExtractImpl, NameExtract>;
 
 }
 
-void registerFunctionExtract(FunctionFactory & factory)
+REGISTER_FUNCTION(Extract)
 {
     factory.registerFunction<FunctionExtract>();
 }
diff --git a/src/Functions/extractAllGroupsHorizontal.cpp b/src/Functions/extractAllGroupsHorizontal.cpp
index fba7483ba03..d0ed7757384 100644
--- a/src/Functions/extractAllGroupsHorizontal.cpp
+++ b/src/Functions/extractAllGroupsHorizontal.cpp
@@ -15,7 +15,7 @@ struct HorizontalImpl
 namespace DB
 {
 
-void registerFunctionExtractAllGroupsHorizontal(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractAllGroupsHorizontal)
 {
     factory.registerFunction<FunctionExtractAllGroups<HorizontalImpl>>();
 }
diff --git a/src/Functions/extractAllGroupsVertical.cpp b/src/Functions/extractAllGroupsVertical.cpp
index bf33eef70f3..87a0b4cf7bc 100644
--- a/src/Functions/extractAllGroupsVertical.cpp
+++ b/src/Functions/extractAllGroupsVertical.cpp
@@ -15,7 +15,7 @@ struct VerticalImpl
 namespace DB
 {
 
-void registerFunctionExtractAllGroupsVertical(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractAllGroupsVertical)
 {
     factory.registerFunction<FunctionExtractAllGroups<VerticalImpl>>();
     factory.registerAlias("extractAllGroups", VerticalImpl::Name, FunctionFactory::CaseSensitive);
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index c6633732aaa..eb6e609a4be 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -108,7 +108,7 @@ public:
 
 }
 
-void registerFunctionExtractGroups(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractGroups)
 {
     factory.registerFunction<FunctionExtractGroups>();
 }
diff --git a/src/Functions/extractTextFromHTML.cpp b/src/Functions/extractTextFromHTML.cpp
index f321a59f734..3c95431452f 100644
--- a/src/Functions/extractTextFromHTML.cpp
+++ b/src/Functions/extractTextFromHTML.cpp
@@ -351,7 +351,7 @@ public:
     }
 };
 
-void registerFunctionExtractTextFromHTML(FunctionFactory & factory)
+REGISTER_FUNCTION(ExtractTextFromHTML)
 {
     factory.registerFunction<FunctionExtractTextFromHTML>();
 }
diff --git a/src/Functions/filesystem.cpp b/src/Functions/filesystem.cpp
index 36db68617e9..12813c3d852 100644
--- a/src/Functions/filesystem.cpp
+++ b/src/Functions/filesystem.cpp
@@ -66,7 +66,7 @@ private:
 
 }
 
-void registerFunctionFilesystem(FunctionFactory & factory)
+REGISTER_FUNCTION(Filesystem)
 {
     factory.registerFunction<FilesystemImpl<FilesystemAvailable>>();
     factory.registerFunction<FilesystemImpl<FilesystemCapacity>>();
diff --git a/src/Functions/finalizeAggregation.cpp b/src/Functions/finalizeAggregation.cpp
index 237d9fa3ef8..61604a3abc0 100644
--- a/src/Functions/finalizeAggregation.cpp
+++ b/src/Functions/finalizeAggregation.cpp
@@ -73,7 +73,7 @@ public:
 
 }
 
-void registerFunctionFinalizeAggregation(FunctionFactory & factory)
+REGISTER_FUNCTION(FinalizeAggregation)
 {
     factory.registerFunction<FunctionFinalizeAggregation>();
 }
diff --git a/src/Functions/flattenTuple.cpp b/src/Functions/flattenTuple.cpp
index f5d5b4cb773..bde081b40a0 100644
--- a/src/Functions/flattenTuple.cpp
+++ b/src/Functions/flattenTuple.cpp
@@ -60,7 +60,7 @@ public:
 
 }
 
-void registerFunctionFlattenTuple(FunctionFactory & factory)
+REGISTER_FUNCTION(FlattenTuple)
 {
     factory.registerFunction<FunctionFlattenTuple>();
 }
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index e2ec90f4e61..37f1f7e83f8 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -730,7 +730,7 @@ using FunctionFROM_UNIXTIME = FunctionFormatDateTimeImpl<NameFromUnixTime, true>
 
 }
 
-void registerFunctionFormatDateTime(FunctionFactory & factory)
+REGISTER_FUNCTION(FormatDateTime)
 {
     factory.registerFunction<FunctionFormatDateTime>();
     factory.registerFunction<FunctionFROM_UNIXTIME>();
diff --git a/src/Functions/formatReadableQuantity.cpp b/src/Functions/formatReadableQuantity.cpp
index 2ccfbd4a857..682fac88969 100644
--- a/src/Functions/formatReadableQuantity.cpp
+++ b/src/Functions/formatReadableQuantity.cpp
@@ -18,7 +18,7 @@ namespace
     };
 }
 
-void registerFunctionFormatReadableQuantity(FunctionFactory & factory)
+REGISTER_FUNCTION(FormatReadableQuantity)
 {
     factory.registerFunction<FunctionFormatReadable<Impl>>();
 }
diff --git a/src/Functions/formatReadableSize.cpp b/src/Functions/formatReadableSize.cpp
index b0b79834eef..95441d43b2f 100644
--- a/src/Functions/formatReadableSize.cpp
+++ b/src/Functions/formatReadableSize.cpp
@@ -18,7 +18,7 @@ namespace
     };
 }
 
-void registerFunctionFormatReadableSize(FunctionFactory & factory)
+REGISTER_FUNCTION(FormatReadableSize)
 {
     factory.registerFunction<FunctionFormatReadable<Impl>>();
 }
diff --git a/src/Functions/formatReadableTimeDelta.cpp b/src/Functions/formatReadableTimeDelta.cpp
index 219c2d95353..058d4c0548c 100644
--- a/src/Functions/formatReadableTimeDelta.cpp
+++ b/src/Functions/formatReadableTimeDelta.cpp
@@ -222,7 +222,7 @@ public:
 
 }
 
-void registerFunctionFormatReadableTimeDelta(FunctionFactory & factory)
+REGISTER_FUNCTION(FormatReadableTimeDelta)
 {
     factory.registerFunction<FunctionFormatReadableTimeDelta>();
 }
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index 77fc2118791..0c2df48105e 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -125,7 +125,7 @@ private:
 
 }
 
-void registerFunctionFormatRow(FunctionFactory & factory)
+REGISTER_FUNCTION(FormatRow)
 {
     factory.registerFunction<FormatRowOverloadResolver<true>>();
     factory.registerFunction<FormatRowOverloadResolver<false>>();
diff --git a/src/Functions/formatString.cpp b/src/Functions/formatString.cpp
index ee90a082e5b..3d04d6e94a1 100644
--- a/src/Functions/formatString.cpp
+++ b/src/Functions/formatString.cpp
@@ -135,7 +135,7 @@ using FunctionFormat = FormatFunction<NameFormat>;
 
 }
 
-void registerFunctionFormat(FunctionFactory & factory)
+REGISTER_FUNCTION(Format)
 {
     factory.registerFunction<FunctionFormat>();
 }
diff --git a/src/Functions/fromModifiedJulianDay.cpp b/src/Functions/fromModifiedJulianDay.cpp
index e699547e346..ff434715338 100644
--- a/src/Functions/fromModifiedJulianDay.cpp
+++ b/src/Functions/fromModifiedJulianDay.cpp
@@ -232,7 +232,7 @@ namespace DB
         static constexpr auto name = "fromModifiedJulianDayOrNull";
     };
 
-    void registerFunctionFromModifiedJulianDay(FunctionFactory & factory)
+    REGISTER_FUNCTION(FromModifiedJulianDay)
     {
         factory.registerFunction<FromModifiedJulianDayOverloadResolver<NameFromModifiedJulianDay, false>>();
         factory.registerFunction<FromModifiedJulianDayOverloadResolver<NameFromModifiedJulianDayOrNull, true>>();
diff --git a/src/Functions/fromUnixTimestamp64Micro.cpp b/src/Functions/fromUnixTimestamp64Micro.cpp
index 1fd98e6e673..70dcbcd1d4b 100644
--- a/src/Functions/fromUnixTimestamp64Micro.cpp
+++ b/src/Functions/fromUnixTimestamp64Micro.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFromUnixTimestamp64Micro(FunctionFactory & factory)
+REGISTER_FUNCTION(FromUnixTimestamp64Micro)
 {
     factory.registerFunction("fromUnixTimestamp64Micro",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/fromUnixTimestamp64Milli.cpp b/src/Functions/fromUnixTimestamp64Milli.cpp
index 90f18699e5d..532013dfe5f 100644
--- a/src/Functions/fromUnixTimestamp64Milli.cpp
+++ b/src/Functions/fromUnixTimestamp64Milli.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFromUnixTimestamp64Milli(FunctionFactory & factory)
+REGISTER_FUNCTION(FromUnixTimestamp64Milli)
 {
     factory.registerFunction("fromUnixTimestamp64Milli",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/fromUnixTimestamp64Nano.cpp b/src/Functions/fromUnixTimestamp64Nano.cpp
index c489b48fb6e..96afdda0fa8 100644
--- a/src/Functions/fromUnixTimestamp64Nano.cpp
+++ b/src/Functions/fromUnixTimestamp64Nano.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFromUnixTimestamp64Nano(FunctionFactory & factory)
+REGISTER_FUNCTION(FromUnixTimestamp64Nano)
 {
     factory.registerFunction("fromUnixTimestamp64Nano",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/fuzzBits.cpp b/src/Functions/fuzzBits.cpp
index 8b54026724d..d97e8aff7ff 100644
--- a/src/Functions/fuzzBits.cpp
+++ b/src/Functions/fuzzBits.cpp
@@ -179,7 +179,7 @@ public:
 
 }
 
-void registerFunctionFuzzBits(FunctionFactory & factory)
+REGISTER_FUNCTION(FuzzBits)
 {
     factory.registerFunction<FunctionFuzzBits>();
 }
diff --git a/src/Functions/gcd.cpp b/src/Functions/gcd.cpp
index c8e70dc87a2..0cd017bb0b4 100644
--- a/src/Functions/gcd.cpp
+++ b/src/Functions/gcd.cpp
@@ -29,7 +29,7 @@ using FunctionGCD = BinaryArithmeticOverloadResolver<GCDImpl, NameGCD, false, fa
 
 }
 
-void registerFunctionGCD(FunctionFactory & factory)
+REGISTER_FUNCTION(GCD)
 {
     factory.registerFunction<FunctionGCD>();
 }
diff --git a/src/Functions/generateUUIDv4.cpp b/src/Functions/generateUUIDv4.cpp
index e4ecf5358f9..da4e324182a 100644
--- a/src/Functions/generateUUIDv4.cpp
+++ b/src/Functions/generateUUIDv4.cpp
@@ -100,7 +100,7 @@ private:
     ImplementationSelector<IFunction> selector;
 };
 
-void registerFunctionGenerateUUIDv4(FunctionFactory & factory)
+REGISTER_FUNCTION(GenerateUUIDv4)
 {
     factory.registerFunction<FunctionGenerateUUIDv4>();
 }
diff --git a/src/Functions/geoToH3.cpp b/src/Functions/geoToH3.cpp
index edbed6335ef..284598ee4d5 100644
--- a/src/Functions/geoToH3.cpp
+++ b/src/Functions/geoToH3.cpp
@@ -141,7 +141,7 @@ public:
 
 }
 
-void registerFunctionGeoToH3(FunctionFactory & factory)
+REGISTER_FUNCTION(GeoToH3)
 {
     factory.registerFunction<FunctionGeoToH3>();
 }
diff --git a/src/Functions/geoToS2.cpp b/src/Functions/geoToS2.cpp
index 8d90552652a..6cfa892b193 100644
--- a/src/Functions/geoToS2.cpp
+++ b/src/Functions/geoToS2.cpp
@@ -119,7 +119,7 @@ public:
 
 }
 
-void registerFunctionGeoToS2(FunctionFactory & factory)
+REGISTER_FUNCTION(GeoToS2)
 {
     factory.registerFunction<FunctionGeoToS2>();
 }
diff --git a/src/Functions/geohashDecode.cpp b/src/Functions/geohashDecode.cpp
index b4e5d8e46e9..b8a38c46dbf 100644
--- a/src/Functions/geohashDecode.cpp
+++ b/src/Functions/geohashDecode.cpp
@@ -93,7 +93,7 @@ public:
 
 }
 
-void registerFunctionGeohashDecode(FunctionFactory & factory)
+REGISTER_FUNCTION(GeohashDecode)
 {
     factory.registerFunction<FunctionGeohashDecode>();
 }
diff --git a/src/Functions/geohashEncode.cpp b/src/Functions/geohashEncode.cpp
index ebfa8167998..2f05a0b902a 100644
--- a/src/Functions/geohashEncode.cpp
+++ b/src/Functions/geohashEncode.cpp
@@ -133,7 +133,7 @@ public:
 
 }
 
-void registerFunctionGeohashEncode(FunctionFactory & factory)
+REGISTER_FUNCTION(GeohashEncode)
 {
     factory.registerFunction<FunctionGeohashEncode>();
 }
diff --git a/src/Functions/geohashesInBox.cpp b/src/Functions/geohashesInBox.cpp
index f6a8526ba9f..9ba4a62a2a0 100644
--- a/src/Functions/geohashesInBox.cpp
+++ b/src/Functions/geohashesInBox.cpp
@@ -181,7 +181,7 @@ public:
 
 }
 
-void registerFunctionGeohashesInBox(FunctionFactory & factory)
+REGISTER_FUNCTION(GeohashesInBox)
 {
     factory.registerFunction<FunctionGeohashesInBox>();
 }
diff --git a/src/Functions/getFuzzerData.cpp b/src/Functions/getFuzzerData.cpp
index f516c871950..6d748619926 100644
--- a/src/Functions/getFuzzerData.cpp
+++ b/src/Functions/getFuzzerData.cpp
@@ -1,11 +1,13 @@
+#ifdef FUZZING_MODE
 #include <Functions/getFuzzerData.h>
 
 namespace DB
 {
 
-void registerFunctionGetFuzzerData(FunctionFactory & factory)
+REGISTER_FUNCTION(GetFuzzerData)
 {
     factory.registerFunction<FunctionGetFuzzerData>();
 }
 
 }
+#endif
diff --git a/src/Functions/getMacro.cpp b/src/Functions/getMacro.cpp
index 29e706ce2a0..d5c9f8439dd 100644
--- a/src/Functions/getMacro.cpp
+++ b/src/Functions/getMacro.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionGetMacro(FunctionFactory & factory)
+REGISTER_FUNCTION(GetMacro)
 {
     factory.registerFunction<FunctionGetMacro>();
 }
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index c165ef26ffa..a3440dd89f2 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -42,6 +42,11 @@ public:
         return 1;
     }
 
+    bool useDefaultImplementationForLowCardinalityColumns() const override
+    {
+        return false;
+    }
+
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -143,7 +148,7 @@ struct GetShardCount
 
 }
 
-void registerFunctionGetScalar(FunctionFactory & factory)
+REGISTER_FUNCTION(GetScalar)
 {
     factory.registerFunction<FunctionGetScalar>();
     factory.registerFunction<FunctionGetSpecialScalar<GetShardNum>>();
diff --git a/src/Functions/getServerPort.cpp b/src/Functions/getServerPort.cpp
index 8596bcd6a07..054f7b538f7 100644
--- a/src/Functions/getServerPort.cpp
+++ b/src/Functions/getServerPort.cpp
@@ -128,7 +128,7 @@ public:
 
 }
 
-void registerFunctionGetServerPort(FunctionFactory & factory)
+REGISTER_FUNCTION(GetServerPort)
 {
     factory.registerFunction<GetServerPortOverloadResolver>();
 }
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index a27f698d54c..e7ea44aab28 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -63,7 +63,7 @@ private:
 
 }
 
-void registerFunctionGetSetting(FunctionFactory & factory)
+REGISTER_FUNCTION(GetSetting)
 {
     factory.registerFunction<FunctionGetSetting>();
 }
diff --git a/src/Functions/getSizeOfEnumType.cpp b/src/Functions/getSizeOfEnumType.cpp
index 17436de02f7..6128f5a44cb 100644
--- a/src/Functions/getSizeOfEnumType.cpp
+++ b/src/Functions/getSizeOfEnumType.cpp
@@ -76,7 +76,7 @@ private:
 
 }
 
-void registerFunctionGetSizeOfEnumType(FunctionFactory & factory)
+REGISTER_FUNCTION(GetSizeOfEnumType)
 {
     factory.registerFunction<FunctionGetSizeOfEnumType>();
 }
diff --git a/src/Functions/getTypeSerializationStreams.cpp b/src/Functions/getTypeSerializationStreams.cpp
index 3306c91dd0a..2b13f0f140d 100644
--- a/src/Functions/getTypeSerializationStreams.cpp
+++ b/src/Functions/getTypeSerializationStreams.cpp
@@ -79,7 +79,7 @@ private:
 
 }
 
-void registerFunctionGetTypeSerializationStreams(FunctionFactory & factory)
+REGISTER_FUNCTION(GetTypeSerializationStreams)
 {
     factory.registerFunction<FunctionGetTypeSerializationStreams>();
 }
diff --git a/src/Functions/globalVariable.cpp b/src/Functions/globalVariable.cpp
index 581ddbea371..50e94fad614 100644
--- a/src/Functions/globalVariable.cpp
+++ b/src/Functions/globalVariable.cpp
@@ -88,7 +88,7 @@ private:
 
 }
 
-void registerFunctionGlobalVariable(FunctionFactory & factory)
+REGISTER_FUNCTION(GlobalVariable)
 {
     factory.registerFunction<FunctionGlobalVariable>();
 }
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index ab8b37af960..5c1923da908 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -344,7 +344,7 @@ private:
     ImplementationSelector<IFunction> selector;
 };
 
-void registerFunctionGeoDistance(FunctionFactory & factory)
+REGISTER_FUNCTION(GeoDistance)
 {
     geodistInit();
     factory.registerFunction<FunctionGeoDistance<Method::SPHERE_DEGREES>>();
diff --git a/src/Functions/greater.cpp b/src/Functions/greater.cpp
index 1a0e999717d..c36f8d7acca 100644
--- a/src/Functions/greater.cpp
+++ b/src/Functions/greater.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionGreater = FunctionComparison<GreaterOp, NameGreater>;
 
-void registerFunctionGreater(FunctionFactory & factory)
+REGISTER_FUNCTION(Greater)
 {
     factory.registerFunction<FunctionGreater>();
 }
diff --git a/src/Functions/greaterOrEquals.cpp b/src/Functions/greaterOrEquals.cpp
index 4412faa6412..089ac4d5466 100644
--- a/src/Functions/greaterOrEquals.cpp
+++ b/src/Functions/greaterOrEquals.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionGreaterOrEquals = FunctionComparison<GreaterOrEqualsOp, NameGreaterOrEquals>;
 
-void registerFunctionGreaterOrEquals(FunctionFactory & factory)
+REGISTER_FUNCTION(GreaterOrEquals)
 {
     factory.registerFunction<FunctionGreaterOrEquals>();
 }
diff --git a/src/Functions/greatest.cpp b/src/Functions/greatest.cpp
index 75837a409e9..cac02eea1be 100644
--- a/src/Functions/greatest.cpp
+++ b/src/Functions/greatest.cpp
@@ -63,7 +63,7 @@ using GreatestImpl = std::conditional_t<!NumberTraits::LeastGreatestSpecialCase<
 struct NameGreatest { static constexpr auto name = "greatest"; };
 using FunctionGreatest = FunctionBinaryArithmetic<GreatestImpl, NameGreatest>;
 
-void registerFunctionGreatest(FunctionFactory & factory)
+REGISTER_FUNCTION(Greatest)
 {
     factory.registerFunction<LeastGreatestOverloadResolver<LeastGreatest::Greatest, FunctionGreatest>>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/h3CellAreaM2.cpp b/src/Functions/h3CellAreaM2.cpp
index e5fb5aa2ed7..10fac6c9441 100644
--- a/src/Functions/h3CellAreaM2.cpp
+++ b/src/Functions/h3CellAreaM2.cpp
@@ -91,7 +91,7 @@ public:
 
 }
 
-void registerFunctionH3CellAreaM2(FunctionFactory & factory)
+REGISTER_FUNCTION(H3CellAreaM2)
 {
     factory.registerFunction<FunctionH3CellAreaM2>();
 }
diff --git a/src/Functions/h3CellAreaRads2.cpp b/src/Functions/h3CellAreaRads2.cpp
index 15d18613b72..c74944e4e2f 100644
--- a/src/Functions/h3CellAreaRads2.cpp
+++ b/src/Functions/h3CellAreaRads2.cpp
@@ -90,7 +90,7 @@ public:
 
 }
 
-void registerFunctionH3CellAreaRads2(FunctionFactory & factory)
+REGISTER_FUNCTION(H3CellAreaRads2)
 {
     factory.registerFunction<FunctionH3CellAreaRads2>();
 }
diff --git a/src/Functions/h3Distance.cpp b/src/Functions/h3Distance.cpp
index b6206a1922f..d4291c30424 100644
--- a/src/Functions/h3Distance.cpp
+++ b/src/Functions/h3Distance.cpp
@@ -107,7 +107,7 @@ public:
 
 }
 
-void registerFunctionH3Distance(FunctionFactory & factory)
+REGISTER_FUNCTION(H3Distance)
 {
     factory.registerFunction<FunctionH3Distance>();
 }
diff --git a/src/Functions/h3EdgeAngle.cpp b/src/Functions/h3EdgeAngle.cpp
index 8240f092ee8..f80bfd1cdf9 100644
--- a/src/Functions/h3EdgeAngle.cpp
+++ b/src/Functions/h3EdgeAngle.cpp
@@ -94,7 +94,7 @@ public:
 
 }
 
-void registerFunctionH3EdgeAngle(FunctionFactory & factory)
+REGISTER_FUNCTION(H3EdgeAngle)
 {
     factory.registerFunction<FunctionH3EdgeAngle>();
 }
diff --git a/src/Functions/h3EdgeLengthKm.cpp b/src/Functions/h3EdgeLengthKm.cpp
index b7072a2f309..ca2b050b485 100644
--- a/src/Functions/h3EdgeLengthKm.cpp
+++ b/src/Functions/h3EdgeLengthKm.cpp
@@ -92,7 +92,7 @@ public:
 
 }
 
-void registerFunctionH3EdgeLengthKm(FunctionFactory & factory)
+REGISTER_FUNCTION(H3EdgeLengthKm)
 {
     factory.registerFunction<FunctionH3EdgeLengthKm>();
 }
diff --git a/src/Functions/h3EdgeLengthM.cpp b/src/Functions/h3EdgeLengthM.cpp
index 2c934bc6c05..a2786da51f1 100644
--- a/src/Functions/h3EdgeLengthM.cpp
+++ b/src/Functions/h3EdgeLengthM.cpp
@@ -97,7 +97,7 @@ public:
 
 }
 
-void registerFunctionH3EdgeLengthM(FunctionFactory & factory)
+REGISTER_FUNCTION(H3EdgeLengthM)
 {
     factory.registerFunction<FunctionH3EdgeLengthM>();
 }
diff --git a/src/Functions/h3ExactEdgeLengthKm.cpp b/src/Functions/h3ExactEdgeLengthKm.cpp
index f37d93fd715..1cd43c98576 100644
--- a/src/Functions/h3ExactEdgeLengthKm.cpp
+++ b/src/Functions/h3ExactEdgeLengthKm.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionH3ExactEdgeLengthKm(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ExactEdgeLengthKm)
 {
     factory.registerFunction<FunctionH3ExactEdgeLengthKm>();
 }
diff --git a/src/Functions/h3ExactEdgeLengthM.cpp b/src/Functions/h3ExactEdgeLengthM.cpp
index 99acbb757c3..1b930a592db 100644
--- a/src/Functions/h3ExactEdgeLengthM.cpp
+++ b/src/Functions/h3ExactEdgeLengthM.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionH3ExactEdgeLengthM(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ExactEdgeLengthM)
 {
     factory.registerFunction<FunctionH3ExactEdgeLengthM>();
 }
diff --git a/src/Functions/h3ExactEdgeLengthRads.cpp b/src/Functions/h3ExactEdgeLengthRads.cpp
index a2937e85c65..62b9d916cdf 100644
--- a/src/Functions/h3ExactEdgeLengthRads.cpp
+++ b/src/Functions/h3ExactEdgeLengthRads.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionH3ExactEdgeLengthRads(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ExactEdgeLengthRads)
 {
     factory.registerFunction<FunctionH3ExactEdgeLengthRads>();
 }
diff --git a/src/Functions/h3GetBaseCell.cpp b/src/Functions/h3GetBaseCell.cpp
index a3023561824..a0cd75c86a9 100644
--- a/src/Functions/h3GetBaseCell.cpp
+++ b/src/Functions/h3GetBaseCell.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionH3GetBaseCell(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetBaseCell)
 {
     factory.registerFunction<FunctionH3GetBaseCell>();
 }
diff --git a/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp b/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp
index 4a4a36076b2..38a97ac8be0 100644
--- a/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp
+++ b/src/Functions/h3GetDestinationIndexFromUnidirectionalEdge.cpp
@@ -85,7 +85,7 @@ public:
 
 }
 
-void registerFunctionH3GetDestinationIndexFromUnidirectionalEdge(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetDestinationIndexFromUnidirectionalEdge)
 {
     factory.registerFunction<FunctionH3GetDestinationIndexFromUnidirectionalEdge>();
 }
diff --git a/src/Functions/h3GetFaces.cpp b/src/Functions/h3GetFaces.cpp
index 0344ccc7944..42f430fb2ab 100644
--- a/src/Functions/h3GetFaces.cpp
+++ b/src/Functions/h3GetFaces.cpp
@@ -106,7 +106,7 @@ public:
 
 }
 
-void registerFunctionH3GetFaces(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetFaces)
 {
     factory.registerFunction<FunctionH3GetFaces>();
 }
diff --git a/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp b/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp
index 91ab22aed29..3d98a6374c6 100644
--- a/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp
+++ b/src/Functions/h3GetIndexesFromUnidirectionalEdge.cpp
@@ -100,7 +100,7 @@ public:
 
 }
 
-void registerFunctionH3GetIndexesFromUnidirectionalEdge(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetIndexesFromUnidirectionalEdge)
 {
     factory.registerFunction<FunctionH3GetIndexesFromUnidirectionalEdge>();
 }
diff --git a/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp b/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp
index acf94fcf95f..cbe69a4e887 100644
--- a/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp
+++ b/src/Functions/h3GetOriginIndexFromUnidirectionalEdge.cpp
@@ -85,7 +85,7 @@ public:
 
 }
 
-void registerFunctionH3GetOriginIndexFromUnidirectionalEdge(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetOriginIndexFromUnidirectionalEdge)
 {
     factory.registerFunction<FunctionH3GetOriginIndexFromUnidirectionalEdge>();
 }
diff --git a/src/Functions/h3GetPentagonIndexes.cpp b/src/Functions/h3GetPentagonIndexes.cpp
index bc90187bb3a..b24b58a2568 100644
--- a/src/Functions/h3GetPentagonIndexes.cpp
+++ b/src/Functions/h3GetPentagonIndexes.cpp
@@ -108,7 +108,7 @@ public:
 
 }
 
-void registerFunctionH3GetPentagonIndexes(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetPentagonIndexes)
 {
     factory.registerFunction<FunctionH3GetPentagonIndexes>();
 }
diff --git a/src/Functions/h3GetRes0Indexes.cpp b/src/Functions/h3GetRes0Indexes.cpp
index 9be55c0bb62..0db89752fa0 100644
--- a/src/Functions/h3GetRes0Indexes.cpp
+++ b/src/Functions/h3GetRes0Indexes.cpp
@@ -59,7 +59,7 @@ public:
 
 }
 
-void registerFunctionH3GetRes0Indexes(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetRes0Indexes)
 {
     factory.registerFunction<FunctionH3GetRes0Indexes>();
 }
diff --git a/src/Functions/h3GetResolution.cpp b/src/Functions/h3GetResolution.cpp
index 4d0a92a1414..153cf883b19 100644
--- a/src/Functions/h3GetResolution.cpp
+++ b/src/Functions/h3GetResolution.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionH3GetResolution(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetResolution)
 {
     factory.registerFunction<FunctionH3GetResolution>();
 }
diff --git a/src/Functions/h3GetUnidirectionalEdge.cpp b/src/Functions/h3GetUnidirectionalEdge.cpp
index 7d4122150e6..eddc35bd45a 100644
--- a/src/Functions/h3GetUnidirectionalEdge.cpp
+++ b/src/Functions/h3GetUnidirectionalEdge.cpp
@@ -117,7 +117,7 @@ public:
 
 }
 
-void registerFunctionH3GetUnidirectionalEdge(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetUnidirectionalEdge)
 {
     factory.registerFunction<FunctionH3GetUnidirectionalEdge>();
 }
diff --git a/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp b/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp
index 4cbdda2cb70..bf2e904c473 100644
--- a/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp
+++ b/src/Functions/h3GetUnidirectionalEdgeBoundary.cpp
@@ -101,7 +101,7 @@ public:
 
 }
 
-void registerFunctionH3GetUnidirectionalEdgeBoundary(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetUnidirectionalEdgeBoundary)
 {
     factory.registerFunction<FunctionH3GetUnidirectionalEdgeBoundary>();
 }
diff --git a/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp b/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp
index 10e0a5d8cb2..e31359c297d 100644
--- a/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp
+++ b/src/Functions/h3GetUnidirectionalEdgesFromHexagon.cpp
@@ -102,7 +102,7 @@ public:
 
 }
 
-void registerFunctionH3GetUnidirectionalEdgesFromHexagon(FunctionFactory & factory)
+REGISTER_FUNCTION(H3GetUnidirectionalEdgesFromHexagon)
 {
     factory.registerFunction<FunctionH3GetUnidirectionalEdgesFromHexagon>();
 }
diff --git a/src/Functions/h3HexAreaKm2.cpp b/src/Functions/h3HexAreaKm2.cpp
index c4a3c1258ab..e29b66f7538 100644
--- a/src/Functions/h3HexAreaKm2.cpp
+++ b/src/Functions/h3HexAreaKm2.cpp
@@ -93,7 +93,7 @@ public:
 
 }
 
-void registerFunctionH3HexAreaKm2(FunctionFactory & factory)
+REGISTER_FUNCTION(H3HexAreaKm2)
 {
     factory.registerFunction<FunctionH3HexAreaKm2>();
 }
diff --git a/src/Functions/h3HexAreaM2.cpp b/src/Functions/h3HexAreaM2.cpp
index f8599651b0f..eb90e5daa2e 100644
--- a/src/Functions/h3HexAreaM2.cpp
+++ b/src/Functions/h3HexAreaM2.cpp
@@ -94,7 +94,7 @@ public:
 
 }
 
-void registerFunctionH3HexAreaM2(FunctionFactory & factory)
+REGISTER_FUNCTION(H3HexAreaM2)
 {
     factory.registerFunction<FunctionH3HexAreaM2>();
 }
diff --git a/src/Functions/h3HexRing.cpp b/src/Functions/h3HexRing.cpp
index cc3acf9d7a5..25cde81e061 100644
--- a/src/Functions/h3HexRing.cpp
+++ b/src/Functions/h3HexRing.cpp
@@ -143,7 +143,7 @@ public:
 
 }
 
-void registerFunctionH3HexRing(FunctionFactory & factory)
+REGISTER_FUNCTION(H3HexRing)
 {
     factory.registerFunction<FunctionH3HexRing>();
 }
diff --git a/src/Functions/h3IndexesAreNeighbors.cpp b/src/Functions/h3IndexesAreNeighbors.cpp
index ee603f7de49..82a05a02f0d 100644
--- a/src/Functions/h3IndexesAreNeighbors.cpp
+++ b/src/Functions/h3IndexesAreNeighbors.cpp
@@ -103,7 +103,7 @@ public:
 
 }
 
-void registerFunctionH3IndexesAreNeighbors(FunctionFactory & factory)
+REGISTER_FUNCTION(H3IndexesAreNeighbors)
 {
     factory.registerFunction<FunctionH3IndexesAreNeighbors>();
 }
diff --git a/src/Functions/h3IsPentagon.cpp b/src/Functions/h3IsPentagon.cpp
index b7374bc1d8d..048a5ca50ce 100644
--- a/src/Functions/h3IsPentagon.cpp
+++ b/src/Functions/h3IsPentagon.cpp
@@ -80,7 +80,7 @@ public:
 
 }
 
-void registerFunctionH3IsPentagon(FunctionFactory & factory)
+REGISTER_FUNCTION(H3IsPentagon)
 {
     factory.registerFunction<FunctionH3IsPentagon>();
 }
diff --git a/src/Functions/h3IsResClassIII.cpp b/src/Functions/h3IsResClassIII.cpp
index 08025c966cd..23a11f1a544 100644
--- a/src/Functions/h3IsResClassIII.cpp
+++ b/src/Functions/h3IsResClassIII.cpp
@@ -80,7 +80,7 @@ public:
 
 }
 
-void registerFunctionH3IsResClassIII(FunctionFactory & factory)
+REGISTER_FUNCTION(H3IsResClassIII)
 {
     factory.registerFunction<FunctionH3IsResClassIII>();
 }
diff --git a/src/Functions/h3IsValid.cpp b/src/Functions/h3IsValid.cpp
index b6701d89de6..6b7b47bc8d4 100644
--- a/src/Functions/h3IsValid.cpp
+++ b/src/Functions/h3IsValid.cpp
@@ -83,7 +83,7 @@ public:
 
 }
 
-void registerFunctionH3IsValid(FunctionFactory & factory)
+REGISTER_FUNCTION(H3IsValid)
 {
     factory.registerFunction<FunctionH3IsValid>();
 }
diff --git a/src/Functions/h3Line.cpp b/src/Functions/h3Line.cpp
index 2e92d65b0b9..d596c6ec956 100644
--- a/src/Functions/h3Line.cpp
+++ b/src/Functions/h3Line.cpp
@@ -133,7 +133,7 @@ public:
 
 }
 
-void registerFunctionH3Line(FunctionFactory & factory)
+REGISTER_FUNCTION(H3Line)
 {
     factory.registerFunction<FunctionH3Line>();
 }
diff --git a/src/Functions/h3NumHexagons.cpp b/src/Functions/h3NumHexagons.cpp
index 009ff182940..3a13071d6cf 100644
--- a/src/Functions/h3NumHexagons.cpp
+++ b/src/Functions/h3NumHexagons.cpp
@@ -89,7 +89,7 @@ public:
 
 }
 
-void registerFunctionH3NumHexagons(FunctionFactory & factory)
+REGISTER_FUNCTION(H3NumHexagons)
 {
     factory.registerFunction<FunctionH3NumHexagons>();
 }
diff --git a/src/Functions/h3PointDist.cpp b/src/Functions/h3PointDist.cpp
index 463050c9b81..2d3512f0192 100644
--- a/src/Functions/h3PointDist.cpp
+++ b/src/Functions/h3PointDist.cpp
@@ -144,9 +144,9 @@ struct H3PointDistRads
 };
 
 
-void registerFunctionH3PointDistM(FunctionFactory & factory) { factory.registerFunction<FunctionH3PointDist<H3PointDistM>>(); }
-void registerFunctionH3PointDistKm(FunctionFactory & factory) { factory.registerFunction<FunctionH3PointDist<H3PointDistKm>>(); }
-void registerFunctionH3PointDistRads(FunctionFactory & factory) { factory.registerFunction<FunctionH3PointDist<H3PointDistRads>>(); }
+REGISTER_FUNCTION(H3PointDistM) { factory.registerFunction<FunctionH3PointDist<H3PointDistM>>(); }
+REGISTER_FUNCTION(H3PointDistKm) { factory.registerFunction<FunctionH3PointDist<H3PointDistKm>>(); }
+REGISTER_FUNCTION(H3PointDistRads) { factory.registerFunction<FunctionH3PointDist<H3PointDistRads>>(); }
 
 }
 
diff --git a/src/Functions/h3ToCenterChild.cpp b/src/Functions/h3ToCenterChild.cpp
index 6b9724c297c..6104d179d30 100644
--- a/src/Functions/h3ToCenterChild.cpp
+++ b/src/Functions/h3ToCenterChild.cpp
@@ -109,7 +109,7 @@ namespace
 
 }
 
-void registerFunctionH3ToCenterChild(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ToCenterChild)
 {
     factory.registerFunction<FunctionH3ToCenterChild>();
 }
diff --git a/src/Functions/h3ToChildren.cpp b/src/Functions/h3ToChildren.cpp
index 26d3e3dc204..f18d96c6a90 100644
--- a/src/Functions/h3ToChildren.cpp
+++ b/src/Functions/h3ToChildren.cpp
@@ -139,7 +139,7 @@ public:
 
 }
 
-void registerFunctionH3ToChildren(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ToChildren)
 {
     factory.registerFunction<FunctionH3ToChildren>();
 }
diff --git a/src/Functions/h3ToGeoBoundary.cpp b/src/Functions/h3ToGeoBoundary.cpp
index acf1ec64020..dedb195f79c 100644
--- a/src/Functions/h3ToGeoBoundary.cpp
+++ b/src/Functions/h3ToGeoBoundary.cpp
@@ -98,7 +98,7 @@ public:
     }
 };
 
-void registerFunctionH3ToGeoBoundary(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ToGeoBoundary)
 {
     factory.registerFunction<FunctionH3ToGeoBoundary>();
 }
diff --git a/src/Functions/h3ToParent.cpp b/src/Functions/h3ToParent.cpp
index 8fd9931b81b..d7678004125 100644
--- a/src/Functions/h3ToParent.cpp
+++ b/src/Functions/h3ToParent.cpp
@@ -114,7 +114,7 @@ public:
 
 }
 
-void registerFunctionH3ToParent(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ToParent)
 {
     factory.registerFunction<FunctionH3ToParent>();
 }
diff --git a/src/Functions/h3ToString.cpp b/src/Functions/h3ToString.cpp
index 7ca46c3b064..9a6b1504af0 100644
--- a/src/Functions/h3ToString.cpp
+++ b/src/Functions/h3ToString.cpp
@@ -101,7 +101,7 @@ public:
 
 }
 
-void registerFunctionH3ToString(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ToString)
 {
     factory.registerFunction<FunctionH3ToString>();
 }
diff --git a/src/Functions/h3UnidirectionalEdgeIsValid.cpp b/src/Functions/h3UnidirectionalEdgeIsValid.cpp
index 6b00fba3c5a..012a14823c9 100644
--- a/src/Functions/h3UnidirectionalEdgeIsValid.cpp
+++ b/src/Functions/h3UnidirectionalEdgeIsValid.cpp
@@ -87,7 +87,7 @@ public:
 
 }
 
-void registerFunctionH3UnidirectionalEdgeIsValid(FunctionFactory & factory)
+REGISTER_FUNCTION(H3UnidirectionalEdgeIsValid)
 {
     factory.registerFunction<FunctionH3UnidirectionalEdgeIsValid>();
 }
diff --git a/src/Functions/h3kRing.cpp b/src/Functions/h3kRing.cpp
index a68f2a5e23d..f2d50532e61 100644
--- a/src/Functions/h3kRing.cpp
+++ b/src/Functions/h3kRing.cpp
@@ -137,7 +137,7 @@ public:
 
 }
 
-void registerFunctionH3KRing(FunctionFactory & factory)
+REGISTER_FUNCTION(H3KRing)
 {
     factory.registerFunction<FunctionH3KRing>();
 }
diff --git a/src/Functions/h3toGeo.cpp b/src/Functions/h3toGeo.cpp
index 52c9b1217ca..aff55324e48 100644
--- a/src/Functions/h3toGeo.cpp
+++ b/src/Functions/h3toGeo.cpp
@@ -100,7 +100,7 @@ public:
 
 }
 
-void registerFunctionH3ToGeo(FunctionFactory & factory)
+REGISTER_FUNCTION(H3ToGeo)
 {
     factory.registerFunction<FunctionH3ToGeo>();
 }
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index a70bf57f7c2..4c3008dd516 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -155,7 +155,7 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
 
 }
 
-void registerFunctionHasColumnInTable(FunctionFactory & factory)
+REGISTER_FUNCTION(HasColumnInTable)
 {
     factory.registerFunction<FunctionHasColumnInTable>();
 }
diff --git a/src/Functions/hasThreadFuzzer.cpp b/src/Functions/hasThreadFuzzer.cpp
index 7ee0b3ee687..a0b1b13b580 100644
--- a/src/Functions/hasThreadFuzzer.cpp
+++ b/src/Functions/hasThreadFuzzer.cpp
@@ -46,7 +46,7 @@ public:
 
 }
 
-void registerFunctionHasThreadFuzzer(FunctionFactory & factory)
+REGISTER_FUNCTION(HasThreadFuzzer)
 {
     factory.registerFunction<FunctionHasThreadFuzzer>();
 }
diff --git a/src/Functions/hasToken.cpp b/src/Functions/hasToken.cpp
index 72d6c11a5fa..646ff0b54f7 100644
--- a/src/Functions/hasToken.cpp
+++ b/src/Functions/hasToken.cpp
@@ -18,7 +18,7 @@ using FunctionHasToken = FunctionsStringSearch<HasTokenImpl<NameHasToken, Volnit
 
 }
 
-void registerFunctionHasToken(FunctionFactory & factory)
+REGISTER_FUNCTION(HasToken)
 {
     factory.registerFunction<FunctionHasToken>();
 }
diff --git a/src/Functions/hasTokenCaseInsensitive.cpp b/src/Functions/hasTokenCaseInsensitive.cpp
index a0280bc12a5..0012ea3e148 100644
--- a/src/Functions/hasTokenCaseInsensitive.cpp
+++ b/src/Functions/hasTokenCaseInsensitive.cpp
@@ -19,7 +19,7 @@ using FunctionHasTokenCaseInsensitive
 
 }
 
-void registerFunctionHasTokenCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(HasTokenCaseInsensitive)
 {
     factory.registerFunction<FunctionHasTokenCaseInsensitive>();
 }
diff --git a/src/Functions/hypot.cpp b/src/Functions/hypot.cpp
index 00297713d11..4963e0262e4 100644
--- a/src/Functions/hypot.cpp
+++ b/src/Functions/hypot.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionHypot(FunctionFactory & factory)
+REGISTER_FUNCTION(Hypot)
 {
     factory.registerFunction<FunctionHypot>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index b3d05226bda..8a29eafca52 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -34,7 +34,7 @@ public:
 
 }
 
-void registerFunctionIdentity(FunctionFactory & factory)
+REGISTER_FUNCTION(Identity)
 {
     factory.registerFunction<FunctionIdentity>();
 }
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index d4c2fcdd779..d7fefb1ad0e 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -1120,7 +1120,7 @@ public:
 
 }
 
-void registerFunctionIf(FunctionFactory & factory)
+REGISTER_FUNCTION(If)
 {
     factory.registerFunction<FunctionIf>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/ifNotFinite.cpp b/src/Functions/ifNotFinite.cpp
index 49f74c2f5d0..5ce5d0ede70 100644
--- a/src/Functions/ifNotFinite.cpp
+++ b/src/Functions/ifNotFinite.cpp
@@ -65,7 +65,7 @@ private:
 
 }
 
-void registerFunctionIfNotFinite(FunctionFactory & factory)
+REGISTER_FUNCTION(IfNotFinite)
 {
     factory.registerFunction<FunctionIfNotFinite>();
 }
diff --git a/src/Functions/ifNull.cpp b/src/Functions/ifNull.cpp
index ab8e2677d28..a586a695752 100644
--- a/src/Functions/ifNull.cpp
+++ b/src/Functions/ifNull.cpp
@@ -89,7 +89,7 @@ private:
 
 }
 
-void registerFunctionIfNull(FunctionFactory & factory)
+REGISTER_FUNCTION(IfNull)
 {
     factory.registerFunction<FunctionIfNull>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/ignore.cpp b/src/Functions/ignore.cpp
index 77c16cf7819..87dd0ab1cbc 100644
--- a/src/Functions/ignore.cpp
+++ b/src/Functions/ignore.cpp
@@ -56,7 +56,7 @@ public:
 
 }
 
-void registerFunctionIgnore(FunctionFactory & factory)
+REGISTER_FUNCTION(Ignore)
 {
     factory.registerFunction<FunctionIgnore>();
 }
diff --git a/src/Functions/ilike.cpp b/src/Functions/ilike.cpp
index b88d01986d5..c9f1fb37c14 100644
--- a/src/Functions/ilike.cpp
+++ b/src/Functions/ilike.cpp
@@ -17,7 +17,7 @@ using FunctionILike = FunctionsStringSearch<ILikeImpl>;
 
 }
 
-void registerFunctionILike(FunctionFactory & factory)
+REGISTER_FUNCTION(ILike)
 {
     factory.registerFunction<FunctionILike>();
 }
diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index 469b98ed00d..5773e823a80 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -174,7 +174,7 @@ void registerFunctionsInImpl(FunctionFactory & factory)
 
 }
 
-void registerFunctionsIn(FunctionFactory & factory)
+REGISTER_FUNCTION(In)
 {
     registerFunctionsInImpl<false>(factory);
     registerFunctionsInImpl<true>(factory);
diff --git a/src/Functions/indexHint.cpp b/src/Functions/indexHint.cpp
index bb38a56cf27..b575d74af32 100644
--- a/src/Functions/indexHint.cpp
+++ b/src/Functions/indexHint.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunction.h>
+#include <Functions/indexHint.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 
@@ -6,61 +6,7 @@
 namespace DB
 {
 
-
-/** The `indexHint` function takes any number of any arguments and always returns one.
-  *
-  * This function has a special meaning (see ExpressionAnalyzer, KeyCondition)
-  * - the expressions inside it are not evaluated;
-  * - but when analyzing the index (selecting ranges for reading), this function is treated the same way,
-  *   as if instead of using it the expression itself would be.
-  *
-  * Example: WHERE something AND indexHint(CounterID = 34)
-  * - do not read or calculate CounterID = 34, but select ranges in which the CounterID = 34 expression can be true.
-  *
-  * The function can be used for debugging purposes, as well as for (hidden from the user) query conversions.
-  */
-class FunctionIndexHint : public IFunction
-{
-public:
-    static constexpr auto name = "indexHint";
-    static FunctionPtr create(ContextPtr)
-    {
-        return std::make_shared<FunctionIndexHint>();
-    }
-
-    bool isVariadic() const override
-    {
-        return true;
-    }
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    bool useDefaultImplementationForNulls() const override { return false; }
-
-    bool isSuitableForConstantFolding() const override { return false; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    String getName() const override
-    {
-        return name;
-    }
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeUInt8>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeUInt8().createColumnConst(input_rows_count, 1u);
-    }
-
-};
-
-
-void registerFunctionIndexHint(FunctionFactory & factory)
+REGISTER_FUNCTION(IndexHint)
 {
     factory.registerFunction<FunctionIndexHint>();
 }
diff --git a/src/Functions/indexHint.h b/src/Functions/indexHint.h
new file mode 100644
index 00000000000..3b71c7a5585
--- /dev/null
+++ b/src/Functions/indexHint.h
@@ -0,0 +1,70 @@
+#pragma once
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+
+
+namespace DB
+{
+
+class ActionsDAG;
+using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
+
+/** The `indexHint` function takes any number of any arguments and always returns one.
+  *
+  * This function has a special meaning (see ExpressionAnalyzer, KeyCondition)
+  * - the expressions inside it are not evaluated;
+  * - but when analyzing the index (selecting ranges for reading), this function is treated the same way,
+  *   as if instead of using it the expression itself would be.
+  *
+  * Example: WHERE something AND indexHint(CounterID = 34)
+  * - do not read or calculate CounterID = 34, but select ranges in which the CounterID = 34 expression can be true.
+  *
+  * The function can be used for debugging purposes, as well as for (hidden from the user) query conversions.
+  */
+class FunctionIndexHint : public IFunction
+{
+public:
+    static constexpr auto name = "indexHint";
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionIndexHint>();
+    }
+
+    bool isVariadic() const override
+    {
+        return true;
+    }
+    size_t getNumberOfArguments() const override
+    {
+        return 0;
+    }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    bool isSuitableForConstantFolding() const override { return false; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    String getName() const override
+    {
+        return name;
+    }
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return DataTypeUInt8().createColumnConst(input_rows_count, 1u);
+    }
+
+    void setActions(ActionsDAGPtr actions_) { actions = std::move(actions_); }
+    const ActionsDAGPtr & getActions() const { return actions; }
+
+private:
+    ActionsDAGPtr actions;
+};
+
+}
diff --git a/src/Functions/initialQueryID.cpp b/src/Functions/initialQueryID.cpp
index d032bde24e3..469f37cf614 100644
--- a/src/Functions/initialQueryID.cpp
+++ b/src/Functions/initialQueryID.cpp
@@ -38,7 +38,7 @@ public:
     }
 };
 
-void registerFunctionInitialQueryID(FunctionFactory & factory)
+REGISTER_FUNCTION(InitialQueryID)
 {
     factory.registerFunction<FunctionInitialQueryID>();
     factory.registerAlias("initial_query_id", FunctionInitialQueryID::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index 8843b1edc8d..b7dcce9c188 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -160,7 +160,7 @@ ColumnPtr FunctionInitializeAggregation::executeImpl(const ColumnsWithTypeAndNam
 
 }
 
-void registerFunctionInitializeAggregation(FunctionFactory & factory)
+REGISTER_FUNCTION(InitializeAggregation)
 {
     factory.registerFunction<FunctionInitializeAggregation>();
 }
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index f2713bb1adb..89a5fe2fbf2 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -126,7 +126,7 @@ template <> struct BinaryOperationImpl<Int32, Int64, DivideIntegralImpl<Int32, I
 struct NameIntDiv { static constexpr auto name = "intDiv"; };
 using FunctionIntDiv = BinaryArithmeticOverloadResolver<DivideIntegralImpl, NameIntDiv, false>;
 
-void registerFunctionIntDiv(FunctionFactory & factory)
+REGISTER_FUNCTION(IntDiv)
 {
     factory.registerFunction<FunctionIntDiv>();
 }
diff --git a/src/Functions/intDivOrZero.cpp b/src/Functions/intDivOrZero.cpp
index d1b3429abfb..96ff6ea80fc 100644
--- a/src/Functions/intDivOrZero.cpp
+++ b/src/Functions/intDivOrZero.cpp
@@ -29,7 +29,7 @@ struct DivideIntegralOrZeroImpl
 struct NameIntDivOrZero { static constexpr auto name = "intDivOrZero"; };
 using FunctionIntDivOrZero = BinaryArithmeticOverloadResolver<DivideIntegralOrZeroImpl, NameIntDivOrZero>;
 
-void registerFunctionIntDivOrZero(FunctionFactory & factory)
+REGISTER_FUNCTION(IntDivOrZero)
 {
     factory.registerFunction<FunctionIntDivOrZero>();
 }
diff --git a/src/Functions/intExp10.cpp b/src/Functions/intExp10.cpp
index abaa17c862b..3b5a2c2ac88 100644
--- a/src/Functions/intExp10.cpp
+++ b/src/Functions/intExp10.cpp
@@ -59,7 +59,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameIntExp10>
     }
 };
 
-void registerFunctionIntExp10(FunctionFactory & factory)
+REGISTER_FUNCTION(IntExp10)
 {
     factory.registerFunction<FunctionIntExp10>();
 }
diff --git a/src/Functions/intExp2.cpp b/src/Functions/intExp2.cpp
index b2c7e80ae4b..ae2a66dda78 100644
--- a/src/Functions/intExp2.cpp
+++ b/src/Functions/intExp2.cpp
@@ -62,7 +62,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameIntExp2>
     }
 };
 
-void registerFunctionIntExp2(FunctionFactory & factory)
+REGISTER_FUNCTION(IntExp2)
 {
     factory.registerFunction<FunctionIntExp2>();
 }
diff --git a/src/Functions/isConstant.cpp b/src/Functions/isConstant.cpp
index 09b29aaf260..c203674e7f9 100644
--- a/src/Functions/isConstant.cpp
+++ b/src/Functions/isConstant.cpp
@@ -52,7 +52,7 @@ public:
 
 }
 
-void registerFunctionIsConstant(FunctionFactory & factory)
+REGISTER_FUNCTION(IsConstant)
 {
     factory.registerFunction<FunctionIsConstant>();
 }
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index 9962d4b7314..fcba8c1f64b 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -146,7 +146,7 @@ private:
 
 }
 
-void registerFunctionIsDecimalOverflow(FunctionFactory & factory)
+REGISTER_FUNCTION(IsDecimalOverflow)
 {
     factory.registerFunction<FunctionIsDecimalOverflow>();
 }
diff --git a/src/Functions/isFinite.cpp b/src/Functions/isFinite.cpp
index b1ff5f326e5..90185b64fff 100644
--- a/src/Functions/isFinite.cpp
+++ b/src/Functions/isFinite.cpp
@@ -39,7 +39,7 @@ using FunctionIsFinite = FunctionNumericPredicate<IsFiniteImpl>;
 
 }
 
-void registerFunctionIsFinite(FunctionFactory & factory)
+REGISTER_FUNCTION(IsFinite)
 {
     factory.registerFunction<FunctionIsFinite>();
 }
diff --git a/src/Functions/isIPAddressContainedIn.cpp b/src/Functions/isIPAddressContainedIn.cpp
index a6f94c77ad1..15dcdc584d8 100644
--- a/src/Functions/isIPAddressContainedIn.cpp
+++ b/src/Functions/isIPAddressContainedIn.cpp
@@ -252,7 +252,7 @@ namespace DB
         }
     };
 
-    void registerFunctionIsIPAddressContainedIn(FunctionFactory & factory)
+    REGISTER_FUNCTION(IsIPAddressContainedIn)
     {
         factory.registerFunction<FunctionIsIPAddressContainedIn>();
     }
diff --git a/src/Functions/isInfinite.cpp b/src/Functions/isInfinite.cpp
index 1fbc134d0c9..e923e1461bc 100644
--- a/src/Functions/isInfinite.cpp
+++ b/src/Functions/isInfinite.cpp
@@ -35,7 +35,7 @@ using FunctionIsInfinite = FunctionNumericPredicate<IsInfiniteImpl>;
 
 }
 
-void registerFunctionIsInfinite(FunctionFactory & factory)
+REGISTER_FUNCTION(IsInfinite)
 {
     factory.registerFunction<FunctionIsInfinite>();
 }
diff --git a/src/Functions/isNaN.cpp b/src/Functions/isNaN.cpp
index 2e35e8cfbb5..e6ab425a4d3 100644
--- a/src/Functions/isNaN.cpp
+++ b/src/Functions/isNaN.cpp
@@ -22,7 +22,7 @@ using FunctionIsNaN = FunctionNumericPredicate<IsNaNImpl>;
 
 }
 
-void registerFunctionIsNaN(FunctionFactory & factory)
+REGISTER_FUNCTION(IsNaN)
 {
     factory.registerFunction<FunctionIsNaN>();
 }
diff --git a/src/Functions/isNotNull.cpp b/src/Functions/isNotNull.cpp
index 44ea8aeaeb0..cbdc08c2fab 100644
--- a/src/Functions/isNotNull.cpp
+++ b/src/Functions/isNotNull.cpp
@@ -79,7 +79,7 @@ public:
 
 }
 
-void registerFunctionIsNotNull(FunctionFactory & factory)
+REGISTER_FUNCTION(IsNotNull)
 {
     factory.registerFunction<FunctionIsNotNull>();
 }
diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index e22b1cf469c..1e1d4edd6ed 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -72,7 +72,7 @@ public:
 
 }
 
-void registerFunctionIsNull(FunctionFactory & factory)
+REGISTER_FUNCTION(IsNull)
 {
     factory.registerFunction<FunctionIsNull>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/isNullable.cpp b/src/Functions/isNullable.cpp
index 3680ac7ccb0..14874487f40 100644
--- a/src/Functions/isNullable.cpp
+++ b/src/Functions/isNullable.cpp
@@ -54,7 +54,7 @@ public:
 
 }
 
-void registerFunctionIsNullable(FunctionFactory & factory)
+REGISTER_FUNCTION(IsNullable)
 {
     factory.registerFunction<FunctionIsNullable>();
 }
diff --git a/src/Functions/isValidUTF8.cpp b/src/Functions/isValidUTF8.cpp
index 0168a36b5b5..3ecf69cc364 100644
--- a/src/Functions/isValidUTF8.cpp
+++ b/src/Functions/isValidUTF8.cpp
@@ -256,7 +256,7 @@ struct NameIsValidUTF8
 };
 using FunctionValidUTF8 = FunctionStringOrArrayToT<ValidUTF8Impl, NameIsValidUTF8, UInt8>;
 
-void registerFunctionIsValidUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(IsValidUTF8)
 {
     factory.registerFunction<FunctionValidUTF8>();
 }
diff --git a/src/Functions/isZeroOrNull.cpp b/src/Functions/isZeroOrNull.cpp
index 1c3b6889f16..021e4a842a6 100644
--- a/src/Functions/isZeroOrNull.cpp
+++ b/src/Functions/isZeroOrNull.cpp
@@ -115,7 +115,7 @@ private:
 
 }
 
-void registerFunctionIsZeroOrNull(FunctionFactory & factory)
+REGISTER_FUNCTION(IsZeroOrNull)
 {
     factory.registerFunction<FunctionIsZeroOrNull>();
 }
diff --git a/src/Functions/jumpConsistentHash.cpp b/src/Functions/jumpConsistentHash.cpp
index bc41913f7e7..ffc21eb5cea 100644
--- a/src/Functions/jumpConsistentHash.cpp
+++ b/src/Functions/jumpConsistentHash.cpp
@@ -39,7 +39,7 @@ using FunctionJumpConsistentHash = FunctionConsistentHashImpl<JumpConsistentHash
 
 }
 
-void registerFunctionJumpConsistentHash(FunctionFactory & factory)
+REGISTER_FUNCTION(JumpConsistentHash)
 {
     factory.registerFunction<FunctionJumpConsistentHash>();
 }
diff --git a/src/Functions/kostikConsistentHash.cpp b/src/Functions/kostikConsistentHash.cpp
index a38c3c965d8..47a9a928976 100644
--- a/src/Functions/kostikConsistentHash.cpp
+++ b/src/Functions/kostikConsistentHash.cpp
@@ -25,7 +25,7 @@ struct KostikConsistentHashImpl
 
 using FunctionKostikConsistentHash = FunctionConsistentHashImpl<KostikConsistentHashImpl>;
 
-void registerFunctionKostikConsistentHash(FunctionFactory & factory)
+REGISTER_FUNCTION(KostikConsistentHash)
 {
     factory.registerFunction<FunctionKostikConsistentHash>();
     factory.registerAlias("yandexConsistentHash", "kostikConsistentHash");
diff --git a/src/Functions/lcm.cpp b/src/Functions/lcm.cpp
index 51a1bf59d1b..495199fa964 100644
--- a/src/Functions/lcm.cpp
+++ b/src/Functions/lcm.cpp
@@ -61,7 +61,7 @@ using FunctionLCM = BinaryArithmeticOverloadResolver<LCMImpl, NameLCM, false, fa
 
 }
 
-void registerFunctionLCM(FunctionFactory & factory)
+REGISTER_FUNCTION(LCM)
 {
     factory.registerFunction<FunctionLCM>();
 }
diff --git a/src/Functions/least.cpp b/src/Functions/least.cpp
index b7fe2b302ff..53676f0c00d 100644
--- a/src/Functions/least.cpp
+++ b/src/Functions/least.cpp
@@ -63,7 +63,7 @@ using LeastImpl = std::conditional_t<!NumberTraits::LeastGreatestSpecialCase<A,
 struct NameLeast { static constexpr auto name = "least"; };
 using FunctionLeast = FunctionBinaryArithmetic<LeastImpl, NameLeast>;
 
-void registerFunctionLeast(FunctionFactory & factory)
+REGISTER_FUNCTION(Least)
 {
     factory.registerFunction<LeastGreatestOverloadResolver<LeastGreatest::Least, FunctionLeast>>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/left.cpp b/src/Functions/left.cpp
index aa7a2cdd5a8..93983d698ce 100644
--- a/src/Functions/left.cpp
+++ b/src/Functions/left.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFunctionLeft(FunctionFactory & factory)
+REGISTER_FUNCTION(Left)
 {
     factory.registerFunction<FunctionLeftRight<false, SubstringDirection::Left>>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionLeftRight<true, SubstringDirection::Left>>(FunctionFactory::CaseSensitive);
diff --git a/src/Functions/lemmatize.cpp b/src/Functions/lemmatize.cpp
index 78f9ee75ed8..72d4fe98a86 100644
--- a/src/Functions/lemmatize.cpp
+++ b/src/Functions/lemmatize.cpp
@@ -120,7 +120,7 @@ public:
 
 }
 
-void registerFunctionLemmatize(FunctionFactory & factory)
+REGISTER_FUNCTION(Lemmatize)
 {
     factory.registerFunction<FunctionLemmatize>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/lengthUTF8.cpp b/src/Functions/lengthUTF8.cpp
index 349635160a6..b139f87bc64 100644
--- a/src/Functions/lengthUTF8.cpp
+++ b/src/Functions/lengthUTF8.cpp
@@ -68,7 +68,7 @@ using FunctionLengthUTF8 = FunctionStringOrArrayToT<LengthUTF8Impl, NameLengthUT
 
 }
 
-void registerFunctionLengthUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(LengthUTF8)
 {
     factory.registerFunction<FunctionLengthUTF8>();
 
diff --git a/src/Functions/less.cpp b/src/Functions/less.cpp
index 5e9107c920d..63bfcfc9f40 100644
--- a/src/Functions/less.cpp
+++ b/src/Functions/less.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionLess = FunctionComparison<LessOp, NameLess>;
 
-void registerFunctionLess(FunctionFactory & factory)
+REGISTER_FUNCTION(Less)
 {
     factory.registerFunction<FunctionLess>();
 }
diff --git a/src/Functions/lessOrEquals.cpp b/src/Functions/lessOrEquals.cpp
index 8fb4702acd1..a91afabe226 100644
--- a/src/Functions/lessOrEquals.cpp
+++ b/src/Functions/lessOrEquals.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionLessOrEquals = FunctionComparison<LessOrEqualsOp, NameLessOrEquals>;
 
-void registerFunctionLessOrEquals(FunctionFactory & factory)
+REGISTER_FUNCTION(LessOrEquals)
 {
     factory.registerFunction<FunctionLessOrEquals>();
 }
diff --git a/src/Functions/lgamma.cpp b/src/Functions/lgamma.cpp
index 57ab74f8f87..93b013e8da6 100644
--- a/src/Functions/lgamma.cpp
+++ b/src/Functions/lgamma.cpp
@@ -25,7 +25,7 @@ using FunctionLGamma = FunctionMathUnary<UnaryFunctionVectorized<LGammaName, lga
 
 }
 
-void registerFunctionLGamma(FunctionFactory & factory)
+REGISTER_FUNCTION(LGamma)
 {
     factory.registerFunction<FunctionLGamma>();
 }
diff --git a/src/Functions/like.cpp b/src/Functions/like.cpp
index bd73aa4d471..3a3345051d4 100644
--- a/src/Functions/like.cpp
+++ b/src/Functions/like.cpp
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-void registerFunctionLike(FunctionFactory & factory)
+REGISTER_FUNCTION(Like)
 {
     factory.registerFunction<FunctionLike>();
 }
diff --git a/src/Functions/log.cpp b/src/Functions/log.cpp
index 791c73d13aa..cacb6dec1d2 100644
--- a/src/Functions/log.cpp
+++ b/src/Functions/log.cpp
@@ -32,7 +32,7 @@ using FunctionLog = FunctionMathUnary<UnaryFunctionVectorized<LogName, log>>;
 
 }
 
-void registerFunctionLog(FunctionFactory & factory)
+REGISTER_FUNCTION(Log)
 {
     factory.registerFunction<FunctionLog>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("ln", "log", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/log10.cpp b/src/Functions/log10.cpp
index 2e0bd484ed3..87b1e84f0fd 100644
--- a/src/Functions/log10.cpp
+++ b/src/Functions/log10.cpp
@@ -11,7 +11,7 @@ using FunctionLog10 = FunctionMathUnary<UnaryFunctionVectorized<Log10Name, log10
 
 }
 
-void registerFunctionLog10(FunctionFactory & factory)
+REGISTER_FUNCTION(Log10)
 {
     factory.registerFunction<FunctionLog10>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/log1p.cpp b/src/Functions/log1p.cpp
index dc3a16224be..3e44cdf1cc8 100644
--- a/src/Functions/log1p.cpp
+++ b/src/Functions/log1p.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionLog1p(FunctionFactory & factory)
+REGISTER_FUNCTION(Log1p)
 {
     factory.registerFunction<FunctionLog1p>();
 }
diff --git a/src/Functions/log2.cpp b/src/Functions/log2.cpp
index 6ca770eafee..487a9850958 100644
--- a/src/Functions/log2.cpp
+++ b/src/Functions/log2.cpp
@@ -11,7 +11,7 @@ using FunctionLog2 = FunctionMathUnary<UnaryFunctionVectorized<Log2Name, log2>>;
 
 }
 
-void registerFunctionLog2(FunctionFactory & factory)
+REGISTER_FUNCTION(Log2)
 {
     factory.registerFunction<FunctionLog2>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index deb49f66123..e1e4c5eb2b0 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -56,7 +56,7 @@ namespace
 
 }
 
-void registerFunctionLogTrace(FunctionFactory & factory)
+REGISTER_FUNCTION(LogTrace)
 {
     factory.registerFunction<FunctionLogTrace>();
 }
diff --git a/src/Functions/lowCardinalityIndices.cpp b/src/Functions/lowCardinalityIndices.cpp
index de96053c1e7..3c9d618b9ba 100644
--- a/src/Functions/lowCardinalityIndices.cpp
+++ b/src/Functions/lowCardinalityIndices.cpp
@@ -57,7 +57,7 @@ public:
 
 }
 
-void registerFunctionLowCardinalityIndices(FunctionFactory & factory)
+REGISTER_FUNCTION(LowCardinalityIndices)
 {
     factory.registerFunction<FunctionLowCardinalityIndices>();
 }
diff --git a/src/Functions/lowCardinalityKeys.cpp b/src/Functions/lowCardinalityKeys.cpp
index aa5c87d5b6d..963034f0830 100644
--- a/src/Functions/lowCardinalityKeys.cpp
+++ b/src/Functions/lowCardinalityKeys.cpp
@@ -50,7 +50,7 @@ public:
 
 }
 
-void registerFunctionLowCardinalityKeys(FunctionFactory & factory)
+REGISTER_FUNCTION(LowCardinalityKeys)
 {
     factory.registerFunction<FunctionLowCardinalityKeys>();
 }
diff --git a/src/Functions/lower.cpp b/src/Functions/lower.cpp
index 0b19ae03f86..a1b777db112 100644
--- a/src/Functions/lower.cpp
+++ b/src/Functions/lower.cpp
@@ -17,7 +17,7 @@ using FunctionLower = FunctionStringToString<LowerUpperImpl<'A', 'Z'>, NameLower
 
 }
 
-void registerFunctionLower(FunctionFactory & factory)
+REGISTER_FUNCTION(Lower)
 {
     factory.registerFunction<FunctionLower>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("lcase", NameLower::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/lowerUTF8.cpp b/src/Functions/lowerUTF8.cpp
index c8ff9636209..7adb0069121 100644
--- a/src/Functions/lowerUTF8.cpp
+++ b/src/Functions/lowerUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionLowerUTF8 = FunctionStringToString<LowerUpperUTF8Impl<'A', 'Z', Po
 
 }
 
-void registerFunctionLowerUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(LowerUTF8)
 {
     factory.registerFunction<FunctionLowerUTF8>();
 }
diff --git a/src/Functions/makeDate.cpp b/src/Functions/makeDate.cpp
index dbf29322787..34c681736f0 100644
--- a/src/Functions/makeDate.cpp
+++ b/src/Functions/makeDate.cpp
@@ -62,7 +62,7 @@ protected:
             DataTypePtr argument_type = arguments[i].type;
             if (!isNumber(argument_type))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Argument '{}' for function {} must be number", std::string(argument_names[i]), getName());
+                    "Argument '{}' for function {} must be a number", std::string(argument_names[i]), getName());
         }
     }
 
@@ -164,9 +164,9 @@ struct MakeDate32Traits
     using ReturnDataType = DataTypeDate32;
     using ReturnColumnType = ColumnInt32;
 
-    static constexpr auto MIN_YEAR = 1925;
-    static constexpr auto MAX_YEAR = 2283;
-    static constexpr auto MAX_DATE = YearMonthDayToSingleInt(MAX_YEAR, 11, 11);
+    static constexpr auto MIN_YEAR = 1900;
+    static constexpr auto MAX_YEAR = 2299;
+    static constexpr auto MAX_DATE = YearMonthDayToSingleInt(MAX_YEAR, 12, 31);
 };
 
 /// Common implementation for makeDateTime, makeDateTime64
@@ -322,7 +322,7 @@ public:
             const auto& fraction_argument = arguments[argument_names.size()];
             if (!isNumber(fraction_argument.type))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Argument 'fraction' for function {} must be number", getName());
+                    "Argument 'fraction' for function {} must be a number", getName());
         }
 
         /// Optional precision argument
@@ -433,7 +433,7 @@ private:
 
 }
 
-void registerFunctionsMakeDate(FunctionFactory & factory)
+REGISTER_FUNCTION(MakeDate)
 {
     factory.registerFunction<FunctionMakeDate<MakeDateTraits>>();
     factory.registerFunction<FunctionMakeDate<MakeDate32Traits>>();
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 964dc92ef3c..cdb68a142a0 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -647,7 +647,7 @@ public:
 
 }
 
-void registerFunctionsMap(FunctionFactory & factory)
+REGISTER_FUNCTION(Map)
 {
     factory.registerFunction<FunctionMap>();
     factory.registerFunction<FunctionMapContains>();
diff --git a/src/Functions/mapFilter.cpp b/src/Functions/mapFilter.cpp
index f38f8f8b4d1..639cee7ce0f 100644
--- a/src/Functions/mapFilter.cpp
+++ b/src/Functions/mapFilter.cpp
@@ -133,7 +133,7 @@ struct MapApplyImpl
     }
 };
 
-void registerFunctionMapApply(FunctionFactory & factory)
+REGISTER_FUNCTION(MapApply)
 {
     factory.registerFunction<FunctionArrayMapped<MapFilterImpl, MapFilterImpl>>();
     factory.registerFunction<FunctionArrayMapped<MapApplyImpl, MapApplyImpl>>();
diff --git a/src/Functions/match.cpp b/src/Functions/match.cpp
index a0789f229fd..c719cc6dd82 100644
--- a/src/Functions/match.cpp
+++ b/src/Functions/match.cpp
@@ -17,7 +17,7 @@ using FunctionMatch = FunctionsStringSearch<MatchImpl<NameMatch, MatchTraits::Sy
 
 }
 
-void registerFunctionMatch(FunctionFactory & factory)
+REGISTER_FUNCTION(Match)
 {
     factory.registerFunction<FunctionMatch>();
     factory.registerAlias("REGEXP_MATCHES", NameMatch::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/materialize.cpp b/src/Functions/materialize.cpp
index c9fdd019be7..5cef610b60a 100644
--- a/src/Functions/materialize.cpp
+++ b/src/Functions/materialize.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionMaterialize(FunctionFactory & factory)
+REGISTER_FUNCTION(Materialize)
 {
     factory.registerFunction<FunctionMaterialize>();
 }
diff --git a/src/Functions/mathConstants.cpp b/src/Functions/mathConstants.cpp
index ecc2f8c48b5..c65b55cf7cf 100644
--- a/src/Functions/mathConstants.cpp
+++ b/src/Functions/mathConstants.cpp
@@ -34,12 +34,12 @@ namespace
     using FunctionPi = FunctionMathConstFloat64<PiImpl>;
 }
 
-void registerFunctionE(FunctionFactory & factory)
+REGISTER_FUNCTION(E)
 {
     factory.registerFunction<FunctionE>();
 }
 
-void registerFunctionPi(FunctionFactory & factory)
+REGISTER_FUNCTION(Pi)
 {
     factory.registerFunction<FunctionPi>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/max2.cpp b/src/Functions/max2.cpp
index 0bfba238b1a..3a693f1f5bb 100644
--- a/src/Functions/max2.cpp
+++ b/src/Functions/max2.cpp
@@ -19,7 +19,7 @@ namespace
     using FunctionMax2 = FunctionMathBinaryFloat64<BinaryFunctionVectorized<Max2Name, max>>;
 }
 
-void registerFunctionMax2(FunctionFactory & factory)
+REGISTER_FUNCTION(Max2)
 {
     factory.registerFunction<FunctionMax2>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/meiliMatch.cpp b/src/Functions/meiliMatch.cpp
index d4886bd0a14..55002354ba7 100644
--- a/src/Functions/meiliMatch.cpp
+++ b/src/Functions/meiliMatch.cpp
@@ -41,7 +41,7 @@ namespace
 
 }
 
-void registerFunctionMeiliMatch(FunctionFactory & factory)
+REGISTER_FUNCTION(MeiliMatch)
 {
     factory.registerFunction<FunctionMeiliMatch>();
 }
diff --git a/src/Functions/min2.cpp b/src/Functions/min2.cpp
index d02db598139..10233ab4011 100644
--- a/src/Functions/min2.cpp
+++ b/src/Functions/min2.cpp
@@ -20,7 +20,7 @@ namespace
     using FunctionMin2 = FunctionMathBinaryFloat64<BinaryFunctionVectorized<Min2Name, min>>;
 }
 
-void registerFunctionMin2(FunctionFactory & factory)
+REGISTER_FUNCTION(Min2)
 {
     factory.registerFunction<FunctionMin2>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/minSampleSize.cpp b/src/Functions/minSampleSize.cpp
index 02a94c743e8..66af9f6c2e9 100644
--- a/src/Functions/minSampleSize.cpp
+++ b/src/Functions/minSampleSize.cpp
@@ -282,7 +282,7 @@ struct ConversionImpl
 };
 
 
-void registerFunctionMinSampleSize(FunctionFactory & factory)
+REGISTER_FUNCTION(MinSampleSize)
 {
     factory.registerFunction<FunctionMinSampleSize<ContinousImpl>>();
     factory.registerFunction<FunctionMinSampleSize<ConversionImpl>>();
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index 76459545790..3668e4afc18 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -46,7 +46,7 @@ struct MinusImpl
 struct NameMinus { static constexpr auto name = "minus"; };
 using FunctionMinus = BinaryArithmeticOverloadResolver<MinusImpl, NameMinus>;
 
-void registerFunctionMinus(FunctionFactory & factory)
+REGISTER_FUNCTION(Minus)
 {
     factory.registerFunction<FunctionMinus>();
 }
diff --git a/src/Functions/modelEvaluate.cpp b/src/Functions/modelEvaluate.cpp
index 53bb109728a..3ee2ae3fae4 100644
--- a/src/Functions/modelEvaluate.cpp
+++ b/src/Functions/modelEvaluate.cpp
@@ -168,7 +168,7 @@ private:
 };
 
 
-void registerFunctionsExternalModels(FunctionFactory & factory)
+REGISTER_FUNCTION(ExternalModels)
 {
     factory.registerFunction<FunctionModelEvaluate>();
 }
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index 175f74bab8f..9a3aa12037f 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -162,7 +162,7 @@ template <> struct BinaryOperationImpl<Int32, Int64, ModuloImpl<Int32, Int64>> :
 struct NameModulo { static constexpr auto name = "modulo"; };
 using FunctionModulo = BinaryArithmeticOverloadResolver<ModuloImpl, NameModulo, false>;
 
-void registerFunctionModulo(FunctionFactory & factory)
+REGISTER_FUNCTION(Modulo)
 {
     factory.registerFunction<FunctionModulo>();
     factory.registerAlias("mod", "modulo", FunctionFactory::CaseInsensitive);
@@ -171,7 +171,7 @@ void registerFunctionModulo(FunctionFactory & factory)
 struct NameModuloLegacy { static constexpr auto name = "moduloLegacy"; };
 using FunctionModuloLegacy = BinaryArithmeticOverloadResolver<ModuloLegacyImpl, NameModuloLegacy, false>;
 
-void registerFunctionModuloLegacy(FunctionFactory & factory)
+REGISTER_FUNCTION(ModuloLegacy)
 {
     factory.registerFunction<FunctionModuloLegacy>();
 }
diff --git a/src/Functions/moduloOrZero.cpp b/src/Functions/moduloOrZero.cpp
index ca55ccc79fd..3551ae74c5f 100644
--- a/src/Functions/moduloOrZero.cpp
+++ b/src/Functions/moduloOrZero.cpp
@@ -41,7 +41,7 @@ using FunctionModuloOrZero = BinaryArithmeticOverloadResolver<ModuloOrZeroImpl,
 
 }
 
-void registerFunctionModuloOrZero(FunctionFactory & factory)
+REGISTER_FUNCTION(ModuloOrZero)
 {
     factory.registerFunction<FunctionModuloOrZero>();
 }
diff --git a/src/Functions/monthName.cpp b/src/Functions/monthName.cpp
index c397fdffaa5..e841f68b326 100644
--- a/src/Functions/monthName.cpp
+++ b/src/Functions/monthName.cpp
@@ -72,7 +72,7 @@ private:
     FunctionOverloadResolverPtr function_resolver;
 };
 
-void registerFunctionMonthName(FunctionFactory & factory)
+REGISTER_FUNCTION(MonthName)
 {
     factory.registerFunction<FunctionMonthName>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/multiFuzzyMatchAllIndices.cpp b/src/Functions/multiFuzzyMatchAllIndices.cpp
index 93ffb936dc1..6a78164e111 100644
--- a/src/Functions/multiFuzzyMatchAllIndices.cpp
+++ b/src/Functions/multiFuzzyMatchAllIndices.cpp
@@ -17,7 +17,7 @@ using FunctionMultiFuzzyMatchAllIndices = FunctionsMultiStringFuzzySearch<MultiM
 
 }
 
-void registerFunctionMultiFuzzyMatchAllIndices(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiFuzzyMatchAllIndices)
 {
     factory.registerFunction<FunctionMultiFuzzyMatchAllIndices>();
 }
diff --git a/src/Functions/multiFuzzyMatchAny.cpp b/src/Functions/multiFuzzyMatchAny.cpp
index a627030d7af..628f9a656ae 100644
--- a/src/Functions/multiFuzzyMatchAny.cpp
+++ b/src/Functions/multiFuzzyMatchAny.cpp
@@ -17,7 +17,7 @@ using FunctionMultiFuzzyMatchAny = FunctionsMultiStringFuzzySearch<MultiMatchAny
 
 }
 
-void registerFunctionMultiFuzzyMatchAny(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiFuzzyMatchAny)
 {
     factory.registerFunction<FunctionMultiFuzzyMatchAny>();
 }
diff --git a/src/Functions/multiFuzzyMatchAnyIndex.cpp b/src/Functions/multiFuzzyMatchAnyIndex.cpp
index 4b24a06e171..a2c0d3370dd 100644
--- a/src/Functions/multiFuzzyMatchAnyIndex.cpp
+++ b/src/Functions/multiFuzzyMatchAnyIndex.cpp
@@ -17,7 +17,7 @@ using FunctionMultiFuzzyMatchAnyIndex = FunctionsMultiStringFuzzySearch<MultiMat
 
 }
 
-void registerFunctionMultiFuzzyMatchAnyIndex(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiFuzzyMatchAnyIndex)
 {
     factory.registerFunction<FunctionMultiFuzzyMatchAnyIndex>();
 }
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 9e0ca4142e5..6fc722e32f4 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -332,7 +332,7 @@ private:
 
 }
 
-void registerFunctionMultiIf(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiIf)
 {
     factory.registerFunction<FunctionMultiIf>();
 
diff --git a/src/Functions/multiMatchAllIndices.cpp b/src/Functions/multiMatchAllIndices.cpp
index 47bd57029e2..6a907654511 100644
--- a/src/Functions/multiMatchAllIndices.cpp
+++ b/src/Functions/multiMatchAllIndices.cpp
@@ -17,7 +17,7 @@ using FunctionMultiMatchAllIndices = FunctionsMultiStringSearch<MultiMatchAllInd
 
 }
 
-void registerFunctionMultiMatchAllIndices(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiMatchAllIndices)
 {
     factory.registerFunction<FunctionMultiMatchAllIndices>();
 }
diff --git a/src/Functions/multiMatchAny.cpp b/src/Functions/multiMatchAny.cpp
index 324e435de26..6e6abe61898 100644
--- a/src/Functions/multiMatchAny.cpp
+++ b/src/Functions/multiMatchAny.cpp
@@ -17,7 +17,7 @@ using FunctionMultiMatchAny = FunctionsMultiStringSearch<MultiMatchAnyImpl<NameM
 
 }
 
-void registerFunctionMultiMatchAny(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiMatchAny)
 {
     factory.registerFunction<FunctionMultiMatchAny>();
 }
diff --git a/src/Functions/multiMatchAnyIndex.cpp b/src/Functions/multiMatchAnyIndex.cpp
index 6a11fa4eb35..9e96f89c8de 100644
--- a/src/Functions/multiMatchAnyIndex.cpp
+++ b/src/Functions/multiMatchAnyIndex.cpp
@@ -17,7 +17,7 @@ using FunctionMultiMatchAnyIndex = FunctionsMultiStringSearch<MultiMatchAnyImpl<
 
 }
 
-void registerFunctionMultiMatchAnyIndex(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiMatchAnyIndex)
 {
     factory.registerFunction<FunctionMultiMatchAnyIndex>();
 }
diff --git a/src/Functions/multiSearchAllPositions.cpp b/src/Functions/multiSearchAllPositions.cpp
index 53f3da9cde6..6d75e814192 100644
--- a/src/Functions/multiSearchAllPositions.cpp
+++ b/src/Functions/multiSearchAllPositions.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchAllPositions
 
 }
 
-void registerFunctionMultiSearchAllPositions(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAllPositions)
 {
     factory.registerFunction<FunctionMultiSearchAllPositions>();
 }
diff --git a/src/Functions/multiSearchAllPositionsCaseInsensitive.cpp b/src/Functions/multiSearchAllPositionsCaseInsensitive.cpp
index 55c112eb093..03f22ff7417 100644
--- a/src/Functions/multiSearchAllPositionsCaseInsensitive.cpp
+++ b/src/Functions/multiSearchAllPositionsCaseInsensitive.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchAllPositionsCaseInsensitive
 
 }
 
-void registerFunctionMultiSearchAllPositionsCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAllPositionsCaseInsensitive)
 {
     factory.registerFunction<FunctionMultiSearchAllPositionsCaseInsensitive>();
 }
diff --git a/src/Functions/multiSearchAllPositionsCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchAllPositionsCaseInsensitiveUTF8.cpp
index df9de8a17ec..9259a20cda4 100644
--- a/src/Functions/multiSearchAllPositionsCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchAllPositionsCaseInsensitiveUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchAllPositionsCaseInsensitiveUTF8
 
 }
 
-void registerFunctionMultiSearchAllPositionsCaseInsensitiveUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAllPositionsCaseInsensitiveUTF8)
 {
     factory.registerFunction<FunctionMultiSearchAllPositionsCaseInsensitiveUTF8>();
 }
diff --git a/src/Functions/multiSearchAllPositionsUTF8.cpp b/src/Functions/multiSearchAllPositionsUTF8.cpp
index e5f9a02afcc..9924be18e35 100644
--- a/src/Functions/multiSearchAllPositionsUTF8.cpp
+++ b/src/Functions/multiSearchAllPositionsUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchAllPositionsUTF8
 
 }
 
-void registerFunctionMultiSearchAllPositionsUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAllPositionsUTF8)
 {
     factory.registerFunction<FunctionMultiSearchAllPositionsUTF8>();
 }
diff --git a/src/Functions/multiSearchAny.cpp b/src/Functions/multiSearchAny.cpp
index 113289b83ed..166bba94913 100644
--- a/src/Functions/multiSearchAny.cpp
+++ b/src/Functions/multiSearchAny.cpp
@@ -18,7 +18,7 @@ using FunctionMultiSearch = FunctionsMultiStringSearch<MultiSearchImpl<NameMulti
 
 }
 
-void registerFunctionMultiSearchAny(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAny)
 {
     factory.registerFunction<FunctionMultiSearch>();
 }
diff --git a/src/Functions/multiSearchAnyCaseInsensitive.cpp b/src/Functions/multiSearchAnyCaseInsensitive.cpp
index af463805ea5..209a586b4aa 100644
--- a/src/Functions/multiSearchAnyCaseInsensitive.cpp
+++ b/src/Functions/multiSearchAnyCaseInsensitive.cpp
@@ -17,7 +17,7 @@ using FunctionMultiSearchCaseInsensitive = FunctionsMultiStringSearch<MultiSearc
 
 }
 
-void registerFunctionMultiSearchAnyCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAnyCaseInsensitive)
 {
     factory.registerFunction<FunctionMultiSearchCaseInsensitive>();
 }
diff --git a/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp
index c83dc843f78..ac1b36c66a7 100644
--- a/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchCaseInsensitiveUTF8
 
 }
 
-void registerFunctionMultiSearchAnyCaseInsensitiveUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAnyCaseInsensitiveUTF8)
 {
     factory.registerFunction<FunctionMultiSearchCaseInsensitiveUTF8>();
 }
diff --git a/src/Functions/multiSearchAnyUTF8.cpp b/src/Functions/multiSearchAnyUTF8.cpp
index 3f34f70ab51..b53197b10f2 100644
--- a/src/Functions/multiSearchAnyUTF8.cpp
+++ b/src/Functions/multiSearchAnyUTF8.cpp
@@ -17,7 +17,7 @@ using FunctionMultiSearchUTF8 = FunctionsMultiStringSearch<MultiSearchImpl<NameM
 
 }
 
-void registerFunctionMultiSearchAnyUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchAnyUTF8)
 {
     factory.registerFunction<FunctionMultiSearchUTF8>();
 }
diff --git a/src/Functions/multiSearchFirstIndex.cpp b/src/Functions/multiSearchFirstIndex.cpp
index a5fbec2dc36..a489d55e233 100644
--- a/src/Functions/multiSearchFirstIndex.cpp
+++ b/src/Functions/multiSearchFirstIndex.cpp
@@ -18,7 +18,7 @@ using FunctionMultiSearchFirstIndex = FunctionsMultiStringSearch<MultiSearchFirs
 
 }
 
-void registerFunctionMultiSearchFirstIndex(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstIndex)
 {
     factory.registerFunction<FunctionMultiSearchFirstIndex>();
 }
diff --git a/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp b/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp
index cc4869d1200..896247b9572 100644
--- a/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp
+++ b/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstIndexCaseInsensitive
 
 }
 
-void registerFunctionMultiSearchFirstIndexCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstIndexCaseInsensitive)
 {
     factory.registerFunction<FunctionMultiSearchFirstIndexCaseInsensitive>();
 }
diff --git a/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp
index fd95947bc67..e5048120721 100644
--- a/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstIndexCaseInsensitiveUTF8
 
 }
 
-void registerFunctionMultiSearchFirstIndexCaseInsensitiveUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstIndexCaseInsensitiveUTF8)
 {
     factory.registerFunction<FunctionMultiSearchFirstIndexCaseInsensitiveUTF8>();
 }
diff --git a/src/Functions/multiSearchFirstIndexUTF8.cpp b/src/Functions/multiSearchFirstIndexUTF8.cpp
index 6854201d14d..929399bb75f 100644
--- a/src/Functions/multiSearchFirstIndexUTF8.cpp
+++ b/src/Functions/multiSearchFirstIndexUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstIndexUTF8
 
 }
 
-void registerFunctionMultiSearchFirstIndexUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstIndexUTF8)
 {
     factory.registerFunction<FunctionMultiSearchFirstIndexUTF8>();
 }
diff --git a/src/Functions/multiSearchFirstPosition.cpp b/src/Functions/multiSearchFirstPosition.cpp
index 4ca1ac35a4d..e1eaa151107 100644
--- a/src/Functions/multiSearchFirstPosition.cpp
+++ b/src/Functions/multiSearchFirstPosition.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstPosition
 
 }
 
-void registerFunctionMultiSearchFirstPosition(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstPosition)
 {
     factory.registerFunction<FunctionMultiSearchFirstPosition>();
 }
diff --git a/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp b/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp
index 4e356335e98..eadfa1822e2 100644
--- a/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp
+++ b/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstPositionCaseInsensitive
 
 }
 
-void registerFunctionMultiSearchFirstPositionCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstPositionCaseInsensitive)
 {
     factory.registerFunction<FunctionMultiSearchFirstPositionCaseInsensitive>();
 }
diff --git a/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp
index 647fc3a2cc8..da254b42e21 100644
--- a/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstPositionCaseInsensitiveUTF8 = FunctionsMultiString
 
 }
 
-void registerFunctionMultiSearchFirstPositionCaseInsensitiveUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstPositionCaseInsensitiveUTF8)
 {
     factory.registerFunction<FunctionMultiSearchFirstPositionCaseInsensitiveUTF8>();
 }
diff --git a/src/Functions/multiSearchFirstPositionUTF8.cpp b/src/Functions/multiSearchFirstPositionUTF8.cpp
index fbb1099ec35..b56a0b1c403 100644
--- a/src/Functions/multiSearchFirstPositionUTF8.cpp
+++ b/src/Functions/multiSearchFirstPositionUTF8.cpp
@@ -19,7 +19,7 @@ using FunctionMultiSearchFirstPositionUTF8
 
 }
 
-void registerFunctionMultiSearchFirstPositionUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(MultiSearchFirstPositionUTF8)
 {
     factory.registerFunction<FunctionMultiSearchFirstPositionUTF8>();
 }
diff --git a/src/Functions/multiply.cpp b/src/Functions/multiply.cpp
index 7cbf806faa0..4dc8cd10f31 100644
--- a/src/Functions/multiply.cpp
+++ b/src/Functions/multiply.cpp
@@ -53,7 +53,7 @@ struct MultiplyImpl
 struct NameMultiply { static constexpr auto name = "multiply"; };
 using FunctionMultiply = BinaryArithmeticOverloadResolver<MultiplyImpl, NameMultiply>;
 
-void registerFunctionMultiply(FunctionFactory & factory)
+REGISTER_FUNCTION(Multiply)
 {
     factory.registerFunction<FunctionMultiply>();
 }
diff --git a/src/Functions/negate.cpp b/src/Functions/negate.cpp
index a378589fe30..779cc0fff78 100644
--- a/src/Functions/negate.cpp
+++ b/src/Functions/negate.cpp
@@ -46,7 +46,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameNegate>
     }
 };
 
-void registerFunctionNegate(FunctionFactory & factory)
+REGISTER_FUNCTION(Negate)
 {
     factory.registerFunction<FunctionNegate>();
 }
diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 296eaf67d9c..11f6edd1786 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -203,7 +203,7 @@ public:
 
 }
 
-void registerFunctionNeighbor(FunctionFactory & factory)
+REGISTER_FUNCTION(Neighbor)
 {
     factory.registerFunction<FunctionNeighbor>();
 }
diff --git a/src/Functions/normalizeQuery.cpp b/src/Functions/normalizeQuery.cpp
index dd36e931bc4..ee1688fe197 100644
--- a/src/Functions/normalizeQuery.cpp
+++ b/src/Functions/normalizeQuery.cpp
@@ -51,7 +51,7 @@ struct Impl
 
 }
 
-void registerFunctionNormalizeQuery(FunctionFactory & factory)
+REGISTER_FUNCTION(NormalizeQuery)
 {
     factory.registerFunction<FunctionStringToString<Impl<true>, Impl<true>>>();
     factory.registerFunction<FunctionStringToString<Impl<false>, Impl<false>>>();
diff --git a/src/Functions/normalizeString.cpp b/src/Functions/normalizeString.cpp
index 625247ca432..a6bec0878f7 100644
--- a/src/Functions/normalizeString.cpp
+++ b/src/Functions/normalizeString.cpp
@@ -169,7 +169,7 @@ using FunctionNormalizeUTF8NFKC = FunctionStringToString<NormalizeUTF8Impl<Norma
 using FunctionNormalizeUTF8NFKD = FunctionStringToString<NormalizeUTF8Impl<NormalizeNFKDImpl>, NormalizeNFKDImpl>;
 }
 
-void registerFunctionNormalizeUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(NormalizeUTF8)
 {
     factory.registerFunction<FunctionNormalizeUTF8NFC>();
     factory.registerFunction<FunctionNormalizeUTF8NFD>();
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index 1e2875ae3e3..b6efa4e18cd 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -97,7 +97,7 @@ public:
 
 }
 
-void registerFunctionNormalizedQueryHash(FunctionFactory & factory)
+REGISTER_FUNCTION(NormalizedQueryHash)
 {
     factory.registerFunction<FunctionNormalizedQueryHash<true>>();
     factory.registerFunction<FunctionNormalizedQueryHash<false>>();
diff --git a/src/Functions/notEmpty.cpp b/src/Functions/notEmpty.cpp
index cc40be88ab1..f7d58e15143 100644
--- a/src/Functions/notEmpty.cpp
+++ b/src/Functions/notEmpty.cpp
@@ -17,7 +17,7 @@ using FunctionNotEmpty = FunctionStringOrArrayToT<EmptyImpl<true>, NameNotEmpty,
 
 }
 
-void registerFunctionNotEmpty(FunctionFactory & factory)
+REGISTER_FUNCTION(NotEmpty)
 {
     factory.registerFunction<FunctionNotEmpty>();
 }
diff --git a/src/Functions/notEquals.cpp b/src/Functions/notEquals.cpp
index 78e4b19fe21..08bedff399e 100644
--- a/src/Functions/notEquals.cpp
+++ b/src/Functions/notEquals.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 using FunctionNotEquals = FunctionComparison<NotEqualsOp, NameNotEquals>;
 
-void registerFunctionNotEquals(FunctionFactory & factory)
+REGISTER_FUNCTION(NotEquals)
 {
     factory.registerFunction<FunctionNotEquals>();
 }
diff --git a/src/Functions/notILike.cpp b/src/Functions/notILike.cpp
index 5e78db1c518..f3b92300d7f 100644
--- a/src/Functions/notILike.cpp
+++ b/src/Functions/notILike.cpp
@@ -17,7 +17,7 @@ using FunctionNotILike = FunctionsStringSearch<NotILikeImpl>;
 
 }
 
-void registerFunctionNotILike(FunctionFactory & factory)
+REGISTER_FUNCTION(NotILike)
 {
     factory.registerFunction<FunctionNotILike>();
 }
diff --git a/src/Functions/notLike.cpp b/src/Functions/notLike.cpp
index 33a36748bb1..a546b511a0b 100644
--- a/src/Functions/notLike.cpp
+++ b/src/Functions/notLike.cpp
@@ -16,7 +16,7 @@ using FunctionNotLike = FunctionsStringSearch<MatchImpl<NameNotLike, MatchTraits
 
 }
 
-void registerFunctionNotLike(FunctionFactory & factory)
+REGISTER_FUNCTION(NotLike)
 {
     factory.registerFunction<FunctionNotLike>();
 }
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index b2cfa7aa2b1..9ecaca55e52 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -126,7 +126,7 @@ public:
 
 }
 
-void registerFunctionNow(FunctionFactory & factory)
+REGISTER_FUNCTION(Now)
 {
     factory.registerFunction<NowOverloadResolver>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index 071140f4bf6..0308fa95b39 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -158,7 +158,7 @@ public:
 
 }
 
-void registerFunctionNow64(FunctionFactory & factory)
+REGISTER_FUNCTION(Now64)
 {
     factory.registerFunction<Now64OverloadResolver>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/nowInBlock.cpp b/src/Functions/nowInBlock.cpp
index b657bc92085..db72e791587 100644
--- a/src/Functions/nowInBlock.cpp
+++ b/src/Functions/nowInBlock.cpp
@@ -80,7 +80,7 @@ public:
 
 }
 
-void registerFunctionNowInBlock(FunctionFactory & factory)
+REGISTER_FUNCTION(NowInBlock)
 {
     factory.registerFunction<FunctionNowInBlock>();
 }
diff --git a/src/Functions/nullIf.cpp b/src/Functions/nullIf.cpp
index 0b4d024c91c..e85747834b1 100644
--- a/src/Functions/nullIf.cpp
+++ b/src/Functions/nullIf.cpp
@@ -67,7 +67,7 @@ public:
 
 }
 
-void registerFunctionNullIf(FunctionFactory & factory)
+REGISTER_FUNCTION(NullIf)
 {
     factory.registerFunction<FunctionNullIf>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/padString.cpp b/src/Functions/padString.cpp
index 544911919fe..c8ed920755c 100644
--- a/src/Functions/padString.cpp
+++ b/src/Functions/padString.cpp
@@ -307,7 +307,7 @@ namespace
     };
 }
 
-void registerFunctionPadString(FunctionFactory & factory)
+REGISTER_FUNCTION(PadString)
 {
     factory.registerFunction<FunctionPadString<false, false>>(); /// leftPad
     factory.registerFunction<FunctionPadString<false, true>>();  /// leftPadUTF8
diff --git a/src/Functions/parseTimeDelta.cpp b/src/Functions/parseTimeDelta.cpp
index 8cb7c229ae8..6842997a71c 100644
--- a/src/Functions/parseTimeDelta.cpp
+++ b/src/Functions/parseTimeDelta.cpp
@@ -304,7 +304,7 @@ namespace
 
 }
 
-void registerFunctionParseTimeDelta(FunctionFactory & factory)
+REGISTER_FUNCTION(ParseTimeDelta)
 {
     factory.registerFunction<FunctionParseTimeDelta>();
 }
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
index c5dced68e88..22c3910feaf 100644
--- a/src/Functions/partitionId.cpp
+++ b/src/Functions/partitionId.cpp
@@ -63,7 +63,7 @@ public:
     }
 };
 
-void registerFunctionPartitionId(FunctionFactory & factory)
+REGISTER_FUNCTION(PartitionId)
 {
     factory.registerFunction<FunctionPartitionId>();
 }
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 997cae0dbed..4b81c23584c 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -48,7 +48,7 @@ struct PlusImpl
 struct NamePlus { static constexpr auto name = "plus"; };
 using FunctionPlus = BinaryArithmeticOverloadResolver<PlusImpl, NamePlus>;
 
-void registerFunctionPlus(FunctionFactory & factory)
+REGISTER_FUNCTION(Plus)
 {
     factory.registerFunction<FunctionPlus>();
 }
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index 1de6e1d5ce6..f69886ad71f 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -194,7 +194,7 @@ private:
 
 }
 
-void registerFunctionPointInEllipses(FunctionFactory & factory)
+REGISTER_FUNCTION(PointInEllipses)
 {
     factory.registerFunction<FunctionPointInEllipses>();
 }
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 7d2369fd5e7..ee2f566e619 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -574,7 +574,7 @@ private:
 
 }
 
-void registerFunctionPointInPolygon(FunctionFactory & factory)
+REGISTER_FUNCTION(PointInPolygon)
 {
     factory.registerFunction<FunctionPointInPolygon<PointInPolygonWithGrid<Float64>>>();
 }
diff --git a/src/Functions/polygonArea.cpp b/src/Functions/polygonArea.cpp
index f7a5c96da55..a83e960dc0d 100644
--- a/src/Functions/polygonArea.cpp
+++ b/src/Functions/polygonArea.cpp
@@ -100,7 +100,7 @@ template <>
 const char * FunctionPolygonArea<SphericalPoint>::name = "polygonAreaSpherical";
 
 
-void registerFunctionPolygonArea(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonArea)
 {
     factory.registerFunction<FunctionPolygonArea<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonArea<SphericalPoint>>();
diff --git a/src/Functions/polygonConvexHull.cpp b/src/Functions/polygonConvexHull.cpp
index a027b9536c5..c0b079d3014 100644
--- a/src/Functions/polygonConvexHull.cpp
+++ b/src/Functions/polygonConvexHull.cpp
@@ -99,7 +99,7 @@ template <>
 const char * FunctionPolygonConvexHull<CartesianPoint>::name = "polygonConvexHullCartesian";
 
 
-void registerFunctionPolygonConvexHull(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonConvexHull)
 {
     factory.registerFunction<FunctionPolygonConvexHull<CartesianPoint>>();
 }
diff --git a/src/Functions/polygonPerimeter.cpp b/src/Functions/polygonPerimeter.cpp
index 1930454a8d4..5d5a3e91e77 100644
--- a/src/Functions/polygonPerimeter.cpp
+++ b/src/Functions/polygonPerimeter.cpp
@@ -99,7 +99,7 @@ template <>
 const char * FunctionPolygonPerimeter<SphericalPoint>::name = "polygonPerimeterSpherical";
 
 
-void registerFunctionPolygonPerimeter(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonPerimeter)
 {
     factory.registerFunction<FunctionPolygonPerimeter<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonPerimeter<SphericalPoint>>();
diff --git a/src/Functions/polygonsDistance.cpp b/src/Functions/polygonsDistance.cpp
index db120da61c9..3b01d01f311 100644
--- a/src/Functions/polygonsDistance.cpp
+++ b/src/Functions/polygonsDistance.cpp
@@ -109,7 +109,7 @@ template <>
 const char * FunctionPolygonsDistance<SphericalPoint>::name = "polygonsDistanceSpherical";
 
 
-void registerFunctionPolygonsDistance(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonsDistance)
 {
     factory.registerFunction<FunctionPolygonsDistance<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonsDistance<SphericalPoint>>();
diff --git a/src/Functions/polygonsEquals.cpp b/src/Functions/polygonsEquals.cpp
index 7112c9f1434..2793df7efac 100644
--- a/src/Functions/polygonsEquals.cpp
+++ b/src/Functions/polygonsEquals.cpp
@@ -108,7 +108,7 @@ template <>
 const char * FunctionPolygonsEquals<CartesianPoint>::name = "polygonsEqualsCartesian";
 
 
-void registerFunctionPolygonsEquals(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonsEquals)
 {
     factory.registerFunction<FunctionPolygonsEquals<CartesianPoint>>();
 }
diff --git a/src/Functions/polygonsIntersection.cpp b/src/Functions/polygonsIntersection.cpp
index 01c3dbf4e11..dd17665edba 100644
--- a/src/Functions/polygonsIntersection.cpp
+++ b/src/Functions/polygonsIntersection.cpp
@@ -115,7 +115,7 @@ template <>
 const char * FunctionPolygonsIntersection<SphericalPoint>::name = "polygonsIntersectionSpherical";
 
 
-void registerFunctionPolygonsIntersection(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonsIntersection)
 {
     factory.registerFunction<FunctionPolygonsIntersection<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonsIntersection<SphericalPoint>>();
diff --git a/src/Functions/polygonsSymDifference.cpp b/src/Functions/polygonsSymDifference.cpp
index ed357fb796b..b8f4443f1ed 100644
--- a/src/Functions/polygonsSymDifference.cpp
+++ b/src/Functions/polygonsSymDifference.cpp
@@ -109,7 +109,7 @@ const char * FunctionPolygonsSymDifference<CartesianPoint>::name = "polygonsSymD
 template <>
 const char * FunctionPolygonsSymDifference<SphericalPoint>::name = "polygonsSymDifferenceSpherical";
 
-void registerFunctionPolygonsSymDifference(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonsSymDifference)
 {
     factory.registerFunction<FunctionPolygonsSymDifference<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonsSymDifference<SphericalPoint>>();
diff --git a/src/Functions/polygonsUnion.cpp b/src/Functions/polygonsUnion.cpp
index 01ef4dda8d6..ea770f461f6 100644
--- a/src/Functions/polygonsUnion.cpp
+++ b/src/Functions/polygonsUnion.cpp
@@ -113,7 +113,7 @@ template <>
 const char * FunctionPolygonsUnion<SphericalPoint>::name = "polygonsUnionSpherical";
 
 
-void registerFunctionPolygonsUnion(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonsUnion)
 {
     factory.registerFunction<FunctionPolygonsUnion<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonsUnion<SphericalPoint>>();
diff --git a/src/Functions/polygonsWithin.cpp b/src/Functions/polygonsWithin.cpp
index 3d86c16fce7..6cc6a8cb2ef 100644
--- a/src/Functions/polygonsWithin.cpp
+++ b/src/Functions/polygonsWithin.cpp
@@ -112,7 +112,7 @@ template <>
 const char * FunctionPolygonsWithin<SphericalPoint>::name = "polygonsWithinSpherical";
 
 
-void registerFunctionPolygonsWithin(FunctionFactory & factory)
+REGISTER_FUNCTION(PolygonsWithin)
 {
     factory.registerFunction<FunctionPolygonsWithin<CartesianPoint>>();
     factory.registerFunction<FunctionPolygonsWithin<SphericalPoint>>();
diff --git a/src/Functions/position.cpp b/src/Functions/position.cpp
index e38dc52b9af..c25beec5ed9 100644
--- a/src/Functions/position.cpp
+++ b/src/Functions/position.cpp
@@ -17,7 +17,7 @@ using FunctionPosition = FunctionsStringSearch<PositionImpl<NamePosition, Positi
 
 }
 
-void registerFunctionPosition(FunctionFactory & factory)
+REGISTER_FUNCTION(Position)
 {
     factory.registerFunction<FunctionPosition>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("locate", NamePosition::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/positionCaseInsensitive.cpp b/src/Functions/positionCaseInsensitive.cpp
index ed9d86c033c..4e3b670fe54 100644
--- a/src/Functions/positionCaseInsensitive.cpp
+++ b/src/Functions/positionCaseInsensitive.cpp
@@ -17,7 +17,7 @@ using FunctionPositionCaseInsensitive = FunctionsStringSearch<PositionImpl<NameP
 
 }
 
-void registerFunctionPositionCaseInsensitive(FunctionFactory & factory)
+REGISTER_FUNCTION(PositionCaseInsensitive)
 {
     factory.registerFunction<FunctionPositionCaseInsensitive>();
 }
diff --git a/src/Functions/positionCaseInsensitiveUTF8.cpp b/src/Functions/positionCaseInsensitiveUTF8.cpp
index f6e344b119e..e7ebf02d156 100644
--- a/src/Functions/positionCaseInsensitiveUTF8.cpp
+++ b/src/Functions/positionCaseInsensitiveUTF8.cpp
@@ -18,7 +18,7 @@ using FunctionPositionCaseInsensitiveUTF8
 
 }
 
-void registerFunctionPositionCaseInsensitiveUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(PositionCaseInsensitiveUTF8)
 {
     factory.registerFunction<FunctionPositionCaseInsensitiveUTF8>();
 }
diff --git a/src/Functions/positionUTF8.cpp b/src/Functions/positionUTF8.cpp
index ecb2a1e9e97..fd9def8109d 100644
--- a/src/Functions/positionUTF8.cpp
+++ b/src/Functions/positionUTF8.cpp
@@ -17,7 +17,7 @@ using FunctionPositionUTF8 = FunctionsStringSearch<PositionImpl<NamePositionUTF8
 
 }
 
-void registerFunctionPositionUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(PositionUTF8)
 {
     factory.registerFunction<FunctionPositionUTF8>();
 }
diff --git a/src/Functions/pow.cpp b/src/Functions/pow.cpp
index 7e60e0e878e..afbf9d10f16 100644
--- a/src/Functions/pow.cpp
+++ b/src/Functions/pow.cpp
@@ -11,7 +11,7 @@ using FunctionPow = FunctionMathBinaryFloat64<BinaryFunctionVectorized<PowName,
 
 }
 
-void registerFunctionPow(FunctionFactory & factory)
+REGISTER_FUNCTION(Pow)
 {
     factory.registerFunction<FunctionPow>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("power", "pow", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/queryID.cpp b/src/Functions/queryID.cpp
index b1945bb1686..704206e1de5 100644
--- a/src/Functions/queryID.cpp
+++ b/src/Functions/queryID.cpp
@@ -38,7 +38,7 @@ public:
     }
 };
 
-void registerFunctionQueryID(FunctionFactory & factory)
+REGISTER_FUNCTION(QueryID)
 {
     factory.registerFunction<FunctionQueryID>();
     factory.registerAlias("query_id", FunctionQueryID::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/radians.cpp b/src/Functions/radians.cpp
index 4dffdc08547..5e46ccca5bd 100644
--- a/src/Functions/radians.cpp
+++ b/src/Functions/radians.cpp
@@ -21,7 +21,7 @@ namespace
     using FunctionRadians = FunctionMathUnary<UnaryFunctionVectorized<RadiansName, radians>>;
 }
 
-void registerFunctionRadians(FunctionFactory & factory)
+REGISTER_FUNCTION(Radians)
 {
     factory.registerFunction<FunctionRadians>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/rand.cpp b/src/Functions/rand.cpp
index 660119a64cb..ba511382651 100644
--- a/src/Functions/rand.cpp
+++ b/src/Functions/rand.cpp
@@ -11,7 +11,7 @@ using FunctionRand = FunctionRandom<UInt32, NameRand>;
 
 }
 
-void registerFunctionRand(FunctionFactory & factory)
+REGISTER_FUNCTION(Rand)
 {
     factory.registerFunction<FunctionRand>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("rand32", NameRand::name);
diff --git a/src/Functions/rand64.cpp b/src/Functions/rand64.cpp
index 9377d3d40d0..b8b9d4d2b02 100644
--- a/src/Functions/rand64.cpp
+++ b/src/Functions/rand64.cpp
@@ -11,7 +11,7 @@ using FunctionRand64 = FunctionRandom<UInt64, NameRand64>;
 
 }
 
-void registerFunctionRand64(FunctionFactory & factory)
+REGISTER_FUNCTION(Rand64)
 {
     factory.registerFunction<FunctionRand64>();
 }
diff --git a/src/Functions/randConstant.cpp b/src/Functions/randConstant.cpp
index e273eb4992e..7bf8630f92a 100644
--- a/src/Functions/randConstant.cpp
+++ b/src/Functions/randConstant.cpp
@@ -117,7 +117,7 @@ using FunctionBuilderRandConstant = RandomConstantOverloadResolver<UInt32, NameR
 
 }
 
-void registerFunctionRandConstant(FunctionFactory & factory)
+REGISTER_FUNCTION(RandConstant)
 {
     factory.registerFunction<FunctionBuilderRandConstant>();
 }
diff --git a/src/Functions/randomFixedString.cpp b/src/Functions/randomFixedString.cpp
index eb8214383a7..a0b7a999d36 100644
--- a/src/Functions/randomFixedString.cpp
+++ b/src/Functions/randomFixedString.cpp
@@ -106,7 +106,7 @@ private:
 
 }
 
-void registerFunctionRandomFixedString(FunctionFactory & factory)
+REGISTER_FUNCTION(RandomFixedString)
 {
     factory.registerFunction<FunctionRandomFixedString>();
 }
diff --git a/src/Functions/randomPrintableASCII.cpp b/src/Functions/randomPrintableASCII.cpp
index 3bfa1fbda6d..cd46f175977 100644
--- a/src/Functions/randomPrintableASCII.cpp
+++ b/src/Functions/randomPrintableASCII.cpp
@@ -113,7 +113,7 @@ public:
 
 }
 
-void registerFunctionRandomPrintableASCII(FunctionFactory & factory)
+REGISTER_FUNCTION(RandomPrintableASCII)
 {
     factory.registerFunction<FunctionRandomPrintableASCII>();
 }
diff --git a/src/Functions/randomString.cpp b/src/Functions/randomString.cpp
index 0e64892bbf4..16b0254c536 100644
--- a/src/Functions/randomString.cpp
+++ b/src/Functions/randomString.cpp
@@ -126,7 +126,7 @@ private:
 
 }
 
-void registerFunctionRandomString(FunctionFactory & factory)
+REGISTER_FUNCTION(RandomString)
 {
     factory.registerFunction<FunctionRandomString>();
 }
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 59fc45a574d..043db179d71 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -148,7 +148,7 @@ public:
 
 }
 
-void registerFunctionRandomStringUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(RandomStringUTF8)
 {
     factory.registerFunction<FunctionRandomStringUTF8>();
 }
diff --git a/src/Functions/readWkt.cpp b/src/Functions/readWkt.cpp
index b8d0d20acb3..28ed9a64ea8 100644
--- a/src/Functions/readWkt.cpp
+++ b/src/Functions/readWkt.cpp
@@ -96,7 +96,7 @@ struct ReadWKTMultiPolygonNameHolder
     static constexpr const char * name = "readWKTMultiPolygon";
 };
 
-void registerFunctionReadWKT(FunctionFactory & factory)
+REGISTER_FUNCTION(ReadWKT)
 {
     factory.registerFunction<FunctionReadWKT<DataTypePointName, CartesianPoint, PointSerializer<CartesianPoint>, ReadWKTPointNameHolder>>();
     factory.registerFunction<FunctionReadWKT<DataTypeRingName, CartesianRing, RingSerializer<CartesianPoint>, ReadWKTRingNameHolder>>();
diff --git a/src/Functions/regexpQuoteMeta.cpp b/src/Functions/regexpQuoteMeta.cpp
index 0db0405323a..d0ec572ac59 100644
--- a/src/Functions/regexpQuoteMeta.cpp
+++ b/src/Functions/regexpQuoteMeta.cpp
@@ -112,7 +112,7 @@ public:
 
 }
 
-void registerFunctionRegexpQuoteMeta(FunctionFactory & factory)
+REGISTER_FUNCTION(RegexpQuoteMeta)
 {
     factory.registerFunction<FunctionRegexpQuoteMeta>();
 }
diff --git a/src/Functions/registerFunctions.cpp b/src/Functions/registerFunctions.cpp
index f578bfc9d68..202ad1e3971 100644
--- a/src/Functions/registerFunctions.cpp
+++ b/src/Functions/registerFunctions.cpp
@@ -5,141 +5,13 @@
 
 namespace DB
 {
-void registerFunctionsArithmetic(FunctionFactory &);
-void registerFunctionsArray(FunctionFactory &);
-void registerFunctionsTuple(FunctionFactory &);
-void registerFunctionsMakeDate(FunctionFactory &);
-void registerFunctionsMap(FunctionFactory &);
-void registerFunctionsBitmap(FunctionFactory &);
-void registerFunctionsBinaryRepr(FunctionFactory &);
-void registerFunctionsCoding(FunctionFactory &);
-void registerFunctionsCodingUUID(FunctionFactory &);
-void registerFunctionChar(FunctionFactory &);
-void registerFunctionsComparison(FunctionFactory &);
-void registerFunctionsConditional(FunctionFactory &);
-void registerFunctionsConversion(FunctionFactory &);
-void registerFunctionCastOrDefault(FunctionFactory &);
-void registerFunctionsDateTime(FunctionFactory &);
-void registerFunctionsEmbeddedDictionaries(FunctionFactory &);
-void registerFunctionsExternalDictionaries(FunctionFactory &);
-void registerFunctionsExternalModels(FunctionFactory &);
-void registerFunctionsFormatting(FunctionFactory &);
-void registerFunctionHashID(FunctionFactory &);
-void registerFunctionsHashing(FunctionFactory &);
-void registerFunctionsHigherOrder(FunctionFactory &);
-void registerFunctionsLogical(FunctionFactory &);
-void registerFunctionsMiscellaneous(FunctionFactory &);
-void registerFunctionsRandom(FunctionFactory &);
-void registerFunctionsReinterpret(FunctionFactory &);
-void registerFunctionsRound(FunctionFactory &);
-void registerFunctionsString(FunctionFactory &);
-void registerFunctionsStringArray(FunctionFactory &);
-void registerFunctionsStringSearch(FunctionFactory &);
-void registerFunctionsStringRegexp(FunctionFactory &);
-void registerFunctionsStringSimilarity(FunctionFactory &);
-void registerFunctionsStringTokenExtractor(FunctionFactory &);
-void registerFunctionsURL(FunctionFactory &);
-void registerFunctionsVisitParam(FunctionFactory &);
-void registerFunctionsMath(FunctionFactory &);
-void registerFunctionsGeo(FunctionFactory &);
-void registerFunctionsIntrospection(FunctionFactory &);
-void registerFunctionsNull(FunctionFactory &);
-void registerFunctionsJSON(FunctionFactory &);
-void registerFunctionsSQLJSON(FunctionFactory &);
-void registerFunctionToJSONString(FunctionFactory &);
-void registerFunctionsConsistentHashing(FunctionFactory & factory);
-void registerFunctionsUnixTimestamp64(FunctionFactory & factory);
-void registerFunctionBitHammingDistance(FunctionFactory & factory);
-void registerFunctionTupleHammingDistance(FunctionFactory & factory);
-void registerFunctionsStringHash(FunctionFactory & factory);
-void registerFunctionValidateNestedArraySizes(FunctionFactory & factory);
-void registerFunctionsSnowflake(FunctionFactory & factory);
-void registerFunctionTid(FunctionFactory & factory);
-void registerFunctionLogTrace(FunctionFactory & factory);
-void registerFunctionsTimeWindow(FunctionFactory &);
-void registerFunctionToBool(FunctionFactory &);
-void registerFunctionMinSampleSize(FunctionFactory &);
-
-/// For Meilisearch
-void registerFunctionMeiliMatch(FunctionFactory & factory);
-
-#if USE_SSL
-void registerFunctionEncrypt(FunctionFactory & factory);
-void registerFunctionDecrypt(FunctionFactory & factory);
-void registerFunctionAESEncryptMysql(FunctionFactory & factory);
-void registerFunctionAESDecryptMysql(FunctionFactory & factory);
-void registerFunctionShowCertificate(FunctionFactory &);
-#endif
 
 void registerFunctions()
 {
     auto & factory = FunctionFactory::instance();
 
-    registerFunctionsArithmetic(factory);
-    registerFunctionsArray(factory);
-    registerFunctionsTuple(factory);
-    registerFunctionsMakeDate(factory);
-    registerFunctionsMap(factory);
-    registerFunctionsBitmap(factory);
-    registerFunctionsBinaryRepr(factory);
-    registerFunctionsCoding(factory);
-    registerFunctionsCodingUUID(factory);
-    registerFunctionChar(factory);
-    registerFunctionsComparison(factory);
-    registerFunctionsConditional(factory);
-    registerFunctionsConversion(factory);
-    registerFunctionCastOrDefault(factory);
-    registerFunctionsDateTime(factory);
-    registerFunctionsEmbeddedDictionaries(factory);
-    registerFunctionsExternalDictionaries(factory);
-    registerFunctionsExternalModels(factory);
-    registerFunctionsFormatting(factory);
-    registerFunctionsHashing(factory);
-    registerFunctionsHigherOrder(factory);
-    registerFunctionsLogical(factory);
-    registerFunctionsMiscellaneous(factory);
-    registerFunctionsRandom(factory);
-    registerFunctionsReinterpret(factory);
-    registerFunctionsRound(factory);
-    registerFunctionsString(factory);
-    registerFunctionsStringArray(factory);
-    registerFunctionsStringSearch(factory);
-    registerFunctionsStringRegexp(factory);
-    registerFunctionsStringSimilarity(factory);
-    registerFunctionsStringTokenExtractor(factory);
-    registerFunctionsURL(factory);
-    registerFunctionsVisitParam(factory);
-    registerFunctionsMath(factory);
-    registerFunctionsGeo(factory);
-    registerFunctionsNull(factory);
-    registerFunctionsJSON(factory);
-    registerFunctionsSQLJSON(factory);
-    registerFunctionToJSONString(factory);
-    registerFunctionsIntrospection(factory);
-    registerFunctionsConsistentHashing(factory);
-    registerFunctionsUnixTimestamp64(factory);
-    registerFunctionBitHammingDistance(factory);
-    registerFunctionTupleHammingDistance(factory);
-    registerFunctionsStringHash(factory);
-    registerFunctionValidateNestedArraySizes(factory);
-    registerFunctionsSnowflake(factory);
-    registerFunctionsTimeWindow(factory);
-    registerFunctionToBool(factory);
-    registerFunctionMinSampleSize(factory);
-    registerFunctionTid(factory);
-    registerFunctionLogTrace(factory);
-    registerFunctionHashID(factory);
-
-    /// For Meilisearch
-    registerFunctionMeiliMatch(factory);
-
-#if USE_SSL
-    registerFunctionEncrypt(factory);
-    registerFunctionDecrypt(factory);
-    registerFunctionAESEncryptMysql(factory);
-    registerFunctionAESDecryptMysql(factory);
-    registerFunctionShowCertificate(factory);
-#endif
+    for (const auto & [_, reg] : FunctionRegisterMap::instance())
+        reg(factory);
 }
 
 }
diff --git a/src/Functions/registerFunctionsArithmetic.cpp b/src/Functions/registerFunctionsArithmetic.cpp
deleted file mode 100644
index 96e77d34882..00000000000
--- a/src/Functions/registerFunctionsArithmetic.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionPlus(FunctionFactory & factory);
-void registerFunctionMinus(FunctionFactory & factory);
-void registerFunctionMultiply(FunctionFactory & factory);
-void registerFunctionDivide(FunctionFactory & factory);
-void registerFunctionIntDiv(FunctionFactory & factory);
-void registerFunctionIntDivOrZero(FunctionFactory & factory);
-void registerFunctionModulo(FunctionFactory & factory);
-void registerFunctionModuloOrZero(FunctionFactory & factory);
-void registerFunctionModuloLegacy(FunctionFactory & factory);
-void registerFunctionNegate(FunctionFactory & factory);
-void registerFunctionAbs(FunctionFactory & factory);
-void registerFunctionBitAnd(FunctionFactory & factory);
-void registerFunctionBitOr(FunctionFactory & factory);
-void registerFunctionBitXor(FunctionFactory & factory);
-void registerFunctionBitNot(FunctionFactory & factory);
-void registerFunctionBitShiftLeft(FunctionFactory & factory);
-void registerFunctionBitShiftRight(FunctionFactory & factory);
-void registerFunctionBitSlice(FunctionFactory & factory);
-void registerFunctionBitRotateLeft(FunctionFactory & factory);
-void registerFunctionBitRotateRight(FunctionFactory & factory);
-void registerFunctionBitCount(FunctionFactory & factory);
-void registerFunctionLeast(FunctionFactory & factory);
-void registerFunctionGreatest(FunctionFactory & factory);
-void registerFunctionBitTest(FunctionFactory & factory);
-void registerFunctionBitTestAny(FunctionFactory & factory);
-void registerFunctionBitTestAll(FunctionFactory & factory);
-void registerFunctionGCD(FunctionFactory & factory);
-void registerFunctionLCM(FunctionFactory & factory);
-void registerFunctionIntExp2(FunctionFactory & factory);
-void registerFunctionIntExp10(FunctionFactory & factory);
-void registerFunctionRoundToExp2(FunctionFactory & factory);
-void registerFunctionRoundDuration(FunctionFactory & factory);
-void registerFunctionRoundAge(FunctionFactory & factory);
-
-void registerFunctionBitBoolMaskOr(FunctionFactory & factory);
-void registerFunctionBitBoolMaskAnd(FunctionFactory & factory);
-void registerFunctionBitWrapperFunc(FunctionFactory & factory);
-void registerFunctionBitSwapLastTwo(FunctionFactory & factory);
-void registerFunctionZTest(FunctionFactory & factory);
-
-
-void registerFunctionsArithmetic(FunctionFactory & factory)
-{
-    registerFunctionPlus(factory);
-    registerFunctionMinus(factory);
-    registerFunctionMultiply(factory);
-    registerFunctionDivide(factory);
-    registerFunctionIntDiv(factory);
-    registerFunctionIntDivOrZero(factory);
-    registerFunctionModulo(factory);
-    registerFunctionModuloOrZero(factory);
-    registerFunctionModuloLegacy(factory);
-    registerFunctionNegate(factory);
-    registerFunctionAbs(factory);
-    registerFunctionBitAnd(factory);
-    registerFunctionBitOr(factory);
-    registerFunctionBitXor(factory);
-    registerFunctionBitNot(factory);
-    registerFunctionBitShiftLeft(factory);
-    registerFunctionBitShiftRight(factory);
-    registerFunctionBitRotateLeft(factory);
-    registerFunctionBitRotateRight(factory);
-    registerFunctionBitCount(factory);
-    registerFunctionBitSlice(factory);
-    registerFunctionLeast(factory);
-    registerFunctionGreatest(factory);
-    registerFunctionBitTest(factory);
-    registerFunctionBitTestAny(factory);
-    registerFunctionBitTestAll(factory);
-    registerFunctionGCD(factory);
-    registerFunctionLCM(factory);
-    registerFunctionIntExp2(factory);
-    registerFunctionIntExp10(factory);
-    registerFunctionRoundToExp2(factory);
-    registerFunctionRoundDuration(factory);
-    registerFunctionRoundAge(factory);
-
-    /// Not for external use.
-    registerFunctionBitBoolMaskOr(factory);
-    registerFunctionBitBoolMaskAnd(factory);
-    registerFunctionBitWrapperFunc(factory);
-    registerFunctionBitSwapLastTwo(factory);
-
-    registerFunctionZTest(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsComparison.cpp b/src/Functions/registerFunctionsComparison.cpp
deleted file mode 100644
index af5cbed6191..00000000000
--- a/src/Functions/registerFunctionsComparison.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionEquals(FunctionFactory & factory);
-void registerFunctionNotEquals(FunctionFactory & factory);
-void registerFunctionLess(FunctionFactory & factory);
-void registerFunctionGreater(FunctionFactory & factory);
-void registerFunctionLessOrEquals(FunctionFactory & factory);
-void registerFunctionGreaterOrEquals(FunctionFactory & factory);
-
-
-void registerFunctionsComparison(FunctionFactory & factory)
-{
-    registerFunctionEquals(factory);
-    registerFunctionNotEquals(factory);
-    registerFunctionLess(factory);
-    registerFunctionGreater(factory);
-    registerFunctionLessOrEquals(factory);
-    registerFunctionGreaterOrEquals(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsConditional.cpp b/src/Functions/registerFunctionsConditional.cpp
deleted file mode 100644
index d58d2508dee..00000000000
--- a/src/Functions/registerFunctionsConditional.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionIf(FunctionFactory & factory);
-void registerFunctionMultiIf(FunctionFactory & factory);
-void registerFunctionCaseWithExpression(FunctionFactory & factory);
-
-
-void registerFunctionsConditional(FunctionFactory & factory)
-{
-    registerFunctionIf(factory);
-    registerFunctionMultiIf(factory);
-    registerFunctionCaseWithExpression(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsConsistentHashing.cpp b/src/Functions/registerFunctionsConsistentHashing.cpp
deleted file mode 100644
index 84a78cd6765..00000000000
--- a/src/Functions/registerFunctionsConsistentHashing.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace DB
-{
-class FunctionFactory;
-
-void registerFunctionKostikConsistentHash(FunctionFactory & factory);
-void registerFunctionJumpConsistentHash(FunctionFactory & factory);
-
-void registerFunctionsConsistentHashing(FunctionFactory & factory)
-{
-    registerFunctionKostikConsistentHash(factory);
-    registerFunctionJumpConsistentHash(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsDateTime.cpp b/src/Functions/registerFunctionsDateTime.cpp
deleted file mode 100644
index b3fcca42bed..00000000000
--- a/src/Functions/registerFunctionsDateTime.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionToYear(FunctionFactory &);
-void registerFunctionToQuarter(FunctionFactory &);
-void registerFunctionToMonth(FunctionFactory &);
-void registerFunctionToDayOfMonth(FunctionFactory &);
-void registerFunctionToDayOfWeek(FunctionFactory &);
-void registerFunctionToDayOfYear(FunctionFactory &);
-void registerFunctionToHour(FunctionFactory &);
-void registerFunctionToMinute(FunctionFactory &);
-void registerFunctionToStartOfNanosecond(FunctionFactory &);
-void registerFunctionToStartOfMicrosecond(FunctionFactory &);
-void registerFunctionToStartOfMillisecond(FunctionFactory &);
-void registerFunctionToStartOfSecond(FunctionFactory &);
-void registerFunctionToSecond(FunctionFactory &);
-void registerFunctionToStartOfDay(FunctionFactory &);
-void registerFunctionToMonday(FunctionFactory &);
-void registerFunctionToISOWeek(FunctionFactory &);
-void registerFunctionToISOYear(FunctionFactory &);
-void registerFunctionToCustomWeek(FunctionFactory &);
-void registerFunctionToModifiedJulianDay(FunctionFactory &);
-void registerFunctionToStartOfMonth(FunctionFactory &);
-void registerFunctionToLastDayOfMonth(FunctionFactory &);
-void registerFunctionToStartOfQuarter(FunctionFactory &);
-void registerFunctionToStartOfYear(FunctionFactory &);
-void registerFunctionToStartOfMinute(FunctionFactory &);
-void registerFunctionToStartOfFiveMinutes(FunctionFactory &);
-void registerFunctionToStartOfTenMinutes(FunctionFactory &);
-void registerFunctionToStartOfFifteenMinutes(FunctionFactory &);
-void registerFunctionToStartOfHour(FunctionFactory &);
-void registerFunctionToStartOfInterval(FunctionFactory &);
-void registerFunctionToStartOfISOYear(FunctionFactory &);
-void registerFunctionToRelativeYearNum(FunctionFactory &);
-void registerFunctionToRelativeQuarterNum(FunctionFactory &);
-void registerFunctionToRelativeMonthNum(FunctionFactory &);
-void registerFunctionToRelativeWeekNum(FunctionFactory &);
-void registerFunctionToRelativeDayNum(FunctionFactory &);
-void registerFunctionToRelativeHourNum(FunctionFactory &);
-void registerFunctionToRelativeMinuteNum(FunctionFactory &);
-void registerFunctionToRelativeSecondNum(FunctionFactory &);
-void registerFunctionToTime(FunctionFactory &);
-void registerFunctionNow(FunctionFactory &);
-void registerFunctionNowInBlock(FunctionFactory &);
-void registerFunctionNow64(FunctionFactory &);
-void registerFunctionToday(FunctionFactory &);
-void registerFunctionYesterday(FunctionFactory &);
-void registerFunctionTimeSlot(FunctionFactory &);
-void registerFunctionTimeSlots(FunctionFactory &);
-void registerFunctionToYYYYMM(FunctionFactory &);
-void registerFunctionToYYYYMMDD(FunctionFactory &);
-void registerFunctionToYYYYMMDDhhmmss(FunctionFactory &);
-void registerFunctionAddNanoseconds(FunctionFactory &);
-void registerFunctionAddMicroseconds(FunctionFactory &);
-void registerFunctionAddMilliseconds(FunctionFactory &);
-void registerFunctionAddSeconds(FunctionFactory &);
-void registerFunctionAddMinutes(FunctionFactory &);
-void registerFunctionAddHours(FunctionFactory &);
-void registerFunctionAddDays(FunctionFactory &);
-void registerFunctionAddWeeks(FunctionFactory &);
-void registerFunctionAddMonths(FunctionFactory &);
-void registerFunctionAddQuarters(FunctionFactory &);
-void registerFunctionAddYears(FunctionFactory &);
-void registerFunctionSubtractNanoseconds(FunctionFactory &);
-void registerFunctionSubtractMicroseconds(FunctionFactory &);
-void registerFunctionSubtractMilliseconds(FunctionFactory &);
-void registerFunctionSubtractSeconds(FunctionFactory &);
-void registerFunctionSubtractMinutes(FunctionFactory &);
-void registerFunctionSubtractHours(FunctionFactory &);
-void registerFunctionSubtractDays(FunctionFactory &);
-void registerFunctionSubtractWeeks(FunctionFactory &);
-void registerFunctionSubtractMonths(FunctionFactory &);
-void registerFunctionSubtractQuarters(FunctionFactory &);
-void registerFunctionSubtractYears(FunctionFactory &);
-void registerFunctionDateDiff(FunctionFactory &);
-void registerFunctionDateName(FunctionFactory &);
-void registerFunctionMonthName(FunctionFactory &);
-void registerFunctionToTimeZone(FunctionFactory &);
-void registerFunctionFormatDateTime(FunctionFactory &);
-void registerFunctionFromModifiedJulianDay(FunctionFactory &);
-void registerFunctionDateTrunc(FunctionFactory &);
-
-void registerFunctiontimezoneOffset(FunctionFactory &);
-
-void registerFunctionsDateTime(FunctionFactory & factory)
-{
-    registerFunctionToYear(factory);
-    registerFunctionToQuarter(factory);
-    registerFunctionToMonth(factory);
-    registerFunctionToDayOfMonth(factory);
-    registerFunctionToDayOfWeek(factory);
-    registerFunctionToDayOfYear(factory);
-    registerFunctionToHour(factory);
-    registerFunctionToMinute(factory);
-    registerFunctionToSecond(factory);
-    registerFunctionToStartOfDay(factory);
-    registerFunctionToMonday(factory);
-    registerFunctionToISOWeek(factory);
-    registerFunctionToISOYear(factory);
-    registerFunctionToCustomWeek(factory);
-    registerFunctionToModifiedJulianDay(factory);
-    registerFunctionToStartOfMonth(factory);
-    registerFunctionToLastDayOfMonth(factory);
-    registerFunctionToStartOfQuarter(factory);
-    registerFunctionToStartOfYear(factory);
-    registerFunctionToStartOfNanosecond(factory);
-    registerFunctionToStartOfMicrosecond(factory);
-    registerFunctionToStartOfMillisecond(factory);
-    registerFunctionToStartOfSecond(factory);
-    registerFunctionToStartOfMinute(factory);
-    registerFunctionToStartOfFiveMinutes(factory);
-    registerFunctionToStartOfTenMinutes(factory);
-    registerFunctionToStartOfFifteenMinutes(factory);
-    registerFunctionToStartOfHour(factory);
-    registerFunctionToStartOfInterval(factory);
-    registerFunctionToStartOfISOYear(factory);
-    registerFunctionToRelativeYearNum(factory);
-    registerFunctionToRelativeQuarterNum(factory);
-    registerFunctionToRelativeMonthNum(factory);
-    registerFunctionToRelativeWeekNum(factory);
-    registerFunctionToRelativeDayNum(factory);
-    registerFunctionToRelativeHourNum(factory);
-    registerFunctionToRelativeMinuteNum(factory);
-    registerFunctionToRelativeSecondNum(factory);
-    registerFunctionToTime(factory);
-    registerFunctionNow(factory);
-    registerFunctionNow64(factory);
-    registerFunctionNowInBlock(factory);
-    registerFunctionToday(factory);
-    registerFunctionYesterday(factory);
-    registerFunctionTimeSlot(factory);
-    registerFunctionTimeSlots(factory);
-    registerFunctionToYYYYMM(factory);
-    registerFunctionToYYYYMMDD(factory);
-    registerFunctionToYYYYMMDDhhmmss(factory);
-    registerFunctionAddNanoseconds(factory);
-    registerFunctionAddMicroseconds(factory);
-    registerFunctionAddMilliseconds(factory);
-    registerFunctionAddSeconds(factory);
-    registerFunctionAddMinutes(factory);
-    registerFunctionAddHours(factory);
-    registerFunctionAddDays(factory);
-    registerFunctionAddWeeks(factory);
-    registerFunctionAddMonths(factory);
-    registerFunctionAddQuarters(factory);
-    registerFunctionAddYears(factory);
-    registerFunctionSubtractNanoseconds(factory);
-    registerFunctionSubtractMicroseconds(factory);
-    registerFunctionSubtractMilliseconds(factory);
-    registerFunctionSubtractSeconds(factory);
-    registerFunctionSubtractMinutes(factory);
-    registerFunctionSubtractHours(factory);
-    registerFunctionSubtractDays(factory);
-    registerFunctionSubtractWeeks(factory);
-    registerFunctionSubtractMonths(factory);
-    registerFunctionSubtractQuarters(factory);
-    registerFunctionSubtractYears(factory);
-    registerFunctionDateDiff(factory);
-    registerFunctionDateName(factory);
-    registerFunctionMonthName(factory);
-    registerFunctionToTimeZone(factory);
-    registerFunctionFormatDateTime(factory);
-    registerFunctionFromModifiedJulianDay(factory);
-    registerFunctionDateTrunc(factory);
-    registerFunctiontimezoneOffset(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsFormatting.cpp b/src/Functions/registerFunctionsFormatting.cpp
deleted file mode 100644
index 02353fac812..00000000000
--- a/src/Functions/registerFunctionsFormatting.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionsBitToArray(FunctionFactory &);
-void registerFunctionFormatReadableSize(FunctionFactory &);
-void registerFunctionFormatReadableQuantity(FunctionFactory &);
-void registerFunctionFormatReadableTimeDelta(FunctionFactory &);
-void registerFunctionParseTimeDelta(FunctionFactory &);
-
-void registerFunctionsFormatting(FunctionFactory & factory)
-{
-    registerFunctionsBitToArray(factory);
-    registerFunctionFormatReadableSize(factory);
-    registerFunctionFormatReadableQuantity(factory);
-    registerFunctionFormatReadableTimeDelta(factory);
-    registerFunctionParseTimeDelta(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsGeo.cpp b/src/Functions/registerFunctionsGeo.cpp
deleted file mode 100644
index 006693a93be..00000000000
--- a/src/Functions/registerFunctionsGeo.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-#include "config_functions.h"
-
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionGeoDistance(FunctionFactory & factory);
-void registerFunctionPointInEllipses(FunctionFactory & factory);
-void registerFunctionPointInPolygon(FunctionFactory & factory);
-void registerFunctionPolygonsIntersection(FunctionFactory & factory);
-void registerFunctionPolygonsUnion(FunctionFactory & factory);
-void registerFunctionPolygonArea(FunctionFactory & factory);
-void registerFunctionPolygonConvexHull(FunctionFactory & factory);
-void registerFunctionPolygonsSymDifference(FunctionFactory & factory);
-void registerFunctionPolygonsEquals(FunctionFactory & factory);
-void registerFunctionPolygonsDistance(FunctionFactory & factory);
-void registerFunctionPolygonsWithin(FunctionFactory & factory);
-void registerFunctionPolygonPerimeter(FunctionFactory & factory);
-void registerFunctionGeohashEncode(FunctionFactory & factory);
-void registerFunctionGeohashDecode(FunctionFactory & factory);
-void registerFunctionGeohashesInBox(FunctionFactory & factory);
-void registerFunctionWkt(FunctionFactory & factory);
-void registerFunctionReadWKT(FunctionFactory & factory);
-void registerFunctionSvg(FunctionFactory & factory);
-
-#if USE_H3
-void registerFunctionGeoToH3(FunctionFactory &);
-void registerFunctionH3ToGeo(FunctionFactory &);
-void registerFunctionH3ToGeoBoundary(FunctionFactory &);
-void registerFunctionH3EdgeAngle(FunctionFactory &);
-void registerFunctionH3EdgeLengthM(FunctionFactory &);
-void registerFunctionH3EdgeLengthKm(FunctionFactory &);
-void registerFunctionH3ExactEdgeLengthM(FunctionFactory &);
-void registerFunctionH3ExactEdgeLengthKm(FunctionFactory &);
-void registerFunctionH3ExactEdgeLengthRads(FunctionFactory &);
-void registerFunctionH3GetResolution(FunctionFactory &);
-void registerFunctionH3IsValid(FunctionFactory &);
-void registerFunctionH3KRing(FunctionFactory &);
-void registerFunctionH3GetBaseCell(FunctionFactory &);
-void registerFunctionH3ToParent(FunctionFactory &);
-void registerFunctionH3ToChildren(FunctionFactory &);
-void registerFunctionH3ToCenterChild(FunctionFactory &);
-void registerFunctionH3IndexesAreNeighbors(FunctionFactory &);
-void registerFunctionStringToH3(FunctionFactory &);
-void registerFunctionH3ToString(FunctionFactory &);
-void registerFunctionH3HexAreaM2(FunctionFactory &);
-void registerFunctionH3IsResClassIII(FunctionFactory &);
-void registerFunctionH3IsPentagon(FunctionFactory &);
-void registerFunctionH3GetFaces(FunctionFactory &);
-void registerFunctionH3HexAreaKm2(FunctionFactory &);
-void registerFunctionH3CellAreaM2(FunctionFactory &);
-void registerFunctionH3CellAreaRads2(FunctionFactory &);
-void registerFunctionH3NumHexagons(FunctionFactory &);
-void registerFunctionH3PointDistM(FunctionFactory &);
-void registerFunctionH3PointDistKm(FunctionFactory &);
-void registerFunctionH3PointDistRads(FunctionFactory &);
-void registerFunctionH3GetRes0Indexes(FunctionFactory &);
-void registerFunctionH3GetPentagonIndexes(FunctionFactory &);
-void registerFunctionH3Line(FunctionFactory &);
-void registerFunctionH3Distance(FunctionFactory &);
-void registerFunctionH3HexRing(FunctionFactory &);
-void registerFunctionH3GetUnidirectionalEdge(FunctionFactory &);
-void registerFunctionH3UnidirectionalEdgeIsValid(FunctionFactory &);
-void registerFunctionH3GetOriginIndexFromUnidirectionalEdge(FunctionFactory &);
-void registerFunctionH3GetDestinationIndexFromUnidirectionalEdge(FunctionFactory &);
-void registerFunctionH3GetIndexesFromUnidirectionalEdge(FunctionFactory &);
-void registerFunctionH3GetUnidirectionalEdgesFromHexagon(FunctionFactory &);
-void registerFunctionH3GetUnidirectionalEdgeBoundary(FunctionFactory &);
-#endif
-
-#if USE_S2_GEOMETRY
-void registerFunctionGeoToS2(FunctionFactory &);
-void registerFunctionS2ToGeo(FunctionFactory &);
-void registerFunctionS2GetNeighbors(FunctionFactory &);
-void registerFunctionS2CellsIntersect(FunctionFactory &);
-void registerFunctionS2CapContains(FunctionFactory &);
-void registerFunctionS2CapUnion(FunctionFactory &);
-void registerFunctionS2RectAdd(FunctionFactory &);
-void registerFunctionS2RectContains(FunctionFactory &);
-void registerFunctionS2RectUnion(FunctionFactory &);
-void registerFunctionS2RectIntersection(FunctionFactory &);
-#endif
-
-
-void registerFunctionsGeo(FunctionFactory & factory)
-{
-    registerFunctionGeoDistance(factory);
-    registerFunctionPointInEllipses(factory);
-    registerFunctionPointInPolygon(factory);
-    registerFunctionPolygonsIntersection(factory);
-    registerFunctionPolygonsUnion(factory);
-    registerFunctionPolygonArea(factory);
-    registerFunctionPolygonConvexHull(factory);
-    registerFunctionPolygonsSymDifference(factory);
-    registerFunctionPolygonsEquals(factory);
-    registerFunctionPolygonsDistance(factory);
-    registerFunctionPolygonsWithin(factory);
-    registerFunctionPolygonPerimeter(factory);
-    registerFunctionGeohashEncode(factory);
-    registerFunctionGeohashDecode(factory);
-    registerFunctionGeohashesInBox(factory);
-    registerFunctionWkt(factory);
-    registerFunctionReadWKT(factory);
-    registerFunctionSvg(factory);
-
-#if USE_H3
-    registerFunctionGeoToH3(factory);
-    registerFunctionH3ToGeo(factory);
-    registerFunctionH3ToGeoBoundary(factory);
-    registerFunctionH3EdgeAngle(factory);
-    registerFunctionH3EdgeLengthM(factory);
-    registerFunctionH3EdgeLengthKm(factory);
-    registerFunctionH3ExactEdgeLengthM(factory);
-    registerFunctionH3ExactEdgeLengthKm(factory);
-    registerFunctionH3ExactEdgeLengthRads(factory);
-    registerFunctionH3GetResolution(factory);
-    registerFunctionH3IsValid(factory);
-    registerFunctionH3KRing(factory);
-    registerFunctionH3GetBaseCell(factory);
-    registerFunctionH3ToParent(factory);
-    registerFunctionH3ToChildren(factory);
-    registerFunctionH3ToCenterChild(factory);
-    registerFunctionH3IndexesAreNeighbors(factory);
-    registerFunctionStringToH3(factory);
-    registerFunctionH3ToString(factory);
-    registerFunctionH3HexAreaM2(factory);
-    registerFunctionH3IsResClassIII(factory);
-    registerFunctionH3IsPentagon(factory);
-    registerFunctionH3GetFaces(factory);
-    registerFunctionH3HexAreaKm2(factory);
-    registerFunctionH3CellAreaM2(factory);
-    registerFunctionH3CellAreaRads2(factory);
-    registerFunctionH3NumHexagons(factory);
-    registerFunctionH3PointDistM(factory);
-    registerFunctionH3PointDistKm(factory);
-    registerFunctionH3PointDistRads(factory);
-    registerFunctionH3GetRes0Indexes(factory);
-    registerFunctionH3GetPentagonIndexes(factory);
-    registerFunctionH3Line(factory);
-    registerFunctionH3Distance(factory);
-    registerFunctionH3HexRing(factory);
-    registerFunctionH3GetUnidirectionalEdge(factory);
-    registerFunctionH3UnidirectionalEdgeIsValid(factory);
-    registerFunctionH3GetOriginIndexFromUnidirectionalEdge(factory);
-    registerFunctionH3GetDestinationIndexFromUnidirectionalEdge(factory);
-    registerFunctionH3GetIndexesFromUnidirectionalEdge(factory);
-    registerFunctionH3GetUnidirectionalEdgesFromHexagon(factory);
-    registerFunctionH3GetUnidirectionalEdgeBoundary(factory);
-#endif
-
-#if USE_S2_GEOMETRY
-    registerFunctionGeoToS2(factory);
-    registerFunctionS2ToGeo(factory);
-    registerFunctionS2GetNeighbors(factory);
-    registerFunctionS2CellsIntersect(factory);
-    registerFunctionS2CapContains(factory);
-    registerFunctionS2CapUnion(factory);
-    registerFunctionS2RectAdd(factory);
-    registerFunctionS2RectContains(factory);
-    registerFunctionS2RectUnion(factory);
-    registerFunctionS2RectIntersection(factory);
-#endif
-}
-
-}
diff --git a/src/Functions/registerFunctionsHigherOrder.cpp b/src/Functions/registerFunctionsHigherOrder.cpp
deleted file mode 100644
index 00bea58b918..00000000000
--- a/src/Functions/registerFunctionsHigherOrder.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionArrayMap(FunctionFactory & factory);
-void registerFunctionArrayFilter(FunctionFactory & factory);
-void registerFunctionArrayCount(FunctionFactory & factory);
-void registerFunctionArrayExists(FunctionFactory & factory);
-void registerFunctionArrayAll(FunctionFactory & factory);
-void registerFunctionArrayCompact(FunctionFactory & factory);
-void registerFunctionArrayAggregation(FunctionFactory & factory);
-void registerFunctionArrayFirst(FunctionFactory & factory);
-void registerFunctionArrayFirstIndex(FunctionFactory & factory);
-void registerFunctionsArrayFill(FunctionFactory & factory);
-void registerFunctionsArraySplit(FunctionFactory & factory);
-void registerFunctionsArraySort(FunctionFactory & factory);
-void registerFunctionArrayCumSum(FunctionFactory & factory);
-void registerFunctionArrayCumSumNonNegative(FunctionFactory & factory);
-void registerFunctionArrayDifference(FunctionFactory & factory);
-void registerFunctionMapApply(FunctionFactory & factory);
-
-void registerFunctionsHigherOrder(FunctionFactory & factory)
-{
-    registerFunctionArrayMap(factory);
-    registerFunctionArrayFilter(factory);
-    registerFunctionArrayCount(factory);
-    registerFunctionArrayExists(factory);
-    registerFunctionArrayAll(factory);
-    registerFunctionArrayCompact(factory);
-    registerFunctionArrayAggregation(factory);
-    registerFunctionArrayFirst(factory);
-    registerFunctionArrayFirstIndex(factory);
-    registerFunctionsArrayFill(factory);
-    registerFunctionsArraySplit(factory);
-    registerFunctionsArraySort(factory);
-    registerFunctionArrayCumSum(factory);
-    registerFunctionArrayCumSumNonNegative(factory);
-    registerFunctionArrayDifference(factory);
-    registerFunctionMapApply(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsIntrospection.cpp b/src/Functions/registerFunctionsIntrospection.cpp
deleted file mode 100644
index 76a92847d8e..00000000000
--- a/src/Functions/registerFunctionsIntrospection.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-#if defined(OS_LINUX)
-void registerFunctionAddressToSymbol(FunctionFactory & factory);
-void registerFunctionAddressToLine(FunctionFactory & factory);
-void registerFunctionAddressToLineWithInlines(FunctionFactory & factory);
-#endif
-
-void registerFunctionDemangle(FunctionFactory & factory);
-void registerFunctionTrap(FunctionFactory & factory);
-
-
-void registerFunctionsIntrospection(FunctionFactory & factory)
-{
-#if defined(OS_LINUX)
-    registerFunctionAddressToSymbol(factory);
-    registerFunctionAddressToLine(factory);
-    registerFunctionAddressToLineWithInlines(factory);
-#endif
-    registerFunctionDemangle(factory);
-    registerFunctionTrap(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsMath.cpp b/src/Functions/registerFunctionsMath.cpp
deleted file mode 100644
index 865ec23174a..00000000000
--- a/src/Functions/registerFunctionsMath.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-namespace DB
-{
-class FunctionFactory;
-
-void registerFunctionE(FunctionFactory & factory);
-void registerFunctionPi(FunctionFactory & factory);
-void registerFunctionExp(FunctionFactory & factory);
-void registerFunctionLog(FunctionFactory & factory);
-void registerFunctionExp2(FunctionFactory & factory);
-void registerFunctionLog2(FunctionFactory & factory);
-void registerFunctionLog1p(FunctionFactory & factory);
-void registerFunctionExp10(FunctionFactory & factory);
-void registerFunctionLog10(FunctionFactory & factory);
-void registerFunctionSqrt(FunctionFactory & factory);
-void registerFunctionCbrt(FunctionFactory & factory);
-void registerFunctionErf(FunctionFactory & factory);
-void registerFunctionErfc(FunctionFactory & factory);
-void registerFunctionLGamma(FunctionFactory & factory);
-void registerFunctionTGamma(FunctionFactory & factory);
-void registerFunctionSin(FunctionFactory & factory);
-void registerFunctionCos(FunctionFactory & factory);
-void registerFunctionTan(FunctionFactory & factory);
-void registerFunctionAsin(FunctionFactory & factory);
-void registerFunctionAcos(FunctionFactory & factory);
-void registerFunctionAtan(FunctionFactory & factory);
-void registerFunctionAtan2(FunctionFactory & factory);
-void registerFunctionSigmoid(FunctionFactory & factory);
-void registerFunctionHypot(FunctionFactory & factory);
-void registerFunctionSinh(FunctionFactory & factory);
-void registerFunctionCosh(FunctionFactory & factory);
-void registerFunctionTanh(FunctionFactory & factory);
-void registerFunctionAsinh(FunctionFactory & factory);
-void registerFunctionAcosh(FunctionFactory & factory);
-void registerFunctionAtanh(FunctionFactory & factory);
-void registerFunctionPow(FunctionFactory & factory);
-void registerFunctionSign(FunctionFactory & factory);
-void registerFunctionMax2(FunctionFactory & factory);
-void registerFunctionMin2(FunctionFactory & factory);
-void registerVectorFunctions(FunctionFactory &);
-void registerFunctionDegrees(FunctionFactory & factory);
-void registerFunctionRadians(FunctionFactory & factory);
-
-
-void registerFunctionsMath(FunctionFactory & factory)
-{
-    registerFunctionE(factory);
-    registerFunctionPi(factory);
-    registerFunctionExp(factory);
-    registerFunctionLog(factory);
-    registerFunctionExp2(factory);
-    registerFunctionLog2(factory);
-    registerFunctionLog1p(factory);
-    registerFunctionExp10(factory);
-    registerFunctionLog10(factory);
-    registerFunctionSqrt(factory);
-    registerFunctionCbrt(factory);
-    registerFunctionErf(factory);
-    registerFunctionErfc(factory);
-    registerFunctionLGamma(factory);
-    registerFunctionTGamma(factory);
-    registerFunctionSin(factory);
-    registerFunctionCos(factory);
-    registerFunctionTan(factory);
-    registerFunctionAsin(factory);
-    registerFunctionAcos(factory);
-    registerFunctionAtan(factory);
-    registerFunctionAtan2(factory);
-    registerFunctionSigmoid(factory);
-    registerFunctionHypot(factory);
-    registerFunctionSinh(factory);
-    registerFunctionCosh(factory);
-    registerFunctionTanh(factory);
-    registerFunctionAsinh(factory);
-    registerFunctionAcosh(factory);
-    registerFunctionAtanh(factory);
-    registerFunctionPow(factory);
-    registerFunctionSign(factory);
-    registerFunctionMax2(factory);
-    registerFunctionMin2(factory);
-    registerVectorFunctions(factory);
-    registerFunctionDegrees(factory);
-    registerFunctionRadians(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsMiscellaneous.cpp b/src/Functions/registerFunctionsMiscellaneous.cpp
deleted file mode 100644
index 755d38409a6..00000000000
--- a/src/Functions/registerFunctionsMiscellaneous.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-#include <config_core.h>
-
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionCurrentDatabase(FunctionFactory &);
-void registerFunctionCurrentUser(FunctionFactory &);
-void registerFunctionCurrentProfiles(FunctionFactory &);
-void registerFunctionCurrentRoles(FunctionFactory &);
-void registerFunctionHostName(FunctionFactory &);
-void registerFunctionFQDN(FunctionFactory &);
-void registerFunctionVisibleWidth(FunctionFactory &);
-void registerFunctionToTypeName(FunctionFactory &);
-void registerFunctionGetSizeOfEnumType(FunctionFactory &);
-void registerFunctionBlockSerializedSize(FunctionFactory &);
-void registerFunctionToColumnTypeName(FunctionFactory &);
-void registerFunctionDumpColumnStructure(FunctionFactory &);
-void registerFunctionDefaultValueOfArgumentType(FunctionFactory &);
-void registerFunctionDefaultValueOfTypeName(FunctionFactory &);
-void registerFunctionBlockSize(FunctionFactory &);
-void registerFunctionBlockNumber(FunctionFactory &);
-void registerFunctionRowNumberInBlock(FunctionFactory &);
-void registerFunctionRowNumberInAllBlocks(FunctionFactory &);
-void registerFunctionNeighbor(FunctionFactory &);
-void registerFunctionSleep(FunctionFactory &);
-void registerFunctionSleepEachRow(FunctionFactory &);
-void registerFunctionMaterialize(FunctionFactory &);
-void registerFunctionIgnore(FunctionFactory &);
-void registerFunctionIndexHint(FunctionFactory &);
-void registerFunctionIdentity(FunctionFactory &);
-void registerFunctionArrayJoin(FunctionFactory &);
-void registerFunctionReplicate(FunctionFactory &);
-void registerFunctionBar(FunctionFactory &);
-void registerFunctionHasColumnInTable(FunctionFactory &);
-void registerFunctionIsFinite(FunctionFactory &);
-void registerFunctionIsInfinite(FunctionFactory &);
-void registerFunctionIsNaN(FunctionFactory &);
-void registerFunctionIfNotFinite(FunctionFactory &);
-void registerFunctionThrowIf(FunctionFactory &);
-void registerFunctionVersion(FunctionFactory &);
-void registerFunctionRevision(FunctionFactory &);
-void registerFunctionBuildId(FunctionFactory &);
-void registerFunctionUptime(FunctionFactory &);
-void registerFunctionTimezone(FunctionFactory &);
-void registerFunctionTimezoneOf(FunctionFactory &);
-void registerFunctionRunningAccumulate(FunctionFactory &);
-void registerFunctionRunningDifference(FunctionFactory &);
-void registerFunctionRunningDifferenceStartingWithFirstValue(FunctionFactory &);
-void registerFunctionRunningConcurrency(FunctionFactory &);
-void registerFunctionFinalizeAggregation(FunctionFactory &);
-void registerFunctionToLowCardinality(FunctionFactory &);
-void registerFunctionLowCardinalityIndices(FunctionFactory &);
-void registerFunctionLowCardinalityKeys(FunctionFactory &);
-void registerFunctionsIn(FunctionFactory &);
-void registerFunctionJoinGet(FunctionFactory &);
-void registerFunctionFilesystem(FunctionFactory &);
-void registerFunctionEvalMLMethod(FunctionFactory &);
-void registerFunctionBasename(FunctionFactory &);
-void registerFunctionTransform(FunctionFactory &);
-void registerFunctionGetMacro(FunctionFactory &);
-void registerFunctionGetScalar(FunctionFactory &);
-void registerFunctionGetSetting(FunctionFactory &);
-void registerFunctionIsConstant(FunctionFactory &);
-void registerFunctionIsDecimalOverflow(FunctionFactory &);
-void registerFunctionCountDigits(FunctionFactory &);
-void registerFunctionGlobalVariable(FunctionFactory &);
-void registerFunctionHasThreadFuzzer(FunctionFactory &);
-void registerFunctionInitializeAggregation(FunctionFactory &);
-void registerFunctionErrorCodeToName(FunctionFactory &);
-void registerFunctionTcpPort(FunctionFactory &);
-void registerFunctionGetServerPort(FunctionFactory &);
-void registerFunctionByteSize(FunctionFactory &);
-void registerFunctionFile(FunctionFactory &);
-void registerFunctionConnectionId(FunctionFactory &);
-void registerFunctionPartitionId(FunctionFactory &);
-void registerFunctionIsIPAddressContainedIn(FunctionFactory &);
-void registerFunctionsTransactionCounters(FunctionFactory & factory);
-void registerFunctionQueryID(FunctionFactory &);
-void registerFunctionInitialQueryID(FunctionFactory &);
-void registerFunctionServerUUID(FunctionFactory &);
-void registerFunctionZooKeeperSessionUptime(FunctionFactory &);
-void registerFunctionGetOSKernelVersion(FunctionFactory &);
-void registerFunctionGetTypeSerializationStreams(FunctionFactory &);
-void registerFunctionFlattenTuple(FunctionFactory &);
-
-#if USE_ICU
-void registerFunctionConvertCharset(FunctionFactory &);
-#endif
-
-#ifdef FUZZING_MODE
-void registerFunctionGetFuzzerData(FunctionFactory & factory);
-#endif
-
-void registerFunctionsMiscellaneous(FunctionFactory & factory)
-{
-    registerFunctionCurrentDatabase(factory);
-    registerFunctionCurrentUser(factory);
-    registerFunctionCurrentProfiles(factory);
-    registerFunctionCurrentRoles(factory);
-    registerFunctionHostName(factory);
-    registerFunctionFQDN(factory);
-    registerFunctionVisibleWidth(factory);
-    registerFunctionToTypeName(factory);
-    registerFunctionGetSizeOfEnumType(factory);
-    registerFunctionBlockSerializedSize(factory);
-    registerFunctionToColumnTypeName(factory);
-    registerFunctionDumpColumnStructure(factory);
-    registerFunctionDefaultValueOfArgumentType(factory);
-    registerFunctionDefaultValueOfTypeName(factory);
-    registerFunctionBlockSize(factory);
-    registerFunctionBlockNumber(factory);
-    registerFunctionRowNumberInBlock(factory);
-    registerFunctionRowNumberInAllBlocks(factory);
-    registerFunctionNeighbor(factory);
-    registerFunctionSleep(factory);
-    registerFunctionSleepEachRow(factory);
-    registerFunctionMaterialize(factory);
-    registerFunctionIgnore(factory);
-    registerFunctionIndexHint(factory);
-    registerFunctionIdentity(factory);
-    registerFunctionArrayJoin(factory);
-    registerFunctionReplicate(factory);
-    registerFunctionBar(factory);
-    registerFunctionHasColumnInTable(factory);
-    registerFunctionIsFinite(factory);
-    registerFunctionIsInfinite(factory);
-    registerFunctionIsNaN(factory);
-    registerFunctionIfNotFinite(factory);
-    registerFunctionThrowIf(factory);
-    registerFunctionVersion(factory);
-    registerFunctionRevision(factory);
-    registerFunctionBuildId(factory);
-    registerFunctionUptime(factory);
-    registerFunctionTimezone(factory);
-    registerFunctionTimezoneOf(factory);
-    registerFunctionRunningAccumulate(factory);
-    registerFunctionRunningDifference(factory);
-    registerFunctionRunningDifferenceStartingWithFirstValue(factory);
-    registerFunctionRunningConcurrency(factory);
-    registerFunctionFinalizeAggregation(factory);
-    registerFunctionToLowCardinality(factory);
-    registerFunctionLowCardinalityIndices(factory);
-    registerFunctionLowCardinalityKeys(factory);
-    registerFunctionsIn(factory);
-    registerFunctionJoinGet(factory);
-    registerFunctionFilesystem(factory);
-    registerFunctionEvalMLMethod(factory);
-    registerFunctionBasename(factory);
-    registerFunctionTransform(factory);
-    registerFunctionGetMacro(factory);
-    registerFunctionGetScalar(factory);
-    registerFunctionGetSetting(factory);
-    registerFunctionIsConstant(factory);
-    registerFunctionIsDecimalOverflow(factory);
-    registerFunctionCountDigits(factory);
-    registerFunctionGlobalVariable(factory);
-    registerFunctionHasThreadFuzzer(factory);
-    registerFunctionInitializeAggregation(factory);
-    registerFunctionErrorCodeToName(factory);
-    registerFunctionTcpPort(factory);
-    registerFunctionGetServerPort(factory);
-    registerFunctionByteSize(factory);
-    registerFunctionFile(factory);
-    registerFunctionConnectionId(factory);
-    registerFunctionPartitionId(factory);
-    registerFunctionIsIPAddressContainedIn(factory);
-    registerFunctionsTransactionCounters(factory);
-    registerFunctionQueryID(factory);
-    registerFunctionInitialQueryID(factory);
-    registerFunctionServerUUID(factory);
-    registerFunctionZooKeeperSessionUptime(factory);
-    registerFunctionGetOSKernelVersion(factory);
-    registerFunctionGetTypeSerializationStreams(factory);
-    registerFunctionFlattenTuple(factory);
-
-#if USE_ICU
-    registerFunctionConvertCharset(factory);
-#endif
-
-#ifdef FUZZING_MODE
-    registerFunctionGetFuzzerData(factory);
-#endif
-}
-
-}
diff --git a/src/Functions/registerFunctionsNull.cpp b/src/Functions/registerFunctionsNull.cpp
deleted file mode 100644
index d94ee95d28f..00000000000
--- a/src/Functions/registerFunctionsNull.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionIsNull(FunctionFactory & factory);
-void registerFunctionIsNotNull(FunctionFactory & factory);
-void registerFunctionCoalesce(FunctionFactory & factory);
-void registerFunctionIfNull(FunctionFactory & factory);
-void registerFunctionNullIf(FunctionFactory & factory);
-void registerFunctionAssumeNotNull(FunctionFactory & factory);
-void registerFunctionToNullable(FunctionFactory & factory);
-void registerFunctionIsZeroOrNull(FunctionFactory & factory);
-void registerFunctionIsNullable(FunctionFactory & factory);
-
-
-void registerFunctionsNull(FunctionFactory & factory)
-{
-    registerFunctionIsNull(factory);
-    registerFunctionIsNotNull(factory);
-    registerFunctionCoalesce(factory);
-    registerFunctionIfNull(factory);
-    registerFunctionNullIf(factory);
-    registerFunctionAssumeNotNull(factory);
-    registerFunctionToNullable(factory);
-    registerFunctionIsZeroOrNull(factory);
-    registerFunctionIsNullable(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsRandom.cpp b/src/Functions/registerFunctionsRandom.cpp
deleted file mode 100644
index 6a2cb82dc4c..00000000000
--- a/src/Functions/registerFunctionsRandom.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace DB
-{
-class FunctionFactory;
-
-void registerFunctionRand(FunctionFactory & factory);
-void registerFunctionRand64(FunctionFactory & factory);
-void registerFunctionRandConstant(FunctionFactory & factory);
-void registerFunctionGenerateUUIDv4(FunctionFactory & factory);
-void registerFunctionRandomPrintableASCII(FunctionFactory & factory);
-void registerFunctionRandomString(FunctionFactory & factory);
-void registerFunctionRandomFixedString(FunctionFactory & factory);
-void registerFunctionRandomStringUTF8(FunctionFactory & factory);
-void registerFunctionFuzzBits(FunctionFactory & factory);
-
-void registerFunctionsRandom(FunctionFactory & factory)
-{
-    registerFunctionRand(factory);
-    registerFunctionRand64(factory);
-    registerFunctionRandConstant(factory);
-    registerFunctionGenerateUUIDv4(factory);
-    registerFunctionRandomPrintableASCII(factory);
-    registerFunctionRandomString(factory);
-    registerFunctionRandomFixedString(factory);
-    registerFunctionRandomStringUTF8(factory);
-    registerFunctionFuzzBits(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsReinterpret.cpp b/src/Functions/registerFunctionsReinterpret.cpp
deleted file mode 100644
index e6fa0402071..00000000000
--- a/src/Functions/registerFunctionsReinterpret.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionsReinterpretAs(FunctionFactory & factory);
-
-void registerFunctionsReinterpret(FunctionFactory & factory)
-{
-    registerFunctionsReinterpretAs(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsSnowflake.cpp b/src/Functions/registerFunctionsSnowflake.cpp
deleted file mode 100644
index 7a0569ee16a..00000000000
--- a/src/Functions/registerFunctionsSnowflake.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerDateTimeToSnowflake(FunctionFactory &);
-void registerSnowflakeToDateTime(FunctionFactory &);
-
-void registerDateTime64ToSnowflake(FunctionFactory &);
-void registerSnowflakeToDateTime64(FunctionFactory &);
-
-
-void registerFunctionsSnowflake(FunctionFactory & factory)
-{
-    registerDateTimeToSnowflake(factory);
-    registerSnowflakeToDateTime(factory);
-
-    registerDateTime64ToSnowflake(factory);
-    registerSnowflakeToDateTime64(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsString.cpp b/src/Functions/registerFunctionsString.cpp
deleted file mode 100644
index 9e75e9900b7..00000000000
--- a/src/Functions/registerFunctionsString.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "config_functions.h"
-#include "config_core.h"
-
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionRepeat(FunctionFactory &);
-void registerFunctionEmpty(FunctionFactory &);
-void registerFunctionNotEmpty(FunctionFactory &);
-void registerFunctionLength(FunctionFactory &);
-void registerFunctionLengthUTF8(FunctionFactory &);
-void registerFunctionIsValidUTF8(FunctionFactory &);
-void registerFunctionToValidUTF8(FunctionFactory &);
-void registerFunctionLower(FunctionFactory &);
-void registerFunctionUpper(FunctionFactory &);
-void registerFunctionLowerUTF8(FunctionFactory &);
-void registerFunctionUpperUTF8(FunctionFactory &);
-void registerFunctionReverse(FunctionFactory &);
-void registerFunctionReverseUTF8(FunctionFactory &);
-void registerFunctionsConcat(FunctionFactory &);
-void registerFunctionFormat(FunctionFactory &);
-void registerFunctionFormatRow(FunctionFactory &);
-void registerFunctionSubstring(FunctionFactory &);
-void registerFunctionLeft(FunctionFactory &);
-void registerFunctionRight(FunctionFactory &);
-void registerFunctionCRC(FunctionFactory &);
-void registerFunctionAppendTrailingCharIfAbsent(FunctionFactory &);
-void registerFunctionStartsWith(FunctionFactory &);
-void registerFunctionEndsWith(FunctionFactory &);
-void registerFunctionTrim(FunctionFactory &);
-void registerFunctionPadString(FunctionFactory &);
-void registerFunctionRegexpQuoteMeta(FunctionFactory &);
-void registerFunctionNormalizeQuery(FunctionFactory &);
-void registerFunctionNormalizedQueryHash(FunctionFactory &);
-void registerFunctionCountMatches(FunctionFactory &);
-void registerFunctionEncodeXMLComponent(FunctionFactory &);
-void registerFunctionDecodeXMLComponent(FunctionFactory &);
-void registerFunctionExtractTextFromHTML(FunctionFactory &);
-void registerFunctionToStringCutToZero(FunctionFactory &);
-void registerFunctionDetectCharset(FunctionFactory &);
-void registerFunctionDetectTonality(FunctionFactory &);
-void registerFunctionDetectProgrammingLanguage(FunctionFactory &);
-
-#if USE_BASE64
-void registerFunctionBase64Encode(FunctionFactory &);
-void registerFunctionBase64Decode(FunctionFactory &);
-void registerFunctionTryBase64Decode(FunctionFactory &);
-#endif
-
-void registerFunctionBase58Encode(FunctionFactory &);
-void registerFunctionBase58Decode(FunctionFactory &);
-
-#if USE_NLP
-void registerFunctionStem(FunctionFactory &);
-void registerFunctionSynonyms(FunctionFactory &);
-void registerFunctionLemmatize(FunctionFactory &);
-void registerFunctionsDetectLanguage(FunctionFactory &);
-#endif
-
-#if USE_ICU
-void registerFunctionNormalizeUTF8(FunctionFactory &);
-#endif
-
-void registerFunctionsString(FunctionFactory & factory)
-{
-    registerFunctionRepeat(factory);
-    registerFunctionEmpty(factory);
-    registerFunctionNotEmpty(factory);
-    registerFunctionLength(factory);
-    registerFunctionLengthUTF8(factory);
-    registerFunctionIsValidUTF8(factory);
-    registerFunctionToValidUTF8(factory);
-    registerFunctionLower(factory);
-    registerFunctionUpper(factory);
-    registerFunctionLowerUTF8(factory);
-    registerFunctionUpperUTF8(factory);
-    registerFunctionReverse(factory);
-    registerFunctionCRC(factory);
-    registerFunctionReverseUTF8(factory);
-    registerFunctionsConcat(factory);
-    registerFunctionFormat(factory);
-    registerFunctionFormatRow(factory);
-    registerFunctionSubstring(factory);
-    registerFunctionLeft(factory);
-    registerFunctionRight(factory);
-    registerFunctionAppendTrailingCharIfAbsent(factory);
-    registerFunctionStartsWith(factory);
-    registerFunctionEndsWith(factory);
-    registerFunctionTrim(factory);
-    registerFunctionPadString(factory);
-    registerFunctionRegexpQuoteMeta(factory);
-    registerFunctionNormalizeQuery(factory);
-    registerFunctionNormalizedQueryHash(factory);
-    registerFunctionCountMatches(factory);
-    registerFunctionEncodeXMLComponent(factory);
-    registerFunctionDecodeXMLComponent(factory);
-    registerFunctionExtractTextFromHTML(factory);
-    registerFunctionToStringCutToZero(factory);
-    registerFunctionDetectCharset(factory);
-    registerFunctionDetectTonality(factory);
-    registerFunctionDetectProgrammingLanguage(factory);
-
-#if USE_BASE64
-    registerFunctionBase64Encode(factory);
-    registerFunctionBase64Decode(factory);
-    registerFunctionTryBase64Decode(factory);
-#endif
-
-    registerFunctionBase58Encode(factory);
-    registerFunctionBase58Decode(factory);
-
-#if USE_NLP
-    registerFunctionStem(factory);
-    registerFunctionSynonyms(factory);
-    registerFunctionLemmatize(factory);
-    registerFunctionsDetectLanguage(factory);
-#endif
-
-#if USE_ICU
-    registerFunctionNormalizeUTF8(factory);
-#endif
-}
-
-}
diff --git a/src/Functions/registerFunctionsStringRegexp.cpp b/src/Functions/registerFunctionsStringRegexp.cpp
deleted file mode 100644
index df7e8f58396..00000000000
--- a/src/Functions/registerFunctionsStringRegexp.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionLike(FunctionFactory &);
-void registerFunctionILike(FunctionFactory &);
-void registerFunctionNotLike(FunctionFactory &);
-void registerFunctionNotILike(FunctionFactory &);
-void registerFunctionMatch(FunctionFactory &);
-void registerFunctionExtract(FunctionFactory &);
-void registerFunctionTranslate(FunctionFactory &);
-void registerFunctionReplaceOne(FunctionFactory &);
-void registerFunctionReplaceAll(FunctionFactory &);
-void registerFunctionReplaceRegexpOne(FunctionFactory &);
-void registerFunctionReplaceRegexpAll(FunctionFactory &);
-void registerFunctionMultiMatchAny(FunctionFactory &);
-void registerFunctionMultiMatchAnyIndex(FunctionFactory &);
-void registerFunctionMultiMatchAllIndices(FunctionFactory &);
-void registerFunctionMultiFuzzyMatchAny(FunctionFactory &);
-void registerFunctionMultiFuzzyMatchAnyIndex(FunctionFactory &);
-void registerFunctionMultiFuzzyMatchAllIndices(FunctionFactory &);
-void registerFunctionExtractGroups(FunctionFactory &);
-void registerFunctionExtractAllGroupsVertical(FunctionFactory &);
-void registerFunctionExtractAllGroupsHorizontal(FunctionFactory &);
-
-void registerFunctionsStringRegexp(FunctionFactory & factory)
-{
-    registerFunctionLike(factory);
-    registerFunctionILike(factory);
-    registerFunctionNotLike(factory);
-    registerFunctionNotILike(factory);
-    registerFunctionMatch(factory);
-    registerFunctionExtract(factory);
-    registerFunctionTranslate(factory);
-    registerFunctionReplaceOne(factory);
-    registerFunctionReplaceAll(factory);
-    registerFunctionReplaceRegexpOne(factory);
-    registerFunctionReplaceRegexpAll(factory);
-    registerFunctionMultiMatchAny(factory);
-    registerFunctionMultiMatchAnyIndex(factory);
-    registerFunctionMultiMatchAllIndices(factory);
-    registerFunctionMultiFuzzyMatchAny(factory);
-    registerFunctionMultiFuzzyMatchAnyIndex(factory);
-    registerFunctionMultiFuzzyMatchAllIndices(factory);
-    registerFunctionExtractGroups(factory);
-    registerFunctionExtractAllGroupsVertical(factory);
-    registerFunctionExtractAllGroupsHorizontal(factory);
-}
-}
diff --git a/src/Functions/registerFunctionsStringSearch.cpp b/src/Functions/registerFunctionsStringSearch.cpp
deleted file mode 100644
index bdf94cf1134..00000000000
--- a/src/Functions/registerFunctionsStringSearch.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionPosition(FunctionFactory &);
-void registerFunctionPositionUTF8(FunctionFactory &);
-void registerFunctionPositionCaseInsensitive(FunctionFactory &);
-void registerFunctionPositionCaseInsensitiveUTF8(FunctionFactory &);
-
-void registerFunctionMultiSearchAny(FunctionFactory &);
-void registerFunctionMultiSearchAnyUTF8(FunctionFactory &);
-void registerFunctionMultiSearchAnyCaseInsensitive(FunctionFactory &);
-void registerFunctionMultiSearchAnyCaseInsensitiveUTF8(FunctionFactory &);
-
-void registerFunctionMultiSearchFirstIndex(FunctionFactory &);
-void registerFunctionMultiSearchFirstIndexUTF8(FunctionFactory &);
-void registerFunctionMultiSearchFirstIndexCaseInsensitive(FunctionFactory &);
-void registerFunctionMultiSearchFirstIndexCaseInsensitiveUTF8(FunctionFactory &);
-
-void registerFunctionMultiSearchFirstPosition(FunctionFactory &);
-void registerFunctionMultiSearchFirstPositionUTF8(FunctionFactory &);
-void registerFunctionMultiSearchFirstPositionCaseInsensitive(FunctionFactory &);
-void registerFunctionMultiSearchFirstPositionCaseInsensitiveUTF8(FunctionFactory &);
-
-void registerFunctionMultiSearchAllPositions(FunctionFactory &);
-void registerFunctionMultiSearchAllPositionsUTF8(FunctionFactory &);
-void registerFunctionMultiSearchAllPositionsCaseInsensitive(FunctionFactory &);
-void registerFunctionMultiSearchAllPositionsCaseInsensitiveUTF8(FunctionFactory &);
-
-void registerFunctionHasToken(FunctionFactory &);
-void registerFunctionHasTokenCaseInsensitive(FunctionFactory &);
-
-void registerFunctionCountSubstrings(FunctionFactory &);
-void registerFunctionCountSubstringsCaseInsensitive(FunctionFactory &);
-void registerFunctionCountSubstringsCaseInsensitiveUTF8(FunctionFactory &);
-
-
-void registerFunctionsStringSearch(FunctionFactory & factory)
-{
-    registerFunctionPosition(factory);
-    registerFunctionPositionUTF8(factory);
-    registerFunctionPositionCaseInsensitive(factory);
-    registerFunctionPositionCaseInsensitiveUTF8(factory);
-
-    registerFunctionMultiSearchAny(factory);
-    registerFunctionMultiSearchAnyUTF8(factory);
-    registerFunctionMultiSearchAnyCaseInsensitive(factory);
-    registerFunctionMultiSearchAnyCaseInsensitiveUTF8(factory);
-
-    registerFunctionMultiSearchFirstIndex(factory);
-    registerFunctionMultiSearchFirstIndexUTF8(factory);
-    registerFunctionMultiSearchFirstIndexCaseInsensitive(factory);
-    registerFunctionMultiSearchFirstIndexCaseInsensitiveUTF8(factory);
-
-    registerFunctionMultiSearchFirstPosition(factory);
-    registerFunctionMultiSearchFirstPositionUTF8(factory);
-    registerFunctionMultiSearchFirstPositionCaseInsensitive(factory);
-    registerFunctionMultiSearchFirstPositionCaseInsensitiveUTF8(factory);
-
-    registerFunctionMultiSearchAllPositions(factory);
-    registerFunctionMultiSearchAllPositionsUTF8(factory);
-    registerFunctionMultiSearchAllPositionsCaseInsensitive(factory);
-    registerFunctionMultiSearchAllPositionsCaseInsensitiveUTF8(factory);
-
-    registerFunctionHasToken(factory);
-    registerFunctionHasTokenCaseInsensitive(factory);
-
-    registerFunctionCountSubstrings(factory);
-    registerFunctionCountSubstringsCaseInsensitive(factory);
-    registerFunctionCountSubstringsCaseInsensitiveUTF8(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsTuple.cpp b/src/Functions/registerFunctionsTuple.cpp
deleted file mode 100644
index 33f078675e9..00000000000
--- a/src/Functions/registerFunctionsTuple.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionTuple(FunctionFactory &);
-void registerFunctionTupleElement(FunctionFactory &);
-void registerFunctionTupleToNameValuePairs(FunctionFactory &);
-
-void registerFunctionsTuple(FunctionFactory & factory)
-{
-    registerFunctionTuple(factory);
-    registerFunctionTupleElement(factory);
-    registerFunctionTupleToNameValuePairs(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsUnixTimestamp64.cpp b/src/Functions/registerFunctionsUnixTimestamp64.cpp
deleted file mode 100644
index d7f3a4a4fc2..00000000000
--- a/src/Functions/registerFunctionsUnixTimestamp64.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerToUnixTimestamp64Milli(FunctionFactory &);
-void registerToUnixTimestamp64Micro(FunctionFactory &);
-void registerToUnixTimestamp64Nano(FunctionFactory &);
-
-void registerFromUnixTimestamp64Milli(FunctionFactory &);
-void registerFromUnixTimestamp64Micro(FunctionFactory &);
-void registerFromUnixTimestamp64Nano(FunctionFactory &);
-
-void registerFunctionsUnixTimestamp64(FunctionFactory & factory)
-{
-    registerToUnixTimestamp64Milli(factory);
-    registerToUnixTimestamp64Micro(factory);
-    registerToUnixTimestamp64Nano(factory);
-
-    registerFromUnixTimestamp64Milli(factory);
-    registerFromUnixTimestamp64Micro(factory);
-    registerFromUnixTimestamp64Nano(factory);
-}
-
-}
diff --git a/src/Functions/registerFunctionsVisitParam.cpp b/src/Functions/registerFunctionsVisitParam.cpp
deleted file mode 100644
index 01084594f08..00000000000
--- a/src/Functions/registerFunctionsVisitParam.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionVisitParamHas(FunctionFactory & factory);
-void registerFunctionVisitParamExtractUInt(FunctionFactory & factory);
-void registerFunctionVisitParamExtractInt(FunctionFactory & factory);
-void registerFunctionVisitParamExtractFloat(FunctionFactory & factory);
-void registerFunctionVisitParamExtractBool(FunctionFactory & factory);
-void registerFunctionVisitParamExtractRaw(FunctionFactory & factory);
-void registerFunctionVisitParamExtractString(FunctionFactory & factory);
-
-void registerFunctionsVisitParam(FunctionFactory & factory)
-{
-    registerFunctionVisitParamHas(factory);
-    registerFunctionVisitParamExtractUInt(factory);
-    registerFunctionVisitParamExtractInt(factory);
-    registerFunctionVisitParamExtractFloat(factory);
-    registerFunctionVisitParamExtractBool(factory);
-    registerFunctionVisitParamExtractRaw(factory);
-    registerFunctionVisitParamExtractString(factory);
-}
-
-}
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index a31b41b55f2..8e656863cdb 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -471,7 +471,7 @@ using FunctionReinterpretAsFixedString = FunctionReinterpretAs<DataTypeFixedStri
 
 }
 
-void registerFunctionsReinterpretAs(FunctionFactory & factory)
+REGISTER_FUNCTION(ReinterpretAs)
 {
     factory.registerFunction<FunctionReinterpretAsUInt8>();
     factory.registerFunction<FunctionReinterpretAsUInt16>();
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index 6100b523420..40f33f2b9c4 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -252,7 +252,7 @@ public:
 
 }
 
-void registerFunctionRepeat(FunctionFactory & factory)
+REGISTER_FUNCTION(Repeat)
 {
     factory.registerFunction<FunctionRepeat>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/replaceAll.cpp b/src/Functions/replaceAll.cpp
index cc29e57ea69..7c5cd82ca5d 100644
--- a/src/Functions/replaceAll.cpp
+++ b/src/Functions/replaceAll.cpp
@@ -17,7 +17,7 @@ using FunctionReplaceAll = FunctionStringReplace<ReplaceStringImpl<false>, NameR
 
 }
 
-void registerFunctionReplaceAll(FunctionFactory & factory)
+REGISTER_FUNCTION(ReplaceAll)
 {
     factory.registerFunction<FunctionReplaceAll>();
     factory.registerAlias("replace", NameReplaceAll::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/replaceOne.cpp b/src/Functions/replaceOne.cpp
index d9bcbef0e2d..c0c21dbf51f 100644
--- a/src/Functions/replaceOne.cpp
+++ b/src/Functions/replaceOne.cpp
@@ -17,7 +17,7 @@ using FunctionReplaceOne = FunctionStringReplace<ReplaceStringImpl<true>, NameRe
 
 }
 
-void registerFunctionReplaceOne(FunctionFactory & factory)
+REGISTER_FUNCTION(ReplaceOne)
 {
     factory.registerFunction<FunctionReplaceOne>();
 }
diff --git a/src/Functions/replaceRegexpAll.cpp b/src/Functions/replaceRegexpAll.cpp
index 07ffbdae792..0250b4a5ba6 100644
--- a/src/Functions/replaceRegexpAll.cpp
+++ b/src/Functions/replaceRegexpAll.cpp
@@ -17,7 +17,7 @@ using FunctionReplaceRegexpAll = FunctionStringReplace<ReplaceRegexpImpl<false>,
 
 }
 
-void registerFunctionReplaceRegexpAll(FunctionFactory & factory)
+REGISTER_FUNCTION(ReplaceRegexpAll)
 {
     factory.registerFunction<FunctionReplaceRegexpAll>();
     factory.registerAlias("REGEXP_REPLACE", NameReplaceRegexpAll::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/replaceRegexpOne.cpp b/src/Functions/replaceRegexpOne.cpp
index 9844f77ee26..b40992b73fc 100644
--- a/src/Functions/replaceRegexpOne.cpp
+++ b/src/Functions/replaceRegexpOne.cpp
@@ -17,7 +17,7 @@ using FunctionReplaceRegexpOne = FunctionStringReplace<ReplaceRegexpImpl<true>,
 
 }
 
-void registerFunctionReplaceRegexpOne(FunctionFactory & factory)
+REGISTER_FUNCTION(ReplaceRegexpOne)
 {
     factory.registerFunction<FunctionReplaceRegexpOne>();
 }
diff --git a/src/Functions/replicate.cpp b/src/Functions/replicate.cpp
index 5f6f187031f..f55f89bcac1 100644
--- a/src/Functions/replicate.cpp
+++ b/src/Functions/replicate.cpp
@@ -59,7 +59,7 @@ ColumnPtr FunctionReplicate::executeImpl(const ColumnsWithTypeAndName & argument
     return ColumnArray::create(first_column->replicate(offsets_data)->convertToFullColumnIfConst(), offsets);
 }
 
-void registerFunctionReplicate(FunctionFactory & factory)
+REGISTER_FUNCTION(Replicate)
 {
     factory.registerFunction<FunctionReplicate>();
 }
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 9edd2927706..56397958b10 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -148,7 +148,7 @@ private:
 
 }
 
-void registerFunctionReverse(FunctionFactory & factory)
+REGISTER_FUNCTION(Reverse)
 {
     factory.registerFunction<ReverseOverloadResolver>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/reverseUTF8.cpp b/src/Functions/reverseUTF8.cpp
index b19808c091e..06567f0b325 100644
--- a/src/Functions/reverseUTF8.cpp
+++ b/src/Functions/reverseUTF8.cpp
@@ -76,7 +76,7 @@ using FunctionReverseUTF8 = FunctionStringToString<ReverseUTF8Impl, NameReverseU
 
 }
 
-void registerFunctionReverseUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(ReverseUTF8)
 {
     factory.registerFunction<FunctionReverseUTF8>();
 }
diff --git a/src/Functions/right.cpp b/src/Functions/right.cpp
index ca0df8b2d98..4c26630c9ff 100644
--- a/src/Functions/right.cpp
+++ b/src/Functions/right.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerFunctionRight(FunctionFactory & factory)
+REGISTER_FUNCTION(Right)
 {
     factory.registerFunction<FunctionLeftRight<false, SubstringDirection::Right>>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionLeftRight<true, SubstringDirection::Right>>(FunctionFactory::CaseSensitive);
diff --git a/src/Functions/roundAge.cpp b/src/Functions/roundAge.cpp
index 54e34dc7266..d2503bb6938 100644
--- a/src/Functions/roundAge.cpp
+++ b/src/Functions/roundAge.cpp
@@ -36,7 +36,7 @@ using FunctionRoundAge = FunctionUnaryArithmetic<RoundAgeImpl, NameRoundAge, fal
 
 template <> struct FunctionUnaryArithmeticMonotonicity<NameRoundAge> : PositiveMonotonicity {};
 
-void registerFunctionRoundAge(FunctionFactory & factory)
+REGISTER_FUNCTION(RoundAge)
 {
     factory.registerFunction<FunctionRoundAge>();
 }
diff --git a/src/Functions/roundDuration.cpp b/src/Functions/roundDuration.cpp
index 40018753d5e..62d35ea194d 100644
--- a/src/Functions/roundDuration.cpp
+++ b/src/Functions/roundDuration.cpp
@@ -45,7 +45,7 @@ using FunctionRoundDuration = FunctionUnaryArithmetic<RoundDurationImpl, NameRou
 
 template <> struct FunctionUnaryArithmeticMonotonicity<NameRoundDuration> : PositiveMonotonicity {};
 
-void registerFunctionRoundDuration(FunctionFactory & factory)
+REGISTER_FUNCTION(RoundDuration)
 {
     factory.registerFunction<FunctionRoundDuration>();
 }
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index 846890bc5c8..7893773fb61 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -83,7 +83,7 @@ using FunctionRoundToExp2 = FunctionUnaryArithmetic<RoundToExp2Impl, NameRoundTo
 
 template <> struct FunctionUnaryArithmeticMonotonicity<NameRoundToExp2> : PositiveMonotonicity {};
 
-void registerFunctionRoundToExp2(FunctionFactory & factory)
+REGISTER_FUNCTION(RoundToExp2)
 {
     factory.registerFunction<FunctionRoundToExp2>();
 }
diff --git a/src/Functions/rowNumberInAllBlocks.cpp b/src/Functions/rowNumberInAllBlocks.cpp
index b12fe351553..91da512d221 100644
--- a/src/Functions/rowNumberInAllBlocks.cpp
+++ b/src/Functions/rowNumberInAllBlocks.cpp
@@ -74,7 +74,7 @@ public:
 
 }
 
-void registerFunctionRowNumberInAllBlocks(FunctionFactory & factory)
+REGISTER_FUNCTION(RowNumberInAllBlocks)
 {
     factory.registerFunction<FunctionRowNumberInAllBlocks>();
 }
diff --git a/src/Functions/rowNumberInBlock.cpp b/src/Functions/rowNumberInBlock.cpp
index 89a9124691f..b3f95d27a93 100644
--- a/src/Functions/rowNumberInBlock.cpp
+++ b/src/Functions/rowNumberInBlock.cpp
@@ -62,7 +62,7 @@ public:
 
 }
 
-void registerFunctionRowNumberInBlock(FunctionFactory & factory)
+REGISTER_FUNCTION(RowNumberInBlock)
 {
     factory.registerFunction<FunctionRowNumberInBlock>();
 }
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index ad0cbdb8758..667f722ee92 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -138,7 +138,7 @@ public:
 
 }
 
-void registerFunctionRunningAccumulate(FunctionFactory & factory)
+REGISTER_FUNCTION(RunningAccumulate)
 {
     factory.registerFunction<FunctionRunningAccumulate>();
 }
diff --git a/src/Functions/runningConcurrency.cpp b/src/Functions/runningConcurrency.cpp
index 4d190dd0f79..37fa11bce8f 100644
--- a/src/Functions/runningConcurrency.cpp
+++ b/src/Functions/runningConcurrency.cpp
@@ -220,7 +220,7 @@ namespace DB
         static constexpr auto name = "runningConcurrency";
     };
 
-    void registerFunctionRunningConcurrency(FunctionFactory & factory)
+    REGISTER_FUNCTION(RunningConcurrency)
     {
         factory.registerFunction<RunningConcurrencyOverloadResolver<NameRunningConcurrency, DataTypeUInt32>>();
     }
diff --git a/src/Functions/runningDifference.cpp b/src/Functions/runningDifference.cpp
index 07acaf6522b..dd3baaa82c1 100644
--- a/src/Functions/runningDifference.cpp
+++ b/src/Functions/runningDifference.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionRunningDifference(FunctionFactory & factory)
+REGISTER_FUNCTION(RunningDifference)
 {
     factory.registerFunction<FunctionRunningDifferenceImpl<true>>();
 }
diff --git a/src/Functions/runningDifferenceStartingWithFirstValue.cpp b/src/Functions/runningDifferenceStartingWithFirstValue.cpp
index 4419e413da7..02cb5c3cd4e 100644
--- a/src/Functions/runningDifferenceStartingWithFirstValue.cpp
+++ b/src/Functions/runningDifferenceStartingWithFirstValue.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionRunningDifferenceStartingWithFirstValue(FunctionFactory & factory)
+REGISTER_FUNCTION(RunningDifferenceStartingWithFirstValue)
 {
     factory.registerFunction<FunctionRunningDifferenceImpl<false>>();
 }
diff --git a/src/Functions/s2CapContains.cpp b/src/Functions/s2CapContains.cpp
index 482c4a22c63..f7a31120e0f 100644
--- a/src/Functions/s2CapContains.cpp
+++ b/src/Functions/s2CapContains.cpp
@@ -154,7 +154,7 @@ public:
 
 }
 
-void registerFunctionS2CapContains(FunctionFactory & factory)
+REGISTER_FUNCTION(S2CapContains)
 {
     factory.registerFunction<FunctionS2CapContains>();
 }
diff --git a/src/Functions/s2CapUnion.cpp b/src/Functions/s2CapUnion.cpp
index ea1f2f7534d..da329065553 100644
--- a/src/Functions/s2CapUnion.cpp
+++ b/src/Functions/s2CapUnion.cpp
@@ -169,7 +169,7 @@ public:
 
 }
 
-void registerFunctionS2CapUnion(FunctionFactory & factory)
+REGISTER_FUNCTION(S2CapUnion)
 {
     factory.registerFunction<FunctionS2CapUnion>();
 }
diff --git a/src/Functions/s2CellsIntersect.cpp b/src/Functions/s2CellsIntersect.cpp
index 617910e1a59..51cef79285f 100644
--- a/src/Functions/s2CellsIntersect.cpp
+++ b/src/Functions/s2CellsIntersect.cpp
@@ -115,7 +115,7 @@ public:
 
 }
 
-void registerFunctionS2CellsIntersect(FunctionFactory & factory)
+REGISTER_FUNCTION(S2CellsIntersect)
 {
     factory.registerFunction<FunctionS2CellsIntersect>();
 }
diff --git a/src/Functions/s2GetNeighbors.cpp b/src/Functions/s2GetNeighbors.cpp
index f16e531a645..906a0e01195 100644
--- a/src/Functions/s2GetNeighbors.cpp
+++ b/src/Functions/s2GetNeighbors.cpp
@@ -115,7 +115,7 @@ public:
 
 }
 
-void registerFunctionS2GetNeighbors(FunctionFactory & factory)
+REGISTER_FUNCTION(S2GetNeighbors)
 {
     factory.registerFunction<FunctionS2GetNeighbors>();
 }
diff --git a/src/Functions/s2RectAdd.cpp b/src/Functions/s2RectAdd.cpp
index 44f240588be..fe74f8b2507 100644
--- a/src/Functions/s2RectAdd.cpp
+++ b/src/Functions/s2RectAdd.cpp
@@ -135,7 +135,7 @@ public:
 
 }
 
-void registerFunctionS2RectAdd(FunctionFactory & factory)
+REGISTER_FUNCTION(S2RectAdd)
 {
     factory.registerFunction<FunctionS2RectAdd>();
 }
diff --git a/src/Functions/s2RectContains.cpp b/src/Functions/s2RectContains.cpp
index 84218704ef1..c10a4e5ecae 100644
--- a/src/Functions/s2RectContains.cpp
+++ b/src/Functions/s2RectContains.cpp
@@ -125,7 +125,7 @@ public:
 
 }
 
-void registerFunctionS2RectContains(FunctionFactory & factory)
+REGISTER_FUNCTION(S2RectContains)
 {
     factory.registerFunction<FunctionS2RectContains>();
 }
diff --git a/src/Functions/s2RectIntersection.cpp b/src/Functions/s2RectIntersection.cpp
index 064dad4166d..cf4f7c8aa9d 100644
--- a/src/Functions/s2RectIntersection.cpp
+++ b/src/Functions/s2RectIntersection.cpp
@@ -150,7 +150,7 @@ public:
 
 }
 
-void registerFunctionS2RectIntersection(FunctionFactory & factory)
+REGISTER_FUNCTION(S2RectIntersection)
 {
     factory.registerFunction<FunctionS2RectIntersection>();
 }
diff --git a/src/Functions/s2RectUnion.cpp b/src/Functions/s2RectUnion.cpp
index 91664d3b65f..845dcb982b6 100644
--- a/src/Functions/s2RectUnion.cpp
+++ b/src/Functions/s2RectUnion.cpp
@@ -148,7 +148,7 @@ public:
 
 }
 
-void registerFunctionS2RectUnion(FunctionFactory & factory)
+REGISTER_FUNCTION(S2RectUnion)
 {
     factory.registerFunction<FunctionS2RectUnion>();
 }
diff --git a/src/Functions/s2ToGeo.cpp b/src/Functions/s2ToGeo.cpp
index 082c300536d..63edfc84f97 100644
--- a/src/Functions/s2ToGeo.cpp
+++ b/src/Functions/s2ToGeo.cpp
@@ -113,7 +113,7 @@ public:
 
 }
 
-void registerFunctionS2ToGeo(FunctionFactory & factory)
+REGISTER_FUNCTION(S2ToGeo)
 {
     factory.registerFunction<FunctionS2ToGeo>();
 }
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
index e809ec7c298..2190b16d966 100644
--- a/src/Functions/serverConstants.cpp
+++ b/src/Functions/serverConstants.cpp
@@ -8,9 +8,7 @@
 #include <Common/DateLUT.h>
 #include <Common/ClickHouseRevision.h>
 
-#if defined(OS_LINUX)
-#    include <Poco/Environment.h>
-#endif
+#include <Poco/Environment.h>
 
 #include <Common/config_version.h>
 
@@ -109,7 +107,6 @@ namespace
         static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionZooKeeperSessionUptime>(context); }
     };
 
-#if defined(OS_LINUX)
     class FunctionGetOSKernelVersion : public FunctionConstantBase<FunctionGetOSKernelVersion, String, DataTypeString>
     {
     public:
@@ -117,66 +114,62 @@ namespace
         explicit FunctionGetOSKernelVersion(ContextPtr context) : FunctionConstantBase(Poco::Environment::osName() + " " + Poco::Environment::osVersion(), context->isDistributed()) {}
         static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionGetOSKernelVersion>(context); }
     };
-#endif
 
 }
 
-
-void registerFunctionBuildId([[maybe_unused]] FunctionFactory & factory)
-{
 #if defined(__ELF__) && !defined(OS_FREEBSD)
+REGISTER_FUNCTION(BuildId)
+{
     factory.registerFunction<FunctionBuildId>();
-#endif
 }
+#endif
 
-void registerFunctionHostName(FunctionFactory & factory)
+REGISTER_FUNCTION(HostName)
 {
     factory.registerFunction<FunctionHostName>();
     factory.registerAlias("hostname", "hostName");
 }
 
-void registerFunctionServerUUID(FunctionFactory & factory)
+REGISTER_FUNCTION(ServerUUID)
 {
     factory.registerFunction<FunctionServerUUID>();
 }
 
-void registerFunctionTcpPort(FunctionFactory & factory)
+REGISTER_FUNCTION(TcpPort)
 {
     factory.registerFunction<FunctionTcpPort>();
 }
 
-void registerFunctionTimezone(FunctionFactory & factory)
+REGISTER_FUNCTION(Timezone)
 {
     factory.registerFunction<FunctionTimezone>();
     factory.registerAlias("timeZone", "timezone");
 }
 
-void registerFunctionUptime(FunctionFactory & factory)
+REGISTER_FUNCTION(Uptime)
 {
     factory.registerFunction<FunctionUptime>();
 }
 
-void registerFunctionVersion(FunctionFactory & factory)
+REGISTER_FUNCTION(Version)
 {
     factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
 }
 
-void registerFunctionRevision(FunctionFactory & factory)
+REGISTER_FUNCTION(Revision)
 {
     factory.registerFunction<FunctionRevision>(FunctionFactory::CaseInsensitive);
 }
 
-void registerFunctionZooKeeperSessionUptime(FunctionFactory & factory)
+REGISTER_FUNCTION(ZooKeeperSessionUptime)
 {
     factory.registerFunction<FunctionZooKeeperSessionUptime>();
 }
 
 
-void registerFunctionGetOSKernelVersion([[maybe_unused]] FunctionFactory & factory)
+REGISTER_FUNCTION(GetOSKernelVersion)
 {
-#if defined(OS_LINUX)
     factory.registerFunction<FunctionGetOSKernelVersion>();
-#endif
 }
 
 
diff --git a/src/Functions/sigmoid.cpp b/src/Functions/sigmoid.cpp
index d675413ae67..d121bdc7389 100644
--- a/src/Functions/sigmoid.cpp
+++ b/src/Functions/sigmoid.cpp
@@ -41,7 +41,7 @@ using FunctionSigmoid = FunctionMathUnary<UnaryFunctionVectorized<SigmoidName, s
 
 }
 
-void registerFunctionSigmoid(FunctionFactory & factory)
+REGISTER_FUNCTION(Sigmoid)
 {
     factory.registerFunction<FunctionSigmoid>();
 }
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 5dfe6538b32..ae87ff8e8b6 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -43,7 +43,7 @@ struct FunctionUnaryArithmeticMonotonicity<NameSign>
     }
 };
 
-void registerFunctionSign(FunctionFactory & factory)
+REGISTER_FUNCTION(Sign)
 {
     factory.registerFunction<FunctionSign>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/sin.cpp b/src/Functions/sin.cpp
index 6fd5d189767..536b2635b9a 100644
--- a/src/Functions/sin.cpp
+++ b/src/Functions/sin.cpp
@@ -11,7 +11,7 @@ using FunctionSin = FunctionMathUnary<UnaryFunctionVectorized<SinName, sin>>;
 
 }
 
-void registerFunctionSin(FunctionFactory & factory)
+REGISTER_FUNCTION(Sin)
 {
     factory.registerFunction<FunctionSin>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/sinh.cpp b/src/Functions/sinh.cpp
index 84fe0e805b7..2d83fad36df 100644
--- a/src/Functions/sinh.cpp
+++ b/src/Functions/sinh.cpp
@@ -13,7 +13,7 @@ namespace
 
 }
 
-void registerFunctionSinh(FunctionFactory & factory)
+REGISTER_FUNCTION(Sinh)
 {
     factory.registerFunction<FunctionSinh>();
 }
diff --git a/src/Functions/sleep.cpp b/src/Functions/sleep.cpp
index ad1c6680363..abd1226b8cf 100644
--- a/src/Functions/sleep.cpp
+++ b/src/Functions/sleep.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionSleep(FunctionFactory & factory)
+REGISTER_FUNCTION(Sleep)
 {
     factory.registerFunction<FunctionSleep<FunctionSleepVariant::PerBlock>>();
 }
diff --git a/src/Functions/sleepEachRow.cpp b/src/Functions/sleepEachRow.cpp
index c1c983e850e..595beb15e19 100644
--- a/src/Functions/sleepEachRow.cpp
+++ b/src/Functions/sleepEachRow.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionSleepEachRow(FunctionFactory & factory)
+REGISTER_FUNCTION(SleepEachRow)
 {
     factory.registerFunction<FunctionSleep<FunctionSleepVariant::PerRow>>();
 }
diff --git a/src/Functions/snowflake.cpp b/src/Functions/snowflake.cpp
index 5ac1d229d17..4849d6512ca 100644
--- a/src/Functions/snowflake.cpp
+++ b/src/Functions/snowflake.cpp
@@ -4,27 +4,27 @@
 namespace DB
 {
 
-void registerDateTimeToSnowflake(FunctionFactory & factory)
+REGISTER_FUNCTION(DateTimeToSnowflake)
 {
     factory.registerFunction("dateTimeToSnowflake",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
             std::make_shared<FunctionDateTimeToSnowflake>("dateTimeToSnowflake")); });
 }
 
-void registerDateTime64ToSnowflake(FunctionFactory & factory)
+REGISTER_FUNCTION(DateTime64ToSnowflake)
 {
     factory.registerFunction("dateTime64ToSnowflake",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
             std::make_shared<FunctionDateTime64ToSnowflake>("dateTime64ToSnowflake")); });
 }
 
-void registerSnowflakeToDateTime(FunctionFactory & factory)
+REGISTER_FUNCTION(SnowflakeToDateTime)
 {
     factory.registerFunction("snowflakeToDateTime",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
             std::make_shared<FunctionSnowflakeToDateTime>("snowflakeToDateTime")); });
 }
-void registerSnowflakeToDateTime64(FunctionFactory & factory)
+REGISTER_FUNCTION(SnowflakeToDateTime64)
 {
     factory.registerFunction("snowflakeToDateTime64",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/sqrt.cpp b/src/Functions/sqrt.cpp
index 725da874a51..63c1098d7e7 100644
--- a/src/Functions/sqrt.cpp
+++ b/src/Functions/sqrt.cpp
@@ -11,7 +11,7 @@ using FunctionSqrt = FunctionMathUnary<UnaryFunctionVectorized<SqrtName, sqrt>>;
 
 }
 
-void registerFunctionSqrt(FunctionFactory & factory)
+REGISTER_FUNCTION(Sqrt)
 {
     factory.registerFunction<FunctionSqrt>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/startsWith.cpp b/src/Functions/startsWith.cpp
index 8e9a06cd17c..32f2b08d540 100644
--- a/src/Functions/startsWith.cpp
+++ b/src/Functions/startsWith.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionStartsWith = FunctionStartsEndsWith<NameStartsWith>;
 
-void registerFunctionStartsWith(FunctionFactory & factory)
+REGISTER_FUNCTION(StartsWith)
 {
     factory.registerFunction<FunctionStartsWith>();
 }
diff --git a/src/Functions/stem.cpp b/src/Functions/stem.cpp
index 3da4a7fdd07..25021ed74a4 100644
--- a/src/Functions/stem.cpp
+++ b/src/Functions/stem.cpp
@@ -125,7 +125,7 @@ public:
 
 }
 
-void registerFunctionStem(FunctionFactory & factory)
+REGISTER_FUNCTION(Stem)
 {
     factory.registerFunction<FunctionStem>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/stringCutToZero.cpp b/src/Functions/stringCutToZero.cpp
index baebf67c0e3..caeedaceae7 100644
--- a/src/Functions/stringCutToZero.cpp
+++ b/src/Functions/stringCutToZero.cpp
@@ -148,7 +148,7 @@ public:
 };
 
 
-void registerFunctionToStringCutToZero(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStringCutToZero)
 {
     factory.registerFunction<FunctionToStringCutToZero>();
 }
diff --git a/src/Functions/stringToH3.cpp b/src/Functions/stringToH3.cpp
index db13534b3d2..8a90866e131 100644
--- a/src/Functions/stringToH3.cpp
+++ b/src/Functions/stringToH3.cpp
@@ -100,7 +100,7 @@ private:
 
 }
 
-void registerFunctionStringToH3(FunctionFactory & factory)
+REGISTER_FUNCTION(StringToH3)
 {
     factory.registerFunction<FunctionStringToH3>();
 }
diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index ca94071187a..79b801a9ef6 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -186,7 +186,7 @@ public:
 
 }
 
-void registerFunctionSubstring(FunctionFactory & factory)
+REGISTER_FUNCTION(Substring)
 {
     factory.registerFunction<FunctionSubstring<false>>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("substr", "substring", FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/subtractDays.cpp b/src/Functions/subtractDays.cpp
index 21966a15311..b0060be2dd2 100644
--- a/src/Functions/subtractDays.cpp
+++ b/src/Functions/subtractDays.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractDays = FunctionDateOrDateTimeAddInterval<SubtractDaysImpl>;
 
-void registerFunctionSubtractDays(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractDays)
 {
     factory.registerFunction<FunctionSubtractDays>();
 }
diff --git a/src/Functions/subtractHours.cpp b/src/Functions/subtractHours.cpp
index e71c9d74a01..0c7cd83e8d6 100644
--- a/src/Functions/subtractHours.cpp
+++ b/src/Functions/subtractHours.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractHours = FunctionDateOrDateTimeAddInterval<SubtractHoursImpl>;
 
-void registerFunctionSubtractHours(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractHours)
 {
     factory.registerFunction<FunctionSubtractHours>();
 }
diff --git a/src/Functions/subtractMinutes.cpp b/src/Functions/subtractMinutes.cpp
index ba9d593a64d..562cf2e6fe6 100644
--- a/src/Functions/subtractMinutes.cpp
+++ b/src/Functions/subtractMinutes.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractMinutes = FunctionDateOrDateTimeAddInterval<SubtractMinutesImpl>;
 
-void registerFunctionSubtractMinutes(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractMinutes)
 {
     factory.registerFunction<FunctionSubtractMinutes>();
 }
diff --git a/src/Functions/subtractMonths.cpp b/src/Functions/subtractMonths.cpp
index 64eeba2ce86..b4e34a03861 100644
--- a/src/Functions/subtractMonths.cpp
+++ b/src/Functions/subtractMonths.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractMonths = FunctionDateOrDateTimeAddInterval<SubtractMonthsImpl>;
 
-void registerFunctionSubtractMonths(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractMonths)
 {
     factory.registerFunction<FunctionSubtractMonths>();
 }
diff --git a/src/Functions/subtractQuarters.cpp b/src/Functions/subtractQuarters.cpp
index 6c066ed17a1..295e1ad37e0 100644
--- a/src/Functions/subtractQuarters.cpp
+++ b/src/Functions/subtractQuarters.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractQuarters = FunctionDateOrDateTimeAddInterval<SubtractQuartersImpl>;
 
-void registerFunctionSubtractQuarters(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractQuarters)
 {
     factory.registerFunction<FunctionSubtractQuarters>();
 }
diff --git a/src/Functions/subtractSeconds.cpp b/src/Functions/subtractSeconds.cpp
index 81a7f7e2df1..97358c9b64f 100644
--- a/src/Functions/subtractSeconds.cpp
+++ b/src/Functions/subtractSeconds.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractSeconds = FunctionDateOrDateTimeAddInterval<SubtractSecondsImpl>;
 
-void registerFunctionSubtractSeconds(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractSeconds)
 {
     factory.registerFunction<FunctionSubtractSeconds>();
 }
diff --git a/src/Functions/subtractWeeks.cpp b/src/Functions/subtractWeeks.cpp
index 55b52043dd0..e4a600fee3c 100644
--- a/src/Functions/subtractWeeks.cpp
+++ b/src/Functions/subtractWeeks.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractWeeks = FunctionDateOrDateTimeAddInterval<SubtractWeeksImpl>;
 
-void registerFunctionSubtractWeeks(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractWeeks)
 {
     factory.registerFunction<FunctionSubtractWeeks>();
 }
diff --git a/src/Functions/subtractYears.cpp b/src/Functions/subtractYears.cpp
index 241142722d5..78f4bb3cc28 100644
--- a/src/Functions/subtractYears.cpp
+++ b/src/Functions/subtractYears.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionSubtractYears = FunctionDateOrDateTimeAddInterval<SubtractYearsImpl>;
 
-void registerFunctionSubtractYears(FunctionFactory & factory)
+REGISTER_FUNCTION(SubtractYears)
 {
     factory.registerFunction<FunctionSubtractYears>();
 }
diff --git a/src/Functions/svg.cpp b/src/Functions/svg.cpp
index e1d48ffc061..4cf1598857b 100644
--- a/src/Functions/svg.cpp
+++ b/src/Functions/svg.cpp
@@ -99,7 +99,7 @@ public:
     }
 };
 
-void registerFunctionSvg(FunctionFactory & factory)
+REGISTER_FUNCTION(Svg)
 {
     factory.registerFunction<FunctionSvg>();
     factory.registerAlias("SVG", "svg");
diff --git a/src/Functions/synonyms.cpp b/src/Functions/synonyms.cpp
index 6d879f9d42c..d68f9c76743 100644
--- a/src/Functions/synonyms.cpp
+++ b/src/Functions/synonyms.cpp
@@ -118,7 +118,7 @@ public:
     }
 };
 
-void registerFunctionSynonyms(FunctionFactory & factory)
+REGISTER_FUNCTION(Synonyms)
 {
     factory.registerFunction<FunctionSynonyms>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/tan.cpp b/src/Functions/tan.cpp
index db63ab13984..7d84055d0c3 100644
--- a/src/Functions/tan.cpp
+++ b/src/Functions/tan.cpp
@@ -11,7 +11,7 @@ using FunctionTan = FunctionMathUnary<UnaryFunctionVectorized<TanName, tan>>;
 
 }
 
-void registerFunctionTan(FunctionFactory & factory)
+REGISTER_FUNCTION(Tan)
 {
     factory.registerFunction<FunctionTan>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/tanh.cpp b/src/Functions/tanh.cpp
index 6fc1d2f79e5..9461c2a5811 100644
--- a/src/Functions/tanh.cpp
+++ b/src/Functions/tanh.cpp
@@ -37,7 +37,7 @@ using FunctionTanh = FunctionMathUnary<UnaryFunctionVectorized<TanhName, tanh>>;
 
 }
 
-void registerFunctionTanh(FunctionFactory & factory)
+REGISTER_FUNCTION(Tanh)
 {
     factory.registerFunction<FunctionTanh>(FunctionFactory::CaseInsensitive);
 }
diff --git a/src/Functions/tgamma.cpp b/src/Functions/tgamma.cpp
index 3378d44388d..c1fb235efcd 100644
--- a/src/Functions/tgamma.cpp
+++ b/src/Functions/tgamma.cpp
@@ -11,7 +11,7 @@ using FunctionTGamma = FunctionMathUnary<UnaryFunctionVectorized<TGammaName, std
 
 }
 
-void registerFunctionTGamma(FunctionFactory & factory)
+REGISTER_FUNCTION(TGamma)
 {
     factory.registerFunction<FunctionTGamma>();
 }
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index 32afa8b4702..692faf1883c 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -4,9 +4,10 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnsCommon.h>
+#include <Common/ErrorCodes.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <IO/WriteHelpers.h>
-
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -21,55 +22,56 @@ namespace ErrorCodes
 namespace
 {
 
+/// The regex-based code style check script in CI complains when it sees "ErrorCodes:: ErrorCode" (space added to avoid another match).
+/// Because this expression is only used in this file, don't add some suppression mechanism to the already complex style checker, instead
+/// work around by creating a namespace alias.
+namespace ErrorCodeAlias = ErrorCodes;
+
 /// Throw an exception if the argument is non zero.
 class FunctionThrowIf : public IFunction
 {
 public:
     static constexpr auto name = "throwIf";
-    static FunctionPtr create(ContextPtr)
-    {
-        return std::make_shared<FunctionThrowIf>();
-    }
 
-    String getName() const override
-    {
-        return name;
-    }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionThrowIf>(context); }
 
+    explicit FunctionThrowIf(ContextPtr context_) : allow_custom_error_code_argument(context_->getSettingsRef().allow_custom_error_code_in_throwif) {}
+    String getName() const override { return name; }
     bool isVariadic() const override { return true; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
+    size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const size_t number_of_arguments = arguments.size();
 
-        if (number_of_arguments < 1 || number_of_arguments > 2)
+        if (number_of_arguments < 1 || number_of_arguments > (allow_custom_error_code_argument ? 3 : 2))
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Number of arguments for function {} doesn't match: passed {}, should be 1 or 2",
-                getName(),
-                toString(number_of_arguments));
+                "Number of arguments for function {} doesn't match: passed {}, should be {}",
+                getName(), toString(number_of_arguments), allow_custom_error_code_argument ? "1 or 2 or 3" : "1 or 2");
 
         if (!isNativeNumber(arguments[0]))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Argument for function {} must be number",
-                getName());
+                "First argument of function {} must be a number (passed: {})", getName(), arguments[0]->getName());
 
         if (number_of_arguments > 1 && !isString(arguments[1]))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of argument of function {}",
-                arguments[1]->getName(),
-                getName());
+                "Second argument of function {} must be a string (passed: {})", getName(), arguments[1]->getName());
+
+        if (allow_custom_error_code_argument && number_of_arguments > 2)
+        {
+            WhichDataType which(arguments[2]);
+            if (!(which.isInt8() || which.isInt16() || which.isInt32()))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Third argument of function {} must be Int8, Int16 or Int32 (passed: {})", getName(), arguments[2]->getName());
+        }
 
 
         return std::make_shared<DataTypeUInt8>();
     }
 
     bool useDefaultImplementationForConstants() const override { return false; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
     /** Prevent constant folding for FunctionThrowIf because for short circuit evaluation
       * it is unsafe to evaluate this function during DAG analysis.
@@ -86,36 +88,44 @@ public:
         {
             const auto * message_column = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
             if (!message_column)
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                    "Second argument for function {} must be constant String",
-                    getName());
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument for function {} must be constant String", getName());
 
             custom_message = message_column->getValue<String>();
         }
 
+        std::optional<ErrorCodeAlias::ErrorCode> custom_error_code;
+        if (allow_custom_error_code_argument && arguments.size() == 3)
+        {
+            if (!isColumnConst(*(arguments[2].column)))
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Third argument for function {} must be constant number", getName());
+
+            custom_error_code = arguments[2].column->getInt(0);
+        }
+
         auto first_argument_column = arguments.front().column;
         const auto * in = first_argument_column.get();
 
         ColumnPtr res;
-        if (!((res = execute<UInt8>(in, custom_message))
-            || (res = execute<UInt16>(in, custom_message))
-            || (res = execute<UInt32>(in, custom_message))
-            || (res = execute<UInt64>(in, custom_message))
-            || (res = execute<Int8>(in, custom_message))
-            || (res = execute<Int16>(in, custom_message))
-            || (res = execute<Int32>(in, custom_message))
-            || (res = execute<Int64>(in, custom_message))
-            || (res = execute<Float32>(in, custom_message))
-            || (res = execute<Float64>(in, custom_message))))
+        if (!((res = execute<UInt8>(in, custom_message, custom_error_code))
+            || (res = execute<UInt16>(in, custom_message, custom_error_code))
+            || (res = execute<UInt32>(in, custom_message, custom_error_code))
+            || (res = execute<UInt64>(in, custom_message, custom_error_code))
+            || (res = execute<Int8>(in, custom_message, custom_error_code))
+            || (res = execute<Int16>(in, custom_message, custom_error_code))
+            || (res = execute<Int32>(in, custom_message, custom_error_code))
+            || (res = execute<Int64>(in, custom_message, custom_error_code))
+            || (res = execute<Float32>(in, custom_message, custom_error_code))
+            || (res = execute<Float64>(in, custom_message, custom_error_code))))
         {
-            throw Exception{"Illegal column " + in->getName() + " of first argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}", in->getName(), getName());
         }
 
         return res;
     }
 
+private:
     template <typename T>
-    ColumnPtr execute(const IColumn * in_untyped, const std::optional<String> & message) const
+    ColumnPtr execute(const IColumn * in_untyped, const std::optional<String> & message, const std::optional<ErrorCodeAlias::ErrorCode> & error_code) const
     {
         const auto * in = checkAndGetColumn<ColumnVector<T>>(in_untyped);
 
@@ -127,8 +137,9 @@ public:
             const auto & in_data = in->getData();
             if (!memoryIsZero(in_data.data(), 0, in_data.size() * sizeof(in_data[0])))
             {
-                throw Exception(ErrorCodes::FUNCTION_THROW_IF_VALUE_IS_NON_ZERO,
-                    message.value_or("Value passed to '" + getName() + "' function is non zero"));
+                throw Exception(
+                    error_code.value_or(ErrorCodes::FUNCTION_THROW_IF_VALUE_IS_NON_ZERO),
+                    message.value_or("Value passed to '" + getName() + "' function is non-zero"));
             }
 
             size_t result_size = in_untyped->size();
@@ -139,11 +150,13 @@ public:
 
         return nullptr;
     }
+
+    bool allow_custom_error_code_argument;
 };
 
 }
 
-void registerFunctionThrowIf(FunctionFactory & factory)
+REGISTER_FUNCTION(ThrowIf)
 {
     factory.registerFunction<FunctionThrowIf>();
 }
diff --git a/src/Functions/tid.cpp b/src/Functions/tid.cpp
index ec767e8ec84..1789c9ba7d4 100644
--- a/src/Functions/tid.cpp
+++ b/src/Functions/tid.cpp
@@ -32,7 +32,7 @@ namespace
 
 }
 
-void registerFunctionTid(FunctionFactory & factory)
+REGISTER_FUNCTION(Tid)
 {
     factory.registerFunction<FunctionTid>();
 }
diff --git a/src/Functions/timeSlot.cpp b/src/Functions/timeSlot.cpp
index afe99c86eb2..697d2234db2 100644
--- a/src/Functions/timeSlot.cpp
+++ b/src/Functions/timeSlot.cpp
@@ -10,7 +10,7 @@ namespace DB
 
 using FunctionTimeSlot = FunctionDateOrDateTimeToSomething<DataTypeDateTime, TimeSlotImpl>;
 
-void registerFunctionTimeSlot(FunctionFactory & factory)
+REGISTER_FUNCTION(TimeSlot)
 {
     factory.registerFunction<FunctionTimeSlot>();
 }
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index a19ccf62565..949ca7bc0e4 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -1,6 +1,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnsNumber.h>
 
@@ -23,9 +24,9 @@ namespace ErrorCodes
 namespace
 {
 
-/** timeSlots(StartTime, Duration)
+/** timeSlots(StartTime, Duration[, Size=1800])
   * - for the time interval beginning at `StartTime` and continuing `Duration` seconds,
-  *   returns an array of time points, consisting of rounding down to half an hour (default; or another value) of points from this interval.
+  *   returns an array of time points, consisting of rounding down to Size (1800 seconds by default) of points from this interval.
   *  For example, timeSlots(toDateTime('2012-01-01 12:20:00'), 600) = [toDateTime('2012-01-01 12:00:00'), toDateTime('2012-01-01 12:30:00')].
   *  This is necessary to search for hits that are part of the corresponding visit.
   *
@@ -33,11 +34,11 @@ namespace
   * But this function was adopted by wider audience.
   */
 
-template <typename DurationType>
 struct TimeSlotsImpl
 {
+    /// The following three methods process DateTime type
     static void vectorVector(
-        const PaddedPODArray<UInt32> & starts, const PaddedPODArray<DurationType> & durations, UInt32 time_slot_size,
+        const PaddedPODArray<UInt32> & starts, const PaddedPODArray<UInt32> & durations, UInt32 time_slot_size,
         PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
         size_t size = starts.size();
@@ -59,7 +60,7 @@ struct TimeSlotsImpl
     }
 
     static void vectorConstant(
-        const PaddedPODArray<UInt32> & starts, DurationType duration, UInt32 time_slot_size,
+        const PaddedPODArray<UInt32> & starts, UInt32 duration, UInt32 time_slot_size,
         PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
         size_t size = starts.size();
@@ -81,7 +82,7 @@ struct TimeSlotsImpl
     }
 
     static void constantVector(
-        UInt32 start, const PaddedPODArray<DurationType> & durations, UInt32 time_slot_size,
+        UInt32 start, const PaddedPODArray<UInt32> & durations, UInt32 time_slot_size,
         PaddedPODArray<UInt32> & result_values, ColumnArray::Offsets & result_offsets)
     {
         size_t size = durations.size();
@@ -101,6 +102,99 @@ struct TimeSlotsImpl
             result_offsets[i] = current_offset;
         }
     }
+    /*
+    The following three methods process DateTime64 type
+    NO_SANITIZE_UNDEFINED is put here because user shall be careful when working with Decimal
+    Adjusting different scales can cause overflow -- it is OK for us. Don't use scales that differ a lot :)
+    */
+    static NO_SANITIZE_UNDEFINED void vectorVector(
+        const PaddedPODArray<DateTime64> & starts, const PaddedPODArray<Decimal64> & durations, Decimal64 time_slot_size,
+        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale)
+    {
+        size_t size = starts.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
+
+        /// Modify all units to have same scale
+        UInt16 max_scale = std::max({dt_scale, duration_scale, time_slot_scale});
+
+        Int64 dt_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - dt_scale);
+        Int64 dur_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - duration_scale);
+        Int64 ts_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - time_slot_scale);
+
+        ColumnArray::Offset current_offset = 0;
+        time_slot_size = time_slot_size.value * ts_multiplier;
+        for (size_t i = 0; i < size; ++i)
+        {
+            for (DateTime64 value = (starts[i] * dt_multiplier) / time_slot_size, end = (starts[i] * dt_multiplier + durations[i] * dur_multiplier) / time_slot_size; value <= end; value += 1)
+            {
+                result_values.push_back(value * time_slot_size);
+                ++current_offset;
+            }
+            result_offsets[i] = current_offset;
+        }
+    }
+
+    static NO_SANITIZE_UNDEFINED void vectorConstant(
+        const PaddedPODArray<DateTime64> & starts, Decimal64 duration, Decimal64 time_slot_size,
+        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale)
+    {
+        size_t size = starts.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
+
+        /// Modify all units to have same scale
+        UInt16 max_scale = std::max({dt_scale, duration_scale, time_slot_scale});
+
+        Int64 dt_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - dt_scale);
+        Int64 dur_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - duration_scale);
+        Int64 ts_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - time_slot_scale);
+
+        ColumnArray::Offset current_offset = 0;
+        duration = duration * dur_multiplier;
+        time_slot_size = time_slot_size.value * ts_multiplier;
+        for (size_t i = 0; i < size; ++i)
+        {
+            for (DateTime64 value = (starts[i] * dt_multiplier) / time_slot_size, end = (starts[i] * dt_multiplier + duration) / time_slot_size; value <= end; value += 1)
+            {
+                result_values.push_back(value * time_slot_size);
+                ++current_offset;
+            }
+            result_offsets[i] = current_offset;
+        }
+    }
+
+    static NO_SANITIZE_UNDEFINED void constantVector(
+        DateTime64 start, const PaddedPODArray<Decimal64> & durations, Decimal64 time_slot_size,
+        PaddedPODArray<DateTime64> & result_values, ColumnArray::Offsets & result_offsets, UInt16 dt_scale, UInt16 duration_scale, UInt16 time_slot_scale)
+    {
+        size_t size = durations.size();
+
+        result_offsets.resize(size);
+        result_values.reserve(size);
+
+        /// Modify all units to have same scale
+        UInt16 max_scale = std::max({dt_scale, duration_scale, time_slot_scale});
+
+        Int64 dt_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - dt_scale);
+        Int64 dur_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - duration_scale);
+        Int64 ts_multiplier = DecimalUtils::scaleMultiplier<DateTime64>(max_scale - time_slot_scale);
+
+        ColumnArray::Offset current_offset = 0;
+        start = dt_multiplier * start;
+        time_slot_size = time_slot_size.value * ts_multiplier;
+        for (size_t i = 0; i < size; ++i)
+        {
+            for (DateTime64 value = start / time_slot_size, end = (start + durations[i] * dur_multiplier) / time_slot_size; value <= end; value += 1)
+            {
+                result_values.push_back(value * time_slot_size);
+                ++current_offset;
+            }
+            result_offsets[i] = current_offset;
+        }
+    }
 };
 
 
@@ -108,7 +202,6 @@ class FunctionTimeSlots : public IFunction
 {
 public:
     static constexpr auto name = "timeSlots";
-    static constexpr UInt32 TIME_SLOT_SIZE = 1800;
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTimeSlots>(); }
 
     String getName() const override
@@ -129,73 +222,160 @@ public:
                             + toString(arguments.size()) + ", should be 2 or 3",
                             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        if (!WhichDataType(arguments[0].type).isDateTime())
-            throw Exception("Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName() + ". Must be DateTime.",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        if (WhichDataType(arguments[0].type).isDateTime())
+        {
+            if (!WhichDataType(arguments[1].type).isUInt32())
+                throw Exception(
+                    "Illegal type " + arguments[1].type->getName() + " of second argument of function " + getName() + ". Must be UInt32 when first argument is DateTime.",
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (!WhichDataType(arguments[1].type).isUInt32())
-            throw Exception("Illegal type " + arguments[1].type->getName() + " of second argument of function " + getName() + ". Must be UInt32.",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            if (arguments.size() == 3 && !WhichDataType(arguments[2].type).isNativeUInt())
+                throw Exception(
+                    "Illegal type " + arguments[2].type->getName() + " of third argument of function " + getName() + ". Must be UInt32 when first argument is DateTime.",
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+        else if (WhichDataType(arguments[0].type).isDateTime64())
+        {
+            if (!WhichDataType(arguments[1].type).isDecimal64())
+                throw Exception(
+                    "Illegal type " + arguments[1].type->getName() + " of second argument of function " + getName() + ". Must be Decimal64 when first argument is DateTime64.",
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (arguments.size() == 3 && !WhichDataType(arguments[2].type).isNativeUInt())
-            throw Exception("Illegal type " + arguments[2].type->getName() + " of third argument of function " + getName() + ". Must be UInt32.",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            if (arguments.size() == 3 && !WhichDataType(arguments[2].type).isDecimal64())
+                throw Exception(
+                    "Illegal type " + arguments[2].type->getName() + " of third argument of function " + getName() + ". Must be Decimal64 when first argument is DateTime64.",
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+        else
+            throw Exception("Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
+                                + ". Must be DateTime or DateTime64.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         /// If time zone is specified for source data type, attach it to the resulting type.
         /// Note that there is no explicit time zone argument for this function (we specify 2 as an argument number with explicit time zone).
-        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 3, 0)));
+        if (WhichDataType(arguments[0].type).isDateTime())
+        {
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 3, 0)));
+        }
+        else
+        {
+            auto start_time_scale = assert_cast<const DataTypeDateTime64 &>(*arguments[0].type).getScale();
+            auto duration_scale = assert_cast<const DataTypeDecimal64 &>(*arguments[1].type).getScale();
+            return std::make_shared<DataTypeArray>(
+                std::make_shared<DataTypeDateTime64>(std::max(start_time_scale, duration_scale), extractTimeZoneNameFromFunctionArguments(arguments, 3, 0)));
+        }
+
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
-        const auto * starts = checkAndGetColumn<ColumnUInt32>(arguments[0].column.get());
-        const auto * const_starts = checkAndGetColumnConst<ColumnUInt32>(arguments[0].column.get());
+        if (WhichDataType(arguments[0].type).isDateTime())
+        {
+            UInt32 time_slot_size = 1800;
+            if (arguments.size() == 3)
+            {
+                const auto * time_slot_column = checkAndGetColumn<ColumnConst>(arguments[2].column.get());
+                if (!time_slot_column)
+                    throw Exception("Third argument for function " + getName() + " must be constant UInt32", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        const auto * durations = checkAndGetColumn<ColumnUInt32>(arguments[1].column.get());
-        const auto * const_durations = checkAndGetColumnConst<ColumnUInt32>(arguments[1].column.get());
+                if (time_slot_size = time_slot_column->getValue<UInt32>(); time_slot_size <= 0)
+                    throw Exception("Third argument for function " + getName() + " must be greater than zero", ErrorCodes::ILLEGAL_COLUMN);
+            }
 
-        auto res = ColumnArray::create(ColumnUInt32::create());
-        ColumnUInt32::Container & res_values = typeid_cast<ColumnUInt32 &>(res->getData()).getData();
+            const auto * dt_starts = checkAndGetColumn<ColumnUInt32>(arguments[0].column.get());
+            const auto * dt_const_starts = checkAndGetColumnConst<ColumnUInt32>(arguments[0].column.get());
 
-        auto time_slot_size = TIME_SLOT_SIZE;
+            const auto * durations = checkAndGetColumn<ColumnUInt32>(arguments[1].column.get());
+            const auto * const_durations = checkAndGetColumnConst<ColumnUInt32>(arguments[1].column.get());
+
+            auto res = ColumnArray::create(ColumnUInt32::create());
+            ColumnUInt32::Container & res_values = typeid_cast<ColumnUInt32 &>(res->getData()).getData();
+
+            if (dt_starts && durations)
+            {
+                TimeSlotsImpl::vectorVector(dt_starts->getData(), durations->getData(), time_slot_size, res_values, res->getOffsets());
+                return res;
+            }
+            else if (dt_starts && const_durations)
+            {
+                TimeSlotsImpl::vectorConstant(dt_starts->getData(), const_durations->getValue<UInt32>(), time_slot_size, res_values, res->getOffsets());
+                return res;
+            }
+            else if (dt_const_starts && durations)
+            {
+                TimeSlotsImpl::constantVector(dt_const_starts->getValue<UInt32>(), durations->getData(), time_slot_size, res_values, res->getOffsets());
+                return res;
+            }
+        }
+        else
+        {
+            assert(WhichDataType(arguments[0].type).isDateTime64());
+            Decimal64 time_slot_size = Decimal64(1800);
+            UInt16 time_slot_scale = 0;
+            if (arguments.size() == 3)
+            {
+                const auto * time_slot_column = checkAndGetColumn<ColumnConst>(arguments[2].column.get());
+                if (!time_slot_column)
+                    throw Exception("Third argument for function " + getName() + " must be constant Decimal64", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+                if (time_slot_size = time_slot_column->getValue<Decimal64>(); time_slot_size <= 0)
+                    throw Exception("Third argument for function " + getName() + " must be greater than zero", ErrorCodes::ILLEGAL_COLUMN);
+                time_slot_scale = assert_cast<const DataTypeDecimal64 *>(arguments[2].type.get())->getScale();
+            }
+
+            const auto * starts = checkAndGetColumn<DataTypeDateTime64::ColumnType>(arguments[0].column.get());
+            const auto * const_starts = checkAndGetColumnConst<DataTypeDateTime64::ColumnType>(arguments[0].column.get());
+
+            const auto * durations = checkAndGetColumn<ColumnDecimal<Decimal64>>(arguments[1].column.get());
+            const auto * const_durations = checkAndGetColumnConst<ColumnDecimal<Decimal64>>(arguments[1].column.get());
+
+            const auto start_time_scale = assert_cast<const DataTypeDateTime64 *>(arguments[0].type.get())->getScale();
+            const auto duration_scale = assert_cast<const DataTypeDecimal64 *>(arguments[1].type.get())->getScale();
+
+            auto res = ColumnArray::create(DataTypeDateTime64(start_time_scale).createColumn());
+            DataTypeDateTime64::ColumnType::Container & res_values = typeid_cast<DataTypeDateTime64::ColumnType &>(res->getData()).getData();
+
+            if (starts && durations)
+            {
+                TimeSlotsImpl::vectorVector(starts->getData(), durations->getData(), time_slot_size, res_values, res->getOffsets(),
+                    start_time_scale, duration_scale, time_slot_scale);
+                return res;
+            }
+            else if (starts && const_durations)
+            {
+                TimeSlotsImpl::vectorConstant(
+                    starts->getData(), const_durations->getValue<Decimal64>(), time_slot_size, res_values, res->getOffsets(),
+                    start_time_scale, duration_scale, time_slot_scale);
+                return res;
+            }
+            else if (const_starts && durations)
+            {
+                TimeSlotsImpl::constantVector(
+                    const_starts->getValue<DateTime64>(), durations->getData(), time_slot_size, res_values, res->getOffsets(),
+                    start_time_scale, duration_scale, time_slot_scale);
+                return res;
+            }
+        }
 
         if (arguments.size() == 3)
         {
-            const auto * time_slot_column = checkAndGetColumn<ColumnConst>(arguments[2].column.get());
-            if (!time_slot_column)
-                throw Exception("Third argument for function " + getName() + " must be constant UInt32", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-            if (time_slot_size = time_slot_column->getValue<UInt32>(); time_slot_size == 0)
-                throw Exception("Third argument for function " + getName() + " must be greater than zero", ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        if (starts && durations)
-        {
-            TimeSlotsImpl<UInt32>::vectorVector(starts->getData(), durations->getData(), time_slot_size, res_values, res->getOffsets());
-            return res;
-        }
-        else if (starts && const_durations)
-        {
-            TimeSlotsImpl<UInt32>::vectorConstant(starts->getData(), const_durations->getValue<UInt32>(), time_slot_size, res_values, res->getOffsets());
-            return res;
-        }
-        else if (const_starts && durations)
-        {
-            TimeSlotsImpl<UInt32>::constantVector(const_starts->getValue<UInt32>(), durations->getData(), time_slot_size, res_values, res->getOffsets());
-            return res;
+            throw Exception(
+                "Illegal columns " + arguments[0].column->getName() + ", " + arguments[1].column->getName() + ", "
+                    + arguments[2].column->getName() + " of arguments of function " + getName(),
+                ErrorCodes::ILLEGAL_COLUMN);
         }
         else
-            throw Exception("Illegal columns " + arguments[0].column->getName()
-                    + ", " + arguments[1].column->getName()
-                    + ", " + arguments[2].column->getName()
+        {
+            throw Exception(
+                "Illegal columns " + arguments[0].column->getName() + ", " + arguments[1].column->getName()
                     + " of arguments of function " + getName(),
                 ErrorCodes::ILLEGAL_COLUMN);
+        }
     }
 };
 
 }
 
-void registerFunctionTimeSlots(FunctionFactory & factory)
+REGISTER_FUNCTION(TimeSlots)
 {
     factory.registerFunction<FunctionTimeSlots>();
 }
diff --git a/src/Functions/timezoneOf.cpp b/src/Functions/timezoneOf.cpp
index 97e025bc0e0..6454b1cd735 100644
--- a/src/Functions/timezoneOf.cpp
+++ b/src/Functions/timezoneOf.cpp
@@ -67,7 +67,7 @@ public:
 
 }
 
-void registerFunctionTimezoneOf(FunctionFactory & factory)
+REGISTER_FUNCTION(TimezoneOf)
 {
     factory.registerFunction<FunctionTimezoneOf>();
     factory.registerAlias("timeZoneOf", "timezoneOf");
diff --git a/src/Functions/timezoneOffset.cpp b/src/Functions/timezoneOffset.cpp
index 296603ce0a4..cc1945d23f9 100644
--- a/src/Functions/timezoneOffset.cpp
+++ b/src/Functions/timezoneOffset.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctiontimezoneOffset = FunctionDateOrDateTimeToSomething<DataTypeInt32, TimezoneOffsetImpl>;
 
-void registerFunctiontimezoneOffset(FunctionFactory & factory)
+REGISTER_FUNCTION(timezoneOffset)
 {
     factory.registerFunction<FunctiontimezoneOffset>();
     factory.registerAlias("timeZoneOffset", "timezoneOffset");
diff --git a/src/Functions/toBool.cpp b/src/Functions/toBool.cpp
index 7f167744f01..765da0c3206 100644
--- a/src/Functions/toBool.cpp
+++ b/src/Functions/toBool.cpp
@@ -56,7 +56,7 @@ namespace
 
 }
 
-void registerFunctionToBool(FunctionFactory & factory)
+REGISTER_FUNCTION(ToBool)
 {
     factory.registerFunction<FunctionToBool>();
 }
diff --git a/src/Functions/toColumnTypeName.cpp b/src/Functions/toColumnTypeName.cpp
index d8013f13340..89a44b2aeef 100644
--- a/src/Functions/toColumnTypeName.cpp
+++ b/src/Functions/toColumnTypeName.cpp
@@ -55,7 +55,7 @@ public:
 
 }
 
-void registerFunctionToColumnTypeName(FunctionFactory & factory)
+REGISTER_FUNCTION(ToColumnTypeName)
 {
     factory.registerFunction<FunctionToColumnTypeName>();
 }
diff --git a/src/Functions/toCustomWeek.cpp b/src/Functions/toCustomWeek.cpp
index 5ba0b8e8b2a..13dc76b6389 100644
--- a/src/Functions/toCustomWeek.cpp
+++ b/src/Functions/toCustomWeek.cpp
@@ -11,7 +11,7 @@ using FunctionToWeek = FunctionCustomWeekToSomething<DataTypeUInt8, ToWeekImpl>;
 using FunctionToYearWeek = FunctionCustomWeekToSomething<DataTypeUInt32, ToYearWeekImpl>;
 using FunctionToStartOfWeek = FunctionCustomWeekToSomething<DataTypeDate, ToStartOfWeekImpl>;
 
-void registerFunctionToCustomWeek(FunctionFactory & factory)
+REGISTER_FUNCTION(ToCustomWeek)
 {
     factory.registerFunction<FunctionToWeek>();
     factory.registerFunction<FunctionToYearWeek>();
diff --git a/src/Functions/toDayOfMonth.cpp b/src/Functions/toDayOfMonth.cpp
index ad397a15276..c5ed4629258 100644
--- a/src/Functions/toDayOfMonth.cpp
+++ b/src/Functions/toDayOfMonth.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToDayOfMonth = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToDayOfMonthImpl>;
 
-void registerFunctionToDayOfMonth(FunctionFactory & factory)
+REGISTER_FUNCTION(ToDayOfMonth)
 {
     factory.registerFunction<FunctionToDayOfMonth>();
 
diff --git a/src/Functions/toDayOfWeek.cpp b/src/Functions/toDayOfWeek.cpp
index 9b2bb055eca..2c04e30a607 100644
--- a/src/Functions/toDayOfWeek.cpp
+++ b/src/Functions/toDayOfWeek.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToDayOfWeek = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToDayOfWeekImpl>;
 
-void registerFunctionToDayOfWeek(FunctionFactory & factory)
+REGISTER_FUNCTION(ToDayOfWeek)
 {
     factory.registerFunction<FunctionToDayOfWeek>();
 
diff --git a/src/Functions/toDayOfYear.cpp b/src/Functions/toDayOfYear.cpp
index 510e3253f87..ac289e3a757 100644
--- a/src/Functions/toDayOfYear.cpp
+++ b/src/Functions/toDayOfYear.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToDayOfYear = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToDayOfYearImpl>;
 
-void registerFunctionToDayOfYear(FunctionFactory & factory)
+REGISTER_FUNCTION(ToDayOfYear)
 {
     factory.registerFunction<FunctionToDayOfYear>();
 
diff --git a/src/Functions/toFixedString.cpp b/src/Functions/toFixedString.cpp
index cfc357a055a..1299288b87e 100644
--- a/src/Functions/toFixedString.cpp
+++ b/src/Functions/toFixedString.cpp
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-void registerFunctionFixedString(FunctionFactory & factory)
+REGISTER_FUNCTION(FixedString)
 {
     factory.registerFunction<FunctionToFixedString>();
 }
diff --git a/src/Functions/toHour.cpp b/src/Functions/toHour.cpp
index 72709f990b0..172515aad58 100644
--- a/src/Functions/toHour.cpp
+++ b/src/Functions/toHour.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToHour = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToHourImpl>;
 
-void registerFunctionToHour(FunctionFactory & factory)
+REGISTER_FUNCTION(ToHour)
 {
     factory.registerFunction<FunctionToHour>();
 
diff --git a/src/Functions/toISOWeek.cpp b/src/Functions/toISOWeek.cpp
index 9cdee8b7a94..240c0c2bad4 100644
--- a/src/Functions/toISOWeek.cpp
+++ b/src/Functions/toISOWeek.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToISOWeek = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToISOWeekImpl>;
 
-void registerFunctionToISOWeek(FunctionFactory & factory)
+REGISTER_FUNCTION(ToISOWeek)
 {
     factory.registerFunction<FunctionToISOWeek>();
 }
diff --git a/src/Functions/toISOYear.cpp b/src/Functions/toISOYear.cpp
index 200ce7aa97e..9d88d154cf3 100644
--- a/src/Functions/toISOYear.cpp
+++ b/src/Functions/toISOYear.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToISOYear = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToISOYearImpl>;
 
-void registerFunctionToISOYear(FunctionFactory & factory)
+REGISTER_FUNCTION(ToISOYear)
 {
     factory.registerFunction<FunctionToISOYear>();
 }
diff --git a/src/Functions/toJSONString.cpp b/src/Functions/toJSONString.cpp
index 0ec13e019f7..de82d7cb50a 100644
--- a/src/Functions/toJSONString.cpp
+++ b/src/Functions/toJSONString.cpp
@@ -55,7 +55,7 @@ namespace
     };
 }
 
-void registerFunctionToJSONString(FunctionFactory & factory)
+REGISTER_FUNCTION(ToJSONString)
 {
     factory.registerFunction<FunctionToJSONString>();
 }
diff --git a/src/Functions/toLastDayOfMonth.cpp b/src/Functions/toLastDayOfMonth.cpp
index 7a15ede4e96..38d42521f00 100644
--- a/src/Functions/toLastDayOfMonth.cpp
+++ b/src/Functions/toLastDayOfMonth.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToLastDayOfMonth = FunctionDateOrDateTimeToSomething<DataTypeDate, ToLastDayOfMonthImpl>;
 
-void registerFunctionToLastDayOfMonth(FunctionFactory & factory)
+REGISTER_FUNCTION(ToLastDayOfMonth)
 {
     factory.registerFunction<FunctionToLastDayOfMonth>();
 
diff --git a/src/Functions/toLowCardinality.cpp b/src/Functions/toLowCardinality.cpp
index eff01b144d9..9b050d47a90 100644
--- a/src/Functions/toLowCardinality.cpp
+++ b/src/Functions/toLowCardinality.cpp
@@ -50,7 +50,7 @@ public:
 
 }
 
-void registerFunctionToLowCardinality(FunctionFactory & factory)
+REGISTER_FUNCTION(ToLowCardinality)
 {
     factory.registerFunction<FunctionToLowCardinality>();
 }
diff --git a/src/Functions/toMinute.cpp b/src/Functions/toMinute.cpp
index 27a79bb0e53..c84b0876a24 100644
--- a/src/Functions/toMinute.cpp
+++ b/src/Functions/toMinute.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToMinute = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToMinuteImpl>;
 
-void registerFunctionToMinute(FunctionFactory & factory)
+REGISTER_FUNCTION(ToMinute)
 {
     factory.registerFunction<FunctionToMinute>();
     /// MysQL compatibility alias.
diff --git a/src/Functions/toModifiedJulianDay.cpp b/src/Functions/toModifiedJulianDay.cpp
index 7873baa11af..2e9b6eb1c79 100644
--- a/src/Functions/toModifiedJulianDay.cpp
+++ b/src/Functions/toModifiedJulianDay.cpp
@@ -228,7 +228,7 @@ namespace DB
         static constexpr auto name = "toModifiedJulianDayOrNull";
     };
 
-    void registerFunctionToModifiedJulianDay(FunctionFactory & factory)
+    REGISTER_FUNCTION(ToModifiedJulianDay)
     {
         factory.registerFunction<ToModifiedJulianDayOverloadResolver<NameToModifiedJulianDay, DataTypeInt32, false>>();
         factory.registerFunction<ToModifiedJulianDayOverloadResolver<NameToModifiedJulianDayOrNull, DataTypeInt32, true>>();
diff --git a/src/Functions/toMonday.cpp b/src/Functions/toMonday.cpp
index 02a1d65b309..89145634e45 100644
--- a/src/Functions/toMonday.cpp
+++ b/src/Functions/toMonday.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToMonday = FunctionDateOrDateTimeToSomething<DataTypeDate, ToMondayImpl>;
 
-void registerFunctionToMonday(FunctionFactory & factory)
+REGISTER_FUNCTION(ToMonday)
 {
     factory.registerFunction<FunctionToMonday>();
 }
diff --git a/src/Functions/toMonth.cpp b/src/Functions/toMonth.cpp
index a61543a897b..1364ad5a997 100644
--- a/src/Functions/toMonth.cpp
+++ b/src/Functions/toMonth.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToMonth = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToMonthImpl>;
 
-void registerFunctionToMonth(FunctionFactory & factory)
+REGISTER_FUNCTION(ToMonth)
 {
     factory.registerFunction<FunctionToMonth>();
     /// MysQL compatibility alias.
diff --git a/src/Functions/toNullable.cpp b/src/Functions/toNullable.cpp
index 16d9f9198cd..aea64c8d4ad 100644
--- a/src/Functions/toNullable.cpp
+++ b/src/Functions/toNullable.cpp
@@ -45,7 +45,7 @@ public:
 
 }
 
-void registerFunctionToNullable(FunctionFactory & factory)
+REGISTER_FUNCTION(ToNullable)
 {
     factory.registerFunction<FunctionToNullable>();
 }
diff --git a/src/Functions/toQuarter.cpp b/src/Functions/toQuarter.cpp
index 55fc3e83b1b..e9c1795121f 100644
--- a/src/Functions/toQuarter.cpp
+++ b/src/Functions/toQuarter.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToQuarter = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToQuarterImpl>;
 
-void registerFunctionToQuarter(FunctionFactory & factory)
+REGISTER_FUNCTION(ToQuarter)
 {
     factory.registerFunction<FunctionToQuarter>();
     /// MysQL compatibility alias.
diff --git a/src/Functions/toRelativeDayNum.cpp b/src/Functions/toRelativeDayNum.cpp
index 7b4ca094843..241104493cd 100644
--- a/src/Functions/toRelativeDayNum.cpp
+++ b/src/Functions/toRelativeDayNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeDayNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeDayNumImpl>;
 
-void registerFunctionToRelativeDayNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeDayNum)
 {
     factory.registerFunction<FunctionToRelativeDayNum>();
 }
diff --git a/src/Functions/toRelativeHourNum.cpp b/src/Functions/toRelativeHourNum.cpp
index e49906c8d56..2404d73c450 100644
--- a/src/Functions/toRelativeHourNum.cpp
+++ b/src/Functions/toRelativeHourNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeHourNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeHourNumImpl>;
 
-void registerFunctionToRelativeHourNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeHourNum)
 {
     factory.registerFunction<FunctionToRelativeHourNum>();
 }
diff --git a/src/Functions/toRelativeMinuteNum.cpp b/src/Functions/toRelativeMinuteNum.cpp
index 5e2b737a814..a5ecada1e92 100644
--- a/src/Functions/toRelativeMinuteNum.cpp
+++ b/src/Functions/toRelativeMinuteNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeMinuteNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeMinuteNumImpl>;
 
-void registerFunctionToRelativeMinuteNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeMinuteNum)
 {
     factory.registerFunction<FunctionToRelativeMinuteNum>();
 }
diff --git a/src/Functions/toRelativeMonthNum.cpp b/src/Functions/toRelativeMonthNum.cpp
index 695ed89ec18..8f46e04e483 100644
--- a/src/Functions/toRelativeMonthNum.cpp
+++ b/src/Functions/toRelativeMonthNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeMonthNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeMonthNumImpl>;
 
-void registerFunctionToRelativeMonthNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeMonthNum)
 {
     factory.registerFunction<FunctionToRelativeMonthNum>();
 }
diff --git a/src/Functions/toRelativeQuarterNum.cpp b/src/Functions/toRelativeQuarterNum.cpp
index fdd5ed57c89..8ea0c42ef09 100644
--- a/src/Functions/toRelativeQuarterNum.cpp
+++ b/src/Functions/toRelativeQuarterNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeQuarterNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeQuarterNumImpl>;
 
-void registerFunctionToRelativeQuarterNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeQuarterNum)
 {
     factory.registerFunction<FunctionToRelativeQuarterNum>();
 }
diff --git a/src/Functions/toRelativeSecondNum.cpp b/src/Functions/toRelativeSecondNum.cpp
index 02b63d86133..7af41ab8334 100644
--- a/src/Functions/toRelativeSecondNum.cpp
+++ b/src/Functions/toRelativeSecondNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeSecondNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeSecondNumImpl>;
 
-void registerFunctionToRelativeSecondNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeSecondNum)
 {
     factory.registerFunction<FunctionToRelativeSecondNum>();
 }
diff --git a/src/Functions/toRelativeWeekNum.cpp b/src/Functions/toRelativeWeekNum.cpp
index b0c4aa730fb..fe7aec3fd9a 100644
--- a/src/Functions/toRelativeWeekNum.cpp
+++ b/src/Functions/toRelativeWeekNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeWeekNum = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToRelativeWeekNumImpl>;
 
-void registerFunctionToRelativeWeekNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeWeekNum)
 {
     factory.registerFunction<FunctionToRelativeWeekNum>();
 }
diff --git a/src/Functions/toRelativeYearNum.cpp b/src/Functions/toRelativeYearNum.cpp
index 94717a8abb3..4574d8513e0 100644
--- a/src/Functions/toRelativeYearNum.cpp
+++ b/src/Functions/toRelativeYearNum.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToRelativeYearNum = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToRelativeYearNumImpl>;
 
-void registerFunctionToRelativeYearNum(FunctionFactory & factory)
+REGISTER_FUNCTION(ToRelativeYearNum)
 {
     factory.registerFunction<FunctionToRelativeYearNum>();
 }
diff --git a/src/Functions/toSecond.cpp b/src/Functions/toSecond.cpp
index a631a2646d6..8ab329689f7 100644
--- a/src/Functions/toSecond.cpp
+++ b/src/Functions/toSecond.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToSecond = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToSecondImpl>;
 
-void registerFunctionToSecond(FunctionFactory & factory)
+REGISTER_FUNCTION(ToSecond)
 {
     factory.registerFunction<FunctionToSecond>();
     /// MysQL compatibility alias.
diff --git a/src/Functions/toStartOfDay.cpp b/src/Functions/toStartOfDay.cpp
index a9632733d9b..0f3304c2283 100644
--- a/src/Functions/toStartOfDay.cpp
+++ b/src/Functions/toStartOfDay.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfDay = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToStartOfDayImpl>;
 
-void registerFunctionToStartOfDay(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfDay)
 {
     factory.registerFunction<FunctionToStartOfDay>();
 }
diff --git a/src/Functions/toStartOfFifteenMinutes.cpp b/src/Functions/toStartOfFifteenMinutes.cpp
index ceac5702915..a103c4ff0eb 100644
--- a/src/Functions/toStartOfFifteenMinutes.cpp
+++ b/src/Functions/toStartOfFifteenMinutes.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfFifteenMinutes = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToStartOfFifteenMinutesImpl>;
 
-void registerFunctionToStartOfFifteenMinutes(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfFifteenMinutes)
 {
     factory.registerFunction<FunctionToStartOfFifteenMinutes>();
 }
diff --git a/src/Functions/toStartOfFiveMinutes.cpp b/src/Functions/toStartOfFiveMinutes.cpp
index b311c69d8c6..17db95841e7 100644
--- a/src/Functions/toStartOfFiveMinutes.cpp
+++ b/src/Functions/toStartOfFiveMinutes.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfFiveMinutes = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToStartOfFiveMinutesImpl>;
 
-void registerFunctionToStartOfFiveMinutes(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfFiveMinutes)
 {
     factory.registerFunction<FunctionToStartOfFiveMinutes>();
     factory.registerAlias("toStartOfFiveMinute", FunctionToStartOfFiveMinutes::name);
diff --git a/src/Functions/toStartOfHour.cpp b/src/Functions/toStartOfHour.cpp
index a2273f2e78f..d12b37ab7b6 100644
--- a/src/Functions/toStartOfHour.cpp
+++ b/src/Functions/toStartOfHour.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfHour = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToStartOfHourImpl>;
 
-void registerFunctionToStartOfHour(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfHour)
 {
     factory.registerFunction<FunctionToStartOfHour>();
 }
diff --git a/src/Functions/toStartOfISOYear.cpp b/src/Functions/toStartOfISOYear.cpp
index a9b338a0a82..366ba8dd09f 100644
--- a/src/Functions/toStartOfISOYear.cpp
+++ b/src/Functions/toStartOfISOYear.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfISOYear = FunctionDateOrDateTimeToSomething<DataTypeDate, ToStartOfISOYearImpl>;
 
-void registerFunctionToStartOfISOYear(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfISOYear)
 {
     factory.registerFunction<FunctionToStartOfISOYear>();
 }
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index 413ae7f63c3..49c3b56c186 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -537,7 +537,7 @@ private:
 
 }
 
-void registerFunctionToStartOfInterval(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfInterval)
 {
     factory.registerFunction<FunctionToStartOfInterval>();
 }
diff --git a/src/Functions/toStartOfMinute.cpp b/src/Functions/toStartOfMinute.cpp
index 5fa7fc8ab4b..dddfaee93ec 100644
--- a/src/Functions/toStartOfMinute.cpp
+++ b/src/Functions/toStartOfMinute.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfMinute = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToStartOfMinuteImpl>;
 
-void registerFunctionToStartOfMinute(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfMinute)
 {
     factory.registerFunction<FunctionToStartOfMinute>();
 }
diff --git a/src/Functions/toStartOfMonth.cpp b/src/Functions/toStartOfMonth.cpp
index 8bad02acc81..9674462097b 100644
--- a/src/Functions/toStartOfMonth.cpp
+++ b/src/Functions/toStartOfMonth.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfMonth = FunctionDateOrDateTimeToSomething<DataTypeDate, ToStartOfMonthImpl>;
 
-void registerFunctionToStartOfMonth(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfMonth)
 {
     factory.registerFunction<FunctionToStartOfMonth>();
 }
diff --git a/src/Functions/toStartOfQuarter.cpp b/src/Functions/toStartOfQuarter.cpp
index c2d2697e86c..c7d69743198 100644
--- a/src/Functions/toStartOfQuarter.cpp
+++ b/src/Functions/toStartOfQuarter.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfQuarter = FunctionDateOrDateTimeToSomething<DataTypeDate, ToStartOfQuarterImpl>;
 
-void registerFunctionToStartOfQuarter(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfQuarter)
 {
     factory.registerFunction<FunctionToStartOfQuarter>();
 }
diff --git a/src/Functions/toStartOfSecond.cpp b/src/Functions/toStartOfSecond.cpp
index d4197a36e6c..3ceb6f94df7 100644
--- a/src/Functions/toStartOfSecond.cpp
+++ b/src/Functions/toStartOfSecond.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfSecond = FunctionDateOrDateTimeToSomething<DataTypeDateTime64, ToStartOfSecondImpl>;
 
-void registerFunctionToStartOfSecond(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfSecond)
 {
     factory.registerFunction<FunctionToStartOfSecond>();
 }
diff --git a/src/Functions/toStartOfSubsecond.cpp b/src/Functions/toStartOfSubsecond.cpp
index b2257c5e3cd..5878eaf1ed6 100644
--- a/src/Functions/toStartOfSubsecond.cpp
+++ b/src/Functions/toStartOfSubsecond.cpp
@@ -8,21 +8,21 @@ namespace DB
 
 using FunctionToStartOfMillisecond = FunctionDateOrDateTimeToSomething<DataTypeDateTime64, ToStartOfMillisecondImpl>;
 
-void registerFunctionToStartOfMillisecond(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfMillisecond)
 {
     factory.registerFunction<FunctionToStartOfMillisecond>();
 }
 
 using FunctionToStartOfMicrosecond = FunctionDateOrDateTimeToSomething<DataTypeDateTime64, ToStartOfMicrosecondImpl>;
 
-void registerFunctionToStartOfMicrosecond(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfMicrosecond)
 {
     factory.registerFunction<FunctionToStartOfMicrosecond>();
 }
 
 using FunctionToStartOfNanosecond = FunctionDateOrDateTimeToSomething<DataTypeDateTime64, ToStartOfNanosecondImpl>;
 
-void registerFunctionToStartOfNanosecond(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfNanosecond)
 {
     factory.registerFunction<FunctionToStartOfNanosecond>();
 }
diff --git a/src/Functions/toStartOfTenMinutes.cpp b/src/Functions/toStartOfTenMinutes.cpp
index 8cff4cc13cd..8f05e080b92 100644
--- a/src/Functions/toStartOfTenMinutes.cpp
+++ b/src/Functions/toStartOfTenMinutes.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfTenMinutes = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToStartOfTenMinutesImpl>;
 
-void registerFunctionToStartOfTenMinutes(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfTenMinutes)
 {
     factory.registerFunction<FunctionToStartOfTenMinutes>();
 }
diff --git a/src/Functions/toStartOfYear.cpp b/src/Functions/toStartOfYear.cpp
index cef10c1534d..13729f2f812 100644
--- a/src/Functions/toStartOfYear.cpp
+++ b/src/Functions/toStartOfYear.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToStartOfYear = FunctionDateOrDateTimeToSomething<DataTypeDate, ToStartOfYearImpl>;
 
-void registerFunctionToStartOfYear(FunctionFactory & factory)
+REGISTER_FUNCTION(ToStartOfYear)
 {
     factory.registerFunction<FunctionToStartOfYear>();
 }
diff --git a/src/Functions/toTime.cpp b/src/Functions/toTime.cpp
index b7ff56a18c4..2f5f3c9a3ca 100644
--- a/src/Functions/toTime.cpp
+++ b/src/Functions/toTime.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 using FunctionToTime = FunctionDateOrDateTimeToSomething<DataTypeDateTime, ToTimeImpl>;
 
-void registerFunctionToTime(FunctionFactory & factory)
+REGISTER_FUNCTION(ToTime)
 {
     factory.registerFunction<FunctionToTime>();
 }
diff --git a/src/Functions/toTimezone.cpp b/src/Functions/toTimezone.cpp
index 092b79131d8..5f6784c5655 100644
--- a/src/Functions/toTimezone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -123,7 +123,7 @@ public:
 
 }
 
-void registerFunctionToTimeZone(FunctionFactory & factory)
+REGISTER_FUNCTION(ToTimeZone)
 {
     factory.registerFunction<ToTimeZoneOverloadResolver>();
     factory.registerAlias("toTimeZone", "toTimezone");
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index d9ec08642ca..e66de5f71c6 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -62,7 +62,7 @@ public:
 
 }
 
-void registerFunctionToTypeName(FunctionFactory & factory)
+REGISTER_FUNCTION(ToTypeName)
 {
     factory.registerFunction<FunctionToTypeName>();
 }
diff --git a/src/Functions/toUnixTimestamp64Micro.cpp b/src/Functions/toUnixTimestamp64Micro.cpp
index c5b841a1a81..fd35e2a7a73 100644
--- a/src/Functions/toUnixTimestamp64Micro.cpp
+++ b/src/Functions/toUnixTimestamp64Micro.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerToUnixTimestamp64Micro(FunctionFactory & factory)
+REGISTER_FUNCTION(ToUnixTimestamp64Micro)
 {
     factory.registerFunction("toUnixTimestamp64Micro",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/toUnixTimestamp64Milli.cpp b/src/Functions/toUnixTimestamp64Milli.cpp
index bfceb3708d3..e6a680f941a 100644
--- a/src/Functions/toUnixTimestamp64Milli.cpp
+++ b/src/Functions/toUnixTimestamp64Milli.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerToUnixTimestamp64Milli(FunctionFactory & factory)
+REGISTER_FUNCTION(ToUnixTimestamp64Milli)
 {
     factory.registerFunction("toUnixTimestamp64Milli",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/toUnixTimestamp64Nano.cpp b/src/Functions/toUnixTimestamp64Nano.cpp
index 2256dc369b9..257f011603c 100644
--- a/src/Functions/toUnixTimestamp64Nano.cpp
+++ b/src/Functions/toUnixTimestamp64Nano.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void registerToUnixTimestamp64Nano(FunctionFactory & factory)
+REGISTER_FUNCTION(ToUnixTimestamp64Nano)
 {
     factory.registerFunction("toUnixTimestamp64Nano",
         [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
diff --git a/src/Functions/toValidUTF8.cpp b/src/Functions/toValidUTF8.cpp
index 0ee62bd4961..9874e39baa4 100644
--- a/src/Functions/toValidUTF8.cpp
+++ b/src/Functions/toValidUTF8.cpp
@@ -166,7 +166,7 @@ using FunctionToValidUTF8 = FunctionStringToString<ToValidUTF8Impl, NameToValidU
 
 }
 
-void registerFunctionToValidUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(ToValidUTF8)
 {
     factory.registerFunction<FunctionToValidUTF8>();
 }
diff --git a/src/Functions/toYYYYMM.cpp b/src/Functions/toYYYYMM.cpp
index 3dfefc4adb1..5b5f6bfe2fe 100644
--- a/src/Functions/toYYYYMM.cpp
+++ b/src/Functions/toYYYYMM.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToYYYYMM = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToYYYYMMImpl>;
 
-void registerFunctionToYYYYMM(FunctionFactory & factory)
+REGISTER_FUNCTION(ToYYYYMM)
 {
     factory.registerFunction<FunctionToYYYYMM>();
 }
diff --git a/src/Functions/toYYYYMMDD.cpp b/src/Functions/toYYYYMMDD.cpp
index fa5e85341fd..ccbb774d60b 100644
--- a/src/Functions/toYYYYMMDD.cpp
+++ b/src/Functions/toYYYYMMDD.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToYYYYMMDD = FunctionDateOrDateTimeToSomething<DataTypeUInt32, ToYYYYMMDDImpl>;
 
-void registerFunctionToYYYYMMDD(FunctionFactory & factory)
+REGISTER_FUNCTION(ToYYYYMMDD)
 {
     factory.registerFunction<FunctionToYYYYMMDD>();
 }
diff --git a/src/Functions/toYYYYMMDDhhmmss.cpp b/src/Functions/toYYYYMMDDhhmmss.cpp
index 7718bbab763..fbdf70ada02 100644
--- a/src/Functions/toYYYYMMDDhhmmss.cpp
+++ b/src/Functions/toYYYYMMDDhhmmss.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToYYYYMMDDhhmmss = FunctionDateOrDateTimeToSomething<DataTypeUInt64, ToYYYYMMDDhhmmssImpl>;
 
-void registerFunctionToYYYYMMDDhhmmss(FunctionFactory & factory)
+REGISTER_FUNCTION(ToYYYYMMDDhhmmss)
 {
     factory.registerFunction<FunctionToYYYYMMDDhhmmss>();
 }
diff --git a/src/Functions/toYear.cpp b/src/Functions/toYear.cpp
index 8db857c132e..6658bf0e927 100644
--- a/src/Functions/toYear.cpp
+++ b/src/Functions/toYear.cpp
@@ -9,7 +9,7 @@ namespace DB
 
 using FunctionToYear = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToYearImpl>;
 
-void registerFunctionToYear(FunctionFactory & factory)
+REGISTER_FUNCTION(ToYear)
 {
     factory.registerFunction<FunctionToYear>();
     /// MysQL compatibility alias.
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index fe63197d127..504c840efe5 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -84,7 +84,7 @@ public:
 
 }
 
-void registerFunctionToday(FunctionFactory & factory)
+REGISTER_FUNCTION(Today)
 {
     factory.registerFunction<TodayOverloadResolver>();
 }
diff --git a/src/Functions/tokenExtractors.cpp b/src/Functions/tokenExtractors.cpp
index 5902cb5f3e5..a29d759d2ca 100644
--- a/src/Functions/tokenExtractors.cpp
+++ b/src/Functions/tokenExtractors.cpp
@@ -147,7 +147,7 @@ private:
     }
 };
 
-void registerFunctionsStringTokenExtractor(FunctionFactory & factory)
+REGISTER_FUNCTION(StringTokenExtractor)
 {
     factory.registerFunction<FunctionTokenExtractor<TokenExtractorStrategy::ngrams>>();
     factory.registerFunction<FunctionTokenExtractor<TokenExtractorStrategy::tokens>>();
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index de9f1a5ba05..3337e8d40a8 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -1217,7 +1217,7 @@ private:
 
 }
 
-void registerFunctionTransform(FunctionFactory & factory)
+REGISTER_FUNCTION(Transform)
 {
     factory.registerFunction<FunctionTransform>();
 }
diff --git a/src/Functions/translate.cpp b/src/Functions/translate.cpp
index 8342bfe236b..b3f1d5ae460 100644
--- a/src/Functions/translate.cpp
+++ b/src/Functions/translate.cpp
@@ -355,7 +355,7 @@ using FunctionTranslateUTF8 = FunctionTranslate<TranslateUTF8Impl, NameTranslate
 
 }
 
-void registerFunctionTranslate(FunctionFactory & factory)
+REGISTER_FUNCTION(Translate)
 {
     factory.registerFunction<FunctionTranslateASCII>();
     factory.registerFunction<FunctionTranslateUTF8>();
diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index 4fa0770e61b..5bb0ed210de 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -177,19 +177,11 @@ public:
 };
 
 
-void registerFunctionTrap(FunctionFactory & factory)
+REGISTER_FUNCTION(Trap)
 {
     factory.registerFunction<FunctionTrap>();
 }
 
 }
 
-#else
-
-namespace DB
-{
-    class FunctionFactory;
-    void registerFunctionTrap(FunctionFactory &) {}
-}
-
 #endif
diff --git a/src/Functions/trim.cpp b/src/Functions/trim.cpp
index a1737fc12a1..58760583e8d 100644
--- a/src/Functions/trim.cpp
+++ b/src/Functions/trim.cpp
@@ -107,7 +107,7 @@ using FunctionTrimBoth = FunctionStringToString<FunctionTrimImpl<TrimModeBoth>,
 
 }
 
-void registerFunctionTrim(FunctionFactory & factory)
+REGISTER_FUNCTION(Trim)
 {
     factory.registerFunction<FunctionTrimLeft>();
     factory.registerFunction<FunctionTrimRight>();
diff --git a/src/Functions/tryBase64Decode.cpp b/src/Functions/tryBase64Decode.cpp
index b43ab2cbeea..1102c7a3418 100644
--- a/src/Functions/tryBase64Decode.cpp
+++ b/src/Functions/tryBase64Decode.cpp
@@ -5,7 +5,7 @@
 
 namespace DB
 {
-void registerFunctionTryBase64Decode(FunctionFactory & factory)
+REGISTER_FUNCTION(TryBase64Decode)
 {
     factory.registerFunction<FunctionBase64Conversion<TryBase64Decode>>();
 }
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index 5e85984bee0..545c6597811 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -83,7 +83,7 @@ public:
 
 }
 
-void registerFunctionTuple(FunctionFactory & factory)
+REGISTER_FUNCTION(Tuple)
 {
     factory.registerFunction<FunctionTuple>();
 }
diff --git a/src/Functions/tupleElement.cpp b/src/Functions/tupleElement.cpp
index 92ca6b85714..4f7ddda6b0b 100644
--- a/src/Functions/tupleElement.cpp
+++ b/src/Functions/tupleElement.cpp
@@ -259,7 +259,7 @@ private:
 
 }
 
-void registerFunctionTupleElement(FunctionFactory & factory)
+REGISTER_FUNCTION(TupleElement)
 {
     factory.registerFunction<FunctionTupleElement>();
 }
diff --git a/src/Functions/tupleHammingDistance.cpp b/src/Functions/tupleHammingDistance.cpp
index 11c8cf84b40..adc063bfa81 100644
--- a/src/Functions/tupleHammingDistance.cpp
+++ b/src/Functions/tupleHammingDistance.cpp
@@ -139,7 +139,7 @@ public:
     }
 };
 
-void registerFunctionTupleHammingDistance(FunctionFactory & factory)
+REGISTER_FUNCTION(TupleHammingDistance)
 {
     factory.registerFunction<FunctionTupleHammingDistance>();
 }
diff --git a/src/Functions/tupleToNameValuePairs.cpp b/src/Functions/tupleToNameValuePairs.cpp
index 1d51b77bbee..998e0da4f0c 100644
--- a/src/Functions/tupleToNameValuePairs.cpp
+++ b/src/Functions/tupleToNameValuePairs.cpp
@@ -129,7 +129,7 @@ public:
 
 }
 
-void registerFunctionTupleToNameValuePairs(FunctionFactory & factory)
+REGISTER_FUNCTION(TupleToNameValuePairs)
 {
     factory.registerFunction<FunctionTupleToNameValuePairs>();
 }
diff --git a/src/Functions/upper.cpp b/src/Functions/upper.cpp
index 515574e2a09..05a125379d9 100644
--- a/src/Functions/upper.cpp
+++ b/src/Functions/upper.cpp
@@ -16,7 +16,7 @@ using FunctionUpper = FunctionStringToString<LowerUpperImpl<'a', 'z'>, NameUpper
 
 }
 
-void registerFunctionUpper(FunctionFactory & factory)
+REGISTER_FUNCTION(Upper)
 {
     factory.registerFunction<FunctionUpper>(FunctionFactory::CaseInsensitive);
     factory.registerAlias("ucase", FunctionUpper::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/upperUTF8.cpp b/src/Functions/upperUTF8.cpp
index 1a85b133757..659e67f0ef3 100644
--- a/src/Functions/upperUTF8.cpp
+++ b/src/Functions/upperUTF8.cpp
@@ -18,7 +18,7 @@ using FunctionUpperUTF8 = FunctionStringToString<LowerUpperUTF8Impl<'a', 'z', Po
 
 }
 
-void registerFunctionUpperUTF8(FunctionFactory & factory)
+REGISTER_FUNCTION(UpperUTF8)
 {
     factory.registerFunction<FunctionUpperUTF8>();
 }
diff --git a/src/Functions/validateNestedArraySizes.cpp b/src/Functions/validateNestedArraySizes.cpp
index 42b0e401fa0..3b005f4d653 100644
--- a/src/Functions/validateNestedArraySizes.cpp
+++ b/src/Functions/validateNestedArraySizes.cpp
@@ -119,7 +119,7 @@ ColumnPtr FunctionValidateNestedArraySizes::executeImpl(
     return ColumnUInt8::create(input_rows_count, 1);
 }
 
-void registerFunctionValidateNestedArraySizes(FunctionFactory & factory)
+REGISTER_FUNCTION(ValidateNestedArraySizes)
 {
     factory.registerFunction<FunctionValidateNestedArraySizes>();
 }
diff --git a/src/Functions/vectorFunctions.cpp b/src/Functions/vectorFunctions.cpp
index d46d12379a7..20571f67eff 100644
--- a/src/Functions/vectorFunctions.cpp
+++ b/src/Functions/vectorFunctions.cpp
@@ -1272,7 +1272,7 @@ using TupleOrArrayFunctionLpDistance = TupleOrArrayFunction<LpDistanceTraits>;
 using TupleOrArrayFunctionLinfDistance = TupleOrArrayFunction<LinfDistanceTraits>;
 using TupleOrArrayFunctionCosineDistance = TupleOrArrayFunction<CosineDistanceTraits>;
 
-void registerVectorFunctions(FunctionFactory & factory)
+REGISTER_FUNCTION(VectorFunctions)
 {
     factory.registerFunction<FunctionTuplePlus>();
     factory.registerAlias("vectorSum", FunctionTuplePlus::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index 4e09aeb399a..d4f6de404ff 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -76,7 +76,7 @@ public:
 };
 
 
-void registerFunctionVisibleWidth(FunctionFactory & factory)
+REGISTER_FUNCTION(VisibleWidth)
 {
     factory.registerFunction<FunctionVisibleWidth>();
 }
diff --git a/src/Functions/visitParamExtractBool.cpp b/src/Functions/visitParamExtractBool.cpp
index 48fb78ba9b6..e5a2277b443 100644
--- a/src/Functions/visitParamExtractBool.cpp
+++ b/src/Functions/visitParamExtractBool.cpp
@@ -22,7 +22,7 @@ using FunctionVisitParamExtractBool = FunctionsStringSearch<ExtractParamImpl<Nam
 struct NameSimpleJSONExtractBool   { static constexpr auto name = "simpleJSONExtractBool"; };
 using FunctionSimpleJSONExtractBool = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractBool, ExtractBool>>;
 
-void registerFunctionVisitParamExtractBool(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamExtractBool)
 {
     factory.registerFunction<FunctionVisitParamExtractBool>();
     factory.registerFunction<FunctionSimpleJSONExtractBool>();
diff --git a/src/Functions/visitParamExtractFloat.cpp b/src/Functions/visitParamExtractFloat.cpp
index e7967b6de2c..ee00f960f8f 100644
--- a/src/Functions/visitParamExtractFloat.cpp
+++ b/src/Functions/visitParamExtractFloat.cpp
@@ -12,7 +12,7 @@ using FunctionVisitParamExtractFloat = FunctionsStringSearch<ExtractParamImpl<Na
 struct NameSimpleJSONExtractFloat  { static constexpr auto name = "simpleJSONExtractFloat"; };
 using FunctionSimpleJSONExtractFloat = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractFloat, ExtractNumericType<Float64>>>;
 
-void registerFunctionVisitParamExtractFloat(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamExtractFloat)
 {
     factory.registerFunction<FunctionVisitParamExtractFloat>();
     factory.registerFunction<FunctionSimpleJSONExtractFloat>();
diff --git a/src/Functions/visitParamExtractInt.cpp b/src/Functions/visitParamExtractInt.cpp
index b7f1050972c..30b373182ea 100644
--- a/src/Functions/visitParamExtractInt.cpp
+++ b/src/Functions/visitParamExtractInt.cpp
@@ -12,7 +12,7 @@ using FunctionVisitParamExtractInt = FunctionsStringSearch<ExtractParamImpl<Name
 struct NameSimpleJSONExtractInt    { static constexpr auto name = "simpleJSONExtractInt"; };
 using FunctionSimpleJSONExtractInt = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractInt, ExtractNumericType<Int64>>>;
 
-void registerFunctionVisitParamExtractInt(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamExtractInt)
 {
     factory.registerFunction<FunctionVisitParamExtractInt>();
     factory.registerFunction<FunctionSimpleJSONExtractInt>();
diff --git a/src/Functions/visitParamExtractRaw.cpp b/src/Functions/visitParamExtractRaw.cpp
index 734fe107557..ab21fdf6e98 100644
--- a/src/Functions/visitParamExtractRaw.cpp
+++ b/src/Functions/visitParamExtractRaw.cpp
@@ -62,7 +62,7 @@ using FunctionVisitParamExtractRaw = FunctionsStringSearchToString<ExtractParamT
 struct NameSimpleJSONExtractRaw    { static constexpr auto name = "simpleJSONExtractRaw"; };
 using FunctionSimpleJSONExtractRaw = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractRaw>, NameSimpleJSONExtractRaw>;
 
-void registerFunctionVisitParamExtractRaw(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamExtractRaw)
 {
     factory.registerFunction<FunctionVisitParamExtractRaw>();
     factory.registerFunction<FunctionSimpleJSONExtractRaw>();
diff --git a/src/Functions/visitParamExtractString.cpp b/src/Functions/visitParamExtractString.cpp
index 23f24b9e3b8..df640cef371 100644
--- a/src/Functions/visitParamExtractString.cpp
+++ b/src/Functions/visitParamExtractString.cpp
@@ -23,7 +23,7 @@ using FunctionVisitParamExtractString = FunctionsStringSearchToString<ExtractPar
 struct NameSimpleJSONExtractString { static constexpr auto name = "simpleJSONExtractString"; };
 using FunctionSimpleJSONExtractString = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractString>, NameSimpleJSONExtractString>;
 
-void registerFunctionVisitParamExtractString(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamExtractString)
 {
     factory.registerFunction<FunctionVisitParamExtractString>();
     factory.registerFunction<FunctionSimpleJSONExtractString>();
diff --git a/src/Functions/visitParamExtractUInt.cpp b/src/Functions/visitParamExtractUInt.cpp
index d89b796263e..1612c91984d 100644
--- a/src/Functions/visitParamExtractUInt.cpp
+++ b/src/Functions/visitParamExtractUInt.cpp
@@ -13,7 +13,7 @@ struct NameSimpleJSONExtractUInt   { static constexpr auto name = "simpleJSONExt
 using FunctionSimpleJSONExtractUInt = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractUInt, ExtractNumericType<UInt64>>>;
 
 
-void registerFunctionVisitParamExtractUInt(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamExtractUInt)
 {
     factory.registerFunction<FunctionVisitParamExtractUInt>();
     factory.registerFunction<FunctionSimpleJSONExtractUInt>();
diff --git a/src/Functions/visitParamHas.cpp b/src/Functions/visitParamHas.cpp
index 71d69ef5768..9e481fb44cc 100644
--- a/src/Functions/visitParamHas.cpp
+++ b/src/Functions/visitParamHas.cpp
@@ -22,7 +22,7 @@ using FunctionVisitParamHas = FunctionsStringSearch<ExtractParamImpl<NameVisitPa
 struct NameSimpleJSONHas           { static constexpr auto name = "simpleJSONHas"; };
 using FunctionSimpleJSONHas = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONHas, HasParam>>;
 
-void registerFunctionVisitParamHas(FunctionFactory & factory)
+REGISTER_FUNCTION(VisitParamHas)
 {
     factory.registerFunction<FunctionVisitParamHas>();
     factory.registerFunction<FunctionSimpleJSONHas>();
diff --git a/src/Functions/wkt.cpp b/src/Functions/wkt.cpp
index 732441eeef2..fc9ef75a1e2 100644
--- a/src/Functions/wkt.cpp
+++ b/src/Functions/wkt.cpp
@@ -68,7 +68,7 @@ public:
     }
 };
 
-void registerFunctionWkt(FunctionFactory & factory)
+REGISTER_FUNCTION(Wkt)
 {
     factory.registerFunction<FunctionWkt>();
 }
diff --git a/src/Functions/yesterday.cpp b/src/Functions/yesterday.cpp
index 364d4721b34..53b73a7a71e 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -81,7 +81,7 @@ public:
     }
 };
 
-void registerFunctionYesterday(FunctionFactory & factory)
+REGISTER_FUNCTION(Yesterday)
 {
     factory.registerFunction<YesterdayOverloadResolver>();
 }
diff --git a/src/Functions/ztest.cpp b/src/Functions/ztest.cpp
index c80b92960e9..26e55a4f934 100644
--- a/src/Functions/ztest.cpp
+++ b/src/Functions/ztest.cpp
@@ -217,7 +217,7 @@ public:
 };
 
 
-void registerFunctionZTest(FunctionFactory & factory)
+REGISTER_FUNCTION(ZTest)
 {
     factory.registerFunction<FunctionTwoSampleProportionsZTest>();
 }
diff --git a/src/IO/BitHelpers.h b/src/IO/BitHelpers.h
index 1648746e2b6..c67b44bc325 100644
--- a/src/IO/BitHelpers.h
+++ b/src/IO/BitHelpers.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <bit>
 #include <base/types.h>
 #include <Common/BitHelpers.h>
 #include <Common/Exception.h>
@@ -140,7 +141,8 @@ private:
         memcpy(&tmp_buffer, source_current, bytes_to_read);
         source_current += bytes_to_read;
 
-        tmp_buffer = __builtin_bswap64(tmp_buffer);
+        if constexpr (std::endian::native == std::endian::little)
+            tmp_buffer = __builtin_bswap64(tmp_buffer);
 
         bits_buffer |= BufferType(tmp_buffer) << ((sizeof(BufferType) - sizeof(tmp_buffer)) * 8 - bits_count);
         bits_count += static_cast<UInt8>(bytes_to_read) * 8;
@@ -223,8 +225,11 @@ private:
                 "Can not write past end of buffer. Space available {} bytes, required to write {} bytes.",
                 available, to_write);
         }
-
-        const auto tmp_buffer = __builtin_bswap64(static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8));
+        UInt64 tmp_buffer = 0;
+        if constexpr (std::endian::native == std::endian::little)
+            tmp_buffer = __builtin_bswap64(static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8));
+        else
+            tmp_buffer = static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8);
         memcpy(dest_current, &tmp_buffer, to_write);
         dest_current += to_write;
 
diff --git a/src/IO/BoundedReadBuffer.cpp b/src/IO/BoundedReadBuffer.cpp
new file mode 100644
index 00000000000..995ee267699
--- /dev/null
+++ b/src/IO/BoundedReadBuffer.cpp
@@ -0,0 +1,71 @@
+#include "BoundedReadBuffer.h"
+
+namespace DB
+{
+
+BoundedReadBuffer::BoundedReadBuffer(std::unique_ptr<SeekableReadBuffer> impl_)
+    : ReadBufferFromFileDecorator(std::move(impl_))
+{
+}
+
+void BoundedReadBuffer::setReadUntilPosition(size_t position)
+{
+    read_until_position = position;
+}
+
+void BoundedReadBuffer::setReadUntilEnd()
+{
+    read_until_position.reset();
+}
+
+SeekableReadBuffer::Range BoundedReadBuffer::getRemainingReadRange() const
+{
+    std::optional<size_t> right_bound_included;
+    if (read_until_position)
+        right_bound_included = *read_until_position - 1;
+    return Range{file_offset_of_buffer_end, right_bound_included};
+}
+
+off_t BoundedReadBuffer::getPosition()
+{
+    return file_offset_of_buffer_end - (working_buffer.end() - pos);
+}
+
+bool BoundedReadBuffer::nextImpl()
+{
+    if (read_until_position && file_offset_of_buffer_end == *read_until_position)
+        return false;
+
+    swap(*impl);
+    auto result = impl->next();
+    swap(*impl);
+
+    if (result && read_until_position)
+    {
+        size_t remaining_size_to_read = *read_until_position - file_offset_of_buffer_end;
+        if (working_buffer.size() > remaining_size_to_read)
+        {
+            ///  file:            [______________________________]
+            ///  working buffer:       [_______________]
+            ///                                 ^
+            ///                                 read_until_position
+            ///                        ^
+            ///                        file_offset_of_buffer_end
+            working_buffer.resize(remaining_size_to_read);
+        }
+    }
+    file_offset_of_buffer_end += available();
+    return result;
+}
+
+off_t BoundedReadBuffer::seek(off_t off, int whence)
+{
+    swap(*impl);
+    auto result = impl->seek(off, whence);
+    swap(*impl);
+
+    file_offset_of_buffer_end = result;
+    return result;
+}
+
+}
diff --git a/src/IO/BoundedReadBuffer.h b/src/IO/BoundedReadBuffer.h
new file mode 100644
index 00000000000..e645e7f655c
--- /dev/null
+++ b/src/IO/BoundedReadBuffer.h
@@ -0,0 +1,39 @@
+#pragma once
+#include <IO/ReadBufferFromFileDecorator.h>
+
+
+namespace DB
+{
+
+/// A buffer which allows to make an underlying buffer as right bounded,
+/// e.g. the buffer cannot return data beyond offset specified in `setReadUntilPosition`.
+class BoundedReadBuffer : public ReadBufferFromFileDecorator
+{
+public:
+    explicit BoundedReadBuffer(std::unique_ptr<SeekableReadBuffer> impl_);
+
+    bool supportsRightBoundedReads() const override { return true; }
+
+    void setReadUntilPosition(size_t position) override;
+
+    void setReadUntilEnd() override;
+
+    bool nextImpl() override;
+
+    off_t seek(off_t off, int whence) override;
+
+    Range getRemainingReadRange() const override;
+
+    size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
+
+    /// file_offset_of_buffer_end can differ from impl's file_offset_of_buffer_end
+    /// because of resizing of the tail. => Need to also override getPosition() as
+    /// it uses file_offset_of_buffer_end.
+    off_t getPosition() override;
+
+private:
+    std::optional<size_t> read_until_position;
+    size_t file_offset_of_buffer_end = 0;
+};
+
+}
diff --git a/src/IO/BufferWithOwnMemory.h b/src/IO/BufferWithOwnMemory.h
index 479e0e88fcc..2121747500b 100644
--- a/src/IO/BufferWithOwnMemory.h
+++ b/src/IO/BufferWithOwnMemory.h
@@ -8,6 +8,8 @@
 #include <Common/Exception.h>
 #include <Core/Defines.h>
 
+#include <base/arithmeticOverflow.h>
+
 
 namespace ProfileEvents
 {
@@ -19,6 +21,11 @@ namespace ProfileEvents
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
 
 /** Replacement for std::vector<char> to use in buffers.
   * Differs in that is doesn't do unneeded memset. (And also tries to do as little as possible.)
@@ -38,9 +45,9 @@ struct Memory : boost::noncopyable, Allocator
     Memory() = default;
 
     /// If alignment != 0, then allocate memory aligned to specified value.
-    explicit Memory(size_t size_, size_t alignment_ = 0) : m_capacity(size_), m_size(m_capacity), alignment(alignment_)
+    explicit Memory(size_t size_, size_t alignment_ = 0) : alignment(alignment_)
     {
-        alloc();
+        alloc(size_);
     }
 
     ~Memory()
@@ -75,57 +82,55 @@ struct Memory : boost::noncopyable, Allocator
 
     void resize(size_t new_size)
     {
-        if (0 == m_capacity)
+        if (!m_data)
         {
-            m_size = new_size;
-            m_capacity = new_size;
-            alloc();
+            alloc(new_size);
+            return;
         }
-        else if (new_size <= m_capacity - pad_right)
+
+        if (new_size <= m_capacity - pad_right)
         {
             m_size = new_size;
             return;
         }
-        else
-        {
-            size_t new_capacity = align(new_size, alignment) + pad_right;
 
-            size_t diff = new_capacity - m_capacity;
-            ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, diff);
+        size_t new_capacity = withPadding(new_size);
 
-            m_data = static_cast<char *>(Allocator::realloc(m_data, m_capacity, new_capacity, alignment));
-            m_capacity = new_capacity;
-            m_size = m_capacity - pad_right;
-        }
+        size_t diff = new_capacity - m_capacity;
+        ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, diff);
+
+        m_data = static_cast<char *>(Allocator::realloc(m_data, m_capacity, new_capacity, alignment));
+        m_capacity = new_capacity;
+        m_size = new_size;
     }
 
 private:
-    static size_t align(const size_t value, const size_t alignment)
+    static size_t withPadding(size_t value)
     {
-        if (!alignment)
-            return value;
+        size_t res = 0;
 
-        if (!(value % alignment))
-            return value;
+        if (common::addOverflow<size_t>(value, pad_right, res))
+            throw Exception("value is too big to apply padding", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
 
-        return (value + alignment - 1) / alignment * alignment;
+        return res;
     }
 
-    void alloc()
+    void alloc(size_t new_size)
     {
-        if (!m_capacity)
+        if (!new_size)
         {
             m_data = nullptr;
             return;
         }
 
-        ProfileEvents::increment(ProfileEvents::IOBufferAllocs);
-        ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, m_capacity);
+        size_t new_capacity = withPadding(new_size);
+
+        ProfileEvents::increment(ProfileEvents::IOBufferAllocs);
+        ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, new_capacity);
 
-        size_t new_capacity = align(m_capacity, alignment) + pad_right;
         m_data = static_cast<char *>(Allocator::alloc(new_capacity, alignment));
         m_capacity = new_capacity;
-        m_size = m_capacity - pad_right;
+        m_size = new_size;
     }
 
     void dealloc()
diff --git a/src/IO/ConnectionTimeouts.h b/src/IO/ConnectionTimeouts.h
index 42b800f15d0..95a2ded6466 100644
--- a/src/IO/ConnectionTimeouts.h
+++ b/src/IO/ConnectionTimeouts.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Defines.h>
 #include <Interpreters/Context_fwd.h>
 
 #include <Poco/Timespan.h>
@@ -22,6 +23,9 @@ struct ConnectionTimeouts
     Poco::Timespan hedged_connection_timeout;
     Poco::Timespan receive_data_timeout;
 
+    /// Timeout for synchronous request-result protocol call (like Ping or TablesStatus)
+    Poco::Timespan sync_request_timeout = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0);
+
     ConnectionTimeouts() = default;
 
     ConnectionTimeouts(Poco::Timespan connection_timeout_,
diff --git a/src/IO/FileEncryptionCommon.h b/src/IO/FileEncryptionCommon.h
index bb6c8d14893..496c9e66b20 100644
--- a/src/IO/FileEncryptionCommon.h
+++ b/src/IO/FileEncryptionCommon.h
@@ -80,6 +80,7 @@ public:
     /// the initialization vector is increased by an index of the current block
     /// and the index of the current block is calculated from this offset.
     void setOffset(size_t offset_) { offset = offset_; }
+    size_t getOffset() const { return offset; }
 
     /// Encrypts some data.
     /// Also the function moves `offset` by `size` (for successive encryptions).
diff --git a/src/IO/HTTPChunkedReadBuffer.cpp b/src/IO/HTTPChunkedReadBuffer.cpp
index 75827679d0c..a7841b1180f 100644
--- a/src/IO/HTTPChunkedReadBuffer.cpp
+++ b/src/IO/HTTPChunkedReadBuffer.cpp
@@ -32,6 +32,9 @@ size_t HTTPChunkedReadBuffer::readChunkHeader()
         ++in->position();
     } while (!in->eof() && isHexDigit(*in->position()));
 
+    if (res > max_chunk_size)
+        throw Exception("Chunk size exceeded the limit", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+
     /// NOTE: If we want to read any chunk extensions, it should be done here.
 
     skipToCarriageReturnOrEOF(*in);
diff --git a/src/IO/HTTPChunkedReadBuffer.h b/src/IO/HTTPChunkedReadBuffer.h
index 378835cafc0..68d90e470fa 100644
--- a/src/IO/HTTPChunkedReadBuffer.h
+++ b/src/IO/HTTPChunkedReadBuffer.h
@@ -10,9 +10,12 @@ namespace DB
 class HTTPChunkedReadBuffer : public BufferWithOwnMemory<ReadBuffer>
 {
 public:
-    explicit HTTPChunkedReadBuffer(std::unique_ptr<ReadBuffer> in_) : in(std::move(in_)) {}
+    explicit HTTPChunkedReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t max_chunk_size_)
+        : max_chunk_size(max_chunk_size_), in(std::move(in_))
+    {}
 
 private:
+    const size_t max_chunk_size;
     std::unique_ptr<ReadBuffer> in;
 
     size_t readChunkHeader();
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index b31ee08eaf5..8d2f7b4c39b 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -255,10 +255,13 @@ namespace
                         {
                             session->reset();
                             session->setHost(ip);
-                            session->attachSessionData({});
                         }
                     }
                 }
+                /// Reset the message, once it has been printed,
+                /// otherwise you will get report for failed parts on and on,
+                /// even for different tables (since they uses the same session).
+                session->attachSessionData({});
             }
 
             setTimeouts(*session, timeouts);
diff --git a/src/IO/MMappedFileCache.h b/src/IO/MMappedFileCache.h
index fe5e7e8e1f7..0a8a80d15d0 100644
--- a/src/IO/MMappedFileCache.h
+++ b/src/IO/MMappedFileCache.h
@@ -2,7 +2,7 @@
 
 #include <Core/Types.h>
 #include <Common/HashTable/Hash.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/SipHash.h>
 #include <Common/ProfileEvents.h>
 #include <IO/MMappedFile.h>
@@ -21,10 +21,10 @@ namespace DB
 /** Cache of opened and mmapped files for reading.
   * mmap/munmap is heavy operation and better to keep mapped file to subsequent use than to map/unmap every time.
   */
-class MMappedFileCache : public LRUCache<UInt128, MMappedFile, UInt128TrivialHash>
+class MMappedFileCache : public CacheBase<UInt128, MMappedFile, UInt128TrivialHash>
 {
 private:
-    using Base = LRUCache<UInt128, MMappedFile, UInt128TrivialHash>;
+    using Base = CacheBase<UInt128, MMappedFile, UInt128TrivialHash>;
 
 public:
     explicit MMappedFileCache(size_t max_size_in_bytes)
diff --git a/src/IO/Progress.cpp b/src/IO/Progress.cpp
index 45710db5c92..1069803633c 100644
--- a/src/IO/Progress.cpp
+++ b/src/IO/Progress.cpp
@@ -11,38 +11,34 @@ namespace DB
 {
 void ProgressValues::read(ReadBuffer & in, UInt64 server_revision)
 {
-    size_t new_read_rows = 0;
-    size_t new_read_bytes = 0;
-    size_t new_total_rows_to_read = 0;
-    size_t new_written_rows = 0;
-    size_t new_written_bytes = 0;
-
-    readVarUInt(new_read_rows, in);
-    readVarUInt(new_read_bytes, in);
-    readVarUInt(new_total_rows_to_read, in);
+    readVarUInt(read_rows, in);
+    readVarUInt(read_bytes, in);
+    readVarUInt(total_rows_to_read, in);
     if (server_revision >= DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO)
     {
-        readVarUInt(new_written_rows, in);
-        readVarUInt(new_written_bytes, in);
+        readVarUInt(written_rows, in);
+        readVarUInt(written_bytes, in);
+    }
+    if (server_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS)
+    {
+        readVarUInt(elapsed_ns, in);
     }
-
-    this->read_rows = new_read_rows;
-    this->read_bytes = new_read_bytes;
-    this->total_rows_to_read = new_total_rows_to_read;
-    this->written_rows = new_written_rows;
-    this->written_bytes = new_written_bytes;
 }
 
 
 void ProgressValues::write(WriteBuffer & out, UInt64 client_revision) const
 {
-    writeVarUInt(this->read_rows, out);
-    writeVarUInt(this->read_bytes, out);
-    writeVarUInt(this->total_rows_to_read, out);
+    writeVarUInt(read_rows, out);
+    writeVarUInt(read_bytes, out);
+    writeVarUInt(total_rows_to_read, out);
     if (client_revision >= DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO)
     {
-        writeVarUInt(this->written_rows, out);
-        writeVarUInt(this->written_bytes, out);
+        writeVarUInt(written_rows, out);
+        writeVarUInt(written_bytes, out);
+    }
+    if (client_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS)
+    {
+        writeVarUInt(elapsed_ns, out);
     }
 }
 
@@ -52,15 +48,19 @@ void ProgressValues::writeJSON(WriteBuffer & out) const
     ///  of 64-bit integers after interpretation by JavaScript.
 
     writeCString("{\"read_rows\":\"", out);
-    writeText(this->read_rows, out);
+    writeText(read_rows, out);
     writeCString("\",\"read_bytes\":\"", out);
-    writeText(this->read_bytes, out);
+    writeText(read_bytes, out);
     writeCString("\",\"written_rows\":\"", out);
-    writeText(this->written_rows, out);
+    writeText(written_rows, out);
     writeCString("\",\"written_bytes\":\"", out);
-    writeText(this->written_bytes, out);
+    writeText(written_bytes, out);
     writeCString("\",\"total_rows_to_read\":\"", out);
-    writeText(this->total_rows_to_read, out);
+    writeText(total_rows_to_read, out);
+    writeCString("\",\"result_rows\":\"", out);
+    writeText(result_rows, out);
+    writeCString("\",\"result_bytes\":\"", out);
+    writeText(result_bytes, out);
     writeCString("\"}", out);
 }
 
@@ -75,6 +75,11 @@ bool Progress::incrementPiecewiseAtomically(const Progress & rhs)
     written_rows += rhs.written_rows;
     written_bytes += rhs.written_bytes;
 
+    result_rows += rhs.result_rows;
+    result_bytes += rhs.result_bytes;
+
+    elapsed_ns += rhs.elapsed_ns;
+
     return rhs.read_rows || rhs.written_rows;
 }
 
@@ -88,6 +93,11 @@ void Progress::reset()
 
     written_rows = 0;
     written_bytes = 0;
+
+    result_rows = 0;
+    result_bytes = 0;
+
+    elapsed_ns = 0;
 }
 
 ProgressValues Progress::getValues() const
@@ -103,6 +113,11 @@ ProgressValues Progress::getValues() const
     res.written_rows = written_rows.load(std::memory_order_relaxed);
     res.written_bytes = written_bytes.load(std::memory_order_relaxed);
 
+    res.result_rows = result_rows.load(std::memory_order_relaxed);
+    res.result_bytes = result_bytes.load(std::memory_order_relaxed);
+
+    res.elapsed_ns = elapsed_ns.load(std::memory_order_relaxed);
+
     return res;
 }
 
@@ -119,6 +134,11 @@ ProgressValues Progress::fetchValuesAndResetPiecewiseAtomically()
     res.written_rows = written_rows.fetch_and(0);
     res.written_bytes = written_bytes.fetch_and(0);
 
+    res.result_rows = result_rows.fetch_and(0);
+    res.result_bytes = result_bytes.fetch_and(0);
+
+    res.elapsed_ns = elapsed_ns.fetch_and(0);
+
     return res;
 }
 
@@ -135,6 +155,11 @@ Progress Progress::fetchAndResetPiecewiseAtomically()
     res.written_rows = written_rows.fetch_and(0);
     res.written_bytes = written_bytes.fetch_and(0);
 
+    res.result_rows = result_rows.fetch_and(0);
+    res.result_bytes = result_bytes.fetch_and(0);
+
+    res.elapsed_ns = elapsed_ns.fetch_and(0);
+
     return res;
 }
 
@@ -149,6 +174,11 @@ Progress & Progress::operator=(Progress && other) noexcept
     written_rows = other.written_rows.load(std::memory_order_relaxed);
     written_bytes = other.written_bytes.load(std::memory_order_relaxed);
 
+    result_rows = other.result_rows.load(std::memory_order_relaxed);
+    result_bytes = other.result_bytes.load(std::memory_order_relaxed);
+
+    elapsed_ns = other.elapsed_ns.load(std::memory_order_relaxed);
+
     return *this;
 }
 
@@ -163,6 +193,8 @@ void Progress::read(ReadBuffer & in, UInt64 server_revision)
 
     written_rows.store(values.written_rows, std::memory_order_relaxed);
     written_bytes.store(values.written_bytes, std::memory_order_relaxed);
+
+    elapsed_ns.store(values.elapsed_ns, std::memory_order_relaxed);
 }
 
 void Progress::write(WriteBuffer & out, UInt64 client_revision) const
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index f04822f26bb..c21b1b854b0 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -16,14 +16,19 @@ class WriteBuffer;
 /// See Progress.
 struct ProgressValues
 {
-    size_t read_rows;
-    size_t read_bytes;
+    UInt64 read_rows = 0;
+    UInt64 read_bytes = 0;
 
-    size_t total_rows_to_read;
-    size_t total_bytes_to_read;
+    UInt64 total_rows_to_read = 0;
+    UInt64 total_bytes_to_read = 0;
 
-    size_t written_rows;
-    size_t written_bytes;
+    UInt64 written_rows = 0;
+    UInt64 written_bytes = 0;
+
+    UInt64 result_rows = 0;
+    UInt64 result_bytes = 0;
+
+    UInt64 elapsed_ns = 0;
 
     void read(ReadBuffer & in, UInt64 server_revision);
     void write(WriteBuffer & out, UInt64 client_revision) const;
@@ -32,30 +37,39 @@ struct ProgressValues
 
 struct ReadProgress
 {
-    size_t read_rows;
-    size_t read_bytes;
-    size_t total_rows_to_read;
+    UInt64 read_rows = 0;
+    UInt64 read_bytes = 0;
+    UInt64 total_rows_to_read = 0;
 
-    ReadProgress(size_t read_rows_, size_t read_bytes_, size_t total_rows_to_read_ = 0)
+    ReadProgress(UInt64 read_rows_, UInt64 read_bytes_, UInt64 total_rows_to_read_ = 0)
         : read_rows(read_rows_), read_bytes(read_bytes_), total_rows_to_read(total_rows_to_read_) {}
 };
 
 struct WriteProgress
 {
-    size_t written_rows;
-    size_t written_bytes;
+    UInt64 written_rows = 0;
+    UInt64 written_bytes = 0;
 
-    WriteProgress(size_t written_rows_, size_t written_bytes_)
+    WriteProgress(UInt64 written_rows_, UInt64 written_bytes_)
         : written_rows(written_rows_), written_bytes(written_bytes_) {}
 };
 
+struct ResultProgress
+{
+    UInt64 result_rows = 0;
+    UInt64 result_bytes = 0;
+
+    ResultProgress(UInt64 result_rows_, UInt64 result_bytes_)
+        : result_rows(result_rows_), result_bytes(result_bytes_) {}
+};
+
 struct FileProgress
 {
     /// Here read_bytes (raw bytes) - do not equal ReadProgress::read_bytes, which are calculated according to column types.
-    size_t read_bytes;
-    size_t total_bytes_to_read;
+    UInt64 read_bytes = 0;
+    UInt64 total_bytes_to_read = 0;
 
-    explicit FileProgress(size_t read_bytes_, size_t total_bytes_to_read_ = 0) : read_bytes(read_bytes_), total_bytes_to_read(total_bytes_to_read_) {}
+    explicit FileProgress(UInt64 read_bytes_, UInt64 total_bytes_to_read_ = 0) : read_bytes(read_bytes_), total_bytes_to_read(total_bytes_to_read_) {}
 };
 
 
@@ -65,28 +79,36 @@ struct FileProgress
   */
 struct Progress
 {
-    std::atomic<size_t> read_rows {0};        /// Rows (source) processed.
-    std::atomic<size_t> read_bytes {0};       /// Bytes (uncompressed, source) processed.
+    std::atomic<UInt64> read_rows {0};        /// Rows (source) processed.
+    std::atomic<UInt64> read_bytes {0};       /// Bytes (uncompressed, source) processed.
 
     /** How much rows/bytes must be processed, in total, approximately. Non-zero value is sent when there is information about
       * some new part of job. Received values must be summed to get estimate of total rows to process.
       */
-    std::atomic<size_t> total_rows_to_read {0};
-    std::atomic<size_t> total_bytes_to_read {0};
+    std::atomic<UInt64> total_rows_to_read {0};
+    std::atomic<UInt64> total_bytes_to_read {0};
 
-    std::atomic<size_t> written_rows {0};
-    std::atomic<size_t> written_bytes {0};
+    std::atomic<UInt64> written_rows {0};
+    std::atomic<UInt64> written_bytes {0};
+
+    std::atomic<UInt64> result_rows {0};
+    std::atomic<UInt64> result_bytes {0};
+
+    std::atomic<UInt64> elapsed_ns {0};
 
     Progress() = default;
 
-    Progress(size_t read_rows_, size_t read_bytes_, size_t total_rows_to_read_ = 0)
+    Progress(UInt64 read_rows_, UInt64 read_bytes_, UInt64 total_rows_to_read_ = 0)
         : read_rows(read_rows_), read_bytes(read_bytes_), total_rows_to_read(total_rows_to_read_) {}
 
     explicit Progress(ReadProgress read_progress)
         : read_rows(read_progress.read_rows), read_bytes(read_progress.read_bytes), total_rows_to_read(read_progress.total_rows_to_read) {}
 
     explicit Progress(WriteProgress write_progress)
-        : written_rows(write_progress.written_rows), written_bytes(write_progress.written_bytes)  {}
+        : written_rows(write_progress.written_rows), written_bytes(write_progress.written_bytes) {}
+
+    explicit Progress(ResultProgress result_progress)
+        : result_rows(result_progress.result_rows), result_bytes(result_progress.result_bytes) {}
 
     explicit Progress(FileProgress file_progress)
         : read_bytes(file_progress.read_bytes), total_bytes_to_read(file_progress.total_bytes_to_read) {}
diff --git a/src/IO/ReadBufferFromEncryptedFile.cpp b/src/IO/ReadBufferFromEncryptedFile.cpp
index 16517422e26..22f994bb44b 100644
--- a/src/IO/ReadBufferFromEncryptedFile.cpp
+++ b/src/IO/ReadBufferFromEncryptedFile.cpp
@@ -21,7 +21,6 @@ ReadBufferFromEncryptedFile::ReadBufferFromEncryptedFile(
     , encryptor(header_.algorithm, key_, header_.init_vector)
 {
     offset = offset_;
-    encryptor.setOffset(offset_);
     need_seek = true;
 }
 
@@ -60,9 +59,6 @@ off_t ReadBufferFromEncryptedFile::seek(off_t off, int whence)
         assert(!hasPendingData());
     }
 
-    /// The encryptor always needs to know what the current offset is.
-    encryptor.setOffset(new_pos);
-
     return new_pos;
 }
 
@@ -94,6 +90,10 @@ bool ReadBufferFromEncryptedFile::nextImpl()
     /// The used cipher algorithms generate the same number of bytes in output as it were in input,
     /// so after deciphering the numbers of bytes will be still `bytes_read`.
     working_buffer.resize(bytes_read);
+
+    /// The decryptor needs to know what the current offset is (because it's used in the decryption algorithm).
+    encryptor.setOffset(offset);
+
     encryptor.decrypt(encrypted_buffer.data(), bytes_read, working_buffer.begin());
 
     offset += bytes_read;
diff --git a/src/IO/ReadBufferFromEncryptedFile.h b/src/IO/ReadBufferFromEncryptedFile.h
index 2b9464114c9..267477b3b98 100644
--- a/src/IO/ReadBufferFromEncryptedFile.h
+++ b/src/IO/ReadBufferFromEncryptedFile.h
@@ -38,6 +38,7 @@ private:
     std::unique_ptr<ReadBufferFromFileBase> in;
 
     off_t offset = 0;
+
     bool need_seek = false;
 
     Memory<> encrypted_buffer;
diff --git a/src/IO/ReadBufferFromFileDecorator.h b/src/IO/ReadBufferFromFileDecorator.h
index 6e62c7f741b..1d035e8d74b 100644
--- a/src/IO/ReadBufferFromFileDecorator.h
+++ b/src/IO/ReadBufferFromFileDecorator.h
@@ -27,6 +27,8 @@ public:
 
     ReadBuffer & getWrappedReadBuffer() { return *impl; }
 
+    bool isIntegratedWithFilesystemCache() const override { return impl->isIntegratedWithFilesystemCache(); }
+
     size_t getFileSize() override;
 
 protected:
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 920e76cd7d0..ffb7bff8afb 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -57,7 +57,7 @@ bool ReadBufferFromFileDescriptor::nextImpl()
 
     /// This is a workaround of a read pass EOF bug in linux kernel with pread()
     if (file_size.has_value() && file_offset_of_buffer_end >= *file_size)
-        return false;
+         return false;
 
     size_t bytes_read = 0;
     while (!bytes_read)
@@ -81,8 +81,7 @@ bool ReadBufferFromFileDescriptor::nextImpl()
         if (-1 == res && errno != EINTR)
         {
             ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadFailed);
-            throwFromErrnoWithPath("Cannot read from file " + getFileName(), getFileName(),
-                                   ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR);
+            throwFromErrnoWithPath("Cannot read from file: " + getFileName(), getFileName(), ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR);
         }
 
         if (res > 0)
diff --git a/src/IO/ReadBufferFromFileDescriptor.h b/src/IO/ReadBufferFromFileDescriptor.h
index 73c651189cd..6b68b8b6dfd 100644
--- a/src/IO/ReadBufferFromFileDescriptor.h
+++ b/src/IO/ReadBufferFromFileDescriptor.h
@@ -18,6 +18,7 @@ protected:
     bool use_pread = false;               /// To access one fd from multiple threads, use 'pread' syscall instead of 'read'.
 
     size_t file_offset_of_buffer_end = 0; /// What offset in file corresponds to working_buffer.end().
+
     int fd;
 
     bool nextImpl() override;
@@ -51,6 +52,8 @@ public:
 
     Range getRemainingReadRange() const override { return Range{ .left = file_offset_of_buffer_end, .right = std::nullopt }; }
 
+    size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
+
     /// If 'offset' is small enough to stay in buffer after seek, then true seek in file does not happen.
     off_t seek(off_t off, int whence) override;
 
@@ -61,8 +64,6 @@ public:
 
     void setProgressCallback(ContextPtr context);
 
-    size_t getFileOffsetOfBufferEnd() const override { return file_offset_of_buffer_end; }
-
 private:
     /// Assuming file descriptor supports 'select', check that we have data to read or wait until timeout.
     bool poll(size_t timeout_microseconds);
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index a6cb52cd273..dbd6cf9667f 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -73,6 +73,8 @@ public:
 
     size_t getFileOffsetOfBufferEnd() const override { return offset; }
 
+    bool supportsRightBoundedReads() const override { return true; }
+
     String getFileName() const override { return bucket + "/" + key; }
 
 private:
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index c2b0a0f65d7..fb5d0b9aea4 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -10,6 +10,7 @@
 #include <IO/Operators.h>
 #include <base/find_symbols.h>
 #include <cstdlib>
+#include <bit>
 
 #ifdef __SSE2__
     #include <emmintrin.h>
@@ -698,7 +699,7 @@ void readCSVStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::CSV &
                     uint16_t bit_mask = _mm_movemask_epi8(eq);
                     if (bit_mask)
                     {
-                        next_pos += __builtin_ctz(bit_mask);
+                        next_pos += std::countr_zero(bit_mask);
                         return;
                     }
                 }
@@ -716,7 +717,7 @@ void readCSVStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::CSV &
                     uint64_t bit_mask = get_nibble_mask(eq);
                     if (bit_mask)
                     {
-                        next_pos += __builtin_ctzll(bit_mask) >> 2;
+                        next_pos += std::countr_zero(bit_mask) >> 2;
                         return;
                     }
                 }
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 7a5df1ed5ac..502e76a6c5e 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -7,6 +7,7 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
+#include <bit>
 
 #include <type_traits>
 
@@ -1027,15 +1028,17 @@ requires is_arithmetic_v<T> && (sizeof(T) <= 8)
 inline void readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian architecture.
 {
     readPODBinary(x, buf);
-
-    if constexpr (sizeof(x) == 1)
-        return;
-    else if constexpr (sizeof(x) == 2)
-        x = __builtin_bswap16(x);
-    else if constexpr (sizeof(x) == 4)
-        x = __builtin_bswap32(x);
-    else if constexpr (sizeof(x) == 8)
-        x = __builtin_bswap64(x);
+    if constexpr (std::endian::native == std::endian::little)
+    {
+        if constexpr (sizeof(x) == 1)
+            return;
+        else if constexpr (sizeof(x) == 2)
+            x = __builtin_bswap16(x);
+        else if constexpr (sizeof(x) == 4)
+            x = __builtin_bswap32(x);
+        else if constexpr (sizeof(x) == 8)
+            x = __builtin_bswap64(x);
+    }
 }
 
 template <typename T>
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index 2a2691e3c06..199ae4dcf7f 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -78,10 +78,16 @@ struct ReadSettings
 
     size_t remote_fs_read_max_backoff_ms = 10000;
     size_t remote_fs_read_backoff_max_tries = 4;
+
     bool enable_filesystem_cache = true;
     size_t filesystem_cache_max_wait_sec = 1;
     bool read_from_filesystem_cache_if_exists_otherwise_bypass_cache = false;
     bool enable_filesystem_cache_log = false;
+    bool is_file_cache_persistent = false; /// Some files can be made non-evictable.
+    /// Some buffers which read via thread pool can also do caching in threadpool
+    /// (instead of caching the result outside of threadpool). By default, if they support it,
+    /// they will do it. But this behaviour can be changed with this setting.
+    bool enable_filesystem_cache_on_lower_level = true;
 
     size_t max_query_cache_size = (128UL * 1024 * 1024 * 1024);
     bool skip_download_if_exceeds_query_cache = true;
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
index d5abc4609ed..63496054e85 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -207,21 +207,7 @@ namespace detail
                 return *file_size;
 
             Poco::Net::HTTPResponse response;
-            for (size_t i = 0; i < settings.http_max_tries; ++i)
-            {
-                try
-                {
-                    callWithRedirects(response, Poco::Net::HTTPRequest::HTTP_HEAD);
-                    break;
-                }
-                catch (const Poco::Exception & e)
-                {
-                    if (i == settings.http_max_tries - 1)
-                        throw;
-
-                    LOG_ERROR(log, "Failed to make HTTP_HEAD request to {}. Error: {}", uri.toString(), e.displayText());
-                }
-            }
+            getHeadResponse(response);
 
             if (response.hasContentLength())
             {
@@ -250,6 +236,25 @@ namespace detail
         InitializeError initialization_error = InitializeError::NONE;
 
     private:
+        void getHeadResponse(Poco::Net::HTTPResponse & response)
+        {
+            for (size_t i = 0; i < settings.http_max_tries; ++i)
+            {
+                try
+                {
+                    callWithRedirects(response, Poco::Net::HTTPRequest::HTTP_HEAD);
+                    break;
+                }
+                catch (const Poco::Exception & e)
+                {
+                    if (i == settings.http_max_tries - 1)
+                        throw;
+
+                    LOG_ERROR(log, "Failed to make HTTP_HEAD request to {}. Error: {}", uri.toString(), e.displayText());
+                }
+            }
+        }
+
         void setupExternalBuffer()
         {
             /**
@@ -669,6 +674,22 @@ namespace detail
         }
 
         const std::string & getCompressionMethod() const { return content_encoding; }
+
+        std::optional<time_t> getLastModificationTime()
+        {
+            Poco::Net::HTTPResponse response;
+            getHeadResponse(response);
+            if (!response.has("Last-Modified"))
+                return std::nullopt;
+
+            String date_str = response.get("Last-Modified");
+            struct tm info;
+            char * res = strptime(date_str.data(), "%a, %d %b %Y %H:%M:%S %Z", &info);
+            if (!res || res != date_str.data() + date_str.size())
+                return std::nullopt;
+
+            return timegm(&info);
+        }
     };
 }
 
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index cea03277c91..fb9cff5d109 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -790,7 +790,8 @@ namespace S3
                             quoteString(bucket), !uri.empty() ? " (" + uri.toString() + ")" : "");
     }
 
-    size_t getObjectSize(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id, bool throw_on_error)
+
+    S3::ObjectInfo getObjectInfo(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id, bool throw_on_error)
     {
         Aws::S3::Model::HeadObjectRequest req;
         req.SetBucket(bucket);
@@ -804,13 +805,18 @@ namespace S3
         if (outcome.IsSuccess())
         {
             auto read_result = outcome.GetResultWithOwnership();
-            return static_cast<size_t>(read_result.GetContentLength());
+            return {.size = static_cast<size_t>(read_result.GetContentLength()), .last_modification_time = read_result.GetLastModified().Millis() / 1000};
         }
         else if (throw_on_error)
         {
             throw DB::Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
         }
-        return 0;
+        return {};
+    }
+
+    size_t getObjectSize(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id, bool throw_on_error)
+    {
+        return getObjectInfo(client_ptr, bucket, key, version_id, throw_on_error).size;
     }
 }
 
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 327730d9740..46a09ee8901 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -78,6 +78,14 @@ struct URI
     static void validateBucket(const String & bucket, const Poco::URI & uri);
 };
 
+struct ObjectInfo
+{
+    size_t size = 0;
+    time_t last_modification_time = 0;
+};
+
+S3::ObjectInfo getObjectInfo(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id = {}, bool throw_on_error = true);
+
 size_t getObjectSize(std::shared_ptr<const Aws::S3::S3Client> client_ptr, const String & bucket, const String & key, const String & version_id = {}, bool throw_on_error = true);
 
 }
diff --git a/src/IO/SeekableReadBuffer.h b/src/IO/SeekableReadBuffer.h
index 1187f7b92ba..b4d5779d423 100644
--- a/src/IO/SeekableReadBuffer.h
+++ b/src/IO/SeekableReadBuffer.h
@@ -44,6 +44,8 @@ public:
     {
         size_t left;
         std::optional<size_t> right;
+
+        String toString() const { return fmt::format("[{}:{}]", left, right ? std::to_string(*right) : "None"); }
     };
 
     /**
@@ -59,6 +61,10 @@ public:
     virtual String getInfoForLog() { return ""; }
 
     virtual size_t getFileOffsetOfBufferEnd() const { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getFileOffsetOfBufferEnd() not implemented"); }
+
+    virtual bool supportsRightBoundedReads() const { return false; }
+
+    virtual bool isIntegratedWithFilesystemCache() const { return false; }
 };
 
 using SeekableReadBufferPtr = std::shared_ptr<SeekableReadBuffer>;
diff --git a/src/IO/UncompressedCache.h b/src/IO/UncompressedCache.h
index 93ca1235a42..3d1c907d364 100644
--- a/src/IO/UncompressedCache.h
+++ b/src/IO/UncompressedCache.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <Common/LRUCache.h>
 #include <Common/SipHash.h>
 #include <Common/ProfileEvents.h>
 #include <Common/HashTable/Hash.h>
 #include <IO/BufferWithOwnMemory.h>
+#include <Common/CacheBase.h>
 
 
 namespace ProfileEvents
@@ -36,14 +36,14 @@ struct UncompressedSizeWeightFunction
 
 /** Cache of decompressed blocks for implementation of CachedCompressedReadBuffer. thread-safe.
   */
-class UncompressedCache : public LRUCache<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>
+class UncompressedCache : public CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>
 {
 private:
-    using Base = LRUCache<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
+    using Base = CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
 
 public:
-    explicit UncompressedCache(size_t max_size_in_bytes)
-        : Base(max_size_in_bytes) {}
+    explicit UncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy = "")
+        : Base(max_size_in_bytes, 0, uncompressed_cache_policy) {}
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file, size_t offset)
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index 25acb71596a..ba49c16c11f 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -18,6 +18,8 @@ namespace ProfileEvents
     extern const Event WriteBufferFromFileDescriptorWriteFailed;
     extern const Event WriteBufferFromFileDescriptorWriteBytes;
     extern const Event DiskWriteElapsedMicroseconds;
+    extern const Event FileSync;
+    extern const Event FileSyncElapsedMicroseconds;
 }
 
 namespace CurrentMetrics
@@ -113,12 +115,18 @@ void WriteBufferFromFileDescriptor::sync()
     /// If buffer has pending data - write it.
     next();
 
+    ProfileEvents::increment(ProfileEvents::FileSync);
+
+    Stopwatch watch;
+
     /// Request OS to sync data with storage medium.
 #if defined(OS_DARWIN)
     int res = ::fsync(fd);
 #else
     int res = ::fdatasync(fd);
 #endif
+    ProfileEvents::increment(ProfileEvents::FileSyncElapsedMicroseconds, watch.elapsedMicroseconds());
+
     if (-1 == res)
         throwFromErrnoWithPath("Cannot fsync " + getFileName(), getFileName(), ErrorCodes::CANNOT_FSYNC);
 }
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 51f0c0d0743..7da38b3df45 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -3,8 +3,8 @@
 #if USE_AWS_S3
 
 #include <Common/logger_useful.h>
-#include <Common/IFileCache.h>
 #include <Common/Throttler.h>
+#include <Common/FileCache.h>
 
 #include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>
@@ -22,7 +22,6 @@
 namespace ProfileEvents
 {
     extern const Event WriteBufferFromS3Bytes;
-    extern const Event CachedReadBufferCacheWriteBytes;
 }
 
 namespace DB
@@ -43,7 +42,6 @@ struct WriteBufferFromS3::UploadPartTask
     bool is_finised = false;
     std::string tag;
     std::exception_ptr exception;
-    std::optional<FileSegmentsHolder> cache_files;
 };
 
 struct WriteBufferFromS3::PutObjectTask
@@ -51,7 +49,6 @@ struct WriteBufferFromS3::PutObjectTask
     Aws::S3::Model::PutObjectRequest req;
     bool is_finised = false;
     std::exception_ptr exception;
-    std::optional<FileSegmentsHolder> cache_files;
 };
 
 WriteBufferFromS3::WriteBufferFromS3(
@@ -62,8 +59,7 @@ WriteBufferFromS3::WriteBufferFromS3(
     std::optional<std::map<String, String>> object_metadata_,
     size_t buffer_size_,
     ScheduleFunc schedule_,
-    const WriteSettings & write_settings_,
-    FileCachePtr cache_)
+    const WriteSettings & write_settings_)
     : BufferWithOwnMemory<WriteBuffer>(buffer_size_, nullptr, 0)
     , bucket(bucket_)
     , key(key_)
@@ -73,7 +69,6 @@ WriteBufferFromS3::WriteBufferFromS3(
     , object_metadata(std::move(object_metadata_))
     , schedule(std::move(schedule_))
     , write_settings(write_settings_)
-    , cache(cache_)
 {
     allocateBuffer();
 }
@@ -94,35 +89,6 @@ void WriteBufferFromS3::nextImpl()
             ? CurrentThread::get().getThreadGroup()
             : MainThreadStatus::getInstance().getThreadGroup();
 
-    if (cacheEnabled())
-    {
-        auto cache_key = cache->hash(key);
-
-        file_segments_holder.emplace(cache->setDownloading(cache_key, current_download_offset, size, /* is_persistent */false));
-        current_download_offset += size;
-
-        size_t remaining_size = size;
-        auto & file_segments = file_segments_holder->file_segments;
-        for (auto file_segment_it = file_segments.begin(); file_segment_it != file_segments.end(); ++file_segment_it)
-        {
-            auto & file_segment = *file_segment_it;
-            size_t current_size = std::min(file_segment->range().size(), remaining_size);
-            remaining_size -= current_size;
-
-            if (file_segment->reserve(current_size))
-            {
-                file_segment->writeInMemory(working_buffer.begin(), current_size);
-            }
-            else
-            {
-                for (auto reset_segment_it = file_segment_it; reset_segment_it != file_segments.end(); ++reset_segment_it)
-                    (*reset_segment_it)->complete(FileSegment::State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
-                file_segments.erase(file_segment_it, file_segments.end());
-                break;
-            }
-        }
-    }
-
     ProfileEvents::increment(ProfileEvents::WriteBufferFromS3Bytes, offset());
     last_part_size += offset();
     if (write_settings.remote_throttler)
@@ -137,7 +103,6 @@ void WriteBufferFromS3::nextImpl()
         writePart();
 
         allocateBuffer();
-        file_segments_holder.reset();
     }
 
     waitForReadyBackGroundTasks();
@@ -173,11 +138,6 @@ WriteBufferFromS3::~WriteBufferFromS3()
 #endif
 }
 
-bool WriteBufferFromS3::cacheEnabled() const
-{
-    return cache != nullptr;
-}
-
 void WriteBufferFromS3::preFinalize()
 {
     next();
@@ -256,6 +216,7 @@ void WriteBufferFromS3::writePart()
     if (schedule)
     {
         UploadPartTask * task = nullptr;
+
         int part_number;
         {
             std::lock_guard lock(bg_tasks_mutex);
@@ -264,58 +225,49 @@ void WriteBufferFromS3::writePart()
             part_number = num_added_bg_tasks;
         }
 
-        fillUploadRequest(task->req, part_number);
-
-        if (file_segments_holder)
+        /// Notify waiting thread when task finished
+        auto task_finish_notify = [&, task]()
         {
-            task->cache_files.emplace(std::move(*file_segments_holder));
-            file_segments_holder.reset();
+            std::lock_guard lock(bg_tasks_mutex);
+            task->is_finised = true;
+            ++num_finished_bg_tasks;
+
+            /// Notification under mutex is important here.
+            /// Otherwise, WriteBuffer could be destroyed in between
+            /// Releasing lock and condvar notification.
+            bg_tasks_condvar.notify_one();
+        };
+
+        try
+        {
+            fillUploadRequest(task->req, part_number);
+
+            schedule([this, task, task_finish_notify]()
+            {
+                try
+                {
+                    processUploadRequest(*task);
+                }
+                catch (...)
+                {
+                    task->exception = std::current_exception();
+                }
+
+                task_finish_notify();
+            });
         }
-
-        schedule([this, task]()
+        catch (...)
         {
-            try
-            {
-                processUploadRequest(*task);
-            }
-            catch (...)
-            {
-                task->exception = std::current_exception();
-            }
-
-            try
-            {
-                finalizeCacheIfNeeded(task->cache_files);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-
-            {
-                std::lock_guard lock(bg_tasks_mutex);
-                task->is_finised = true;
-                ++num_finished_bg_tasks;
-
-                /// Notification under mutex is important here.
-                /// Otherwise, WriteBuffer could be destroyed in between
-                /// Releasing lock and condvar notification.
-                bg_tasks_condvar.notify_one();
-            }
-        });
+            task_finish_notify();
+            throw;
+        }
     }
     else
     {
         UploadPartTask task;
         fillUploadRequest(task.req, part_tags.size() + 1);
-        if (file_segments_holder)
-        {
-            task.cache_files.emplace(std::move(*file_segments_holder));
-            file_segments_holder.reset();
-        }
         processUploadRequest(task);
         part_tags.push_back(task.tag);
-        finalizeCacheIfNeeded(task.cache_files);
     }
 }
 
@@ -397,55 +349,47 @@ void WriteBufferFromS3::makeSinglepartUpload()
     {
         put_object_task = std::make_unique<PutObjectTask>();
 
-        fillPutRequest(put_object_task->req);
-        if (file_segments_holder)
+        /// Notify waiting thread when put object task finished
+        auto task_notify_finish = [&]()
         {
-            put_object_task->cache_files.emplace(std::move(*file_segments_holder));
-            file_segments_holder.reset();
+            std::lock_guard lock(bg_tasks_mutex);
+            put_object_task->is_finised = true;
+
+            /// Notification under mutex is important here.
+            /// Othervies, WriteBuffer could be destroyed in between
+            /// Releasing lock and condvar notification.
+            bg_tasks_condvar.notify_one();
+        };
+
+        try
+        {
+            fillPutRequest(put_object_task->req);
+
+            schedule([this, task_notify_finish]()
+            {
+                try
+                {
+                    processPutRequest(*put_object_task);
+                }
+                catch (...)
+                {
+                    put_object_task->exception = std::current_exception();
+                }
+
+                task_notify_finish();
+            });
         }
-
-        schedule([this]()
+        catch (...)
         {
-            try
-            {
-                processPutRequest(*put_object_task);
-            }
-            catch (...)
-            {
-                put_object_task->exception = std::current_exception();
-            }
-
-            try
-            {
-                finalizeCacheIfNeeded(put_object_task->cache_files);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-
-            {
-                std::lock_guard lock(bg_tasks_mutex);
-                put_object_task->is_finised = true;
-
-                /// Notification under mutex is important here.
-                /// Othervies, WriteBuffer could be destroyed in between
-                /// Releasing lock and condvar notification.
-                bg_tasks_condvar.notify_one();
-            }
-        });
+            task_notify_finish();
+            throw;
+        }
     }
     else
     {
         PutObjectTask task;
         fillPutRequest(task.req);
-        if (file_segments_holder)
-        {
-            task.cache_files.emplace(std::move(*file_segments_holder));
-            file_segments_holder.reset();
-        }
         processPutRequest(task);
-        finalizeCacheIfNeeded(task.cache_files);
     }
 }
 
@@ -472,28 +416,6 @@ void WriteBufferFromS3::processPutRequest(PutObjectTask & task)
         throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
 }
 
-void WriteBufferFromS3::finalizeCacheIfNeeded(std::optional<FileSegmentsHolder> & file_segments_holder)
-{
-    if (!file_segments_holder)
-        return;
-
-    auto & file_segments = file_segments_holder->file_segments;
-    for (auto file_segment_it = file_segments.begin(); file_segment_it != file_segments.end();)
-    {
-        try
-        {
-            size_t size = (*file_segment_it)->finalizeWrite();
-            file_segment_it = file_segments.erase(file_segment_it);
-
-            ProfileEvents::increment(ProfileEvents::CachedReadBufferCacheWriteBytes, size);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-}
-
 void WriteBufferFromS3::waitForReadyBackGroundTasks()
 {
     if (schedule)
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index e79051823c4..99440654910 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -7,13 +7,10 @@
 #include <memory>
 #include <vector>
 #include <list>
-#include <Common/logger_useful.h>
+
 #include <base/types.h>
-
+#include <Common/logger_useful.h>
 #include <Common/ThreadPool.h>
-#include <Common/FileCache_fwd.h>
-#include <Common/FileSegment.h>
-
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteSettings.h>
@@ -21,6 +18,7 @@
 
 #include <aws/core/utils/memory/stl/AWSStringStream.h>
 
+
 namespace Aws::S3
 {
 class S3Client;
@@ -56,8 +54,7 @@ public:
         std::optional<std::map<String, String>> object_metadata_ = std::nullopt,
         size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
         ScheduleFunc schedule_ = {},
-        const WriteSettings & write_settings_ = {},
-        FileCachePtr cache_ = nullptr);
+        const WriteSettings & write_settings_ = {});
 
     ~WriteBufferFromS3() override;
 
@@ -88,8 +85,6 @@ private:
     void waitForReadyBackGroundTasks();
     void waitForAllBackGroundTasks();
 
-    bool cacheEnabled() const;
-
     String bucket;
     String key;
     std::shared_ptr<const Aws::S3::S3Client> client_ptr;
@@ -122,11 +117,6 @@ private:
     Poco::Logger * log = &Poco::Logger::get("WriteBufferFromS3");
 
     WriteSettings write_settings;
-
-    FileCachePtr cache;
-    size_t current_download_offset = 0;
-    std::optional<FileSegmentsHolder> file_segments_holder;
-    static void finalizeCacheIfNeeded(std::optional<FileSegmentsHolder> &);
 };
 
 }
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 2903a70b61a..f9892ac6194 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <iterator>
 #include <concepts>
+#include <bit>
 
 #include <pcg-random/pcg_random.hpp>
 
@@ -1110,13 +1111,15 @@ template <typename T>
 requires is_arithmetic_v<T> && (sizeof(T) <= 8)
 inline void writeBinaryBigEndian(T x, WriteBuffer & buf)    /// Assuming little endian architecture.
 {
-    if constexpr (sizeof(x) == 2)
-        x = __builtin_bswap16(x);
-    else if constexpr (sizeof(x) == 4)
-        x = __builtin_bswap32(x);
-    else if constexpr (sizeof(x) == 8)
-        x = __builtin_bswap64(x);
-
+    if constexpr (std::endian::native == std::endian::little)
+    {
+        if constexpr (sizeof(x) == 2)
+            x = __builtin_bswap16(x);
+        else if constexpr (sizeof(x) == 4)
+            x = __builtin_bswap32(x);
+        else if constexpr (sizeof(x) == 8)
+            x = __builtin_bswap64(x);
+    }
     writePODBinary(x, buf);
 }
 
diff --git a/src/IO/WriteSettings.h b/src/IO/WriteSettings.h
index 7530b27794a..ec2b5d17ec2 100644
--- a/src/IO/WriteSettings.h
+++ b/src/IO/WriteSettings.h
@@ -8,10 +8,13 @@ namespace DB
 /// Settings to be passed to IDisk::writeFile()
 struct WriteSettings
 {
-    bool enable_filesystem_cache_on_write_operations = false;
-
     /// Bandwidth throttler to use during writing
     ThrottlerPtr remote_throttler;
+
+    /// Filesystem cache settings
+    bool enable_filesystem_cache_on_write_operations = false;
+    bool enable_filesystem_cache_log = false;
+    bool is_file_cache_persistent = false;
 };
 
 }
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index 3c6f9b8f9f5..df3f02708a9 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -697,4 +697,9 @@ bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & i
     return parseDateTime64BestEffortImpl<bool, false>(res, scale, in, local_time_zone, utc_time_zone);
 }
 
+bool tryParseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
+{
+    return parseDateTime64BestEffortImpl<bool, true>(res, scale, in, local_time_zone, utc_time_zone);
+}
+
 }
diff --git a/src/IO/parseDateTimeBestEffort.h b/src/IO/parseDateTimeBestEffort.h
index fe3da24a797..22af44f9e76 100644
--- a/src/IO/parseDateTimeBestEffort.h
+++ b/src/IO/parseDateTimeBestEffort.h
@@ -27,7 +27,6 @@ class ReadBuffer;
   *
   * DD/MM/YY
   * DD/MM/YYYY - when '/' separator is used, these are the only possible forms
-  * Note that American style is not supported.
   *
   * hh:mm:ss - when ':' separator is used, it is always time
   * hh:mm - it can be specified without seconds
@@ -61,7 +60,7 @@ bool tryParseDateTimeBestEffort(time_t & res, ReadBuffer & in, const DateLUTImpl
 void parseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 void parseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
-void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
-
+void parseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
+bool tryParseDateTime64BestEffortUS(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 }
diff --git a/src/IO/tests/gtest_file_encryption.cpp b/src/IO/tests/gtest_file_encryption.cpp
index e9affee4add..cae40afbb38 100644
--- a/src/IO/tests/gtest_file_encryption.cpp
+++ b/src/IO/tests/gtest_file_encryption.cpp
@@ -8,6 +8,7 @@
 #include <IO/WriteBufferFromEncryptedFile.h>
 #include <IO/ReadBufferFromEncryptedFile.h>
 #include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
 #include <Common/getRandomASCIIString.h>
 #include <filesystem>
 
@@ -241,6 +242,23 @@ TEST(FileEncryptionPositionUpdateTest, Decryption)
     rb.ignore(5);
     rb.ignore(5);
     ASSERT_EQ(rb.getPosition(), 15);
+
+    String res;
+    readStringUntilEOF(res, rb);
+    ASSERT_EQ(res, data.substr(15));
+    res.clear();
+
+    rb.seek(0, SEEK_SET);
+    ASSERT_EQ(rb.getPosition(), 0);
+    res.resize(5);
+    rb.read(res.data(), res.size());
+    ASSERT_EQ(res, data.substr(0, 5));
+    res.clear();
+
+    rb.seek(1, SEEK_CUR);
+    ASSERT_EQ(rb.getPosition(), 6);
+    readStringUntilEOF(res, rb);
+    ASSERT_EQ(res, data.substr(6));
 }
 
 #endif
diff --git a/src/IO/tests/gtest_memory_resize.cpp b/src/IO/tests/gtest_memory_resize.cpp
new file mode 100644
index 00000000000..8619419a47a
--- /dev/null
+++ b/src/IO/tests/gtest_memory_resize.cpp
@@ -0,0 +1,328 @@
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <gtest/gtest.h>
+
+#define EXPECT_THROW_ERROR_CODE(statement, expected_exception, expected_code)    \
+    EXPECT_THROW(                                                                \
+        try                                                                      \
+        {                                                                        \
+            statement;                                                           \
+        }                                                                        \
+        catch (const expected_exception & e)                                     \
+        {                                                                        \
+            EXPECT_EQ(expected_code, e.code());                                  \
+            throw;                                                               \
+        }                                                                        \
+    , expected_exception)
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
+    extern const int CANNOT_ALLOCATE_MEMORY;
+}
+
+}
+
+using namespace DB;
+
+class DummyAllocator
+{
+    void * dummy_address = reinterpret_cast<void *>(1);
+
+public:
+    void * alloc(size_t size, size_t /*alignment*/ = 0)
+    {
+        checkSize(size);
+        if (size)
+            return dummy_address;
+        else
+            return nullptr;
+    }
+
+    void * realloc(void * /*buf*/, size_t /*old_size*/, size_t new_size, size_t /*alignment*/ = 0)
+    {
+        checkSize(new_size);
+        return dummy_address;
+    }
+
+    void free([[maybe_unused]] void * buf, size_t /*size*/)
+    {
+        assert(buf == dummy_address);
+    }
+
+    // the same check as in Common/Allocator.h
+    void static checkSize(size_t size)
+    {
+        /// More obvious exception in case of possible overflow (instead of just "Cannot mmap").
+        if (size >= 0x8000000000000000ULL)
+            throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Too large size ({}) passed to allocator. It indicates an error.", size);
+    }
+};
+
+TEST(MemoryResizeTest, SmallInitAndSmallResize)
+{
+    {
+        auto memory = Memory<DummyAllocator>(0);
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(0);
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+    }
+
+    {
+        auto memory = Memory<DummyAllocator>(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        memory.resize(0);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+    }
+}
+
+TEST(MemoryResizeTest, SmallInitAndBigResizeOverflowWhenPadding)
+{
+    {
+        auto memory = Memory<DummyAllocator>(0);
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        EXPECT_THROW_ERROR_CODE(memory.resize(std::numeric_limits<size_t>::max()), Exception, ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        ASSERT_EQ(memory.m_data, nullptr); // state is intact after exception
+        ASSERT_EQ(memory.m_size, 0);
+        ASSERT_EQ(memory.m_capacity, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        memory.resize(2);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 17);
+        ASSERT_EQ(memory.m_size, 2);
+
+        EXPECT_THROW_ERROR_CODE(memory.resize(std::numeric_limits<size_t>::max()), Exception, ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        ASSERT_TRUE(memory.m_data); // state is intact after exception
+        ASSERT_EQ(memory.m_capacity, 17);
+        ASSERT_EQ(memory.m_size, 2);
+
+        memory.resize(0x8000000000000000ULL-16);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 0x8000000000000000ULL - 1);
+        ASSERT_EQ(memory.m_size, 0x8000000000000000ULL - 16);
+
+#ifndef ABORT_ON_LOGICAL_ERROR
+        EXPECT_THROW_ERROR_CODE(memory.resize(0x8000000000000000ULL-15), Exception, ErrorCodes::LOGICAL_ERROR);
+        ASSERT_TRUE(memory.m_data);  // state is intact after exception
+        ASSERT_EQ(memory.m_capacity, 0x8000000000000000ULL - 1);
+        ASSERT_EQ(memory.m_size, 0x8000000000000000ULL - 16);
+#endif
+    }
+
+    {
+        auto memory = Memory<DummyAllocator>(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        EXPECT_THROW_ERROR_CODE(memory.resize(std::numeric_limits<size_t>::max()), Exception, ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        ASSERT_TRUE(memory.m_data); // state is intact after exception
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+#ifndef ABORT_ON_LOGICAL_ERROR
+        EXPECT_THROW_ERROR_CODE(memory.resize(0x8000000000000000ULL-15), Exception, ErrorCodes::LOGICAL_ERROR);
+        ASSERT_TRUE(memory.m_data); // state is intact after exception
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+#endif
+    }
+}
+
+
+TEST(MemoryResizeTest, BigInitAndSmallResizeOverflowWhenPadding)
+{
+    {
+        EXPECT_THROW_ERROR_CODE(
+        {
+            auto memory = Memory<DummyAllocator>(std::numeric_limits<size_t>::max());
+        }
+        , Exception
+        , ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+    }
+
+    {
+        EXPECT_THROW_ERROR_CODE(
+        {
+            auto memory = Memory<DummyAllocator>(std::numeric_limits<size_t>::max() - 1);
+        }
+        , Exception
+        , ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+    }
+
+    {
+        EXPECT_THROW_ERROR_CODE(
+        {
+            auto memory = Memory<DummyAllocator>(std::numeric_limits<size_t>::max() - 10);
+        }
+        , Exception
+        , ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+    }
+
+#ifndef ABORT_ON_LOGICAL_ERROR
+    {
+        EXPECT_THROW_ERROR_CODE(
+        {
+            auto memory = Memory<DummyAllocator>(std::numeric_limits<size_t>::max() - 15);
+        }
+        , Exception
+        , ErrorCodes::LOGICAL_ERROR);
+    }
+
+    {
+        EXPECT_THROW_ERROR_CODE(
+        {
+            auto memory = Memory<DummyAllocator>(0x8000000000000000ULL - 15);
+        }
+        , Exception
+        , ErrorCodes::LOGICAL_ERROR);
+    }
+#endif
+
+    {
+       auto memory = Memory<DummyAllocator>(0x8000000000000000ULL - 16);
+       ASSERT_TRUE(memory.m_data);
+       ASSERT_EQ(memory.m_capacity, 0x8000000000000000ULL - 1);
+       ASSERT_EQ(memory.m_size, 0x8000000000000000ULL - 16);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 0x8000000000000000ULL - 1);
+        ASSERT_EQ(memory.m_size, 1);
+    }
+}
+
+TEST(MemoryResizeTest, AlignmentWithRealAllocator)
+{
+    {
+        auto memory = Memory<>(0, 3); // not the power of 2 but less than MALLOC_MIN_ALIGNMENT 8 so user-defined alignment is ignored at Allocator
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        memory.resize(2);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 17);
+        ASSERT_EQ(memory.m_size, 2);
+
+        memory.resize(3);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 18);
+        ASSERT_EQ(memory.m_size, 3);
+
+        memory.resize(4);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 19);
+        ASSERT_EQ(memory.m_size, 4);
+
+        memory.resize(0);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 19);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 19);
+        ASSERT_EQ(memory.m_size, 1);
+    }
+
+#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && !defined(UNDEFINED_BEHAVIOR_SANITIZER)
+    {
+        auto memory = Memory<>(0, 10); // not the power of 2
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        EXPECT_THROW_ERROR_CODE(memory.resize(1), ErrnoException, ErrorCodes::CANNOT_ALLOCATE_MEMORY);
+        ASSERT_EQ(memory.m_data, nullptr); // state is intact after exception
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+    }
+#endif
+
+    {
+        auto memory = Memory<>(0, 32);
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        memory.resize(32);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 47);
+        ASSERT_EQ(memory.m_size, 32);
+    }
+}
+
+TEST(MemoryResizeTest, SomeAlignmentOverflowWhenAlignment)
+{
+    {
+        auto memory = Memory<DummyAllocator>(0, 31);
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(0);
+        ASSERT_EQ(memory.m_data, nullptr);
+        ASSERT_EQ(memory.m_capacity, 0);
+        ASSERT_EQ(memory.m_size, 0);
+
+        memory.resize(1);
+        ASSERT_TRUE(memory.m_data);
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+
+        EXPECT_THROW_ERROR_CODE(memory.resize(std::numeric_limits<size_t>::max()), Exception, ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        ASSERT_TRUE(memory.m_data); // state is intact after exception
+        ASSERT_EQ(memory.m_capacity, 16);
+        ASSERT_EQ(memory.m_size, 1);
+    }
+
+}
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index b91fd7ac5cf..3dc855b93ff 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/Context.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <Core/SortDescription.h>
 
 #include <stack>
 #include <base/sort.h>
@@ -57,7 +58,7 @@ void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
 ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs_)
 {
     for (const auto & input : inputs_)
-        index.push_back(&addInput(input.name, input.type));
+        outputs.push_back(&addInput(input.name, input.type));
 }
 
 ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
@@ -74,10 +75,10 @@ ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
             ///   without any respect to header structure. So, it is a way to drop materialized column and use
             ///   constant value from header.
             /// We cannot remove such input right now cause inputs positions are important in some cases.
-            index.push_back(&addColumn(input));
+            outputs.push_back(&addColumn(input));
         }
         else
-            index.push_back(&addInput(input.name, input.type));
+            outputs.push_back(&addInput(input.name, input.type));
     }
 }
 
@@ -144,6 +145,9 @@ const ActionsDAG::Node & ActionsDAG::addArrayJoin(const Node & child, std::strin
     if (!array_type)
         throw Exception("ARRAY JOIN requires array argument", ErrorCodes::TYPE_MISMATCH);
 
+    if (result_name.empty())
+        result_name = "arrayJoin(" + child.result_name + ")";
+
     Node node;
     node.type = ActionType::ARRAY_JOIN;
     node.result_type = array_type->getNestedType();
@@ -234,42 +238,42 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
     return addNode(std::move(node));
 }
 
-const ActionsDAG::Node & ActionsDAG::findInIndex(const std::string & name) const
+const ActionsDAG::Node & ActionsDAG::findInOutputs(const std::string & name) const
 {
-    if (const auto * node = tryFindInIndex(name))
+    if (const auto * node = tryFindInOutputs(name))
         return *node;
 
     throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER, "Unknown identifier: '{}'", name);
 }
 
-const ActionsDAG::Node * ActionsDAG::tryFindInIndex(const std::string & name) const
+const ActionsDAG::Node * ActionsDAG::tryFindInOutputs(const std::string & name) const
 {
-    for (const auto & node : index)
+    for (const auto & node : outputs)
         if (node->result_name == name)
             return node;
 
     return nullptr;
 }
 
-void ActionsDAG::addOrReplaceInIndex(const Node & node)
+void ActionsDAG::addOrReplaceInOutputs(const Node & node)
 {
-    for (auto & index_node : index)
+    for (auto & output_node : outputs)
     {
-        if (index_node->result_name == node.result_name)
+        if (output_node->result_name == node.result_name)
         {
-            index_node = &node;
+            output_node = &node;
             return;
         }
     }
 
-    index.push_back(&node);
+    outputs.push_back(&node);
 }
 
 NamesAndTypesList ActionsDAG::getRequiredColumns() const
 {
     NamesAndTypesList result;
-    for (const auto & input : inputs)
-        result.emplace_back(input->result_name, input->result_type);
+    for (const auto & input_node : inputs)
+        result.emplace_back(input_node->result_name, input_node->result_type);
 
     return result;
 }
@@ -279,8 +283,8 @@ Names ActionsDAG::getRequiredColumnsNames() const
     Names result;
     result.reserve(inputs.size());
 
-    for (const auto & input : inputs)
-        result.emplace_back(input->result_name);
+    for (const auto & input_node : inputs)
+        result.emplace_back(input_node->result_name);
 
     return result;
 }
@@ -288,8 +292,9 @@ Names ActionsDAG::getRequiredColumnsNames() const
 ColumnsWithTypeAndName ActionsDAG::getResultColumns() const
 {
     ColumnsWithTypeAndName result;
-    result.reserve(index.size());
-    for (const auto & node : index)
+    result.reserve(outputs.size());
+
+    for (const auto & node : outputs)
         result.emplace_back(node->column, node->result_type, node->result_name);
 
     return result;
@@ -298,7 +303,7 @@ ColumnsWithTypeAndName ActionsDAG::getResultColumns() const
 NamesAndTypesList ActionsDAG::getNamesAndTypesList() const
 {
     NamesAndTypesList result;
-    for (const auto & node : index)
+    for (const auto & node : outputs)
         result.emplace_back(node->result_name, node->result_type);
 
     return result;
@@ -307,8 +312,9 @@ NamesAndTypesList ActionsDAG::getNamesAndTypesList() const
 Names ActionsDAG::getNames() const
 {
     Names names;
-    names.reserve(index.size());
-    for (const auto & node : index)
+    names.reserve(outputs.size());
+
+    for (const auto & node : outputs)
         names.emplace_back(node->result_name);
 
     return names;
@@ -332,7 +338,7 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names, bool allow_
     required_nodes.reserve(required_names.size());
 
     NameSet added;
-    for (const auto & node : index)
+    for (const auto & node : outputs)
     {
         if (required_names.contains(node->result_name) && !added.contains(node->result_name))
         {
@@ -349,7 +355,7 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names, bool allow_
                                 "Unknown column: {}, there are only columns {}", name, dumpNames());
     }
 
-    index.swap(required_nodes);
+    outputs.swap(required_nodes);
     removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
 
@@ -359,7 +365,7 @@ void ActionsDAG::removeUnusedActions(const Names & required_names, bool allow_re
     required_nodes.reserve(required_names.size());
 
     std::unordered_map<std::string_view, const Node *> names_map;
-    for (const auto * node : index)
+    for (const auto * node : outputs)
         names_map[node->result_name] = node;
 
     for (const auto & name : required_names)
@@ -372,7 +378,7 @@ void ActionsDAG::removeUnusedActions(const Names & required_names, bool allow_re
         required_nodes.push_back(it->second);
     }
 
-    index.swap(required_nodes);
+    outputs.swap(required_nodes);
     removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
 
@@ -381,7 +387,7 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs, bool allow_consta
     std::unordered_set<const Node *> visited_nodes;
     std::stack<Node *> stack;
 
-    for (const auto * node : index)
+    for (const auto * node : outputs)
     {
         visited_nodes.insert(node);
         stack.push(const_cast<Node *>(node));
@@ -513,7 +519,7 @@ Block ActionsDAG::updateHeader(Block header) const
     }
 
     ColumnsWithTypeAndName result_columns;
-    result_columns.reserve(index.size());
+    result_columns.reserve(outputs.size());
 
     struct Frame
     {
@@ -522,12 +528,12 @@ Block ActionsDAG::updateHeader(Block header) const
     };
 
     {
-        for (const auto * output : index)
+        for (const auto * output_node : outputs)
         {
-            if (!node_to_column.contains(output))
+            if (!node_to_column.contains(output_node))
             {
                 std::stack<Frame> stack;
-                stack.push({.node = output});
+                stack.push({.node = output_node});
 
                 while (!stack.empty())
                 {
@@ -564,8 +570,8 @@ Block ActionsDAG::updateHeader(Block header) const
                 }
             }
 
-            if (node_to_column[output].column)
-                result_columns.push_back(node_to_column[output]);
+            if (node_to_column[output_node].column)
+                result_columns.push_back(node_to_column[output_node]);
         }
     }
 
@@ -589,35 +595,35 @@ NameSet ActionsDAG::foldActionsByProjection(
     const NameSet & required_columns, const Block & projection_block_for_keys, const String & predicate_column_name, bool add_missing_keys)
 {
     std::unordered_set<const Node *> visited_nodes;
-    std::unordered_set<std::string_view> visited_index_names;
+    std::unordered_set<std::string_view> visited_output_nodes_names;
     std::stack<Node *> stack;
 
-    /// Record all needed index nodes to start folding.
-    for (const auto & node : index)
+    /// Record all needed output nodes to start folding.
+    for (const auto & output_node : outputs)
     {
-        if (required_columns.find(node->result_name) != required_columns.end() || node->result_name == predicate_column_name)
+        if (required_columns.find(output_node->result_name) != required_columns.end() || output_node->result_name == predicate_column_name)
         {
-            visited_nodes.insert(node);
-            visited_index_names.insert(node->result_name);
-            stack.push(const_cast<Node *>(node));
+            visited_nodes.insert(output_node);
+            visited_output_nodes_names.insert(output_node->result_name);
+            stack.push(const_cast<Node *>(output_node));
         }
     }
 
-    /// If some required columns are not in any index node, try searching from all projection key
+    /// If some required columns are not in any output node, try searching from all projection key
     /// columns. If still missing, return empty set which means current projection fails to match
     /// (missing columns).
     if (add_missing_keys)
     {
         for (const auto & column : required_columns)
         {
-            if (visited_index_names.find(column) == visited_index_names.end())
+            if (visited_output_nodes_names.find(column) == visited_output_nodes_names.end())
             {
                 if (const ColumnWithTypeAndName * column_with_type_name = projection_block_for_keys.findByName(column))
                 {
                     const auto * node = &addInput(*column_with_type_name);
                     visited_nodes.insert(node);
-                    index.push_back(node);
-                    visited_index_names.insert(column);
+                    outputs.push_back(node);
+                    visited_output_nodes_names.insert(column);
                 }
                 else
                 {
@@ -659,20 +665,20 @@ NameSet ActionsDAG::foldActionsByProjection(
 
     /// Clean up unused nodes after folding.
     std::erase_if(inputs, [&](const Node * node) { return !visited_nodes.contains(node); });
-    std::erase_if(index, [&](const Node * node) { return !visited_index_names.contains(node->result_name); });
+    std::erase_if(outputs, [&](const Node * node) { return !visited_output_nodes_names.contains(node->result_name); });
     nodes.remove_if([&](const Node & node) { return !visited_nodes.contains(&node); });
 
     /// Calculate the required columns after folding.
     NameSet next_required_columns;
-    for (const auto & input : inputs)
-        next_required_columns.insert(input->result_name);
+    for (const auto & input_node : inputs)
+        next_required_columns.insert(input_node->result_name);
 
     return next_required_columns;
 }
 
 void ActionsDAG::reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map)
 {
-    ::sort(index.begin(), index.end(), [&key_names_pos_map](const Node * lhs, const Node * rhs)
+    ::sort(outputs.begin(), outputs.end(), [&key_names_pos_map](const Node * lhs, const Node * rhs)
     {
         return key_names_pos_map.find(lhs->result_name)->second < key_names_pos_map.find(rhs->result_name)->second;
     });
@@ -681,17 +687,21 @@ void ActionsDAG::reorderAggregationKeysForProjection(const std::unordered_map<st
 void ActionsDAG::addAggregatesViaProjection(const Block & aggregates)
 {
     for (const auto & aggregate : aggregates)
-        index.push_back(&addInput(aggregate));
+        outputs.push_back(&addInput(aggregate));
 }
 
 void ActionsDAG::addAliases(const NamesWithAliases & aliases)
 {
     std::unordered_map<std::string_view, size_t> names_map;
-    for (size_t i = 0; i < index.size(); ++i)
-        names_map[index[i]->result_name] = i;
+    size_t output_nodes_size = outputs.size();
+
+    for (size_t i = 0; i < output_nodes_size; ++i)
+        names_map[outputs[i]->result_name] = i;
+
+    size_t aliases_size = aliases.size();
 
     NodeRawConstPtrs required_nodes;
-    required_nodes.reserve(aliases.size());
+    required_nodes.reserve(aliases_size);
 
     for (const auto & item : aliases)
     {
@@ -700,10 +710,10 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases)
             throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                             "Unknown column: {}, there are only columns {}", item.first, dumpNames());
 
-        required_nodes.push_back(index[it->second]);
+        required_nodes.push_back(outputs[it->second]);
     }
 
-    for (size_t i = 0; i < aliases.size(); ++i)
+    for (size_t i = 0; i < aliases_size; ++i)
     {
         const auto & item = aliases[i];
         const auto * child = required_nodes[i];
@@ -723,22 +733,24 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases)
         auto it = names_map.find(child->result_name);
         if (it == names_map.end())
         {
-            names_map[child->result_name] = index.size();
-            index.push_back(child);
+            names_map[child->result_name] = outputs.size();
+            outputs.push_back(child);
         }
         else
-            index[it->second] = child;
+            outputs[it->second] = child;
     }
 }
 
 void ActionsDAG::project(const NamesWithAliases & projection)
 {
     std::unordered_map<std::string_view, const Node *> names_map;
-    for (const auto * node : index)
-        names_map.emplace(node->result_name, node);
+    for (const auto * output_node : outputs)
+        names_map.emplace(output_node->result_name, output_node);
 
-    index.clear();
-    index.reserve(projection.size());
+    outputs.clear();
+
+    size_t projection_size = projection.size();
+    outputs.reserve(projection_size);
 
     for (const auto & item : projection)
     {
@@ -747,13 +759,13 @@ void ActionsDAG::project(const NamesWithAliases & projection)
             throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
                             "Unknown column: {}, there are only columns {}", item.first, dumpNames());
 
-        index.push_back(it->second);
+        outputs.push_back(it->second);
     }
 
-    for (size_t i = 0; i < projection.size(); ++i)
+    for (size_t i = 0; i < projection_size; ++i)
     {
         const auto & item = projection[i];
-        auto & child = index[i];
+        auto & child = outputs[i];
 
         if (!item.second.empty() && item.first != item.second)
         {
@@ -775,8 +787,8 @@ void ActionsDAG::project(const NamesWithAliases & projection)
 
 bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
 {
-    for (const auto * node : index)
-        if (node->result_name == column_name)
+    for (const auto * output_node : outputs)
+        if (output_node->result_name == column_name)
             return true;
 
     for (auto it = nodes.rbegin(); it != nodes.rend(); ++it)
@@ -784,7 +796,7 @@ bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
         auto & node = *it;
         if (node.result_name == column_name)
         {
-            index.push_back(&node);
+            outputs.push_back(&node);
             return true;
         }
     }
@@ -794,19 +806,19 @@ bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
 
 bool ActionsDAG::removeUnusedResult(const std::string & column_name)
 {
-    /// Find column in index and remove.
+    /// Find column in output nodes and remove.
     const Node * col;
     {
-        auto it = index.begin();
-        for (; it != index.end(); ++it)
+        auto it = outputs.begin();
+        for (; it != outputs.end(); ++it)
             if ((*it)->result_name == column_name)
                 break;
 
-        if (it == index.end())
+        if (it == outputs.end())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found result {} in ActionsDAG\n{}", column_name, dumpDAG());
 
         col = *it;
-        index.erase(it);
+        outputs.erase(it);
     }
 
     /// Check if column is in input.
@@ -824,9 +836,9 @@ bool ActionsDAG::removeUnusedResult(const std::string & column_name)
             if (col == child)
                 return false;
 
-    /// Do not remove input if it was mentioned in index several times.
-    for (const auto * node : index)
-        if (col == node)
+    /// Do not remove input if it was mentioned in output nodes several times.
+    for (const auto * output_node : outputs)
+        if (col == output_node)
             return false;
 
     /// Remove from nodes and inputs.
@@ -861,11 +873,11 @@ ActionsDAGPtr ActionsDAG::clone() const
         for (auto & child : node.children)
             child = copy_map[child];
 
-    for (const auto & node : index)
-        actions->index.push_back(copy_map[node]);
+    for (const auto & output_node : outputs)
+        actions->outputs.push_back(copy_map[output_node]);
 
-    for (const auto & node : inputs)
-        actions->inputs.push_back(copy_map[node]);
+    for (const auto & input_node : inputs)
+        actions->inputs.push_back(copy_map[input_node]);
 
     return actions;
 }
@@ -936,8 +948,8 @@ std::string ActionsDAG::dumpDAG() const
         out << "\n";
     }
 
-    out << "Index:";
-    for (const auto * node : index)
+    out << "Output nodes:";
+    for (const auto * node : outputs)
         out << ' ' << map[node];
     out << '\n';
 
@@ -981,8 +993,8 @@ void ActionsDAG::assertDeterministic() const
 
 void ActionsDAG::addMaterializingOutputActions()
 {
-    for (auto & node : index)
-        node = &materializeNode(*node);
+    for (auto & output_node : outputs)
+        output_node = &materializeNode(*output_node);
 }
 
 const ActionsDAG::Node & ActionsDAG::materializeNode(const Node & node)
@@ -1020,7 +1032,8 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     std::map<std::string_view, std::list<size_t>> inputs;
     if (mode == MatchColumnsMode::Name)
     {
-        for (size_t pos = 0; pos < actions_dag->inputs.size(); ++pos)
+        size_t input_nodes_size = actions_dag->inputs.size();
+        for (size_t pos = 0; pos < input_nodes_size; ++pos)
             inputs[actions_dag->inputs[pos]->result_name].push_back(pos);
     }
 
@@ -1131,7 +1144,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
         }
     }
 
-    actions_dag->index.swap(projection);
+    actions_dag->outputs.swap(projection);
     actions_dag->removeUnusedActions();
     actions_dag->projectInput();
 
@@ -1150,7 +1163,7 @@ ActionsDAGPtr ActionsDAG::makeAddingColumnActions(ColumnWithTypeAndName column)
     const auto & function_node = adding_column_action->addFunction(func_builder_materialize, std::move(inputs), {});
     const auto & alias_node = adding_column_action->addAlias(function_node, std::move(column_name));
 
-    adding_column_action->index.push_back(&alias_node);
+    adding_column_action->outputs.push_back(&alias_node);
     return adding_column_action;
 }
 
@@ -1162,7 +1175,7 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 
     /// Will store merged result in `first`.
 
-    /// This map contains nodes which should be removed from `first` index, cause they are used as inputs for `second`.
+    /// This map contains nodes which should be removed from `first` outputs, cause they are used as inputs for `second`.
     /// The second element is the number of removes (cause one node may be repeated several times in result).
     std::unordered_map<const Node *, size_t> removed_first_result;
     /// Map inputs of `second` to nodes of `first`.
@@ -1170,25 +1183,25 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 
     /// Update inputs list.
     {
-        /// Index may have multiple columns with same name. They also may be used by `second`. Order is important.
+        /// Outputs may have multiple columns with same name. They also may be used by `second`. Order is important.
         std::unordered_map<std::string_view, std::list<const Node *>> first_result;
-        for (const auto & node : first.index)
-            first_result[node->result_name].push_back(node);
+        for (const auto & output_node : first.outputs)
+            first_result[output_node->result_name].push_back(output_node);
 
-        for (const auto & node : second.inputs)
+        for (const auto & input_node : second.inputs)
         {
-            auto it = first_result.find(node->result_name);
+            auto it = first_result.find(input_node->result_name);
             if (it == first_result.end() || it->second.empty())
             {
                 if (first.project_input)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR,
-                                    "Cannot find column {} in ActionsDAG result", node->result_name);
+                    throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
+                                    "Cannot find column {} in ActionsDAG result", input_node->result_name);
 
-                first.inputs.push_back(node);
+                first.inputs.push_back(input_node);
             }
             else
             {
-                inputs_map[node] = it->second.front();
+                inputs_map[input_node] = it->second.front();
                 removed_first_result[it->second.front()] += 1;
                 it->second.pop_front();
             }
@@ -1209,35 +1222,35 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
         }
     }
 
-    for (auto & node : second.index)
+    for (auto & output_node : second.outputs)
     {
-        if (node->type == ActionType::INPUT)
+        if (output_node->type == ActionType::INPUT)
         {
-            auto it = inputs_map.find(node);
+            auto it = inputs_map.find(output_node);
             if (it != inputs_map.end())
-                node = it->second;
+                output_node = it->second;
         }
     }
 
-    /// Update index.
+    /// Update output nodes.
     if (second.project_input)
     {
-        first.index.swap(second.index);
+        first.outputs.swap(second.outputs);
         first.project_input = true;
     }
     else
     {
         /// Add not removed result from first actions.
-        for (const auto * node : first.index)
+        for (const auto * output_node : first.outputs)
         {
-            auto it = removed_first_result.find(node);
+            auto it = removed_first_result.find(output_node);
             if (it != removed_first_result.end() && it->second > 0)
                 --it->second;
             else
-                second.index.push_back(node);
+                second.outputs.push_back(output_node);
         }
 
-        first.index.swap(second.index);
+        first.outputs.swap(second.outputs);
     }
 
     first.nodes.splice(first.nodes.end(), std::move(second.nodes));
@@ -1253,12 +1266,13 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split_nodes) const
 {
     /// Split DAG into two parts.
-    /// (first_nodes, first_index) is a part which will have split_list in result.
-    /// (second_nodes, second_index) is a part which will have same index as current actions.
-    Nodes second_nodes;
+    /// (first_nodes, first_outputs) is a part which will have split_list in result.
+    /// (second_nodes, second_outputs) is a part which will have same outputs as current actions.
     Nodes first_nodes;
-    NodeRawConstPtrs second_index;
-    NodeRawConstPtrs first_index;
+    NodeRawConstPtrs first_outputs;
+
+    Nodes second_nodes;
+    NodeRawConstPtrs second_outputs;
 
     /// List of nodes from current actions which are not inputs, but will be in second part.
     NodeRawConstPtrs new_inputs;
@@ -1284,8 +1298,8 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     std::stack<Frame> stack;
     std::unordered_map<const Node *, Data> data;
 
-    for (const auto & node : index)
-        data[node].used_in_result = true;
+    for (const auto & output_node : outputs)
+        data[output_node].used_in_result = true;
 
     /// DFS. Decide if node is needed by split.
     for (const auto & node : nodes)
@@ -1419,15 +1433,15 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
         }
     }
 
-    for (const auto * node : index)
-        second_index.push_back(data[node].to_second);
+    for (const auto * output_node : outputs)
+        second_outputs.push_back(data[output_node].to_second);
 
     NodeRawConstPtrs second_inputs;
     NodeRawConstPtrs first_inputs;
 
-    for (const auto * input : inputs)
+    for (const auto * input_node : inputs)
     {
-        const auto & cur = data[input];
+        const auto & cur = data[input_node];
         first_inputs.push_back(cur.to_first);
     }
 
@@ -1435,17 +1449,17 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     {
         const auto & cur = data[input];
         second_inputs.push_back(cur.to_second);
-        first_index.push_back(cur.to_first);
+        first_outputs.push_back(cur.to_first);
     }
 
     auto first_actions = std::make_shared<ActionsDAG>();
     first_actions->nodes.swap(first_nodes);
-    first_actions->index.swap(first_index);
+    first_actions->outputs.swap(first_outputs);
     first_actions->inputs.swap(first_inputs);
 
     auto second_actions = std::make_shared<ActionsDAG>();
     second_actions->nodes.swap(second_nodes);
-    second_actions->index.swap(second_index);
+    second_actions->outputs.swap(second_outputs);
     second_actions->inputs.swap(second_inputs);
 
     return {std::move(first_actions), std::move(second_actions)};
@@ -1513,8 +1527,7 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBeforeArrayJoin(const NameSet &
     }
 
     auto res = split(split_nodes);
-    /// Do not remove array joined columns if they are not used.
-    /// res.first->project_input = false;
+    res.second->project_input = project_input;
     return res;
 }
 
@@ -1522,11 +1535,13 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBySortingDescription(const NameS
 {
     std::unordered_set<const Node *> split_nodes;
     for (const auto & sort_column : sort_columns)
-        if (const auto * node = tryFindInIndex(sort_column))
+        if (const auto * node = tryFindInOutputs(sort_column))
             split_nodes.insert(node);
         else
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR, "Sorting column {} wasn't found in the ActionsDAG's index. DAG:\n{}", sort_column, dumpDAG());
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Sorting column {} wasn't found in the ActionsDAG's outputs. DAG:\n{}",
+                sort_column,
+                dumpDAG());
 
     auto res = split(split_nodes);
     res.second->project_input = project_input;
@@ -1535,11 +1550,12 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBySortingDescription(const NameS
 
 ActionsDAG::SplitResult ActionsDAG::splitActionsForFilter(const std::string & column_name) const
 {
-    const auto * node = tryFindInIndex(column_name);
+    const auto * node = tryFindInOutputs(column_name);
     if (!node)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}",
-                        column_name, dumpDAG());
+                        "Outputs for ActionsDAG does not contain filter column name {}. DAG:\n{}",
+                        column_name,
+                        dumpDAG());
 
     std::unordered_set<const Node *> split_nodes = {node};
     auto res = split(split_nodes);
@@ -1687,7 +1703,7 @@ ColumnsWithTypeAndName prepareFunctionArguments(const ActionsDAG::NodeRawConstPt
 /// Create actions which calculate conjunction of selected nodes.
 /// Assume conjunction nodes are predicates (and may be used as arguments of function AND).
 ///
-/// Result actions add single column with conjunction result (it is always first in index).
+/// Result actions add single column with conjunction result (it is always first in outputs).
 /// No other columns are added or removed.
 ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs)
 {
@@ -1761,7 +1777,7 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
         result_predicate = &actions->addFunction(func_builder_and, std::move(args), {});
     }
 
-    actions->index.push_back(result_predicate);
+    actions->outputs.push_back(result_predicate);
 
     for (const auto & col : all_inputs)
     {
@@ -1776,9 +1792,9 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
             actions->inputs.push_back(input);
         }
 
-        /// We should not add result_predicate into the index for the second time.
+        /// We should not add result_predicate into the outputs for the second time.
         if (input->result_name != result_predicate->result_name)
-            actions->index.push_back(input);
+            actions->outputs.push_back(input);
     }
 
     return actions;
@@ -1790,10 +1806,12 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     const Names & available_inputs,
     const ColumnsWithTypeAndName & all_inputs)
 {
-    Node * predicate = const_cast<Node *>(tryFindInIndex(filter_name));
+    Node * predicate = const_cast<Node *>(tryFindInOutputs(filter_name));
     if (!predicate)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR, "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}", filter_name, dumpDAG());
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Output nodes for ActionsDAG do not contain filter column name {}. DAG:\n{}",
+                filter_name,
+                dumpDAG());
 
     /// If condition is constant let's do nothing.
     /// It means there is nothing to push down or optimization was already applied.
@@ -1805,8 +1823,8 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     /// Get input nodes from available_inputs names.
     {
         std::unordered_map<std::string_view, std::list<const Node *>> inputs_map;
-        for (const auto & input : inputs)
-            inputs_map[input->result_name].emplace_back(input);
+        for (const auto & input_node : inputs)
+            inputs_map[input_node->result_name].emplace_back(input_node);
 
         for (const auto & name : available_inputs)
         {
@@ -1831,8 +1849,8 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
         /// The whole predicate was split.
         if (can_remove_filter)
         {
-            /// If filter column is not needed, remove it from index.
-            std::erase_if(index, [&](const Node * node) { return node == predicate; });
+            /// If filter column is not needed, remove it from output nodes.
+            std::erase_if(outputs, [&](const Node * node) { return node == predicate; });
 
             /// At the very end of this method we'll call removeUnusedActions() with allow_remove_inputs=false,
             /// so we need to manually remove predicate if it is an input node.
@@ -1857,11 +1875,11 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
             {
                 /// Special case. We cannot replace input to constant inplace.
                 /// Because we cannot affect inputs list for actions.
-                /// So we just add a new constant and update index.
+                /// So we just add a new constant and update outputs.
                 const auto * new_predicate = &addNode(node);
-                for (auto & index_node : index)
-                    if (index_node == predicate)
-                        index_node = new_predicate;
+                for (auto & output_node : outputs)
+                    if (output_node == predicate)
+                        output_node = new_predicate;
             }
         }
     }
@@ -1924,4 +1942,106 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
     return actions;
 }
 
+static bool isColumnSortingPreserved(const ActionsDAG::Node * start_node, const String & sorted_column)
+{
+    /// only function node can several children
+    /// but we support monotonicity check only for functions with one argument
+    /// so, currently we consider just first child - it covers majority of cases
+    /// TODO: if one parameter is variable and other are constant then we can try to check monotonicity as well
+
+    /// first find the column
+    const ActionsDAG::Node * node = start_node;
+    bool found = false;
+    while (node)
+    {
+        /// if column found
+        if (node->type == ActionsDAG::ActionType::INPUT && node->result_name == sorted_column)
+        {
+            found = true;
+            break;
+        }
+
+        if (node->children.empty())
+            break; /// column not found
+
+        node = node->children.front();
+    }
+    if (!found)
+        return false;
+
+    /// if column found, check if sorting is preserved
+    const Field field{};
+    node = start_node;
+    while (node)
+    {
+        if (node->type == ActionsDAG::ActionType::FUNCTION)
+        {
+            auto func = node->function_base;
+            if (func)
+            {
+                if (!func->hasInformationAboutMonotonicity())
+                    return false;
+
+                const auto & types = func->getArgumentTypes();
+                if (types.empty())
+                    return false;
+
+                const auto monotonicity = func->getMonotonicityForRange(*types.front(), field, field);
+                if (!monotonicity.is_always_monotonic)
+                    return false;
+            }
+        }
+
+        if (node->children.empty())
+            break;
+
+        node = node->children.front();
+    }
+    return true;
+}
+
+bool ActionsDAG::isSortingPreserved(
+    const Block & input_header, const SortDescription & sort_description, const String & ignore_output_column) const
+{
+    if (sort_description.empty())
+        return true;
+
+    if (hasArrayJoin())
+        return false;
+
+    const Block & output_header = updateHeader(input_header);
+    for (const auto & desc : sort_description)
+    {
+        /// header contains column with the same name
+        if (output_header.findByName(desc.column_name))
+        {
+            /// find the corresponding node in output
+            const auto * output_node = tryFindInOutputs(desc.column_name);
+            if (!output_node)
+            {
+                /// sorted column name in header but NOT in expression output -> no expression is applied to it -> sorting preserved
+                continue;
+            }
+        }
+
+        /// check if any output node is related to the sorted column and sorting order is preserved
+        bool preserved = false;
+        for (const auto * output_node : outputs)
+        {
+            if (output_node->result_name == ignore_output_column)
+                continue;
+
+            if (isColumnSortingPreserved(output_node, desc.column_name))
+            {
+                preserved = true;
+                break;
+            }
+        }
+        if (!preserved)
+            return false;
+    }
+
+    return true;
+}
+
 }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index d11dfc3b8ad..14d1dcca6b7 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -33,6 +33,8 @@ namespace JSONBuilder
     using ItemPtr = std::unique_ptr<IItem>;
 }
 
+class SortDescription;
+
 /// Directed acyclic graph of expressions.
 /// This is an intermediate representation of actions which is usually built from expression list AST.
 /// Node of DAG describe calculation of a single column with known type, name, and constant value (if applicable).
@@ -73,7 +75,7 @@ public:
         DataTypePtr result_type;
 
         FunctionOverloadResolverPtr function_builder;
-        /// Can be used after action was added to ExpressionActions if we want to get function signature or properties like monotonicity.
+        /// Can be used to get function signature or properties like monotonicity.
         FunctionBasePtr function_base;
         /// Prepared function which is used in function execution.
         ExecutableFunctionPtr function;
@@ -96,8 +98,8 @@ public:
 
 private:
     Nodes nodes;
-    NodeRawConstPtrs index;
     NodeRawConstPtrs inputs;
+    NodeRawConstPtrs outputs;
 
     bool project_input = false;
     bool projected_output = false;
@@ -111,7 +113,12 @@ public:
     explicit ActionsDAG(const ColumnsWithTypeAndName & inputs_);
 
     const Nodes & getNodes() const { return nodes; }
-    const NodeRawConstPtrs & getIndex() const { return index; }
+    const NodeRawConstPtrs & getOutputs() const { return outputs; }
+    /** Output nodes can contain any column returned from DAG.
+      * You may manually change it if needed.
+      */
+    NodeRawConstPtrs & getOutputs() { return outputs; }
+
     const NodeRawConstPtrs & getInputs() const { return inputs; }
 
     NamesAndTypesList getRequiredColumns() const;
@@ -133,25 +140,26 @@ public:
             NodeRawConstPtrs children,
             std::string result_name);
 
-    /// Index can contain any column returned from DAG.
-    /// You may manually change it if needed.
-    NodeRawConstPtrs & getIndex() { return index; }
-    /// Find first column by name in index. This search is linear.
-    const Node & findInIndex(const std::string & name) const;
+    /// Find first column by name in output nodes. This search is linear.
+    const Node & findInOutputs(const std::string & name) const;
+
     /// Same, but return nullptr if node not found.
-    const Node * tryFindInIndex(const std::string & name) const;
-    /// Find first node with the same name in index and replace it.
-    /// If was not found, add node to index end.
-    void addOrReplaceInIndex(const Node & node);
+    const Node * tryFindInOutputs(const std::string & name) const;
+
+    /// Find first node with the same name in output nodes and replace it.
+    /// If was not found, add node to outputs end.
+    void addOrReplaceInOutputs(const Node & node);
 
     /// Call addAlias several times.
     void addAliases(const NamesWithAliases & aliases);
-    /// Add alias actions and remove unused columns from index. Also specify result columns order in index.
+
+    /// Add alias actions and remove unused columns from outputs. Also specify result columns order in outputs.
     void project(const NamesWithAliases & projection);
 
-    /// If column is not in index, try to find it in nodes and insert back into index.
+    /// If column is not in outputs, try to find it in nodes and insert back into outputs.
     bool tryRestoreColumn(const std::string & column_name);
-    /// Find column in result. Remove it from index.
+
+    /// Find column in result. Remove it from outputs.
     /// If columns is in inputs and has no dependent nodes, remove it from inputs too.
     /// Return true if column was removed from inputs.
     bool removeUnusedResult(const std::string & column_name);
@@ -160,7 +168,13 @@ public:
     bool isInputProjected() const { return project_input; }
     bool isOutputProjected() const { return projected_output; }
 
+    /// Remove actions that are not needed to compute output nodes
+    void removeUnusedActions(bool allow_remove_inputs = true, bool allow_constant_folding = true);
+
+    /// Remove actions that are not needed to compute output nodes with required names
     void removeUnusedActions(const Names & required_names, bool allow_remove_inputs = true, bool allow_constant_folding = true);
+
+    /// Remove actions that are not needed to compute output nodes with required names
     void removeUnusedActions(const NameSet & required_names, bool allow_remove_inputs = true, bool allow_constant_folding = true);
 
     /// Transform the current DAG in a way that leaf nodes get folded into their parents. It's done
@@ -196,10 +210,10 @@ public:
         const String & predicate_column_name = {},
         bool add_missing_keys = true);
 
-    /// Reorder the index nodes using given position mapping.
+    /// Reorder the output nodes using given position mapping.
     void reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map);
 
-    /// Add aggregate columns to index nodes from projection
+    /// Add aggregate columns to output nodes from projection
     void addAggregatesViaProjection(const Block & aggregates);
 
     bool hasArrayJoin() const;
@@ -263,7 +277,7 @@ public:
 
     /// Split ActionsDAG into two DAGs, where first part contains all nodes from split_nodes and their children.
     /// Execution of first then second parts on block is equivalent to execution of initial DAG.
-    /// First DAG and initial DAG have equal inputs, second DAG and initial DAG has equal index (outputs).
+    /// First DAG and initial DAG have equal inputs, second DAG and initial DAG has equal outputs.
     /// Second DAG inputs may contain less inputs then first DAG (but also include other columns).
     SplitResult split(std::unordered_set<const Node *> split_nodes) const;
 
@@ -271,7 +285,7 @@ public:
     SplitResult splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const;
 
     /// Splits actions into two parts. First part has minimal size sufficient for calculation of column_name.
-    /// Index of initial actions must contain column_name.
+    /// Outputs of initial actions must contain column_name.
     SplitResult splitActionsForFilter(const std::string & column_name) const;
 
     /// Splits actions into two parts. The first part contains all the calculations required to calculate sort_columns.
@@ -301,11 +315,12 @@ public:
         const Names & available_inputs,
         const ColumnsWithTypeAndName & all_inputs);
 
+    bool
+    isSortingPreserved(const Block & input_header, const SortDescription & sort_description, const String & ignore_output_column = "") const;
+
 private:
     Node & addNode(Node node);
 
-    void removeUnusedActions(bool allow_remove_inputs = true, bool allow_constant_folding = true);
-
 #if USE_EMBEDDED_COMPILER
     void compileFunctions(size_t min_count_to_compile_expression, const std::unordered_set<const Node *> & lazy_executed_nodes = {});
 #endif
@@ -313,4 +328,10 @@ private:
     static ActionsDAGPtr cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs);
 };
 
+/// This is an ugly way to bypass impossibility to forward declare ActionDAG::Node.
+struct ActionDAGNodes
+{
+    ActionsDAG::NodeRawConstPtrs nodes;
+};
+
 }
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index b62690b7a3a..6c9e54a966d 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -9,6 +9,7 @@
 #include <Functions/grouping.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsMiscellaneous.h>
+#include <Functions/indexHint.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 
@@ -388,7 +389,7 @@ SetPtr makeExplicitSet(
     const ASTPtr & right_arg = args.children.at(1);
 
     auto column_name = left_arg->getColumnName();
-    const auto & dag_node = actions.findInIndex(column_name);
+    const auto & dag_node = actions.findInOutputs(column_name);
     const DataTypePtr & left_arg_type = dag_node.result_type;
 
     DataTypes set_element_types = {left_arg_type};
@@ -401,8 +402,8 @@ SetPtr makeExplicitSet(
             element_type = low_cardinality_type->getDictionaryType();
 
     auto set_key = PreparedSetKey::forLiteral(*right_arg, set_element_types);
-    if (auto it = prepared_sets.find(set_key); it != prepared_sets.end())
-        return it->second; /// Already prepared.
+    if (auto set = prepared_sets.get(set_key))
+        return set; /// Already prepared.
 
     Block block;
     const auto & right_arg_func = std::dynamic_pointer_cast<ASTFunction>(right_arg);
@@ -417,7 +418,7 @@ SetPtr makeExplicitSet(
     set->insertFromBlock(block.getColumnsWithTypeAndName());
     set->finishInsert();
 
-    prepared_sets.emplace(set_key, set);
+    prepared_sets.set(set_key, set);
     return set;
 }
 
@@ -484,8 +485,7 @@ ActionsMatcher::Data::Data(
     size_t subquery_depth_,
     std::reference_wrapper<const NamesAndTypesList> source_columns_,
     ActionsDAGPtr actions_dag,
-    PreparedSets & prepared_sets_,
-    SubqueriesForSets & subqueries_for_sets_,
+    PreparedSetsPtr prepared_sets_,
     bool no_subqueries_,
     bool no_makeset_,
     bool only_consts_,
@@ -497,7 +497,6 @@ ActionsMatcher::Data::Data(
     , subquery_depth(subquery_depth_)
     , source_columns(source_columns_)
     , prepared_sets(prepared_sets_)
-    , subqueries_for_sets(subqueries_for_sets_)
     , no_subqueries(no_subqueries_)
     , no_makeset(no_makeset_)
     , only_consts(only_consts_)
@@ -506,7 +505,7 @@ ActionsMatcher::Data::Data(
     , actions_stack(std::move(actions_dag), context_)
     , aggregation_keys_info(aggregation_keys_info_)
     , build_expression_with_window_functions(build_expression_with_window_functions_)
-    , next_unique_suffix(actions_stack.getLastActions().getIndex().size() + 1)
+    , next_unique_suffix(actions_stack.getLastActions().getOutputs().size() + 1)
 {
 }
 
@@ -525,9 +524,9 @@ ScopeStack::ScopeStack(ActionsDAGPtr actions_dag, ContextPtr context_) : WithCon
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::move(actions_dag);
-    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getIndex());
+    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getOutputs());
 
-    for (const auto & node : level.actions_dag->getIndex())
+    for (const auto & node : level.actions_dag->getOutputs())
         if (node->type == ActionsDAG::ActionType::INPUT)
             level.inputs.emplace(node->result_name);
 }
@@ -536,7 +535,7 @@ void ScopeStack::pushLevel(const NamesAndTypesList & input_columns)
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::make_shared<ActionsDAG>();
-    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getIndex());
+    level.index = std::make_unique<ScopeStack::Index>(level.actions_dag->getOutputs());
     const auto & prev = stack[stack.size() - 2];
 
     for (const auto & input_column : input_columns)
@@ -546,7 +545,7 @@ void ScopeStack::pushLevel(const NamesAndTypesList & input_columns)
         level.inputs.emplace(input_column.name);
     }
 
-    for (const auto & node : prev.actions_dag->getIndex())
+    for (const auto & node : prev.actions_dag->getOutputs())
     {
         if (!level.index->contains(node->result_name))
         {
@@ -934,8 +933,43 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     /// A special function `indexHint`. Everything that is inside it is not calculated
     if (node.name == "indexHint")
     {
+        if (data.only_consts)
+            return;
+
+        /// Here we create a separate DAG for indexHint condition.
+        /// It will be used only for index analysis.
+        Data index_hint_data(
+            data.getContext(),
+            data.set_size_limit,
+            data.subquery_depth,
+            data.source_columns,
+            std::make_shared<ActionsDAG>(data.source_columns),
+            data.prepared_sets,
+            data.no_subqueries,
+            data.no_makeset,
+            data.only_consts,
+            /*create_source_for_in*/ false,
+            data.aggregation_keys_info);
+
+        NamesWithAliases args;
+
+        if (node.arguments)
+        {
+            for (const auto & arg : node.arguments->children)
+            {
+                visit(arg, index_hint_data);
+                args.push_back({arg->getColumnNameWithoutAlias(), {}});
+            }
+        }
+
+        auto dag = index_hint_data.getActions();
+        dag->project(args);
+
+        auto index_hint = std::make_shared<FunctionIndexHint>();
+        index_hint->setActions(std::move(dag));
+
         // Arguments are removed. We add function instead of constant column to avoid constant folding.
-        data.addFunction(FunctionFactory::instance().get("indexHint", data.getContext()), {}, column_name);
+        data.addFunction(std::make_unique<FunctionToOverloadResolverAdaptor>(index_hint), {}, column_name);
         return;
     }
 
@@ -1272,6 +1306,9 @@ void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
 
 SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_subqueries)
 {
+    if (!data.prepared_sets)
+        return nullptr;
+
     /** You need to convert the right argument to a set.
       * This can be a table name, a value, a value enumeration, or a subquery.
       * The enumeration of values is parsed as a function `tuple`.
@@ -1287,8 +1324,8 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         if (no_subqueries)
             return {};
         auto set_key = PreparedSetKey::forSubquery(*right_in_operand);
-        if (auto it = data.prepared_sets.find(set_key); it != data.prepared_sets.end())
-            return it->second;
+        if (SetPtr set = data.prepared_sets->get(set_key))
+            return set;
 
         /// A special case is if the name of the table is specified on the right side of the IN statement,
         ///  and the table has the type Set (a previously prepared set).
@@ -1302,25 +1339,17 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
                 StorageSet * storage_set = dynamic_cast<StorageSet *>(table.get());
                 if (storage_set)
                 {
-                    data.prepared_sets.emplace(set_key, storage_set->getSet());
-                    return storage_set->getSet();
+                    SetPtr set = storage_set->getSet();
+                    data.prepared_sets->set(set_key, set);
+                    return set;
                 }
             }
         }
 
         /// We get the stream of blocks for the subquery. Create Set and put it in place of the subquery.
         String set_id = right_in_operand->getColumnName();
-
-        SubqueryForSet & subquery_for_set = data.subqueries_for_sets[set_id];
-
-        /// If you already created a Set with the same subquery / table.
-        if (subquery_for_set.set)
-        {
-            data.prepared_sets.emplace(set_key, subquery_for_set.set);
-            return subquery_for_set.set;
-        }
-
-        SetPtr set = std::make_shared<Set>(data.set_size_limit, false, data.getContext()->getSettingsRef().transform_null_in);
+        bool transform_null_in =  data.getContext()->getSettingsRef().transform_null_in;
+        SubqueryForSet & subquery_for_set = data.prepared_sets->createOrGetSubquery(set_id, set_key, data.set_size_limit, transform_null_in);
 
         /** The following happens for GLOBAL INs or INs:
           * - in the addExternalStorage function, the IN (SELECT ...) subquery is replaced with IN _data1,
@@ -1330,24 +1359,21 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
           * In case that we have HAVING with IN subquery, we have to force creating set for it.
           * Also it doesn't make sense if it is GLOBAL IN or ordinary IN.
           */
-        if (!subquery_for_set.source && data.create_source_for_in)
+        if (data.create_source_for_in && !subquery_for_set.hasSource())
         {
             auto interpreter = interpretSubquery(right_in_operand, data.getContext(), data.subquery_depth, {});
-            subquery_for_set.source = std::make_unique<QueryPlan>();
-            interpreter->buildQueryPlan(*subquery_for_set.source);
+            subquery_for_set.createSource(*interpreter);
         }
 
-        subquery_for_set.set = set;
-        data.prepared_sets.emplace(set_key, set);
-        return set;
+        return subquery_for_set.set;
     }
     else
     {
         const auto & last_actions = data.actions_stack.getLastActions();
         const auto & index = data.actions_stack.getLastActionsIndex();
-        if (index.contains(left_in_operand->getColumnName()))
+        if (data.prepared_sets && index.contains(left_in_operand->getColumnName()))
             /// An explicit enumeration of values in parentheses.
-            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, data.prepared_sets);
+            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, *data.prepared_sets);
         else
             return {};
     }
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 5b5a3d31da2..a27745d2cfa 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -5,10 +5,9 @@
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/PreparedSets.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Parsers/IAST.h>
 #include <Core/ColumnNumbers.h>
-
+#include <Core/ColumnWithTypeAndName.h>
 
 namespace DB
 {
@@ -115,7 +114,7 @@ struct AggregationKeysInfo
     GroupByKind group_by_kind;
 };
 
-/// Collect ExpressionAction from AST. Returns PreparedSets and SubqueriesForSets too.
+/// Collect ExpressionAction from AST. Returns PreparedSets
 class ActionsMatcher
 {
 public:
@@ -126,8 +125,7 @@ public:
         SizeLimits set_size_limit;
         size_t subquery_depth;
         const NamesAndTypesList & source_columns;
-        PreparedSets & prepared_sets;
-        SubqueriesForSets & subqueries_for_sets;
+        PreparedSetsPtr prepared_sets;
         bool no_subqueries;
         bool no_makeset;
         bool only_consts;
@@ -150,8 +148,7 @@ public:
             size_t subquery_depth_,
             std::reference_wrapper<const NamesAndTypesList> source_columns_,
             ActionsDAGPtr actions_dag,
-            PreparedSets & prepared_sets_,
-            SubqueriesForSets & subqueries_for_sets_,
+            PreparedSetsPtr prepared_sets_,
             bool no_subqueries_,
             bool no_makeset_,
             bool only_consts_,
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index a99ecee43bf..6e101005599 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -17,7 +17,7 @@
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/MemoryTracker.h>
 #include <Common/CurrentThread.h>
 #include <Common/typeid_cast.h>
@@ -34,11 +34,14 @@
 
 namespace ProfileEvents
 {
-extern const Event ExternalAggregationWritePart;
-extern const Event ExternalAggregationCompressedBytes;
-extern const Event ExternalAggregationUncompressedBytes;
-extern const Event AggregationPreallocatedElementsInHashTables;
-extern const Event AggregationHashTablesInitializedAsTwoLevel;
+    extern const Event ExternalAggregationWritePart;
+    extern const Event ExternalAggregationCompressedBytes;
+    extern const Event ExternalAggregationUncompressedBytes;
+    extern const Event AggregationPreallocatedElementsInHashTables;
+    extern const Event AggregationHashTablesInitializedAsTwoLevel;
+    extern const Event OverflowThrow;
+    extern const Event OverflowBreak;
+    extern const Event OverflowAny;
 }
 
 namespace
@@ -54,7 +57,7 @@ public:
         size_t median_size; // roughly the size we're going to preallocate on each thread
     };
 
-    using Cache = DB::LRUCache<UInt64, Entry>;
+    using Cache = DB::CacheBase<UInt64, Entry>;
     using CachePtr = std::shared_ptr<Cache>;
     using Params = DB::Aggregator::Params::StatsCollectingParams;
 
@@ -911,7 +914,7 @@ void Aggregator::mergeOnBlockSmall(
         mergeStreamsImpl(result.aggregates_pool, *result.NAME, result.NAME->data, \
                          result.without_key, /* no_more_keys= */ false, \
                          row_begin, row_end, \
-                         aggregate_columns_data, key_columns);
+                         aggregate_columns_data, key_columns, result.aggregates_pool);
 
     APPLY_FOR_AGGREGATED_VARIANTS(M)
 #undef M
@@ -1667,14 +1670,17 @@ bool Aggregator::checkLimits(size_t result_size, bool & no_more_keys) const
         switch (params.group_by_overflow_mode)
         {
             case OverflowMode::THROW:
+                ProfileEvents::increment(ProfileEvents::OverflowThrow);
                 throw Exception("Limit for rows to GROUP BY exceeded: has " + toString(result_size)
                     + " rows, maximum: " + toString(params.max_rows_to_group_by),
                     ErrorCodes::TOO_MANY_ROWS);
 
             case OverflowMode::BREAK:
+                ProfileEvents::increment(ProfileEvents::OverflowBreak);
                 return false;
 
             case OverflowMode::ANY:
+                ProfileEvents::increment(ProfileEvents::OverflowAny);
                 no_more_keys = true;
                 break;
         }
@@ -2647,19 +2653,23 @@ void NO_INLINE Aggregator::mergeStreamsImplCase(
     size_t row_begin,
     size_t row_end,
     const AggregateColumnsConstData & aggregate_columns_data,
-    const ColumnRawPtrs & key_columns) const
+    const ColumnRawPtrs & key_columns,
+    Arena * arena_for_keys) const
 {
     typename Method::State state(key_columns, key_sizes, aggregation_state_cache);
 
     std::unique_ptr<AggregateDataPtr[]> places(new AggregateDataPtr[row_end]);
 
+    if (!arena_for_keys)
+        arena_for_keys = aggregates_pool;
+
     for (size_t i = row_begin; i < row_end; ++i)
     {
         AggregateDataPtr aggregate_data = nullptr;
 
         if (!no_more_keys)
         {
-            auto emplace_result = state.emplaceKey(data, i, *aggregates_pool);
+            auto emplace_result = state.emplaceKey(data, i, *arena_for_keys); // NOLINT
             if (emplace_result.isInserted())
             {
                 emplace_result.setMapped(nullptr);
@@ -2674,7 +2684,7 @@ void NO_INLINE Aggregator::mergeStreamsImplCase(
         }
         else
         {
-            auto find_result = state.findKey(data, i, *aggregates_pool);
+            auto find_result = state.findKey(data, i, *arena_for_keys);
             if (find_result.isFound())
                 aggregate_data = find_result.getMapped();
         }
@@ -2703,21 +2713,14 @@ void NO_INLINE Aggregator::mergeStreamsImpl(
     Method & method,
     Table & data,
     AggregateDataPtr overflow_row,
-    bool no_more_keys) const
+    bool no_more_keys,
+    Arena * arena_for_keys) const
 {
     const AggregateColumnsConstData & aggregate_columns_data = params.makeAggregateColumnsData(block);
     const ColumnRawPtrs & key_columns = params.makeRawKeyColumns(block);
 
     mergeStreamsImpl<Method, Table>(
-        aggregates_pool,
-        method,
-        data,
-        overflow_row,
-        no_more_keys,
-        0,
-        block.rows(),
-        aggregate_columns_data,
-        key_columns);
+        aggregates_pool, method, data, overflow_row, no_more_keys, 0, block.rows(), aggregate_columns_data, key_columns, arena_for_keys);
 }
 
 template <typename Method, typename Table>
@@ -2730,12 +2733,15 @@ void NO_INLINE Aggregator::mergeStreamsImpl(
     size_t row_begin,
     size_t row_end,
     const AggregateColumnsConstData & aggregate_columns_data,
-    const ColumnRawPtrs & key_columns) const
+    const ColumnRawPtrs & key_columns,
+    Arena * arena_for_keys) const
 {
     if (!no_more_keys)
-        mergeStreamsImplCase<false>(aggregates_pool, method, data, overflow_row, row_begin, row_end, aggregate_columns_data, key_columns);
+        mergeStreamsImplCase<false>(
+            aggregates_pool, method, data, overflow_row, row_begin, row_end, aggregate_columns_data, key_columns, arena_for_keys);
     else
-        mergeStreamsImplCase<true>(aggregates_pool, method, data, overflow_row, row_begin, row_end, aggregate_columns_data, key_columns);
+        mergeStreamsImplCase<true>(
+            aggregates_pool, method, data, overflow_row, row_begin, row_end, aggregate_columns_data, key_columns, arena_for_keys);
 }
 
 
@@ -3015,17 +3021,26 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
     result.keys_size = params.keys_size;
     result.key_sizes = key_sizes;
 
+    size_t source_rows = 0;
+
+    /// In some aggregation methods (e.g. serialized) aggregates pools are used also to store serialized aggregation keys.
+    /// Memory occupied by them will have the same lifetime as aggregate function states, while it is not actually necessary and leads to excessive memory consumption.
+    /// To avoid this we use a separate arena to allocate memory for aggregation keys. Its memory will be freed at this function return.
+    auto arena_for_keys = std::make_shared<Arena>();
+
     for (Block & block : blocks)
     {
+        source_rows += block.rows();
+
         if (bucket_num >= 0 && block.info.bucket_num != bucket_num)
             bucket_num = -1;
 
         if (result.type == AggregatedDataVariants::Type::without_key || is_overflows)
             mergeBlockWithoutKeyStreamsImpl(std::move(block), result);
 
-    #define M(NAME, IS_TWO_LEVEL) \
-        else if (result.type == AggregatedDataVariants::Type::NAME) \
-            mergeStreamsImpl(std::move(block), result.aggregates_pool, *result.NAME, result.NAME->data, nullptr, false);
+#define M(NAME, IS_TWO_LEVEL) \
+    else if (result.type == AggregatedDataVariants::Type::NAME) \
+        mergeStreamsImpl(std::move(block), result.aggregates_pool, *result.NAME, result.NAME->data, nullptr, false, arena_for_keys.get());
 
         APPLY_FOR_AGGREGATED_VARIANTS(M)
     #undef M
@@ -3049,9 +3064,15 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
     size_t rows = block.rows();
     size_t bytes = block.bytes();
     double elapsed_seconds = watch.elapsedSeconds();
-    LOG_DEBUG(log, "Merged partially aggregated blocks. {} rows, {}. in {} sec. ({:.3f} rows/sec., {}/sec.)",
-        rows, ReadableSize(bytes),
-        elapsed_seconds, rows / elapsed_seconds,
+    LOG_DEBUG(
+        log,
+        "Merged partially aggregated blocks for bucket #{}. Got {} rows, {} from {} source rows in {} sec. ({:.3f} rows/sec., {}/sec.)",
+        bucket_num,
+        rows,
+        ReadableSize(bytes),
+        source_rows,
+        elapsed_seconds,
+        rows / elapsed_seconds,
         ReadableSize(bytes / elapsed_seconds));
 
     block.info.bucket_num = bucket_num;
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index 716849465de..3e8b25c1a8c 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -1348,8 +1348,11 @@ private:
         size_t row_begin,
         size_t row_end,
         const AggregateColumnsConstData & aggregate_columns_data,
-        const ColumnRawPtrs & key_columns) const;
+        const ColumnRawPtrs & key_columns,
+        Arena * arena_for_keys) const;
 
+    /// `arena_for_keys` used to store serialized aggregation keys (in methods like `serialized`) to save some space.
+    /// If not provided, aggregates_pool is used instead. Refer to mergeBlocks() for an usage example.
     template <typename Method, typename Table>
     void mergeStreamsImpl(
         Block block,
@@ -1357,7 +1360,9 @@ private:
         Method & method,
         Table & data,
         AggregateDataPtr overflow_row,
-        bool no_more_keys) const;
+        bool no_more_keys,
+        Arena * arena_for_keys = nullptr) const;
+
     template <typename Method, typename Table>
     void mergeStreamsImpl(
         Arena * aggregates_pool,
@@ -1368,7 +1373,8 @@ private:
         size_t row_begin,
         size_t row_end,
         const AggregateColumnsConstData & aggregate_columns_data,
-        const ColumnRawPtrs & key_columns) const;
+        const ColumnRawPtrs & key_columns,
+        Arena * arena_for_keys) const;
 
     void mergeBlockWithoutKeyStreamsImpl(
         Block block,
diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index 9fd27fc28b6..f9bc22dd110 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -12,9 +12,9 @@
 #include <Common/typeid_cast.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
 #include <Common/getCurrentProcessFDCount.h>
 #include <Common/getMaxFileDescriptorCount.h>
+#include <Common/FileCache.h>
 #include <Server/ProtocolServerAdapter.h>
 #include <Storages/MarkCache.h>
 #include <Storages/StorageMergeTree.h>
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index ddf3b46f102..6877c0ece06 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -425,7 +425,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
             auto pool = ConnectionPoolFactory::instance().get(
                 settings.distributed_connections_pool_size,
                 address.host_name, address.port,
-                address.default_database, address.user, address.password,
+                address.default_database, address.user, address.password, address.quota_key,
                 address.cluster, address.cluster_secret,
                 "server", address.compression,
                 address.secure, address.priority);
@@ -499,7 +499,7 @@ Cluster::Cluster(const Poco::Util::AbstractConfiguration & config,
                 auto replica_pool = ConnectionPoolFactory::instance().get(
                     settings.distributed_connections_pool_size,
                     replica.host_name, replica.port,
-                    replica.default_database, replica.user, replica.password,
+                    replica.default_database, replica.user, replica.password, replica.quota_key,
                     replica.cluster, replica.cluster_secret,
                     "server", replica.compression,
                     replica.secure, replica.priority);
@@ -587,7 +587,7 @@ Cluster::Cluster(
             auto replica_pool = ConnectionPoolFactory::instance().get(
                         settings.distributed_connections_pool_size,
                         replica.host_name, replica.port,
-                        replica.default_database, replica.user, replica.password,
+                        replica.default_database, replica.user, replica.password, replica.quota_key,
                         replica.cluster, replica.cluster_secret,
                         "server", replica.compression, replica.secure, replica.priority);
             all_replicas.emplace_back(replica_pool);
@@ -699,6 +699,7 @@ Cluster::Cluster(Cluster::ReplicasAsShardsTag, const Cluster & from, const Setti
                 address.default_database,
                 address.user,
                 address.password,
+                address.quota_key,
                 address.cluster,
                 address.cluster_secret,
                 "server",
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index 72958703d0e..ada04aa1cae 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -93,6 +93,7 @@ public:
         UInt16 port{0};
         String user;
         String password;
+        String quota_key;
 
         /// For inter-server authorization
         String cluster;
diff --git a/src/Interpreters/ClusterDiscovery.cpp b/src/Interpreters/ClusterDiscovery.cpp
index f45d87809e4..88d7cedec83 100644
--- a/src/Interpreters/ClusterDiscovery.cpp
+++ b/src/Interpreters/ClusterDiscovery.cpp
@@ -13,6 +13,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/setThreadName.h>
+#include <Common/Config/ConfigHelper.h>
 
 #include <Core/ServerUUID.h>
 
@@ -126,11 +127,19 @@ ClusterDiscovery::ClusterDiscovery(
                 /* zk_root_= */ config.getString(prefix + ".path"),
                 /* port= */ context->getTCPPort(),
                 /* secure= */ config.getBool(prefix + ".secure", false),
-                /* shard_id= */ config.getUInt(prefix + ".shard", 0)
+                /* shard_id= */ config.getUInt(prefix + ".shard", 0),
+                /* observer_mode= */ ConfigHelper::getBool(config, prefix + ".observer")
             )
         );
     }
-    clusters_to_update = std::make_shared<UpdateFlags>(config_keys.begin(), config_keys.end());
+
+    std::vector<String> clusters_info_names;
+    clusters_info_names.reserve(clusters_info.size());
+    for (const auto & e : clusters_info)
+        clusters_info_names.emplace_back(e.first);
+
+    LOG_TRACE(log, "Clusters in discovery mode: {}", fmt::join(clusters_info_names, ", "));
+    clusters_to_update = std::make_shared<UpdateFlags>(clusters_info_names.begin(), clusters_info_names.end());
 }
 
 /// List node in zookeper for cluster
@@ -240,6 +249,11 @@ ClusterPtr ClusterDiscovery::makeCluster(const ClusterInfo & cluster_info)
     return cluster;
 }
 
+static bool contains(const Strings & list, const String & value)
+{
+    return std::find(list.begin(), list.end(), value) != list.end();
+}
+
 /// Reads data from zookeeper and tries to update cluster.
 /// Returns true on success (or no update required).
 bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
@@ -252,7 +266,22 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
     Strings node_uuids = getNodeNames(zk, cluster_info.zk_root, cluster_info.name, &start_version, false);
     auto & nodes_info = cluster_info.nodes_info;
 
-    if (std::find(node_uuids.begin(), node_uuids.end(), current_node_name) == node_uuids.end())
+    auto on_exit = [this, start_version, &zk, &cluster_info, &nodes_info]()
+    {
+        /// in case of successful update we still need to check if configuration of cluster still valid and also set watch callback
+        int current_version;
+        getNodeNames(zk, cluster_info.zk_root, cluster_info.name, &current_version, true);
+
+        if (current_version != start_version)
+        {
+            LOG_DEBUG(log, "Cluster '{}' configuration changed during update", cluster_info.name);
+            nodes_info.clear();
+            return false;
+        }
+        return true;
+    };
+
+    if (!cluster_info.current_node_is_observer && !contains(node_uuids, current_node_name))
     {
         LOG_ERROR(log, "Can't find current node in cluster '{}', will register again", cluster_info.name);
         registerInZk(zk, cluster_info);
@@ -263,7 +292,7 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
     if (!needUpdate(node_uuids, nodes_info))
     {
         LOG_DEBUG(log, "No update required for cluster '{}'", cluster_info.name);
-        return true;
+        return on_exit();
     }
 
     nodes_info = getNodes(zk, cluster_info.zk_root, node_uuids);
@@ -273,15 +302,8 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
         return false;
     }
 
-    int current_version;
-    getNodeNames(zk, cluster_info.zk_root, cluster_info.name, &current_version, true);
-
-    if (current_version != start_version)
-    {
-        LOG_DEBUG(log, "Cluster '{}' configuration changed during update", cluster_info.name);
-        nodes_info.clear();
+    if (bool ok = on_exit(); !ok)
         return false;
-    }
 
     LOG_DEBUG(log, "Updating system.clusters record for '{}' with {} nodes", cluster_info.name, cluster_info.nodes_info.size());
 
@@ -292,11 +314,18 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
 
 void ClusterDiscovery::registerInZk(zkutil::ZooKeeperPtr & zk, ClusterInfo & info)
 {
-    LOG_DEBUG(log, "Registering current node {} in cluster {}", current_node_name, info.name);
-
+    /// Create root node in observer mode not to get 'No node' error
     String node_path = getShardsListPath(info.zk_root) / current_node_name;
     zk->createAncestors(node_path);
 
+    if (info.current_node_is_observer)
+    {
+        LOG_DEBUG(log, "Current node {} is observer of cluster {}", current_node_name, info.name);
+        return;
+    }
+
+    LOG_DEBUG(log, "Registering current node {} in cluster {}", current_node_name, info.name);
+
     zk->createOrUpdate(node_path, info.current_node.serialize(), zkutil::CreateMode::Ephemeral);
     LOG_DEBUG(log, "Current node {} registered in cluster {}", current_node_name, info.name);
 }
diff --git a/src/Interpreters/ClusterDiscovery.h b/src/Interpreters/ClusterDiscovery.h
index 2098652c069..1c7337406b7 100644
--- a/src/Interpreters/ClusterDiscovery.h
+++ b/src/Interpreters/ClusterDiscovery.h
@@ -72,11 +72,19 @@ private:
         Stopwatch watch;
 
         NodeInfo current_node;
+        /// Current node may not belong to cluster, to be just an observer.
+        bool current_node_is_observer = false;
 
-        explicit ClusterInfo(const String & name_, const String & zk_root_, UInt16 port, bool secure, size_t shard_id)
+        explicit ClusterInfo(const String & name_,
+                             const String & zk_root_,
+                             UInt16 port,
+                             bool secure,
+                             size_t shard_id,
+                             bool observer_mode)
             : name(name_)
             , zk_root(zk_root_)
             , current_node(getFQDNOrHostName() + ":" + toString(port), secure, shard_id)
+            , current_node_is_observer(observer_mode)
         {
         }
     };
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.cpp b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
index 1c87138e1e3..15ecb822976 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.cpp
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
@@ -48,7 +48,7 @@ void CollectJoinOnKeysMatcher::Data::addJoinKeys(const ASTPtr & left_ast, const
 }
 
 void CollectJoinOnKeysMatcher::Data::addAsofJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast,
-                                                     JoinIdentifierPosPair table_pos, const ASOF::Inequality & inequality)
+                                                     JoinIdentifierPosPair table_pos, const ASOFJoinInequality & inequality)
 {
     if (isLeftIdentifier(table_pos.first) && isRightIdentifier(table_pos.second))
     {
@@ -60,7 +60,7 @@ void CollectJoinOnKeysMatcher::Data::addAsofJoinKeys(const ASTPtr & left_ast, co
     {
         asof_left_key = right_ast->clone();
         asof_right_key = left_ast->clone();
-        analyzed_join.setAsofInequality(ASOF::reverseInequality(inequality));
+        analyzed_join.setAsofInequality(reverseASOFJoinInequality(inequality));
     }
     else
     {
@@ -91,8 +91,9 @@ void CollectJoinOnKeysMatcher::visit(const ASTFunction & func, const ASTPtr & as
     if (func.name == "and")
         return; /// go into children
 
-    ASOF::Inequality inequality = ASOF::getInequality(func.name);
-    if (func.name == "equals" || inequality != ASOF::Inequality::None)
+    ASOFJoinInequality inequality = getASOFJoinInequality(func.name);
+
+    if (func.name == "equals" || inequality != ASOFJoinInequality::None)
     {
         if (func.arguments->children.size() != 2)
             throw Exception("Function " + func.name + " takes two arguments, got '" + func.formatForErrorMessage() + "' instead",
@@ -126,7 +127,7 @@ void CollectJoinOnKeysMatcher::visit(const ASTFunction & func, const ASTPtr & as
         return;
     }
 
-    if (data.is_asof && inequality != ASOF::Inequality::None)
+    if (data.is_asof && inequality != ASOFJoinInequality::None)
     {
         if (data.asof_left_key || data.asof_right_key)
             throw Exception("ASOF JOIN expects exactly one inequality in ON section. Unexpected '" + queryToString(ast) + "'",
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.h b/src/Interpreters/CollectJoinOnKeysVisitor.h
index 0647f58f79b..e52b0c69591 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.h
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.h
@@ -50,7 +50,7 @@ public:
 
         void addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast, JoinIdentifierPosPair table_pos);
         void addAsofJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast, JoinIdentifierPosPair table_pos,
-                             const ASOF::Inequality & asof_inequality);
+                             const ASOFJoinInequality & asof_inequality);
         void asofToJoinKeys();
     };
 
diff --git a/src/Interpreters/ConcurrentHashJoin.cpp b/src/Interpreters/ConcurrentHashJoin.cpp
index 5d6318a8df1..b7ad56dca91 100644
--- a/src/Interpreters/ConcurrentHashJoin.cpp
+++ b/src/Interpreters/ConcurrentHashJoin.cpp
@@ -9,7 +9,6 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/PreparedSets.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/createBlockSelector.h>
 #include <Parsers/DumpASTNode.h>
@@ -33,7 +32,7 @@ static UInt32 toPowerOfTwo(UInt32 x)
 {
     if (x <= 1)
         return 1;
-    return static_cast<UInt32>(1) << (32 - __builtin_clz(x - 1));
+    return static_cast<UInt32>(1) << (32 - std::countl_zero(x - 1));
 }
 
 ConcurrentHashJoin::ConcurrentHashJoin(ContextPtr context_, std::shared_ptr<TableJoin> table_join_, size_t slots_, const Block & right_sample_block, bool any_take_last_row_)
@@ -165,8 +164,8 @@ bool ConcurrentHashJoin::alwaysReturnsEmptySet() const
 std::shared_ptr<NotJoinedBlocks> ConcurrentHashJoin::getNonJoinedBlocks(
         const Block & /*left_sample_block*/, const Block & /*result_sample_block*/, UInt64 /*max_block_size*/) const
 {
-    if (table_join->strictness() == ASTTableJoin::Strictness::Asof ||
-        table_join->strictness() == ASTTableJoin::Strictness::Semi ||
+    if (table_join->strictness() == JoinStrictness::Asof ||
+        table_join->strictness() == JoinStrictness::Semi ||
         !isRightOrFull(table_join->kind()))
     {
         return {};
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index a5629b33d22..55ac93f7e7b 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -73,6 +73,7 @@
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Common/StackTrace.h>
+#include <Common/Config/ConfigHelper.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/Config/AbstractConfigurationComparison.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
@@ -1657,14 +1658,14 @@ ProcessList::Element * Context::getProcessListElement() const
 }
 
 
-void Context::setUncompressedCache(size_t max_size_in_bytes)
+void Context::setUncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy)
 {
     auto lock = getLock();
 
     if (shared->uncompressed_cache)
         throw Exception("Uncompressed cache has been already created.", ErrorCodes::LOGICAL_ERROR);
 
-    shared->uncompressed_cache = std::make_shared<UncompressedCache>(max_size_in_bytes);
+    shared->uncompressed_cache = std::make_shared<UncompressedCache>(max_size_in_bytes, uncompressed_cache_policy);
 }
 
 
@@ -1683,14 +1684,14 @@ void Context::dropUncompressedCache() const
 }
 
 
-void Context::setMarkCache(size_t cache_size_in_bytes)
+void Context::setMarkCache(size_t cache_size_in_bytes, const String & mark_cache_policy)
 {
     auto lock = getLock();
 
     if (shared->mark_cache)
         throw Exception("Mark cache has been already created.", ErrorCodes::LOGICAL_ERROR);
 
-    shared->mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes);
+    shared->mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes, mark_cache_policy);
 }
 
 MarkCachePtr Context::getMarkCache() const
@@ -2402,7 +2403,7 @@ void Context::startClusterDiscovery()
 void Context::setClustersConfig(const ConfigurationPtr & config, bool enable_discovery, const String & config_name)
 {
     std::lock_guard lock(shared->clusters_mutex);
-    if (config->getBool("allow_experimental_cluster_discovery", false) && enable_discovery && !shared->cluster_discovery)
+    if (ConfigHelper::getBool(*config, "allow_experimental_cluster_discovery") && enable_discovery && !shared->cluster_discovery)
     {
         shared->cluster_discovery = std::make_unique<ClusterDiscovery>(*config, getGlobalContext());
     }
@@ -2667,7 +2668,9 @@ DiskSelectorPtr Context::getDiskSelector(std::lock_guard<std::mutex> & /* lock *
         constexpr auto config_name = "storage_configuration.disks";
         const auto & config = getConfigRef();
 
-        shared->merge_tree_disk_selector = std::make_shared<DiskSelector>(config, config_name, shared_from_this());
+        auto disk_selector = std::make_shared<DiskSelector>();
+        disk_selector->initialize(config, config_name, shared_from_this());
+        shared->merge_tree_disk_selector = disk_selector;
     }
     return shared->merge_tree_disk_selector;
 }
@@ -2965,6 +2968,11 @@ void Context::setQueryParameter(const String & name, const String & value)
         throw Exception("Duplicate name " + backQuote(name) + " of query parameter", ErrorCodes::BAD_ARGUMENTS);
 }
 
+void Context::addQueryParameters(const NameToNameMap & parameters)
+{
+    for (const auto & [name, value] : parameters)
+        query_parameters.insert_or_assign(name, value);
+}
 
 void Context::addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const
 {
@@ -3446,6 +3454,7 @@ ReadSettings Context::getReadSettings() const
     res.filesystem_cache_max_wait_sec = settings.filesystem_cache_max_wait_sec;
     res.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache;
     res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
+    res.enable_filesystem_cache_on_lower_level = settings.enable_filesystem_cache_on_lower_level;
 
     res.max_query_cache_size = settings.max_query_cache_size;
     res.skip_download_if_exceeds_query_cache = settings.skip_download_if_exceeds_query_cache;
@@ -3475,6 +3484,7 @@ WriteSettings Context::getWriteSettings() const
     WriteSettings res;
 
     res.enable_filesystem_cache_on_write_operations = settings.enable_filesystem_cache_on_write_operations;
+    res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
 
     res.remote_throttler = getRemoteWriteThrottler();
 
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index cf508c7bfdb..ea03b8e6586 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -780,12 +780,12 @@ public:
     void setSystemZooKeeperLogAfterInitializationIfNeeded();
 
     /// Create a cache of uncompressed blocks of specified size. This can be done only once.
-    void setUncompressedCache(size_t max_size_in_bytes);
+    void setUncompressedCache(size_t max_size_in_bytes, const String & uncompressed_cache_policy);
     std::shared_ptr<UncompressedCache> getUncompressedCache() const;
     void dropUncompressedCache() const;
 
     /// Create a cache of marks of specified size. This can be done only once.
-    void setMarkCache(size_t cache_size_in_bytes);
+    void setMarkCache(size_t cache_size_in_bytes, const String & mark_cache_policy);
     std::shared_ptr<MarkCache> getMarkCache() const;
     void dropMarkCache() const;
 
@@ -946,9 +946,14 @@ public:
     /// Query parameters for prepared statements.
     bool hasQueryParameters() const;
     const NameToNameMap & getQueryParameters() const;
+
+    /// Throws if parameter with the given name already set.
     void setQueryParameter(const String & name, const String & value);
     void setQueryParameters(const NameToNameMap & parameters) { query_parameters = parameters; }
 
+    /// Overrides values of existing parameters.
+    void addQueryParameters(const NameToNameMap & parameters);
+
     /// Add started bridge command. It will be killed after context destruction
     void addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const;
 
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index cfa979f4036..52c457f2373 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -60,19 +60,19 @@ struct JoinedElement
 
     void rewriteCommaToCross()
     {
-        if (join && join->kind == ASTTableJoin::Kind::Comma)
-            join->kind = ASTTableJoin::Kind::Cross;
+        if (join && join->kind == JoinKind::Comma)
+            join->kind = JoinKind::Cross;
     }
 
-    ASTTableJoin::Kind getOriginalKind() const { return original_kind; }
+    JoinKind getOriginalKind() const { return original_kind; }
 
     bool rewriteCrossToInner(ASTPtr on_expression)
     {
-        if (join->kind != ASTTableJoin::Kind::Cross)
+        if (join->kind != JoinKind::Cross)
             return false;
 
-        join->kind = ASTTableJoin::Kind::Inner;
-        join->strictness = ASTTableJoin::Strictness::All;
+        join->kind = JoinKind::Inner;
+        join->strictness = JoinStrictness::All;
 
         join->on_expression = on_expression;
         join->children.push_back(join->on_expression);
@@ -89,7 +89,7 @@ private:
     const ASTTablesInSelectQueryElement & element;
     ASTTableJoin * join = nullptr;
 
-    ASTTableJoin::Kind original_kind;
+    JoinKind original_kind;
 };
 
 bool isAllowedToRewriteCrossJoin(const ASTPtr & node, const Aliases & aliases)
@@ -243,7 +243,7 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
         for (size_t i = 1; i < joined_tables.size(); ++i)
         {
             auto & joined = joined_tables[i];
-            if (joined.tableJoin()->kind != ASTTableJoin::Kind::Cross)
+            if (joined.tableJoin()->kind != JoinKind::Cross)
                 continue;
 
             String query_before = queryToString(*joined.tableJoin());
@@ -258,7 +258,7 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
                 }
             }
 
-            if (joined.getOriginalKind() == ASTTableJoin::Kind::Comma &&
+            if (joined.getOriginalKind() == JoinKind::Comma &&
                 data.cross_to_inner_join_rewrite > 1 &&
                 !rewritten)
             {
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 71fcd7a1884..50876ed29af 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -25,6 +25,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_TYPE_OF_QUERY;
     extern const int INCONSISTENT_CLUSTER_DEFINITION;
     extern const int LOGICAL_ERROR;
+    extern const int DNS_ERROR;
 }
 
 HostID HostID::fromString(const String & host_port_str)
@@ -58,7 +59,12 @@ void DDLLogEntry::assertVersion() const
 void DDLLogEntry::setSettingsIfRequired(ContextPtr context)
 {
     version = context->getSettingsRef().distributed_ddl_entry_format_version;
-    if (version == 2)
+
+    /// NORMALIZE_CREATE_ON_INITIATOR_VERSION does not affect entry format in ZooKeeper
+    if (version == NORMALIZE_CREATE_ON_INITIATOR_VERSION)
+        version = SETTINGS_IN_ZK_VERSION;
+
+    if (version == SETTINGS_IN_ZK_VERSION)
         settings.emplace(context->getSettingsRef().changes());
 }
 
@@ -69,7 +75,7 @@ String DDLLogEntry::toString() const
     wb << "version: " << version << "\n";
     wb << "query: " << escape << query << "\n";
 
-    bool write_hosts = version == 1 || !hosts.empty();
+    bool write_hosts = version == OLDEST_VERSION || !hosts.empty();
     if (write_hosts)
     {
         Strings host_id_strings(hosts.size());
@@ -79,7 +85,7 @@ String DDLLogEntry::toString() const
 
     wb << "initiator: " << initiator << "\n";
 
-    bool write_settings = 1 <= version && settings && !settings->empty();
+    bool write_settings = SETTINGS_IN_ZK_VERSION <= version && settings && !settings->empty();
     if (write_settings)
     {
         ASTSetQuery ast;
@@ -164,17 +170,33 @@ ContextMutablePtr DDLTaskBase::makeQueryContext(ContextPtr from_context, const Z
 bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log)
 {
     bool host_in_hostlist = false;
+    std::exception_ptr first_exception = nullptr;
 
     for (const HostID & host : entry.hosts)
     {
         auto maybe_secure_port = global_context->getTCPPortSecure();
 
-        /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
-        bool is_local_port = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port))
-                             || host.isLocalAddress(global_context->getTCPPort());
+        try
+        {
+            /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
+            bool is_local_port
+                = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port)) || host.isLocalAddress(global_context->getTCPPort());
 
-        if (!is_local_port)
+            if (!is_local_port)
+                continue;
+        }
+        catch (const Exception & e)
+        {
+            if (e.code() != ErrorCodes::DNS_ERROR)
+                throw;
+
+            if (!first_exception)
+                first_exception = std::current_exception();
+
+            /// Ignore unknown hosts (in case DNS record was removed)
+            /// We will rethrow exception if we don't find local host in the list.
             continue;
+        }
 
         if (host_in_hostlist)
         {
@@ -190,6 +212,12 @@ bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log)
         }
     }
 
+    if (!host_in_hostlist && first_exception)
+    {
+        /// We don't know for sure if we should process task or not
+        std::rethrow_exception(first_exception);
+    }
+
     return host_in_hostlist;
 }
 
@@ -361,7 +389,7 @@ void DatabaseReplicatedTask::parseQueryFromEntry(ContextPtr context)
     if (auto * ddl_query = dynamic_cast<ASTQueryWithTableAndOutput *>(query.get()))
     {
         /// Update database name with actual name of local database
-        assert(!ddl_query->database);
+        chassert(!ddl_query->database);
         ddl_query->setDatabase(database->getDatabaseName());
     }
 }
@@ -397,6 +425,24 @@ Coordination::RequestPtr DatabaseReplicatedTask::getOpToUpdateLogPointer()
     return zkutil::makeSetRequest(database->replica_path + "/log_ptr", toString(getLogEntryNumber(entry_name)), -1);
 }
 
+void DatabaseReplicatedTask::createSyncedNodeIfNeed(const ZooKeeperPtr & zookeeper)
+{
+    assert(!completely_processed);
+    if (!entry.settings)
+        return;
+
+    Field value;
+    if (!entry.settings->tryGet("database_replicated_enforce_synchronous_settings", value))
+        return;
+
+    /// Bool type is really weird, sometimes it's Bool and sometimes it's UInt64...
+    assert(value.getType() == Field::Types::Bool || value.getType() == Field::Types::UInt64);
+    if (!value.get<UInt64>())
+        return;
+
+    zookeeper->createIfNotExists(getSyncedNodePath(), "");
+}
+
 String DDLTaskBase::getLogEntryName(UInt32 log_entry_number)
 {
     return zkutil::getSequentialNodeName("query-", log_entry_number);
@@ -423,7 +469,7 @@ void ZooKeeperMetadataTransaction::commit()
 ClusterPtr tryGetReplicatedDatabaseCluster(const String & cluster_name)
 {
     if (const auto * replicated_db = dynamic_cast<const DatabaseReplicated *>(DatabaseCatalog::instance().tryGetDatabase(cluster_name).get()))
-        return replicated_db->getCluster();
+        return replicated_db->tryGetCluster();
     return {};
 }
 
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index d3728918a2d..d5990edd43f 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -66,6 +66,10 @@ struct HostID
 
 struct DDLLogEntry
 {
+    static constexpr const UInt64 OLDEST_VERSION = 1;
+    static constexpr const UInt64 SETTINGS_IN_ZK_VERSION = 2;
+    static constexpr const UInt64 NORMALIZE_CREATE_ON_INITIATOR_VERSION = 3;
+
     UInt64 version = 1;
     String query;
     std::vector<HostID> hosts;
@@ -109,9 +113,12 @@ struct DDLTaskBase
     virtual ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper);
     virtual Coordination::RequestPtr getOpToUpdateLogPointer() { return nullptr; }
 
+    virtual void createSyncedNodeIfNeed(const ZooKeeperPtr & /*zookeeper*/) {}
+
     inline String getActiveNodePath() const { return fs::path(entry_path) / "active" / host_id_str; }
     inline String getFinishedNodePath() const { return fs::path(entry_path) / "finished" / host_id_str; }
     inline String getShardNodePath() const { return fs::path(entry_path) / "shards" / getShardID(); }
+    inline String getSyncedNodePath() const { return fs::path(entry_path) / "synced" / host_id_str; }
 
     static String getLogEntryName(UInt32 log_entry_number);
     static UInt32 getLogEntryNumber(const String & log_entry_name);
@@ -147,6 +154,7 @@ struct DatabaseReplicatedTask : public DDLTaskBase
     void parseQueryFromEntry(ContextPtr context) override;
     ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper) override;
     Coordination::RequestPtr getOpToUpdateLogPointer() override;
+    void createSyncedNodeIfNeed(const ZooKeeperPtr & zookeeper) override;
 
     DatabaseReplicated * database;
 };
@@ -174,6 +182,12 @@ class ZooKeeperMetadataTransaction
     String task_path;
     Coordination::Requests ops;
 
+    /// CREATE OR REPLACE is special query that consists of 3 separate DDL queries (CREATE, RENAME, DROP)
+    /// and not all changes should be applied to metadata in ZooKeeper
+    /// (otherwise we may get partially applied changes on connection loss).
+    /// So we need this flag to avoid doing unnecessary operations with metadata.
+    bool is_create_or_replace_query = false;
+
 public:
     ZooKeeperMetadataTransaction(const ZooKeeperPtr & current_zookeeper_, const String & zookeeper_path_, bool is_initial_query_, const String & task_path_)
     : current_zookeeper(current_zookeeper_)
@@ -193,6 +207,10 @@ public:
 
     ZooKeeperPtr getZooKeeper() const { return current_zookeeper; }
 
+    void setIsCreateOrReplaceQuery() { is_create_or_replace_query = true; }
+
+    bool isCreateOrReplaceQuery() const { return is_create_or_replace_query; }
+
     void addOp(Coordination::RequestPtr && op)
     {
         if (isExecuted())
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 13432940c1b..6ec20ab5f5f 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -112,6 +112,8 @@ DDLWorker::DDLWorker(
 
 void DDLWorker::startup()
 {
+    [[maybe_unused]] bool prev_stop_flag = stop_flag.exchange(false);
+    chassert(true);
     main_thread = ThreadFromGlobalPool(&DDLWorker::runMainThread, this);
     cleanup_thread = ThreadFromGlobalPool(&DDLWorker::runCleanupThread, this);
 }
@@ -251,7 +253,7 @@ void DDLWorker::scheduleTasks(bool reinitialized)
             auto & task = *task_it;
             if (task->completely_processed)
             {
-                assert(task->was_executed);
+                chassert(task->was_executed);
                 /// Status must be written (but finished/ node may not exist if entry was deleted).
                 /// If someone is deleting entry concurrently, then /active status dir must not exist.
                 assert(zookeeper->exists(task->getFinishedNodePath()) || !zookeeper->exists(fs::path(task->entry_path) / "active"));
@@ -267,7 +269,13 @@ void DDLWorker::scheduleTasks(bool reinitialized)
                 /// but we lost connection while waiting for the response.
                 /// Yeah, distributed systems is a zoo.
                 if (status_written)
+                {
+                    /// TODO We cannot guarantee that query was actually executed synchronously if connection was lost.
+                    /// Let's simple create synced/ node for now, but it would be better to pass UNFINISHED status to initiator
+                    /// or wait for query to actually finish (requires https://github.com/ClickHouse/ClickHouse/issues/23513)
+                    task->createSyncedNodeIfNeed(zookeeper);
                     task->completely_processed = true;
+                }
                 else
                     processTask(*task, zookeeper);
                 ++task_it;
@@ -312,7 +320,7 @@ void DDLWorker::scheduleTasks(bool reinitialized)
     if (first_failed_task_name)
     {
         /// If we had failed tasks, then we should start from the first failed task.
-        assert(reinitialized);
+        chassert(reinitialized);
         begin_node = std::lower_bound(queue_nodes.begin(), queue_nodes.end(), first_failed_task_name);
     }
     else
@@ -505,7 +513,7 @@ void DDLWorker::updateMaxDDLEntryID(const String & entry_name)
 void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
 {
     LOG_DEBUG(log, "Processing task {} ({})", task.entry_name, task.entry.query);
-    assert(!task.completely_processed);
+    chassert(!task.completely_processed);
 
     String active_node_path = task.getActiveNodePath();
     String finished_node_path = task.getFinishedNodePath();
@@ -523,14 +531,14 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
     {
         if (create_active_res != Coordination::Error::ZNONODE && create_active_res != Coordination::Error::ZNODEEXISTS)
         {
-            assert(Coordination::isHardwareError(create_active_res));
+            chassert(Coordination::isHardwareError(create_active_res));
             throw Coordination::Exception(create_active_res, active_node_path);
         }
 
         /// Status dirs were not created in enqueueQuery(...) or someone is removing entry
         if (create_active_res == Coordination::Error::ZNONODE)
         {
-            assert(dynamic_cast<DatabaseReplicatedTask *>(&task) == nullptr);
+            chassert(dynamic_cast<DatabaseReplicatedTask *>(&task) == nullptr);
             if (task.was_executed)
             {
                 /// Special case:
@@ -643,6 +651,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
     /// Active node was removed in multi ops
     active_node->setAlreadyRemoved();
 
+    task.createSyncedNodeIfNeed(zookeeper);
     task.completely_processed = true;
     updateMaxDDLEntryID(task.entry_name);
 }
@@ -810,7 +819,7 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
         }
     }
 
-    assert(!(executed_by_us && executed_by_other_leader));
+    chassert(!(executed_by_us && executed_by_other_leader));
 
     /// Not executed by leader so was not executed at all
     if (!executed_by_us && !executed_by_other_leader)
@@ -901,9 +910,9 @@ void DDLWorker::cleanupQueue(Int64, const ZooKeeperPtr & zookeeper)
                 /// Possible rare case: initiator node has lost connection after enqueueing entry and failed to create status dirs.
                 /// No one has started to process the entry, so node_path/active and node_path/finished nodes were never created, node_path has no children.
                 /// Entry became outdated, but we cannot remove remove it in a transaction with node_path/finished.
-                assert(res[0]->error == Coordination::Error::ZOK && res[1]->error == Coordination::Error::ZNONODE);
+                chassert(res[0]->error == Coordination::Error::ZOK && res[1]->error == Coordination::Error::ZNONODE);
                 rm_entry_res = zookeeper->tryRemove(node_path);
-                assert(rm_entry_res != Coordination::Error::ZNOTEMPTY);
+                chassert(rm_entry_res != Coordination::Error::ZNOTEMPTY);
                 continue;
             }
             zkutil::KeeperMultiException::check(rm_entry_res, ops, res);
@@ -1004,7 +1013,7 @@ String DDLWorker::enqueueQuery(DDLLogEntry & entry)
 
 bool DDLWorker::initializeMainThread()
 {
-    assert(!initialized);
+    chassert(!initialized);
     setThreadName("DDLWorker");
     LOG_DEBUG(log, "Initializing DDLWorker thread");
 
@@ -1023,7 +1032,7 @@ bool DDLWorker::initializeMainThread()
             {
                 /// A logical error.
                 LOG_ERROR(log, "ZooKeeper error: {}. Failed to start DDLWorker.", getCurrentExceptionMessage(true));
-                assert(false);  /// Catch such failures in tests with debug build
+                chassert(false);  /// Catch such failures in tests with debug build
             }
 
             tryLogCurrentException(__PRETTY_FUNCTION__);
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 5dc6d4acbe5..7ddcc80c02a 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -138,7 +138,7 @@ protected:
     std::shared_ptr<Poco::Event> queue_updated_event = std::make_shared<Poco::Event>();
     std::shared_ptr<Poco::Event> cleanup_event = std::make_shared<Poco::Event>();
     std::atomic<bool> initialized = false;
-    std::atomic<bool> stop_flag = false;
+    std::atomic<bool> stop_flag = true;
 
     ThreadFromGlobalPool main_thread;
     ThreadFromGlobalPool cleanup_thread;
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 02d3e5eac32..1ad3d0057cd 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -5,6 +5,7 @@
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseMemory.h>
 #include <Databases/DatabaseOnDisk.h>
+#include <Disks/IDisk.h>
 #include <Common/quoteString.h>
 #include <Storages/StorageMemory.h>
 #include <Storages/LiveView/TemporaryLiveViewCleaner.h>
@@ -19,10 +20,6 @@
 #include <Common/filesystemHelpers.h>
 #include <Common/noexcept_scope.h>
 
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <utime.h>
-
 #include "config_core.h"
 
 #if USE_MYSQL
@@ -894,7 +891,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
             create->setTable(table_id.table_name);
             try
             {
-                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, getContext(), false).second;
+                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, getContext(), /* force_restore */ true).second;
                 table->is_dropped = true;
             }
             catch (...)
@@ -979,7 +976,6 @@ void DatabaseCatalog::dropTableDataTask()
 
     if (table.table_id)
     {
-
         try
         {
             dropTableFinally(table);
@@ -1019,13 +1015,15 @@ void DatabaseCatalog::dropTableFinally(const TableMarkedAsDropped & table)
         table.table->drop();
     }
 
-    /// Even if table is not loaded, try remove its data from disk.
-    /// TODO remove data from all volumes
-    fs::path data_path = fs::path(getContext()->getPath()) / "store" / getPathForUUID(table.table_id.uuid);
-    if (fs::exists(data_path))
+    /// Even if table is not loaded, try remove its data from disks.
+    for (const auto & [disk_name, disk] : getContext()->getDisksMap())
     {
-        LOG_INFO(log, "Removing data directory {} of dropped table {}", data_path.string(), table.table_id.getNameForLogs());
-        fs::remove_all(data_path);
+        String data_path = "store/" + getPathForUUID(table.table_id.uuid);
+        if (!disk->exists(data_path) || disk->isReadOnly())
+            continue;
+
+        LOG_INFO(log, "Removing data directory {} of dropped table {} from disk {}", data_path, table.table_id.getNameForLogs(), disk_name);
+        disk->removeRecursive(data_path);
     }
 
     LOG_INFO(log, "Removing metadata {} of dropped table {}", table.metadata_path, table.table_id.getNameForLogs());
@@ -1169,121 +1167,118 @@ void DatabaseCatalog::updateLoadingDependencies(const StorageID & table_id, Tabl
 
 void DatabaseCatalog::cleanupStoreDirectoryTask()
 {
-    fs::path store_path = fs::path(getContext()->getPath()) / "store";
-    size_t affected_dirs = 0;
-    for (const auto & prefix_dir : fs::directory_iterator{store_path})
+    for (const auto & [disk_name, disk] : getContext()->getDisksMap())
     {
-        String prefix = prefix_dir.path().filename();
-        bool expected_prefix_dir = prefix_dir.is_directory() &&
-            prefix.size() == 3 &&
-            isHexDigit(prefix[0]) &&
-            isHexDigit(prefix[1]) &&
-            isHexDigit(prefix[2]);
-
-        if (!expected_prefix_dir)
-        {
-            LOG_WARNING(log, "Found invalid directory {}, will try to remove it", prefix_dir.path().string());
-            affected_dirs += maybeRemoveDirectory(prefix_dir.path());
+        if (!disk->supportsStat() || !disk->supportsChmod())
             continue;
-        }
 
-        for (const auto & uuid_dir : fs::directory_iterator{prefix_dir.path()})
+        size_t affected_dirs = 0;
+        for (auto it = disk->iterateDirectory("store"); it->isValid(); it->next())
         {
-            String uuid_str = uuid_dir.path().filename();
-            UUID uuid;
-            bool parsed = tryParse(uuid, uuid_str);
+            String prefix = it->name();
+            bool expected_prefix_dir = disk->isDirectory(it->path()) && prefix.size() == 3 && isHexDigit(prefix[0]) && isHexDigit(prefix[1])
+                && isHexDigit(prefix[2]);
 
-            bool expected_dir = uuid_dir.is_directory() &&
-                parsed &&
-                uuid != UUIDHelpers::Nil &&
-                uuid_str.starts_with(prefix);
-
-            if (!expected_dir)
+            if (!expected_prefix_dir)
             {
-                LOG_WARNING(log, "Found invalid directory {}, will try to remove it", uuid_dir.path().string());
-                affected_dirs += maybeRemoveDirectory(uuid_dir.path());
+                LOG_WARNING(log, "Found invalid directory {} on disk {}, will try to remove it", it->path(), disk_name);
+                affected_dirs += maybeRemoveDirectory(disk_name, disk, it->path());
                 continue;
             }
 
-            /// Order is important
-            if (!hasUUIDMapping(uuid))
+            for (auto jt = disk->iterateDirectory(it->path()); jt->isValid(); jt->next())
             {
-                /// We load uuids even for detached and permanently detached tables,
-                /// so it looks safe enough to remove directory if we don't have uuid mapping for it.
-                /// No table or database using this directory should concurrently appear,
-                /// because creation of new table would fail with "directory already exists".
-                affected_dirs += maybeRemoveDirectory(uuid_dir.path());
+                String uuid_str = jt->name();
+                UUID uuid;
+                bool parsed = tryParse(uuid, uuid_str);
+
+                bool expected_dir = disk->isDirectory(jt->path()) && parsed && uuid != UUIDHelpers::Nil && uuid_str.starts_with(prefix);
+
+                if (!expected_dir)
+                {
+                    LOG_WARNING(log, "Found invalid directory {} on disk {}, will try to remove it", jt->path(), disk_name);
+                    affected_dirs += maybeRemoveDirectory(disk_name, disk, jt->path());
+                    continue;
+                }
+
+                /// Order is important
+                if (!hasUUIDMapping(uuid))
+                {
+                    /// We load uuids even for detached and permanently detached tables,
+                    /// so it looks safe enough to remove directory if we don't have uuid mapping for it.
+                    /// No table or database using this directory should concurrently appear,
+                    /// because creation of new table would fail with "directory already exists".
+                    affected_dirs += maybeRemoveDirectory(disk_name, disk, jt->path());
+                }
             }
         }
-    }
 
-    if (affected_dirs)
-        LOG_INFO(log, "Cleaned up {} directories from store/", affected_dirs);
+        if (affected_dirs)
+            LOG_INFO(log, "Cleaned up {} directories from store/ on disk {}", affected_dirs, disk_name);
+    }
 
     (*cleanup_task)->scheduleAfter(unused_dir_cleanup_period_sec * 1000);
 }
 
-bool DatabaseCatalog::maybeRemoveDirectory(const fs::path & unused_dir)
+bool DatabaseCatalog::maybeRemoveDirectory(const String & disk_name, const DiskPtr & disk, const String & unused_dir)
 {
     /// "Safe" automatic removal of some directory.
     /// At first we do not remove anything and only revoke all access right.
     /// And remove only if nobody noticed it after, for example, one month.
 
-    struct stat st;
-    if (stat(unused_dir.string().c_str(), &st))
+    try
     {
-        LOG_ERROR(log, "Failed to stat {}, errno: {}", unused_dir.string(), errno);
+        struct stat st = disk->stat(unused_dir);
+
+        if (st.st_uid != geteuid())
+        {
+            /// Directory is not owned by clickhouse, it's weird, let's ignore it (chmod will likely fail anyway).
+            LOG_WARNING(log, "Found directory {} with unexpected owner (uid={}) on disk {}", unused_dir, st.st_uid, disk_name);
+            return false;
+        }
+
+        time_t max_modification_time = std::max(st.st_atime, std::max(st.st_mtime, st.st_ctime));
+        time_t current_time = time(nullptr);
+        if (st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))
+        {
+            if (current_time <= max_modification_time + unused_dir_hide_timeout_sec)
+                return false;
+
+            LOG_INFO(log, "Removing access rights for unused directory {} from disk {} (will remove it when timeout exceed)", unused_dir, disk_name);
+
+            /// Explicitly update modification time just in case
+
+            disk->setLastModified(unused_dir, Poco::Timestamp::fromEpochTime(current_time));
+
+            /// Remove all access right
+            disk->chmod(unused_dir, 0);
+
+            return true;
+        }
+        else
+        {
+            if (!unused_dir_rm_timeout_sec)
+                return false;
+
+            if (current_time <= max_modification_time + unused_dir_rm_timeout_sec)
+                return false;
+
+            LOG_INFO(log, "Removing unused directory {} from disk {}", unused_dir, disk_name);
+
+            /// We have to set these access rights to make recursive removal work
+            disk->chmod(unused_dir, S_IRWXU);
+
+            disk->removeRecursive(unused_dir);
+
+            return true;
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, fmt::format("Failed to remove unused directory {} from disk {} ({})",
+                                                unused_dir, disk->getName(), disk->getPath()));
         return false;
     }
-
-    if (st.st_uid != geteuid())
-    {
-        /// Directory is not owned by clickhouse, it's weird, let's ignore it (chmod will likely fail anyway).
-        LOG_WARNING(log, "Found directory {} with unexpected owner (uid={})", unused_dir.string(), st.st_uid);
-        return false;
-    }
-
-    time_t max_modification_time = std::max(st.st_atime, std::max(st.st_mtime, st.st_ctime));
-    time_t current_time = time(nullptr);
-    if (st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))
-    {
-        if (current_time <= max_modification_time + unused_dir_hide_timeout_sec)
-            return false;
-
-        LOG_INFO(log, "Removing access rights for unused directory {} (will remove it when timeout exceed)", unused_dir.string());
-
-        /// Explicitly update modification time just in case
-
-        struct utimbuf tb;
-        tb.actime = current_time;
-        tb.modtime = current_time;
-        if (utime(unused_dir.string().c_str(), &tb) != 0)
-            LOG_ERROR(log, "Failed to utime {}, errno: {}", unused_dir.string(), errno);
-
-        /// Remove all access right
-        if (chmod(unused_dir.string().c_str(), 0))
-            LOG_ERROR(log, "Failed to chmod {}, errno: {}", unused_dir.string(), errno);
-
-        return true;
-    }
-    else
-    {
-        if (!unused_dir_rm_timeout_sec)
-            return false;
-
-        if (current_time <= max_modification_time + unused_dir_rm_timeout_sec)
-            return false;
-
-        LOG_INFO(log, "Removing unused directory {}", unused_dir.string());
-
-        /// We have to set these access rights to make recursive removal work
-        if (chmod(unused_dir.string().c_str(), S_IRWXU))
-            LOG_ERROR(log, "Failed to chmod {}, errno: {}", unused_dir.string(), errno);
-
-        fs::remove_all(unused_dir);
-
-        return true;
-    }
 }
 
 static void maybeUnlockUUID(UUID uuid)
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index d82ad56eadd..0b3daefb258 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -31,10 +31,12 @@ class IDatabase;
 class Exception;
 class ColumnsDescription;
 struct ConstraintsDescription;
+class IDisk;
 
 using DatabasePtr = std::shared_ptr<IDatabase>;
 using DatabaseAndTable = std::pair<DatabasePtr, StoragePtr>;
 using Databases = std::map<String, std::shared_ptr<IDatabase>>;
+using DiskPtr = std::shared_ptr<IDisk>;
 
 /// Table -> set of table-views that make SELECT from it.
 using ViewDependencies = std::map<StorageID, std::set<StorageID>>;
@@ -271,7 +273,7 @@ private:
     void dropTableFinally(const TableMarkedAsDropped & table);
 
     void cleanupStoreDirectoryTask();
-    bool maybeRemoveDirectory(const fs::path & unused_dir);
+    bool maybeRemoveDirectory(const String & disk_name, const DiskPtr & disk, const String & unused_dir);
 
     static constexpr size_t reschedule_time_ms = 100;
     static constexpr time_t drop_error_cooldown_sec = 5;
diff --git a/src/Interpreters/DictionaryReader.cpp b/src/Interpreters/DictionaryReader.cpp
deleted file mode 100644
index 3c66b0019ed..00000000000
--- a/src/Interpreters/DictionaryReader.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <Interpreters/DictionaryReader.h>
-#include <Interpreters/Context.h>
-#include <Common/typeid_cast.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Functions/FunctionFactory.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
-    extern const int TYPE_MISMATCH;
-}
-
-
-DictionaryReader::FunctionWrapper::FunctionWrapper(FunctionOverloadResolverPtr resolver, const ColumnsWithTypeAndName & arguments,
-                                                   Block & block, const ColumnNumbers & arg_positions_, const String & column_name,
-                                                   TypeIndex expected_type)
-    : arg_positions(arg_positions_)
-    , result_pos(block.columns())
-{
-    FunctionBasePtr prepared_function = resolver->build(arguments);
-
-    ColumnWithTypeAndName result;
-    result.name = "get_" + column_name;
-    result.type = prepared_function->getResultType();
-    if (result.type->getTypeId() != expected_type)
-        throw Exception("Type mismatch in dictionary reader for: " + column_name, ErrorCodes::TYPE_MISMATCH);
-    block.insert(result);
-
-    ColumnsWithTypeAndName args;
-    args.reserve(arg_positions.size());
-    for (auto pos : arg_positions)
-        args.emplace_back(block.getByPosition(pos));
-
-    function = prepared_function->prepare(block.getColumnsWithTypeAndName());
-}
-
-static constexpr const size_t key_size = 1;
-
-DictionaryReader::DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                                   ContextPtr context)
-    : result_header(makeResultBlock(result_columns))
-    , key_position(key_size + result_header.columns())
-{
-    if (src_column_names.size() != result_columns.size())
-        throw Exception("Columns number mismatch in dictionary reader", ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
-
-    ColumnWithTypeAndName dict_name;
-    ColumnWithTypeAndName key;
-    ColumnWithTypeAndName column_name;
-
-    {
-        dict_name.name = "dict";
-        dict_name.type = std::make_shared<DataTypeString>();
-        dict_name.column = dict_name.type->createColumnConst(1, dictionary_name);
-
-        /// TODO: composite key (key_size > 1)
-        key.name = "key";
-        key.type = std::make_shared<DataTypeUInt64>();
-
-        column_name.name = "column";
-        column_name.type = std::make_shared<DataTypeString>();
-    }
-
-    /// dictHas('dict_name', id)
-    ColumnsWithTypeAndName arguments_has;
-    arguments_has.push_back(dict_name);
-    arguments_has.push_back(key);
-
-    /// dictGet('dict_name', 'attr_name', id)
-    ColumnsWithTypeAndName arguments_get;
-    arguments_get.push_back(dict_name);
-    arguments_get.push_back(column_name);
-    arguments_get.push_back(key);
-
-    sample_block.insert(dict_name);
-
-    for (const auto & columns_name : src_column_names)
-    {
-        ColumnWithTypeAndName name;
-        name.name = "col_" + columns_name;
-        name.type = std::make_shared<DataTypeString>();
-        name.column = name.type->createColumnConst(1, columns_name);
-
-        sample_block.insert(name);
-    }
-
-    sample_block.insert(key);
-
-    ColumnNumbers positions_has{0, key_position};
-    function_has = std::make_unique<FunctionWrapper>(FunctionFactory::instance().get("dictHas", context),
-                                                        arguments_has, sample_block, positions_has, "has", DataTypeUInt8().getTypeId());
-    functions_get.reserve(result_header.columns());
-
-    for (size_t i = 0; i < result_header.columns(); ++i)
-    {
-        size_t column_name_pos = key_size + i;
-        auto & column = result_header.getByPosition(i);
-        arguments_get[1].column = DataTypeString().createColumnConst(1, src_column_names[i]);
-        ColumnNumbers positions_get{0, column_name_pos, key_position};
-        functions_get.emplace_back(
-            FunctionWrapper(FunctionFactory::instance().get("dictGet", context),
-                            arguments_get, sample_block, positions_get, column.name, column.type->getTypeId()));
-    }
-}
-
-void DictionaryReader::readKeys(const IColumn & keys, Block & out_block, ColumnVector<UInt8>::Container & found,
-                                std::vector<size_t> & positions) const
-{
-    auto working_block = sample_block.getColumnsWithTypeAndName();
-    size_t has_position = key_position + 1;
-    size_t size = keys.size();
-
-    /// set keys for dictHas()
-    ColumnWithTypeAndName & key_column = working_block[key_position];
-    key_column.column = keys.cloneResized(size); /// just a copy we cannot avoid
-
-    /// calculate and extract dictHas()
-    function_has->execute(working_block, size);
-    ColumnWithTypeAndName & has_column = working_block[has_position];
-    auto mutable_has = IColumn::mutate(std::move(has_column.column));
-    found.swap(typeid_cast<ColumnVector<UInt8> &>(*mutable_has).getData());
-    has_column.column = nullptr;
-
-    /// set mapping from source keys to resulting rows in output block
-    positions.clear();
-    positions.resize(size, 0);
-    size_t pos = 0;
-    for (size_t i = 0; i < size; ++i)
-        if (found[i])
-            positions[i] = pos++;
-
-    /// set keys for dictGet(): remove not found keys
-    key_column.column = key_column.column->filter(found, -1);
-    size_t rows = key_column.column->size();
-
-    /// calculate dictGet()
-    for (const auto & func : functions_get)
-        func.execute(working_block, rows);
-
-    /// make result: copy header block with correct names and move data columns
-    out_block = result_header.cloneEmpty();
-    size_t first_get_position = has_position + 1;
-    for (size_t i = 0; i < out_block.columns(); ++i)
-    {
-        auto & src_column = working_block[first_get_position + i];
-        auto & dst_column = out_block.getByPosition(i);
-        dst_column.column = src_column.column;
-        src_column.column = nullptr;
-    }
-}
-
-Block DictionaryReader::makeResultBlock(const NamesAndTypesList & names)
-{
-    Block block;
-    for (const auto & nm : names)
-    {
-        ColumnWithTypeAndName column{nullptr, nm.type, nm.name};
-        if (column.type->isNullable())
-            column.type = typeid_cast<const DataTypeNullable &>(*column.type).getNestedType();
-        block.insert(std::move(column));
-    }
-    return block;
-}
-
-}
diff --git a/src/Interpreters/DictionaryReader.h b/src/Interpreters/DictionaryReader.h
deleted file mode 100644
index bfb21e2f050..00000000000
--- a/src/Interpreters/DictionaryReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <Columns/ColumnVector.h>
-#include <Functions/IFunctionAdaptors.h>
-#include <Interpreters/Context_fwd.h>
-
-namespace DB
-{
-
-/// Read block of required columns from Dictionary by UInt64 key column. Rename columns if needed.
-/// Current implementation uses dictHas() + N * dictGet() functions.
-class DictionaryReader
-{
-public:
-    struct FunctionWrapper
-    {
-        ExecutableFunctionPtr function;
-        ColumnNumbers arg_positions;
-        size_t result_pos = 0;
-
-        FunctionWrapper(FunctionOverloadResolverPtr resolver, const ColumnsWithTypeAndName & arguments, Block & block,
-                        const ColumnNumbers & arg_positions_, const String & column_name, TypeIndex expected_type);
-
-        void execute(ColumnsWithTypeAndName & columns, size_t rows) const
-        {
-            ColumnsWithTypeAndName args;
-            args.reserve(arg_positions.size());
-            for (auto pos : arg_positions)
-                args.emplace_back(columns[pos]);
-
-            columns[result_pos].column = function->execute(args, columns[result_pos].type, rows, false);
-        }
-    };
-
-    DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                     ContextPtr context);
-    void readKeys(const IColumn & keys, Block & out_block, ColumnVector<UInt8>::Container & found, std::vector<size_t> & positions) const;
-
-private:
-    Block result_header;
-    Block sample_block; /// dictionary name, column names, key, dictHas() result, dictGet() results
-    size_t key_position;
-    std::unique_ptr<FunctionWrapper> function_has;
-    std::vector<FunctionWrapper> functions_get;
-
-    static Block makeResultBlock(const NamesAndTypesList & names);
-};
-
-}
diff --git a/src/Interpreters/DirectJoin.cpp b/src/Interpreters/DirectJoin.cpp
index 21baeb31945..02b3854a47b 100644
--- a/src/Interpreters/DirectJoin.cpp
+++ b/src/Interpreters/DirectJoin.cpp
@@ -30,6 +30,11 @@ static MutableColumns convertBlockStructure(
     MutableColumns result_columns;
     for (const auto & out_sample_col : result_sample_block)
     {
+        /// Some columns from result_sample_block may not be in source_sample_block,
+        /// e.g. if they will be calculated later based on joined columns
+        if (!source_sample_block.has(out_sample_col.name))
+            continue;
+
         auto i = source_sample_block.getPositionByName(out_sample_col.name);
         if (columns[i] == nullptr)
         {
@@ -58,24 +63,31 @@ static MutableColumns convertBlockStructure(
 
 DirectKeyValueJoin::DirectKeyValueJoin(std::shared_ptr<TableJoin> table_join_,
                                        const Block & right_sample_block_,
-                                       std::shared_ptr<IKeyValueStorage> storage_)
+                                       std::shared_ptr<const IKeyValueEntity> storage_)
     : table_join(table_join_)
     , storage(storage_)
     , right_sample_block(right_sample_block_)
     , log(&Poco::Logger::get("DirectKeyValueJoin"))
 {
-    if (!table_join->oneDisjunct()
-        || table_join->getOnlyClause().key_names_left.size() != 1
-        || table_join->getOnlyClause().key_names_right.size() != 1)
+    if (!table_join->oneDisjunct() ||
+        table_join->getOnlyClause().key_names_left.size() != 1 ||
+        table_join->getOnlyClause().key_names_right.size() != 1)
     {
         throw DB::Exception(ErrorCodes::UNSUPPORTED_JOIN_KEYS, "Not supported by direct JOIN");
     }
 
-    if (table_join->strictness() != ASTTableJoin::Strictness::All &&
-        table_join->strictness() != ASTTableJoin::Strictness::Any &&
-        table_join->strictness() != ASTTableJoin::Strictness::RightAny)
+    bool allowed_inner = isInner(table_join->kind()) && (table_join->strictness() == JoinStrictness::All ||
+                                                         table_join->strictness() == JoinStrictness::Any ||
+                                                         table_join->strictness() != JoinStrictness::RightAny);
+
+    bool allowed_left = isLeft(table_join->kind()) && (table_join->strictness() == JoinStrictness::Any ||
+                                                       table_join->strictness() == JoinStrictness::All ||
+                                                       table_join->strictness() == JoinStrictness::Semi ||
+                                                       table_join->strictness() == JoinStrictness::Anti);
+    if (!allowed_inner && !allowed_left)
     {
-        throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "Not supported by direct JOIN");
+        throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "Strictness {} and kind {} is not supported by direct JOIN",
+            table_join->strictness(), table_join->kind());
     }
 
     LOG_TRACE(log, "Using direct join");
@@ -101,12 +113,14 @@ void DirectKeyValueJoin::joinBlock(Block & block, std::shared_ptr<ExtraBlock> &)
     if (!key_col.column)
         return;
 
-    NullMap null_map;
-    Chunk joined_chunk = storage->getByKeys({key_col}, null_map);
-
-    /// Expected right block may differ from structure in storage, because of `join_use_nulls` or we just select not all columns.
     Block original_right_block = originalRightBlock(right_sample_block, *table_join);
-    Block sample_storage_block = storage->getInMemoryMetadataPtr()->getSampleBlock();
+    const Names & attribute_names = original_right_block.getNames();
+
+    NullMap null_map;
+    Chunk joined_chunk = storage->getByKeys({key_col}, null_map, attribute_names);
+
+    /// Expected right block may differ from structure in storage, because of `join_use_nulls` or we just select not all joined attributes
+    Block sample_storage_block = storage->getSampleBlock(attribute_names);
     MutableColumns result_columns = convertBlockStructure(sample_storage_block, original_right_block, joined_chunk.mutateColumns(), null_map);
 
     for (size_t i = 0; i < result_columns.size(); ++i)
@@ -116,7 +130,18 @@ void DirectKeyValueJoin::joinBlock(Block & block, std::shared_ptr<ExtraBlock> &)
         block.insert(std::move(col));
     }
 
-    if (!isLeftOrFull(table_join->kind()))
+    bool is_semi_join = table_join->strictness() == JoinStrictness::Semi;
+    bool is_anti_join = table_join->strictness() == JoinStrictness::Anti;
+
+    if (is_anti_join)
+    {
+        /// invert null_map
+        for (auto & val : null_map)
+            val = !val;
+    }
+
+    /// Filter non joined rows
+    if (isInner(table_join->kind()) || (isLeft(table_join->kind()) && (is_semi_join || is_anti_join)))
     {
         MutableColumns dst_columns = block.mutateColumns();
         for (auto & col : dst_columns)
diff --git a/src/Interpreters/DirectJoin.h b/src/Interpreters/DirectJoin.h
index f7da06ef826..8e82b59da02 100644
--- a/src/Interpreters/DirectJoin.h
+++ b/src/Interpreters/DirectJoin.h
@@ -9,7 +9,7 @@
 
 #include <QueryPipeline/SizeLimits.h>
 
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 #include <Storages/IStorage_fwd.h>
 
 namespace DB
@@ -23,7 +23,7 @@ public:
     DirectKeyValueJoin(
         std::shared_ptr<TableJoin> table_join_,
         const Block & right_sample_block_,
-        std::shared_ptr<IKeyValueStorage> storage_);
+        std::shared_ptr<const IKeyValueEntity> storage_);
 
     virtual const TableJoin & getTableJoin() const override { return *table_join; }
 
@@ -50,7 +50,7 @@ public:
 
 private:
     std::shared_ptr<TableJoin> table_join;
-    std::shared_ptr<IKeyValueStorage> storage;
+    std::shared_ptr<const IKeyValueEntity> storage;
     Block right_sample_block;
     Block sample_block_with_columns_to_add;
     Poco::Logger * log;
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 2e96ffe7947..b27df0f1c35 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -47,8 +47,6 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
 }
 
-ExpressionActions::~ExpressionActions() = default;
-
 static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions(const ActionsDAG & actions_dag, ShortCircuitFunctionEvaluation short_circuit_function_evaluation);
 
 ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_)
@@ -301,7 +299,7 @@ static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions
     if (short_circuit_nodes.empty())
         return {};
 
-    auto reverse_info = getActionsDAGReverseInfo(nodes, actions_dag.getIndex());
+    auto reverse_info = getActionsDAGReverseInfo(nodes, actions_dag.getOutputs());
 
     /// For each node we fill LazyExecutionInfo.
     std::unordered_map<const ActionsDAG::Node *, LazyExecutionInfo> lazy_execution_infos;
@@ -335,10 +333,10 @@ void ExpressionActions::linearizeActions(const std::unordered_set<const ActionsD
     };
 
     const auto & nodes = getNodes();
-    const auto & index = actions_dag->getIndex();
+    const auto & outputs = actions_dag->getOutputs();
     const auto & inputs = actions_dag->getInputs();
 
-    auto reverse_info = getActionsDAGReverseInfo(nodes, index);
+    auto reverse_info = getActionsDAGReverseInfo(nodes, outputs);
     std::vector<Data> data;
     for (const auto & node : nodes)
         data.push_back({.node = &node});
@@ -428,9 +426,9 @@ void ExpressionActions::linearizeActions(const std::unordered_set<const ActionsD
         }
     }
 
-    result_positions.reserve(index.size());
+    result_positions.reserve(outputs.size());
 
-    for (const auto & node : index)
+    for (const auto & node : outputs)
     {
         auto pos = data[reverse_info.reverse_index[node]].position;
 
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 332ae941bba..889617e0a22 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -83,7 +83,6 @@ private:
 
 public:
     ExpressionActions() = delete;
-    ~ExpressionActions();
     explicit ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_ = {});
     ExpressionActions(const ExpressionActions &) = default;
     ExpressionActions & operator=(const ExpressionActions &) = default;
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 96e4e11f17b..105d46eed1f 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -18,7 +18,6 @@
 #include <Interpreters/ArrayJoinAction.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ConcurrentHashJoin.h>
-#include <Interpreters/DictionaryReader.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
@@ -30,6 +29,7 @@
 #include <Interpreters/Set.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/FullSortingMergeJoin.h>
+#include <Interpreters/replaceForPositionalArguments.h>
 
 #include <Processors/QueryPlan/ExpressionStep.h>
 
@@ -39,7 +39,7 @@
 #include <Storages/StorageDistributed.h>
 #include <Storages/StorageDictionary.h>
 #include <Storages/StorageJoin.h>
-
+#include <Functions/FunctionsExternalDictionaries.h>
 
 #include <Dictionaries/DictionaryStructure.h>
 
@@ -63,7 +63,7 @@
 #include <Interpreters/GetAggregatesVisitor.h>
 #include <Interpreters/GlobalSubqueriesVisitor.h>
 #include <Interpreters/interpretSubquery.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Interpreters/misc.h>
 
 #include <IO/Operators.h>
@@ -112,78 +112,7 @@ bool allowEarlyConstantFolding(const ActionsDAG & actions, const Settings & sett
     return true;
 }
 
-bool checkPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
-{
-    auto columns = select_query->select()->children;
-
-    const auto * expr_with_alias = dynamic_cast<const ASTWithAlias *>(argument.get());
-    if (expr_with_alias && !expr_with_alias->alias.empty())
-        return false;
-
-    const auto * ast_literal = typeid_cast<const ASTLiteral *>(argument.get());
-    if (!ast_literal)
-        return false;
-
-    auto which = ast_literal->value.getType();
-    if (which != Field::Types::UInt64)
-        return false;
-
-    auto pos = ast_literal->value.get<UInt64>();
-    if (!pos || pos > columns.size())
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Positional argument out of bounds: {} (exprected in range [1, {}]",
-                        pos, columns.size());
-
-    const auto & column = columns[--pos];
-    if (typeid_cast<const ASTIdentifier *>(column.get()) || typeid_cast<const ASTLiteral *>(column.get()))
-    {
-        argument = column->clone();
-    }
-    else if (typeid_cast<const ASTFunction *>(column.get()))
-    {
-        std::function<void(ASTPtr)> throw_if_aggregate_function = [&](ASTPtr node)
-        {
-            if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
-            {
-                auto is_aggregate_function = AggregateUtils::isAggregateFunction(*function);
-                if (is_aggregate_function)
-                {
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                                    "Illegal value (aggregate function) for positional argument in {}",
-                                    ASTSelectQuery::expressionToString(expression));
-                }
-                else
-                {
-                    if (function->arguments)
-                    {
-                        for (const auto & arg : function->arguments->children)
-                            throw_if_aggregate_function(arg);
-                    }
-                }
-            }
-        };
-
-        if (expression == ASTSelectQuery::Expression::GROUP_BY)
-            throw_if_aggregate_function(column);
-
-        argument = column->clone();
-    }
-    else
-    {
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "Illegal value for positional argument in {}",
-                        ASTSelectQuery::expressionToString(expression));
-    }
-
-    return true;
-}
-
-void replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
-{
-    auto argument_with_replacement = argument->clone();
-    if (checkPositionalArguments(argument_with_replacement, select_query, expression))
-        argument = argument_with_replacement;
-}
+Poco::Logger * getLogger() { return &Poco::Logger::get("ExpressionAnalyzer"); }
 
 }
 
@@ -226,18 +155,19 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     size_t subquery_depth_,
     bool do_global,
     bool is_explain,
-    SubqueriesForSets subqueries_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     : WithContext(context_)
     , query(query_), settings(getContext()->getSettings())
     , subquery_depth(subquery_depth_)
     , syntax(syntax_analyzer_result_)
 {
     /// Cache prepared sets because we might run analysis multiple times
-    subqueries_for_sets = std::move(subqueries_for_sets_);
-    prepared_sets = std::move(prepared_sets_);
+    if (prepared_sets_)
+        prepared_sets = prepared_sets_;
+    else
+        prepared_sets = std::make_shared<PreparedSets>();
 
-    /// external_tables, subqueries_for_sets for global subqueries.
+    /// external_tables, sets for global subqueries.
     /// Replaces global subqueries with the generated names of temporary tables that will be sent to remote servers.
     initGlobalSubqueriesAndExternalTables(do_global, is_explain);
 
@@ -376,7 +306,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
 
                         ssize_t group_size = group_elements_ast.size();
                         const auto & column_name = group_elements_ast[j]->getColumnName();
-                        const auto * node = temp_actions->tryFindInIndex(column_name);
+                        const auto * node = temp_actions->tryFindInOutputs(column_name);
                         if (!node)
                             throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
 
@@ -430,7 +360,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
                     getRootActionsNoMakeSet(group_asts[i], temp_actions, false);
 
                     const auto & column_name = group_asts[i]->getColumnName();
-                    const auto * node = temp_actions->tryFindInIndex(column_name);
+                    const auto * node = temp_actions->tryFindInOutputs(column_name);
                     if (!node)
                         throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
 
@@ -501,7 +431,7 @@ void ExpressionAnalyzer::initGlobalSubqueriesAndExternalTables(bool do_global, b
     if (do_global)
     {
         GlobalSubqueriesVisitor::Data subqueries_data(
-            getContext(), subquery_depth, isRemoteStorage(), is_explain, external_tables, subqueries_for_sets, has_global_subqueries);
+            getContext(), subquery_depth, isRemoteStorage(), is_explain, external_tables, prepared_sets, has_global_subqueries);
         GlobalSubqueriesVisitor(subqueries_data).visit(query);
     }
 }
@@ -509,14 +439,17 @@ void ExpressionAnalyzer::initGlobalSubqueriesAndExternalTables(bool do_global, b
 
 void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name, const SelectQueryOptions & query_options)
 {
+    if (!prepared_sets)
+        return;
+
     auto set_key = PreparedSetKey::forSubquery(*subquery_or_table_name);
 
-    if (prepared_sets.contains(set_key))
+    if (prepared_sets->get(set_key))
         return; /// Already prepared.
 
     if (auto set_ptr_from_storage_set = isPlainStorageSetInSubquery(subquery_or_table_name))
     {
-        prepared_sets.insert({set_key, set_ptr_from_storage_set});
+        prepared_sets->set(set_key, set_ptr_from_storage_set);
         return;
     }
 
@@ -540,7 +473,7 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
 
     set->finishInsert();
 
-    prepared_sets[set_key] = std::move(set);
+    prepared_sets->set(set_key, std::move(set));
 }
 
 SetPtr ExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_or_table_name)
@@ -596,8 +529,8 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
                 auto temp_actions = std::make_shared<ActionsDAG>(columns_after_join);
                 getRootActions(left_in_operand, true, temp_actions);
 
-                if (temp_actions->tryFindInIndex(left_in_operand->getColumnName()))
-                    makeExplicitSet(func, *temp_actions, true, getContext(), settings.size_limits_for_set, prepared_sets);
+                if (prepared_sets && temp_actions->tryFindInOutputs(left_in_operand->getColumnName()))
+                    makeExplicitSet(func, *temp_actions, true, getContext(), settings.size_limits_for_set, *prepared_sets);
             }
         }
     }
@@ -614,7 +547,6 @@ void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_makeset_for_
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
@@ -634,7 +566,6 @@ void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, ActionsDAGP
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         true /* no_makeset_for_subqueries, no_makeset implies no_makeset_for_subqueries */,
         true /* no_makeset */,
         only_consts,
@@ -656,7 +587,6 @@ void ExpressionAnalyzer::getRootActionsForHaving(
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         no_makeset_for_subqueries,
         false /* no_makeset */,
         only_consts,
@@ -677,7 +607,6 @@ void ExpressionAnalyzer::getRootActionsForWindowFunctions(const ASTPtr & ast, bo
         sourceColumns(),
         std::move(actions),
         prepared_sets,
-        subqueries_for_sets,
         no_makeset_for_subqueries,
         false /* no_makeset */,
         false /*only_consts */,
@@ -706,7 +635,7 @@ void ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions, Aggr
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             const std::string & name = arguments[i]->getColumnName();
-            const auto * dag_node = actions->tryFindInIndex(name);
+            const auto * dag_node = actions->tryFindInOutputs(name);
             if (!dag_node)
             {
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
@@ -913,7 +842,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
         for (size_t i = 0; i < arguments.size(); ++i)
         {
             const std::string & name = arguments[i]->getColumnName();
-            const auto * node = actions->tryFindInIndex(name);
+            const auto * node = actions->tryFindInOutputs(name);
 
             if (!node)
             {
@@ -1009,8 +938,8 @@ ArrayJoinActionPtr ExpressionAnalyzer::addMultipleArrayJoinAction(ActionsDAGPtr
         /// Assign new names to columns, if needed.
         if (result_source.first != result_source.second)
         {
-            const auto & node = actions->findInIndex(result_source.second);
-            actions->getIndex().push_back(&actions->addAlias(node, result_source.first));
+            const auto & node = actions->findInOutputs(result_source.second);
+            actions->getOutputs().push_back(&actions->addAlias(node, result_source.first));
         }
 
         /// Make ARRAY JOIN (replace arrays with their insides) for the columns in these new names.
@@ -1086,19 +1015,12 @@ static std::shared_ptr<IJoin> chooseJoinAlgorithm(std::shared_ptr<TableJoin> ana
 
     if (analyzed_join->isEnabledAlgorithm(JoinAlgorithm::DIRECT))
     {
-        if (JoinPtr kvjoin = tryKeyValueJoin(analyzed_join, right_sample_block))
+        JoinPtr direct_join = tryKeyValueJoin(analyzed_join, right_sample_block);
+        if (direct_join)
         {
-            /// Do not need to execute plan for right part
+            /// Do not need to execute plan for right part, it's ready.
             joined_plan.reset();
-            return kvjoin;
-        }
-
-        /// It's not a hash join actually, that's why we check JoinAlgorithm::DIRECT
-        /// It's would be fixed in https://github.com/ClickHouse/ClickHouse/pull/38956
-        if (analyzed_join->tryInitDictJoin(right_sample_block, context))
-        {
-            joined_plan.reset();
-            return std::make_shared<HashJoin>(analyzed_join, right_sample_block);
+            return direct_join;
         }
     }
 
@@ -1169,10 +1091,10 @@ static std::unique_ptr<QueryPlan> buildJoinedPlan(
             {
                 auto pos = original_right_columns.getPositionByName(name_with_alias.first);
                 const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
-                rename_dag->getIndex()[pos] = &alias;
+                rename_dag->getOutputs()[pos] = &alias;
             }
         }
-
+        rename_dag->projectInput();
         auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
         rename_step->setStepDescription("Rename joined columns");
         joined_plan->addStep(std::move(rename_step));
@@ -1192,19 +1114,17 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
 
     auto storage = analyzed_join->getStorageKeyValue();
     if (!storage)
-    {
         return nullptr;
-    }
 
-    if (!isInnerOrLeft(analyzed_join->kind()))
-    {
-        return nullptr;
-    }
-
-    if (analyzed_join->strictness() != ASTTableJoin::Strictness::All &&
-        analyzed_join->strictness() != ASTTableJoin::Strictness::Any &&
-        analyzed_join->strictness() != ASTTableJoin::Strictness::RightAny)
+    bool allowed_inner = isInner(analyzed_join->kind()) && analyzed_join->strictness() == JoinStrictness::All;
+    bool allowed_left = isLeft(analyzed_join->kind()) && (analyzed_join->strictness() == JoinStrictness::Any ||
+                                                          analyzed_join->strictness() == JoinStrictness::All ||
+                                                          analyzed_join->strictness() == JoinStrictness::Semi ||
+                                                          analyzed_join->strictness() == JoinStrictness::Anti);
+    if (!allowed_inner && !allowed_left)
     {
+        LOG_TRACE(getLogger(), "Can't use direct join: {} {} is not supported",
+            analyzed_join->kind(), analyzed_join->strictness());
         return nullptr;
     }
 
@@ -1217,6 +1137,7 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
 
     if (!only_one_key)
     {
+        LOG_TRACE(getLogger(), "Can't use direct join: only one key is supported");
         return nullptr;
     }
 
@@ -1225,6 +1146,8 @@ std::shared_ptr<DirectKeyValueJoin> tryKeyValueJoin(std::shared_ptr<TableJoin> a
     const auto & storage_primary_key = storage->getPrimaryKey();
     if (storage_primary_key.size() != 1 || storage_primary_key[0] != original_key_name)
     {
+        LOG_TRACE(getLogger(), "Can't use direct join: join key '{}' doesn't match to storage key ({})",
+            original_key_name, fmt::join(storage_primary_key, ", "));
         return nullptr;
     }
 
@@ -1264,7 +1187,6 @@ JoinPtr SelectQueryExpressionAnalyzer::makeJoin(
     }
 
     JoinPtr join = chooseJoinAlgorithm(analyzed_join, joined_plan, getContext());
-
     return join;
 }
 
@@ -1284,7 +1206,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
     String prewhere_column_name = select_query->prewhere()->getColumnName();
     step.addRequiredOutput(prewhere_column_name);
 
-    const auto & node = step.actions()->findInIndex(prewhere_column_name);
+    const auto & node = step.actions()->findInOutputs(prewhere_column_name);
     auto filter_type = node.result_type;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in PREWHERE: " + filter_type->getName(),
@@ -1367,7 +1289,7 @@ bool SelectQueryExpressionAnalyzer::appendWhere(ExpressionActionsChain & chain,
     auto where_column_name = select_query->where()->getColumnName();
     step.addRequiredOutput(where_column_name);
 
-    const auto & node = step.actions()->findInIndex(where_column_name);
+    const auto & node = step.actions()->findInOutputs(where_column_name);
     auto filter_type = node.result_type;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in WHERE: " + filter_type->getName(),
@@ -1594,9 +1516,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
             throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
 
         if (getContext()->getSettingsRef().enable_positional_arguments)
-        {
             replaceForPositionalArguments(ast->children.at(0), select_query, ASTSelectQuery::Expression::ORDER_BY);
-        }
     }
 
     getRootActions(select_query->orderBy(), only_types, step.actions());
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index da92bc10832..ddb41a00f84 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -5,10 +5,9 @@
 #include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/AggregateDescription.h>
 #include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/WindowDescription.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/SelectQueryInfo.h>
@@ -50,8 +49,7 @@ struct ExpressionAnalyzerData
 {
     ~ExpressionAnalyzerData();
 
-    SubqueriesForSets subqueries_for_sets;
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 
     std::unique_ptr<QueryPlan> joined_plan;
 
@@ -106,7 +104,7 @@ public:
     /// Ctor for non-select queries. Generally its usage is:
     /// auto actions = ExpressionAnalyzer(query, syntax, context).getActions();
     ExpressionAnalyzer(const ASTPtr & query_, const TreeRewriterResultPtr & syntax_analyzer_result_, ContextPtr context_)
-        : ExpressionAnalyzer(query_, syntax_analyzer_result_, context_, 0, false, false, {}, {})
+        : ExpressionAnalyzer(query_, syntax_analyzer_result_, context_, 0, false, false, {})
     {
     }
 
@@ -130,9 +128,7 @@ public:
       * That is, you need to call getSetsWithSubqueries after all calls of `append*` or `getActions`
       *  and create all the returned sets before performing the actions.
       */
-    SubqueriesForSets & getSubqueriesForSets() { return subqueries_for_sets; }
-
-    PreparedSets & getPreparedSets() { return prepared_sets; }
+    PreparedSetsPtr getPreparedSets() { return prepared_sets; }
 
     /// Get intermediates for tests
     const ExpressionAnalyzerData & getAnalyzedData() const { return *this; }
@@ -143,14 +139,12 @@ public:
     void makeWindowDescriptionFromAST(const Context & context, const WindowDescriptions & existing_descriptions, WindowDescription & desc, const IAST * ast);
     void makeWindowDescriptions(ActionsDAGPtr actions);
 
-    /**
-      * Create Set from a subquery or a table expression in the query. The created set is suitable for using the index.
+    /** Create Set from a subquery or a table expression in the query. The created set is suitable for using the index.
       * The set will not be created if its size hits the limit.
       */
     void tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_or_table_name, const SelectQueryOptions & query_options = {});
 
-    /**
-      * Checks if subquery is not a plain StorageSet.
+    /** Checks if subquery is not a plain StorageSet.
       * Because while making set we will read data from StorageSet which is not allowed.
       * Returns valid SetPtr from StorageSet if the latter is used after IN or nullptr otherwise.
       */
@@ -164,8 +158,7 @@ protected:
         size_t subquery_depth_,
         bool do_global_,
         bool is_explain_,
-        SubqueriesForSets subqueries_for_sets_,
-        PreparedSets prepared_sets_);
+        PreparedSetsPtr prepared_sets_);
 
     ASTPtr query;
     const ExtractedSettings settings;
@@ -317,8 +310,7 @@ public:
         const NameSet & required_result_columns_ = {},
         bool do_global_ = false,
         const SelectQueryOptions & options_ = {},
-        SubqueriesForSets subqueries_for_sets_ = {},
-        PreparedSets prepared_sets_ = {})
+        PreparedSetsPtr prepared_sets_ = nullptr)
         : ExpressionAnalyzer(
             query_,
             syntax_analyzer_result_,
@@ -326,8 +318,7 @@ public:
             options_.subquery_depth,
             do_global_,
             options_.is_explain,
-            std::move(subqueries_for_sets_),
-            std::move(prepared_sets_))
+            prepared_sets_)
         , metadata_snapshot(metadata_snapshot_)
         , required_result_columns(required_result_columns_)
         , query_options(options_)
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 01c92598142..a179c4d8bf6 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -551,10 +551,10 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression, const
             node_to_data[child].all_parents_compilable &= node_is_valid_for_compilation;
     }
 
-    for (const auto & node : index)
+    for (const auto & output_node : outputs)
     {
-        /// Force result nodes to compile
-        node_to_data[node].all_parents_compilable = false;
+        /// Force output nodes to compile
+        node_to_data[output_node].all_parents_compilable = false;
     }
 
     std::vector<Node *> nodes_to_compile;
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 1dcf48da130..704dff325b7 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -1299,6 +1299,7 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
     return [this, ptr, name]()
     {
         config_files_reader->removeConfigRepository(ptr);
+        CurrentStatusInfo::unset(CurrentStatusInfo::DictionaryStatus, name);
         reloadConfig(name);
     };
 }
diff --git a/src/Interpreters/FilesystemCacheLog.cpp b/src/Interpreters/FilesystemCacheLog.cpp
index f03472c45e0..547df77786e 100644
--- a/src/Interpreters/FilesystemCacheLog.cpp
+++ b/src/Interpreters/FilesystemCacheLog.cpp
@@ -10,15 +10,17 @@
 namespace DB
 {
 
-static String typeToString(FilesystemCacheLogElement::ReadType type)
+static String typeToString(FilesystemCacheLogElement::CacheType type)
 {
     switch (type)
     {
-        case FilesystemCacheLogElement::ReadType::READ_FROM_CACHE:
+        case FilesystemCacheLogElement::CacheType::READ_FROM_CACHE:
             return "READ_FROM_CACHE";
-        case FilesystemCacheLogElement::ReadType::READ_FROM_FS_AND_DOWNLOADED_TO_CACHE:
+        case FilesystemCacheLogElement::CacheType::READ_FROM_FS_AND_DOWNLOADED_TO_CACHE:
             return "READ_FROM_FS_AND_DOWNLOADED_TO_CACHE";
-        case FilesystemCacheLogElement::ReadType::READ_FROM_FS_BYPASSING_CACHE:
+        case FilesystemCacheLogElement::CacheType::READ_FROM_FS_BYPASSING_CACHE:
+            return "READ_FROM_FS_BYPASSING_CACHE";
+        case FilesystemCacheLogElement::CacheType::WRITE_THROUGH_CACHE:
             return "READ_FROM_FS_BYPASSING_CACHE";
     }
     __builtin_unreachable();
@@ -59,7 +61,7 @@ void FilesystemCacheLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(Tuple{file_segment_range.first, file_segment_range.second});
     columns[i++]->insert(Tuple{requested_range.first, requested_range.second});
     columns[i++]->insert(file_segment_size);
-    columns[i++]->insert(typeToString(read_type));
+    columns[i++]->insert(typeToString(cache_type));
     columns[i++]->insert(cache_attempted);
 
     if (profile_counters)
diff --git a/src/Interpreters/FilesystemCacheLog.h b/src/Interpreters/FilesystemCacheLog.h
index a3624867aec..00863c36c79 100644
--- a/src/Interpreters/FilesystemCacheLog.h
+++ b/src/Interpreters/FilesystemCacheLog.h
@@ -24,11 +24,12 @@ namespace DB
 ///
 struct FilesystemCacheLogElement
 {
-    enum class ReadType
+    enum class CacheType
     {
         READ_FROM_CACHE,
         READ_FROM_FS_AND_DOWNLOADED_TO_CACHE,
         READ_FROM_FS_BYPASSING_CACHE,
+        WRITE_THROUGH_CACHE,
     };
 
     time_t event_time{};
@@ -38,7 +39,7 @@ struct FilesystemCacheLogElement
 
     std::pair<size_t, size_t> file_segment_range{};
     std::pair<size_t, size_t> requested_range{};
-    ReadType read_type{};
+    CacheType cache_type{};
     size_t file_segment_size;
     bool cache_attempted;
     String read_buffer_id;
diff --git a/src/Interpreters/FunctionMaskingArgumentCheckVisitor.h b/src/Interpreters/FunctionMaskingArgumentCheckVisitor.h
new file mode 100644
index 00000000000..1f3c44f8087
--- /dev/null
+++ b/src/Interpreters/FunctionMaskingArgumentCheckVisitor.h
@@ -0,0 +1,44 @@
+#pragma once
+
+
+#include <DataTypes/Serializations/ISerialization.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+
+namespace DB
+{
+
+/// Checks from bottom to top if a function's alias shadows the name
+/// of one of it's arguments, e.g.
+/// SELECT toString(dummy) as dummy FROM system.one GROUP BY dummy;
+class FunctionMaskingArgumentCheckMatcher
+{
+public:
+    struct Data
+    {
+        const String& alias;
+        bool is_rejected = false;
+        void reject() { is_rejected = true; }
+    };
+
+    static void visit(const ASTPtr & ast, Data & data)
+    {
+        if (data.is_rejected)
+            return;
+        if (const auto & identifier = ast->as<ASTIdentifier>())
+            visit(*identifier, data);
+    }
+
+    static void visit(const ASTIdentifier & ast, Data & data)
+    {
+        if (ast.getAliasOrColumnName() == data.alias)
+            data.reject();
+    }
+
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+};
+
+using FunctionMaskingArgumentCheckVisitor = ConstInDepthNodeVisitor<FunctionMaskingArgumentCheckMatcher, false>;
+
+}
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.cpp b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
index 93b35a3416a..2abd7af1455 100644
--- a/src/Interpreters/GatherFunctionQuantileVisitor.cpp
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
@@ -1,8 +1,9 @@
-#include <string>
 #include <Interpreters/GatherFunctionQuantileVisitor.h>
+
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
 #include <Parsers/ASTFunction.h>
-#include <Common/Exception.h>
 #include <base/types.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
@@ -30,6 +31,13 @@ static const std::unordered_map<String, String> quantile_fuse_name_mapping = {
     {NameQuantileTimingWeighted::name, NameQuantilesTimingWeighted::name},
 };
 
+String GatherFunctionQuantileData::toFusedNameOrSelf(const String & func_name)
+{
+    if (auto it = quantile_fuse_name_mapping.find(func_name); it != quantile_fuse_name_mapping.end())
+        return it->second;
+    return func_name;
+}
+
 String GatherFunctionQuantileData::getFusedName(const String & func_name)
 {
     if (auto it = quantile_fuse_name_mapping.find(func_name); it != quantile_fuse_name_mapping.end())
@@ -53,11 +61,9 @@ void GatherFunctionQuantileData::FuseQuantileAggregatesData::addFuncNode(ASTPtr
 
     const auto & arguments = func->arguments->children;
 
-    bool need_two_args = func->name == NameQuantileDeterministic::name
-                         || func->name == NameQuantileExactWeighted::name
-                         || func->name == NameQuantileTimingWeighted::name
-                         || func->name == NameQuantileTDigestWeighted::name
-                         || func->name == NameQuantileBFloat16Weighted::name;
+    bool need_two_args = func->name == NameQuantileDeterministic::name || func->name == NameQuantileExactWeighted::name
+        || func->name == NameQuantileTimingWeighted::name || func->name == NameQuantileTDigestWeighted::name
+        || func->name == NameQuantileBFloat16Weighted::name;
     if (arguments.size() != (need_two_args ? 2 : 1))
         return;
 
@@ -83,4 +89,3 @@ bool GatherFunctionQuantileData::needChild(const ASTPtr & node, const ASTPtr &)
 }
 
 }
-
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.h b/src/Interpreters/GatherFunctionQuantileVisitor.h
index d68cc8fe22e..74388e7161a 100644
--- a/src/Interpreters/GatherFunctionQuantileVisitor.h
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <AggregateFunctions/AggregateFunctionQuantile.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/IAST_fwd.h>
 
@@ -26,6 +25,8 @@ public:
 
     void visit(ASTFunction & function, ASTPtr & ast);
 
+    static String toFusedNameOrSelf(const String & func_name);
+
     static String getFusedName(const String & func_name);
 
     static bool needChild(const ASTPtr & node, const ASTPtr &);
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 7086b1e950d..dc9294be878 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -8,7 +8,7 @@
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/interpretSubquery.h>
-#include <Interpreters/SubqueryForSet.h>
+#include <Interpreters/PreparedSets.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
@@ -41,7 +41,7 @@ public:
         bool is_remote;
         bool is_explain;
         TemporaryTablesMapping & external_tables;
-        SubqueriesForSets & subqueries_for_sets;
+        PreparedSetsPtr prepared_sets;
         bool & has_global_subqueries;
 
         Data(
@@ -50,14 +50,14 @@ public:
             bool is_remote_,
             bool is_explain_,
             TemporaryTablesMapping & tables,
-            SubqueriesForSets & subqueries_for_sets_,
+            PreparedSetsPtr prepared_sets_,
             bool & has_global_subqueries_)
             : WithContext(context_)
             , subquery_depth(subquery_depth_)
             , is_remote(is_remote_)
             , is_explain(is_explain_)
             , external_tables(tables)
-            , subqueries_for_sets(subqueries_for_sets_)
+            , prepared_sets(prepared_sets_)
             , has_global_subqueries(has_global_subqueries_)
         {
         }
@@ -178,9 +178,8 @@ public:
             }
             else
             {
-                subqueries_for_sets[external_table_name].source = std::make_unique<QueryPlan>();
-                interpreter->buildQueryPlan(*subqueries_for_sets[external_table_name].source);
-                subqueries_for_sets[external_table_name].table = external_storage;
+                auto & subquery_for_set = prepared_sets->getSubquery(external_table_name);
+                subquery_for_set.createSource(*interpreter, external_storage);
             }
 
             /** NOTE If it was written IN tmp_table - the existing temporary (but not external) table,
@@ -239,7 +238,7 @@ private:
     static void visit(ASTTablesInSelectQueryElement & table_elem, ASTPtr &, Data & data)
     {
         if (table_elem.table_join
-            && (table_elem.table_join->as<ASTTableJoin &>().locality == ASTTableJoin::Locality::Global
+            && (table_elem.table_join->as<ASTTableJoin &>().locality == JoinLocality::Global
                 || data.getContext()->getSettingsRef().prefer_global_in_and_join))
         {
             data.addExternalStorage(table_elem.table_expression, true);
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index d9825a43c07..e559977be49 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -15,13 +15,11 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Interpreters/HashJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/joinDispatch.h>
 #include <Interpreters/NullableUtils.h>
-#include <Interpreters/DictionaryReader.h>
 
-#include <Storages/StorageDictionary.h>
 #include <Storages/IStorage.h>
 
 #include <Core/ColumnNumbers.h>
@@ -73,7 +71,7 @@ namespace JoinStuff
     }
 
     /// for single disjunct
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+    template <JoinKind KIND, JoinStrictness STRICTNESS>
     void JoinUsedFlags::reinit(size_t size)
     {
         if constexpr (MapGetter<KIND, STRICTNESS>::flagged)
@@ -85,7 +83,7 @@ namespace JoinStuff
     }
 
     /// for multiple disjuncts
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+    template <JoinKind KIND, JoinStrictness STRICTNESS>
     void JoinUsedFlags::reinit(const Block * block_ptr)
     {
         if constexpr (MapGetter<KIND, STRICTNESS>::flagged)
@@ -179,36 +177,6 @@ namespace JoinStuff
     }
 }
 
-static ColumnPtr filterWithBlanks(ColumnPtr src_column, const IColumn::Filter & filter, bool inverse_filter = false)
-{
-    ColumnPtr column = src_column->convertToFullColumnIfConst();
-    MutableColumnPtr mut_column = column->cloneEmpty();
-    mut_column->reserve(column->size());
-
-    if (inverse_filter)
-    {
-        for (size_t row = 0; row < filter.size(); ++row)
-        {
-            if (filter[row])
-                mut_column->insertDefault();
-            else
-                mut_column->insertFrom(*column, row);
-        }
-    }
-    else
-    {
-        for (size_t row = 0; row < filter.size(); ++row)
-        {
-            if (filter[row])
-                mut_column->insertFrom(*column, row);
-            else
-                mut_column->insertDefault();
-        }
-    }
-
-    return mut_column;
-}
-
 static ColumnWithTypeAndName correctNullability(ColumnWithTypeAndName && column, bool nullable)
 {
     if (nullable)
@@ -220,7 +188,7 @@ static ColumnWithTypeAndName correctNullability(ColumnWithTypeAndName && column,
         /// We have to replace values masked by NULLs with defaults.
         if (column.column)
             if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(*column.column))
-                column.column = filterWithBlanks(column.column, nullable_column->getNullMapColumn().getData(), true);
+                column.column = JoinCommon::filterWithBlanks(column.column, nullable_column->getNullMapColumn().getData(), true);
 
         JoinCommon::removeColumnNullability(column);
     }
@@ -298,16 +266,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
         const auto & key_names_right = clause.key_names_right;
         ColumnRawPtrs key_columns = JoinCommon::extractKeysForJoin(right_table_keys, key_names_right);
 
-        if (table_join->getDictionaryReader())
-        {
-            assert(disjuncts_num == 1);
-            data->type = Type::DICT;
-
-            data->maps.resize(disjuncts_num);
-            std::get<MapsOne>(data->maps[0]).create(Type::DICT);
-            chooseMethod(kind, key_columns, key_sizes.emplace_back()); /// init key_sizes
-        }
-        else if (strictness == ASTTableJoin::Strictness::Asof)
+        if (strictness == JoinStrictness::Asof)
         {
             assert(disjuncts_num == 1);
 
@@ -348,7 +307,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
     LOG_DEBUG(log, "Join type: {}, kind: {}, strictness: {}", data->type, kind, strictness);
 }
 
-HashJoin::Type HashJoin::chooseMethod(ASTTableJoin::Kind kind, const ColumnRawPtrs & key_columns, Sizes & key_sizes)
+HashJoin::Type HashJoin::chooseMethod(JoinKind kind, const ColumnRawPtrs & key_columns, Sizes & key_sizes)
 {
     size_t keys_size = key_columns.size();
 
@@ -429,36 +388,6 @@ static KeyGetter createKeyGetter(const ColumnRawPtrs & key_columns, const Sizes
 template <typename Mapped, bool need_offset = false>
 using FindResultImpl = ColumnsHashing::columns_hashing_impl::FindResultImpl<Mapped, true>;
 
-class KeyGetterForDict
-{
-public:
-    using Mapped = RowRef;
-    using FindResult = FindResultImpl<Mapped, true>;
-
-    KeyGetterForDict(const TableJoin & table_join, const ColumnRawPtrs & key_columns)
-    {
-        assert(table_join.getDictionaryReader());
-        table_join.getDictionaryReader()->readKeys(*key_columns[0], read_result, found, positions);
-
-        for (ColumnWithTypeAndName & column : read_result)
-            if (table_join.rightBecomeNullable(column.type))
-                JoinCommon::convertColumnToNullable(column);
-    }
-
-    FindResult findKey(const TableJoin &, size_t row, const Arena &)
-    {
-        result.block = &read_result;
-        result.row_num = positions[row];
-        return FindResult(&result, found[row], 0);
-    }
-
-private:
-    Block read_result;
-    Mapped result;
-    ColumnVector<UInt8>::Container found;
-    std::vector<size_t> positions;
-};
-
 /// Dummy key getter, always find nothing, used for JOIN ON NULL
 template <typename Mapped>
 class KeyGetterEmpty
@@ -529,20 +458,13 @@ struct KeyGetterForType
 
 void HashJoin::dataMapInit(MapsVariant & map)
 {
-    if (data->type == Type::DICT)
-        return;
-    if (kind == ASTTableJoin::Kind::Cross)
+
+    if (kind == JoinKind::Cross)
         return;
     joinDispatchInit(kind, strictness, map);
     joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.create(data->type); });
 }
 
-bool HashJoin::overDictionary() const
-{
-    assert(data->type != Type::DICT || table_join->getDictionaryReader());
-    return data->type == Type::DICT;
-}
-
 bool HashJoin::empty() const
 {
     return data->type == Type::EMPTY;
@@ -550,7 +472,7 @@ bool HashJoin::empty() const
 
 bool HashJoin::alwaysReturnsEmptySet() const
 {
-    return isInnerOrRight(getKind()) && data->empty && !overDictionary();
+    return isInnerOrRight(getKind()) && data->empty;
 }
 
 size_t HashJoin::getTotalRowCount() const
@@ -562,7 +484,7 @@ size_t HashJoin::getTotalRowCount() const
         for (const auto & block : data->blocks)
             res += block.rows();
     }
-    else if (data->type != Type::DICT)
+    else
     {
         for (const auto & map : data->maps)
         {
@@ -570,6 +492,7 @@ size_t HashJoin::getTotalRowCount() const
         }
     }
 
+
     return res;
 }
 
@@ -582,7 +505,7 @@ size_t HashJoin::getTotalByteCount() const
         for (const auto & block : data->blocks)
             res += block.bytes();
     }
-    else if (data->type != Type::DICT)
+    else
     {
         for (const auto & map : data->maps)
         {
@@ -636,13 +559,13 @@ namespace
     };
 
 
-    template <ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map, bool has_null_map>
+    template <JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool has_null_map>
     size_t NO_INLINE insertFromBlockImplTypeCase(
         HashJoin & join, Map & map, size_t rows, const ColumnRawPtrs & key_columns,
         const Sizes & key_sizes, Block * stored_block, ConstNullMapPtr null_map, UInt8ColumnDataPtr join_mask, Arena & pool)
     {
         [[maybe_unused]] constexpr bool mapped_one = std::is_same_v<typename Map::mapped_type, RowRef>;
-        constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
+        constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
 
         const IColumn * asof_column [[maybe_unused]] = nullptr;
         if constexpr (is_asof_join)
@@ -670,7 +593,7 @@ namespace
     }
 
 
-    template <ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map>
+    template <JoinStrictness STRICTNESS, typename KeyGetter, typename Map>
     size_t insertFromBlockImplType(
         HashJoin & join, Map & map, size_t rows, const ColumnRawPtrs & key_columns,
         const Sizes & key_sizes, Block * stored_block, ConstNullMapPtr null_map, UInt8ColumnDataPtr join_mask, Arena & pool)
@@ -684,7 +607,7 @@ namespace
     }
 
 
-    template <ASTTableJoin::Strictness STRICTNESS, typename Maps>
+    template <JoinStrictness STRICTNESS, typename Maps>
     size_t insertFromBlockImpl(
         HashJoin & join, HashJoin::Type type, Maps & maps, size_t rows, const ColumnRawPtrs & key_columns,
         const Sizes & key_sizes, Block * stored_block, ConstNullMapPtr null_map, UInt8ColumnDataPtr join_mask, Arena & pool)
@@ -693,7 +616,6 @@ namespace
         {
             case HashJoin::Type::EMPTY: return 0;
             case HashJoin::Type::CROSS: return 0; /// Do nothing. We have already saved block, and it is enough.
-            case HashJoin::Type::DICT:  return 0; /// No one should call it with Type::DICT.
 
         #define M(TYPE) \
             case HashJoin::Type::TYPE: \
@@ -723,7 +645,7 @@ void HashJoin::initRightBlockStructure(Block & saved_block_sample)
     {
         saved_block_sample = right_table_keys.cloneEmpty();
     }
-    else if (strictness == ASTTableJoin::Strictness::Asof)
+    else if (strictness == JoinStrictness::Asof)
     {
         /// Save ASOF key
         saved_block_sample.insert(right_table_keys.safeGetByPosition(right_table_keys.columns() - 1));
@@ -753,9 +675,6 @@ Block HashJoin::structureRightBlock(const Block & block) const
 
 bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
 {
-    if (overDictionary())
-        throw Exception("Logical error: insert into hash-map in HashJoin over dictionary", ErrorCodes::LOGICAL_ERROR);
-
     /// RowRef::SizeT is uint32_t (not size_t) for hash table Cell memory efficiency.
     /// It's possible to split bigger blocks and insert them by parts here. But it would be a dead code.
     if (unlikely(source_block.rows() > std::numeric_limits<RowRef::SizeT>::max()))
@@ -824,7 +743,7 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
                 }
             }
 
-            if (kind != ASTTableJoin::Kind::Cross)
+            if (kind != JoinKind::Cross)
             {
                 joinDispatch(kind, strictness, data->maps[onexpr_idx], [&](auto kind_, auto strictness_, auto & map)
                 {
@@ -1072,20 +991,20 @@ private:
     }
 };
 
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+template <JoinKind KIND, JoinStrictness STRICTNESS>
 struct JoinFeatures
 {
-    static constexpr bool is_any_join = STRICTNESS == ASTTableJoin::Strictness::Any;
-    static constexpr bool is_any_or_semi_join = STRICTNESS == ASTTableJoin::Strictness::Any || STRICTNESS == ASTTableJoin::Strictness::RightAny || (STRICTNESS == ASTTableJoin::Strictness::Semi && KIND == ASTTableJoin::Kind::Left);
-    static constexpr bool is_all_join = STRICTNESS == ASTTableJoin::Strictness::All;
-    static constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
-    static constexpr bool is_semi_join = STRICTNESS == ASTTableJoin::Strictness::Semi;
-    static constexpr bool is_anti_join = STRICTNESS == ASTTableJoin::Strictness::Anti;
+    static constexpr bool is_any_join = STRICTNESS == JoinStrictness::Any;
+    static constexpr bool is_any_or_semi_join = STRICTNESS == JoinStrictness::Any || STRICTNESS == JoinStrictness::RightAny || (STRICTNESS == JoinStrictness::Semi && KIND == JoinKind::Left);
+    static constexpr bool is_all_join = STRICTNESS == JoinStrictness::All;
+    static constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
+    static constexpr bool is_semi_join = STRICTNESS == JoinStrictness::Semi;
+    static constexpr bool is_anti_join = STRICTNESS == JoinStrictness::Anti;
 
-    static constexpr bool left = KIND == ASTTableJoin::Kind::Left;
-    static constexpr bool right = KIND == ASTTableJoin::Kind::Right;
-    static constexpr bool inner = KIND == ASTTableJoin::Kind::Inner;
-    static constexpr bool full = KIND == ASTTableJoin::Kind::Full;
+    static constexpr bool left = KIND == JoinKind::Left;
+    static constexpr bool right = KIND == JoinKind::Right;
+    static constexpr bool inner = KIND == JoinKind::Inner;
+    static constexpr bool full = KIND == JoinKind::Full;
 
     static constexpr bool need_replication = is_all_join || (is_any_join && right) || (is_semi_join && right);
     static constexpr bool need_filter = !need_replication && (inner || right || (is_semi_join && left) || (is_anti_join && left));
@@ -1239,7 +1158,7 @@ void setUsed(IColumn::Filter & filter [[maybe_unused]], size_t pos [[maybe_unuse
 
 /// Joins right table columns which indexes are present in right_indexes using specified map.
 /// Makes filter (1 if row presented in right table) and returns offsets to replicate (for ALL JOINS).
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map, bool multiple_disjuncts>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map, bool multiple_disjuncts>
 NO_INLINE IColumn::Filter joinRightColumns(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
@@ -1322,7 +1241,7 @@ NO_INLINE IColumn::Filter joinRightColumns(
                         addFoundRowAll<Map, jf.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
                     }
                 }
-                else if constexpr (jf.is_any_join && KIND == ASTTableJoin::Kind::Inner)
+                else if constexpr (jf.is_any_join && KIND == JoinKind::Inner)
                 {
                     bool used_once = used_flags.template setUsedOnce<jf.need_flags, multiple_disjuncts>(find_result);
 
@@ -1389,7 +1308,7 @@ NO_INLINE IColumn::Filter joinRightColumns(
     return filter;
 }
 
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map>
 IColumn::Filter joinRightColumnsSwitchMultipleDisjuncts(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
@@ -1401,7 +1320,7 @@ IColumn::Filter joinRightColumnsSwitchMultipleDisjuncts(
         : joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, need_filter, has_null_map, false>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
 }
 
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map>
 IColumn::Filter joinRightColumnsSwitchNullability(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
@@ -1426,14 +1345,14 @@ IColumn::Filter joinRightColumnsSwitchNullability(
     }
 }
 
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps>
 IColumn::Filter switchJoinRightColumns(
     const std::vector<const Maps *> & mapv,
     AddedColumns & added_columns,
     HashJoin::Type type,
     JoinStuff::JoinUsedFlags & used_flags)
 {
-    constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
+    constexpr bool is_asof_join = STRICTNESS == JoinStrictness::Asof;
     switch (type)
     {
         case HashJoin::Type::EMPTY:
@@ -1476,31 +1395,9 @@ IColumn::Filter switchJoinRightColumns(
     }
 }
 
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
-IColumn::Filter dictionaryJoinRightColumns(const TableJoin & table_join, AddedColumns & added_columns)
-{
-    if constexpr (KIND == ASTTableJoin::Kind::Left &&
-        (STRICTNESS == ASTTableJoin::Strictness::Any ||
-        STRICTNESS == ASTTableJoin::Strictness::Semi ||
-        STRICTNESS == ASTTableJoin::Strictness::Anti))
-    {
-        assert(added_columns.join_on_keys.size() == 1);
-
-        std::vector<const TableJoin *> maps_vector;
-        maps_vector.push_back(&table_join);
-
-        JoinStuff::JoinUsedFlags flags;
-        std::vector<KeyGetterForDict> key_getter_vector;
-        key_getter_vector.push_back(KeyGetterForDict(table_join, added_columns.join_on_keys[0].key_columns));
-        return joinRightColumnsSwitchNullability<KIND, STRICTNESS, KeyGetterForDict>(std::move(key_getter_vector), maps_vector, added_columns, flags);
-    }
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", STRICTNESS, KIND);
-}
-
 } /// nameless
 
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps>
 void HashJoin::joinBlockImpl(
     Block & block,
     const Block & block_with_columns_to_add,
@@ -1544,9 +1441,7 @@ void HashJoin::joinBlockImpl(
     bool has_required_right_keys = (required_right_keys.columns() != 0);
     added_columns.need_filter = jf.need_filter || has_required_right_keys;
 
-    IColumn::Filter row_filter = overDictionary() ?
-        dictionaryJoinRightColumns<KIND, STRICTNESS>(*table_join, added_columns) :
-        switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, used_flags);
+    IColumn::Filter row_filter = switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, used_flags);
 
     for (size_t i = 0; i < added_columns.size(); ++i)
         block.insert(added_columns.moveColumn(i));
@@ -1607,7 +1502,7 @@ void HashJoin::joinBlockImpl(
                 const auto & col = block.getByName(left_name);
                 bool is_nullable = JoinCommon::isNullable(right_key.type);
 
-                ColumnPtr thin_column = filterWithBlanks(col.column, filter);
+                ColumnPtr thin_column = JoinCommon::filterWithBlanks(col.column, filter);
 
                 ColumnWithTypeAndName right_col(thin_column, col.type, right_col_name);
                 if (right_col.type->lowCardinality() != right_key.type->lowCardinality())
@@ -1745,11 +1640,11 @@ DataTypePtr HashJoin::joinGetCheckAndGetReturnType(const DataTypes & data_types,
 }
 
 /// TODO: return multiple columns as named tuple
-/// TODO: return array of values when strictness == ASTTableJoin::Strictness::All
+/// TODO: return array of values when strictness == JoinStrictness::All
 ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block_with_columns_to_add) const
 {
-    bool is_valid = (strictness == ASTTableJoin::Strictness::Any || strictness == ASTTableJoin::Strictness::RightAny)
-        && kind == ASTTableJoin::Kind::Left;
+    bool is_valid = (strictness == JoinStrictness::Any || strictness == JoinStrictness::RightAny)
+        && kind == JoinKind::Left;
     if (!is_valid)
         throw Exception("joinGet only supports StorageJoin of type Left Any", ErrorCodes::INCOMPATIBLE_TYPE_OF_JOIN);
     const auto & key_names_right = table_join->getOnlyClause().key_names_right;
@@ -1763,12 +1658,12 @@ ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block
         keys.insert(std::move(key));
     }
 
-    static_assert(!MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>::flagged,
+    static_assert(!MapGetter<JoinKind::Left, JoinStrictness::Any>::flagged,
                   "joinGet are not protected from hash table changes between block processing");
 
     std::vector<const MapsOne *> maps_vector;
     maps_vector.push_back(&std::get<MapsOne>(data->maps[0]));
-    joinBlockImpl<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>(
+    joinBlockImpl<JoinKind::Left, JoinStrictness::Any>(
         keys, block_with_columns_to_add, maps_vector, true);
     return keys.getByPosition(keys.columns() - 1);
 }
@@ -1791,53 +1686,18 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
             right_sample_block, onexpr.key_names_right, cond_column_name.second);
     }
 
-    if (kind == ASTTableJoin::Kind::Cross)
+    if (kind == JoinKind::Cross)
     {
         joinBlockImplCross(block, not_processed);
         return;
     }
 
-    if (kind == ASTTableJoin::Kind::Right || kind == ASTTableJoin::Kind::Full)
+    if (kind == JoinKind::Right || kind == JoinKind::Full)
     {
         materializeBlockInplace(block);
     }
 
-    if (overDictionary())
     {
-        using Kind = ASTTableJoin::Kind;
-        using Strictness = ASTTableJoin::Strictness;
-
-        auto & map = std::get<MapsOne>(data->maps[0]);
-        std::vector<const std::decay_t<decltype(map)>*> maps_vector;
-        maps_vector.push_back(&map);
-
-        if (kind == Kind::Left)
-        {
-            switch (strictness)
-            {
-            case Strictness::Any:
-            case Strictness::All:
-                    joinBlockImpl<Kind::Left, Strictness::Any>(block, sample_block_with_columns_to_add, maps_vector);
-                    break;
-            case Strictness::Semi:
-                    joinBlockImpl<Kind::Left, Strictness::Semi>(block, sample_block_with_columns_to_add, maps_vector);
-                    break;
-            case Strictness::Anti:
-                    joinBlockImpl<Kind::Left, Strictness::Anti>(block, sample_block_with_columns_to_add, maps_vector);
-                    break;
-            default:
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
-            }
-        }
-        else if (kind == Kind::Inner && strictness == Strictness::All)
-            joinBlockImpl<Kind::Left, Strictness::Semi>(block, sample_block_with_columns_to_add, maps_vector);
-
-        else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", strictness, kind);
-    }
-    else
-    {
-
         std::vector<const std::decay_t<decltype(data->maps[0])> * > maps_vector;
         for (size_t i = 0; i < table_join->getClauses().size(); ++i)
             maps_vector.push_back(&data->maps[i]);
@@ -1979,7 +1839,7 @@ private:
         return rows_added;
     }
 
-    template <ASTTableJoin::Strictness STRICTNESS, typename Maps>
+    template <JoinStrictness STRICTNESS, typename Maps>
     size_t fillColumnsFromMap(const Maps & maps, MutableColumns & columns_keys_and_right)
     {
         switch (parent.data->type)
@@ -1996,7 +1856,7 @@ private:
         __builtin_unreachable();
     }
 
-    template <ASTTableJoin::Strictness STRICTNESS, typename Map>
+    template <JoinStrictness STRICTNESS, typename Map>
     size_t fillColumns(const Map & map, MutableColumns & columns_keys_and_right)
     {
         size_t rows_added = 0;
@@ -2089,8 +1949,8 @@ std::shared_ptr<NotJoinedBlocks> HashJoin::getNonJoinedBlocks(const Block & left
                                                               const Block & result_sample_block,
                                                               UInt64 max_block_size) const
 {
-    if (table_join->strictness() == ASTTableJoin::Strictness::Asof ||
-        table_join->strictness() == ASTTableJoin::Strictness::Semi ||
+    if (table_join->strictness() == JoinStrictness::Asof ||
+        table_join->strictness() == JoinStrictness::Semi ||
         !isRightOrFull(table_join->kind()))
     {
         return {};
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index 00bf92059bd..33955333aa2 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -27,13 +27,12 @@
 #include <Core/Block.h>
 
 #include <Storages/IStorage_fwd.h>
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 
 namespace DB
 {
 
 class TableJoin;
-class DictionaryReader;
 
 namespace JoinStuff
 {
@@ -54,10 +53,10 @@ public:
     /// Update size for vector with flags.
     /// Calling this method invalidates existing flags.
     /// It can be called several times, but all of them should happen before using this structure.
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+    template <JoinKind KIND, JoinStrictness STRICTNESS>
     void reinit(size_t size_);
 
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+    template <JoinKind KIND, JoinStrictness STRICTNESS>
     void reinit(const Block * block_ptr);
 
     bool getUsedSafe(size_t i) const;
@@ -171,13 +170,12 @@ public:
     /// Used by joinGet function that turns StorageJoin into a dictionary.
     ColumnWithTypeAndName joinGet(const Block & block, const Block & block_with_columns_to_add) const;
 
-    bool isFilled() const override { return from_storage_join || data->type == Type::DICT; }
+    bool isFilled() const override { return from_storage_join; }
 
     JoinPipelineType pipelineType() const override
     {
-        /// No need to process anything in the right stream if it's a dictionary will just join the left stream with it.
-        bool is_filled = from_storage_join || data->type == Type::DICT;
-        if (is_filled)
+        /// No need to process anything in the right stream if hash table was already filled
+        if (from_storage_join)
             return JoinPipelineType::FilledRight;
 
         /// Default pipeline processes right stream at first and then left.
@@ -199,10 +197,10 @@ public:
 
     bool alwaysReturnsEmptySet() const final;
 
-    ASTTableJoin::Kind getKind() const { return kind; }
-    ASTTableJoin::Strictness getStrictness() const { return strictness; }
+    JoinKind getKind() const { return kind; }
+    JoinStrictness getStrictness() const { return strictness; }
     const std::optional<TypeIndex> & getAsofType() const { return asof_type; }
-    ASOF::Inequality getAsofInequality() const { return asof_inequality; }
+    ASOFJoinInequality getAsofInequality() const { return asof_inequality; }
     bool anyTakeLastRow() const { return any_take_last_row; }
 
     const ColumnWithTypeAndName & rightAsofKeyColumn() const;
@@ -233,7 +231,6 @@ public:
     {
         EMPTY,
         CROSS,
-        DICT,
         #define M(NAME) NAME,
             APPLY_FOR_JOIN_VARIANTS(M)
         #undef M
@@ -261,7 +258,6 @@ public:
             {
                 case Type::EMPTY:            break;
                 case Type::CROSS:            break;
-                case Type::DICT:             break;
 
             #define M(NAME) \
                 case Type::NAME: NAME = std::make_unique<typename decltype(NAME)::element_type>(); break;
@@ -276,7 +272,6 @@ public:
             {
                 case Type::EMPTY:            return 0;
                 case Type::CROSS:            return 0;
-                case Type::DICT:             return 0;
 
             #define M(NAME) \
                 case Type::NAME: return NAME ? NAME->size() : 0;
@@ -293,7 +288,6 @@ public:
             {
                 case Type::EMPTY:            return 0;
                 case Type::CROSS:            return 0;
-                case Type::DICT:             return 0;
 
             #define M(NAME) \
                 case Type::NAME: return NAME ? NAME->getBufferSizeInBytes() : 0;
@@ -310,7 +304,6 @@ public:
             {
                 case Type::EMPTY:            return 0;
                 case Type::CROSS:            return 0;
-                case Type::DICT:             return 0;
 
             #define M(NAME) \
                 case Type::NAME: return NAME ? NAME->getBufferSizeInCells() : 0;
@@ -367,15 +360,15 @@ private:
     friend class JoinSource;
 
     std::shared_ptr<TableJoin> table_join;
-    ASTTableJoin::Kind kind;
-    ASTTableJoin::Strictness strictness;
+    JoinKind kind;
+    JoinStrictness strictness;
 
     /// This join was created from StorageJoin and it is already filled.
     bool from_storage_join = false;
 
     bool any_take_last_row; /// Overwrite existing values when encountering the same key again
     std::optional<TypeIndex> asof_type;
-    ASOF::Inequality asof_inequality;
+    ASOFJoinInequality asof_inequality;
 
     /// Right table data. StorageJoin shares it between many Join objects.
     /// Flags that indicate that particular row already used in join.
@@ -412,7 +405,7 @@ private:
     Block structureRightBlock(const Block & stored_block) const;
     void initRightBlockStructure(Block & saved_block_sample);
 
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
+    template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps>
     void joinBlockImpl(
         Block & block,
         const Block & block_with_columns_to_add,
@@ -421,10 +414,9 @@ private:
 
     void joinBlockImplCross(Block & block, ExtraBlockPtr & not_processed) const;
 
-    static Type chooseMethod(ASTTableJoin::Kind kind, const ColumnRawPtrs & key_columns, Sizes & key_sizes);
+    static Type chooseMethod(JoinKind kind, const ColumnRawPtrs & key_columns, Sizes & key_sizes);
 
     bool empty() const;
-    bool overDictionary() const;
 };
 
 }
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 05486f65da5..6319949655b 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -106,14 +106,14 @@ static ActionsDAGPtr makeAdditionalPostFilter(ASTPtr & ast, ContextPtr context,
     auto syntax_result = TreeRewriter(context).analyze(ast, header.getNamesAndTypesList());
     String result_column_name = ast->getColumnName();
     auto dag = ExpressionAnalyzer(ast, syntax_result, context).getActionsDAG(false, false);
-    const ActionsDAG::Node * result_node = &dag->findInIndex(result_column_name);
-    auto & index = dag->getIndex();
-    index.clear();
-    index.reserve(dag->getInputs().size() + 1);
+    const ActionsDAG::Node * result_node = &dag->findInOutputs(result_column_name);
+    auto & outputs = dag->getOutputs();
+    outputs.clear();
+    outputs.reserve(dag->getInputs().size() + 1);
     for (const auto * node : dag->getInputs())
-        index.push_back(node);
+        outputs.push_back(node);
 
-    index.push_back(result_node);
+    outputs.push_back(result_node);
 
     return dag;
 }
@@ -128,7 +128,7 @@ void IInterpreterUnionOrSelectQuery::addAdditionalPostFilter(QueryPlan & plan) c
         return;
 
     auto dag = makeAdditionalPostFilter(ast, context, plan.getCurrentDataStream().header);
-    std::string filter_name = dag->getIndex().back()->result_name;
+    std::string filter_name = dag->getOutputs().back()->result_name;
     auto filter_step = std::make_unique<FilterStep>(
         plan.getCurrentDataStream(), std::move(dag), std::move(filter_name), true);
     filter_step->setStepDescription("Additional result filter");
diff --git a/src/Storages/IKVStorage.h b/src/Interpreters/IKeyValueEntity.h
similarity index 56%
rename from src/Storages/IKVStorage.h
rename to src/Interpreters/IKeyValueEntity.h
index 667ccda0c41..d1ceda57f0e 100644
--- a/src/Storages/IKVStorage.h
+++ b/src/Interpreters/IKeyValueEntity.h
@@ -1,17 +1,17 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <Storages/IStorage.h>
 #include <Processors/Chunk.h>
 
 namespace DB
 {
 
-/// Storage that support key-value requests
-class IKeyValueStorage : public IStorage
+/// Interface for entities with key-value semantics.
+class IKeyValueEntity
 {
 public:
-    using IStorage::IStorage;
+    IKeyValueEntity() = default;
+    virtual ~IKeyValueEntity() = default;
 
     /// Get primary key name that supports key-value requests.
     /// Primary key can constist of multiple columns.
@@ -22,12 +22,20 @@ public:
      *
      * @param keys - keys to get data for. Key can be compound and represented by several columns.
      * @param out_null_map - output parameter indicating which keys were not found.
+     * @param required_columns - if we don't need all attributes, implementation can use it to benefit from reading a subset of them.
      *
      * @return - chunk of data corresponding for keys.
      *   Number of rows in chunk is equal to size of columns in keys.
      *   If the key was not found row would have a default value.
      */
-    virtual Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & out_null_map) const = 0;
+    virtual Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & out_null_map, const Names & required_columns) const = 0;
+
+    /// Header for getByKeys result
+    virtual Block getSampleBlock(const Names & required_columns) const = 0;
+
+protected:
+    /// Names of result columns. If empty then all columns are required.
+    Names key_value_result_names;
 };
 
 }
diff --git a/src/Interpreters/ITokenExtractor.cpp b/src/Interpreters/ITokenExtractor.cpp
index 8c1af130f71..9c4027dfa0a 100644
--- a/src/Interpreters/ITokenExtractor.cpp
+++ b/src/Interpreters/ITokenExtractor.cpp
@@ -4,6 +4,7 @@
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
+#include <bit>
 
 #if defined(__SSE2__)
 #include <emmintrin.h>
@@ -122,7 +123,7 @@ bool SplitTokenExtractor::nextInStringPadded(const char * data, size_t length, s
         const auto alnum_chars_ranges = _mm_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
                 '\xFF', '\x80', 'z', 'a', 'Z', 'A', '9', '0');
         // Every bit represents if `haystack` character is in the ranges (1) or not (0)
-        const int result_bitmask = _mm_cvtsi128_si32(_mm_cmpestrm(alnum_chars_ranges, 8, haystack, haystack_length, _SIDD_CMP_RANGES));
+        const unsigned result_bitmask = _mm_cvtsi128_si32(_mm_cmpestrm(alnum_chars_ranges, 8, haystack, haystack_length, _SIDD_CMP_RANGES));
 #else
         // NOTE: -1 and +1 required since SSE2 has no `>=` and `<=` instructions on packed 8-bit integers (epi8).
         const auto number_begin =      _mm_set1_epi8('0' - 1);
@@ -136,7 +137,7 @@ bool SplitTokenExtractor::nextInStringPadded(const char * data, size_t length, s
         // every bit represents if `haystack` character `c` satisfies condition:
         // (c < 0) || (c > '0' - 1 && c < '9' + 1) || (c > 'a' - 1 && c < 'z' + 1) || (c > 'A' - 1 && c < 'Z' + 1)
         // < 0 since _mm_cmplt_epi8 threats chars as SIGNED, and so all chars > 0x80 are negative.
-        const int result_bitmask = _mm_movemask_epi8(_mm_or_si128(_mm_or_si128(_mm_or_si128(
+        const unsigned result_bitmask = _mm_movemask_epi8(_mm_or_si128(_mm_or_si128(_mm_or_si128(
                 _mm_cmplt_epi8(haystack, zero),
                 _mm_and_si128(_mm_cmpgt_epi8(haystack, number_begin),      _mm_cmplt_epi8(haystack, number_end))),
                 _mm_and_si128(_mm_cmpgt_epi8(haystack, alpha_lower_begin), _mm_cmplt_epi8(haystack, alpha_lower_end))),
@@ -152,7 +153,7 @@ bool SplitTokenExtractor::nextInStringPadded(const char * data, size_t length, s
             continue;
         }
 
-        const auto token_start_pos_in_current_haystack = getTrailingZeroBitsUnsafe(result_bitmask);
+        const auto token_start_pos_in_current_haystack = std::countr_zero(result_bitmask);
         if (*token_length == 0)
             // new token
             *token_start = *pos + token_start_pos_in_current_haystack;
@@ -160,7 +161,7 @@ bool SplitTokenExtractor::nextInStringPadded(const char * data, size_t length, s
             // end of token starting in one of previous haystacks
             return true;
 
-        const auto token_bytes_in_current_haystack = getTrailingZeroBitsUnsafe(~(result_bitmask >> token_start_pos_in_current_haystack));
+        const auto token_bytes_in_current_haystack = std::countr_zero(~(result_bitmask >> token_start_pos_in_current_haystack));
         *token_length += token_bytes_in_current_haystack;
 
         *pos += token_start_pos_in_current_haystack + token_bytes_in_current_haystack;
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
index 28e1757bc3e..66ee32750f3 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
@@ -105,7 +105,7 @@ private:
                     throw Exception("Logical error: unexpected function name " + concrete->name, ErrorCodes::LOGICAL_ERROR);
             }
             else if (table_join)
-                table_join->locality = ASTTableJoin::Locality::Global;
+                table_join->locality = JoinLocality::Global;
             else
                 throw Exception("Logical error: unexpected AST node", ErrorCodes::LOGICAL_ERROR);
         }
@@ -189,7 +189,7 @@ private:
             return;
 
         ASTTableJoin * table_join = node.table_join->as<ASTTableJoin>();
-        if (table_join->locality != ASTTableJoin::Locality::Global)
+        if (table_join->locality != JoinLocality::Global)
         {
             if (auto * table = node.table_expression->as<ASTTableExpression>())
             {
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 056a3d9f7b4..762afd28923 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -66,7 +66,7 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
 {
     BlockIO res;
 
-    if (!alter.cluster.empty())
+    if (!alter.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
         DDLQueryOnClusterParams params;
         params.access_to_check = getRequiredAccess();
diff --git a/src/Interpreters/InterpreterBackupQuery.cpp b/src/Interpreters/InterpreterBackupQuery.cpp
index 8f2060d2d02..e238286a33c 100644
--- a/src/Interpreters/InterpreterBackupQuery.cpp
+++ b/src/Interpreters/InterpreterBackupQuery.cpp
@@ -19,18 +19,15 @@ namespace
 {
     Block getResultRow(const BackupsWorker::Info & info)
     {
-        auto column_uuid = ColumnUUID::create();
-        auto column_backup_name = ColumnString::create();
+        auto column_id = ColumnString::create();
         auto column_status = ColumnInt8::create();
 
-        column_uuid->insert(info.uuid);
-        column_backup_name->insert(info.backup_name);
+        column_id->insert(info.id);
         column_status->insert(static_cast<Int8>(info.status));
 
         Block res_columns;
-        res_columns.insert(0, {std::move(column_uuid), std::make_shared<DataTypeUUID>(), "uuid"});
-        res_columns.insert(1, {std::move(column_backup_name), std::make_shared<DataTypeString>(), "backup_name"});
-        res_columns.insert(2, {std::move(column_status), std::make_shared<DataTypeEnum8>(getBackupStatusEnumValues()), "status"});
+        res_columns.insert(0, {std::move(column_id), std::make_shared<DataTypeString>(), "id"});
+        res_columns.insert(1, {std::move(column_status), std::make_shared<DataTypeEnum8>(getBackupStatusEnumValues()), "status"});
 
         return res_columns;
     }
@@ -39,9 +36,14 @@ namespace
 BlockIO InterpreterBackupQuery::execute()
 {
     auto & backups_worker = context->getBackupsWorker();
-    auto [uuid, internal] = backups_worker.start(query_ptr, context);
+    auto id = backups_worker.start(query_ptr, context);
+
+    auto info = backups_worker.getInfo(id);
+    if (info.exception)
+        std::rethrow_exception(info.exception);
+
     BlockIO res_io;
-    res_io.pipeline = QueryPipeline(std::make_shared<SourceFromSingleChunk>(getResultRow(backups_worker.getInfo(uuid, internal))));
+    res_io.pipeline = QueryPipeline(std::make_shared<SourceFromSingleChunk>(getResultRow(info)));
     return res_io;
 }
 
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 7a00bbf524c..e66fe543ab0 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -249,6 +249,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
     bool need_write_metadata = !create.attach || !fs::exists(metadata_file_path);
     bool need_lock_uuid = internal || need_write_metadata;
+    auto mode = getLoadingStrictnessLevel(create.attach, force_attach, has_force_restore_data_flag);
 
     /// Lock uuid, so we will known it's already in use.
     /// We do it when attaching databases on server startup (internal) and on CREATE query (!create.attach);
@@ -303,8 +304,9 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
         if (!load_database_without_tables)
         {
+
             /// We use global context here, because storages lifetime is bigger than query context lifetime
-            TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, has_force_restore_data_flag, create.attach && force_attach}; //-V560
+            TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, mode}; //-V560
             loader.loadTables();
             loader.startupTables();
         }
@@ -1017,6 +1019,9 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
             }
         }
 
+        if (!create.cluster.empty())
+            return executeQueryOnCluster(create);
+
         bool if_not_exists = create.if_not_exists;
 
         // Table SQL definition is available even if the table is detached (even permanently)
@@ -1153,6 +1158,9 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         }
     }
 
+    if (!create.cluster.empty())
+        return executeQueryOnCluster(create);
+
     if (create.replace_table)
         return doCreateOrReplaceTable(create, properties);
 
@@ -1358,25 +1366,15 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
 {
     /// Replicated database requires separate contexts for each DDL query
     ContextPtr current_context = getContext();
+    if (auto txn = current_context->getZooKeeperMetadataTransaction())
+        txn->setIsCreateOrReplaceQuery();
     ContextMutablePtr create_context = Context::createCopy(current_context);
     create_context->setQueryContext(std::const_pointer_cast<Context>(current_context));
 
-    auto make_drop_context = [&](bool on_error) -> ContextMutablePtr
+    auto make_drop_context = [&]() -> ContextMutablePtr
     {
         ContextMutablePtr drop_context = Context::createCopy(current_context);
-        drop_context->makeQueryContext();
-        if (on_error)
-            return drop_context;
-
-        if (auto txn = current_context->getZooKeeperMetadataTransaction())
-        {
-            /// Execute drop as separate query, because [CREATE OR] REPLACE query can be considered as
-            /// successfully executed after RENAME/EXCHANGE query.
-            drop_context->resetZooKeeperMetadataTransaction();
-            auto drop_txn = std::make_shared<ZooKeeperMetadataTransaction>(txn->getZooKeeper(), txn->getDatabaseZooKeeperPath(),
-                                                                           txn->isInitialQuery(), txn->getTaskZooKeeperPath());
-            drop_context->initZooKeeperMetadataTransaction(drop_txn);
-        }
+        drop_context->setQueryContext(std::const_pointer_cast<Context>(current_context));
         return drop_context;
     };
 
@@ -1452,7 +1450,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         if (!interpreter_rename.renamedInsteadOfExchange())
         {
             /// Target table was replaced with new one, drop old table
-            auto drop_context = make_drop_context(false);
+            auto drop_context = make_drop_context();
             InterpreterDropQuery(ast_drop, drop_context).execute();
         }
 
@@ -1465,7 +1463,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         /// Drop temporary table if it was successfully created, but was not renamed to target name
         if (created && !renamed)
         {
-            auto drop_context = make_drop_context(true);
+            auto drop_context = make_drop_context();
             InterpreterDropQuery(ast_drop, drop_context).execute();
         }
         throw;
@@ -1511,6 +1509,11 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, Cont
 
     if (cluster->maybeCrossReplication())
     {
+        auto on_cluster_version = local_context->getSettingsRef().distributed_ddl_entry_format_version;
+        if (DDLLogEntry::NORMALIZE_CREATE_ON_INITIATOR_VERSION <= on_cluster_version)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Value {} of setting distributed_ddl_entry_format_version "
+                                                         "is incompatible with cross-replication", on_cluster_version);
+
         /// Check that {uuid} macro is not used in zookeeper_path for ReplicatedMergeTree.
         /// Otherwise replicas will generate different paths.
         if (!create.storage)
@@ -1543,16 +1546,25 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, Cont
     }
 }
 
+BlockIO InterpreterCreateQuery::executeQueryOnCluster(ASTCreateQuery & create)
+{
+    prepareOnClusterQuery(create, getContext(), create.cluster);
+    DDLQueryOnClusterParams params;
+    params.access_to_check = getRequiredAccess();
+    return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+}
+
 BlockIO InterpreterCreateQuery::execute()
 {
     FunctionNameNormalizer().visit(query_ptr.get());
     auto & create = query_ptr->as<ASTCreateQuery &>();
-    if (!create.cluster.empty())
+
+    bool is_create_database = create.database && !create.table;
+    if (!create.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
-        prepareOnClusterQuery(create, getContext(), create.cluster);
-        DDLQueryOnClusterParams params;
-        params.access_to_check = getRequiredAccess();
-        return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+        auto on_cluster_version = getContext()->getSettingsRef().distributed_ddl_entry_format_version;
+        if (is_create_database || on_cluster_version < DDLLogEntry::NORMALIZE_CREATE_ON_INITIATOR_VERSION)
+            return executeQueryOnCluster(create);
     }
 
     getContext()->checkAccess(getRequiredAccess());
@@ -1560,7 +1572,7 @@ BlockIO InterpreterCreateQuery::execute()
     ASTQueryWithOutput::resetOutputASTIfExist(create);
 
     /// CREATE|ATTACH DATABASE
-    if (create.database && !create.table)
+    if (is_create_database)
         return createDatabase(create);
     else
         return createTable(create);
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index b6c8e10668a..984310b2952 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -100,6 +100,8 @@ private:
     /// It's used to prevent automatic schema inference while table creation on each server startup.
     void addColumnsDescriptionToCreateQueryIfNecessary(ASTCreateQuery & create, const StoragePtr & storage);
 
+    BlockIO executeQueryOnCluster(ASTCreateQuery & create);
+
     ASTPtr query_ptr;
 
     /// Skip safety threshold when loading tables.
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 497fae8f573..5e5bebfdc58 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -12,9 +12,8 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/MutationCommands.h>
-#include <Storages/StorageMergeTree.h>
-#include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/LightweightDeleteDescription.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 
 namespace DB
@@ -50,10 +49,9 @@ BlockIO InterpreterDeleteQuery::execute()
 
     /// First check table storage for validations.
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
-    auto storage_merge_tree = std::dynamic_pointer_cast<StorageMergeTree>(table);
-    auto storage_replicated_merge_tree = std::dynamic_pointer_cast<StorageReplicatedMergeTree>(table);
-    if (!storage_merge_tree && !storage_replicated_merge_tree)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only MergeTree or ReplicatedMergeTree tables are supported");
+    auto merge_tree = std::dynamic_pointer_cast<MergeTreeData>(table);
+    if (!merge_tree)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only MergeTree family tables are supported");
 
     checkStorageSupportsTransactionsIfNeeded(table, getContext());
     if (table->isStaticStorage())
diff --git a/src/Interpreters/InterpreterDescribeCacheQuery.cpp b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
index dd6df26c6af..d5e4a81e98e 100644
--- a/src/Interpreters/InterpreterDescribeCacheQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeCacheQuery.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Storages/ColumnsDescription.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Access/Common/AccessFlags.h>
 #include <Core/Block.h>
 
@@ -23,7 +23,8 @@ static Block getSampleBlock()
         ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "enable_cache_hits_threshold"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "current_size"},
         ColumnWithTypeAndName{std::make_shared<DataTypeUInt64>(), "current_elements"},
-        ColumnWithTypeAndName{std::make_shared<DataTypeString>(), "path"}
+        ColumnWithTypeAndName{std::make_shared<DataTypeString>(), "path"},
+        ColumnWithTypeAndName{std::make_shared<DataTypeNumber<UInt8>>(), "do_not_evict_index_and_mark_files"},
     };
     return Block(columns);
 }
@@ -48,6 +49,7 @@ BlockIO InterpreterDescribeCacheQuery::execute()
     res_columns[5]->insert(cache->getUsedCacheSize());
     res_columns[6]->insert(cache->getFileSegmentsNum());
     res_columns[7]->insert(cache->getBasePath());
+    res_columns[8]->insert(settings.do_not_evict_index_and_mark_files);
 
     BlockIO res;
     size_t num_rows = res_columns[0]->size();
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index ac731ec6f4b..1f83992dbbe 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -54,7 +54,7 @@ InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, ContextMut
 BlockIO InterpreterDropQuery::execute()
 {
     auto & drop = query_ptr->as<ASTDropQuery &>();
-    if (!drop.cluster.empty())
+    if (!drop.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
         DDLQueryOnClusterParams params;
         params.access_to_check = getRequiredAccessForDDLOnCluster();
@@ -245,6 +245,11 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ContextPtr context_, ASTDropQue
             DatabaseCatalog::instance().tryRemoveLoadingDependencies(table_id, getContext()->getSettingsRef().check_table_dependencies,
                                                                      is_drop_or_detach_database);
             database->dropTable(context_, table_id.table_name, query.sync);
+
+            /// We have to drop mmapio cache when dropping table from Ordinary database
+            /// to avoid reading old data if new table with the same name is created
+            if (database->getUUID() == UUIDHelpers::Nil)
+                context_->dropMMappedFileCache();
         }
 
         db = database;
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 6715947da43..4799970b6a1 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -174,7 +174,8 @@ struct QueryPlanSettings
             {"actions", query_plan_options.actions},
             {"indexes", query_plan_options.indexes},
             {"optimize", optimize},
-            {"json", json}
+            {"json", json},
+            {"sorting", query_plan_options.sorting},
     };
 };
 
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 7b6066575ae..4c7823ddc4e 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -326,7 +326,7 @@ BlockIO InterpreterInsertQuery::execute()
     if (!query.table_function)
         getContext()->checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
 
-    if (query.select && table->isRemote() && settings.parallel_distributed_insert_select)
+    if (query.select && settings.parallel_distributed_insert_select)
         // Distributed INSERT SELECT
         distributed_pipeline = table->distributedWrite(query, getContext());
 
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 2999535bfb7..9b87e4dbbef 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -162,7 +162,7 @@ FilterDAGInfoPtr generateFilterActions(
     filter_info->actions->projectInput(false);
 
     for (const auto * node : filter_info->actions->getInputs())
-        filter_info->actions->getIndex().push_back(node);
+        filter_info->actions->getOutputs().push_back(node);
 
     auto required_columns_from_filter = filter_info->actions->getRequiredColumns();
 
@@ -212,10 +212,9 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
     const ContextPtr & context_,
     const SelectQueryOptions & options_,
-    SubqueriesForSets subquery_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     : InterpreterSelectQuery(
-        query_ptr_, context_, std::nullopt, nullptr, options_, {}, {}, std::move(subquery_for_sets_), std::move(prepared_sets_))
+        query_ptr_, context_, std::nullopt, nullptr, options_, {}, {}, prepared_sets_)
 {}
 
 InterpreterSelectQuery::~InterpreterSelectQuery() = default;
@@ -333,8 +332,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const SelectQueryOptions & options_,
     const Names & required_result_column_names,
     const StorageMetadataPtr & metadata_snapshot_,
-    SubqueriesForSets subquery_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     : InterpreterSelectQuery(
         query_ptr_,
         Context::createCopy(context_),
@@ -343,8 +341,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         options_,
         required_result_column_names,
         metadata_snapshot_,
-        std::move(subquery_for_sets_),
-        std::move(prepared_sets_))
+        prepared_sets_)
 {}
 
 InterpreterSelectQuery::InterpreterSelectQuery(
@@ -355,19 +352,20 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const SelectQueryOptions & options_,
     const Names & required_result_column_names,
     const StorageMetadataPtr & metadata_snapshot_,
-    SubqueriesForSets subquery_for_sets_,
-    PreparedSets prepared_sets_)
+    PreparedSetsPtr prepared_sets_)
     /// NOTE: the query almost always should be cloned because it will be modified during analysis.
     : IInterpreterUnionOrSelectQuery(options_.modify_inplace ? query_ptr_ : query_ptr_->clone(), context_, options_)
     , storage(storage_)
     , input_pipe(std::move(input_pipe_))
     , log(&Poco::Logger::get("InterpreterSelectQuery"))
     , metadata_snapshot(metadata_snapshot_)
-    , subquery_for_sets(std::move(subquery_for_sets_))
-    , prepared_sets(std::move(prepared_sets_))
+    , prepared_sets(prepared_sets_)
 {
     checkStackSize();
 
+    if (!prepared_sets)
+        prepared_sets = std::make_shared<PreparedSets>();
+
     query_info.ignore_projections = options.ignore_projections;
     query_info.is_projection_query = options.is_projection_query;
 
@@ -566,8 +564,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             NameSet(required_result_column_names.begin(), required_result_column_names.end()),
             !options.only_analyze,
             options,
-            std::move(subquery_for_sets),
-            std::move(prepared_sets));
+            prepared_sets);
 
         if (!options.only_analyze)
         {
@@ -611,11 +608,15 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
         if (storage)
         {
+            query_info.filter_asts.clear();
+
             /// Fix source_header for filter actions.
             if (row_policy_filter)
             {
                 filter_info = generateFilterActions(
                     table_id, row_policy_filter, context, storage, storage_snapshot, metadata_snapshot, required_columns);
+
+                query_info.filter_asts.push_back(row_policy_filter);
             }
 
             if (query_info.additional_filter_ast)
@@ -624,6 +625,8 @@ InterpreterSelectQuery::InterpreterSelectQuery(
                     table_id, query_info.additional_filter_ast, context, storage, storage_snapshot, metadata_snapshot, required_columns);
 
                 additional_filter_info->do_remove_column = true;
+
+                query_info.filter_asts.push_back(query_info.additional_filter_ast);
             }
 
             source_header = storage_snapshot->getSampleBlockForColumns(required_columns);
@@ -658,8 +661,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         LOG_TRACE(log, "Running 'analyze' second time");
 
         /// Reuse already built sets for multiple passes of analysis
-        subquery_for_sets = std::move(query_analyzer->getSubqueriesForSets());
-        prepared_sets = std::move(query_analyzer->getPreparedSets());
+        prepared_sets = query_analyzer->getPreparedSets();
 
         /// Do not try move conditions to PREWHERE for the second time.
         /// Otherwise, we won't be able to fallback from inefficient PREWHERE to WHERE later.
@@ -748,21 +750,23 @@ BlockIO InterpreterSelectQuery::execute()
 
 Block InterpreterSelectQuery::getSampleBlockImpl()
 {
+    auto & select_query = getSelectQuery();
+
     query_info.query = query_ptr;
+
+    /// NOTE: this is required for getQueryProcessingStage(), so should be initialized before ExpressionAnalysisResult.
     query_info.has_window = query_analyzer->hasWindow();
+    /// NOTE: this is required only for IStorage::read(), and to be precise MergeTreeData::read(), in case of projections.
+    query_info.has_order_by = select_query.orderBy() != nullptr;
+    query_info.need_aggregate = query_analyzer->hasAggregation();
+
     if (storage && !options.only_analyze)
     {
-        auto & query = getSelectQuery();
-        query_analyzer->makeSetsForIndex(query.where());
-        query_analyzer->makeSetsForIndex(query.prewhere());
-        query_info.sets = std::move(query_analyzer->getPreparedSets());
-        query_info.subquery_for_sets = std::move(query_analyzer->getSubqueriesForSets());
+        query_analyzer->makeSetsForIndex(select_query.where());
+        query_analyzer->makeSetsForIndex(select_query.prewhere());
+        query_info.prepared_sets = query_analyzer->getPreparedSets();
 
         from_stage = storage->getQueryProcessingStage(context, options.to_stage, storage_snapshot, query_info);
-
-        /// query_info.sets is used for further set index analysis. Use copy instead of move.
-        query_analyzer->getPreparedSets() = query_info.sets;
-        query_analyzer->getSubqueriesForSets() = std::move(query_info.subquery_for_sets);
     }
 
     /// Do I need to perform the first part of the pipeline?
@@ -1175,12 +1179,11 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
     auto & query = getSelectQuery();
     const Settings & settings = context->getSettingsRef();
     auto & expressions = analysis_result;
-    auto & subqueries_for_sets = query_analyzer->getSubqueriesForSets();
     bool intermediate_stage = false;
     bool to_aggregation_stage = false;
     bool from_aggregation_stage = false;
 
-    /// Do I need to aggregate in a separate row rows that have not passed max_rows_to_group_by.
+    /// Do I need to aggregate in a separate row that has not passed max_rows_to_group_by?
     bool aggregate_overflow_row =
         expressions.need_aggregate &&
         query.group_by_with_totals &&
@@ -1428,7 +1431,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
 
                         auto sorting_step = std::make_unique<SortingStep>(
                             plan.getCurrentDataStream(),
-                            order_descr,
+                            std::move(order_descr),
                             settings.max_block_size,
                             0 /* LIMIT */,
                             SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode),
@@ -1436,7 +1439,8 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                             settings.remerge_sort_lowered_memory_bytes_ratio,
                             settings.max_bytes_before_external_sort,
                             this->context->getTemporaryVolume(),
-                            settings.min_free_disk_space_for_temporary_data);
+                            settings.min_free_disk_space_for_temporary_data,
+                            settings.optimize_sorting_by_input_stream_properties);
                         sorting_step->setStepDescription(fmt::format("Sort {} before JOIN", is_right ? "right" : "left"));
                         plan.addStep(std::move(sorting_step));
                     };
@@ -1683,8 +1687,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
         }
     }
 
-    if (!subqueries_for_sets.empty())
-        executeSubqueriesInSetsAndJoins(query_plan, subqueries_for_sets);
+    executeSubqueriesInSetsAndJoins(query_plan);
 }
 
 static void executeMergeAggregatedImpl(
@@ -2006,8 +2009,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         && storage
         && storage->getName() != "MaterializedMySQL"
         && !storage->hasLightweightDeletedMask()
-        && !row_policy_filter
-        && !query_info.additional_filter_ast
+        && query_info.filter_asts.empty()
         && processing_stage == QueryProcessingStage::FetchColumns
         && query_analyzer->hasAggregation()
         && (query_analyzer->aggregates().size() == 1)
@@ -2028,7 +2030,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
             SelectQueryInfo temp_query_info;
             temp_query_info.query = query_ptr;
             temp_query_info.syntax_analyzer_result = syntax_analyzer_result;
-            temp_query_info.sets = query_analyzer->getPreparedSets();
+            temp_query_info.prepared_sets = query_analyzer->getPreparedSets();
 
             num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, context);
         }
@@ -2107,7 +2109,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         && !query.limit_with_ties
         && !query.prewhere()
         && !query.where()
-        && !query_info.additional_filter_ast
+        && query_info.filter_asts.empty()
         && !query.groupBy()
         && !query.having()
         && !query.orderBy()
@@ -2570,7 +2572,8 @@ void InterpreterSelectQuery::executeWindow(QueryPlan & query_plan)
                 settings.remerge_sort_lowered_memory_bytes_ratio,
                 settings.max_bytes_before_external_sort,
                 context->getTemporaryVolume(),
-                settings.min_free_disk_space_for_temporary_data);
+                settings.min_free_disk_space_for_temporary_data,
+                settings.optimize_sorting_by_input_stream_properties);
             sorting_step->setStepDescription("Sorting for window '" + window.window_name + "'");
             query_plan.addStep(std::move(sorting_step));
         }
@@ -2628,7 +2631,8 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
         settings.remerge_sort_lowered_memory_bytes_ratio,
         settings.max_bytes_before_external_sort,
         context->getTemporaryVolume(),
-        settings.min_free_disk_space_for_temporary_data);
+        settings.min_free_disk_space_for_temporary_data,
+        settings.optimize_sorting_by_input_stream_properties);
 
     sorting_step->setStepDescription("Sorting for ORDER BY");
     query_plan.addStep(std::move(sorting_step));
@@ -2637,19 +2641,12 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
 
 void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const std::string & description)
 {
-    auto & query = getSelectQuery();
-    SortDescription order_descr = getSortDescription(query, context);
-    UInt64 limit = getLimitForSorting(query, context);
-
-    executeMergeSorted(query_plan, order_descr, limit, description);
-}
-
-void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description)
-{
-    const Settings & settings = context->getSettingsRef();
-
-    auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), sort_description, settings.max_block_size, limit);
+    const auto & query = getSelectQuery();
+    SortDescription sort_description = getSortDescription(query, context);
+    const UInt64 limit = getLimitForSorting(query, context);
+    const auto max_block_size = context->getSettingsRef().max_block_size;
 
+    auto merging_sorted = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), std::move(sort_description), max_block_size, limit);
     merging_sorted->setStepDescription("Merge sorted streams " + description);
     query_plan.addStep(std::move(merging_sorted));
 }
@@ -2840,12 +2837,9 @@ void InterpreterSelectQuery::executeExtremes(QueryPlan & query_plan)
     query_plan.addStep(std::move(extremes_step));
 }
 
-void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, SubqueriesForSets & subqueries_for_sets)
+void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(QueryPlan & query_plan)
 {
-    const Settings & settings = context->getSettingsRef();
-
-    SizeLimits limits(settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
-    addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), limits, context);
+    addCreatingSetsStep(query_plan, prepared_sets, context);
 }
 
 
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index e70490f13ac..3b933547422 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -23,7 +23,7 @@ class Logger;
 
 namespace DB
 {
-struct SubqueryForSet;
+class SubqueryForSet;
 class InterpreterSelectWithUnionQuery;
 class Context;
 class QueryPlan;
@@ -77,14 +77,13 @@ public:
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
         const SelectQueryOptions & = {});
 
-    /// Reuse existing subqueries_for_sets and prepared_sets for another pass of analysis. It's used for projection.
+    /// Reuse existing prepared_sets for another pass of analysis. It's used for projection.
     /// TODO: Find a general way of sharing sets among different interpreters, such as subqueries.
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
         const ContextPtr & context_,
         const SelectQueryOptions &,
-        SubqueriesForSets subquery_for_sets_,
-        PreparedSets prepared_sets_);
+        PreparedSetsPtr prepared_sets_);
 
     ~InterpreterSelectQuery() override;
 
@@ -128,6 +127,8 @@ public:
     /// It will set shard_num and shard_count to the client_info
     void setProperClientInfo(size_t replica_num, size_t replica_count);
 
+    FilterDAGInfoPtr getAdditionalQueryInfo() const { return additional_filter_info; }
+
     static SortDescription getSortDescription(const ASTSelectQuery & query, const ContextPtr & context);
     static UInt64 getLimitForSorting(const ASTSelectQuery & query, const ContextPtr & context);
 
@@ -140,8 +141,7 @@ private:
         const SelectQueryOptions &,
         const Names & required_result_column_names = {},
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
-        SubqueriesForSets subquery_for_sets_ = {},
-        PreparedSets prepared_sets_ = {});
+        PreparedSetsPtr prepared_sets_ = nullptr);
 
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
@@ -151,8 +151,7 @@ private:
         const SelectQueryOptions &,
         const Names & required_result_column_names = {},
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
-        SubqueriesForSets subquery_for_sets_ = {},
-        PreparedSets prepared_sets_ = {});
+        PreparedSetsPtr prepared_sets_ = nullptr);
 
     ASTSelectQuery & getSelectQuery() { return query_ptr->as<ASTSelectQuery &>(); }
 
@@ -185,9 +184,7 @@ private:
     static void executeProjection(QueryPlan & query_plan, const ActionsDAGPtr & expression);
     void executeDistinct(QueryPlan & query_plan, bool before_order, Names columns, bool pre_distinct);
     void executeExtremes(QueryPlan & query_plan);
-    void executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, std::unordered_map<String, SubqueryForSet> & subqueries_for_sets);
-    void
-    executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description);
+    void executeSubqueriesInSetsAndJoins(QueryPlan & query_plan);
 
     enum class Modificator
     {
@@ -244,8 +241,7 @@ private:
     StorageSnapshotPtr storage_snapshot;
 
     /// Reuse already built sets for multiple passes of analysis, possibly across interpreters.
-    SubqueriesForSets subquery_for_sets;
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 };
 
 }
diff --git a/src/Interpreters/InterpreterSetQuery.cpp b/src/Interpreters/InterpreterSetQuery.cpp
index 1c6a4236bf6..2bd8d648040 100644
--- a/src/Interpreters/InterpreterSetQuery.cpp
+++ b/src/Interpreters/InterpreterSetQuery.cpp
@@ -1,6 +1,6 @@
-#include <Parsers/ASTSetQuery.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSetQuery.h>
+#include <Parsers/ASTSetQuery.h>
 
 namespace DB
 {
@@ -10,7 +10,9 @@ BlockIO InterpreterSetQuery::execute()
 {
     const auto & ast = query_ptr->as<ASTSetQuery &>();
     getContext()->checkSettingsConstraints(ast.changes);
-    getContext()->getSessionContext()->applySettingsChanges(ast.changes);
+    auto session_context = getContext()->getSessionContext();
+    session_context->applySettingsChanges(ast.changes);
+    session_context->addQueryParameters(ast.query_parameters);
     return {};
 }
 
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 695ea53e65e..d9310169ac7 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -8,7 +8,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/ShellCommand.h>
 #include <Common/FileCacheFactory.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
@@ -45,6 +45,10 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/Freeze.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/StorageFile.h>
+#include <Storages/StorageS3.h>
+#include <Storages/StorageURL.h>
+#include <Storages/HDFS/StorageHDFS.h>
 #include <Parsers/ASTSystemQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTCreateQuery.h>
@@ -317,15 +321,38 @@ BlockIO InterpreterSystemQuery::execute()
             {
                 auto caches = FileCacheFactory::instance().getAll();
                 for (const auto & [_, cache_data] : caches)
-                    cache_data->cache->removeIfReleasable(/* remove_persistent_files */false);
+                    cache_data->cache->removeIfReleasable();
             }
             else
             {
                 auto cache = FileCacheFactory::instance().get(query.filesystem_cache_path);
-                cache->removeIfReleasable(/* remove_persistent_files */false);
+                cache->removeIfReleasable();
             }
             break;
         }
+        case Type::DROP_SCHEMA_CACHE:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_SCHEMA_CACHE);
+            std::unordered_set<String> caches_to_drop;
+            if (query.schema_cache_storage.empty())
+                caches_to_drop = {"FILE", "S3", "HDFS", "URL"};
+            else
+                caches_to_drop = {query.schema_cache_storage};
+
+            if (caches_to_drop.contains("FILE"))
+                StorageFile::getSchemaCache(getContext()).clear();
+#if USE_AWS_S3
+            if (caches_to_drop.contains("S3"))
+                StorageS3::getSchemaCache(getContext()).clear();
+#endif
+#if USE_HDFS
+            if (caches_to_drop.contains("HDFS"))
+                StorageHDFS::getSchemaCache(getContext()).clear();
+#endif
+            if (caches_to_drop.contains("URL"))
+                StorageURL::getSchemaCache(getContext()).clear();
+            break;
+        }
         case Type::RELOAD_DICTIONARY:
         {
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
@@ -760,6 +787,7 @@ void InterpreterSystemQuery::syncReplica(ASTSystemQuery &)
 void InterpreterSystemQuery::syncReplicatedDatabase(ASTSystemQuery & query)
 {
     const auto database_name = query.getDatabase();
+    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, "");
     auto database = DatabaseCatalog::instance().getDatabase(database_name);
 
     if (auto * ptr = typeid_cast<DatabaseReplicated *>(database.get()))
@@ -767,8 +795,7 @@ void InterpreterSystemQuery::syncReplicatedDatabase(ASTSystemQuery & query)
         LOG_TRACE(log, "Synchronizing entries in the database replica's (name: {}) queue with the log", database_name);
         if (!ptr->waitForReplicaToProcessAllEntries(getContext()->getSettingsRef().receive_timeout.totalMilliseconds()))
         {
-            LOG_ERROR(log, "SYNC DATABASE REPLICA {}: Timed out!", database_name);
-            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "SYNC DATABASE REPLICA {}: command timed out. " \
+            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "SYNC DATABASE REPLICA {}: database is readonly or command timed out. " \
                     "See the 'receive_timeout' setting", database_name);
         }
         LOG_TRACE(log, "SYNC DATABASE REPLICA {}: OK", database_name);
@@ -833,6 +860,7 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         case Type::DROP_INDEX_MARK_CACHE:
         case Type::DROP_INDEX_UNCOMPRESSED_CACHE:
         case Type::DROP_FILESYSTEM_CACHE:
+        case Type::DROP_SCHEMA_CACHE:
         {
             required_access.emplace_back(AccessType::SYSTEM_DROP_CACHE);
             break;
diff --git a/src/Interpreters/JIT/CompiledExpressionCache.h b/src/Interpreters/JIT/CompiledExpressionCache.h
index 936b5798280..a2a8141759c 100644
--- a/src/Interpreters/JIT/CompiledExpressionCache.h
+++ b/src/Interpreters/JIT/CompiledExpressionCache.h
@@ -3,7 +3,7 @@
 #include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
-#    include <Common/LRUCache.h>
+#    include <Common/CacheBase.h>
 #    include <Common/HashTable/Hash.h>
 #    include <Interpreters/JIT/CHJIT.h>
 
@@ -35,10 +35,10 @@ struct CompiledFunctionWeightFunction
     }
 };
 
-class CompiledExpressionCache : public LRUCache<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>
+class CompiledExpressionCache : public CacheBase<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>
 {
 public:
-    using Base = LRUCache<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>;
+    using Base = CacheBase<UInt128, CompiledExpressionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>;
     using Base::Base;
 };
 
diff --git a/src/Interpreters/JoinSwitcher.cpp b/src/Interpreters/JoinSwitcher.cpp
index 34c8bb4cfd5..5d5a9b27825 100644
--- a/src/Interpreters/JoinSwitcher.cpp
+++ b/src/Interpreters/JoinSwitcher.cpp
@@ -2,7 +2,7 @@
 #include <Interpreters/JoinSwitcher.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/MergeJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
index e07430c0feb..8e515caace4 100644
--- a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
+++ b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
@@ -229,7 +229,6 @@ bool needRewrite(ASTSelectQuery & select, std::vector<const ASTTableExpression *
         return false;
 
     size_t num_array_join = 0;
-    size_t num_using = 0;
 
     table_expressions.reserve(num_tables);
     for (size_t i = 0; i < num_tables; ++i)
@@ -254,11 +253,8 @@ bool needRewrite(ASTSelectQuery & select, std::vector<const ASTTableExpression *
         }
 
         const auto & join = table->table_join->as<ASTTableJoin &>();
-        if (join.kind == ASTTableJoin::Kind::Comma)
+        if (join.kind == JoinKind::Comma)
             throw Exception("COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query", ErrorCodes::NOT_IMPLEMENTED);
-
-        if (join.using_expression_list)
-            ++num_using;
     }
 
     if (num_tables - num_array_join <= 2)
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/JoinUtils.cpp
similarity index 96%
rename from src/Interpreters/join_common.cpp
rename to src/Interpreters/JoinUtils.cpp
index c81f4a193c3..59e2475a9b2 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/JoinUtils.cpp
@@ -1,4 +1,4 @@
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnLowCardinality.h>
@@ -573,6 +573,36 @@ void splitAdditionalColumns(const Names & key_names, const Block & sample_block,
     }
 }
 
+ColumnPtr filterWithBlanks(ColumnPtr src_column, const IColumn::Filter & filter, bool inverse_filter)
+{
+    ColumnPtr column = src_column->convertToFullColumnIfConst();
+    MutableColumnPtr mut_column = column->cloneEmpty();
+    mut_column->reserve(column->size());
+
+    if (inverse_filter)
+    {
+        for (size_t row = 0; row < filter.size(); ++row)
+        {
+            if (filter[row])
+                mut_column->insertDefault();
+            else
+                mut_column->insertFrom(*column, row);
+        }
+    }
+    else
+    {
+        for (size_t row = 0; row < filter.size(); ++row)
+        {
+            if (filter[row])
+                mut_column->insertFrom(*column, row);
+            else
+                mut_column->insertDefault();
+        }
+    }
+
+    return mut_column;
+}
+
 }
 
 NotJoinedBlocks::NotJoinedBlocks(std::unique_ptr<RightColumnsFiller> filler_,
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/JoinUtils.h
similarity index 97%
rename from src/Interpreters/join_common.h
rename to src/Interpreters/JoinUtils.h
index 38b431db3e0..2e26ab782a1 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/JoinUtils.h
@@ -106,6 +106,9 @@ void splitAdditionalColumns(const Names & key_names, const Block & sample_block,
 
 void changeLowCardinalityInplace(ColumnWithTypeAndName & column);
 
+/// Insert default values for rows marked in filter
+ColumnPtr filterWithBlanks(ColumnPtr src_column, const IColumn::Filter & filter, bool inverse_filter = false);
+
 }
 
 /// Creates result from right table data in RIGHT and FULL JOIN when keys are not present in left table.
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 8ac0bc45f06..f4a98ada199 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/InJoinSubqueriesPreprocessor.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/getTableExpressions.h>
+#include <Functions/FunctionsExternalDictionaries.h>
 
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTFunction.h>
@@ -62,7 +63,7 @@ void replaceJoinedTable(const ASTSelectQuery & select_query)
     const auto & table_join = join->table_join->as<ASTTableJoin &>();
 
     /// TODO: Push down for CROSS JOIN is not OK [disabled]
-    if (table_join.kind == ASTTableJoin::Kind::Cross)
+    if (table_join.kind == JoinKind::Cross)
         return;
 
     /* Do not push down predicates for ASOF because it can lead to incorrect results
@@ -70,7 +71,7 @@ void replaceJoinedTable(const ASTSelectQuery & select_query)
      * ANY join behavior can also be different with this optimization,
      * but it's ok because we don't guarantee which row to choose for ANY, unlike ASOF, where we have to pick the closest one.
      */
-    if (table_join.strictness == ASTTableJoin::Strictness::Asof)
+    if (table_join.strictness == JoinStrictness::Asof)
         return;
 
     auto & table_expr = join->table_expression->as<ASTTableExpression &>();
@@ -320,13 +321,26 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
             {
                 table_join->setStorageJoin(storage_join);
             }
-            else if (auto storage_dict = std::dynamic_pointer_cast<StorageDictionary>(storage);
-                     storage_dict && join_algorithm.isSet(JoinAlgorithm::DIRECT))
+
+            if (auto storage_dict = std::dynamic_pointer_cast<StorageDictionary>(storage);
+                storage_dict && join_algorithm.isSet(JoinAlgorithm::DIRECT))
             {
-                table_join->setStorageJoin(storage_dict);
+                FunctionDictHelper dictionary_helper(context);
+
+                auto dictionary_name = storage_dict->getDictionaryName();
+                auto dictionary = dictionary_helper.getDictionary(dictionary_name);
+                if (!dictionary)
+                {
+                    LOG_TRACE(&Poco::Logger::get("JoinedTables"), "Can't use dictionary join: dictionary '{}' was not found", dictionary_name);
+                    return nullptr;
+                }
+
+                auto dictionary_kv = std::dynamic_pointer_cast<const IKeyValueEntity>(dictionary);
+                table_join->setStorageJoin(dictionary_kv);
             }
-            else if (auto storage_kv = std::dynamic_pointer_cast<IKeyValueStorage>(storage);
-                     storage_kv && join_algorithm.isSet(JoinAlgorithm::DIRECT))
+
+            if (auto storage_kv = std::dynamic_pointer_cast<IKeyValueEntity>(storage);
+                storage_kv && join_algorithm.isSet(JoinAlgorithm::DIRECT))
             {
                 table_join->setStorageJoin(storage_kv);
             }
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 711b71a2b3d..f1dcff70c4c 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/MergeJoin.h>
 #include <Interpreters/TableJoin.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 #include <Interpreters/sortBlock.h>
 #include <Processors/Sources/BlocksListSource.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
@@ -468,9 +468,9 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
     : table_join(table_join_)
     , size_limits(table_join->sizeLimits())
     , right_sample_block(right_sample_block_)
-    , is_any_join(table_join->strictness() == ASTTableJoin::Strictness::Any)
-    , is_all_join(table_join->strictness() == ASTTableJoin::Strictness::All)
-    , is_semi_join(table_join->strictness() == ASTTableJoin::Strictness::Semi)
+    , is_any_join(table_join->strictness() == JoinStrictness::Any)
+    , is_all_join(table_join->strictness() == JoinStrictness::All)
+    , is_semi_join(table_join->strictness() == JoinStrictness::Semi)
     , is_inner(isInner(table_join->kind()))
     , is_left(isLeft(table_join->kind()))
     , is_right(isRight(table_join->kind()))
@@ -482,10 +482,10 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
 {
     switch (table_join->strictness())
     {
-        case ASTTableJoin::Strictness::All:
+        case JoinStrictness::All:
             break;
-        case ASTTableJoin::Strictness::Any:
-        case ASTTableJoin::Strictness::Semi:
+        case JoinStrictness::Any:
+        case JoinStrictness::Semi:
             if (!is_left && !is_inner)
                 throw Exception("Not supported. MergeJoin supports SEMI and ANY variants only for LEFT and INNER JOINs.",
                                 ErrorCodes::NOT_IMPLEMENTED);
@@ -1109,7 +1109,7 @@ private:
 std::shared_ptr<NotJoinedBlocks> MergeJoin::getNonJoinedBlocks(
     const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const
 {
-    if (table_join->strictness() == ASTTableJoin::Strictness::All && (is_right || is_full))
+    if (table_join->strictness() == JoinStrictness::All && (is_right || is_full))
     {
         size_t left_columns_count = left_sample_block.columns();
         assert(left_columns_count == result_sample_block.columns() - right_columns_to_add.columns());
@@ -1140,9 +1140,9 @@ bool MergeJoin::isSupported(const std::shared_ptr<TableJoin> & table_join)
     auto kind = table_join->kind();
     auto strictness = table_join->strictness();
 
-    bool is_any = (strictness == ASTTableJoin::Strictness::Any);
-    bool is_all = (strictness == ASTTableJoin::Strictness::All);
-    bool is_semi = (strictness == ASTTableJoin::Strictness::Semi);
+    bool is_any = (strictness == JoinStrictness::Any);
+    bool is_all = (strictness == JoinStrictness::All);
+    bool is_semi = (strictness == JoinStrictness::Semi);
 
     bool all_join = is_all && (isInner(kind) || isLeft(kind) || isRight(kind) || isFull(kind));
     bool special_left = isInnerOrLeft(kind) && (is_any || is_semi);
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index 3b8ad6063e3..99bd7deffe2 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -2,7 +2,7 @@
 
 #include <shared_mutex>
 
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Core/Block.h>
 #include <Core/SortDescription.h>
 #include <Interpreters/IJoin.h>
@@ -69,7 +69,7 @@ private:
         size_t operator()(const Block & block) const { return block.bytes(); }
     };
 
-    using Cache = LRUCache<size_t, Block, std::hash<size_t>, BlockByteWeight>;
+    using Cache = CacheBase<size_t, Block, std::hash<size_t>, BlockByteWeight>;
 
     mutable std::shared_mutex rwlock;
     std::shared_ptr<TableJoin> table_join;
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 7b2d55911d1..d3679aac891 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -28,6 +28,7 @@
 #include <IO/WriteHelpers.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <DataTypes/NestedUtils.h>
+#include <Interpreters/PreparedSets.h>
 #include <Storages/LightweightDeleteDescription.h>
 
 
@@ -859,9 +860,9 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
             for (const auto & kv : stage.column_to_updated)
             {
                 auto column_name = kv.second->getColumnName();
-                const auto & dag_node = actions->findInIndex(column_name);
+                const auto & dag_node = actions->findInOutputs(column_name);
                 const auto & alias = actions->addAlias(dag_node, kv.first);
-                actions->addOrReplaceInIndex(alias);
+                actions->addOrReplaceInOutputs(alias);
             }
         }
 
@@ -934,14 +935,7 @@ QueryPipelineBuilder MutationsInterpreter::addStreamsForLaterStages(const std::v
             }
         }
 
-        SubqueriesForSets & subqueries_for_sets = stage.analyzer->getSubqueriesForSets();
-        if (!subqueries_for_sets.empty())
-        {
-            const Settings & settings = context->getSettingsRef();
-            SizeLimits network_transfer_limits(
-                    settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
-            addCreatingSetsStep(plan, std::move(subqueries_for_sets), network_transfer_limits, context);
-        }
+        addCreatingSetsStep(plan, stage.analyzer->getPreparedSets(), context);
     }
 
     QueryPlanOptimizationSettings do_not_optimize_plan;
diff --git a/src/Interpreters/PreparedSets.cpp b/src/Interpreters/PreparedSets.cpp
new file mode 100644
index 00000000000..79cfb8b688a
--- /dev/null
+++ b/src/Interpreters/PreparedSets.cpp
@@ -0,0 +1,109 @@
+#include <Interpreters/PreparedSets.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/Set.h>
+
+namespace DB
+{
+
+PreparedSetKey PreparedSetKey::forLiteral(const IAST & ast, DataTypes types_)
+{
+    /// Remove LowCardinality types from type list because Set doesn't support LowCardinality keys now,
+    ///   just converts LowCardinality to ordinary types.
+    for (auto & type : types_)
+        type = recursiveRemoveLowCardinality(type);
+
+    PreparedSetKey key;
+    key.ast_hash = ast.getTreeHash();
+    key.types = std::move(types_);
+    return key;
+}
+
+PreparedSetKey PreparedSetKey::forSubquery(const IAST & ast)
+{
+    PreparedSetKey key;
+    key.ast_hash = ast.getTreeHash();
+    return key;
+}
+
+bool PreparedSetKey::operator==(const PreparedSetKey & other) const
+{
+    if (ast_hash != other.ast_hash)
+        return false;
+
+    if (types.size() != other.types.size())
+        return false;
+
+    for (size_t i = 0; i < types.size(); ++i)
+    {
+        if (!types[i]->equals(*other.types[i]))
+            return false;
+    }
+
+    return true;
+}
+
+SubqueryForSet & PreparedSets::createOrGetSubquery(const String & subquery_id, const PreparedSetKey & key,
+                                                   SizeLimits set_size_limit, bool transform_null_in)
+{
+    SubqueryForSet & subquery = subqueries[subquery_id];
+
+    /// If you already created a Set with the same subquery / table for another ast
+    /// In that case several PreparedSetKey would share same subquery and set
+    /// Not sure if it's really possible case (maybe for distributed query when set was filled by external table?)
+    if (subquery.set)
+        sets[key] = subquery.set;
+    else
+        sets[key] = subquery.set = std::make_shared<Set>(set_size_limit, false, transform_null_in);
+    return subquery;
+}
+
+/// If the subquery is not associated with any set, create default-constructed SubqueryForSet.
+/// It's aimed to fill external table passed to SubqueryForSet::createSource.
+SubqueryForSet & PreparedSets::getSubquery(const String & subquery_id) { return subqueries[subquery_id]; }
+
+void PreparedSets::set(const PreparedSetKey & key, SetPtr set_) { sets[key] = set_; }
+
+SetPtr & PreparedSets::get(const PreparedSetKey & key) { return sets[key]; }
+
+std::vector<SetPtr> PreparedSets::getByTreeHash(IAST::Hash ast_hash)
+{
+    std::vector<SetPtr> res;
+    for (const auto & it : this->sets)
+    {
+        if (it.first.ast_hash == ast_hash)
+            res.push_back(it.second);
+    }
+    return res;
+}
+
+PreparedSets::SubqueriesForSets PreparedSets::detachSubqueries()
+{
+    auto res = std::move(subqueries);
+    subqueries = SubqueriesForSets();
+    return res;
+}
+
+bool PreparedSets::empty() const { return sets.empty(); }
+
+void SubqueryForSet::createSource(InterpreterSelectWithUnionQuery & interpreter, StoragePtr table_)
+{
+    source = std::make_unique<QueryPlan>();
+    interpreter.buildQueryPlan(*source);
+    if (table_)
+        table = table_;
+}
+
+bool SubqueryForSet::hasSource() const
+{
+    return source != nullptr;
+}
+
+QueryPlanPtr SubqueryForSet::detachSource()
+{
+    auto res = std::move(source);
+    source = nullptr;
+    return res;
+}
+
+};
diff --git a/src/Interpreters/PreparedSets.h b/src/Interpreters/PreparedSets.h
index f486752e192..06600c49f13 100644
--- a/src/Interpreters/PreparedSets.h
+++ b/src/Interpreters/PreparedSets.h
@@ -4,58 +4,61 @@
 #include <DataTypes/IDataType.h>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 #include <DataTypes/DataTypeLowCardinality.h>
-
+#include <Storages/IStorage_fwd.h>
+#include <QueryPipeline/SizeLimits.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 
 namespace DB
 {
 
+class QueryPlan;
+
+class Set;
+using SetPtr = std::shared_ptr<Set>;
+class InterpreterSelectWithUnionQuery;
+
+/// Information on how to build set for the [GLOBAL] IN section.
+class SubqueryForSet
+{
+public:
+
+    void createSource(InterpreterSelectWithUnionQuery & interpreter, StoragePtr table_ = nullptr);
+
+    bool hasSource() const;
+
+    /// Returns query plan for the set's source
+    /// and removes it from SubqueryForSet because we need to build it only once.
+    std::unique_ptr<QueryPlan> detachSource();
+
+    /// Build this set from the result of the subquery.
+    SetPtr set;
+
+    /// If set, put the result into the table.
+    /// This is a temporary table for transferring to remote servers for distributed query processing.
+    StoragePtr table;
+
+private:
+    /// The source is obtained using the InterpreterSelectQuery subquery.
+    std::unique_ptr<QueryPlan> source;
+};
+
 struct PreparedSetKey
 {
     /// Prepared sets for tuple literals are indexed by the hash of the tree contents and by the desired
     /// data types of set elements (two different Sets can be required for two tuples with the same contents
     /// if left hand sides of the IN operators have different types).
-    static PreparedSetKey forLiteral(const IAST & ast, DataTypes types_)
-    {
-        /// Remove LowCardinality types from type list because Set doesn't support LowCardinality keys now,
-        ///   just converts LowCardinality to ordinary types.
-        for (auto & type : types_)
-            type = recursiveRemoveLowCardinality(type);
-
-        PreparedSetKey key;
-        key.ast_hash = ast.getTreeHash();
-        key.types = std::move(types_);
-        return key;
-    }
+    static PreparedSetKey forLiteral(const IAST & ast, DataTypes types_);
 
     /// Prepared sets for subqueries are indexed only by the AST contents because the type of the resulting
     /// set is fully determined by the subquery.
-    static PreparedSetKey forSubquery(const IAST & ast)
-    {
-        PreparedSetKey key;
-        key.ast_hash = ast.getTreeHash();
-        return key;
-    }
+    static PreparedSetKey forSubquery(const IAST & ast);
 
     IAST::Hash ast_hash;
     DataTypes types; /// Empty for subqueries.
 
-    bool operator==(const PreparedSetKey & other) const
-    {
-        if (ast_hash != other.ast_hash)
-            return false;
-
-        if (types.size() != other.types.size())
-            return false;
-
-        for (size_t i = 0; i < types.size(); ++i)
-        {
-            if (!types[i]->equals(*other.types[i]))
-                return false;
-        }
-
-        return true;
-    }
+    bool operator==(const PreparedSetKey & other) const;
 
     struct Hash
     {
@@ -63,9 +66,36 @@ struct PreparedSetKey
     };
 };
 
-class Set;
-using SetPtr = std::shared_ptr<Set>;
+class PreparedSets
+{
+public:
+    using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
 
-using PreparedSets = std::unordered_map<PreparedSetKey, SetPtr, PreparedSetKey::Hash>;
+    SubqueryForSet & createOrGetSubquery(const String & subquery_id, const PreparedSetKey & key,
+                                         SizeLimits set_size_limit, bool transform_null_in);
+    SubqueryForSet & getSubquery(const String & subquery_id);
+
+    void set(const PreparedSetKey & key, SetPtr set_);
+    SetPtr & get(const PreparedSetKey & key);
+
+    /// Get subqueries and clear them.
+    /// We need to build a plan for subqueries just once. That's why we can clear them after accessing them.
+    /// SetPtr would still be available for consumers of PreparedSets.
+    SubqueriesForSets detachSubqueries();
+
+    /// Returns all sets that match the given ast hash not checking types
+    /// Used in KeyCondition and MergeTreeIndexConditionBloomFilter to make non exact match for types in PreparedSetKey
+    std::vector<SetPtr> getByTreeHash(IAST::Hash ast_hash);
+
+    bool empty() const;
+
+private:
+    std::unordered_map<PreparedSetKey, SetPtr, PreparedSetKey::Hash> sets;
+
+    /// This is the information required for building sets
+    SubqueriesForSets subqueries;
+};
+
+using PreparedSetsPtr = std::shared_ptr<PreparedSets>;
 
 }
diff --git a/src/Interpreters/ProcessorsProfileLog.cpp b/src/Interpreters/ProcessorsProfileLog.cpp
index 0589f78105d..f6ce801605a 100644
--- a/src/Interpreters/ProcessorsProfileLog.cpp
+++ b/src/Interpreters/ProcessorsProfileLog.cpp
@@ -26,12 +26,18 @@ NamesAndTypesList ProcessorProfileLogElement::getNamesAndTypes()
 
         {"id", std::make_shared<DataTypeUInt64>()},
         {"parent_ids", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
+        {"plan_step", std::make_shared<DataTypeUInt64>()},
+        {"plan_group", std::make_shared<DataTypeUInt64>()},
 
         {"query_id", std::make_shared<DataTypeString>()},
         {"name", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
         {"elapsed_us", std::make_shared<DataTypeUInt64>()},
         {"input_wait_elapsed_us", std::make_shared<DataTypeUInt64>()},
         {"output_wait_elapsed_us", std::make_shared<DataTypeUInt64>()},
+        {"input_rows", std::make_shared<DataTypeUInt64>()},
+        {"input_bytes", std::make_shared<DataTypeUInt64>()},
+        {"output_rows", std::make_shared<DataTypeUInt64>()},
+        {"output_bytes", std::make_shared<DataTypeUInt64>()},
     };
 }
 
@@ -52,11 +58,17 @@ void ProcessorProfileLogElement::appendToBlock(MutableColumns & columns) const
         columns[i++]->insert(parent_ids_array);
     }
 
+    columns[i++]->insert(plan_step);
+    columns[i++]->insert(plan_group);
     columns[i++]->insertData(query_id.data(), query_id.size());
     columns[i++]->insertData(processor_name.data(), processor_name.size());
     columns[i++]->insert(elapsed_us);
     columns[i++]->insert(input_wait_elapsed_us);
     columns[i++]->insert(output_wait_elapsed_us);
+    columns[i++]->insert(input_rows);
+    columns[i++]->insert(input_bytes);
+    columns[i++]->insert(output_rows);
+    columns[i++]->insert(output_bytes);
 }
 
 ProcessorsProfileLog::ProcessorsProfileLog(ContextPtr context_, const String & database_name_,
diff --git a/src/Interpreters/ProcessorsProfileLog.h b/src/Interpreters/ProcessorsProfileLog.h
index 33cb3988e9f..07837bdd10e 100644
--- a/src/Interpreters/ProcessorsProfileLog.h
+++ b/src/Interpreters/ProcessorsProfileLog.h
@@ -13,9 +13,12 @@ struct ProcessorProfileLogElement
     time_t event_time{};
     Decimal64 event_time_microseconds{};
 
-    UInt64 id;
+    UInt64 id{};
     std::vector<UInt64> parent_ids;
 
+    UInt64 plan_step{};
+    UInt64 plan_group{};
+
     String query_id;
     String processor_name;
 
@@ -26,6 +29,11 @@ struct ProcessorProfileLogElement
     /// IProcessor::PortFull
     UInt32 output_wait_elapsed_us{};
 
+    size_t input_rows{};
+    size_t input_bytes{};
+    size_t output_rows{};
+    size_t output_bytes{};
+
     static std::string name() { return "ProcessorsProfileLog"; }
     static NamesAndTypesList getNamesAndTypes();
     static NamesAndAliases getNamesAndAliases() { return {}; }
diff --git a/src/Interpreters/ProfileEventsExt.cpp b/src/Interpreters/ProfileEventsExt.cpp
index 94f67713551..1a8176624d2 100644
--- a/src/Interpreters/ProfileEventsExt.cpp
+++ b/src/Interpreters/ProfileEventsExt.cpp
@@ -162,9 +162,8 @@ void getProfileEvents(
     dumpMemoryTracker(group_snapshot, columns, server_display_name);
 
     Block curr_block;
-    size_t rows = 0;
 
-    for (; profile_queue->tryPop(curr_block); ++rows)
+    while (profile_queue->tryPop(curr_block))
     {
         auto curr_columns = curr_block.getColumns();
         for (size_t j = 0; j < curr_columns.size(); ++j)
diff --git a/src/Interpreters/RequiredSourceColumnsData.h b/src/Interpreters/RequiredSourceColumnsData.h
index 501f6961efa..dd4e2dc3d68 100644
--- a/src/Interpreters/RequiredSourceColumnsData.h
+++ b/src/Interpreters/RequiredSourceColumnsData.h
@@ -36,6 +36,7 @@ struct RequiredSourceColumnsData
 
     bool has_table_join = false;
     bool has_array_join = false;
+    bool visit_index_hint = false;
 
     bool addColumnAliasIfAny(const IAST & ast);
     void addColumnIdentifier(const ASTIdentifier & node);
diff --git a/src/Interpreters/RequiredSourceColumnsVisitor.cpp b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
index f4305692eb6..fe0ee6f97ac 100644
--- a/src/Interpreters/RequiredSourceColumnsVisitor.cpp
+++ b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
@@ -52,10 +52,8 @@ bool RequiredSourceColumnsMatcher::needChildVisit(const ASTPtr & node, const AST
 
     if (const auto * f = node->as<ASTFunction>())
     {
-        /// "indexHint" is a special function for index analysis.
-        /// Everything that is inside it is not calculated. See KeyCondition
         /// "lambda" visit children itself.
-        if (f->name == "indexHint" || f->name == "lambda")
+        if (f->name == "lambda")
             return false;
     }
 
@@ -73,6 +71,11 @@ void RequiredSourceColumnsMatcher::visit(const ASTPtr & ast, Data & data)
     }
     if (auto * t = ast->as<ASTFunction>())
     {
+        /// "indexHint" is a special function for index analysis.
+        /// Everything that is inside it is not calculated. See KeyCondition
+        if (!data.visit_index_hint && t->name == "indexHint")
+            return;
+
         data.addColumnAliasIfAny(*ast);
         visit(*t, ast, data);
         return;
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 2a18c2c700a..09af04bc7e5 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -3,6 +3,7 @@
 #include <Common/RadixSort.h>
 #include <Columns/IColumn.h>
 #include <DataTypes/IDataType.h>
+#include <Core/Joins.h>
 #include <base/types.h>
 
 
@@ -39,7 +40,7 @@ void callWithType(TypeIndex type, F && f)
     __builtin_unreachable();
 }
 
-template <typename TKey, ASOF::Inequality inequality>
+template <typename TKey, ASOFJoinInequality inequality>
 class SortedLookupVector : public SortedLookupVectorBase
 {
     struct Entry
@@ -77,8 +78,8 @@ public:
     using Entries = PaddedPODArray<Entry>;
     using RowRefs = PaddedPODArray<RowRef>;
 
-    static constexpr bool is_descending = (inequality == ASOF::Inequality::Greater || inequality == ASOF::Inequality::GreaterOrEquals);
-    static constexpr bool is_strict = (inequality == ASOF::Inequality::Less) || (inequality == ASOF::Inequality::Greater);
+    static constexpr bool is_descending = (inequality == ASOFJoinInequality::Greater || inequality == ASOFJoinInequality::GreaterOrEquals);
+    static constexpr bool is_strict = (inequality == ASOFJoinInequality::Less) || (inequality == ASOFJoinInequality::Greater);
 
     void insert(const IColumn & asof_column, const Block * block, size_t row_num) override
     {
@@ -216,7 +217,7 @@ private:
 };
 }
 
-AsofRowRefs createAsofRowRef(TypeIndex type, ASOF::Inequality inequality)
+AsofRowRefs createAsofRowRef(TypeIndex type, ASOFJoinInequality inequality)
 {
     AsofRowRefs result;
     auto call = [&](const auto & t)
@@ -224,17 +225,17 @@ AsofRowRefs createAsofRowRef(TypeIndex type, ASOF::Inequality inequality)
         using T = std::decay_t<decltype(t)>;
         switch (inequality)
         {
-            case ASOF::Inequality::LessOrEquals:
-                result = std::make_unique<SortedLookupVector<T, ASOF::Inequality::LessOrEquals>>();
+            case ASOFJoinInequality::LessOrEquals:
+                result = std::make_unique<SortedLookupVector<T, ASOFJoinInequality::LessOrEquals>>();
                 break;
-            case ASOF::Inequality::Less:
-                result = std::make_unique<SortedLookupVector<T, ASOF::Inequality::Less>>();
+            case ASOFJoinInequality::Less:
+                result = std::make_unique<SortedLookupVector<T, ASOFJoinInequality::Less>>();
                 break;
-            case ASOF::Inequality::GreaterOrEquals:
-                result = std::make_unique<SortedLookupVector<T, ASOF::Inequality::GreaterOrEquals>>();
+            case ASOFJoinInequality::GreaterOrEquals:
+                result = std::make_unique<SortedLookupVector<T, ASOFJoinInequality::GreaterOrEquals>>();
                 break;
-            case ASOF::Inequality::Greater:
-                result = std::make_unique<SortedLookupVector<T, ASOF::Inequality::Greater>>();
+            case ASOFJoinInequality::Greater:
+                result = std::make_unique<SortedLookupVector<T, ASOFJoinInequality::Greater>>();
                 break;
             default:
                 throw Exception("Invalid ASOF Join order", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index fa5ce867613..2c9f2062a82 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -10,7 +10,7 @@
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/IColumn.h>
-#include <Interpreters/asof.h>
+#include <Core/Joins.h>
 #include <base/sort.h>
 #include <Common/Arena.h>
 
@@ -161,5 +161,5 @@ struct SortedLookupVectorBase
 // It only contains a std::unique_ptr which is memmovable.
 // Source: https://github.com/ClickHouse/ClickHouse/issues/4906
 using AsofRowRefs = std::unique_ptr<SortedLookupVectorBase>;
-AsofRowRefs createAsofRowRef(TypeIndex type, ASOF::Inequality inequality);
+AsofRowRefs createAsofRowRef(TypeIndex type, ASOFJoinInequality inequality);
 }
diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp
index 5f303ab64b4..29357875488 100644
--- a/src/Interpreters/SessionLog.cpp
+++ b/src/Interpreters/SessionLog.cpp
@@ -182,12 +182,10 @@ void SessionLogElement::appendToBlock(MutableColumns & columns) const
         auto & names_col = *settings_tuple_col.getColumnPtr(0)->assumeMutable();
         auto & values_col = assert_cast<ColumnString &>(*settings_tuple_col.getColumnPtr(1)->assumeMutable());
 
-        size_t items_added = 0;
         for (const auto & kv : settings)
         {
             names_col.insert(kv.first);
             values_col.insert(kv.second);
-            ++items_added;
         }
 
         auto & offsets = settings_array_col.getOffsets();
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index ab443f58cf2..af05b33c1f6 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -430,8 +430,9 @@ MergeTreeSetIndex::MergeTreeSetIndex(const Columns & set_elements, std::vector<K
     SortDescription sort_description;
     for (size_t i = 0; i < tuple_size; ++i)
     {
-        block_to_sort.insert({ordered_set[i], nullptr, ordered_set[i]->getName()});
-        sort_description.emplace_back(ordered_set[i]->getName(), 1, 1);
+        String column_name = "_" + toString(i);
+        block_to_sort.insert({ordered_set[i], nullptr, column_name});
+        sort_description.emplace_back(column_name, 1, 1);
     }
 
     sortBlock(block_to_sort, sort_description);
diff --git a/src/Interpreters/SubqueryForSet.cpp b/src/Interpreters/SubqueryForSet.cpp
deleted file mode 100644
index d669e091131..00000000000
--- a/src/Interpreters/SubqueryForSet.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <Interpreters/SubqueryForSet.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Interpreters/PreparedSets.h>
-
-namespace DB
-{
-
-SubqueryForSet::SubqueryForSet() = default;
-SubqueryForSet::~SubqueryForSet() = default;
-SubqueryForSet::SubqueryForSet(SubqueryForSet &&) noexcept = default;
-SubqueryForSet & SubqueryForSet::operator= (SubqueryForSet &&) noexcept = default;
-
-}
diff --git a/src/Interpreters/SubqueryForSet.h b/src/Interpreters/SubqueryForSet.h
deleted file mode 100644
index f737ec4582b..00000000000
--- a/src/Interpreters/SubqueryForSet.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <Storages/IStorage_fwd.h>
-
-
-namespace DB
-{
-
-class QueryPlan;
-
-class Set;
-using SetPtr = std::shared_ptr<Set>;
-
-/// Information on what to do when executing a subquery in the [GLOBAL] IN/JOIN section.
-struct SubqueryForSet
-{
-    SubqueryForSet();
-    ~SubqueryForSet();
-    SubqueryForSet(SubqueryForSet &&) noexcept;
-    SubqueryForSet & operator=(SubqueryForSet &&) noexcept;
-
-    /// The source is obtained using the InterpreterSelectQuery subquery.
-    std::unique_ptr<QueryPlan> source;
-
-    /// If set, build it from result.
-    SetPtr set;
-
-    /// If set, put the result into the table.
-    /// This is a temporary table for transferring to remote servers for distributed query processing.
-    StoragePtr table;
-};
-
-/// ID of subquery -> what to do with it.
-using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
-
-}
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index 029038357c1..5d065e564b2 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -13,7 +13,6 @@
 
 #include <Dictionaries/DictionaryStructure.h>
 
-#include <Interpreters/DictionaryReader.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 
 #include <Parsers/ASTExpressionList.h>
@@ -388,17 +387,17 @@ void TableJoin::addJoinedColumnsAndCorrectTypesImpl(TColumns & left_columns, boo
             left_columns.emplace_back(col.name, col.type);
 }
 
-bool TableJoin::sameStrictnessAndKind(ASTTableJoin::Strictness strictness_, ASTTableJoin::Kind kind_) const
+bool TableJoin::sameStrictnessAndKind(JoinStrictness strictness_, JoinKind kind_) const
 {
     if (strictness_ == strictness() && kind_ == kind())
         return true;
 
     /// Compatibility: old ANY INNER == new SEMI LEFT
-    if (strictness_ == ASTTableJoin::Strictness::Semi && isLeft(kind_) &&
-        strictness() == ASTTableJoin::Strictness::RightAny && isInner(kind()))
+    if (strictness_ == JoinStrictness::Semi && isLeft(kind_) &&
+        strictness() == JoinStrictness::RightAny && isInner(kind()))
         return true;
-    if (strictness() == ASTTableJoin::Strictness::Semi && isLeft(kind()) &&
-        strictness_ == ASTTableJoin::Strictness::RightAny && isInner(kind_))
+    if (strictness() == JoinStrictness::Semi && isLeft(kind()) &&
+        strictness_ == JoinStrictness::RightAny && isInner(kind_))
         return true;
 
     return false;
@@ -411,83 +410,12 @@ bool TableJoin::oneDisjunct() const
 
 bool TableJoin::needStreamWithNonJoinedRows() const
 {
-    if (strictness() == ASTTableJoin::Strictness::Asof ||
-        strictness() == ASTTableJoin::Strictness::Semi)
+    if (strictness() == JoinStrictness::Asof ||
+        strictness() == JoinStrictness::Semi)
         return false;
     return isRightOrFull(kind());
 }
 
-static std::optional<String> getDictKeyName(const String & dict_name , ContextPtr context)
-{
-    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
-    if (!dictionary)
-        return {};
-
-    if (const auto & structure = dictionary->getStructure(); structure.id)
-        return structure.id->name;
-    return {};
-}
-
-bool TableJoin::tryInitDictJoin(const Block & sample_block, ContextPtr context)
-{
-    using Strictness = ASTTableJoin::Strictness;
-
-    bool allowed_inner = isInner(kind()) && strictness() == Strictness::All;
-    bool allowed_left = isLeft(kind()) && (strictness() == Strictness::Any ||
-                                           strictness() == Strictness::All ||
-                                           strictness() == Strictness::Semi ||
-                                           strictness() == Strictness::Anti);
-
-    /// Support ALL INNER, [ANY | ALL | SEMI | ANTI] LEFT
-    if (!allowed_inner && !allowed_left)
-        return false;
-
-    if (clauses.size() != 1 || clauses[0].key_names_right.size() != 1)
-        return false;
-
-    const auto & right_key = getOnlyClause().key_names_right[0];
-
-    /// TODO: support 'JOIN ... ON expr(dict_key) = table_key'
-    auto it_key = original_names.find(right_key);
-    if (it_key == original_names.end())
-        return false;
-
-    if (!right_storage_dictionary)
-        return false;
-
-    auto dict_name = right_storage_dictionary->getDictionaryName();
-
-    auto dict_key = getDictKeyName(dict_name, context);
-    if (!dict_key.has_value() || *dict_key != it_key->second)
-        return false; /// JOIN key != Dictionary key
-
-    Names src_names;
-    NamesAndTypesList dst_columns;
-    for (const auto & col : sample_block)
-    {
-        if (col.name == right_key)
-            continue; /// do not extract key column
-
-        auto it = original_names.find(col.name);
-        if (it != original_names.end())
-        {
-            String original = it->second;
-            src_names.push_back(original);
-            dst_columns.push_back({col.name, col.type});
-        }
-        else
-        {
-            /// Can't extract column from dictionary table
-            /// TODO: Sometimes it should be possible to recunstruct required column,
-            /// e.g. if it's an expression depending on dictionary attributes
-            return false;
-        }
-    }
-    dictionary_reader = std::make_shared<DictionaryReader>(dict_name, src_names, dst_columns, context);
-
-    return true;
-}
-
 static void renameIfNeeded(String & name, const NameToNameMap & renames)
 {
     if (const auto it = renames.find(name); it != renames.end())
@@ -569,7 +497,7 @@ void TableJoin::inferJoinKeyCommonType(const LeftNamesAndTypes & left, const Rig
     for (const auto & col : right)
         right_types[renamedRightColumnName(col.name)] = col.type;
 
-    if (strictness() == ASTTableJoin::Strictness::Asof)
+    if (strictness() == JoinStrictness::Asof)
     {
         if (clauses.size() != 1)
             throw DB::Exception("ASOF join over multiple keys is not supported", ErrorCodes::NOT_IMPLEMENTED);
@@ -717,23 +645,24 @@ ActionsDAGPtr TableJoin::applyKeyConvertToTable(
     return dag_stage1;
 }
 
-void TableJoin::setStorageJoin(std::shared_ptr<IKeyValueStorage> storage)
+void TableJoin::setStorageJoin(std::shared_ptr<const IKeyValueEntity> storage)
 {
     right_kv_storage = storage;
 }
 
 void TableJoin::setStorageJoin(std::shared_ptr<StorageJoin> storage)
 {
-    if (right_storage_dictionary)
-        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
     right_storage_join = storage;
 }
 
-void TableJoin::setStorageJoin(std::shared_ptr<StorageDictionary> storage)
+void TableJoin::setRightStorageName(const std::string & storage_name)
 {
-    if (right_storage_join)
-        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
-    right_storage_dictionary = storage;
+    right_storage_name = storage_name;
+}
+
+const std::string & TableJoin::getRightStorageName() const
+{
+    return right_storage_name;
 }
 
 String TableJoin::renamedRightColumnName(const String & name) const
@@ -815,16 +744,16 @@ void TableJoin::assertHasOneOnExpr() const
 void TableJoin::resetToCross()
 {
     this->resetKeys();
-    this->table_join.kind = ASTTableJoin::Kind::Cross;
+    this->table_join.kind = JoinKind::Cross;
 }
 
 bool TableJoin::allowParallelHashJoin() const
 {
-    if (dictionary_reader || !join_algorithm.isSet(JoinAlgorithm::PARALLEL_HASH))
+    if (!right_storage_name.empty() || !join_algorithm.isSet(JoinAlgorithm::PARALLEL_HASH))
         return false;
-    if (table_join.kind != ASTTableJoin::Kind::Left && table_join.kind != ASTTableJoin::Kind::Inner)
+    if (table_join.kind != JoinKind::Left && table_join.kind != JoinKind::Inner)
         return false;
-    if (table_join.strictness == ASTTableJoin::Strictness::Asof)
+    if (table_join.strictness == JoinStrictness::Asof)
         return false;
     if (isSpecialStorage() || !oneDisjunct())
         return false;
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 57895d6d1c1..d0bf64fdebe 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -5,11 +5,10 @@
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Interpreters/IJoin.h>
-#include <Interpreters/join_common.h>
-#include <Interpreters/asof.h>
+#include <Interpreters/JoinUtils.h>
 #include <QueryPipeline/SizeLimits.h>
 #include <DataTypes/getLeastSupertype.h>
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 
 #include <Common/Exception.h>
 #include <Parsers/IAST_fwd.h>
@@ -29,10 +28,10 @@ class Context;
 class ASTSelectQuery;
 struct DatabaseAndTableWithAlias;
 class Block;
-class DictionaryReader;
+class DictionaryJoinAdapter;
 class StorageJoin;
 class StorageDictionary;
-class IKeyValueStorage;
+class IKeyValueEntity;
 
 struct ColumnWithTypeAndName;
 using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
@@ -42,12 +41,6 @@ struct Settings;
 class IVolume;
 using VolumePtr = std::shared_ptr<IVolume>;
 
-enum class JoinTableSide
-{
-    Left,
-    Right
-};
-
 class TableJoin
 {
 public:
@@ -125,7 +118,7 @@ private:
 
     ASTTableJoin table_join;
 
-    ASOF::Inequality asof_inequality = ASOF::Inequality::GreaterOrEquals;
+    ASOFJoinInequality asof_inequality = ASOFJoinInequality::GreaterOrEquals;
 
     /// All columns which can be read from joined table. Duplicating names are qualified.
     NamesAndTypesList columns_from_joined_table;
@@ -147,10 +140,9 @@ private:
 
     std::shared_ptr<StorageJoin> right_storage_join;
 
-    std::shared_ptr<StorageDictionary> right_storage_dictionary;
-    std::shared_ptr<DictionaryReader> dictionary_reader;
+    std::shared_ptr<const IKeyValueEntity> right_kv_storage;
 
-    std::shared_ptr<IKeyValueStorage> right_kv_storage;
+    std::string right_storage_name;
 
     Names requiredJoinedNames() const;
 
@@ -176,7 +168,7 @@ public:
     TableJoin(const Settings & settings, VolumePtr tmp_volume_);
 
     /// for StorageJoin
-    TableJoin(SizeLimits limits, bool use_nulls, ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness,
+    TableJoin(SizeLimits limits, bool use_nulls, JoinKind kind, JoinStrictness strictness,
               const Names & key_names_right)
         : size_limits(limits)
         , default_max_bytes(0)
@@ -188,9 +180,9 @@ public:
         table_join.strictness = strictness;
     }
 
-    ASTTableJoin::Kind kind() const { return table_join.kind; }
-    ASTTableJoin::Strictness strictness() const { return table_join.strictness; }
-    bool sameStrictnessAndKind(ASTTableJoin::Strictness, ASTTableJoin::Kind) const;
+    JoinKind kind() const { return table_join.kind; }
+    JoinStrictness strictness() const { return table_join.strictness; }
+    bool sameStrictnessAndKind(JoinStrictness, JoinKind) const;
     const SizeLimits & sizeLimits() const { return size_limits; }
     VolumePtr getTemporaryVolume() { return tmp_volume; }
 
@@ -280,8 +272,8 @@ public:
         const ColumnsWithTypeAndName & left_sample_columns,
         const ColumnsWithTypeAndName & right_sample_columns);
 
-    void setAsofInequality(ASOF::Inequality inequality) { asof_inequality = inequality; }
-    ASOF::Inequality getAsofInequality() { return asof_inequality; }
+    void setAsofInequality(ASOFJoinInequality inequality) { asof_inequality = inequality; }
+    ASOFJoinInequality getAsofInequality() { return asof_inequality; }
 
     ASTPtr leftKeysList() const;
     ASTPtr rightKeysList() const; /// For ON syntax only
@@ -308,18 +300,18 @@ public:
 
     std::unordered_map<String, String> leftToRightKeyRemap() const;
 
-    void setStorageJoin(std::shared_ptr<IKeyValueStorage> storage);
+    /// Remember storage name in case of joining with dictionary or another special storage
+    void setRightStorageName(const std::string & storage_name);
+    const std::string & getRightStorageName() const;
+
+    void setStorageJoin(std::shared_ptr<const IKeyValueEntity> storage);
     void setStorageJoin(std::shared_ptr<StorageJoin> storage);
-    void setStorageJoin(std::shared_ptr<StorageDictionary> storage);
 
     std::shared_ptr<StorageJoin> getStorageJoin() { return right_storage_join; }
 
-    bool tryInitDictJoin(const Block & sample_block, ContextPtr context);
+    bool isSpecialStorage() const { return !right_storage_name.empty() || right_storage_join || right_kv_storage; }
 
-    bool isSpecialStorage() const { return right_storage_dictionary || right_storage_join || right_kv_storage; }
-    const DictionaryReader * getDictionaryReader() const { return dictionary_reader.get(); }
-
-    std::shared_ptr<IKeyValueStorage> getStorageKeyValue() { return right_kv_storage; }
+    std::shared_ptr<const IKeyValueEntity> getStorageKeyValue() { return right_kv_storage; }
 };
 
 }
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index cf79cd158e8..07c7cd85d1b 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -13,6 +13,7 @@
 #include <Interpreters/AggregateFunctionOfGroupByKeysVisitor.h>
 #include <Interpreters/RewriteAnyFunctionVisitor.h>
 #include <Interpreters/RemoveInjectiveFunctionsVisitor.h>
+#include <Interpreters/FunctionMaskingArgumentCheckVisitor.h>
 #include <Interpreters/RedundantFunctionsInOrderByVisitor.h>
 #include <Interpreters/RewriteCountVariantsVisitor.h>
 #include <Interpreters/MonotonicityCheckVisitor.h>
@@ -153,6 +154,19 @@ void optimizeGroupBy(ASTSelectQuery * select_query, ContextPtr context)
                     continue;
                 }
             }
+            /// don't optimise functions that shadow any of it's arguments, e.g.:
+            /// SELECT toString(dummy) as dummy FROM system.one GROUP BY dummy;
+            if (!function->alias.empty())
+            {
+                FunctionMaskingArgumentCheckVisitor::Data data{.alias=function->alias};
+                FunctionMaskingArgumentCheckVisitor(data).visit(function->arguments);
+
+                if (data.is_rejected)
+                {
+                    ++i;
+                    continue;
+                }
+            }
 
             /// copy shared pointer to args in order to ensure lifetime
             auto args_ast = function->arguments;
@@ -823,12 +837,12 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
     if (settings.optimize_normalize_count_variants)
         optimizeCountConstantAndSumOne(query);
 
-    if (settings.optimize_rewrite_sum_if_to_count_if)
-        optimizeSumIfFunctions(query);
-
     if (settings.optimize_multiif_to_if)
         optimizeMultiIfToIf(query);
 
+    if (settings.optimize_rewrite_sum_if_to_count_if)
+        optimizeSumIfFunctions(query);
+
     /// Remove injective functions inside uniq
     if (settings.optimize_injective_functions_inside_uniq)
         optimizeInjectiveFunctionsInsideUniq(query, context);
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index bd18984faed..9248e8eecb6 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -6,29 +6,31 @@
 #include <Common/checkStackSize.h>
 #include <Core/SettingsEnums.h>
 
-#include <Interpreters/TreeRewriter.h>
-#include <Interpreters/LogicalExpressionsOptimizer.h>
-#include <Interpreters/QueryAliasesVisitor.h>
 #include <Interpreters/ArrayJoinedColumnsVisitor.h>
-#include <Interpreters/TranslateQualifiedNamesVisitor.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/FunctionNameNormalizer.h>
-#include <Interpreters/MarkTableIdentifiersVisitor.h>
-#include <Interpreters/QueryNormalizer.h>
-#include <Interpreters/GroupingSetsRewriterVisitor.h>
-#include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
-#include <Interpreters/RequiredSourceColumnsVisitor.h>
-#include <Interpreters/GetAggregatesVisitor.h>
-#include <Interpreters/UserDefinedSQLFunctionVisitor.h>
-#include <Interpreters/TableJoin.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
 #include <Interpreters/ExpressionActions.h> /// getSmallestColumn()
-#include <Interpreters/getTableExpressions.h>
-#include <Interpreters/TreeOptimizer.h>
-#include <Interpreters/replaceAliasColumnsInQuery.h>
-#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/GetAggregatesVisitor.h>
+#include <Interpreters/GroupingSetsRewriterVisitor.h>
+#include <Interpreters/LogicalExpressionsOptimizer.h>
+#include <Interpreters/MarkTableIdentifiersVisitor.h>
 #include <Interpreters/PredicateExpressionsOptimizer.h>
+#include <Interpreters/QueryAliasesVisitor.h>
+#include <Interpreters/QueryNormalizer.h>
+#include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Interpreters/RewriteOrderByVisitor.hpp>
+#include <Interpreters/TableJoin.h>
+#include <Interpreters/TranslateQualifiedNamesVisitor.h>
+#include <Interpreters/TreeOptimizer.h>
+#include <Interpreters/TreeRewriter.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLFunctionVisitor.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/getTableExpressions.h>
+#include <Interpreters/replaceAliasColumnsInQuery.h>
+#include <Interpreters/replaceForPositionalArguments.h>
 
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTExpressionList.h>
@@ -612,13 +614,13 @@ void setJoinStrictness(ASTSelectQuery & select_query, JoinStrictness join_defaul
 
     auto & table_join = const_cast<ASTTablesInSelectQueryElement *>(node)->table_join->as<ASTTableJoin &>();
 
-    if (table_join.strictness == ASTTableJoin::Strictness::Unspecified &&
-        table_join.kind != ASTTableJoin::Kind::Cross)
+    if (table_join.strictness == JoinStrictness::Unspecified &&
+        table_join.kind != JoinKind::Cross)
     {
-        if (join_default_strictness == JoinStrictness::ANY)
-            table_join.strictness = ASTTableJoin::Strictness::Any;
-        else if (join_default_strictness == JoinStrictness::ALL)
-            table_join.strictness = ASTTableJoin::Strictness::All;
+        if (join_default_strictness == JoinStrictness::Any)
+            table_join.strictness = JoinStrictness::Any;
+        else if (join_default_strictness == JoinStrictness::All)
+            table_join.strictness = JoinStrictness::All;
         else
             throw Exception("Expected ANY or ALL in JOIN section, because setting (join_default_strictness) is empty",
                             DB::ErrorCodes::EXPECTED_ALL_OR_ANY);
@@ -626,19 +628,19 @@ void setJoinStrictness(ASTSelectQuery & select_query, JoinStrictness join_defaul
 
     if (old_any)
     {
-        if (table_join.strictness == ASTTableJoin::Strictness::Any &&
-            table_join.kind == ASTTableJoin::Kind::Inner)
+        if (table_join.strictness == JoinStrictness::Any &&
+            table_join.kind == JoinKind::Inner)
         {
-            table_join.strictness = ASTTableJoin::Strictness::Semi;
-            table_join.kind = ASTTableJoin::Kind::Left;
+            table_join.strictness = JoinStrictness::Semi;
+            table_join.kind = JoinKind::Left;
         }
 
-        if (table_join.strictness == ASTTableJoin::Strictness::Any)
-            table_join.strictness = ASTTableJoin::Strictness::RightAny;
+        if (table_join.strictness == JoinStrictness::Any)
+            table_join.strictness = JoinStrictness::RightAny;
     }
     else
     {
-        if (table_join.strictness == ASTTableJoin::Strictness::Any && table_join.kind == ASTTableJoin::Kind::Full)
+        if (table_join.strictness == JoinStrictness::Any && table_join.kind == JoinKind::Full)
             throw Exception("ANY FULL JOINs are not implemented", ErrorCodes::NOT_IMPLEMENTED);
     }
 
@@ -720,7 +722,7 @@ void collectJoinedColumns(TableJoin & analyzed_join, ASTTableJoin & table_join,
     }
     else if (table_join.on_expression)
     {
-        bool is_asof = (table_join.strictness == ASTTableJoin::Strictness::Asof);
+        bool is_asof = (table_join.strictness == JoinStrictness::Asof);
 
         CollectJoinOnKeysVisitor::Data data{analyzed_join, tables[0], tables[1], aliases, is_asof};
         if (auto * or_func = table_join.on_expression->as<ASTFunction>(); or_func && or_func->name == "or")
@@ -964,12 +966,13 @@ void TreeRewriterResult::collectSourceColumns(bool add_special)
 /// Calculate which columns are required to execute the expression.
 /// Then, delete all other columns from the list of available columns.
 /// After execution, columns will only contain the list of columns needed to read from the table.
-void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select)
+void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select, bool visit_index_hint)
 {
     /// We calculate required_source_columns with source_columns modifications and swap them on exit
     required_source_columns = source_columns;
 
     RequiredSourceColumnsVisitor::Data columns_context;
+    columns_context.visit_index_hint = visit_index_hint;
     RequiredSourceColumnsVisitor(columns_context).visit(query);
 
     NameSet source_column_names;
@@ -1252,6 +1255,26 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     normalize(query, result.aliases, all_source_columns_set, select_options.ignore_alias, settings, /* allow_self_aliases = */ true, getContext());
 
+
+    if (getContext()->getSettingsRef().enable_positional_arguments)
+    {
+        if (select_query->groupBy())
+        {
+            for (auto & expr : select_query->groupBy()->children)
+                replaceForPositionalArguments(expr, select_query, ASTSelectQuery::Expression::GROUP_BY);
+        }
+        if (select_query->orderBy())
+        {
+            for (auto & expr : select_query->orderBy()->children)
+                replaceForPositionalArguments(expr, select_query, ASTSelectQuery::Expression::ORDER_BY);
+        }
+        if (select_query->limitBy())
+        {
+            for (auto & expr : select_query->limitBy()->children)
+                replaceForPositionalArguments(expr, select_query, ASTSelectQuery::Expression::LIMIT_BY);
+        }
+    }
+
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)
@@ -1286,7 +1309,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     result.aggregates = getAggregates(query, *select_query);
     result.window_function_asts = getWindowFunctions(query, *select_query);
     result.expressions_with_window_function = getExpressionsWithWindowFunctions(query);
-    result.collectUsedColumns(query, true);
+    result.collectUsedColumns(query, true, settings.query_plan_optimize_primary_key);
     result.required_source_columns_before_expanding_alias_columns = result.required_source_columns.getNames();
 
     /// rewrite filters for select query, must go after getArrayJoinedColumns
@@ -1310,7 +1333,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
             result.aggregates = getAggregates(query, *select_query);
             result.window_function_asts = getWindowFunctions(query, *select_query);
             result.expressions_with_window_function = getExpressionsWithWindowFunctions(query);
-            result.collectUsedColumns(query, true);
+            result.collectUsedColumns(query, true, settings.query_plan_optimize_primary_key);
         }
     }
 
@@ -1376,15 +1399,18 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     else
         assertNoAggregates(query, "in wrong place");
 
-    result.collectUsedColumns(query, false);
+    result.collectUsedColumns(query, false, settings.query_plan_optimize_primary_key);
     return std::make_shared<const TreeRewriterResult>(result);
 }
 
 void TreeRewriter::normalize(
     ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, bool ignore_alias, const Settings & settings, bool allow_self_aliases, ContextPtr context_)
 {
-    UserDefinedSQLFunctionVisitor::Data data_user_defined_functions_visitor;
-    UserDefinedSQLFunctionVisitor(data_user_defined_functions_visitor).visit(query);
+    if (!UserDefinedSQLFunctionFactory::instance().empty())
+    {
+        UserDefinedSQLFunctionVisitor::Data data_user_defined_functions_visitor;
+        UserDefinedSQLFunctionVisitor(data_user_defined_functions_visitor).visit(query);
+    }
 
     CustomizeCountDistinctVisitor::Data data_count_distinct{settings.count_distinct_implementation};
     CustomizeCountDistinctVisitor(data_count_distinct).visit(query);
diff --git a/src/Interpreters/TreeRewriter.h b/src/Interpreters/TreeRewriter.h
index b84756260a8..16ff7f8b6c3 100644
--- a/src/Interpreters/TreeRewriter.h
+++ b/src/Interpreters/TreeRewriter.h
@@ -88,7 +88,7 @@ struct TreeRewriterResult
         bool add_special = true);
 
     void collectSourceColumns(bool add_special);
-    void collectUsedColumns(const ASTPtr & query, bool is_select);
+    void collectUsedColumns(const ASTPtr & query, bool is_select, bool visit_index_hint);
     Names requiredSourceColumns() const { return required_source_columns.getNames(); }
     const Names & requiredSourceColumnsForAccessCheck() const { return required_source_columns_before_expanding_alias_columns; }
     NameSet getArrayJoinSourceNameSet() const;
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.cpp b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
index 698faac5fab..2f876f00cc3 100644
--- a/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
@@ -160,4 +160,9 @@ std::vector<std::string> UserDefinedSQLFunctionFactory::getAllRegisteredNames()
     return registered_names;
 }
 
+bool UserDefinedSQLFunctionFactory::empty() const
+{
+    std::lock_guard lock(mutex);
+    return function_name_to_create_query.empty();
+}
 }
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.h b/src/Interpreters/UserDefinedSQLFunctionFactory.h
index 63bf5d73c15..db43bb7298e 100644
--- a/src/Interpreters/UserDefinedSQLFunctionFactory.h
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.h
@@ -43,6 +43,9 @@ public:
     /// Get all user defined functions registered names.
     std::vector<String> getAllRegisteredNames() const override;
 
+    /// Check whether any UDFs have been registered
+    bool empty() const;
+
 private:
     std::unordered_map<String, ASTPtr> function_name_to_create_query;
     mutable std::mutex mutex;
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index 6394b1d5429..7a59aa9ac9b 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -85,6 +85,7 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
                 {"Multi",               static_cast<Int16>(Coordination::OpNum::Multi)},
                 {"Auth",                static_cast<Int16>(Coordination::OpNum::Auth)},
                 {"SessionID",           static_cast<Int16>(Coordination::OpNum::SessionID)},
+                {"FilteredList",        static_cast<Int16>(Coordination::OpNum::FilteredList)},
             });
 
     auto error_enum = getCoordinationErrorCodesEnumType();
@@ -121,6 +122,7 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
         {"address", DataTypeFactory::instance().get("IPv6")},
         {"port", std::make_shared<DataTypeUInt16>()},
         {"session_id", std::make_shared<DataTypeInt64>()},
+        {"duration_ms", std::make_shared<DataTypeUInt64>()},
 
         {"xid", std::make_shared<DataTypeInt32>()},
         {"has_watch", std::make_shared<DataTypeUInt8>()},
@@ -171,6 +173,7 @@ void ZooKeeperLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insertData(IPv6ToBinary(address.host()).data(), 16);
     columns[i++]->insert(address.port());
     columns[i++]->insert(session_id);
+    columns[i++]->insert(duration_ms);
 
     columns[i++]->insert(xid);
     columns[i++]->insert(has_watch);
diff --git a/src/Interpreters/ZooKeeperLog.h b/src/Interpreters/ZooKeeperLog.h
index 43cdebced2d..d79b75ec85f 100644
--- a/src/Interpreters/ZooKeeperLog.h
+++ b/src/Interpreters/ZooKeeperLog.h
@@ -27,6 +27,8 @@ struct ZooKeeperLogElement
     Poco::Net::SocketAddress address;
     Int64 session_id = 0;
 
+    UInt64 duration_ms = 0;
+
     /// Common request info
     Int32 xid = 0;
     bool has_watch = false;
diff --git a/src/Interpreters/addMissingDefaults.cpp b/src/Interpreters/addMissingDefaults.cpp
index 62cfa7f6f4e..3febcfc74a8 100644
--- a/src/Interpreters/addMissingDefaults.cpp
+++ b/src/Interpreters/addMissingDefaults.cpp
@@ -23,7 +23,7 @@ ActionsDAGPtr addMissingDefaults(
     bool null_as_default)
 {
     auto actions = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-    auto & index = actions->getIndex();
+    auto & index = actions->getOutputs();
 
     /// For missing columns of nested structure, you need to create not a column of empty arrays, but a column of arrays of correct lengths.
     /// First, remember the offset columns for all arrays in the block.
diff --git a/src/Interpreters/asof.h b/src/Interpreters/asof.h
deleted file mode 100644
index 439bf4cc58c..00000000000
--- a/src/Interpreters/asof.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-#include <string>
-
-namespace DB
-{
-namespace ASOF
-{
-
-enum class Inequality
-{
-    None = 0,
-    Less,
-    Greater,
-    LessOrEquals,
-    GreaterOrEquals,
-};
-
-inline Inequality getInequality(const std::string & func_name)
-{
-    Inequality inequality{Inequality::None};
-    if (func_name == "less")
-        inequality = Inequality::Less;
-    else if (func_name == "greater")
-        inequality = Inequality::Greater;
-    else if (func_name == "lessOrEquals")
-        inequality = Inequality::LessOrEquals;
-    else if (func_name == "greaterOrEquals")
-        inequality = Inequality::GreaterOrEquals;
-    return inequality;
-}
-
-inline Inequality reverseInequality(Inequality inequality)
-{
-    if (inequality == Inequality::Less)
-        return Inequality::Greater;
-    else if (inequality == Inequality::Greater)
-        return Inequality::Less;
-    else if (inequality == Inequality::LessOrEquals)
-        return Inequality::GreaterOrEquals;
-    else if (inequality == Inequality::GreaterOrEquals)
-        return Inequality::LessOrEquals;
-    return Inequality::None;
-}
-
-}
-}
diff --git a/src/Interpreters/examples/hash_map3.cpp b/src/Interpreters/examples/hash_map3.cpp
index a8673e06e9b..110dcab3f76 100644
--- a/src/Interpreters/examples/hash_map3.cpp
+++ b/src/Interpreters/examples/hash_map3.cpp
@@ -1,13 +1,9 @@
-#include <iostream>
-
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 
-
-#include <string.h>
-
+#include <iostream>
+#include <cstring>
 #include <cstdlib>
-
 #include <utility>
 
 #include <base/types.h>
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 387f4e892a1..7cc4efcb64d 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -12,9 +12,11 @@
 #include <Access/ContextAccess.h>
 #include <Common/Macros.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
+#include <Databases/DatabaseReplicated.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <Processors/Sinks/EmptySink.h>
 #include <QueryPipeline/Pipe.h>
 #include <filesystem>
@@ -181,10 +183,24 @@ public:
 private:
     static Strings getChildrenAllowNoNode(const std::shared_ptr<zkutil::ZooKeeper> & zookeeper, const String & node_path);
 
+    static Block getSampleBlock(ContextPtr context_, bool hosts_to_wait);
+
     Strings getNewAndUpdate(const Strings & current_list_of_finished_hosts);
 
     std::pair<String, UInt16> parseHostAndPort(const String & host_id) const;
 
+    Chunk generateChunkWithUnfinishedHosts() const;
+
+    enum ReplicatedDatabaseQueryStatus
+    {
+        /// Query is (successfully) finished
+        OK = 0,
+        /// Query is not finished yet, but replica is currently executing it
+        IN_PROGRESS = 1,
+        /// Replica is not available or busy with previous queries. It will process query asynchronously
+        QUEUED = 2,
+    };
+
     String node_path;
     ContextPtr context;
     Stopwatch watch;
@@ -200,7 +216,7 @@ private:
     std::unique_ptr<Exception> first_exception;
 
     Int64 timeout_seconds = 120;
-    bool by_hostname = true;
+    bool is_replicated_database = false;
     bool throw_on_timeout = true;
     bool timeout_exceeded = false;
 };
@@ -221,7 +237,7 @@ BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & en
     return io;
 }
 
-static Block getSampleBlock(ContextPtr context_, bool hosts_to_wait)
+Block DDLQueryStatusSource::getSampleBlock(ContextPtr context_, bool hosts_to_wait)
 {
     auto output_mode = context_->getSettingsRef().distributed_ddl_output_mode;
 
@@ -232,19 +248,38 @@ static Block getSampleBlock(ContextPtr context_, bool hosts_to_wait)
         return std::make_shared<DataTypeNullable>(type);
     };
 
-    Block res = Block{
-        {std::make_shared<DataTypeString>(),                         "host"},
-        {std::make_shared<DataTypeUInt16>(),                         "port"},
-        {maybe_make_nullable(std::make_shared<DataTypeInt64>()),     "status"},
-        {maybe_make_nullable(std::make_shared<DataTypeString>()),    "error"},
-        {std::make_shared<DataTypeUInt64>(),                         "num_hosts_remaining"},
-        {std::make_shared<DataTypeUInt64>(),                         "num_hosts_active"},
+    auto get_status_enum = []()
+    {
+        return std::make_shared<DataTypeEnum8>(
+            DataTypeEnum8::Values
+            {
+                {"OK",              static_cast<Int8>(OK)},
+                {"IN_PROGRESS",     static_cast<Int8>(IN_PROGRESS)},
+                {"QUEUED",          static_cast<Int8>(QUEUED)},
+            });
     };
 
     if (hosts_to_wait)
-        res.erase("port");
-
-    return res;
+    {
+        return Block{
+            {std::make_shared<DataTypeString>(), "shard"},
+            {std::make_shared<DataTypeString>(), "replica"},
+            {get_status_enum(), "status"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_remaining"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_active"},
+        };
+    }
+    else
+    {
+        return Block{
+            {std::make_shared<DataTypeString>(), "host"},
+            {std::make_shared<DataTypeUInt16>(), "port"},
+            {maybe_make_nullable(std::make_shared<DataTypeInt64>()), "status"},
+            {maybe_make_nullable(std::make_shared<DataTypeString>()), "error"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_remaining"},
+            {std::make_shared<DataTypeUInt64>(), "num_hosts_active"},
+        };
+    }
 }
 
 DDLQueryStatusSource::DDLQueryStatusSource(
@@ -261,7 +296,7 @@ DDLQueryStatusSource::DDLQueryStatusSource(
     if (hosts_to_wait)
     {
         waiting_hosts = NameSet(hosts_to_wait->begin(), hosts_to_wait->end());
-        by_hostname = false;
+        is_replicated_database = true;
     }
     else
     {
@@ -277,7 +312,7 @@ std::pair<String, UInt16> DDLQueryStatusSource::parseHostAndPort(const String &
 {
     String host = host_id;
     UInt16 port = 0;
-    if (by_hostname)
+    if (!is_replicated_database)
     {
         auto host_and_port = Cluster::Address::fromString(host_id);
         host = host_and_port.first;
@@ -286,6 +321,43 @@ std::pair<String, UInt16> DDLQueryStatusSource::parseHostAndPort(const String &
     return {host, port};
 }
 
+Chunk DDLQueryStatusSource::generateChunkWithUnfinishedHosts() const
+{
+    NameSet unfinished_hosts = waiting_hosts;
+    for (const auto & host_id : finished_hosts)
+        unfinished_hosts.erase(host_id);
+
+    NameSet active_hosts_set = NameSet{current_active_hosts.begin(), current_active_hosts.end()};
+
+    /// Query is not finished on the rest hosts, so fill the corresponding rows with NULLs.
+    MutableColumns columns = output.getHeader().cloneEmptyColumns();
+    for (const String & host_id : unfinished_hosts)
+    {
+        size_t num = 0;
+        if (is_replicated_database)
+        {
+            auto [shard, replica] = DatabaseReplicated::parseFullReplicaName(host_id);
+            columns[num++]->insert(shard);
+            columns[num++]->insert(replica);
+            if (active_hosts_set.contains(host_id))
+                columns[num++]->insert(IN_PROGRESS);
+            else
+                columns[num++]->insert(QUEUED);
+        }
+        else
+        {
+            auto [host, port] = parseHostAndPort(host_id);
+            columns[num++]->insert(host);
+            columns[num++]->insert(port);
+            columns[num++]->insert(Field{});
+            columns[num++]->insert(Field{});
+        }
+        columns[num++]->insert(unfinished_hosts.size());
+        columns[num++]->insert(current_active_hosts.size());
+    }
+    return Chunk(std::move(columns), unfinished_hosts.size());
+}
+
 Chunk DDLQueryStatusSource::generate()
 {
     bool all_hosts_finished = num_hosts_finished >= waiting_hosts.size();
@@ -296,6 +368,10 @@ Chunk DDLQueryStatusSource::generate()
     if (all_hosts_finished || timeout_exceeded)
         return {};
 
+    String node_to_wait = "finished";
+    if (is_replicated_database && context->getSettingsRef().database_replicated_enforce_synchronous_settings)
+        node_to_wait = "synced";
+
     auto zookeeper = context->getZooKeeper();
     size_t try_number = 0;
 
@@ -320,30 +396,16 @@ Chunk DDLQueryStatusSource::generate()
                     first_exception = std::make_unique<Exception>(
                         fmt::format(msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts),
                         ErrorCodes::TIMEOUT_EXCEEDED);
+
+                /// For Replicated database print a list of unfinished hosts as well. Will return empty block on next iteration.
+                if (is_replicated_database)
+                    return generateChunkWithUnfinishedHosts();
                 return {};
             }
 
             LOG_INFO(log, msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts);
 
-            NameSet unfinished_hosts = waiting_hosts;
-            for (const auto & host_id : finished_hosts)
-                unfinished_hosts.erase(host_id);
-
-            /// Query is not finished on the rest hosts, so fill the corresponding rows with NULLs.
-            MutableColumns columns = output.getHeader().cloneEmptyColumns();
-            for (const String & host_id : unfinished_hosts)
-            {
-                auto [host, port] = parseHostAndPort(host_id);
-                size_t num = 0;
-                columns[num++]->insert(host);
-                if (by_hostname)
-                    columns[num++]->insert(port);
-                columns[num++]->insert(Field{});
-                columns[num++]->insert(Field{});
-                columns[num++]->insert(num_unfinished_hosts);
-                columns[num++]->insert(num_active_hosts);
-            }
-            return Chunk(std::move(columns), unfinished_hosts.size());
+            return generateChunkWithUnfinishedHosts();
         }
 
         if (num_hosts_finished != 0 || try_number != 0)
@@ -365,7 +427,7 @@ Chunk DDLQueryStatusSource::generate()
             return {};
         }
 
-        Strings new_hosts = getNewAndUpdate(getChildrenAllowNoNode(zookeeper, fs::path(node_path) / "finished"));
+        Strings new_hosts = getNewAndUpdate(getChildrenAllowNoNode(zookeeper, fs::path(node_path) / node_to_wait));
         ++try_number;
         if (new_hosts.empty())
             continue;
@@ -376,17 +438,27 @@ Chunk DDLQueryStatusSource::generate()
         for (const String & host_id : new_hosts)
         {
             ExecutionStatus status(-1, "Cannot obtain error message");
+
+            if (node_to_wait == "finished")
             {
                 String status_data;
                 if (zookeeper->tryGet(fs::path(node_path) / "finished" / host_id, status_data))
                     status.tryDeserializeText(status_data);
             }
+            else
+            {
+                status = ExecutionStatus{0};
+            }
 
-            auto [host, port] = parseHostAndPort(host_id);
 
             if (status.code != 0 && !first_exception
                 && context->getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW)
             {
+                /// Replicated database retries in case of error, it should not write error status.
+                if (is_replicated_database)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "There was an error on {}: {} (probably it's a bug)", host_id, status.message);
+
+                auto [host, port] = parseHostAndPort(host_id);
                 first_exception = std::make_unique<Exception>(
                     fmt::format("There was an error on [{}:{}]: {}", host, port, status.message), status.code);
             }
@@ -394,11 +466,23 @@ Chunk DDLQueryStatusSource::generate()
             ++num_hosts_finished;
 
             size_t num = 0;
-            columns[num++]->insert(host);
-            if (by_hostname)
+            if (is_replicated_database)
+            {
+                if (status.code != 0)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "There was an error on {}: {} (probably it's a bug)", host_id, status.message);
+                auto [shard, replica] = DatabaseReplicated::parseFullReplicaName(host_id);
+                columns[num++]->insert(shard);
+                columns[num++]->insert(replica);
+                columns[num++]->insert(OK);
+            }
+            else
+            {
+                auto [host, port] = parseHostAndPort(host_id);
+                columns[num++]->insert(host);
                 columns[num++]->insert(port);
-            columns[num++]->insert(status.code);
-            columns[num++]->insert(status.message);
+                columns[num++]->insert(status.code);
+                columns[num++]->insert(status.message);
+            }
             columns[num++]->insert(waiting_hosts.size() - num_hosts_finished);
             columns[num++]->insert(current_active_hosts.size());
         }
@@ -464,4 +548,26 @@ Strings DDLQueryStatusSource::getNewAndUpdate(const Strings & current_list_of_fi
 }
 
 
+bool maybeRemoveOnCluster(const ASTPtr & query_ptr, ContextPtr context)
+{
+    const auto * query = dynamic_cast<const ASTQueryWithTableAndOutput *>(query_ptr.get());
+    if (!query || !query->table)
+        return false;
+
+    String database_name = query->getDatabase();
+    if (database_name.empty())
+        database_name = context->getCurrentDatabase();
+
+    auto * query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query_ptr.get());
+    if (database_name != query_on_cluster->cluster)
+        return false;
+
+    auto db = DatabaseCatalog::instance().tryGetDatabase(database_name);
+    if (!db || db->getEngineName() != "Replicated")
+        return false;
+
+    query_on_cluster->cluster.clear();
+    return true;
+}
+
 }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index 3004fe2ff2e..8df199f0ede 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -45,4 +45,6 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, c
 BlockIO getDistributedDDLStatus(
     const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait = {});
 
+bool maybeRemoveOnCluster(const ASTPtr & query_ptr, ContextPtr context);
+
 }
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 7c0a95e5fcc..cdddd28adeb 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -864,11 +864,6 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.event_time_microseconds = time_in_microseconds(finish_time);
                 status_info_to_query_log(elem, info, ast, context);
 
-                auto progress_callback = context->getProgressCallback();
-
-                if (progress_callback)
-                    progress_callback(Progress(WriteProgress(info.written_rows, info.written_bytes)));
-
                 if (pulling_pipeline)
                 {
                     query_pipeline.tryGetResultRowsAndBytes(elem.result_rows, elem.result_bytes);
@@ -880,6 +875,14 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     elem.result_bytes = progress_out.written_bytes;
                 }
 
+                auto progress_callback = context->getProgressCallback();
+                if (progress_callback)
+                {
+                    Progress p(WriteProgress{info.written_rows, info.written_bytes});
+                    p.incrementPiecewiseAtomically(Progress{ResultProgress{elem.result_rows, elem.result_bytes}});
+                    progress_callback(p);
+                }
+
                 if (elem.read_rows != 0)
                 {
                     LOG_INFO(&Poco::Logger::get("executeQuery"), "Read {} rows, {} in {} sec., {} rows/sec., {}/sec.",
@@ -921,12 +924,21 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                             processor_elem.id = get_proc_id(*processor);
                             processor_elem.parent_ids = std::move(parents);
 
+                            processor_elem.plan_step = reinterpret_cast<std::uintptr_t>(processor->getQueryPlanStep());
+                            processor_elem.plan_group = processor->getQueryPlanStepGroup();
+
                             processor_elem.processor_name = processor->getName();
 
                             processor_elem.elapsed_us = processor->getElapsedUs();
                             processor_elem.input_wait_elapsed_us = processor->getInputWaitElapsedUs();
                             processor_elem.output_wait_elapsed_us = processor->getOutputWaitElapsedUs();
 
+                            auto stats = processor->getProcessorDataStats();
+                            processor_elem.input_rows = stats.input_rows;
+                            processor_elem.input_bytes = stats.input_bytes;
+                            processor_elem.output_rows = stats.output_rows;
+                            processor_elem.output_bytes = stats.output_bytes;
+
                             processors_profile_log->add(processor_elem);
                         }
                     }
diff --git a/src/Interpreters/joinDispatch.h b/src/Interpreters/joinDispatch.h
index a9de8206b65..ca2fcd27cda 100644
--- a/src/Interpreters/joinDispatch.h
+++ b/src/Interpreters/joinDispatch.h
@@ -12,58 +12,57 @@
 namespace DB
 {
 
-template <ASTTableJoin::Kind kind, typename ASTTableJoin::Strictness>
+template <JoinKind kind, JoinStrictness join_strictness>
 struct MapGetter;
 
-template <> struct MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::RightAny>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Inner, ASTTableJoin::Strictness::RightAny> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Right, ASTTableJoin::Strictness::RightAny> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
-template <> struct MapGetter<ASTTableJoin::Kind::Full, ASTTableJoin::Strictness::RightAny>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::RightAny>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::RightAny> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::RightAny> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::RightAny>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
 
-template <> struct MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Inner, ASTTableJoin::Strictness::Any> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
-template <> struct MapGetter<ASTTableJoin::Kind::Right, ASTTableJoin::Strictness::Any> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <> struct MapGetter<ASTTableJoin::Kind::Full, ASTTableJoin::Strictness::Any>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::Any>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Any> { using Map = HashJoin::MapsOne; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::Any> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::Any>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
 
-template <> struct MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::All>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Inner, ASTTableJoin::Strictness::All> { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Right, ASTTableJoin::Strictness::All> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <> struct MapGetter<ASTTableJoin::Kind::Full, ASTTableJoin::Strictness::All>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::All>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::All> { using Map = HashJoin::MapsAll; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::All> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::All>  { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
 
 /// Only SEMI LEFT and SEMI RIGHT are valid. INNER and FULL are here for templates instantiation.
-template <> struct MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Semi>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Inner, ASTTableJoin::Strictness::Semi> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Right, ASTTableJoin::Strictness::Semi> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <> struct MapGetter<ASTTableJoin::Kind::Full, ASTTableJoin::Strictness::Semi>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::Semi>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Semi> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::Semi> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::Semi>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
 
 /// Only SEMI LEFT and SEMI RIGHT are valid. INNER and FULL are here for templates instantiation.
-template <> struct MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Anti>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Inner, ASTTableJoin::Strictness::Anti> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
-template <> struct MapGetter<ASTTableJoin::Kind::Right, ASTTableJoin::Strictness::Anti> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
-template <> struct MapGetter<ASTTableJoin::Kind::Full, ASTTableJoin::Strictness::Anti>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Left, JoinStrictness::Anti>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Inner, JoinStrictness::Anti> { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
+template <> struct MapGetter<JoinKind::Right, JoinStrictness::Anti> { using Map = HashJoin::MapsAll; static constexpr bool flagged = true; };
+template <> struct MapGetter<JoinKind::Full, JoinStrictness::Anti>  { using Map = HashJoin::MapsOne; static constexpr bool flagged = false; };
 
-template <ASTTableJoin::Kind kind>
-struct MapGetter<kind, ASTTableJoin::Strictness::Asof> { using Map = HashJoin::MapsAsof; static constexpr bool flagged = false; };
+template <JoinKind kind>
+struct MapGetter<kind, JoinStrictness::Asof> { using Map = HashJoin::MapsAsof; static constexpr bool flagged = false; };
 
-
-static constexpr std::array<ASTTableJoin::Strictness, 6> STRICTNESSES = {
-    ASTTableJoin::Strictness::RightAny,
-    ASTTableJoin::Strictness::Any,
-    ASTTableJoin::Strictness::All,
-    ASTTableJoin::Strictness::Asof,
-    ASTTableJoin::Strictness::Semi,
-    ASTTableJoin::Strictness::Anti,
+static constexpr std::array<JoinStrictness, 6> STRICTNESSES = {
+    JoinStrictness::RightAny,
+    JoinStrictness::Any,
+    JoinStrictness::All,
+    JoinStrictness::Asof,
+    JoinStrictness::Semi,
+    JoinStrictness::Anti,
 };
 
-static constexpr std::array<ASTTableJoin::Kind, 4> KINDS = {
-    ASTTableJoin::Kind::Left,
-    ASTTableJoin::Kind::Inner,
-    ASTTableJoin::Kind::Full,
-    ASTTableJoin::Kind::Right
+static constexpr std::array<JoinKind, 4> KINDS = {
+    JoinKind::Left,
+    JoinKind::Inner,
+    JoinKind::Full,
+    JoinKind::Right
 };
 
 /// Init specified join map
-inline bool joinDispatchInit(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness, HashJoin::MapsVariant & maps)
+inline bool joinDispatchInit(JoinKind kind, JoinStrictness strictness, HashJoin::MapsVariant & maps)
 {
     return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
     {
@@ -80,7 +79,7 @@ inline bool joinDispatchInit(ASTTableJoin::Kind kind, ASTTableJoin::Strictness s
 
 /// Call function on specified join map
 template <typename MapsVariant, typename Func>
-inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness, MapsVariant & maps, Func && func)
+inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, MapsVariant & maps, Func && func)
 {
     return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
     {
@@ -91,8 +90,8 @@ inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness stric
         if (kind == KINDS[i] && strictness == STRICTNESSES[j])
         {
             func(
-                std::integral_constant<ASTTableJoin::Kind, KINDS[i]>(),
-                std::integral_constant<ASTTableJoin::Strictness, STRICTNESSES[j]>(),
+                std::integral_constant<JoinKind, KINDS[i]>(),
+                std::integral_constant<JoinStrictness, STRICTNESSES[j]>(),
                 std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps));
             return true;
         }
@@ -102,7 +101,7 @@ inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness stric
 
 /// Call function on specified join map
 template <typename MapsVariant, typename Func>
-inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness, std::vector<const MapsVariant *> & mapsv, Func && func)
+inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, std::vector<const MapsVariant *> & mapsv, Func && func)
 {
     return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
     {
@@ -120,8 +119,8 @@ inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness stric
             }
 
             func(
-                std::integral_constant<ASTTableJoin::Kind, KINDS[i]>(),
-                std::integral_constant<ASTTableJoin::Strictness, STRICTNESSES[j]>(),
+                std::integral_constant<JoinKind, KINDS[i]>(),
+                std::integral_constant<JoinStrictness, STRICTNESSES[j]>(),
                 v
                 /*std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps)*/);
             return true;
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 15d4f7929f8..7d79e2b0224 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -1,7 +1,5 @@
 #include <Common/ThreadPool.h>
 
-#include <Poco/DirectoryIterator.h>
-
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/parseQuery.h>
@@ -13,6 +11,7 @@
 
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/TablesLoader.h>
+#include <Storages/StorageMaterializedView.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
@@ -38,6 +37,7 @@ static void executeCreateQuery(
     ContextMutablePtr context,
     const String & database,
     const String & file_name,
+    bool create,
     bool has_force_restore_data_flag)
 {
     ParserCreateQuery parser;
@@ -49,8 +49,11 @@ static void executeCreateQuery(
 
     InterpreterCreateQuery interpreter(ast, context);
     interpreter.setInternal(true);
-    interpreter.setForceAttach(true);
-    interpreter.setForceRestoreData(has_force_restore_data_flag);
+    if (!create)
+    {
+        interpreter.setForceAttach(true);
+        interpreter.setForceRestoreData(has_force_restore_data_flag);
+    }
     interpreter.setLoadDatabaseWithoutTables(true);
     interpreter.execute();
 }
@@ -86,7 +89,7 @@ static void loadDatabase(
 
     try
     {
-        executeCreateQuery(database_attach_query, context, database, database_metadata_file, force_restore_data);
+        executeCreateQuery(database_attach_query, context, database, database_metadata_file, /* create */ true, force_restore_data);
     }
     catch (Exception & e)
     {
@@ -173,7 +176,8 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
         loaded_databases.insert({name, DatabaseCatalog::instance().getDatabase(name)});
     }
 
-    TablesLoader loader{context, std::move(loaded_databases), has_force_restore_data_flag, /* force_attach */ true};
+    auto mode = getLoadingStrictnessLevel(/* attach */ true, /* force_attach */ true, has_force_restore_data_flag);
+    TablesLoader loader{context, std::move(loaded_databases), mode};
     loader.loadTables();
     loader.startupTables();
 
@@ -207,21 +211,16 @@ static void loadSystemDatabaseImpl(ContextMutablePtr context, const String & dat
         database_create_query += database_name;
         database_create_query += " ENGINE=";
         database_create_query += default_engine;
-        executeCreateQuery(database_create_query, context, database_name, "<no file>", true);
+        executeCreateQuery(database_create_query, context, database_name, "<no file>", true, true);
     }
 }
 
-static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const DatabasePtr & database)
+static void convertOrdinaryDatabaseToAtomic(Poco::Logger * log, ContextMutablePtr context, const DatabasePtr & database,
+                                            const String & name, const String tmp_name)
 {
     /// It's kind of C++ script that creates temporary database with Atomic engine,
     /// moves all tables to it, drops old database and then renames new one to old name.
 
-    Poco::Logger * log = &Poco::Logger::get("loadMetadata");
-
-    String name = database->getDatabaseName();
-
-    String tmp_name = fmt::format(".tmp_convert.{}.{}", name, thread_local_rng());
-
     String name_quoted = backQuoteIfNeed(name);
     String tmp_name_quoted = backQuoteIfNeed(tmp_name);
 
@@ -235,19 +234,34 @@ static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Dat
     assert(tmp_database->getEngineName() == "Atomic");
 
     size_t num_tables = 0;
+    std::unordered_set<String> inner_mv_tables;
     for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
     {
         ++num_tables;
         auto id = iterator->table()->getStorageID();
         id.database_name = tmp_name;
+        /// We need some uuid for checkTableCanBeRenamed
+        id.uuid = UUIDHelpers::generateV4();
         iterator->table()->checkTableCanBeRenamed(id);
+        if (const auto * mv = dynamic_cast<const StorageMaterializedView *>(iterator->table().get()))
+        {
+            /// We should not rename inner tables of MVs, because MVs are responsible for renaming it...
+            if (mv->hasInnerTable())
+                inner_mv_tables.emplace(mv->getTargetTable()->getStorageID().table_name);
+        }
     }
 
-    LOG_INFO(log, "Will move {} tables to {}", num_tables, tmp_name_quoted);
+    LOG_INFO(log, "Will move {} tables to {} (including {} inner tables of MVs)", num_tables, tmp_name_quoted, inner_mv_tables.size());
 
     for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
     {
         auto id = iterator->table()->getStorageID();
+        if (inner_mv_tables.contains(id.table_name))
+        {
+            LOG_DEBUG(log, "Do not rename {}, because it will be renamed together with MV", id.getNameForLogs());
+            continue;
+        }
+
         String qualified_quoted_name = id.getFullTableName();
         id.database_name = tmp_name;
         String tmp_qualified_quoted_name = id.getFullTableName();
@@ -264,6 +278,7 @@ static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Dat
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Database {} is not empty after moving tables", name_quoted);
 
     String drop_query = fmt::format("DROP DATABASE {}", name_quoted);
+    context->setSetting("force_remove_data_recursively_on_drop", false);
     res = executeQuery(drop_query, context, true);
     executeTrivialBlockIO(res, context);
     res = {};
@@ -275,31 +290,54 @@ static void convertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Dat
     LOG_INFO(log, "Finished database engine conversion of {}", name_quoted);
 }
 
-void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const DatabasePtr & database)
+/// Converts database with Ordinary engine to Atomic. Does nothing if database is not Ordinary.
+/// Can be called only during server startup when there are no queries from users.
+static void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const String & database_name, bool tables_started)
 {
+    Poco::Logger * log = &Poco::Logger::get("loadMetadata");
+
+    auto database = DatabaseCatalog::instance().getDatabase(database_name);
+    if (!database)
+    {
+        LOG_WARNING(log, "Database {} not found (while trying to convert it from Ordinary to Atomic)", database_name);
+        return;
+    }
+
     if (database->getEngineName() != "Ordinary")
         return;
 
-    if (context->getSettingsRef().allow_deprecated_database_ordinary)
-        return;
+    Strings permanently_detached_tables = database->getNamesOfPermanentlyDetachedTables();
+    if (!permanently_detached_tables.empty())
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot automatically convert database {} from Ordinary to Atomic, "
+                        "because it contains permanently detached tables ({}) that were not loaded during startup. "
+                        "Attach these tables, so server will load and convert them",
+                        database_name, fmt::join(permanently_detached_tables, ", "));
+    }
+
+    String tmp_name = fmt::format(".tmp_convert.{}.{}", database_name, thread_local_rng());
 
     try
     {
-        /// It's not quite correct to run DDL queries while database is not started up.
-        startupSystemTables();
+        if (!tables_started)
+        {
+            /// It's not quite correct to run DDL queries while database is not started up.
+            ThreadPool pool;
+            DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, LoadingStrictnessLevel::FORCE_RESTORE);
+        }
 
         auto local_context = Context::createCopy(context);
         local_context->setSetting("check_table_dependencies", false);
-        convertOrdinaryDatabaseToAtomic(local_context, database);
+        convertOrdinaryDatabaseToAtomic(log, local_context, database, database_name, tmp_name);
 
-        auto new_database = DatabaseCatalog::instance().getDatabase(DatabaseCatalog::SYSTEM_DATABASE);
+        auto new_database = DatabaseCatalog::instance().getDatabase(database_name);
         UUID db_uuid = new_database->getUUID();
         std::vector<UUID> tables_uuids;
         for (auto iterator = new_database->getTablesIterator(context); iterator->isValid(); iterator->next())
             tables_uuids.push_back(iterator->uuid());
 
         /// Reload database just in case (and update logger name)
-        String detach_query = fmt::format("DETACH DATABASE {}", backQuoteIfNeed(DatabaseCatalog::SYSTEM_DATABASE));
+        String detach_query = fmt::format("DETACH DATABASE {}", backQuoteIfNeed(database_name));
         auto res = executeQuery(detach_query, context, true);
         executeTrivialBlockIO(res, context);
         res = {};
@@ -310,28 +348,59 @@ void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const Datab
         for (const auto & uuid : tables_uuids)
             DatabaseCatalog::instance().removeUUIDMappingFinally(uuid);
 
-        loadSystemDatabaseImpl(context, DatabaseCatalog::SYSTEM_DATABASE, "Atomic");
+        String path = context->getPath() + "metadata/" + escapeForFileName(database_name);
+        /// force_restore_data is needed to re-create metadata symlinks
+        loadDatabase(context, database_name, path, /* force_restore_data */ true);
+
         TablesLoader::Databases databases =
         {
-            {DatabaseCatalog::SYSTEM_DATABASE, DatabaseCatalog::instance().getSystemDatabase()},
+            {database_name, DatabaseCatalog::instance().getDatabase(database_name)},
         };
-        TablesLoader loader{context, databases, /* force_restore */ true, /* force_attach */ true};
+        TablesLoader loader{context, databases, LoadingStrictnessLevel::FORCE_RESTORE};
         loader.loadTables();
 
-        /// Will startup tables usual way
+        /// Startup tables if they were started before conversion and detach/attach
+        if (tables_started)
+            loader.startupTables();
     }
     catch (Exception & e)
     {
-        e.addMessage("While trying to convert {} to Atomic", database->getDatabaseName());
+        e.addMessage("Exception while trying to convert database {} from Ordinary to Atomic. It may be in some intermediate state."
+            "You can finish conversion manually by moving the rest tables from {} to {} (using RENAME TABLE)"
+            "and executing DROP DATABASE {} and RENAME DATABASE {} TO {}.",
+            database_name, database_name, tmp_name, database_name, tmp_name, database_name);
         throw;
     }
 }
 
+void maybeConvertSystemDatabase(ContextMutablePtr context)
+{
+    /// TODO remove this check, convert system database unconditionally
+    if (context->getSettingsRef().allow_deprecated_database_ordinary)
+        return;
+
+    maybeConvertOrdinaryDatabaseToAtomic(context, DatabaseCatalog::SYSTEM_DATABASE, /* tables_started */ false);
+}
+
+void convertDatabasesEnginesIfNeed(ContextMutablePtr context)
+{
+    auto convert_flag_path = fs::path(context->getFlagsPath()) / "convert_ordinary_to_atomic";
+    if (!fs::exists(convert_flag_path))
+        return;
+
+    LOG_INFO(&Poco::Logger::get("loadMetadata"), "Found convert_ordinary_to_atomic file in flags directory, "
+                                                 "will try to convert all Ordinary databases to Atomic");
+    fs::remove(convert_flag_path);
+
+    for (const auto & [name, _] : DatabaseCatalog::instance().getDatabases())
+        if (name != DatabaseCatalog::SYSTEM_DATABASE)
+            maybeConvertOrdinaryDatabaseToAtomic(context, name, /* tables_started */ true);
+}
 
 void startupSystemTables()
 {
     ThreadPool pool;
-    DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, /* force_restore */ true, /* force_attach */ true);
+    DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, LoadingStrictnessLevel::FORCE_RESTORE);
 }
 
 void loadMetadataSystem(ContextMutablePtr context)
@@ -346,7 +415,7 @@ void loadMetadataSystem(ContextMutablePtr context)
         {DatabaseCatalog::INFORMATION_SCHEMA, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA)},
         {DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE)},
     };
-    TablesLoader loader{context, databases, /* force_restore */ true, /* force_attach */ true};
+    TablesLoader loader{context, databases, LoadingStrictnessLevel::FORCE_RESTORE};
     loader.loadTables();
     /// Will startup tables in system database after all databases are loaded.
 }
diff --git a/src/Interpreters/loadMetadata.h b/src/Interpreters/loadMetadata.h
index 8dc332defc5..b229a2b4c31 100644
--- a/src/Interpreters/loadMetadata.h
+++ b/src/Interpreters/loadMetadata.h
@@ -19,8 +19,10 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
 /// so we startup system tables after all databases are loaded.
 void startupSystemTables();
 
-/// Converts database with Ordinary engine to Atomic. Does nothing if database is not Ordinary.
-/// Can be called only during server startup when there are no queries from users.
-void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const DatabasePtr & database);
+/// Converts `system` database from Ordinary to Atomic (if needed)
+void maybeConvertSystemDatabase(ContextMutablePtr context);
+
+/// Converts all databases (except system) from Ordinary to Atomic if convert_ordinary_to_atomic flag exists
+void convertDatabasesEnginesIfNeed(ContextMutablePtr context);
 
 }
diff --git a/src/TableFunctions/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
similarity index 86%
rename from src/TableFunctions/parseColumnsListForTableFunction.cpp
rename to src/Interpreters/parseColumnsListForTableFunction.cpp
index d9ae92b067a..ed270c2118b 100644
--- a/src/TableFunctions/parseColumnsListForTableFunction.cpp
+++ b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/parseQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/Context.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 
 namespace DB
@@ -44,8 +44,15 @@ bool tryParseColumnsListFromString(const std::string & structure, ColumnsDescrip
     if (!columns_list)
         return false;
 
-    columns = InterpreterCreateQuery::getColumnsDescription(*columns_list, context, false);
-    return true;
+    try
+    {
+        columns = InterpreterCreateQuery::getColumnsDescription(*columns_list, context, false);
+        return true;
+    }
+    catch (...)
+    {
+        return false;
+    }
 }
 
 }
diff --git a/src/TableFunctions/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
similarity index 100%
rename from src/TableFunctions/parseColumnsListForTableFunction.h
rename to src/Interpreters/parseColumnsListForTableFunction.h
diff --git a/src/Interpreters/replaceForPositionalArguments.cpp b/src/Interpreters/replaceForPositionalArguments.cpp
new file mode 100644
index 00000000000..410cc5bb10c
--- /dev/null
+++ b/src/Interpreters/replaceForPositionalArguments.cpp
@@ -0,0 +1,83 @@
+#include <Interpreters/replaceForPositionalArguments.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+bool replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
+{
+    auto columns = select_query->select()->children;
+
+    const auto * expr_with_alias = dynamic_cast<const ASTWithAlias *>(argument.get());
+
+    if (expr_with_alias && !expr_with_alias->alias.empty())
+        return false;
+
+    const auto * ast_literal = typeid_cast<const ASTLiteral *>(argument.get());
+    if (!ast_literal)
+        return false;
+
+    auto which = ast_literal->value.getType();
+    if (which != Field::Types::UInt64)
+        return false;
+
+    auto pos = ast_literal->value.get<UInt64>();
+    if (!pos || pos > columns.size())
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Positional argument out of bounds: {} (exprected in range [1, {}]",
+                        pos, columns.size());
+
+    const auto & column = columns[--pos];
+    if (typeid_cast<const ASTIdentifier *>(column.get()) || typeid_cast<const ASTLiteral *>(column.get()))
+    {
+        argument = column->clone();
+    }
+    else if (typeid_cast<const ASTFunction *>(column.get()))
+    {
+        std::function<void(ASTPtr)> throw_if_aggregate_function = [&](ASTPtr node)
+        {
+            if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
+            {
+                auto is_aggregate_function = AggregateUtils::isAggregateFunction(*function);
+                if (is_aggregate_function)
+                {
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                    "Illegal value (aggregate function) for positional argument in {}",
+                                    ASTSelectQuery::expressionToString(expression));
+                }
+                else
+                {
+                    if (function->arguments)
+                    {
+                        for (const auto & arg : function->arguments->children)
+                            throw_if_aggregate_function(arg);
+                    }
+                }
+            }
+        };
+
+        if (expression == ASTSelectQuery::Expression::GROUP_BY)
+            throw_if_aggregate_function(column);
+
+        argument = column->clone();
+    }
+    else
+    {
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Illegal value for positional argument in {}",
+                        ASTSelectQuery::expressionToString(expression));
+    }
+
+    return true;
+}
+
+}
diff --git a/src/Interpreters/replaceForPositionalArguments.h b/src/Interpreters/replaceForPositionalArguments.h
new file mode 100644
index 00000000000..9e238ba32d3
--- /dev/null
+++ b/src/Interpreters/replaceForPositionalArguments.h
@@ -0,0 +1,9 @@
+#pragma once
+#include <Parsers/ASTSelectQuery.h>
+
+namespace DB
+{
+
+bool replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression);
+
+}
diff --git a/src/Loggers/Loggers.cpp b/src/Loggers/Loggers.cpp
index 70205998bb5..dec6bcd51c7 100644
--- a/src/Loggers/Loggers.cpp
+++ b/src/Loggers/Loggers.cpp
@@ -97,7 +97,12 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
         log_file->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, log_file);
         log->setLevel(log_level);
@@ -133,7 +138,12 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         error_log_file->setProperty(Poco::FileChannel::PROP_FLUSH, config.getRawString("logger.flush", "true"));
         error_log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> errorlog = new DB::OwnFormattingChannel(pf, error_log_file);
         errorlog->setLevel(errorlog_level);
@@ -172,7 +182,12 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         }
         syslog_channel->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, syslog_channel);
         log->setLevel(syslog_level);
@@ -195,7 +210,11 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
             max_log_level = console_log_level;
         }
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(color_enabled);
+        Poco::AutoPtr<OwnPatternFormatter> pf;
+        if (config.getString("logger.formatting", "") == "json")
+            pf = new OwnJSONPatternFormatter;
+        else
+            pf = new OwnPatternFormatter(color_enabled);
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel);
         log->setLevel(console_log_level);
         split->addChannel(log, "console");
diff --git a/src/Loggers/OwnFormattingChannel.h b/src/Loggers/OwnFormattingChannel.h
index 0480d0d5061..da7cde315f9 100644
--- a/src/Loggers/OwnFormattingChannel.h
+++ b/src/Loggers/OwnFormattingChannel.h
@@ -4,6 +4,7 @@
 #include <Poco/Channel.h>
 #include <Poco/FormattingChannel.h>
 #include "ExtendedLogChannel.h"
+#include "OwnJSONPatternFormatter.h"
 #include "OwnPatternFormatter.h"
 
 
@@ -38,6 +39,12 @@ public:
             pChannel->close();
     }
 
+    void setProperty(const std::string& name, const std::string& value) override
+    {
+        if (pChannel)
+            pChannel->setProperty(name, value);
+    }
+
     void log(const Poco::Message & msg) override;
     void logExtended(const ExtendedLogMessage & msg) override;
 
diff --git a/src/Loggers/OwnJSONPatternFormatter.cpp b/src/Loggers/OwnJSONPatternFormatter.cpp
new file mode 100644
index 00000000000..d12506e2451
--- /dev/null
+++ b/src/Loggers/OwnJSONPatternFormatter.cpp
@@ -0,0 +1,104 @@
+#include "OwnJSONPatternFormatter.h"
+
+#include <functional>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Interpreters/InternalTextLogsQueue.h>
+#include <base/terminalColors.h>
+#include <Common/CurrentThread.h>
+#include <Common/HashTable/Hash.h>
+
+OwnJSONPatternFormatter::OwnJSONPatternFormatter() : OwnPatternFormatter("")
+{
+}
+
+
+void OwnJSONPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const
+{
+    DB::WriteBufferFromString wb(text);
+
+    DB::FormatSettings settings;
+
+    const Poco::Message & msg = msg_ext.base;
+    DB::writeChar('{', wb);
+
+    writeJSONString("date_time", wb, settings);
+    DB::writeChar(':', wb);
+
+    DB::writeChar('\"', wb);
+    /// Change delimiters in date for compatibility with old logs.
+    writeDateTimeUnixTimestamp(msg_ext.time_seconds, 0, wb);
+    DB::writeChar('.', wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 100000) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 10000) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 1000) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 100) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 10) % 10), wb);
+    DB::writeChar('0' + ((msg_ext.time_microseconds / 1) % 10), wb);
+    DB::writeChar('\"', wb);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("thread_name", wb, settings);
+    DB::writeChar(':', wb);
+
+    writeJSONString(msg.getThread(), wb, settings);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("thread_id", wb, settings);
+    DB::writeChar(':', wb);
+    DB::writeChar('\"', wb);
+    DB::writeIntText(msg_ext.thread_id, wb);
+    DB::writeChar('\"', wb);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("level", wb, settings);
+    DB::writeChar(':', wb);
+    int priority = static_cast<int>(msg.getPriority());
+    writeJSONString(std::to_string(priority), wb, settings);
+    DB::writeChar(',', wb);
+
+    /// We write query_id even in case when it is empty (no query context)
+    /// just to be convenient for various log parsers.
+
+    writeJSONString("query_id", wb, settings);
+    DB::writeChar(':', wb);
+    writeJSONString(msg_ext.query_id, wb, settings);
+
+    DB::writeChar(',', wb);
+
+    writeJSONString("logger_name", wb, settings);
+    DB::writeChar(':', wb);
+
+    writeJSONString(msg.getSource(), wb, settings);
+    DB::writeChar(',', wb);
+
+    writeJSONString("message", wb, settings);
+    DB::writeChar(':', wb);
+    writeJSONString(msg.getText(), wb, settings);
+    DB::writeChar(',', wb);
+
+    writeJSONString("source_file", wb, settings);
+    DB::writeChar(':', wb);
+    const char * source_file = msg.getSourceFile();
+    if (source_file != nullptr)
+        writeJSONString(source_file, wb, settings);
+    else
+        writeJSONString("", wb, settings);
+    DB::writeChar(',', wb);
+
+    writeJSONString("source_line", wb, settings);
+    DB::writeChar(':', wb);
+    DB::writeChar('\"', wb);
+    DB::writeIntText(msg.getSourceLine(), wb);
+    DB::writeChar('\"', wb);
+
+    DB::writeChar('}', wb);
+}
+
+void OwnJSONPatternFormatter::format(const Poco::Message & msg, std::string & text)
+{
+    formatExtended(DB::ExtendedLogMessage::getFrom(msg), text);
+}
diff --git a/src/Loggers/OwnJSONPatternFormatter.h b/src/Loggers/OwnJSONPatternFormatter.h
new file mode 100644
index 00000000000..032506b15e3
--- /dev/null
+++ b/src/Loggers/OwnJSONPatternFormatter.h
@@ -0,0 +1,32 @@
+#pragma once
+
+
+#include <Poco/PatternFormatter.h>
+#include "ExtendedLogChannel.h"
+#include "OwnPatternFormatter.h"
+
+
+/** Format log messages own way in JSON.
+  * We can't obtain some details using Poco::PatternFormatter.
+  *
+  * Firstly, the thread number here is peaked not from Poco::Thread
+  * threads only, but from all threads with number assigned (see ThreadNumber.h)
+  *
+  * Secondly, the local date and time are correctly displayed.
+  * Poco::PatternFormatter does not work well with local time,
+  * when timestamps are close to DST timeshift moments.
+  * - see Poco sources and http://thread.gmane.org/gmane.comp.time.tz/8883
+  *
+  * Also it's made a bit more efficient (unimportant).
+  */
+
+class Loggers;
+
+class OwnJSONPatternFormatter : public OwnPatternFormatter
+{
+public:
+    OwnJSONPatternFormatter();
+
+    void format(const Poco::Message & msg, std::string & text) override;
+    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const override;
+};
diff --git a/src/Loggers/OwnPatternFormatter.h b/src/Loggers/OwnPatternFormatter.h
index fba4f0964cb..d776b097cb2 100644
--- a/src/Loggers/OwnPatternFormatter.h
+++ b/src/Loggers/OwnPatternFormatter.h
@@ -27,7 +27,7 @@ public:
     OwnPatternFormatter(bool color_ = false);
 
     void format(const Poco::Message & msg, std::string & text) override;
-    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
+    virtual void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
 
 private:
     bool color;
diff --git a/src/Loggers/OwnSplitChannel.cpp b/src/Loggers/OwnSplitChannel.cpp
index 355b733b624..933fc09d3e4 100644
--- a/src/Loggers/OwnSplitChannel.cpp
+++ b/src/Loggers/OwnSplitChannel.cpp
@@ -169,4 +169,14 @@ void OwnSplitChannel::setLevel(const std::string & name, int level)
      }
 }
 
+void OwnSplitChannel::setChannelProperty(const std::string& channel_name, const std::string& name, const std::string& value)
+{
+    auto it = channels.find(channel_name);
+    if (it != channels.end())
+    {
+        if (auto * channel = dynamic_cast<DB::OwnFormattingChannel *>(it->second.first.get()))
+            channel->setProperty(name, value);
+    }
+}
+
 }
diff --git a/src/Loggers/OwnSplitChannel.h b/src/Loggers/OwnSplitChannel.h
index 72027f66afd..16231c105b7 100644
--- a/src/Loggers/OwnSplitChannel.h
+++ b/src/Loggers/OwnSplitChannel.h
@@ -24,6 +24,9 @@ class OwnSplitChannel : public Poco::Channel
 public:
     /// Makes an extended message from msg and passes it to the client logs queue and child (if possible)
     void log(const Poco::Message & msg) override;
+
+    void setChannelProperty(const std::string& channel_name, const std::string& name, const std::string& value);
+
     /// Adds a child channel
     void addChannel(Poco::AutoPtr<Poco::Channel> channel, const std::string & name);
 
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index e676be63921..a277960643b 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -196,6 +196,8 @@ ASTPtr ASTCreateQuery::clone() const
         res->set(res->columns_list, columns_list->clone());
     if (storage)
         res->set(res->storage, storage->clone());
+    if (inner_storage)
+        res->set(res->inner_storage, inner_storage->clone());
     if (select)
         res->set(res->select, select->clone());
     if (table_overrides)
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index 39d89f56e91..ac340eef987 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -14,6 +14,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTWithAlias.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/ASTSetQuery.h>
 
 using namespace std::literals;
 
@@ -549,6 +550,8 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                     {
                         if (i != 0)
                             settings.ostr << (settings.hilite ? hilite_operator : "") << func[1] << (settings.hilite ? hilite_none : "");
+                        if (arguments->children[i]->as<ASTSetQuery>())
+                            settings.ostr << "SETTINGS ";
                         arguments->children[i]->formatImpl(settings, state, nested_need_parens);
                     }
                     if (frame.need_parens)
@@ -565,6 +568,8 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
             {
                 if (i != 0)
                     settings.ostr << ", ";
+                if (arguments->children[i]->as<ASTSetQuery>())
+                    settings.ostr << "SETTINGS ";
                 arguments->children[i]->formatImpl(settings, state, nested_dont_need_parens);
             }
             settings.ostr << (settings.hilite ? hilite_operator : "") << ']' << (settings.hilite ? hilite_none : "");
@@ -578,6 +583,8 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
             {
                 if (i != 0)
                     settings.ostr << ", ";
+                if (arguments->children[i]->as<ASTSetQuery>())
+                    settings.ostr << "SETTINGS ";
                 arguments->children[i]->formatImpl(settings, state, nested_dont_need_parens);
             }
             settings.ostr << (settings.hilite ? hilite_operator : "") << ')' << (settings.hilite ? hilite_none : "");
@@ -591,6 +598,8 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
             {
                 if (i != 0)
                     settings.ostr << ", ";
+                if (arguments->children[i]->as<ASTSetQuery>())
+                    settings.ostr << "SETTINGS ";
                 arguments->children[i]->formatImpl(settings, state, nested_dont_need_parens);
             }
             settings.ostr << (settings.hilite ? hilite_operator : "") << ')' << (settings.hilite ? hilite_none : "");
@@ -625,6 +634,8 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
         {
             if (i != 0)
                 settings.ostr << ", ";
+            if (arguments->children[i]->as<ASTSetQuery>())
+                settings.ostr << "SETTINGS ";
 
             bool special_hilite = false;
             if (i == 1 && special_hilite_regexp)
diff --git a/src/Parsers/ASTIdentifier.cpp b/src/Parsers/ASTIdentifier.cpp
index a889680c81f..ca8ac0e8e64 100644
--- a/src/Parsers/ASTIdentifier.cpp
+++ b/src/Parsers/ASTIdentifier.cpp
@@ -32,7 +32,7 @@ ASTIdentifier::ASTIdentifier(std::vector<String> && name_parts_, bool special, s
     semantic->legacy_compound = true;
     if (!name_params.empty())
     {
-        size_t params = 0;
+        [[maybe_unused]] size_t params = 0;
         for (const auto & part [[maybe_unused]] : name_parts)
         {
             if (part.empty())
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 53c820a180d..4e84e1d1e20 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -344,6 +344,25 @@ const ASTTablesInSelectQueryElement * ASTSelectQuery::join() const
     return getFirstTableJoin(*this);
 }
 
+bool ASTSelectQuery::hasJoin() const
+{
+    if (!tables())
+        return false;
+
+    const auto & tables_in_select_query = tables()->as<ASTTablesInSelectQuery &>();
+    if (tables_in_select_query.children.empty())
+        return false;
+
+    for (const auto & child : tables_in_select_query.children)
+    {
+        const auto & tables_element = child->as<ASTTablesInSelectQueryElement &>();
+        if (tables_element.table_join)
+            return true;
+    }
+
+    return false;
+}
+
 static String getTableExpressionAlias(const ASTTableExpression * table_expression)
 {
     if (table_expression->subquery)
diff --git a/src/Parsers/ASTSelectQuery.h b/src/Parsers/ASTSelectQuery.h
index 1a02717db8d..5e3af545f12 100644
--- a/src/Parsers/ASTSelectQuery.h
+++ b/src/Parsers/ASTSelectQuery.h
@@ -131,6 +131,7 @@ public:
     std::pair<ASTPtr, bool> arrayJoinExpressionList() const;
 
     const ASTTablesInSelectQueryElement * join() const;
+    bool hasJoin() const;
     bool final() const;
     bool withFill() const;
     void replaceDatabaseAndTable(const String & database_name, const String & table_name);
diff --git a/src/Parsers/ASTSetQuery.h b/src/Parsers/ASTSetQuery.h
index 40a0b679650..4e3d9d227b6 100644
--- a/src/Parsers/ASTSetQuery.h
+++ b/src/Parsers/ASTSetQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Common/SettingsChanges.h>
+#include <Core/Names.h>
 #include <Parsers/IAST.h>
-
+#include <Common/SettingsChanges.h>
 
 namespace DB
 {
@@ -15,6 +15,7 @@ public:
     bool is_standalone = true; /// If false, this AST is a part of another query, such as SELECT.
 
     SettingsChanges changes;
+    NameToNameMap query_parameters;
 
     /** Get the text that identifies this element. */
     String getID(char) const override { return "Set"; }
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index f2ef7a7a47a..f2c3fa8ece5 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -29,6 +29,7 @@ public:
         DROP_COMPILED_EXPRESSION_CACHE,
 #endif
         DROP_FILESYSTEM_CACHE,
+        DROP_SCHEMA_CACHE,
         STOP_LISTEN_QUERIES,
         START_LISTEN_QUERIES,
         RESTART_REPLICAS,
@@ -94,8 +95,11 @@ public:
     UInt64 seconds{};
 
     String filesystem_cache_path;
+
     String backup_name;
 
+    String schema_cache_storage;
+
     String getID(char) const override { return "SYSTEM query"; }
 
     ASTPtr clone() const override
diff --git a/src/Parsers/ASTTablesInSelectQuery.cpp b/src/Parsers/ASTTablesInSelectQuery.cpp
index 32d7f166564..3b7a3a342e6 100644
--- a/src/Parsers/ASTTablesInSelectQuery.cpp
+++ b/src/Parsers/ASTTablesInSelectQuery.cpp
@@ -150,41 +150,41 @@ void ASTTableJoin::formatImplBeforeTable(const FormatSettings & settings, Format
     settings.ostr << (settings.hilite ? hilite_keyword : "");
     std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
 
-    if (kind != Kind::Comma)
+    if (kind != JoinKind::Comma)
     {
         settings.ostr << settings.nl_or_ws << indent_str;
     }
 
     switch (locality)
     {
-        case Locality::Unspecified:
-        case Locality::Local:
+        case JoinLocality::Unspecified:
+        case JoinLocality::Local:
             break;
-        case Locality::Global:
+        case JoinLocality::Global:
             settings.ostr << "GLOBAL ";
             break;
     }
 
-    if (kind != Kind::Cross && kind != Kind::Comma)
+    if (kind != JoinKind::Cross && kind != JoinKind::Comma)
     {
         switch (strictness)
         {
-            case Strictness::Unspecified:
+            case JoinStrictness::Unspecified:
                 break;
-            case Strictness::RightAny:
-            case Strictness::Any:
+            case JoinStrictness::RightAny:
+            case JoinStrictness::Any:
                 settings.ostr << "ANY ";
                 break;
-            case Strictness::All:
+            case JoinStrictness::All:
                 settings.ostr << "ALL ";
                 break;
-            case Strictness::Asof:
+            case JoinStrictness::Asof:
                 settings.ostr << "ASOF ";
                 break;
-            case Strictness::Semi:
+            case JoinStrictness::Semi:
                 settings.ostr << "SEMI ";
                 break;
-            case Strictness::Anti:
+            case JoinStrictness::Anti:
                 settings.ostr << "ANTI ";
                 break;
         }
@@ -192,22 +192,22 @@ void ASTTableJoin::formatImplBeforeTable(const FormatSettings & settings, Format
 
     switch (kind)
     {
-        case Kind::Inner:
+        case JoinKind::Inner:
             settings.ostr << "INNER JOIN";
             break;
-        case Kind::Left:
+        case JoinKind::Left:
             settings.ostr << "LEFT JOIN";
             break;
-        case Kind::Right:
+        case JoinKind::Right:
             settings.ostr << "RIGHT JOIN";
             break;
-        case Kind::Full:
+        case JoinKind::Full:
             settings.ostr << "FULL OUTER JOIN";
             break;
-        case Kind::Cross:
+        case JoinKind::Cross:
             settings.ostr << "CROSS JOIN";
             break;
-        case Kind::Comma:
+        case JoinKind::Comma:
             settings.ostr << ",";
             break;
     }
diff --git a/src/Parsers/ASTTablesInSelectQuery.h b/src/Parsers/ASTTablesInSelectQuery.h
index 9eddaf3137d..a004cbf9847 100644
--- a/src/Parsers/ASTTablesInSelectQuery.h
+++ b/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <Parsers/IAST.h>
 #include <base/EnumReflection.h>
 
+#include <Core/Joins.h>
+
+#include <Parsers/IAST.h>
 
 namespace DB
 {
@@ -64,40 +66,9 @@ struct ASTTableExpression : public IAST
 /// How to JOIN another table.
 struct ASTTableJoin : public IAST
 {
-    /// Algorithm for distributed query processing.
-    enum class Locality
-    {
-        Unspecified,
-        Local,    /// Perform JOIN, using only data available on same servers (co-located data).
-        Global    /// Collect and merge data from remote servers, and broadcast it to each server.
-    };
-
-    /// Allows more optimal JOIN for typical cases.
-    enum class Strictness
-    {
-        Unspecified,
-        RightAny, /// Old ANY JOIN. If there are many suitable rows in right table, use any from them to join.
-        Any,    /// Semi Join with any value from filtering table. For LEFT JOIN with Any and RightAny are the same.
-        All,    /// If there are many suitable rows to join, use all of them and replicate rows of "left" table (usual semantic of JOIN).
-        Asof,   /// For the last JOIN column, pick the latest value
-        Semi,   /// LEFT or RIGHT. SEMI LEFT JOIN filters left table by values exists in right table. SEMI RIGHT - otherwise.
-        Anti,   /// LEFT or RIGHT. Same as SEMI JOIN but filter values that are NOT exists in other table.
-    };
-
-    /// Join method.
-    enum class Kind
-    {
-        Inner, /// Leave only rows that was JOINed.
-        Left, /// If in "right" table there is no corresponding rows, use default values instead.
-        Right,
-        Full,
-        Cross, /// Direct product. Strictness and condition doesn't matter.
-        Comma /// Same as direct product. Intended to be converted to INNER JOIN with conditions from WHERE.
-    };
-
-    Locality locality = Locality::Unspecified;
-    Strictness strictness = Strictness::Unspecified;
-    Kind kind = Kind::Inner;
+    JoinLocality locality = JoinLocality::Unspecified;
+    JoinStrictness strictness = JoinStrictness::Unspecified;
+    JoinKind kind = JoinKind::Inner;
 
     /// Condition. One of fields is non-nullptr.
     ASTPtr using_expression_list;
@@ -113,16 +84,6 @@ struct ASTTableJoin : public IAST
     void updateTreeHashImpl(SipHash & hash_state) const override;
 };
 
-inline constexpr bool isLeft(ASTTableJoin::Kind kind)         { return kind == ASTTableJoin::Kind::Left; }
-inline constexpr bool isRight(ASTTableJoin::Kind kind)        { return kind == ASTTableJoin::Kind::Right; }
-inline constexpr bool isInner(ASTTableJoin::Kind kind)        { return kind == ASTTableJoin::Kind::Inner; }
-inline constexpr bool isFull(ASTTableJoin::Kind kind)         { return kind == ASTTableJoin::Kind::Full; }
-inline constexpr bool isCrossOrComma(ASTTableJoin::Kind kind) { return kind == ASTTableJoin::Kind::Comma || kind == ASTTableJoin::Kind::Cross; }
-inline constexpr bool isRightOrFull(ASTTableJoin::Kind kind)  { return kind == ASTTableJoin::Kind::Right || kind == ASTTableJoin::Kind::Full; }
-inline constexpr bool isLeftOrFull(ASTTableJoin::Kind kind)   { return kind == ASTTableJoin::Kind::Left  || kind == ASTTableJoin::Kind::Full; }
-inline constexpr bool isInnerOrRight(ASTTableJoin::Kind kind) { return kind == ASTTableJoin::Kind::Inner || kind == ASTTableJoin::Kind::Right; }
-inline constexpr bool isInnerOrLeft(ASTTableJoin::Kind kind)  { return kind == ASTTableJoin::Kind::Inner || kind == ASTTableJoin::Kind::Left; }
-
 /// Specification of ARRAY JOIN.
 struct ASTArrayJoin : public IAST
 {
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index caf9be1fea6..ea51367ee5d 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -1,6 +1,7 @@
 #include <string_view>
 
 #include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserSetQuery.h>
 
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTExpressionList.h>
@@ -9,6 +10,7 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
@@ -603,6 +605,13 @@ bool ParserTableFunctionExpression::parseImpl(Pos & pos, ASTPtr & node, Expected
 {
     if (ParserTableFunctionView().parse(pos, node, expected))
         return true;
+    ParserKeyword s_settings("SETTINGS");
+    if (s_settings.ignore(pos, expected))
+    {
+        ParserSetQuery parser_settings(true);
+        if (parser_settings.parse(pos, node, expected))
+            return true;
+    }
     return elem_parser.parse(pos, node, expected);
 }
 
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index 3a21d704eb9..f1557076a07 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -26,6 +26,70 @@ const char * IAST::hilite_substitution = "\033[1;36m";
 const char * IAST::hilite_none         = "\033[0m";
 
 
+IAST::~IAST()
+{
+    /** Create intrusive linked list of children to delete.
+      * Each ASTPtr child contains pointer to next child to delete.
+      */
+    ASTPtr delete_list_head_holder = nullptr;
+    const bool delete_directly = next_to_delete_list_head == nullptr;
+    ASTPtr & delete_list_head_reference = next_to_delete_list_head ? *next_to_delete_list_head : delete_list_head_holder;
+
+    /// Move children into intrusive list
+    for (auto & child : children)
+    {
+        /** If two threads remove ASTPtr concurrently,
+          * it is possible that neither thead will see use_count == 1.
+          * It is ok. Will need one more extra stack frame in this case.
+          */
+        if (child.use_count() != 1)
+            continue;
+
+        ASTPtr child_to_delete;
+        child_to_delete.swap(child);
+
+        if (!delete_list_head_reference)
+        {
+            /// Initialize list first time
+            delete_list_head_reference = std::move(child_to_delete);
+            continue;
+        }
+
+        ASTPtr previous_head = std::move(delete_list_head_reference);
+        delete_list_head_reference = std::move(child_to_delete);
+        delete_list_head_reference->next_to_delete = std::move(previous_head);
+    }
+
+    if (!delete_directly)
+        return;
+
+    while (delete_list_head_reference)
+    {
+        /** Extract child to delete from current list head.
+          * Child will be destroyed at the end of scope.
+          */
+        ASTPtr child_to_delete;
+        child_to_delete.swap(delete_list_head_reference);
+
+        /// Update list head
+        delete_list_head_reference = std::move(child_to_delete->next_to_delete);
+
+        /** Pass list head into child before destruction.
+          * It is important to properly handle cases where subclass has member same as one of its children.
+          *
+          * class ASTSubclass : IAST
+          * {
+          *     ASTPtr first_child; /// Same as first child
+          * }
+          *
+          * In such case we must move children into list only in IAST destructor.
+          * If we try to move child to delete children into list before subclasses desruction,
+          * first child use count will be 2.
+          */
+        child_to_delete->next_to_delete_list_head = &delete_list_head_reference;
+    }
+}
+
 size_t IAST::size() const
 {
     size_t res = 1;
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index 1999eff37a8..e91d419acd8 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <set>
+#include <list>
 
 
 class SipHash;
@@ -34,7 +35,7 @@ class IAST : public std::enable_shared_from_this<IAST>, public TypePromotion<IAS
 public:
     ASTs children;
 
-    virtual ~IAST() = default;
+    virtual ~IAST();
     IAST() = default;
     IAST(const IAST &) = default;
     IAST & operator=(const IAST &) = default;
@@ -273,6 +274,12 @@ public:
 
 private:
     size_t checkDepthImpl(size_t max_depth, size_t level) const;
+
+    /** Forward linked list of ASTPtr to delete.
+      * Used in IAST destructor to avoid possible stack overflow.
+      */
+    ASTPtr next_to_delete = nullptr;
+    ASTPtr * next_to_delete_list_head = nullptr;
 };
 
 template <typename AstArray>
diff --git a/src/Parsers/ParserSetQuery.cpp b/src/Parsers/ParserSetQuery.cpp
index 0ff437bcfb1..20de785ac1b 100644
--- a/src/Parsers/ParserSetQuery.cpp
+++ b/src/Parsers/ParserSetQuery.cpp
@@ -5,13 +5,38 @@
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ParserSetQuery.h>
 
-#include <Common/typeid_cast.h>
+#include <Core/Names.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <Common/FieldVisitorToString.h>
 #include <Common/SettingsChanges.h>
-
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+static NameToNameMap::value_type convertToQueryParameter(SettingChange change)
+{
+    auto name = change.name.substr(strlen(QUERY_PARAMETER_NAME_PREFIX));
+    if (name.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter name cannot be empty");
+
+    auto value = applyVisitor(FieldVisitorToString(), change.value);
+    /// writeQuoted is not always quoted in line with SQL standard https://github.com/ClickHouse/ClickHouse/blob/master/src/IO/WriteHelpers.h
+    if (value.starts_with('\''))
+    {
+        ReadBufferFromOwnString buf(value);
+        readQuoted(value, buf);
+    }
+    return {name, value};
+}
+
+
 class ParserLiteralOrMap : public IParserBase
 {
 public:
@@ -111,16 +136,23 @@ bool ParserSetQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
 
     SettingsChanges changes;
+    NameToNameMap query_parameters;
 
     while (true)
     {
-        if (!changes.empty() && !s_comma.ignore(pos))
+        if ((!changes.empty() || !query_parameters.empty()) && !s_comma.ignore(pos))
             break;
 
-        changes.push_back(SettingChange{});
+        /// Either a setting or a parameter for prepared statement (if name starts with QUERY_PARAMETER_NAME_PREFIX)
+        SettingChange current;
 
-        if (!parseNameValuePair(changes.back(), pos, expected))
+        if (!parseNameValuePair(current, pos, expected))
             return false;
+
+        if (current.name.starts_with(QUERY_PARAMETER_NAME_PREFIX))
+            query_parameters.emplace(convertToQueryParameter(std::move(current)));
+        else
+            changes.push_back(std::move(current));
     }
 
     auto query = std::make_shared<ASTSetQuery>();
@@ -128,6 +160,7 @@ bool ParserSetQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     query->is_standalone = !parse_only_internals;
     query->changes = std::move(changes);
+    query->query_parameters = std::move(query_parameters);
 
     return true;
 }
diff --git a/src/Parsers/ParserSetQuery.h b/src/Parsers/ParserSetQuery.h
index 0bc1cec3093..d9c69358ac2 100644
--- a/src/Parsers/ParserSetQuery.h
+++ b/src/Parsers/ParserSetQuery.h
@@ -9,6 +9,8 @@ namespace DB
 
 struct SettingChange;
 
+constexpr char QUERY_PARAMETER_NAME_PREFIX[] = "param_";
+
 /** Query like this:
   * SET name1 = value1, name2 = value2, ...
   */
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 7854f7a2400..26ba9290d04 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -363,6 +363,23 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             parseQueryWithOnCluster(res, pos, expected);
             break;
         }
+        case Type::DROP_SCHEMA_CACHE:
+        {
+            if (ParserKeyword{"FOR"}.ignore(pos, expected))
+            {
+                if (ParserKeyword{"FILE"}.ignore(pos, expected))
+                    res->schema_cache_storage = "FILE";
+                else if (ParserKeyword{"S3"}.ignore(pos, expected))
+                    res->schema_cache_storage = "S3";
+                else if (ParserKeyword{"HDFS"}.ignore(pos, expected))
+                    res->schema_cache_storage = "HDFS";
+                else if (ParserKeyword{"URL"}.ignore(pos, expected))
+                    res->schema_cache_storage = "URL";
+                else
+                    return false;
+            }
+            break;
+        }
 
         case Type::UNFREEZE:
         {
diff --git a/src/Parsers/ParserTablesInSelectQuery.cpp b/src/Parsers/ParserTablesInSelectQuery.cpp
index 88251dbd3c8..8137093b990 100644
--- a/src/Parsers/ParserTablesInSelectQuery.cpp
+++ b/src/Parsers/ParserTablesInSelectQuery.cpp
@@ -109,15 +109,15 @@ bool ParserArrayJoin::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 void ParserTablesInSelectQueryElement::parseJoinStrictness(Pos & pos, ASTTableJoin & table_join)
 {
     if (ParserKeyword("ANY").ignore(pos))
-        table_join.strictness = ASTTableJoin::Strictness::Any;
+        table_join.strictness = JoinStrictness::Any;
     else if (ParserKeyword("ALL").ignore(pos))
-        table_join.strictness = ASTTableJoin::Strictness::All;
+        table_join.strictness = JoinStrictness::All;
     else if (ParserKeyword("ASOF").ignore(pos))
-        table_join.strictness = ASTTableJoin::Strictness::Asof;
+        table_join.strictness = JoinStrictness::Asof;
     else if (ParserKeyword("SEMI").ignore(pos))
-        table_join.strictness = ASTTableJoin::Strictness::Semi;
+        table_join.strictness = JoinStrictness::Semi;
     else if (ParserKeyword("ANTI").ignore(pos) || ParserKeyword("ONLY").ignore(pos))
-        table_join.strictness = ASTTableJoin::Strictness::Anti;
+        table_join.strictness = JoinStrictness::Anti;
 }
 
 bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
@@ -139,31 +139,31 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
         if (pos->type == TokenType::Comma)
         {
             ++pos;
-            table_join->kind = ASTTableJoin::Kind::Comma;
+            table_join->kind = JoinKind::Comma;
         }
         else
         {
             if (ParserKeyword("GLOBAL").ignore(pos))
-                table_join->locality = ASTTableJoin::Locality::Global;
+                table_join->locality = JoinLocality::Global;
             else if (ParserKeyword("LOCAL").ignore(pos))
-                table_join->locality = ASTTableJoin::Locality::Local;
+                table_join->locality = JoinLocality::Local;
 
-            table_join->strictness = ASTTableJoin::Strictness::Unspecified;
+            table_join->strictness = JoinStrictness::Unspecified;
 
             /// Legacy: allow JOIN type before JOIN kind
             parseJoinStrictness(pos, *table_join);
 
             bool no_kind = false;
             if (ParserKeyword("INNER").ignore(pos))
-                table_join->kind = ASTTableJoin::Kind::Inner;
+                table_join->kind = JoinKind::Inner;
             else if (ParserKeyword("LEFT").ignore(pos))
-                table_join->kind = ASTTableJoin::Kind::Left;
+                table_join->kind = JoinKind::Left;
             else if (ParserKeyword("RIGHT").ignore(pos))
-                table_join->kind = ASTTableJoin::Kind::Right;
+                table_join->kind = JoinKind::Right;
             else if (ParserKeyword("FULL").ignore(pos))
-                table_join->kind = ASTTableJoin::Kind::Full;
+                table_join->kind = JoinKind::Full;
             else if (ParserKeyword("CROSS").ignore(pos))
-                table_join->kind = ASTTableJoin::Kind::Cross;
+                table_join->kind = JoinKind::Cross;
             else
                 no_kind = true;
 
@@ -171,9 +171,9 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
             parseJoinStrictness(pos, *table_join);
 
             /// Optional OUTER keyword for outer joins.
-            if (table_join->kind == ASTTableJoin::Kind::Left
-                || table_join->kind == ASTTableJoin::Kind::Right
-                || table_join->kind == ASTTableJoin::Kind::Full)
+            if (table_join->kind == JoinKind::Left
+                || table_join->kind == JoinKind::Right
+                || table_join->kind == JoinKind::Full)
             {
                 ParserKeyword("OUTER").ignore(pos);
             }
@@ -181,19 +181,19 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
             if (no_kind)
             {
                 /// Use INNER by default as in another DBMS.
-                if (table_join->strictness == ASTTableJoin::Strictness::Semi ||
-                    table_join->strictness == ASTTableJoin::Strictness::Anti)
-                    table_join->kind = ASTTableJoin::Kind::Left;
+                if (table_join->strictness == JoinStrictness::Semi ||
+                    table_join->strictness == JoinStrictness::Anti)
+                    table_join->kind = JoinKind::Left;
                 else
-                    table_join->kind = ASTTableJoin::Kind::Inner;
+                    table_join->kind = JoinKind::Inner;
             }
 
-            if (table_join->strictness != ASTTableJoin::Strictness::Unspecified
-                && table_join->kind == ASTTableJoin::Kind::Cross)
+            if (table_join->strictness != JoinStrictness::Unspecified
+                && table_join->kind == JoinKind::Cross)
                 throw Exception("You must not specify ANY or ALL for CROSS JOIN.", ErrorCodes::SYNTAX_ERROR);
 
-            if ((table_join->strictness == ASTTableJoin::Strictness::Semi || table_join->strictness == ASTTableJoin::Strictness::Anti) &&
-                (table_join->kind != ASTTableJoin::Kind::Left && table_join->kind != ASTTableJoin::Kind::Right))
+            if ((table_join->strictness == JoinStrictness::Semi || table_join->strictness == JoinStrictness::Anti) &&
+                (table_join->kind != JoinKind::Left && table_join->kind != JoinKind::Right))
                 throw Exception("SEMI|ANTI JOIN should be LEFT or RIGHT.", ErrorCodes::SYNTAX_ERROR);
 
             if (!ParserKeyword("JOIN").ignore(pos, expected))
@@ -203,8 +203,8 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
         if (!ParserTableExpression().parse(pos, res->table_expression, expected))
             return false;
 
-        if (table_join->kind != ASTTableJoin::Kind::Comma
-            && table_join->kind != ASTTableJoin::Kind::Cross)
+        if (table_join->kind != JoinKind::Comma
+            && table_join->kind != JoinKind::Cross)
         {
             if (ParserKeyword("USING").ignore(pos, expected))
             {
diff --git a/src/Parsers/parseIntervalKind.cpp b/src/Parsers/parseIntervalKind.cpp
index 0704aa107ca..77c3178ae2b 100644
--- a/src/Parsers/parseIntervalKind.cpp
+++ b/src/Parsers/parseIntervalKind.cpp
@@ -43,7 +43,7 @@ bool parseIntervalKind(IParser::Pos & pos, Expected & expected, IntervalKind & r
     }
 
     if (ParserKeyword("HOUR").ignore(pos, expected) || ParserKeyword("SQL_TSI_HOUR").ignore(pos, expected)
-        || ParserKeyword("HH").ignore(pos, expected))
+        || ParserKeyword("HH").ignore(pos, expected) || ParserKeyword("H").ignore(pos, expected))
     {
         result = IntervalKind::Hour;
         return true;
diff --git a/src/Parsers/tests/gtest_ast_deleter.cpp b/src/Parsers/tests/gtest_ast_deleter.cpp
new file mode 100644
index 00000000000..c6913f8ef8f
--- /dev/null
+++ b/src/Parsers/tests/gtest_ast_deleter.cpp
@@ -0,0 +1,147 @@
+#include <gtest/gtest.h>
+#include <Parsers/IAST.h>
+#include <Common/StackTrace.h>
+
+struct StackDecrementer
+{
+    size_t & depth;
+
+    explicit StackDecrementer(size_t & depth_) : depth(depth_) {}
+
+    virtual ~StackDecrementer()
+    {
+        --depth;
+    }
+};
+
+struct ASTCounting : public StackDecrementer, public DB::IAST
+{
+    explicit ASTCounting(size_t & depth_) : StackDecrementer(depth_) {}
+
+    String getID(char) const override { return ""; }
+    DB::ASTPtr clone() const override { return nullptr; }
+};
+
+class ASTWithMembers : public ASTCounting
+{
+public:
+    explicit ASTWithMembers(DB::ASTs members_, size_t & depth_) : ASTCounting(depth_), members(std::move(members_))
+    {
+        children = members;
+    }
+
+    DB::ASTs members;
+};
+
+class ASTWithDecrementer : public ASTWithMembers
+{
+public:
+    ASTWithDecrementer(DB::ASTs members_, size_t & depth_, size_t max_depth_)
+        : ASTWithMembers(std::move(members_), depth_), max_depth(max_depth_)
+    {
+    }
+
+    size_t max_depth;
+
+    ~ASTWithDecrementer() override
+    {
+        ++depth;
+        if (depth == max_depth)
+            std::cout << StackTrace().toString() << std::endl;
+        if (depth > max_depth)
+            EXPECT_LE(depth, max_depth);
+    }
+};
+
+
+TEST(ASTDeleter, SimpleChain)
+{
+    size_t depth = 0;
+    size_t max_depth = 5;
+    size_t chain_length = 10;
+
+    {
+        DB::ASTPtr ast = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+
+        for (size_t i = 0; i < chain_length; ++i)
+            ast = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast)}, depth, max_depth);
+    }
+}
+
+TEST(ASTDeleter, SimpleChainLong)
+{
+    size_t depth = 0;
+    size_t max_depth = 5;
+    size_t chain_length = 100000;
+
+    {
+        DB::ASTPtr ast = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+
+        for (size_t i = 0; i < chain_length; ++i)
+            ast = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast)}, depth, max_depth);
+    }
+}
+
+TEST(ASTDeleter, ChainWithExtraMember)
+{
+    size_t depth = 0;
+    size_t max_depth = 5;
+    size_t member_depth = 10;
+    size_t chain_length = 100;
+
+    {
+        DB::ASTPtr ast = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+
+        for (size_t i = 0; i < chain_length; ++i)
+        {
+            ast = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast)}, depth, max_depth);
+            if (i > member_depth)
+            {
+                DB::ASTPtr member = ast;
+                for (size_t j = 0; j < member_depth; ++j)
+                    member = member->children.front();
+                ast->as<ASTWithDecrementer>()->members.push_back(std::move(member));
+            }
+        }
+    }
+}
+
+TEST(ASTDeleter, DoubleChain)
+{
+    size_t depth = 0;
+    size_t max_depth = 5;
+    size_t chain_length = 10;
+
+    {
+        DB::ASTPtr ast1 = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+        DB::ASTPtr ast2 = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+
+        for (size_t i = 0; i < chain_length; ++i)
+        {
+            ast1 = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast1)}, depth, max_depth);
+            ast2 = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast2)}, depth, max_depth);
+            ast1->as<ASTWithDecrementer>()->members.push_back(ast2->children.front());
+            ast2->as<ASTWithDecrementer>()->members.push_back(ast1->children.front());
+        }
+    }
+}
+
+TEST(ASTDeleter, DoubleChainLong)
+{
+    size_t depth = 0;
+    size_t max_depth = 5;
+    size_t chain_length = 100000;
+
+    {
+        DB::ASTPtr ast1 = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+        DB::ASTPtr ast2 = std::make_shared<ASTWithDecrementer>(DB::ASTs{}, depth, max_depth);
+
+        for (size_t i = 0; i < chain_length; ++i)
+        {
+            ast1 = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast1)}, depth, max_depth);
+            ast2 = std::make_shared<ASTWithDecrementer>(DB::ASTs{std::move(ast2)}, depth, max_depth);
+            ast1->as<ASTWithDecrementer>()->members.push_back(ast2->children.front());
+            ast2->as<ASTWithDecrementer>()->members.push_back(ast1->children.front());
+        }
+    }
+}
diff --git a/src/Processors/Executors/ExecutorTasks.cpp b/src/Processors/Executors/ExecutorTasks.cpp
index 824b4e962d2..d5c2bfe7399 100644
--- a/src/Processors/Executors/ExecutorTasks.cpp
+++ b/src/Processors/Executors/ExecutorTasks.cpp
@@ -32,7 +32,7 @@ void ExecutorTasks::tryWakeUpAnyOtherThreadWithTasks(ExecutionThreadContext & se
 {
     if (!task_queue.empty() && !threads_queue.empty() && !finished)
     {
-        size_t next_thread = self.thread_number + 1 == num_threads ? 0 : (self.thread_number + 1);
+        size_t next_thread = self.thread_number + 1 >= use_threads ? 0 : (self.thread_number + 1);
         auto thread_to_wake = task_queue.getAnyThreadWithTasks(next_thread);
 
         if (threads_queue.has(thread_to_wake))
@@ -40,6 +40,9 @@ void ExecutorTasks::tryWakeUpAnyOtherThreadWithTasks(ExecutionThreadContext & se
         else
             thread_to_wake = threads_queue.popAny();
 
+        if (thread_to_wake >= use_threads)
+            throw Exception("Non-empty queue without allocated thread", ErrorCodes::LOGICAL_ERROR);
+
         lock.unlock();
         executor_contexts[thread_to_wake]->wakeUp();
     }
@@ -50,6 +53,7 @@ void ExecutorTasks::tryGetTask(ExecutionThreadContext & context)
     {
         std::unique_lock lock(mutex);
 
+        /// Try get async task assigned to this thread or any other task from queue.
         if (auto * async_task = context.tryPopAsyncTask())
         {
             context.setTask(async_task);
@@ -58,13 +62,18 @@ void ExecutorTasks::tryGetTask(ExecutionThreadContext & context)
         else if (!task_queue.empty())
             context.setTask(task_queue.pop(context.thread_number));
 
+        /// Task found.
         if (context.hasTask())
         {
+            /// We have to wake up at least one thread if there are pending tasks.
+            /// That thread will wake up other threads during its `tryGetTask()` call if any.
             tryWakeUpAnyOtherThreadWithTasks(context, lock);
             return;
         }
 
-        if (threads_queue.size() + 1 == num_threads && async_task_queue.empty() && num_waiting_async_tasks == 0)
+        /// This thread has no tasks to do and is going to wait.
+        /// Finish execution if this was the last active thread.
+        if (threads_queue.size() + 1 == use_threads && async_task_queue.empty() && num_waiting_async_tasks == 0)
         {
             lock.unlock();
             finish();
@@ -88,6 +97,7 @@ void ExecutorTasks::tryGetTask(ExecutionThreadContext & context)
         }
     #endif
 
+        /// Enqueue thread into stack of waiting threads.
         threads_queue.push(context.thread_number);
     }
 
@@ -124,13 +134,15 @@ void ExecutorTasks::pushTasks(Queue & queue, Queue & async_queue, ExecutionThrea
             queue.pop();
         }
 
+        /// Wake up at least one thread that will wake up other threads if required
         tryWakeUpAnyOtherThreadWithTasks(context, lock);
     }
 }
 
-void ExecutorTasks::init(size_t num_threads_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback)
+void ExecutorTasks::init(size_t num_threads_, size_t use_threads_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback)
 {
     num_threads = num_threads_;
+    use_threads = use_threads_;
     threads_queue.init(num_threads);
     task_queue.init(num_threads);
 
@@ -154,11 +166,21 @@ void ExecutorTasks::fill(Queue & queue)
         queue.pop();
 
         ++next_thread;
-        if (next_thread >= num_threads)
+
+        /// It is important to keep queues empty for threads that are not started yet.
+        /// Otherwise that thread can be selected by `tryWakeUpAnyOtherThreadWithTasks()`, leading to deadlock.
+        if (next_thread >= use_threads)
             next_thread = 0;
     }
 }
 
+void ExecutorTasks::upscale(size_t use_threads_)
+{
+    std::lock_guard lock(mutex);
+    if (use_threads < use_threads_)
+        use_threads = use_threads_;
+}
+
 void ExecutorTasks::processAsyncTasks()
 {
 #if defined(OS_LINUX)
diff --git a/src/Processors/Executors/ExecutorTasks.h b/src/Processors/Executors/ExecutorTasks.h
index 668470e7b11..d35f8de94d1 100644
--- a/src/Processors/Executors/ExecutorTasks.h
+++ b/src/Processors/Executors/ExecutorTasks.h
@@ -32,8 +32,12 @@ class ExecutorTasks
     /// For single thread, will wait for async tasks only when task_queue is empty.
     PollingQueue async_task_queue;
 
+    /// Maximum amount of threads. Constant after initialization, based on `max_threads` setting.
     size_t num_threads = 0;
 
+    /// Started thread count (allocated by `ConcurrencyControl`). Can increase during execution up to `num_threads`.
+    size_t use_threads = 0;
+
     /// This is the total number of waited async tasks which are not executed yet.
     /// sum(executor_contexts[i].async_tasks.size())
     size_t num_waiting_async_tasks = 0;
@@ -54,8 +58,9 @@ public:
     void tryGetTask(ExecutionThreadContext & context);
     void pushTasks(Queue & queue, Queue & async_queue, ExecutionThreadContext & context);
 
-    void init(size_t num_threads_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback);
+    void init(size_t num_threads_, size_t use_threads_, bool profile_processors, bool trace_processors, ReadProgressCallback * callback);
     void fill(Queue & queue);
+    void upscale(size_t use_threads_);
 
     void processAsyncTasks();
 
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index 29c57e08573..ae20d97604b 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -1,4 +1,3 @@
-#include <queue>
 #include <IO/WriteBufferFromString.h>
 #include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
@@ -114,6 +113,11 @@ bool PipelineExecutor::executeStep(std::atomic_bool * yield_flag)
     {
         initializeExecution(1);
 
+        // Acquire slot until we are done
+        single_thread_slot = slots->tryAcquire();
+        if (!single_thread_slot)
+            abort(); // Unable to allocate slot for the first thread, but we just allocated at least one slot
+
         if (yield_flag && *yield_flag)
             return true;
     }
@@ -128,6 +132,7 @@ bool PipelineExecutor::executeStep(std::atomic_bool * yield_flag)
         if (node->exception)
             std::rethrow_exception(node->exception);
 
+    single_thread_slot.reset();
     finalizeExecution();
 
     return false;
@@ -250,6 +255,9 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, std::atomic_bool * yie
             context.processing_time_ns += processing_time_watch.elapsed();
 #endif
 
+            /// Upscale if possible.
+            spawnThreads();
+
             /// We have executed single processor. Check if we need to yield execution.
             if (yield_flag && *yield_flag)
                 yield = true;
@@ -266,70 +274,98 @@ void PipelineExecutor::initializeExecution(size_t num_threads)
 {
     is_execution_initialized = true;
 
+    /// Allocate CPU slots from concurrency control
+    constexpr size_t min_threads = 1;
+    slots = ConcurrencyControl::instance().allocate(min_threads, num_threads);
+    size_t use_threads = slots->grantedCount();
+
     Queue queue;
     graph->initializeExecution(queue);
 
-    tasks.init(num_threads, profile_processors, trace_processors, read_progress_callback.get());
+    tasks.init(num_threads, use_threads, profile_processors, trace_processors, read_progress_callback.get());
     tasks.fill(queue);
+
+    std::unique_lock lock{threads_mutex};
+    threads.reserve(num_threads);
+}
+
+void PipelineExecutor::spawnThreads()
+{
+    while (auto slot = slots->tryAcquire())
+    {
+        std::unique_lock lock{threads_mutex};
+        size_t thread_num = threads.size();
+
+        /// Count of threads in use should be updated for proper finish() condition.
+        /// NOTE: this will not decrease `use_threads` below initially granted count
+        tasks.upscale(thread_num + 1);
+
+        /// Start new thread
+        threads.emplace_back([this, thread_num, thread_group = CurrentThread::getGroup(), slot = std::move(slot)]
+        {
+            /// ThreadStatus thread_status;
+
+            setThreadName("QueryPipelineEx");
+
+            if (thread_group)
+                CurrentThread::attachTo(thread_group);
+
+            try
+            {
+                executeSingleThread(thread_num);
+            }
+            catch (...)
+            {
+                /// In case of exception from executor itself, stop other threads.
+                finish();
+                tasks.getThreadContext(thread_num).setException(std::current_exception());
+            }
+        });
+    }
+}
+
+void PipelineExecutor::joinThreads()
+{
+    for (size_t thread_num = 0; ; thread_num++)
+    {
+        std::unique_lock lock{threads_mutex};
+        if (thread_num >= threads.size())
+            break;
+        if (threads[thread_num].joinable())
+        {
+            auto & thread = threads[thread_num];
+            lock.unlock(); // to avoid deadlock if thread we are going to join starts spawning threads
+            thread.join();
+        }
+    }
+    // NOTE: No races: all concurrent spawnThreads() calls are done from `threads`, but they're already joined.
 }
 
 void PipelineExecutor::executeImpl(size_t num_threads)
 {
     initializeExecution(num_threads);
 
-    using ThreadsData = std::vector<ThreadFromGlobalPool>;
-    ThreadsData threads;
-    threads.reserve(num_threads);
-
     bool finished_flag = false;
 
     SCOPE_EXIT_SAFE(
         if (!finished_flag)
         {
             finish();
-
-            for (auto & thread : threads)
-                if (thread.joinable())
-                    thread.join();
+            joinThreads();
         }
     );
 
     if (num_threads > 1)
     {
-        auto thread_group = CurrentThread::getGroup();
-
-        for (size_t i = 0; i < num_threads; ++i)
-        {
-            threads.emplace_back([this, thread_group, thread_num = i]
-            {
-                /// ThreadStatus thread_status;
-
-                setThreadName("QueryPipelineEx");
-
-                if (thread_group)
-                    CurrentThread::attachTo(thread_group);
-
-                try
-                {
-                    executeSingleThread(thread_num);
-                }
-                catch (...)
-                {
-                    /// In case of exception from executor itself, stop other threads.
-                    finish();
-                    tasks.getThreadContext(thread_num).setException(std::current_exception());
-                }
-            });
-        }
-
+        spawnThreads(); // start at least one thread
         tasks.processAsyncTasks();
-
-        for (auto & thread : threads)
-            if (thread.joinable())
-                thread.join();
+        joinThreads();
     }
     else
+    {
+        auto slot = slots->tryAcquire();
         executeSingleThread(0);
+    }
 
     finished_flag = true;
 }
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index c4d11ef688d..cea64d309fa 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -4,9 +4,10 @@
 #include <Processors/Executors/ExecutorTasks.h>
 #include <Common/EventCounter.h>
 #include <Common/logger_useful.h>
+#include <Common/ThreadPool.h>
+#include <Common/ConcurrencyControl.h>
 
 #include <queue>
-#include <stack>
 #include <mutex>
 
 namespace DB
@@ -59,7 +60,12 @@ private:
     ExecutingGraphPtr graph;
 
     ExecutorTasks tasks;
-    using Stack = std::stack<UInt64>;
+
+    // Concurrency control related
+    ConcurrencyControl::AllocationPtr slots;
+    ConcurrencyControl::SlotPtr single_thread_slot; // slot for single-thread mode to work using executeStep()
+    std::mutex threads_mutex;
+    std::vector<ThreadFromGlobalPool> threads;
 
     /// Flag that checks that initializeExecution was called.
     bool is_execution_initialized = false;
@@ -81,6 +87,8 @@ private:
 
     void initializeExecution(size_t num_threads); /// Initialize executor contexts and task_queue.
     void finalizeExecution(); /// Check all processors are finished.
+    void spawnThreads();
+    void joinThreads();
 
     /// Methods connected to execution.
     void executeImpl(size_t num_threads);
diff --git a/src/Processors/Formats/IOutputFormat.cpp b/src/Processors/Formats/IOutputFormat.cpp
index 3c4e6861151..47ebaa9c5f5 100644
--- a/src/Processors/Formats/IOutputFormat.cpp
+++ b/src/Processors/Formats/IOutputFormat.cpp
@@ -73,7 +73,6 @@ void IOutputFormat::work()
             setRowsBeforeLimit(rows_before_limit_counter->get());
 
         finalize();
-        finalized = true;
         return;
     }
 
@@ -120,9 +119,12 @@ void IOutputFormat::write(const Block & block)
 
 void IOutputFormat::finalize()
 {
+    if (finalized)
+        return;
     writePrefixIfNot();
     writeSuffixIfNot();
     finalizeImpl();
+    finalized = true;
 }
 
 }
diff --git a/src/Processors/Formats/ISchemaReader.cpp b/src/Processors/Formats/ISchemaReader.cpp
index 5a6ebf00660..4e3e7e4eeb8 100644
--- a/src/Processors/Formats/ISchemaReader.cpp
+++ b/src/Processors/Formats/ISchemaReader.cpp
@@ -1,6 +1,8 @@
 #include <Processors/Formats/ISchemaReader.h>
 #include <Formats/ReadSchemaUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <DataTypes/DataTypeString.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <boost/algorithm/string.hpp>
 
 namespace DB
@@ -17,35 +19,39 @@ namespace ErrorCodes
 
 void chooseResultColumnType(
     DataTypePtr & type,
-    const DataTypePtr & new_type,
-    CommonDataTypeChecker common_type_checker,
+    DataTypePtr & new_type,
+    std::function<void(DataTypePtr &, DataTypePtr &)> transform_types_if_needed,
     const DataTypePtr & default_type,
     const String & column_name,
     size_t row)
 {
     if (!type)
+    {
         type = new_type;
+        return;
+    }
+
+    if (!new_type || type->equals(*new_type))
+        return;
+
+    transform_types_if_needed(type, new_type);
+    if (type->equals(*new_type))
+        return;
 
     /// If the new type and the previous type for this column are different,
     /// we will use default type if we have it or throw an exception.
-    if (new_type && !type->equals(*new_type))
+    if (default_type)
+        type = default_type;
+    else
     {
-        DataTypePtr common_type;
-        if (common_type_checker)
-            common_type = common_type_checker(type, new_type);
-
-        if (common_type)
-            type = common_type;
-        else if (default_type)
-            type = default_type;
-        else
-            throw Exception(
-                ErrorCodes::TYPE_MISMATCH,
-                "Automatically defined type {} for column {} in row {} differs from type defined by previous rows: {}",
-                type->getName(),
-                column_name,
-                row,
-                new_type->getName());
+        throw Exception(
+            ErrorCodes::TYPE_MISMATCH,
+            "Automatically defined type {} for column {} in row {} differs from type defined by previous rows: {}. "
+            "You can specify the type for this column using setting schema_inference_hints",
+            type->getName(),
+            column_name,
+            row,
+            new_type->getName());
     }
 }
 
@@ -56,37 +62,46 @@ void checkResultColumnTypeAndAppend(NamesAndTypesList & result, DataTypePtr & ty
         if (!default_type)
             throw Exception(
                 ErrorCodes::ONLY_NULLS_WHILE_READING_SCHEMA,
-                "Cannot determine table structure by first {} rows of data, because some columns contain only Nulls", rows_read);
+                "Cannot determine type for column {} by first {} rows of data, most likely this column contains only Nulls or empty "
+                "Arrays/Maps. You can specify the type for this column using setting schema_inference_hints",
+                name,
+                rows_read);
 
         type = default_type;
     }
     result.emplace_back(name, type);
 }
 
-IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings)
-    : ISchemaReader(in_)
+IIRowSchemaReader::IIRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_)
+    : ISchemaReader(in_), default_type(default_type_), hints_str(format_settings_.schema_inference_hints), format_settings(format_settings_)
 {
-    if (!format_settings.column_names_for_schema_inference.empty())
+}
+
+
+void IIRowSchemaReader::setContext(ContextPtr & context)
+{
+    ColumnsDescription columns;
+    if (tryParseColumnsListFromString(hints_str, columns, context))
     {
-        /// column_names_for_schema_inference is a string in format 'column1,column2,column3,...'
-        boost::split(column_names, format_settings.column_names_for_schema_inference, boost::is_any_of(","));
-        for (auto & column_name : column_names)
-        {
-            std::string col_name_trimmed = boost::trim_copy(column_name);
-            if (!col_name_trimmed.empty())
-                column_name = col_name_trimmed;
-        }
+        for (const auto & [name, type] : columns.getAll())
+            hints[name] = type;
     }
 }
 
-IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings, DataTypePtr default_type_)
-    : IRowSchemaReader(in_, format_settings)
+IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
+    : IIRowSchemaReader(in_, format_settings_)
 {
-    default_type = default_type_;
+    initColumnNames(format_settings.column_names_for_schema_inference);
 }
 
-IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings, const DataTypes & default_types_)
-    : IRowSchemaReader(in_, format_settings)
+IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_)
+    : IIRowSchemaReader(in_, format_settings_, default_type_)
+{
+    initColumnNames(format_settings.column_names_for_schema_inference);
+}
+
+IRowSchemaReader::IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, const DataTypes & default_types_)
+    : IRowSchemaReader(in_, format_settings_)
 {
     default_types = default_types_;
 }
@@ -100,30 +115,6 @@ NamesAndTypesList IRowSchemaReader::readSchema()
             "Most likely setting input_format_max_rows_to_read_for_schema_inference is set to 0");
 
     DataTypes data_types = readRowAndGetDataTypes();
-    for (rows_read = 1; rows_read < max_rows_to_read; ++rows_read)
-    {
-        DataTypes new_data_types = readRowAndGetDataTypes();
-        if (new_data_types.empty())
-            /// We reached eof.
-            break;
-
-        if (new_data_types.size() != data_types.size())
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Rows have different amount of values");
-
-        for (size_t i = 0; i != data_types.size(); ++i)
-        {
-            /// We couldn't determine the type of this column in a new row, just skip it.
-            if (!new_data_types[i])
-                continue;
-
-            chooseResultColumnType(data_types[i], new_data_types[i], common_type_checker, getDefaultType(i), std::to_string(i + 1), rows_read);
-        }
-    }
-
-    /// Check that we read at list one column.
-    if (data_types.empty())
-        throw Exception(ErrorCodes::EMPTY_DATA_PASSED, "Cannot read rows from the data");
-
     /// If column names weren't set, use default names 'c1', 'c2', ...
     if (column_names.empty())
     {
@@ -137,6 +128,39 @@ NamesAndTypesList IRowSchemaReader::readSchema()
             ErrorCodes::INCORRECT_DATA,
             "The number of column names {} differs with the number of types {}", column_names.size(), data_types.size());
 
+    for (size_t i = 0; i != column_names.size(); ++i)
+    {
+        auto hint_it = hints.find(column_names[i]);
+        if (hint_it != hints.end())
+            data_types[i] = hint_it->second;
+    }
+
+    for (rows_read = 1; rows_read < max_rows_to_read; ++rows_read)
+    {
+        DataTypes new_data_types = readRowAndGetDataTypes();
+        if (new_data_types.empty())
+            /// We reached eof.
+            break;
+
+        if (new_data_types.size() != data_types.size())
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Rows have different amount of values");
+
+        for (size_t i = 0; i != data_types.size(); ++i)
+        {
+            /// Check if we couldn't determine the type of this column in a new row
+            /// or the type for this column was taken from hints.
+            if (!new_data_types[i] || hints.contains(column_names[i]))
+                continue;
+
+            auto transform_types_if_needed = [&](DataTypePtr & type, DataTypePtr & new_type){ transformTypesIfNeeded(type, new_type, i); };
+            chooseResultColumnType(data_types[i], new_data_types[i], transform_types_if_needed, getDefaultType(i), std::to_string(i + 1), rows_read);
+        }
+    }
+
+    /// Check that we read at list one column.
+    if (data_types.empty())
+        throw Exception(ErrorCodes::EMPTY_DATA_PASSED, "Cannot read rows from the data");
+
     NamesAndTypesList result;
     for (size_t i = 0; i != data_types.size(); ++i)
     {
@@ -147,6 +171,21 @@ NamesAndTypesList IRowSchemaReader::readSchema()
     return result;
 }
 
+void IRowSchemaReader::initColumnNames(const String & column_names_str)
+{
+    if (column_names_str.empty())
+        return;
+
+    /// column_names_for_schema_inference is a string in format 'column1,column2,column3,...'
+    boost::split(column_names, column_names_str, boost::is_any_of(","));
+    for (auto & column_name : column_names)
+    {
+        std::string col_name_trimmed = boost::trim_copy(column_name);
+        if (!col_name_trimmed.empty())
+            column_name = col_name_trimmed;
+    }
+}
+
 DataTypePtr IRowSchemaReader::getDefaultType(size_t column) const
 {
     if (default_type)
@@ -156,8 +195,13 @@ DataTypePtr IRowSchemaReader::getDefaultType(size_t column) const
     return nullptr;
 }
 
-IRowWithNamesSchemaReader::IRowWithNamesSchemaReader(ReadBuffer & in_, DataTypePtr default_type_)
-    : ISchemaReader(in_), default_type(default_type_)
+void IRowSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings);
+}
+
+IRowWithNamesSchemaReader::IRowWithNamesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_)
+    : IIRowSchemaReader(in_, format_settings_, default_type_)
 {
 }
 
@@ -177,10 +221,15 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
     names_order.reserve(names_and_types.size());
     for (const auto & [name, type] : names_and_types)
     {
-        names_to_types[name] = type;
+        auto hint_it = hints.find(name);
+        if (hint_it != hints.end())
+            names_to_types[name] = hint_it->second;
+        else
+            names_to_types[name] = type;
         names_order.push_back(name);
     }
 
+    auto transform_types_if_needed = [&](DataTypePtr & type, DataTypePtr & new_type){ transformTypesIfNeeded(type, new_type); };
     for (rows_read = 1; rows_read < max_rows_to_read; ++rows_read)
     {
         auto new_names_and_types = readRowAndGetNamesAndDataTypes(eof);
@@ -188,19 +237,26 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
             /// We reached eof.
             break;
 
-        for (const auto & [name, new_type] : new_names_and_types)
+        for (auto & [name, new_type] : new_names_and_types)
         {
             auto it = names_to_types.find(name);
             /// If we didn't see this column before, just add it.
             if (it == names_to_types.end())
             {
-                names_to_types[name] = new_type;
+                auto hint_it = hints.find(name);
+                if (hint_it != hints.end())
+                    names_to_types[name] = hint_it->second;
+                else
+                    names_to_types[name] = new_type;
                 names_order.push_back(name);
                 continue;
             }
 
+            if (hints.contains(name))
+                continue;
+
             auto & type = it->second;
-            chooseResultColumnType(type, new_type, common_type_checker, default_type, name, rows_read);
+            chooseResultColumnType(type, new_type, transform_types_if_needed, default_type, name, rows_read);
         }
     }
 
@@ -219,4 +275,9 @@ NamesAndTypesList IRowWithNamesSchemaReader::readSchema()
     return result;
 }
 
+void IRowWithNamesSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings);
+}
+
 }
diff --git a/src/Processors/Formats/ISchemaReader.h b/src/Processors/Formats/ISchemaReader.h
index 00987540d04..5d1f1fdc029 100644
--- a/src/Processors/Formats/ISchemaReader.h
+++ b/src/Processors/Formats/ISchemaReader.h
@@ -37,6 +37,26 @@ protected:
 
 using CommonDataTypeChecker = std::function<DataTypePtr(const DataTypePtr &, const DataTypePtr &)>;
 
+class IIRowSchemaReader : public ISchemaReader
+{
+public:
+    IIRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_ = nullptr);
+
+    bool needContext() const override { return !hints_str.empty(); }
+    void setContext(ContextPtr & context) override;
+
+protected:
+    void setMaxRowsToRead(size_t max_rows) override { max_rows_to_read = max_rows; }
+    size_t getNumRowsRead() const override { return rows_read; }
+
+    size_t max_rows_to_read;
+    size_t rows_read = 0;
+    DataTypePtr default_type;
+    String hints_str;
+    FormatSettings format_settings;
+    std::unordered_map<String, DataTypePtr> hints;
+};
+
 /// Base class for schema inference for formats that read data row by row.
 /// It reads data row by row (up to max_rows_to_read), determines types of columns
 /// for each row and compare them with types from the previous rows. If some column
@@ -44,17 +64,15 @@ using CommonDataTypeChecker = std::function<DataTypePtr(const DataTypePtr &, con
 /// (from argument default_type_) will be used for this column or the exception
 /// will be thrown (if default type is not set). If different columns have different
 /// default types, you can provide them by default_types_ argument.
-class IRowSchemaReader : public ISchemaReader
+class IRowSchemaReader : public IIRowSchemaReader
 {
 public:
-    IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings);
-    IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings, DataTypePtr default_type_);
-    IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings, const DataTypes & default_types_);
+    IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_);
+    IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_);
+    IRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, const DataTypes & default_types_);
 
     NamesAndTypesList readSchema() override;
 
-    void setCommonTypeChecker(CommonDataTypeChecker checker) { common_type_checker = checker; }
-
 protected:
     /// Read one row and determine types of columns in it.
     /// Return types in the same order in which the values were in the row.
@@ -64,17 +82,13 @@ protected:
 
     void setColumnNames(const std::vector<String> & names) { column_names = names; }
 
-    void setMaxRowsToRead(size_t max_rows) override { max_rows_to_read = max_rows; }
-    size_t getNumRowsRead() const override { return rows_read; }
+    virtual void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t index);
 
 private:
-
     DataTypePtr getDefaultType(size_t column) const;
-    size_t max_rows_to_read;
-    size_t rows_read = 0;
-    DataTypePtr default_type;
+    void initColumnNames(const String & column_names_str);
+
     DataTypes default_types;
-    CommonDataTypeChecker common_type_checker;
     std::vector<String> column_names;
 };
 
@@ -83,15 +97,13 @@ private:
 /// Differ from IRowSchemaReader in that after reading a row we get
 /// a map {column_name : type} and some columns may be missed in a single row
 /// (in this case we will use types from the previous rows for missed columns).
-class IRowWithNamesSchemaReader : public ISchemaReader
+class IRowWithNamesSchemaReader : public IIRowSchemaReader
 {
 public:
-    IRowWithNamesSchemaReader(ReadBuffer & in_, DataTypePtr default_type_ = nullptr);
+    IRowWithNamesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_ = nullptr);
     NamesAndTypesList readSchema() override;
     bool hasStrictOrderOfColumns() const override { return false; }
 
-    void setCommonTypeChecker(CommonDataTypeChecker checker) { common_type_checker = checker; }
-
 protected:
     /// Read one row and determine types of columns in it.
     /// Return list with names and types.
@@ -99,14 +111,7 @@ protected:
     /// Set eof = true if can't read more data.
     virtual NamesAndTypesList readRowAndGetNamesAndDataTypes(bool & eof) = 0;
 
-    void setMaxRowsToRead(size_t max_rows) override { max_rows_to_read = max_rows; }
-    size_t getNumRowsRead() const override { return rows_read; }
-
-private:
-    size_t max_rows_to_read;
-    size_t rows_read = 0;
-    DataTypePtr default_type;
-    CommonDataTypeChecker common_type_checker;
+    virtual void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type);
 };
 
 /// Base class for schema inference for formats that don't need any data to
@@ -122,8 +127,8 @@ public:
 
 void chooseResultColumnType(
     DataTypePtr & type,
-    const DataTypePtr & new_type,
-    CommonDataTypeChecker common_type_checker,
+    DataTypePtr & new_type,
+    std::function<void(DataTypePtr &, DataTypePtr &)> transform_types_if_needed,
     const DataTypePtr & default_type,
     const String & column_name,
     size_t row);
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index f922ff048b2..23b07116df3 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -70,6 +70,7 @@ namespace ErrorCodes
     extern const int THERE_IS_NO_COLUMN;
     extern const int UNKNOWN_EXCEPTION;
     extern const int INCORRECT_NUMBER_OF_COLUMNS;
+    extern const int INCORRECT_DATA;
 }
 
 /// Inserts numeric data right into internal column data to reduce an overhead
@@ -98,6 +99,7 @@ static ColumnWithTypeAndName readColumnWithNumericData(std::shared_ptr<arrow::Ch
 /// Inserts chars and offsets right into internal column data to reduce an overhead.
 /// Internal offsets are shifted by one to the right in comparison with Arrow ones. So the last offset should map to the end of all chars.
 /// Also internal strings are null terminated.
+template <typename ArrowArray>
 static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = std::make_shared<DataTypeString>();
@@ -108,7 +110,7 @@ static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::Chu
     size_t chars_t_size = 0;
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
     {
-        arrow::BinaryArray & chunk = dynamic_cast<arrow::BinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        ArrowArray & chunk = dynamic_cast<ArrowArray &>(*(arrow_column->chunk(chunk_i)));
         const size_t chunk_length = chunk.length();
 
         if (chunk_length > 0)
@@ -123,7 +125,7 @@ static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::Chu
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
     {
-        arrow::BinaryArray & chunk = dynamic_cast<arrow::BinaryArray &>(*(arrow_column->chunk(chunk_i)));
+        ArrowArray & chunk = dynamic_cast<ArrowArray &>(*(arrow_column->chunk(chunk_i)));
         std::shared_ptr<arrow::Buffer> buffer = chunk.value_data();
         const size_t chunk_length = chunk.length();
 
@@ -265,6 +267,9 @@ static ColumnWithTypeAndName readColumnWithDecimalData(std::shared_ptr<arrow::Ch
 /// Creates a null bytemap from arrow's null bitmap
 static ColumnPtr readByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
+    if (!arrow_column->null_count())
+        return ColumnUInt8::create(arrow_column->length(), 0);
+
     auto nullmap_column = ColumnUInt8::create();
     PaddedPODArray<UInt8> & bytemap_data = assert_cast<ColumnVector<UInt8> &>(*nullmap_column).getData();
     bytemap_data.reserve(arrow_column->length());
@@ -297,14 +302,121 @@ static ColumnPtr readOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedAr
     return offsets_column;
 }
 
-static ColumnPtr readColumnWithIndexesData(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
+/*
+ * Arrow Dictionary and ClickHouse LowCardinality types are a bit different.
+ * Dictionary(Nullable(X)) in ArrowColumn format is composed of a nullmap, dictionary and an index.
+ * It doesn't have the concept of null or default values.
+ * An empty string is just a regular value appended at any position of the dictionary.
+ * Null values have an index of 0, but it should be ignored since the nullmap will return null.
+ * In ClickHouse LowCardinality, it's different. The dictionary contains null (if dictionary type is Nullable)
+ * and default values at the beginning. [default, ...] when default values have index of 0 or [null, default, ...]
+ * when null values have an index of 0 and default values have an index of 1.
+ * So, we should remap indexes while converting Arrow Dictionary to ClickHouse LowCardinality
+ * */
+template <typename NumericType, typename VectorType = ColumnVector<NumericType>>
+static ColumnWithTypeAndName readColumnWithIndexesDataImpl(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, Int64 default_value_index, NumericType dict_size, bool is_nullable)
+{
+    auto internal_type = std::make_shared<DataTypeNumber<NumericType>>();
+    auto internal_column = internal_type->createColumn();
+    auto & column_data = static_cast<VectorType &>(*internal_column).getData();
+    column_data.reserve(arrow_column->length());
+    NumericType shift = is_nullable ? 2 : 1;
+
+    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    {
+        std::shared_ptr<arrow::Array> chunk = arrow_column->chunk(chunk_i);
+        if (chunk->length() == 0)
+            continue;
+
+        /// buffers[0] is a null bitmap and buffers[1] are actual values
+        std::shared_ptr<arrow::Buffer> buffer = chunk->data()->buffers[1];
+        const auto * data = reinterpret_cast<const NumericType *>(buffer->data());
+
+        /// Check that indexes are correct (protection against corrupted files)
+        for (int64_t i = 0; i != chunk->length(); ++i)
+        {
+            if (data[i] < 0 || data[i] >= dict_size)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Index {} in Dictionary column is out of bounds, dictionary size is {}", Int64(data[i]), UInt64(dict_size));
+        }
+
+        /// If dictionary type is not nullable and arrow dictionary contains default type
+        /// at 0 index, we don't need to remap anything (it's the case when this data
+        /// was generated by ClickHouse)
+        if (!is_nullable && default_value_index == 0)
+        {
+            column_data.insert_assume_reserved(data, data + chunk->length());
+        }
+        /// If dictionary don't contain default value, we should move all indexes
+        /// to the right one or two (if dictionary is Nullable) positions
+        /// Example:
+        /// Dictionary:
+        ///     dict: ["one", "two"]
+        ///     indexes: [0, 1, 0]
+        /// LowCardinality:
+        ///     dict: ["", "one", "two"]
+        ///     indexes: [1, 2, 1]
+        /// LowCardinality(Nullable):
+        ///     dict: [null, "", "one", "two"]
+        ///     indexes: [2, 3, 2]
+        else if (default_value_index == -1)
+        {
+            for (int64_t i = 0; i != chunk->length(); ++i)
+            {
+                if (chunk->IsNull(i))
+                    column_data.push_back(0);
+                else
+                    column_data.push_back(data[i] + shift);
+            }
+        }
+        /// If dictionary contains default value, we change all indexes of it to
+        /// 0 or 1 (if dictionary type is Nullable) and move all indexes
+        /// that are less then default value index to the right one or two
+        /// (if dictionary is Nullable) position and all indexes that are
+        /// greater then default value index zero or one (if dictionary is Nullable)
+        /// positions.
+        /// Example:
+        /// Dictionary:
+        ///     dict: ["one", "two", "", "three"]
+        ///     indexes: [0, 1, 2, 3, 0]
+        /// LowCardinality :
+        ///     dict: ["", "one", "two", "three"]
+        ///     indexes: [1, 2, 0, 3, 1]
+        /// LowCardinality(Nullable):
+        ///     dict: [null, "", "one", "two", "three"]
+        ///     indexes: [2, 3, 1, 4, 2]
+        else
+        {
+            NumericType new_default_index = is_nullable ? 1 : 0;
+            NumericType default_index = NumericType(default_value_index);
+            for (int64_t i = 0; i != chunk->length(); ++i)
+            {
+                if (chunk->IsNull(i))
+                    column_data.push_back(0);
+                else
+                {
+                    NumericType value = data[i];
+                    if (value == default_index)
+                        value = new_default_index;
+                    else if (value < default_index)
+                        value += shift;
+                    else
+                        value += shift - 1;
+                    column_data.push_back(value);
+                }
+            }
+        }
+    }
+    return {std::move(internal_column), std::move(internal_type), column_name};
+}
+
+static ColumnPtr readColumnWithIndexesData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, Int64 default_value_index, UInt64 dict_size, bool is_nullable)
 {
     switch (arrow_column->type()->id())
     {
 #    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
             case ARROW_NUMERIC_TYPE: \
             { \
-                    return readColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, "").column; \
+                    return readColumnWithIndexesDataImpl<CPP_NUMERIC_TYPE>(arrow_column, "", default_value_index, dict_size, is_nullable).column; \
             }
         FOR_ARROW_INDEXES_TYPES(DISPATCH)
 #    undef DISPATCH
@@ -331,16 +443,20 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
     const std::string & column_name,
     const std::string & format_name,
     bool is_nullable,
-    std::unordered_map<String, std::shared_ptr<ColumnWithTypeAndName>> & dictionary_values,
-    bool read_ints_as_dates,
+    std::unordered_map<String, ArrowColumnToCHColumn::DictionaryInfo> & dictionary_infos,
     bool allow_null_type,
     bool skip_columns_with_unsupported_types,
-    bool & skipped)
+    bool & skipped,
+    DataTypePtr type_hint = nullptr)
 {
-    if (!is_nullable && arrow_column->null_count() && arrow_column->type()->id() != arrow::Type::LIST
-        && arrow_column->type()->id() != arrow::Type::MAP && arrow_column->type()->id() != arrow::Type::STRUCT)
+    if (!is_nullable && (arrow_column->null_count() || (type_hint && type_hint->isNullable())) && arrow_column->type()->id() != arrow::Type::LIST
+        && arrow_column->type()->id() != arrow::Type::MAP && arrow_column->type()->id() != arrow::Type::STRUCT &&
+        arrow_column->type()->id() != arrow::Type::DICTIONARY)
     {
-        auto nested_column = readColumnFromArrowColumn(arrow_column, column_name, format_name, true, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
+        DataTypePtr nested_type_hint;
+        if (type_hint)
+            nested_type_hint = removeNullable(type_hint);
+        auto nested_column = readColumnFromArrowColumn(arrow_column, column_name, format_name, true, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, nested_type_hint);
         if (skipped)
             return {};
         auto nullmap_column = readByteMapFromArrowColumn(arrow_column);
@@ -354,7 +470,10 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         case arrow::Type::STRING:
         case arrow::Type::BINARY:
             //case arrow::Type::FIXED_SIZE_BINARY:
-            return readColumnWithStringData(arrow_column, column_name);
+            return readColumnWithStringData<arrow::BinaryArray>(arrow_column, column_name);
+        case arrow::Type::LARGE_BINARY:
+        case arrow::Type::LARGE_STRING:
+            return readColumnWithStringData<arrow::LargeBinaryArray>(arrow_column, column_name);
         case arrow::Type::BOOL:
             return readColumnWithBooleanData(arrow_column, column_name);
         case arrow::Type::DATE32:
@@ -367,14 +486,14 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         case arrow::Type::UINT16:
         {
             auto column = readColumnWithNumericData<UInt16>(arrow_column, column_name);
-            if (read_ints_as_dates)
+            if (type_hint && (isDateOrDate32(type_hint) || isDateTime(type_hint) || isDateTime64(type_hint)))
                 column.type = std::make_shared<DataTypeDate>();
             return column;
         }
         case arrow::Type::UINT32:
         {
             auto column = readColumnWithNumericData<UInt32>(arrow_column, column_name);
-            if (read_ints_as_dates)
+            if (type_hint && (isDateOrDate32(type_hint) || isDateTime(type_hint) || isDateTime64(type_hint)))
                 column.type = std::make_shared<DataTypeDateTime>();
             return column;
         }
@@ -386,8 +505,15 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             return readColumnWithDecimalData<arrow::Decimal256Array>(arrow_column, column_name);
         case arrow::Type::MAP:
         {
+            DataTypePtr nested_type_hint;
+            if (type_hint)
+            {
+                const auto * map_type_hint = typeid_cast<const DataTypeMap *>(type_hint.get());
+                if (map_type_hint)
+                    nested_type_hint = assert_cast<const DataTypeArray *>(map_type_hint->getNestedType().get())->getNestedType();
+            }
             auto arrow_nested_column = getNestedArrowColumn(arrow_column);
-            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, nested_type_hint);
             if (skipped)
                 return {};
 
@@ -401,8 +527,15 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         }
         case arrow::Type::LIST:
         {
+            DataTypePtr nested_type_hint;
+            if (type_hint)
+            {
+                const auto * array_type_hint = typeid_cast<const DataTypeArray *>(type_hint.get());
+                if (array_type_hint)
+                    nested_type_hint = array_type_hint->getNestedType();
+            }
             auto arrow_nested_column = getNestedArrowColumn(arrow_column);
-            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, nested_type_hint);
             if (skipped)
                 return {};
             auto offsets_column = readOffsetsFromArrowListColumn(arrow_column);
@@ -425,11 +558,25 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             Columns tuple_elements;
             DataTypes tuple_types;
             std::vector<String> tuple_names;
+            const auto * tuple_type_hint = type_hint ? typeid_cast<const DataTypeTuple *>(type_hint.get()) : nullptr;
 
             for (int i = 0; i != arrow_struct_type->num_fields(); ++i)
             {
+                auto field_name = arrow_struct_type->field(i)->name();
+                DataTypePtr nested_type_hint;
+                if (tuple_type_hint)
+                {
+                    if (tuple_type_hint->haveExplicitNames())
+                    {
+                        auto pos = tuple_type_hint->tryGetPositionByName(field_name);
+                        if (pos)
+                            nested_type_hint = tuple_type_hint->getElement(*pos);
+                    }
+                    else if (size_t(i) < tuple_type_hint->getElements().size())
+                        nested_type_hint = tuple_type_hint->getElement(i);
+                }
                 auto nested_arrow_column = std::make_shared<arrow::ChunkedArray>(nested_arrow_columns[i]);
-                auto element = readColumnFromArrowColumn(nested_arrow_column, arrow_struct_type->field(i)->name(), format_name, false, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
+                auto element = readColumnFromArrowColumn(nested_arrow_column, field_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, nested_type_hint);
                 if (skipped)
                     return {};
                 tuple_elements.emplace_back(std::move(element.column));
@@ -443,9 +590,11 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         }
         case arrow::Type::DICTIONARY:
         {
-            auto & dict_values = dictionary_values[column_name];
+            auto & dict_info = dictionary_infos[column_name];
+            const auto is_lc_nullable = arrow_column->null_count() > 0 || (type_hint && type_hint->isLowCardinalityNullable());
+
             /// Load dictionary values only once and reuse it.
-            if (!dict_values)
+            if (!dict_info.values)
             {
                 arrow::ArrayVector dict_array;
                 for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -454,14 +603,22 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                     dict_array.emplace_back(dict_chunk.dictionary());
                 }
                 auto arrow_dict_column = std::make_shared<arrow::ChunkedArray>(dict_array);
-                auto dict_column = readColumnFromArrowColumn(arrow_dict_column, column_name, format_name, false, dictionary_values, read_ints_as_dates, allow_null_type, skip_columns_with_unsupported_types, skipped);
-
-                /// We should convert read column to ColumnUnique.
-                auto tmp_lc_column = DataTypeLowCardinality(dict_column.type).createColumn();
+                auto dict_column = readColumnFromArrowColumn(arrow_dict_column, column_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped);
+                for (size_t i = 0; i != dict_column.column->size(); ++i)
+                {
+                    if (dict_column.column->isDefaultAt(i))
+                    {
+                        dict_info.default_value_index = i;
+                        break;
+                    }
+                }
+                auto lc_type = std::make_shared<DataTypeLowCardinality>(is_lc_nullable ? makeNullable(dict_column.type) : dict_column.type);
+                auto tmp_lc_column = lc_type->createColumn();
                 auto tmp_dict_column = IColumn::mutate(assert_cast<ColumnLowCardinality *>(tmp_lc_column.get())->getDictionaryPtr());
-                static_cast<IColumnUnique *>(tmp_dict_column.get())->uniqueInsertRangeFrom(*dict_column.column, 0, dict_column.column->size());
+                dynamic_cast<IColumnUnique *>(tmp_dict_column.get())->uniqueInsertRangeFrom(*dict_column.column, 0, dict_column.column->size());
                 dict_column.column = std::move(tmp_dict_column);
-                dict_values = std::make_shared<ColumnWithTypeAndName>(std::move(dict_column));
+                dict_info.values = std::make_shared<ColumnWithTypeAndName>(std::move(dict_column));
+                dict_info.dictionary_size = arrow_dict_column->length();
             }
 
             arrow::ArrayVector indexes_array;
@@ -472,9 +629,9 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             }
 
             auto arrow_indexes_column = std::make_shared<arrow::ChunkedArray>(indexes_array);
-            auto indexes_column = readColumnWithIndexesData(arrow_indexes_column);
-            auto lc_column = ColumnLowCardinality::create(dict_values->column, indexes_column);
-            auto lc_type = std::make_shared<DataTypeLowCardinality>(dict_values->type);
+            auto indexes_column = readColumnWithIndexesData(arrow_indexes_column, dict_info.default_value_index, dict_info.dictionary_size, is_lc_nullable);
+            auto lc_column = ColumnLowCardinality::create(dict_info.values->column, indexes_column);
+            auto lc_type = std::make_shared<DataTypeLowCardinality>(is_lc_nullable ? makeNullable(dict_info.values->type) : dict_info.values->type);
             return {std::move(lc_column), std::move(lc_type), column_name};
         }
 #    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
@@ -551,13 +708,13 @@ Block ArrowColumnToCHColumn::arrowSchemaToCHHeader(
 
         arrow::ArrayVector array_vector = {arrow_array};
         auto arrow_column = std::make_shared<arrow::ChunkedArray>(array_vector);
-        std::unordered_map<std::string, std::shared_ptr<ColumnWithTypeAndName>> dict_values;
+        std::unordered_map<std::string, DictionaryInfo> dict_infos;
         bool skipped = false;
         bool allow_null_type = false;
         if (hint_header && hint_header->has(field->name()) && hint_header->getByName(field->name()).type->isNullable())
             allow_null_type = true;
         ColumnWithTypeAndName sample_column = readColumnFromArrowColumn(
-            arrow_column, field->name(), format_name, false, dict_values, false, allow_null_type, skip_columns_with_unsupported_types, skipped);
+            arrow_column, field->name(), format_name, false, dict_infos, allow_null_type, skip_columns_with_unsupported_types, skipped);
         if (!skipped)
             sample_columns.emplace_back(std::move(sample_column));
     }
@@ -628,9 +785,17 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
                 {
                     if (!nested_tables.contains(search_nested_table_name))
                     {
+                        NamesAndTypesList nested_columns;
+                        for (const auto & name_and_type : header.getNamesAndTypesList())
+                        {
+                            if (name_and_type.name.starts_with(nested_table_name + "."))
+                                nested_columns.push_back(name_and_type);
+                        }
+                        auto nested_table_type = Nested::collect(nested_columns).front().type;
+
                         std::shared_ptr<arrow::ChunkedArray> arrow_column = name_to_column_ptr[search_nested_table_name];
                         ColumnsWithTypeAndName cols = {readColumnFromArrowColumn(
-                            arrow_column, nested_table_name, format_name, false, dictionary_values, true, true, false, skipped)};
+                            arrow_column, nested_table_name, format_name, false, dictionary_infos, true, false, skipped, nested_table_type)};
                         BlockPtr block_ptr = std::make_shared<Block>(cols);
                         auto column_extractor = std::make_shared<NestedColumnExtractHelper>(*block_ptr, case_insensitive_matching);
                         nested_tables[search_nested_table_name] = {block_ptr, column_extractor};
@@ -663,7 +828,7 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
         {
             auto arrow_column = name_to_column_ptr[search_column_name];
             column = readColumnFromArrowColumn(
-                arrow_column, header_column.name, format_name, false, dictionary_values, true, true, false, skipped);
+                arrow_column, header_column.name, format_name, false, dictionary_infos, true, false, skipped, header_column.type);
         }
 
         try
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
index 695e14b7bba..092ed65d61a 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
@@ -44,6 +44,14 @@ public:
         const Block * hint_header = nullptr,
         bool ignore_case = false);
 
+    struct DictionaryInfo
+    {
+        std::shared_ptr<ColumnWithTypeAndName> values;
+        Int64 default_value_index = -1;
+        UInt64 dictionary_size;
+    };
+
+
 private:
     const Block & header;
     const std::string format_name;
@@ -55,7 +63,7 @@ private:
     /// Map {column name : dictionary column}.
     /// To avoid converting dictionary from Arrow Dictionary
     /// to LowCardinality every chunk we save it and reuse.
-    std::unordered_map<std::string, std::shared_ptr<ColumnWithTypeAndName>> dictionary_values;
+    std::unordered_map<std::string, DictionaryInfo> dictionary_infos;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index 6b056e64d41..75a318ce372 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -6,7 +6,7 @@
 
 #include <Core/Field.h>
 
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 
 #include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
@@ -777,13 +777,13 @@ private:
     }
 
     Poco::URI base_url;
-    LRUCache<uint32_t, avro::ValidSchema> schema_cache;
+    CacheBase<uint32_t, avro::ValidSchema> schema_cache;
 };
 
 using ConfluentSchemaRegistry = AvroConfluentRowInputFormat::SchemaRegistry;
 #define SCHEMA_REGISTRY_CACHE_MAX_SIZE 1000
 /// Cache of Schema Registry URL -> SchemaRegistry
-static LRUCache<std::string, ConfluentSchemaRegistry>  schema_registry_cache(SCHEMA_REGISTRY_CACHE_MAX_SIZE);
+static CacheBase<std::string, ConfluentSchemaRegistry>  schema_registry_cache(SCHEMA_REGISTRY_CACHE_MAX_SIZE);
 
 static std::shared_ptr<ConfluentSchemaRegistry> getConfluentSchemaRegistry(const FormatSettings & format_settings)
 {
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 34c120c3f52..9e423f8a96b 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -47,7 +47,8 @@
         M(INT64, arrow::Int64Type) \
         M(FLOAT, arrow::FloatType) \
         M(DOUBLE, arrow::DoubleType) \
-        M(BINARY, arrow::BinaryType)
+        M(BINARY, arrow::BinaryType) \
+        M(STRING, arrow::StringType)
 
 namespace DB
 {
@@ -234,27 +235,30 @@ namespace DB
     }
 
     template<typename T>
-    static PaddedPODArray<Int64> extractIndexesImpl(ColumnPtr column, size_t start, size_t end)
+    static PaddedPODArray<Int64> extractIndexesImpl(ColumnPtr column, size_t start, size_t end, bool shift)
     {
         const PaddedPODArray<T> & data = assert_cast<const ColumnVector<T> *>(column.get())->getData();
         PaddedPODArray<Int64> result;
         result.reserve(end - start);
-        std::transform(data.begin() + start, data.begin() + end, std::back_inserter(result), [](T value) { return Int64(value); });
+        if (shift)
+            std::transform(data.begin() + start, data.begin() + end, std::back_inserter(result), [](T value) { return Int64(value) - 1; });
+        else
+            std::transform(data.begin() + start, data.begin() + end, std::back_inserter(result), [](T value) { return Int64(value); });
         return result;
     }
 
-    static PaddedPODArray<Int64> extractIndexesImpl(ColumnPtr column, size_t start, size_t end)
+    static PaddedPODArray<Int64> extractIndexesImpl(ColumnPtr column, size_t start, size_t end, bool shift)
     {
         switch (column->getDataType())
         {
             case TypeIndex::UInt8:
-                return extractIndexesImpl<UInt8>(column, start, end);
+                return extractIndexesImpl<UInt8>(column, start, end, shift);
             case TypeIndex::UInt16:
-                return extractIndexesImpl<UInt16>(column, start, end);
+                return extractIndexesImpl<UInt16>(column, start, end, shift);
             case TypeIndex::UInt32:
-                return extractIndexesImpl<UInt32>(column, start, end);
+                return extractIndexesImpl<UInt32>(column, start, end, shift);
             case TypeIndex::UInt64:
-                return extractIndexesImpl<UInt64>(column, start, end);
+                return extractIndexesImpl<UInt64>(column, start, end, shift);
             default:
                 throw Exception(fmt::format("Indexes column must be ColumnUInt, got {}.", column->getName()),
                                 ErrorCodes::LOGICAL_ERROR);
@@ -266,7 +270,7 @@ namespace DB
         const String & column_name,
         ColumnPtr & column,
         const std::shared_ptr<const IDataType> & column_type,
-        const PaddedPODArray<UInt8> * null_bytemap,
+        const PaddedPODArray<UInt8> *,
         arrow::ArrayBuilder * array_builder,
         String format_name,
         size_t start,
@@ -277,6 +281,7 @@ namespace DB
         const auto * column_lc = assert_cast<const ColumnLowCardinality *>(column.get());
         arrow::DictionaryBuilder<ValueType> * builder = assert_cast<arrow::DictionaryBuilder<ValueType> *>(array_builder);
         auto & dict_values = dictionary_values[column_name];
+        bool is_nullable = column_type->isLowCardinalityNullable();
 
         /// Convert dictionary from LowCardinality to Arrow dictionary only once and then reuse it.
         if (!dict_values)
@@ -287,9 +292,9 @@ namespace DB
             arrow::Status status = MakeBuilder(pool, value_type, &values_builder);
             checkStatus(status, column->getName(), format_name);
 
-            auto dict_column = column_lc->getDictionary().getNestedColumn();
-            const auto & dict_type = assert_cast<const DataTypeLowCardinality *>(column_type.get())->getDictionaryType();
-            fillArrowArray(column_name, dict_column, dict_type, nullptr, values_builder.get(), format_name, 0, dict_column->size(), output_string_as_string, dictionary_values);
+            auto dict_column = column_lc->getDictionary().getNestedNotNullableColumn();
+            const auto & dict_type = removeNullable(assert_cast<const DataTypeLowCardinality *>(column_type.get())->getDictionaryType());
+            fillArrowArray(column_name, dict_column, dict_type, nullptr, values_builder.get(), format_name, is_nullable, dict_column->size(), output_string_as_string, dictionary_values);
             status = values_builder->Finish(&dict_values);
             checkStatus(status, column->getName(), format_name);
         }
@@ -299,15 +304,14 @@ namespace DB
 
         /// AppendIndices in DictionaryBuilder works only with int64_t data, so we cannot use
         /// fillArrowArray here and should copy all indexes to int64_t container.
-        auto indexes = extractIndexesImpl(column_lc->getIndexesPtr(), start, end);
+        auto indexes = extractIndexesImpl(column_lc->getIndexesPtr(), start, end, is_nullable);
         const uint8_t * arrow_null_bytemap_raw_ptr = nullptr;
         PaddedPODArray<uint8_t> arrow_null_bytemap;
-        if (null_bytemap)
+        if (column_type->isLowCardinalityNullable())
         {
-            /// Invert values since Arrow interprets 1 as a non-null value, while CH as a null
             arrow_null_bytemap.reserve(end - start);
             for (size_t i = start; i < end; ++i)
-                arrow_null_bytemap.emplace_back(!(*null_bytemap)[i]);
+                arrow_null_bytemap.emplace_back(!column_lc->isNullAt(i));
 
             arrow_null_bytemap_raw_ptr = arrow_null_bytemap.data();
         }
@@ -679,7 +683,7 @@ namespace DB
         {
             auto nested_type = assert_cast<const DataTypeLowCardinality *>(column_type.get())->getDictionaryType();
             const auto * lc_column = assert_cast<const ColumnLowCardinality *>(column.get());
-            const auto & nested_column = lc_column->getDictionaryPtr();
+            const auto & nested_column = lc_column->getDictionary().getNestedColumn();
             const auto & indexes_column = lc_column->getIndexesPtr();
             return arrow::dictionary(
                 getArrowTypeForLowCardinalityIndexes(indexes_column),
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index 0dadbb75532..e94ac27870f 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -49,6 +49,11 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 {
     uint32_t segment_count;
     in->readStrict(reinterpret_cast<char*>(&segment_count), sizeof(uint32_t));
+    /// Don't allow large amount of segments as it's done in capnproto library:
+    /// https://github.com/capnproto/capnproto/blob/931074914eda9ca574b5c24d1169c0f7a5156594/c%2B%2B/src/capnp/serialize.c%2B%2B#L181
+    /// Large amount of segments can indicate that corruption happened.
+    if (segment_count >= 512)
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Message has too many segments. Most likely, data was corrupted");
 
     // one for segmentCount and one because segmentCount starts from 0
     const auto prefix_size = (2 + segment_count) * sizeof(uint32_t);
@@ -313,6 +318,8 @@ void registerInputFormatCapnProto(FormatFactory & factory)
         });
     factory.markFormatSupportsSubsetOfColumns("CapnProto");
     factory.registerFileExtension("capnp", "CapnProto");
+    factory.registerAdditionalInfoForSchemaCacheGetter(
+        "CapnProto", [](const FormatSettings & settings) { return "Format schema: " + settings.schema.format_schema; });
 }
 
 void registerCapnProtoSchemaReader(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
index 61488a94ccd..e5397ca0757 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.cpp
@@ -318,6 +318,11 @@ DataTypes CustomSeparatedSchemaReader::readRowAndGetDataTypes()
     return determineDataTypesByEscapingRule(fields, reader.getFormatSettings(), reader.getEscapingRule());
 }
 
+void CustomSeparatedSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings, reader.getEscapingRule());
+}
+
 void registerInputFormatCustomSeparated(FormatFactory & factory)
 {
     for (bool ignore_spaces : {false, true})
diff --git a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
index d9e62a1b8e9..c7e332b983f 100644
--- a/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CustomSeparatedRowInputFormat.h
@@ -97,6 +97,8 @@ public:
 private:
     DataTypes readRowAndGetDataTypes() override;
 
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t) override;
+
     PeekableReadBuffer buf;
     CustomSeparatedFormatReader reader;
     bool first_row = true;
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
index cdde87f2cf6..7f9fbddd554 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
@@ -1,5 +1,6 @@
 #include <Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h>
 #include <Formats/JSONUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <IO/ReadHelpers.h>
 #include <base/find_symbols.h>
 
@@ -181,13 +182,14 @@ JSONColumnsSchemaReaderBase::JSONColumnsSchemaReaderBase(
 {
 }
 
-void JSONColumnsSchemaReaderBase::chooseResulType(DataTypePtr & type, const DataTypePtr & new_type, const String & column_name, size_t row) const
+void JSONColumnsSchemaReaderBase::chooseResulType(DataTypePtr & type, DataTypePtr & new_type, const String & column_name, size_t row) const
 {
-    auto common_type_checker = [&](const DataTypePtr & first, const DataTypePtr & second)
+    auto convert_types_if_needed = [&](DataTypePtr & first, DataTypePtr & second)
     {
-        return JSONUtils::getCommonTypeForJSONFormats(first, second, format_settings.json.read_bools_as_numbers);
+        DataTypes types = {first, second};
+        transformInferredJSONTypesIfNeeded(types, format_settings);
     };
-    chooseResultColumnType(type, new_type, common_type_checker, nullptr, column_name, row);
+    chooseResultColumnType(type, new_type, convert_types_if_needed, nullptr, column_name, row);
 }
 
 NamesAndTypesList JSONColumnsSchemaReaderBase::readSchema()
@@ -260,7 +262,7 @@ DataTypePtr JSONColumnsSchemaReaderBase::readColumnAndGetDataType(const String &
         }
 
         readJSONField(field, in);
-        DataTypePtr field_type = JSONUtils::getDataTypeFromField(field);
+        DataTypePtr field_type = JSONUtils::getDataTypeFromField(field, format_settings);
         chooseResulType(column_type, field_type, column_name, rows_read);
         ++rows_read;
     }
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
index ac746a2e2d1..6769e60be22 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
@@ -83,7 +83,7 @@ private:
     DataTypePtr readColumnAndGetDataType(const String & column_name, size_t & rows_read, size_t max_rows_to_read);
 
     /// Choose result type for column from two inferred types from different rows.
-    void chooseResulType(DataTypePtr & type, const DataTypePtr & new_type, const String & column_name, size_t row) const;
+    void chooseResulType(DataTypePtr & type, DataTypePtr & new_type, const String & column_name, size_t row) const;
 
     const FormatSettings format_settings;
     std::unique_ptr<JSONColumnsReaderBase> reader;
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 1bc5223a712..8ea379beae5 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -6,6 +6,7 @@
 #include <Formats/FormatFactory.h>
 #include <Formats/verbosePrintString.h>
 #include <Formats/JSONUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <Formats/registerWithNamesAndTypes.h>
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
@@ -187,11 +188,6 @@ JSONCompactEachRowRowSchemaReader::JSONCompactEachRowRowSchemaReader(
     : FormatWithNamesAndTypesSchemaReader(in_, format_settings_, with_names_, with_types_, &reader)
     , reader(in_, yield_strings_, format_settings_)
 {
-    bool allow_bools_as_numbers = format_settings_.json.read_bools_as_numbers;
-    setCommonTypeChecker([allow_bools_as_numbers](const DataTypePtr & first, const DataTypePtr & second)
-    {
-        return JSONUtils::getCommonTypeForJSONFormats(first, second, allow_bools_as_numbers);
-    });
 }
 
 DataTypes JSONCompactEachRowRowSchemaReader::readRowAndGetDataTypes()
@@ -210,7 +206,12 @@ DataTypes JSONCompactEachRowRowSchemaReader::readRowAndGetDataTypes()
     if (in.eof())
         return {};
 
-    return JSONUtils::readRowAndGetDataTypesForJSONCompactEachRow(in, reader.yieldStrings());
+    return JSONUtils::readRowAndGetDataTypesForJSONCompactEachRow(in, format_settings, reader.yieldStrings());
+}
+
+void JSONCompactEachRowRowSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredJSONTypesIfNeeded(type, new_type, format_settings);
 }
 
 void registerInputFormatJSONCompactEachRow(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
index 79c76214774..7be9ba9289b 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.h
@@ -80,6 +80,8 @@ public:
 private:
     DataTypes readRowAndGetDataTypes() override;
 
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t) override;
+
     JSONCompactEachRowFormatReader reader;
     bool first_row = true;
 };
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 3bcea8a8843..7cb62f9bf83 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -3,6 +3,7 @@
 
 #include <Processors/Formats/Impl/JSONEachRowRowInputFormat.h>
 #include <Formats/JSONUtils.h>
+#include <Formats/EscapingRuleUtils.h>
 #include <Formats/FormatFactory.h>
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
@@ -306,18 +307,12 @@ void JSONEachRowRowInputFormat::readSuffix()
     assertEOF(*in);
 }
 
-JSONEachRowSchemaReader::JSONEachRowSchemaReader(ReadBuffer & in_, bool json_strings_, const FormatSettings & format_settings)
-    : IRowWithNamesSchemaReader(in_)
+JSONEachRowSchemaReader::JSONEachRowSchemaReader(ReadBuffer & in_, bool json_strings_, const FormatSettings & format_settings_)
+    : IRowWithNamesSchemaReader(in_, format_settings_)
     , json_strings(json_strings_)
 {
-    bool allow_bools_as_numbers = format_settings.json.read_bools_as_numbers;
-    setCommonTypeChecker([allow_bools_as_numbers](const DataTypePtr & first, const DataTypePtr & second)
-    {
-        return JSONUtils::getCommonTypeForJSONFormats(first, second, allow_bools_as_numbers);
-    });
 }
 
-
 NamesAndTypesList JSONEachRowSchemaReader::readRowAndGetNamesAndDataTypes(bool & eof)
 {
     if (first_row)
@@ -350,7 +345,12 @@ NamesAndTypesList JSONEachRowSchemaReader::readRowAndGetNamesAndDataTypes(bool &
         return {};
     }
 
-    return JSONUtils::readRowAndGetNamesAndDataTypesForJSONEachRow(in, json_strings);
+    return JSONUtils::readRowAndGetNamesAndDataTypesForJSONEachRow(in, format_settings, json_strings);
+}
+
+void JSONEachRowSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type)
+{
+    transformInferredJSONTypesIfNeeded(type, new_type, format_settings);
 }
 
 void registerInputFormatJSONEachRow(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
index 1673d55b9fd..e16e40ff9e9 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.h
@@ -88,10 +88,11 @@ private:
 class JSONEachRowSchemaReader : public IRowWithNamesSchemaReader
 {
 public:
-    JSONEachRowSchemaReader(ReadBuffer & in_, bool json_strings, const FormatSettings & format_settings);
+    JSONEachRowSchemaReader(ReadBuffer & in_, bool json_strings, const FormatSettings & format_settings_);
 
 private:
     NamesAndTypesList readRowAndGetNamesAndDataTypes(bool & eof) override;
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type) override;
 
     bool json_strings;
     bool first_row = true;
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.h b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
index 3459cc1b7a6..66b8d0f682e 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.h
@@ -72,7 +72,7 @@ protected:
 
     size_t field_number = 0;
     size_t row_count = 0;
-    NamesAndTypes fields;
+    NamesAndTypes fields;   /// The field names are pre-escaped to be put into JSON string literal.
 
     Statistics statistics;
     FormatSettings settings;
diff --git a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
index 8e787edf8ab..8c24f22ce13 100644
--- a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
@@ -402,7 +402,7 @@ void MySQLDumpRowInputFormat::skipField()
 }
 
 MySQLDumpSchemaReader::MySQLDumpSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : IRowSchemaReader(in_, format_settings_), format_settings(format_settings_), table_name(format_settings_.mysql_dump.table_name)
+    : IRowSchemaReader(in_, format_settings_), table_name(format_settings_.mysql_dump.table_name)
 {
 }
 
@@ -452,6 +452,9 @@ void registerInputFormatMySQLDump(FormatFactory & factory)
     {
         return std::make_shared<MySQLDumpRowInputFormat>(buf, header, params, settings);
     });
+
+    factory.registerAdditionalInfoForSchemaCacheGetter(
+        "MySQLDump", [](const FormatSettings & settings) { return "Table name: " + settings.mysql_dump.table_name; });
 }
 
 void registerMySQLSchemaReader(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h
index 2457f3d4762..6be20550e49 100644
--- a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h
+++ b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.h
@@ -35,7 +35,6 @@ private:
     NamesAndTypesList readSchema() override;
     DataTypes readRowAndGetDataTypes() override;
 
-    const FormatSettings format_settings;
     String table_name;
 };
 
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 8fbf0a14916..4920bf659f7 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -9,7 +9,6 @@
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <Common/PODArray.h>
 #include <Common/UTF8Helpers.h>
 
 namespace DB
@@ -21,8 +20,8 @@ namespace ErrorCodes
 
 
 PrettyBlockOutputFormat::PrettyBlockOutputFormat(
-    WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_)
-     : IOutputFormat(header_, out_), format_settings(format_settings_), serializations(header_.getSerializations())
+    WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_)
+     : IOutputFormat(header_, out_), format_settings(format_settings_), serializations(header_.getSerializations()), mono_block(mono_block_)
 {
     struct winsize w;
     if (0 == ioctl(STDOUT_FILENO, TIOCGWINSZ, &w))
@@ -142,17 +141,33 @@ GridSymbols ascii_grid_symbols {
 
 }
 
-
 void PrettyBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
 {
-    UInt64 max_rows = format_settings.pretty.max_rows;
-
-    if (total_rows >= max_rows)
+    if (total_rows >= format_settings.pretty.max_rows)
     {
         total_rows += chunk.getNumRows();
         return;
     }
+    if (mono_block)
+    {
+        if (port_kind == PortKind::Main)
+        {
+            if (mono_chunk)
+                mono_chunk.append(chunk);
+            else
+                mono_chunk = std::move(chunk);
+            return;
+        }
 
+        /// Should be written from writeSuffix()
+        assert(!mono_chunk);
+    }
+
+    writeChunk(chunk, port_kind);
+}
+
+void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind)
+{
     auto num_rows = chunk.getNumRows();
     auto num_columns = chunk.getNumColumns();
     const auto & columns = chunk.getColumns();
@@ -265,7 +280,7 @@ void PrettyBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
     }
     writeString(middle_names_separator_s, out);
 
-    for (size_t i = 0; i < num_rows && total_rows + i < max_rows; ++i)
+    for (size_t i = 0; i < num_rows && total_rows + i < format_settings.pretty.max_rows; ++i)
     {
         if (i != 0)
         {
@@ -385,8 +400,19 @@ void PrettyBlockOutputFormat::consumeExtremes(Chunk chunk)
 }
 
 
+void PrettyBlockOutputFormat::writeMonoChunkIfNeeded()
+{
+    if (mono_chunk)
+    {
+        writeChunk(mono_chunk, PortKind::Main);
+        mono_chunk.clear();
+    }
+}
+
 void PrettyBlockOutputFormat::writeSuffix()
 {
+    writeMonoChunkIfNeeded();
+
     if (total_rows >= format_settings.pretty.max_rows)
     {
         writeCString("  Showed first ", out);
@@ -395,32 +421,9 @@ void PrettyBlockOutputFormat::writeSuffix()
     }
 }
 
-
 void registerOutputFormatPretty(FormatFactory & factory)
 {
-    factory.registerOutputFormat("Pretty", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        return std::make_shared<PrettyBlockOutputFormat>(buf, sample, format_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("Pretty");
-
-    factory.registerOutputFormat("PrettyNoEscapes", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        FormatSettings changed_settings = format_settings;
-        changed_settings.pretty.color = false;
-        return std::make_shared<PrettyBlockOutputFormat>(buf, sample, changed_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettyNoEscapes");
+    registerPrettyFormatWithNoEscapesAndMonoBlock<PrettyBlockOutputFormat>(factory, "Pretty");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index cfdd2213515..c8ab22b123f 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -3,6 +3,7 @@
 #include <Core/Block.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Formats/FormatSettings.h>
+#include <Formats/FormatFactory.h>
 
 
 namespace DB
@@ -18,7 +19,7 @@ class PrettyBlockOutputFormat : public IOutputFormat
 {
 public:
     /// no_escapes - do not use ANSI escape sequences - to display in the browser, not in the console.
-    PrettyBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_);
+    PrettyBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_);
 
     String getName() const override { return "PrettyBlockOutputFormat"; }
 
@@ -38,7 +39,9 @@ protected:
     using Widths = PODArray<size_t>;
     using WidthsPerColumn = std::vector<Widths>;
 
-    virtual void write(Chunk chunk, PortKind port_kind);
+    void write(Chunk chunk, PortKind port_kind);
+    virtual void writeChunk(const Chunk & chunk, PortKind port_kind);
+    void writeMonoChunkIfNeeded();
     void writeSuffix() override;
 
     void onRowsReadBeforeUpdate() override { total_rows = getRowsReadBefore(); }
@@ -50,6 +53,39 @@ protected:
     void writeValueWithPadding(
         const IColumn & column, const ISerialization & serialization, size_t row_num,
         size_t value_width, size_t pad_to_width, bool align_right);
+
+private:
+    bool mono_block;
+    /// For mono_block == true only
+    Chunk mono_chunk;
 };
 
+template <class OutputFormat>
+void registerPrettyFormatWithNoEscapesAndMonoBlock(FormatFactory & factory, const String & base_name)
+{
+    auto creator = [&](FormatFactory & fact, const String & name, bool no_escapes, bool mono_block)
+    {
+        fact.registerOutputFormat(name, [no_escapes, mono_block](
+            WriteBuffer & buf,
+            const Block & sample,
+            const RowOutputFormatParams &,
+            const FormatSettings & format_settings)
+        {
+            if (no_escapes)
+            {
+                FormatSettings changed_settings = format_settings;
+                changed_settings.pretty.color = false;
+                return std::make_shared<OutputFormat>(buf, sample, changed_settings, mono_block);
+            }
+            return std::make_shared<OutputFormat>(buf, sample, format_settings, mono_block);
+        });
+        if (!mono_block)
+            factory.markOutputFormatSupportsParallelFormatting(name);
+    };
+    creator(factory, base_name, false, false);
+    creator(factory, base_name + "NoEscapes", true, false);
+    creator(factory, base_name + "MonoBlock", false, true);
+    creator(factory, base_name + "NoEscapesMonoBlock", true, true);
+}
+
 }
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
index 9ba358a76e1..cc26a064b54 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
@@ -49,22 +49,10 @@ GridSymbols ascii_grid_symbols {
 }
 
 PrettyCompactBlockOutputFormat::PrettyCompactBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_)
-    : PrettyBlockOutputFormat(out_, header, format_settings_)
-    , mono_block(mono_block_)
+    : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_)
 {
 }
 
-void PrettyCompactBlockOutputFormat::writeSuffix()
-{
-    if (mono_chunk)
-    {
-        writeChunk(mono_chunk, PortKind::Main);
-        mono_chunk.clear();
-    }
-
-    PrettyBlockOutputFormat::writeSuffix();
-}
-
 void PrettyCompactBlockOutputFormat::writeHeader(
     const Block & block,
     const Widths & max_widths,
@@ -186,38 +174,6 @@ void PrettyCompactBlockOutputFormat::writeRow(
     writeCString("\n", out);
 }
 
-void PrettyCompactBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
-{
-    UInt64 max_rows = format_settings.pretty.max_rows;
-
-    if (total_rows >= max_rows)
-    {
-        total_rows += chunk.getNumRows();
-        return;
-    }
-    if (mono_block)
-    {
-        if (port_kind == PortKind::Main)
-        {
-            if (!mono_chunk)
-            {
-                mono_chunk = std::move(chunk);
-                return;
-            }
-
-            mono_chunk.append(chunk);
-            return;
-        }
-        else
-        {
-            /// Should be written from writeSuffix()
-            assert(!mono_chunk);
-        }
-    }
-
-    writeChunk(chunk, port_kind);
-}
-
 void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind)
 {
     UInt64 max_rows = format_settings.pretty.max_rows;
@@ -244,31 +200,7 @@ void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind po
 
 void registerOutputFormatPrettyCompact(FormatFactory & factory)
 {
-    for (const auto & [name, mono_block] : {std::make_pair("PrettyCompact", false), std::make_pair("PrettyCompactMonoBlock", true)})
-    {
-        factory.registerOutputFormat(name, [mono_block = mono_block](
-            WriteBuffer & buf,
-            const Block & sample,
-            const RowOutputFormatParams &,
-            const FormatSettings & format_settings)
-        {
-            return std::make_shared<PrettyCompactBlockOutputFormat>(buf, sample, format_settings, mono_block);
-        });
-    }
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettyCompact");
-
-    factory.registerOutputFormat("PrettyCompactNoEscapes", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        FormatSettings changed_settings = format_settings;
-        changed_settings.pretty.color = false;
-        return std::make_shared<PrettyCompactBlockOutputFormat>(buf, sample, changed_settings, false /* mono_block */);
-    });
-    factory.markOutputFormatSupportsParallelFormatting("PrettyCompactNoEscapes");
+    registerPrettyFormatWithNoEscapesAndMonoBlock<PrettyCompactBlockOutputFormat>(factory, "PrettyCompact");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
index 5c39328051c..432ff0ee120 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
@@ -17,7 +17,6 @@ public:
     String getName() const override { return "PrettyCompactBlockOutputFormat"; }
 
 private:
-    void write(Chunk chunk, PortKind port_kind) override;
     void writeHeader(const Block & block, const Widths & max_widths, const Widths & name_widths);
     void writeBottom(const Widths & max_widths);
     void writeRow(
@@ -27,12 +26,7 @@ private:
         const WidthsPerColumn & widths,
         const Widths & max_widths);
 
-    bool mono_block;
-    /// For mono_block == true only
-    Chunk mono_chunk;
-
-    void writeChunk(const Chunk & chunk, PortKind port_kind);
-    void writeSuffix() override;
+    void writeChunk(const Chunk & chunk, PortKind port_kind) override;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index 730907ba45c..4afb380dec9 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -9,7 +9,7 @@ namespace DB
 {
 
 
-void PrettySpaceBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
+void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind)
 {
     UInt64 max_rows = format_settings.pretty.max_rows;
 
@@ -100,6 +100,8 @@ void PrettySpaceBlockOutputFormat::write(Chunk chunk, PortKind port_kind)
 
 void PrettySpaceBlockOutputFormat::writeSuffix()
 {
+    writeMonoChunkIfNeeded();
+
     if (total_rows >= format_settings.pretty.max_rows)
     {
         writeCString("\nShowed first ", out);
@@ -111,29 +113,7 @@ void PrettySpaceBlockOutputFormat::writeSuffix()
 
 void registerOutputFormatPrettySpace(FormatFactory & factory)
 {
-    factory.registerOutputFormat("PrettySpace", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, format_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettySpace");
-
-    factory.registerOutputFormat("PrettySpaceNoEscapes", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings & format_settings)
-    {
-        FormatSettings changed_settings = format_settings;
-        changed_settings.pretty.color = false;
-        return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, changed_settings);
-    });
-
-    factory.markOutputFormatSupportsParallelFormatting("PrettySpaceNoEscapes");
+    registerPrettyFormatWithNoEscapesAndMonoBlock<PrettySpaceBlockOutputFormat>(factory, "PrettySpace");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
index 6a8cb4e799c..1cccd5fb476 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
@@ -11,13 +11,13 @@ namespace DB
 class PrettySpaceBlockOutputFormat : public PrettyBlockOutputFormat
 {
 public:
-    PrettySpaceBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_)
-        : PrettyBlockOutputFormat(out_, header, format_settings_) {}
+    PrettySpaceBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_)
+        : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_) {}
 
     String getName() const override { return "PrettySpaceBlockOutputFormat"; }
 
 private:
-    void write(Chunk chunk, PortKind port_kind) override;
+    void writeChunk(const Chunk & chunk, PortKind port_kind) override;
     void writeSuffix() override;
 };
 
diff --git a/src/Processors/Formats/Impl/ProtobufListInputFormat.cpp b/src/Processors/Formats/Impl/ProtobufListInputFormat.cpp
index d4d80fe3a23..7af0d8a7094 100644
--- a/src/Processors/Formats/Impl/ProtobufListInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ProtobufListInputFormat.cpp
@@ -81,6 +81,8 @@ void registerInputFormatProtobufList(FormatFactory & factory)
                     FormatSchemaInfo(settings, "Protobuf", true), settings.protobuf.input_flatten_google_wrappers);
             });
     factory.markFormatSupportsSubsetOfColumns("ProtobufList");
+    factory.registerAdditionalInfoForSchemaCacheGetter(
+        "ProtobufList", [](const FormatSettings & settings) { return "Format schema: " + settings.schema.format_schema; });
 }
 
 void registerProtobufListSchemaReader(FormatFactory & factory)
diff --git a/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp b/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
index f4329b7ecfe..5fd4bb79fa0 100644
--- a/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
@@ -101,6 +101,10 @@ void registerProtobufSchemaReader(FormatFactory & factory)
     {
         return std::make_shared<ProtobufSchemaReader>(settings);
     });
+
+    for (const auto & name : {"Protobuf", "ProtobufSingle"})
+        factory.registerAdditionalInfoForSchemaCacheGetter(
+            name, [](const FormatSettings & settings) { return "Format schema: " + settings.schema.format_schema; });
 }
 
 }
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index d92f65f33d1..c6150863bd4 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -133,7 +133,6 @@ RegexpSchemaReader::RegexpSchemaReader(ReadBuffer & in_, const FormatSettings &
         buf,
         format_settings_,
         getDefaultDataTypeForEscapingRule(format_settings_.regexp.escaping_rule))
-    , format_settings(format_settings_)
     , field_extractor(format_settings)
     , buf(in_)
 {
@@ -157,6 +156,12 @@ DataTypes RegexpSchemaReader::readRowAndGetDataTypes()
     return data_types;
 }
 
+void RegexpSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings, format_settings.regexp.escaping_rule);
+}
+
+
 void registerInputFormatRegexp(FormatFactory & factory)
 {
     factory.registerInputFormat("Regexp", [](
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.h b/src/Processors/Formats/Impl/RegexpRowInputFormat.h
index 3cc6a3192fd..7fbb3fc320f 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.h
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.h
@@ -81,8 +81,10 @@ public:
 private:
     DataTypes readRowAndGetDataTypes() override;
 
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t) override;
+
+
     using EscapingRule = FormatSettings::EscapingRule;
-    const FormatSettings format_settings;
     RegexpFieldExtractor field_extractor;
     PeekableReadBuffer buf;
 };
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
index fe2c0c5ecdd..7393a1d6ce6 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
@@ -214,8 +214,7 @@ void TSKVRowInputFormat::resetParser()
 }
 
 TSKVSchemaReader::TSKVSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : IRowWithNamesSchemaReader(in_, getDefaultDataTypeForEscapingRule(FormatSettings::EscapingRule::Escaped))
-    , format_settings(format_settings_)
+    : IRowWithNamesSchemaReader(in_, format_settings_, getDefaultDataTypeForEscapingRule(FormatSettings::EscapingRule::Escaped))
 {
 }
 
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.h b/src/Processors/Formats/Impl/TSKVRowInputFormat.h
index bf8580bc6b7..5130ee5e827 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.h
@@ -61,7 +61,6 @@ public:
 private:
     NamesAndTypesList readRowAndGetNamesAndDataTypes(bool & eof) override;
 
-    const FormatSettings format_settings;
     bool first_row = true;
 };
 
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index df4d49b172c..6e8bba89d8c 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -458,7 +458,6 @@ TemplateSchemaReader::TemplateSchemaReader(
     , buf(in_)
     , format(format_)
     , row_format(row_format_)
-    , format_settings(format_settings_)
     , format_reader(buf, ignore_spaces_, format, row_format, row_between_delimiter, format_settings)
 {
     setColumnNames(row_format.column_names);
@@ -494,6 +493,11 @@ DataTypes TemplateSchemaReader::readRowAndGetDataTypes()
     return data_types;
 }
 
+void TemplateSchemaReader::transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t column_idx)
+{
+    transformInferredTypesIfNeeded(type, new_type, format_settings, row_format.escaping_rules[column_idx]);
+}
+
 static ParsedTemplateFormatString fillResultSetFormat(const FormatSettings & settings)
 {
     ParsedTemplateFormatString resultset_format;
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.h b/src/Processors/Formats/Impl/TemplateRowInputFormat.h
index ab7043f057e..740683ad95d 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.h
@@ -121,10 +121,11 @@ public:
     DataTypes readRowAndGetDataTypes() override;
 
 private:
+    void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type, size_t column_idx) override;
+
     PeekableReadBuffer buf;
     const ParsedTemplateFormatString format;
     const ParsedTemplateFormatString row_format;
-    FormatSettings format_settings;
     TemplateFormatReader format_reader;
     bool first_row = true;
 };
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 41f77f8bbf2..49b758b78c4 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -567,7 +567,7 @@ void ValuesBlockInputFormat::setReadBuffer(ReadBuffer & in_)
 }
 
 ValuesSchemaReader::ValuesSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : IRowSchemaReader(buf, format_settings_), buf(in_), format_settings(format_settings_)
+    : IRowSchemaReader(buf, format_settings_), buf(in_)
 {
 }
 
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index 9653e431b4e..bf243c54bd7 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -103,7 +103,6 @@ private:
     DataTypes readRowAndGetDataTypes() override;
 
     PeekableReadBuffer buf;
-    const FormatSettings format_settings;
     ParserExpression parser;
     bool first_row = true;
     bool end_of_data = false;
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
index a3dcbe914bb..9ff227e5dab 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
@@ -229,12 +229,12 @@ void RowInputFormatWithNamesAndTypes::setReadBuffer(ReadBuffer & in_)
 
 FormatWithNamesAndTypesSchemaReader::FormatWithNamesAndTypesSchemaReader(
     ReadBuffer & in_,
-    const FormatSettings & format_settings,
+    const FormatSettings & format_settings_,
     bool with_names_,
     bool with_types_,
     FormatWithNamesAndTypesReader * format_reader_,
     DataTypePtr default_type_)
-    : IRowSchemaReader(in_, format_settings, default_type_), with_names(with_names_), with_types(with_types_), format_reader(format_reader_)
+    : IRowSchemaReader(in_, format_settings_, default_type_), with_names(with_names_), with_types(with_types_), format_reader(format_reader_)
 {
 }
 
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
index 9fc8b2083df..0afc0146846 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
@@ -123,7 +123,7 @@ class FormatWithNamesAndTypesSchemaReader : public IRowSchemaReader
 public:
     FormatWithNamesAndTypesSchemaReader(
         ReadBuffer & in,
-        const FormatSettings & format_settings,
+        const FormatSettings & format_settings_,
         bool with_names_,
         bool with_types_,
         FormatWithNamesAndTypesReader * format_reader_,
diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index 9d885002cfe..6d17db69c9e 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -307,6 +307,33 @@ public:
     uint64_t getInputWaitElapsedUs() const { return input_wait_elapsed_us; }
     uint64_t getOutputWaitElapsedUs() const { return output_wait_elapsed_us; }
 
+    struct ProcessorDataStats
+    {
+        size_t input_rows = 0;
+        size_t input_bytes = 0;
+        size_t output_rows = 0;
+        size_t output_bytes = 0;
+    };
+
+    ProcessorDataStats getProcessorDataStats() const
+    {
+        ProcessorDataStats stats;
+
+        for (const auto & input : inputs)
+        {
+            stats.input_rows += input.rows;
+            stats.input_bytes += input.bytes;
+        }
+
+        for (const auto & output : outputs)
+        {
+            stats.output_rows += output.rows;
+            stats.output_bytes += output.bytes;
+        }
+
+        return stats;
+    }
+
     struct ReadProgressCounters
     {
         uint64_t read_rows = 0;
diff --git a/src/Processors/Port.h b/src/Processors/Port.h
index 06f9059c9c3..e3fb0e3e342 100644
--- a/src/Processors/Port.h
+++ b/src/Processors/Port.h
@@ -254,6 +254,10 @@ protected:
         if (likely(update_info))
             update_info->update();
     }
+
+    /// For processors_profile_log
+    size_t rows = 0;
+    size_t bytes = 0;
 };
 
 /// Invariants:
@@ -300,6 +304,9 @@ public:
                 chunk.dumpStructure());
         }
 
+        rows += data->chunk.getNumRows();
+        bytes += data->chunk.bytes();
+
         return std::move(*data);
     }
 
@@ -422,6 +429,10 @@ public:
 
         std::uintptr_t flags = 0;
         *data = std::move(data_);
+
+        rows += data->chunk.getNumRows();
+        bytes += data->chunk.bytes();
+
         state->push(data, flags);
     }
 
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index f4e3749bd70..f0374d2419b 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -239,15 +239,15 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
 
                 /// Here we create a DAG which fills missing keys and adds `__grouping_set` column
                 auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-                ActionsDAG::NodeRawConstPtrs index;
-                index.reserve(output_header.columns() + 1);
+                ActionsDAG::NodeRawConstPtrs outputs;
+                outputs.reserve(output_header.columns() + 1);
 
                 auto grouping_col = ColumnConst::create(ColumnUInt64::create(1, set_counter), 0);
                 const auto * grouping_node = &dag->addColumn(
                     {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
 
                 grouping_node = &dag->materializeNode(*grouping_node);
-                index.push_back(grouping_node);
+                outputs.push_back(grouping_node);
 
                 const auto & missing_columns = grouping_sets_params[set_counter].missing_keys;
 
@@ -264,19 +264,19 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
                         auto column = ColumnConst::create(std::move(column_with_default), 0);
                         const auto * node = &dag->addColumn({ColumnPtr(std::move(column)), col.type, col.name});
                         node = &dag->materializeNode(*node);
-                        index.push_back(node);
+                        outputs.push_back(node);
                     }
                     else
                     {
-                        const auto * column_node = dag->getIndex()[header.getPositionByName(col.name)];
+                        const auto * column_node = dag->getOutputs()[header.getPositionByName(col.name)];
                         if (group_by_use_nulls && column_node->result_type->canBeInsideNullable())
-                            index.push_back(&dag->addFunction(to_nullable_function, { column_node }, col.name));
+                            outputs.push_back(&dag->addFunction(to_nullable_function, { column_node }, col.name));
                         else
-                            index.push_back(column_node);
+                            outputs.push_back(column_node);
                     }
                 }
 
-                dag->getIndex().swap(index);
+                dag->getOutputs().swap(outputs);
                 auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
                 auto transform = std::make_shared<ExpressionTransform>(header, expression);
 
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 94d841ff095..bd079c0b8a9 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -5,6 +5,8 @@
 #include <IO/Operators.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Common/JSONBuilder.h>
+#include <Interpreters/PreparedSets.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -61,8 +63,6 @@ void CreatingSetStep::describeActions(FormatSettings & settings) const
     settings.out << prefix;
     if (subquery_for_set.set)
         settings.out << "Set: ";
-    // else if (subquery_for_set.join)
-    //     settings.out << "Join: ";
 
     settings.out << description << '\n';
 }
@@ -71,8 +71,6 @@ void CreatingSetStep::describeActions(JSONBuilder::JSONMap & map) const
 {
     if (subquery_for_set.set)
         map.add("Set", description);
-    // else if (subquery_for_set.join)
-    //     map.add("Join", description);
 }
 
 
@@ -124,9 +122,11 @@ void CreatingSetsStep::describePipeline(FormatSettings & settings) const
     IQueryPlanStep::describePipeline(processors, settings);
 }
 
-void addCreatingSetsStep(
-    QueryPlan & query_plan, SubqueriesForSets subqueries_for_sets, const SizeLimits & limits, ContextPtr context)
+void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context)
 {
+    if (!prepared_sets || prepared_sets->empty())
+        return;
+
     DataStreams input_streams;
     input_streams.emplace_back(query_plan.getCurrentDataStream());
 
@@ -134,18 +134,19 @@ void addCreatingSetsStep(
     plans.emplace_back(std::make_unique<QueryPlan>(std::move(query_plan)));
     query_plan = QueryPlan();
 
-    for (auto & [description, set] : subqueries_for_sets)
+    for (auto & [description, subquery_for_set] : prepared_sets->detachSubqueries())
     {
-        if (!set.source)
+        if (!subquery_for_set.hasSource())
             continue;
 
-        auto plan = std::move(set.source);
+        auto plan = subquery_for_set.detachSource();
 
+        const Settings & settings = context->getSettingsRef();
         auto creating_set = std::make_unique<CreatingSetStep>(
                 plan->getCurrentDataStream(),
                 description,
-                std::move(set),
-                limits,
+                std::move(subquery_for_set),
+                SizeLimits(settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode),
                 context);
         creating_set->setStepDescription("Create set for subquery");
         plan->addStep(std::move(creating_set));
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index 20cdd24c8a9..9c61eb2012c 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -2,8 +2,8 @@
 
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <QueryPipeline/SizeLimits.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/Context_fwd.h>
+#include <Interpreters/PreparedSets.h>
 
 namespace DB
 {
@@ -49,10 +49,6 @@ private:
     Processors processors;
 };
 
-void addCreatingSetsStep(
-    QueryPlan & query_plan,
-    SubqueriesForSets subqueries_for_sets,
-    const SizeLimits & limits,
-    ContextPtr context);
+void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context);
 
 }
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 52539dec75f..03f952ac782 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -40,17 +40,17 @@ CubeStep::CubeStep(const DataStream & input_stream_, Aggregator::Params params_,
 ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, bool use_nulls, const BuildQueryPipelineSettings & settings, UInt64 grouping_set_number)
 {
     auto dag = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
-    auto & index = dag->getIndex();
+    auto & outputs = dag->getOutputs();
 
     if (use_nulls)
     {
         auto to_nullable = FunctionFactory::instance().get("toNullable", nullptr);
         for (const auto & key : keys)
         {
-            const auto * node = dag->getIndex()[header.getPositionByName(key)];
+            const auto * node = dag->getOutputs()[header.getPositionByName(key)];
             if (node->result_type->canBeInsideNullable())
             {
-                dag->addOrReplaceInIndex(dag->addFunction(to_nullable, { node }, node->result_name));
+                dag->addOrReplaceInOutputs(dag->addFunction(to_nullable, { node }, node->result_name));
             }
         }
     }
@@ -60,7 +60,7 @@ ProcessorPtr addGroupingSetForTotals(const Block & header, const Names & keys, b
         {ColumnPtr(std::move(grouping_col)), std::make_shared<DataTypeUInt64>(), "__grouping_set"});
 
     grouping_node = &dag->materializeNode(*grouping_node);
-    index.insert(index.begin(), grouping_node);
+    outputs.insert(outputs.begin(), grouping_node);
 
     auto expression = std::make_shared<ExpressionActions>(dag, settings.getActionsSettings());
     return std::make_shared<ExpressionTransform>(header, expression);
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index c268cb44267..7da2b5252f5 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -52,28 +52,6 @@ static SortDescription getSortDescription(const SortDescription & input_sort_des
     return distinct_sort_desc;
 }
 
-static Poco::Logger * getLogger()
-{
-    static Poco::Logger & logger = Poco::Logger::get("DistinctStep");
-    return &logger;
-}
-
-static String dumpColumnNames(const Names & columns)
-{
-    WriteBufferFromOwnString wb;
-    bool first = true;
-
-    for (const auto & name : columns)
-    {
-        if (!first)
-            wb << ", ";
-        first = false;
-
-        wb << name;
-    }
-    return wb.str();
-}
-
 DistinctStep::DistinctStep(
     const DataStream & input_stream_,
     const SizeLimits & set_size_limits_,
@@ -112,11 +90,7 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
 
     if (optimize_distinct_in_order)
     {
-        LOG_DEBUG(getLogger(), "Input sort description    ({}): {}", input_stream.sort_description.size(), dumpSortDescription(input_stream.sort_description));
-        LOG_DEBUG(getLogger(), "Distinct columns          ({}): {}", columns.size(), dumpColumnNames(columns));
-        SortDescription distinct_sort_desc = getSortDescription(input_stream.sort_description, columns);
-        LOG_DEBUG(getLogger(), "Distinct sort description ({}): {}", distinct_sort_desc.size(), dumpSortDescription(distinct_sort_desc));
-
+        const SortDescription distinct_sort_desc = getSortDescription(input_stream.sort_description, columns);
         if (!distinct_sort_desc.empty())
         {
             /// pre-distinct for sorted chunks
@@ -140,15 +114,19 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
 
                 if (distinct_sort_desc.size() < columns.size())
                 {
-                    pipeline.addSimpleTransform(
-                        [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-                        {
-                            if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                                return nullptr;
+                    if (DistinctSortedTransform::isApplicable(pipeline.getHeader(), distinct_sort_desc, columns))
+                    {
+                        pipeline.addSimpleTransform(
+                            [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+                            {
+                                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                                    return nullptr;
 
-                            return std::make_shared<DistinctSortedTransform>(
-                                header, distinct_sort_desc, set_size_limits, limit_hint, columns);
-                        });
+                                return std::make_shared<DistinctSortedTransform>(
+                                    header, distinct_sort_desc, set_size_limits, limit_hint, columns);
+                            });
+                        return;
+                    }
                 }
                 else
                 {
@@ -161,8 +139,8 @@ void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const Buil
                             return std::make_shared<DistinctSortedChunkTransform>(
                                 header, set_size_limits, limit_hint, distinct_sort_desc, columns, true);
                         });
+                    return;
                 }
-                return;
             }
         }
     }
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index c9f1e1ce242..dcfa6e5a891 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -5,13 +5,12 @@
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
 #include <Interpreters/JoinSwitcher.h>
-
 #include <Common/JSONBuilder.h>
 
 namespace DB
 {
 
-static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
+static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions, const Block & header, const SortDescription & sort_description)
 {
     return ITransformingStep::Traits
     {
@@ -19,7 +18,7 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
             .preserves_distinct_columns = !actions->hasArrayJoin(),
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
-            .preserves_sorting = !actions->hasArrayJoin(),
+            .preserves_sorting = actions->isSortingPreserved(header, sort_description),
         },
         {
             .preserves_number_of_rows = !actions->hasArrayJoin(),
@@ -27,12 +26,12 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
     };
 }
 
-ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_)
+ExpressionStep::ExpressionStep(const DataStream & input_stream_, const ActionsDAGPtr & actions_dag_)
     : ITransformingStep(
         input_stream_,
         ExpressionTransform::transformHeader(input_stream_.header, *actions_dag_),
-        getTraits(actions_dag_))
-    , actions_dag(std::move(actions_dag_))
+        getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description))
+    , actions_dag(actions_dag_)
 {
     /// Some columns may be removed by expression.
     updateDistinctColumns(output_stream->header, output_stream->distinct_columns);
diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h
index 96869a9e9ca..3eef14ac129 100644
--- a/src/Processors/QueryPlan/ExpressionStep.h
+++ b/src/Processors/QueryPlan/ExpressionStep.h
@@ -15,7 +15,7 @@ class ExpressionStep : public ITransformingStep
 {
 public:
 
-    explicit ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_);
+    explicit ExpressionStep(const DataStream & input_stream_, const ActionsDAGPtr & actions_dag_);
     String getName() const override { return "Expression"; }
 
     void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index becfe1062fb..4699a7c1908 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -9,15 +9,24 @@
 namespace DB
 {
 
-static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression)
+static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression, const Block & header, const SortDescription & sort_description, bool remove_filter_column, const String & filter_column_name)
 {
+    bool preserves_sorting = expression->isSortingPreserved(header, sort_description, remove_filter_column ? filter_column_name : "");
+    if (remove_filter_column)
+    {
+        preserves_sorting &= find_if(
+                                 begin(sort_description),
+                                 end(sort_description),
+                                 [&](const auto & column_desc) { return column_desc.column_name == filter_column_name; })
+            == sort_description.end();
+    }
     return ITransformingStep::Traits
     {
         {
             .preserves_distinct_columns = !expression->hasArrayJoin(), /// I suppose it actually never happens
             .returns_single_stream = false,
             .preserves_number_of_streams = true,
-            .preserves_sorting = true,
+            .preserves_sorting = preserves_sorting,
         },
         {
             .preserves_number_of_rows = false,
@@ -27,7 +36,7 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & expression)
 
 FilterStep::FilterStep(
     const DataStream & input_stream_,
-    ActionsDAGPtr actions_dag_,
+    const ActionsDAGPtr & actions_dag_,
     String filter_column_name_,
     bool remove_filter_column_)
     : ITransformingStep(
@@ -37,8 +46,8 @@ FilterStep::FilterStep(
             actions_dag_.get(),
             filter_column_name_,
             remove_filter_column_),
-        getTraits(actions_dag_))
-    , actions_dag(std::move(actions_dag_))
+        getTraits(actions_dag_, input_stream_.header, input_stream_.sort_description, remove_filter_column_, filter_column_name_))
+    , actions_dag(actions_dag_)
     , filter_column_name(std::move(filter_column_name_))
     , remove_filter_column(remove_filter_column_)
 {
@@ -113,5 +122,4 @@ void FilterStep::updateOutputStream()
         getDataStreamTraits());
 }
 
-
 }
diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h
index daea1e13c58..e020cd3c4d3 100644
--- a/src/Processors/QueryPlan/FilterStep.h
+++ b/src/Processors/QueryPlan/FilterStep.h
@@ -13,7 +13,7 @@ class FilterStep : public ITransformingStep
 public:
     FilterStep(
         const DataStream & input_stream_,
-        ActionsDAGPtr actions_dag_,
+        const ActionsDAGPtr & actions_dag_,
         String filter_column_name_,
         bool remove_filter_column_);
 
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index 96b48ed55fd..a66582ff06d 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -34,6 +34,7 @@ public:
     /// How data is sorted.
     enum class SortMode
     {
+        None,
         Chunk, /// Separate chunks are sorted
         Port, /// Data from each port is sorted
         Stream, /// Data is globally sorted
@@ -41,7 +42,7 @@ public:
 
     /// It is not guaranteed that header has columns from sort_description.
     SortDescription sort_description = {};
-    SortMode sort_mode = SortMode::Chunk;
+    SortMode sort_mode = SortMode::None;
 
     /// Things which may be added:
     /// * limit
diff --git a/src/Processors/QueryPlan/Optimizations/Optimizations.h b/src/Processors/QueryPlan/Optimizations/Optimizations.h
index d6ae3a276b2..904f30e84b0 100644
--- a/src/Processors/QueryPlan/Optimizations/Optimizations.h
+++ b/src/Processors/QueryPlan/Optimizations/Optimizations.h
@@ -12,6 +12,8 @@ namespace QueryPlanOptimizations
 /// This is the main function which optimizes the whole QueryPlan tree.
 void optimizeTree(const QueryPlanOptimizationSettings & settings, QueryPlan::Node & root, QueryPlan::Nodes & nodes);
 
+void optimizePrimaryKeyCondition(QueryPlan::Node & root);
+
 /// Optimization is a function applied to QueryPlan::Node.
 /// It can read and update subtree of specified node.
 /// It return the number of updated layers of subtree if some change happened.
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index 680d158ecaf..6c6c8954ea4 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -42,37 +42,50 @@ static bool filterColumnIsNotAmongAggregatesArguments(const AggregateDescription
     return true;
 }
 
-static size_t
-tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, const Names & allowed_inputs,
-                    bool can_remove_filter = true, size_t child_idx = 0)
+/// Assert that `node->children` has at least `child_num` elements
+static void checkChildrenSize(QueryPlan::Node * node, size_t child_num)
+{
+    auto & child = node->step;
+    if (child_num > child->getInputStreams().size() || child_num > node->children.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong number of children: expected at least {}, got {} children and {} streams",
+                        child_num, child->getInputStreams().size(), node->children.size());
+}
+
+static ActionsDAGPtr splitFilter(QueryPlan::Node * parent_node, const Names & allowed_inputs, size_t child_idx = 0)
 {
     QueryPlan::Node * child_node = parent_node->children.front();
+    checkChildrenSize(child_node, child_idx + 1);
 
     auto & parent = parent_node->step;
     auto & child = child_node->step;
 
-    auto * filter = static_cast<FilterStep *>(parent.get());
+    auto * filter = assert_cast<FilterStep *>(parent.get());
     const auto & expression = filter->getExpression();
     const auto & filter_column_name = filter->getFilterColumnName();
     bool removes_filter = filter->removesFilterColumn();
 
-    // std::cerr << "Filter: \n" << expression->dumpDAG() << std::endl;
-
-    if (child_idx >= child->getInputStreams().size() || child_idx >= child_node->children.size())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Child index {} is out of range (streams: {}, children: {})",
-                        child_idx, child->getInputStreams().size(), child_node->children.size());
-
     const auto & all_inputs = child->getInputStreams()[child_idx].header.getColumnsWithTypeAndName();
 
     auto split_filter = expression->cloneActionsForFilterPushDown(filter_column_name, removes_filter, allowed_inputs, all_inputs);
-    if (!split_filter)
-        return 0;
+    return split_filter;
+}
 
-    // std::cerr << "===============\n" << expression->dumpDAG() << std::endl;
-    // std::cerr << "---------------\n" << split_filter->dumpDAG() << std::endl;
+static size_t
+tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, const ActionsDAGPtr & split_filter,
+                    bool can_remove_filter = true, size_t child_idx = 0)
+{
+    QueryPlan::Node * child_node = parent_node->children.front();
+    checkChildrenSize(child_node, child_idx + 1);
 
-    const auto * filter_node = expression->tryFindInIndex(filter_column_name);
-    if (!filter_node && !removes_filter)
+    auto & parent = parent_node->step;
+    auto & child = child_node->step;
+
+    auto * filter = assert_cast<FilterStep *>(parent.get());
+    const auto & expression = filter->getExpression();
+    const auto & filter_column_name = filter->getFilterColumnName();
+
+    const auto * filter_node = expression->tryFindInOutputs(filter_column_name);
+    if (!filter_node && !filter->removesFilterColumn())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Filter column {} was removed from ActionsDAG but it is needed in result. DAG:\n{}",
                         filter_column_name, expression->dumpDAG());
@@ -89,9 +102,10 @@ tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, con
     /// Expression/Filter -> Aggregating -> Filter -> Something
 
     /// New filter column is the first one.
-    auto split_filter_column_name = (*split_filter->getIndex().begin())->result_name;
+    String split_filter_column_name = split_filter->getOutputs().front()->result_name;
+
     node.step = std::make_unique<FilterStep>(
-        node.children.at(0)->step->getOutputStream(), std::move(split_filter), std::move(split_filter_column_name), can_remove_filter);
+        node.children.at(0)->step->getOutputStream(), split_filter, std::move(split_filter_column_name), can_remove_filter);
 
     if (auto * transforming_step = dynamic_cast<ITransformingStep *>(child.get()))
     {
@@ -118,6 +132,15 @@ tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, con
     return 3;
 }
 
+static size_t
+tryAddNewFilterStep(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes, const Names & allowed_inputs,
+                    bool can_remove_filter = true)
+{
+    if (auto split_filter = splitFilter(parent_node, allowed_inputs, 0))
+        return tryAddNewFilterStep(parent_node, nodes, split_filter, can_remove_filter, 0);
+    return 0;
+}
+
 size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes)
 {
     if (parent_node->children.size() != 1)
@@ -220,16 +243,16 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
 
     if (auto * join = typeid_cast<JoinStep *>(child.get()))
     {
-        auto join_push_down = [&](ASTTableJoin::Kind kind) -> size_t
+        auto join_push_down = [&](JoinKind kind) -> size_t
         {
             const auto & table_join = join->getJoin()->getTableJoin();
 
             /// Only inner and left(/right) join are supported. Other types may generate default values for left table keys.
             /// So, if we push down a condition like `key != 0`, not all rows may be filtered.
-            if (table_join.kind() != ASTTableJoin::Kind::Inner && table_join.kind() != kind)
+            if (table_join.kind() != JoinKind::Inner && table_join.kind() != kind)
                 return 0;
 
-            bool is_left = kind == ASTTableJoin::Kind::Left;
+            bool is_left = kind == JoinKind::Left;
             const auto & input_header = is_left ? join->getInputStreams().front().header : join->getInputStreams().back().header;
             const auto & res_header = join->getOutputStream().header;
             Names allowed_keys;
@@ -248,23 +271,37 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
                 allowed_keys.push_back(name);
             }
 
-            const bool can_remove_filter
-                = std::find(source_columns.begin(), source_columns.end(), filter->getFilterColumnName()) == source_columns.end();
-            size_t updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_keys, can_remove_filter, is_left ? 0 : 1);
+            /// For left JOIN, push down to the first child; for right - to the second one.
+            const auto child_idx = is_left ? 0 : 1;
+            ActionsDAGPtr split_filter = splitFilter(parent_node, allowed_keys, child_idx);
+            if (!split_filter)
+                return 0;
+            /*
+             * We should check the presence of a split filter column name in `source_columns` to avoid removing the required column.
+             *
+             * Example:
+             * A filter expression is `a AND b = c`, but `b` and `c` belong to another side of the join and not in `allowed_keys`, so the final split filter is just `a`.
+             * In this case `a` can be in `source_columns` but not `and(a, equals(b, c))`.
+             *
+             * New filter column is the first one.
+             */
+            const String & split_filter_column_name = split_filter->getOutputs().front()->result_name;
+            bool can_remove_filter = source_columns.end() == std::find(source_columns.begin(), source_columns.end(), split_filter_column_name);
+            const size_t updated_steps = tryAddNewFilterStep(parent_node, nodes, split_filter, can_remove_filter, child_idx);
             if (updated_steps > 0)
             {
-                LOG_DEBUG(&Poco::Logger::get("tryPushDownFilter"), "Pushed down filter to {} side of join", kind);
+                LOG_DEBUG(&Poco::Logger::get("QueryPlanOptimizations"), "Pushed down filter to {} side of join", kind);
             }
             return updated_steps;
         };
 
-        if (size_t updated_steps = join_push_down(ASTTableJoin::Kind::Left))
+        if (size_t updated_steps = join_push_down(JoinKind::Left))
             return updated_steps;
 
         /// For full sorting merge join we push down both to the left and right tables, because left and right streams are not independent.
         if (join->allowPushDownToRight())
         {
-            if (size_t updated_steps = join_push_down(ASTTableJoin::Kind::Right))
+            if (size_t updated_steps = join_push_down(JoinKind::Right))
                 return updated_steps;
         }
     }
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
new file mode 100644
index 00000000000..7d682c408e5
--- /dev/null
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
@@ -0,0 +1,58 @@
+#include <Processors/QueryPlan/Optimizations/Optimizations.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Storages/StorageMerge.h>
+#include <Interpreters/ActionsDAG.h>
+#include <deque>
+
+namespace DB::QueryPlanOptimizations
+{
+
+void optimizePrimaryKeyCondition(QueryPlan::Node & root)
+{
+    struct Frame
+    {
+        QueryPlan::Node * node = nullptr;
+        size_t next_child = 0;
+    };
+
+    std::deque<Frame> stack;
+    stack.push_back({.node = &root});
+
+    while (!stack.empty())
+    {
+        auto & frame = stack.back();
+
+        /// Traverse all children first.
+        if (frame.next_child < frame.node->children.size())
+        {
+            stack.push_back({.node = frame.node->children[frame.next_child]});
+
+            ++frame.next_child;
+            continue;
+        }
+
+        auto add_filter = [&](auto & storage)
+        {
+            for (auto iter=stack.rbegin() + 1; iter!=stack.rend(); ++iter)
+            {
+                if (auto * filter_step = typeid_cast<FilterStep *>(iter->node->step.get()))
+                    storage.addFilter(filter_step->getExpression(), filter_step->getFilterColumnName());
+                else if (typeid_cast<ExpressionStep *>(iter->node->step.get()))
+                    ;
+                else
+                    break;
+            }
+        };
+
+        if (auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(frame.node->step.get()))
+            add_filter(*read_from_merge_tree);
+        else if (auto * read_from_merge = typeid_cast<ReadFromMerge *>(frame.node->step.get()))
+            add_filter(*read_from_merge);
+
+        stack.pop_back();
+    }
+}
+
+}
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 08e36c5f32b..c27c0c0d318 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -325,8 +325,22 @@ static void explainStep(
                 elem.dumpNameAndType(settings.out);
             }
         }
-
         settings.out.write('\n');
+
+    }
+
+    if (options.sorting)
+    {
+        if (step.hasOutputStream())
+        {
+            settings.out << prefix << "Sorting (" << step.getOutputStream().sort_mode << ")";
+            if (step.getOutputStream().sort_mode != DataStream::SortMode::None)
+            {
+                settings.out << ": ";
+                dumpSortDescription(step.getOutputStream().sort_description, settings.out);
+            }
+            settings.out.write('\n');
+        }
     }
 
     if (options.actions)
@@ -434,6 +448,7 @@ void QueryPlan::explainPipeline(WriteBuffer & buffer, const ExplainPipelineOptio
 void QueryPlan::optimize(const QueryPlanOptimizationSettings & optimization_settings)
 {
     QueryPlanOptimizations::optimizeTree(optimization_settings, *root, nodes);
+    QueryPlanOptimizations::optimizePrimaryKeyCondition(*root);
 }
 
 void QueryPlan::explainEstimate(MutableColumns & columns)
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index ce12ce7beda..7598bdff63e 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -71,6 +71,8 @@ public:
         bool actions = false;
         /// Add information about indexes actions.
         bool indexes = false;
+        /// Add information about sorting
+        bool sorting = false;
     };
 
     struct ExplainPipelineOptions
@@ -103,6 +105,8 @@ public:
         std::vector<Node *> children = {};
     };
 
+    const Node * getRootNode() const { return root; }
+
     using Nodes = std::list<Node>;
 
 private:
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 75ea5974aad..d7dae54bb1e 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -73,18 +73,6 @@ static const PrewhereInfoPtr & getPrewhereInfo(const SelectQueryInfo & query_inf
                                  : query_info.prewhere_info;
 }
 
-static int getSortDirection(const SelectQueryInfo & query_info)
-{
-    const InputOrderInfoPtr & order_info = query_info.input_order_info
-        ? query_info.input_order_info
-        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
-
-    if (!order_info)
-        return 1;
-
-    return order_info->direction;
-}
-
 ReadFromMergeTree::ReadFromMergeTree(
     MergeTreeData::DataPartsVector parts_,
     Names real_column_names_,
@@ -143,7 +131,7 @@ ReadFromMergeTree::ReadFromMergeTree(
         SortDescription sort_description;
         const Names & sorting_key_columns = storage_snapshot->getMetadataForQuery()->getSortingKeyColumns();
         const Block & header = output_stream->header;
-        const int sort_direction = getSortDirection(query_info);
+        const int sort_direction = getSortDirection();
         for (const auto & column_name : sorting_key_columns)
         {
             if (std::find_if(header.begin(), header.end(), [&](ColumnWithTypeAndName const & col) { return col.name == column_name; })
@@ -151,8 +139,17 @@ ReadFromMergeTree::ReadFromMergeTree(
                 break;
             sort_description.emplace_back(column_name, sort_direction);
         }
+        if (!sort_description.empty())
+        {
+            auto const & settings = context->getSettingsRef();
+            if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && query_info.getInputOrderInfo())
+                output_stream->sort_mode = DataStream::SortMode::Port;
+            else
+                output_stream->sort_mode = DataStream::SortMode::Chunk;
+        }
+
         output_stream->sort_description = std::move(sort_description);
-        output_stream->sort_mode = DataStream::SortMode::Chunk;
+
     }
 }
 
@@ -834,6 +831,8 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(Merge
 {
     return selectRangesToRead(
         std::move(parts),
+        prewhere_info,
+        added_filter_nodes,
         storage_snapshot->metadata,
         storage_snapshot->getMetadataForQuery(),
         query_info,
@@ -848,6 +847,8 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(Merge
 
 MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     MergeTreeData::DataPartsVector parts,
+    const PrewhereInfoPtr & prewhere_info,
+    const ActionDAGNodes & added_filter_nodes,
     const StorageMetadataPtr & metadata_snapshot_base,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
@@ -882,9 +883,37 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     // Build and check if primary key is used when necessary
     const auto & primary_key = metadata_snapshot->getPrimaryKey();
     Names primary_key_columns = primary_key.column_names;
-    KeyCondition key_condition(query_info, context, primary_key_columns, primary_key.expression);
+    std::optional<KeyCondition> key_condition;
 
-    if (settings.force_primary_key && key_condition.alwaysUnknownOrTrue())
+    if (settings.query_plan_optimize_primary_key)
+    {
+        ActionDAGNodes nodes;
+        if (prewhere_info)
+        {
+            {
+                const auto & node = prewhere_info->prewhere_actions->findInOutputs(prewhere_info->prewhere_column_name);
+                nodes.nodes.push_back(&node);
+            }
+
+            if (prewhere_info->row_level_filter)
+            {
+                const auto & node = prewhere_info->row_level_filter->findInOutputs(prewhere_info->row_level_column_name);
+                nodes.nodes.push_back(&node);
+            }
+        }
+
+        for (const auto & node : added_filter_nodes.nodes)
+            nodes.nodes.push_back(node);
+
+        key_condition.emplace(
+            std::move(nodes), query_info.syntax_analyzer_result, query_info.prepared_sets, context, primary_key_columns, primary_key.expression);
+    }
+    else
+    {
+        key_condition.emplace(query_info, context, primary_key_columns, primary_key.expression);
+    }
+
+    if (settings.force_primary_key && key_condition->alwaysUnknownOrTrue())
     {
         return std::make_shared<MergeTreeDataSelectAnalysisResult>(MergeTreeDataSelectAnalysisResult{
             .result = std::make_exception_ptr(Exception(
@@ -892,7 +921,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
                 "Primary key ({}) is not used and setting 'force_primary_key' is set",
                 fmt::join(primary_key_columns, ", ")))});
     }
-    LOG_DEBUG(log, "Key condition: {}", key_condition.toString());
+    LOG_DEBUG(log, "Key condition: {}", key_condition->toString());
 
     const auto & select = query_info.query->as<ASTSelectQuery &>();
 
@@ -915,7 +944,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
             select,
             metadata_snapshot->getColumns().getAllPhysical(),
             parts,
-            key_condition,
+            *key_condition,
             data,
             metadata_snapshot,
             context,
@@ -940,7 +969,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
             metadata_snapshot,
             query_info,
             context,
-            key_condition,
+            *key_condition,
             reader_settings,
             log,
             num_streams,
@@ -977,10 +1006,7 @@ MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     result.total_marks_pk = total_marks_pk;
     result.selected_rows = sum_rows;
 
-    const auto & input_order_info = query_info.input_order_info
-        ? query_info.input_order_info
-        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
-
+    const auto & input_order_info = query_info.getInputOrderInfo();
     if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && input_order_info)
         result.read_type = (input_order_info->direction > 0) ? ReadType::InOrder
                                                              : ReadType::InReverseOrder;
@@ -1068,13 +1094,10 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
                                    column_names_to_read.end());
     }
 
-    const auto & input_order_info = query_info.input_order_info
-        ? query_info.input_order_info
-        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
-
     Pipe pipe;
 
     const auto & settings = context->getSettingsRef();
+    const auto & input_order_info = query_info.getInputOrderInfo();
 
     if (select.final())
     {
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 46be5ea1d7d..43e7eecac5d 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -2,6 +2,7 @@
 #include <Processors/QueryPlan/ISourceStep.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/RequestResponse.h>
+#include <Storages/SelectQueryInfo.h>
 
 namespace DB
 {
@@ -114,6 +115,18 @@ public:
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeIndexes(JSONBuilder::JSONMap & map) const override;
 
+    void addFilter(ActionsDAGPtr expression, std::string column_name)
+    {
+        added_filter_dags.push_back(expression);
+        added_filter_nodes.nodes.push_back(&expression->findInOutputs(column_name));
+    }
+
+    void addFilterNodes(const ActionDAGNodes & filter_nodes)
+    {
+        for (const auto & node : filter_nodes.nodes)
+            added_filter_nodes.nodes.push_back(node);
+    }
+
     StorageID getStorageID() const { return data.getStorageID(); }
     UInt64 getSelectedParts() const { return selected_parts; }
     UInt64 getSelectedRows() const { return selected_rows; }
@@ -121,6 +134,8 @@ public:
 
     static MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(
         MergeTreeData::DataPartsVector parts,
+        const PrewhereInfoPtr & prewhere_info,
+        const ActionDAGNodes & added_filter_nodes,
         const StorageMetadataPtr & metadata_snapshot_base,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
@@ -140,6 +155,15 @@ public:
     void setQueryInfoInputOrderInfo(InputOrderInfoPtr order_info);
 
 private:
+    int getSortDirection() const
+    {
+        const InputOrderInfoPtr & order_info = query_info.getInputOrderInfo();
+        if (order_info)
+            return order_info->direction;
+
+        return 1;
+    }
+
     const MergeTreeReaderSettings reader_settings;
 
     MergeTreeData::DataPartsVector prepared_parts;
@@ -151,6 +175,9 @@ private:
     PrewhereInfoPtr prewhere_info;
     ExpressionActionsSettings actions_settings;
 
+    std::vector<ActionsDAGPtr> added_filter_dags;
+    ActionDAGNodes added_filter_nodes;
+
     StorageSnapshotPtr storage_snapshot;
     StorageMetadataPtr metadata_for_reading;
 
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 46588ada225..38e02eebd44 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -30,7 +30,7 @@ static ITransformingStep::Traits getTraits(size_t limit)
 
 SortingStep::SortingStep(
     const DataStream & input_stream,
-    const SortDescription & description_,
+    SortDescription description_,
     size_t max_block_size_,
     UInt64 limit_,
     SizeLimits size_limits_,
@@ -38,17 +38,20 @@ SortingStep::SortingStep(
     double remerge_lowered_memory_bytes_ratio_,
     size_t max_bytes_before_external_sort_,
     VolumePtr tmp_volume_,
-    size_t min_free_disk_space_)
+    size_t min_free_disk_space_,
+    bool optimize_sorting_by_input_stream_properties_)
     : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
     , type(Type::Full)
-    , result_description(description_)
+    , result_description(std::move(description_))
     , max_block_size(max_block_size_)
     , limit(limit_)
     , size_limits(size_limits_)
     , max_bytes_before_remerge(max_bytes_before_remerge_)
     , remerge_lowered_memory_bytes_ratio(remerge_lowered_memory_bytes_ratio_)
-    , max_bytes_before_external_sort(max_bytes_before_external_sort_), tmp_volume(tmp_volume_)
+    , max_bytes_before_external_sort(max_bytes_before_external_sort_)
+    , tmp_volume(tmp_volume_)
     , min_free_disk_space(min_free_disk_space_)
+    , optimize_sorting_by_input_stream_properties(optimize_sorting_by_input_stream_properties_)
 {
     /// TODO: check input_stream is partially sorted by the same description.
     output_stream->sort_description = result_description;
@@ -111,129 +114,173 @@ void SortingStep::convertToFinishSorting(SortDescription prefix_description_)
     prefix_description = std::move(prefix_description_);
 }
 
-void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+void SortingStep::finishSorting(
+    QueryPipelineBuilder & pipeline, const SortDescription & input_sort_desc, const SortDescription & result_sort_desc, const UInt64 limit_)
 {
-    if (type == Type::FinishSorting)
-    {
-        bool need_finish_sorting = (prefix_description.size() < result_description.size());
-        if (pipeline.getNumStreams() > 1)
+    pipeline.addSimpleTransform(
+        [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
         {
-            UInt64 limit_for_merging = (need_finish_sorting ? 0 : limit);
-            auto transform = std::make_shared<MergingSortedTransform>(
-                    pipeline.getHeader(),
-                    pipeline.getNumStreams(),
-                    prefix_description,
-                    max_block_size,
-                    SortingQueueStrategy::Batch,
-                    limit_for_merging);
+            if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                return nullptr;
 
-            pipeline.addTransform(std::move(transform));
-        }
+            return std::make_shared<PartialSortingTransform>(header, result_sort_desc, limit_);
+        });
 
-        if (need_finish_sorting)
+    bool increase_sort_description_compile_attempts = true;
+
+    /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
+    pipeline.addSimpleTransform(
+        [&, increase_sort_description_compile_attempts](const Block & header) mutable -> ProcessorPtr
         {
-            pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-            {
-                if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                    return nullptr;
-
-                return std::make_shared<PartialSortingTransform>(header, result_description, limit);
-            });
-
-            bool increase_sort_description_compile_attempts = true;
-
-            /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
-            pipeline.addSimpleTransform([&, increase_sort_description_compile_attempts](const Block & header) mutable -> ProcessorPtr
-            {
-                /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan
+            /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan
                   * To property support min_count_to_compile_sort_description.
                   */
-                bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
+            bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
 
-                if (increase_sort_description_compile_attempts)
-                    increase_sort_description_compile_attempts = false;
+            if (increase_sort_description_compile_attempts)
+                increase_sort_description_compile_attempts = false;
 
-                return std::make_shared<FinishSortingTransform>(
-                    header, prefix_description, result_description, max_block_size, limit, increase_sort_description_compile_attempts_current);
-            });
-        }
-    }
-    else if (type == Type::Full)
+            return std::make_shared<FinishSortingTransform>(
+                header, input_sort_desc, result_sort_desc, max_block_size, limit_, increase_sort_description_compile_attempts_current);
+        });
+}
+
+void SortingStep::mergingSorted(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, const UInt64 limit_)
+{
+    /// If there are several streams, then we merge them into one
+    if (pipeline.getNumStreams() > 1)
     {
-        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-        {
-            if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                return nullptr;
+        auto transform = std::make_shared<MergingSortedTransform>(
+            pipeline.getHeader(),
+            pipeline.getNumStreams(),
+            result_sort_desc,
+            max_block_size,
+            SortingQueueStrategy::Batch,
+            limit_);
 
-            return std::make_shared<PartialSortingTransform>(header, result_description, limit);
-        });
+        pipeline.addTransform(std::move(transform));
+    }
+}
 
-        StreamLocalLimits limits;
-        limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
-        limits.size_limits = size_limits;
+void SortingStep::mergeSorting(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, UInt64 limit_)
+{
+    bool increase_sort_description_compile_attempts = true;
 
-        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
-        {
-            if (stream_type != QueryPipelineBuilder::StreamType::Main)
-                return nullptr;
-
-            auto transform = std::make_shared<LimitsCheckingTransform>(header, limits);
-            return transform;
-        });
-
-        bool increase_sort_description_compile_attempts = true;
-
-        pipeline.addSimpleTransform([&, increase_sort_description_compile_attempts](const Block & header, QueryPipelineBuilder::StreamType stream_type) mutable -> ProcessorPtr
+    pipeline.addSimpleTransform(
+        [&, increase_sort_description_compile_attempts](
+            const Block & header, QueryPipelineBuilder::StreamType stream_type) mutable -> ProcessorPtr
         {
             if (stream_type == QueryPipelineBuilder::StreamType::Totals)
                 return nullptr;
 
-            /** For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan.
-              * To property support min_count_to_compile_sort_description.
-              */
+            // For multiple FinishSortingTransform we need to count identical comparators only once per QueryPlan.
+            // To property support min_count_to_compile_sort_description.
             bool increase_sort_description_compile_attempts_current = increase_sort_description_compile_attempts;
 
             if (increase_sort_description_compile_attempts)
                 increase_sort_description_compile_attempts = false;
 
             return std::make_shared<MergeSortingTransform>(
-                    header, result_description, max_block_size, limit, increase_sort_description_compile_attempts_current,
-                    max_bytes_before_remerge / pipeline.getNumStreams(),
-                    remerge_lowered_memory_bytes_ratio,
-                    max_bytes_before_external_sort,
-                    tmp_volume,
-                    min_free_disk_space);
+                header,
+                result_sort_desc,
+                max_block_size,
+                limit_,
+                increase_sort_description_compile_attempts_current,
+                max_bytes_before_remerge / pipeline.getNumStreams(),
+                remerge_lowered_memory_bytes_ratio,
+                max_bytes_before_external_sort,
+                tmp_volume,
+                min_free_disk_space);
         });
+}
 
-        /// If there are several streams, then we merge them into one
-        if (pipeline.getNumStreams() > 1)
+void SortingStep::fullSort(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, const UInt64 limit_, const bool skip_partial_sort)
+{
+    if (!skip_partial_sort || limit_)
+    {
+        pipeline.addSimpleTransform(
+            [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+            {
+                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                    return nullptr;
+
+                return std::make_shared<PartialSortingTransform>(header, result_sort_desc, limit_);
+            });
+
+        StreamLocalLimits limits;
+        limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
+        limits.size_limits = size_limits;
+
+        pipeline.addSimpleTransform(
+            [&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+            {
+                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                    return nullptr;
+
+                return std::make_shared<LimitsCheckingTransform>(header, limits);
+            });
+    }
+
+    mergeSorting(pipeline, result_sort_desc, limit_);
+
+    /// If there are several streams, then we merge them into one
+    if (pipeline.getNumStreams() > 1)
+    {
+        auto transform = std::make_shared<MergingSortedTransform>(
+            pipeline.getHeader(), pipeline.getNumStreams(), result_sort_desc, max_block_size, SortingQueueStrategy::Batch, limit_);
+
+        pipeline.addTransform(std::move(transform));
+    }
+}
+
+void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    /// We consider that a caller has more information what type of sorting to apply.
+    /// The type depends on constructor used to create sorting step.
+    /// So we'll try to infer sorting to use only in case of Full sorting
+
+    if (type == Type::MergingSorted)
+    {
+        mergingSorted(pipeline, result_description, limit);
+        return;
+    }
+
+    if (type == Type::FinishSorting)
+    {
+        bool need_finish_sorting = (prefix_description.size() < result_description.size());
+        mergingSorted(pipeline, prefix_description, (need_finish_sorting ? 0 : limit));
+        if (need_finish_sorting)
         {
-            auto transform = std::make_shared<MergingSortedTransform>(
-                    pipeline.getHeader(),
-                    pipeline.getNumStreams(),
-                    result_description,
-                    max_block_size,
-                    SortingQueueStrategy::Batch,
-                    limit);
+            finishSorting(pipeline, prefix_description, result_description, limit);
+        }
+        return;
+    }
 
-            pipeline.addTransform(std::move(transform));
+    const auto input_sort_mode = input_streams.front().sort_mode;
+    const SortDescription & input_sort_desc = input_streams.front().sort_description;
+    if (optimize_sorting_by_input_stream_properties)
+    {
+        /// skip sorting if stream is already sorted
+        if (input_sort_mode == DataStream::SortMode::Stream && input_sort_desc.hasPrefix(result_description))
+            return;
+
+        /// merge sorted
+        if (input_sort_mode == DataStream::SortMode::Port && input_sort_desc.hasPrefix(result_description))
+        {
+            mergingSorted(pipeline, result_description, limit);
+            return;
+        }
+
+        /// if chunks already sorted according to result_sort_desc, then we can skip chunk sorting
+        if (input_sort_mode == DataStream::SortMode::Chunk && input_sort_desc.hasPrefix(result_description))
+        {
+            const bool skip_partial_sort = true;
+            fullSort(pipeline, result_description, limit, skip_partial_sort);
+            return;
         }
     }
-    else if (type == Type::MergingSorted)
-    {        /// If there are several streams, then we merge them into one
-        if (pipeline.getNumStreams() > 1)
-        {
-            auto transform = std::make_shared<MergingSortedTransform>(
-                    pipeline.getHeader(),
-                    pipeline.getNumStreams(),
-                    result_description,
-                    max_block_size,
-                    SortingQueueStrategy::Batch,
-                    limit);
 
-            pipeline.addTransform(std::move(transform));
-        }
-    }
+    fullSort(pipeline, result_description, limit);
 }
 
 void SortingStep::describeActions(FormatSettings & settings) const
diff --git a/src/Processors/QueryPlan/SortingStep.h b/src/Processors/QueryPlan/SortingStep.h
index ce78bb863bf..5ba0ba7ec63 100644
--- a/src/Processors/QueryPlan/SortingStep.h
+++ b/src/Processors/QueryPlan/SortingStep.h
@@ -14,7 +14,7 @@ public:
     /// Full
     SortingStep(
         const DataStream & input_stream,
-        const SortDescription & description_,
+        SortDescription description_,
         size_t max_block_size_,
         UInt64 limit_,
         SizeLimits size_limits_,
@@ -22,7 +22,8 @@ public:
         double remerge_lowered_memory_bytes_ratio_,
         size_t max_bytes_before_external_sort_,
         VolumePtr tmp_volume_,
-        size_t min_free_disk_space_);
+        size_t min_free_disk_space_,
+        bool optimize_sorting_by_input_stream_properties_);
 
     /// FinishSorting
     SortingStep(
@@ -49,13 +50,23 @@ public:
     /// Add limit or change it to lower value.
     void updateLimit(size_t limit_);
 
-    SortDescription getSortDescription() const { return result_description; }
+    const SortDescription & getSortDescription() const { return result_description; }
 
     void convertToFinishSorting(SortDescription prefix_description);
 
 private:
     void updateOutputStream() override;
 
+    void mergingSorted(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, UInt64 limit_);
+    void mergeSorting(QueryPipelineBuilder & pipeline, const SortDescription & result_sort_desc, UInt64 limit_);
+    void finishSorting(
+        QueryPipelineBuilder & pipeline, const SortDescription & input_sort_desc, const SortDescription & result_sort_desc, UInt64 limit_);
+    void fullSort(
+        QueryPipelineBuilder & pipeline,
+        const SortDescription & result_sort_desc,
+        UInt64 limit_,
+        bool skip_partial_sort = false);
+
     enum class Type
     {
         Full,
@@ -66,8 +77,8 @@ private:
     Type type;
 
     SortDescription prefix_description;
-    SortDescription result_description;
-    size_t max_block_size;
+    const SortDescription result_description;
+    const size_t max_block_size;
     UInt64 limit;
     SizeLimits size_limits;
 
@@ -76,6 +87,7 @@ private:
     size_t max_bytes_before_external_sort = 0;
     VolumePtr tmp_volume;
     size_t min_free_disk_space = 0;
+    const bool optimize_sorting_by_input_stream_properties = false;
 };
 
 }
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index 48a32ea8663..ca59fb9e220 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -2,10 +2,10 @@
 
 #include <QueryPipeline/SizeLimits.h>
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Processors/IAccumulatingTransform.h>
 #include <QueryPipeline/Chain.h>
 #include <QueryPipeline/QueryPipeline.h>
+#include <Interpreters/PreparedSets.h>
 #include <Common/Stopwatch.h>
 
 #include <Poco/Logger.h>
@@ -50,7 +50,6 @@ private:
     Stopwatch watch;
 
     bool done_with_set = true;
-    //bool done_with_join = true;
     bool done_with_table = true;
 
     SizeLimits network_transfer_limits;
diff --git a/src/Processors/Transforms/DistinctSortedTransform.cpp b/src/Processors/Transforms/DistinctSortedTransform.cpp
index 73e89c774ae..4c6ca03950c 100644
--- a/src/Processors/Transforms/DistinctSortedTransform.cpp
+++ b/src/Processors/Transforms/DistinctSortedTransform.cpp
@@ -6,117 +6,214 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SET_SIZE_LIMIT_EXCEEDED;
+    extern const int LOGICAL_ERROR;
 }
 
-DistinctSortedTransform::DistinctSortedTransform(
-    Block header_, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns)
-    : ISimpleTransform(header_, header_, true)
-    , header(std::move(header_))
-    , description(std::move(sort_description))
-    , column_names(columns)
-    , limit_hint(limit_hint_)
-    , set_size_limits(set_size_limits_)
+/// calculate column positions to use during chunk transformation
+static void calcColumnPositionsInHeader(const Block& header, const Names & column_names, ColumnNumbers& column_positions, ColumnNumbers& const_column_positions)
 {
-    /// pre-calculate column positions to use during chunk transformation
     const size_t num_columns = column_names.empty() ? header.columns() : column_names.size();
+    column_positions.clear();
     column_positions.reserve(num_columns);
+    const_column_positions.clear();
+    const_column_positions.reserve(num_columns);
     for (size_t i = 0; i < num_columns; ++i)
     {
         auto pos = column_names.empty() ? i : header.getPositionByName(column_names[i]);
-        const auto & col = header.getByPosition(pos).column;
-        if (col && !isColumnConst(*col))
-            column_positions.emplace_back(pos);
+        const auto & column = header.getByPosition(pos).column;
+        if (column)
+        {
+            if (isColumnConst(*column))
+                const_column_positions.emplace_back(pos);
+            else
+                column_positions.emplace_back(pos);
+        }
     }
 }
 
+/// calculate DISTINCT column positions which form sort prefix of sort description
+static void calcSortPrefixPositionsInHeader(
+    const Block & header,
+    const SortDescription & sort_description,
+    const ColumnNumbers & column_positions,
+    const ColumnNumbers & const_column_positions,
+    ColumnNumbers & sort_prefix_positions)
+{
+    sort_prefix_positions.reserve(sort_description.size());
+    for (const auto & column_sort_descr : sort_description)
+    {
+        /// check if there is such column in header
+        if (!header.has(column_sort_descr.column_name))
+            break;
+
+        /// check if sorted column position matches any DISTINCT column
+        const auto pos = header.getPositionByName(column_sort_descr.column_name);
+        if (std::find(begin(column_positions), end(column_positions), pos) == column_positions.end())
+        {
+            /// if sorted column found in const columns then we can skip it
+            if (std::find(begin(const_column_positions), end(const_column_positions), pos) != const_column_positions.end())
+                continue;
+
+            break;
+        }
+
+        sort_prefix_positions.emplace_back(pos);
+    }
+}
+
+///  check if distinct sorted is applicable for provided header, sort description and distinct columns
+bool DistinctSortedTransform::isApplicable(const Block & header, const SortDescription & sort_description, const Names & column_names)
+{
+    if (sort_description.empty())
+        return false;
+
+    ColumnNumbers column_positions;
+    ColumnNumbers const_column_positions;
+    calcColumnPositionsInHeader(header, column_names, column_positions, const_column_positions);
+    if (column_positions.empty())
+        return false;
+
+    /// check if sorted columns matches DISTINCT columns
+    ColumnNumbers sort_prefix_positions;
+    calcSortPrefixPositionsInHeader(header, sort_description, column_positions, const_column_positions, sort_prefix_positions);
+    return !sort_prefix_positions.empty();
+}
+
+DistinctSortedTransform::DistinctSortedTransform(
+    const Block & header,
+    const SortDescription & sort_description,
+    const SizeLimits & set_size_limits_,
+    const UInt64 limit_hint_,
+    const Names & column_names)
+    : ISimpleTransform(header, header, true)
+    , limit_hint(limit_hint_)
+    , set_size_limits(set_size_limits_)
+{
+    if (sort_description.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DistinctSortedTransform: sort description can't be empty");
+
+    /// pre-calculate column positions to use during chunk transformation
+    ColumnNumbers const_column_positions;
+    calcColumnPositionsInHeader(header, column_names, column_positions, const_column_positions);
+    if (column_positions.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DistinctSortedTransform: all columns can't be const. DistinctTransform should be used instead");
+
+    /// pre-calculate DISTINCT column positions which form sort prefix of sort description
+    calcSortPrefixPositionsInHeader(header, sort_description, column_positions, const_column_positions, sort_prefix_positions);
+    if (sort_prefix_positions.empty())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR, "DistinctSortedTransform: columns have to form a sort prefix for provided sort description");
+
+    column_ptrs.reserve(column_positions.size());
+    sort_prefix_columns.reserve(sort_prefix_positions.size());
+}
+
 void DistinctSortedTransform::transform(Chunk & chunk)
 {
-        const ColumnRawPtrs column_ptrs(getKeyColumns(chunk));
-        if (column_ptrs.empty())
-            return;
+    if (unlikely(!chunk.hasRows()))
+        return;
 
-        ColumnRawPtrs clearing_hint_columns(getClearingColumns(column_ptrs));
+    /// get DISTINCT columns from chunk
+    column_ptrs.clear();
+    for (const auto pos : column_positions)
+    {
+        const auto & column = chunk.getColumns()[pos];
+        column_ptrs.emplace_back(column.get());
+    }
 
-        if (data.type == ClearableSetVariants::Type::EMPTY)
-            data.init(ClearableSetVariants::chooseMethod(column_ptrs, key_sizes));
+    /// get DISTINCT columns from chunk which form sort prefix of sort description
+    sort_prefix_columns.clear();
+    for (const auto pos : sort_prefix_positions)
+    {
+        const auto & column = chunk.getColumns()[pos];
+        sort_prefix_columns.emplace_back(column.get());
+    }
 
-        const size_t rows = chunk.getNumRows();
-        IColumn::Filter filter(rows);
+    if (data.type == ClearableSetVariants::Type::EMPTY)
+        data.init(ClearableSetVariants::chooseMethod(column_ptrs, key_sizes));
+
+    const size_t rows = chunk.getNumRows();
+    IColumn::Filter filter(rows);
+
+    bool has_new_data = false;
+    switch (data.type)
+    {
+        case ClearableSetVariants::Type::EMPTY:
+            break;
+            // clang-format off
+#define M(NAME) \
+        case ClearableSetVariants::Type::NAME: \
+            has_new_data = buildFilter(*data.NAME, column_ptrs, sort_prefix_columns, filter, rows, data); \
+            break;
 
-        bool has_new_data = false;
-        switch (data.type)
-        {
-            case ClearableSetVariants::Type::EMPTY:
-                break;
-    #define M(NAME) \
-            case ClearableSetVariants::Type::NAME: \
-                has_new_data = buildFilter(*data.NAME, column_ptrs, clearing_hint_columns, filter, rows, data); \
-                break;
         APPLY_FOR_SET_VARIANTS(M)
-    #undef M
-        }
+#undef M
+            // clang-format on
+    }
 
-        /// Just go to the next block if there isn't any new record in the current one.
-        if (!has_new_data)
-        {
-            chunk.clear();
-            return;
-        }
+    /// Just go to the next block if there isn't any new record in the current one.
+    if (!has_new_data)
+    {
+        chunk.clear();
+        return;
+    }
 
-        if (!set_size_limits.check(data.getTotalRowCount(), data.getTotalByteCount(), "DISTINCT", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED))
-        {
-            stopReading();
-            chunk.clear();
-            return;
-        }
+    if (!set_size_limits.check(data.getTotalRowCount(), data.getTotalByteCount(), "DISTINCT", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED))
+    {
+        stopReading();
+        chunk.clear();
+        return;
+    }
 
-        /// Stop reading if we already reached the limit.
-        if (limit_hint && data.getTotalRowCount() >= limit_hint)
-            stopReading();
+    /// Stop reading if we already reached the limit.
+    if (limit_hint && data.getTotalRowCount() >= limit_hint)
+        stopReading();
 
-        prev_chunk.chunk = std::move(chunk);
-        prev_chunk.clearing_hint_columns = std::move(clearing_hint_columns);
+    prev_chunk.chunk = std::move(chunk);
+    prev_chunk.clearing_hint_columns = std::move(sort_prefix_columns);
 
-        size_t all_columns = prev_chunk.chunk.getNumColumns();
-        Chunk res_chunk;
-        for (size_t i = 0; i < all_columns; ++i)
-            res_chunk.addColumn(prev_chunk.chunk.getColumns().at(i)->filter(filter, -1));
+    const size_t all_columns = prev_chunk.chunk.getNumColumns();
+    Chunk res_chunk;
+    for (size_t i = 0; i < all_columns; ++i)
+        res_chunk.addColumn(prev_chunk.chunk.getColumns().at(i)->filter(filter, -1));
 
-        chunk = std::move(res_chunk);
+    chunk = std::move(res_chunk);
 }
 
-
 template <typename Method>
 bool DistinctSortedTransform::buildFilter(
     Method & method,
     const ColumnRawPtrs & columns,
     const ColumnRawPtrs & clearing_hint_columns,
     IColumn::Filter & filter,
-    size_t rows,
+    const size_t rows,
     ClearableSetVariants & variants) const
 {
     typename Method::State state(columns, key_sizes, nullptr);
 
     /// Compare last row of previous block and first row of current block,
-    /// If rows not equal, we can clear HashSet,
-    /// If clearing_hint_columns is empty, we CAN'T clear HashSet.
-    if (!clearing_hint_columns.empty() && !prev_chunk.clearing_hint_columns.empty()
-        && !rowsEqual(clearing_hint_columns, 0, prev_chunk.clearing_hint_columns, prev_chunk.chunk.getNumRows() - 1))
+    /// If rows are NOT equal, we can clear HashSet
+    if (!prev_chunk.clearing_hint_columns.empty()) /// it's not first chunk in stream
     {
-        method.data.clear();
+        if (!rowsEqual(clearing_hint_columns, 0, prev_chunk.clearing_hint_columns, prev_chunk.chunk.getNumRows() - 1))
+            method.data.clear();
     }
 
     bool has_new_data = false;
-    for (size_t i = 0; i < rows; ++i)
+    { /// handle 0-indexed row to avoid index check in loop below
+        const auto emplace_result = state.emplaceKey(method.data, 0, variants.string_pool);
+        if (emplace_result.isInserted())
+            has_new_data = true;
+        filter[0] = emplace_result.isInserted();
+    }
+    for (size_t i = 1; i < rows; ++i)
     {
         /// Compare i-th row and i-1-th row,
-        /// If rows are not equal, we can clear HashSet,
-        /// If clearing_hint_columns is empty, we CAN'T clear HashSet.
-        if (i > 0 && !clearing_hint_columns.empty() && !rowsEqual(clearing_hint_columns, i, clearing_hint_columns, i - 1))
+        /// If rows are not equal, we can clear HashSet
+        if (!rowsEqual(clearing_hint_columns, i, clearing_hint_columns, i - 1))
             method.data.clear();
 
-        auto emplace_result = state.emplaceKey(method.data, i, variants.string_pool);
-
+        const auto emplace_result = state.emplaceKey(method.data, i, variants.string_pool);
         if (emplace_result.isInserted())
             has_new_data = true;
 
@@ -127,41 +224,13 @@ bool DistinctSortedTransform::buildFilter(
     return has_new_data;
 }
 
-ColumnRawPtrs DistinctSortedTransform::getKeyColumns(const Chunk & chunk) const
-{
-    ColumnRawPtrs column_ptrs;
-    column_ptrs.reserve(column_positions.size());
-    for (const auto pos : column_positions)
-    {
-        const auto & column = chunk.getColumns()[pos];
-        column_ptrs.emplace_back(column.get());
-    }
-    return column_ptrs;
-}
-
-ColumnRawPtrs DistinctSortedTransform::getClearingColumns(const ColumnRawPtrs & key_columns) const
-{
-    ColumnRawPtrs clearing_hint_columns;
-    clearing_hint_columns.reserve(description.size());
-    for (const auto & sort_column_description : description)
-    {
-        const auto * sort_column_ptr = header.getByName(sort_column_description.column_name).column.get();
-        const auto it = std::find(key_columns.cbegin(), key_columns.cend(), sort_column_ptr);
-        if (it != key_columns.cend()) /// if found in key_columns
-            clearing_hint_columns.emplace_back(sort_column_ptr);
-        else
-            return clearing_hint_columns; /// We will use common prefix of sort description and requested DISTINCT key.
-    }
-    return clearing_hint_columns;
-}
-
 bool DistinctSortedTransform::rowsEqual(const ColumnRawPtrs & lhs, size_t n, const ColumnRawPtrs & rhs, size_t m)
 {
     for (size_t column_index = 0, num_columns = lhs.size(); column_index < num_columns; ++column_index)
     {
         const auto & lhs_column = *lhs[column_index];
         const auto & rhs_column = *rhs[column_index];
-        if (lhs_column.compareAt(n, m, rhs_column, 0) != 0) /// not equal
+        if (lhs_column.compareAt(n, m, rhs_column, -1) != 0) /// not equal
             return false;
     }
     return true;
diff --git a/src/Processors/Transforms/DistinctSortedTransform.h b/src/Processors/Transforms/DistinctSortedTransform.h
index 72acde0716b..86c5c968e4b 100644
--- a/src/Processors/Transforms/DistinctSortedTransform.h
+++ b/src/Processors/Transforms/DistinctSortedTransform.h
@@ -12,6 +12,9 @@ namespace DB
 /** This class is intended for implementation of SELECT DISTINCT clause and
   * leaves only unique rows in the stream.
   *
+  * DistinctSortedTransform::isApplicable() have to be used to check if DistinctSortedTransform can be constructed with particular arguments,
+  * otherwise the constructor can throw LOGICAL_ERROR exception
+  *
   * Implementation for case, when input stream has rows for same DISTINCT key or at least its prefix,
   *  grouped together (going consecutively).
   *
@@ -24,18 +27,20 @@ class DistinctSortedTransform : public ISimpleTransform
 public:
     /// Empty columns_ means all columns.
     DistinctSortedTransform(
-        Block header_, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns);
+        const Block & header,
+        const SortDescription & sort_description,
+        const SizeLimits & set_size_limits_,
+        UInt64 limit_hint_,
+        const Names & column_names);
 
     String getName() const override { return "DistinctSortedTransform"; }
 
+    static bool isApplicable(const Block & header, const SortDescription & sort_description, const Names & column_names);
+
 protected:
     void transform(Chunk & chunk) override;
 
 private:
-    ColumnRawPtrs getKeyColumns(const Chunk & chunk) const;
-    /// When clearing_columns changed, we can clean HashSet to memory optimization
-    /// clearing_columns is a left-prefix of SortDescription exists in key_columns
-    ColumnRawPtrs getClearingColumns(const ColumnRawPtrs & key_columns) const;
     static bool rowsEqual(const ColumnRawPtrs & lhs, size_t n, const ColumnRawPtrs & rhs, size_t m);
 
     /// return true if has new data
@@ -48,9 +53,6 @@ private:
         size_t rows,
         ClearableSetVariants & variants) const;
 
-    Block header;
-    SortDescription description;
-
     struct PreviousChunk
     {
         Chunk chunk;
@@ -58,8 +60,11 @@ private:
     };
     PreviousChunk prev_chunk;
 
-    Names column_names;
-    ColumnNumbers column_positions;
+    ColumnNumbers column_positions;      /// DISTINCT columns positions in header
+    ColumnNumbers sort_prefix_positions; /// DISTINCT columns positions which form sort prefix of sort description
+    ColumnRawPtrs column_ptrs;           /// DISTINCT columns from chunk
+    ColumnRawPtrs sort_prefix_columns;   /// DISTINCT columns from chunk which form sort prefix of sort description
+
     ClearableSetVariants data;
     Sizes key_sizes;
     UInt64 limit_hint;
diff --git a/src/Processors/Transforms/DistinctTransform.cpp b/src/Processors/Transforms/DistinctTransform.cpp
index 0108b7d6547..4d78adb6e22 100644
--- a/src/Processors/Transforms/DistinctTransform.cpp
+++ b/src/Processors/Transforms/DistinctTransform.cpp
@@ -11,7 +11,7 @@ namespace ErrorCodes
 DistinctTransform::DistinctTransform(
     const Block & header_,
     const SizeLimits & set_size_limits_,
-    UInt64 limit_hint_,
+    const UInt64 limit_hint_,
     const Names & columns_)
     : ISimpleTransform(header_, header_, true)
     , limit_hint(limit_hint_)
@@ -33,7 +33,7 @@ void DistinctTransform::buildFilter(
     Method & method,
     const ColumnRawPtrs & columns,
     IColumn::Filter & filter,
-    size_t rows,
+    const size_t rows,
     SetVariants & variants) const
 {
     typename Method::State state(columns, key_sizes, nullptr);
@@ -50,15 +50,22 @@ void DistinctTransform::buildFilter(
 
 void DistinctTransform::transform(Chunk & chunk)
 {
+    if (unlikely(!chunk.hasRows()))
+        return;
+
     /// Convert to full column, because SetVariant for sparse column is not implemented.
     convertToFullIfSparse(chunk);
 
-    auto num_rows = chunk.getNumRows();
+    const auto num_rows = chunk.getNumRows();
     auto columns = chunk.detachColumns();
 
-    /// Stop reading if we already reach the limit.
-    if (no_more_rows || (limit_hint && data.getTotalRowCount() >= limit_hint))
+    /// Special case, - only const columns, return single row
+    if (unlikely(key_columns_pos.empty()))
     {
+        for (auto & column : columns)
+            column = column->cut(0, 1);
+
+        chunk.setColumns(std::move(columns), 1);
         stopReading();
         return;
     }
@@ -68,17 +75,6 @@ void DistinctTransform::transform(Chunk & chunk)
     for (auto pos : key_columns_pos)
         column_ptrs.emplace_back(columns[pos].get());
 
-    if (column_ptrs.empty())
-    {
-        /// Only constants. We need to return single row.
-        no_more_rows = true;
-        for (auto & column : columns)
-            column = column->cut(0, 1);
-
-        chunk.setColumns(std::move(columns), 1);
-        return;
-    }
-
     if (data.empty())
         data.init(SetVariants::chooseMethod(column_ptrs, key_sizes));
 
@@ -108,6 +104,13 @@ void DistinctTransform::transform(Chunk & chunk)
         column = column->filter(filter, -1);
 
     chunk.setColumns(std::move(columns), data.getTotalRowCount() - old_set_size);
+
+    /// Stop reading if we already reach the limit
+    if (limit_hint && data.getTotalRowCount() >= limit_hint)
+    {
+        stopReading();
+        return;
+    }
 }
 
 }
diff --git a/src/Processors/Transforms/DistinctTransform.h b/src/Processors/Transforms/DistinctTransform.h
index d80fdb5bc22..ac53243ea3f 100644
--- a/src/Processors/Transforms/DistinctTransform.h
+++ b/src/Processors/Transforms/DistinctTransform.h
@@ -25,9 +25,7 @@ private:
     ColumnNumbers key_columns_pos;
     SetVariants data;
     Sizes key_sizes;
-    UInt64 limit_hint;
-
-    bool no_more_rows = false;
+    const UInt64 limit_hint;
 
     /// Restrictions on the maximum size of the output data.
     SizeLimits set_size_limits;
diff --git a/src/Processors/Transforms/IntersectOrExceptTransform.cpp b/src/Processors/Transforms/IntersectOrExceptTransform.cpp
index 3e39123ae4b..1ac82e99cf2 100644
--- a/src/Processors/Transforms/IntersectOrExceptTransform.cpp
+++ b/src/Processors/Transforms/IntersectOrExceptTransform.cpp
@@ -128,7 +128,11 @@ void IntersectOrExceptTransform::accumulate(Chunk chunk)
     column_ptrs.reserve(key_columns_pos.size());
 
     for (auto pos : key_columns_pos)
+    {
+        /// Hash methods expect non-const column
+        columns[pos] = columns[pos]->convertToFullColumnIfConst();
         column_ptrs.emplace_back(columns[pos].get());
+    }
 
     if (!data)
         data.emplace();
@@ -160,8 +164,11 @@ void IntersectOrExceptTransform::filter(Chunk & chunk)
     column_ptrs.reserve(key_columns_pos.size());
 
     for (auto pos : key_columns_pos)
+    {
+        /// Hash methods expect non-const column
+        columns[pos] = columns[pos]->convertToFullColumnIfConst();
         column_ptrs.emplace_back(columns[pos].get());
-
+    }
     if (!data)
         data.emplace();
 
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index 64343946ff4..fed28a11ad5 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 #include <Common/logger_useful.h>
 
diff --git a/src/Processors/Transforms/MergeJoinTransform.cpp b/src/Processors/Transforms/MergeJoinTransform.cpp
index c7b7afab541..6f842bec939 100644
--- a/src/Processors/Transforms/MergeJoinTransform.cpp
+++ b/src/Processors/Transforms/MergeJoinTransform.cpp
@@ -30,8 +30,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-using JoinKind = ASTTableJoin::Kind;
-
 namespace
 {
 
@@ -281,7 +279,7 @@ MergeJoinAlgorithm::MergeJoinAlgorithm(
         throw Exception("MergeJoinAlgorithm requires exactly two inputs", ErrorCodes::LOGICAL_ERROR);
 
     auto strictness = table_join->getTableJoin().strictness();
-    if (strictness != ASTTableJoin::Strictness::Any && strictness != ASTTableJoin::Strictness::All)
+    if (strictness != JoinStrictness::Any && strictness != JoinStrictness::All)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MergeJoinAlgorithm is not implemented for strictness {}", strictness);
 
     auto kind = table_join->getTableJoin().kind();
@@ -826,10 +824,10 @@ IMergingAlgorithm::Status MergeJoinAlgorithm::merge()
 
     auto strictness = table_join->getTableJoin().strictness();
 
-    if (strictness == ASTTableJoin::Strictness::Any)
+    if (strictness == JoinStrictness::Any)
         return anyJoin(kind);
 
-    if (strictness == ASTTableJoin::Strictness::All)
+    if (strictness == JoinStrictness::All)
         return allJoin(kind);
 
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported strictness '{}'", strictness);
diff --git a/src/Processors/Transforms/MergeJoinTransform.h b/src/Processors/Transforms/MergeJoinTransform.h
index 9f60eafb455..58ac652cb18 100644
--- a/src/Processors/Transforms/MergeJoinTransform.h
+++ b/src/Processors/Transforms/MergeJoinTransform.h
@@ -245,10 +245,10 @@ public:
 
 private:
     std::optional<Status> handleAnyJoinState();
-    Status anyJoin(ASTTableJoin::Kind kind);
+    Status anyJoin(JoinKind kind);
 
     std::optional<Status> handleAllJoinState();
-    Status allJoin(ASTTableJoin::Kind kind);
+    Status allJoin(JoinKind kind);
 
     Chunk createBlockWithDefaults(size_t source_num);
     Chunk createBlockWithDefaults(size_t source_num, size_t start, size_t num_rows) const;
diff --git a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
index 905620d39f9..8471139d9dc 100644
--- a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
@@ -1,9 +1,10 @@
-#include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
+#include <limits>
+#include <Interpreters/Aggregator.h>
 #include <Processors/ISimpleTransform.h>
 #include <Processors/ResizeProcessor.h>
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
+#include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <QueryPipeline/Pipe.h>
-#include <Interpreters/Aggregator.h>
 
 namespace DB
 {
@@ -367,7 +368,7 @@ SortingAggregatedTransform::SortingAggregatedTransform(size_t num_inputs_, Aggre
     : IProcessor(InputPorts(num_inputs_, params_->getHeader()), {params_->getHeader()})
     , num_inputs(num_inputs_)
     , params(std::move(params_))
-    , last_bucket_number(num_inputs, -1)
+    , last_bucket_number(num_inputs, std::numeric_limits<Int32>::min())
     , is_input_finished(num_inputs, false)
 {
 }
@@ -462,7 +463,13 @@ IProcessor::Status SortingAggregatedTransform::prepare()
             continue;
         }
 
-        //all_finished = false;
+        /// We want to keep not more than `num_inputs` buckets in memory (and there will be only a single chunk with the given `bucket_id`).
+        const bool bucket_from_this_input_still_in_memory = chunks.contains(last_bucket_number[input_num]);
+        if (bucket_from_this_input_still_in_memory)
+        {
+            all_finished = false;
+            continue;
+        }
 
         in->setNeeded();
 
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 5e0d896599c..4155ab7c7f1 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -968,9 +968,6 @@ void WindowTransform::updateAggregationState()
             }
         }
     }
-
-    prev_frame_start = frame_start;
-    prev_frame_end = frame_end;
 }
 
 void WindowTransform::writeOutCurrentRow()
@@ -1212,6 +1209,9 @@ void WindowTransform::appendChunk(Chunk & chunk)
                 return;
             }
 
+            prev_frame_start = frame_start;
+            prev_frame_end = frame_end;
+
             // Move to the next row. The frame will have to be recalculated.
             // The peer group start is updated at the beginning of the loop,
             // because current_row might now be past-the-end.
@@ -1617,16 +1617,12 @@ struct StatefulWindowFunction : public WindowFunction
 
 struct ExponentialTimeDecayedSumState
 {
-    RowNumber previous_frame_start;
-    RowNumber previous_frame_end;
     Float64 previous_time;
     Float64 previous_sum;
 };
 
 struct ExponentialTimeDecayedAvgState
 {
-    RowNumber previous_frame_start;
-    RowNumber previous_frame_end;
     Float64 previous_time;
     Float64 previous_sum;
     Float64 previous_count;
@@ -1685,40 +1681,43 @@ struct WindowFunctionExponentialTimeDecayedSum final : public StatefulWindowFunc
         auto & state = getState(workspace);
 
         Float64 result = 0;
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
 
-        if (state.previous_frame_start <= transform->frame_start
-            && transform->frame_start < state.previous_frame_end
-            && state.previous_frame_end <= transform->frame_end)
+        if (transform->frame_start < transform->frame_end)
         {
-            for (RowNumber i = state.previous_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result -= std::exp((prev_t - curr_t) / decay_length) * prev_val;
-            }
-            result += std::exp((state.previous_time - curr_t) / decay_length) * state.previous_sum;
-            for (RowNumber i = state.previous_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length) * prev_val;
-            }
-        }
-        else
-        {
-            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length) * prev_val;
-            }
-        }
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
 
-        state.previous_sum = result;
-        state.previous_time = curr_t;
-        state.previous_frame_start = transform->frame_start;
-        state.previous_frame_end = transform->frame_end;
+            if (transform->prev_frame_start <= transform->frame_start
+                && transform->frame_start < transform->prev_frame_end
+                && transform->prev_frame_end <= transform->frame_end)
+            {
+                for (RowNumber i = transform->prev_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result -= std::exp((prev_t - back_t) / decay_length) * prev_val;
+                }
+                result += std::exp((state.previous_time - back_t) / decay_length) * state.previous_sum;
+                for (RowNumber i = transform->prev_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length) * prev_val;
+                }
+            }
+            else
+            {
+                for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length) * prev_val;
+                }
+            }
+
+            state.previous_sum = result;
+            state.previous_time = back_t;
+        }
 
         WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, result);
     }
@@ -1776,18 +1775,24 @@ struct WindowFunctionExponentialTimeDecayedMax final : public WindowFunction
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
-        Float64 result = std::numeric_limits<Float64>::lowest();
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
+        Float64 result = std::numeric_limits<Float64>::quiet_NaN();
 
-        for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+        if (transform->frame_start < transform->frame_end)
         {
-            Float64 value = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-            Float64 t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+            result = std::numeric_limits<Float64>::lowest();
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
 
-            /// Avoiding extra calls to `exp` and multiplications.
-            if (value > result || t > curr_t || result < 0)
+            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
             {
-                result = std::max(std::exp((t - curr_t) / decay_length) * value, result);
+                Float64 value = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                Float64 t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+
+                /// Avoiding extra calls to `exp` and multiplications.
+                if (value > result || t > back_t || result < 0)
+                {
+                    result = std::max(std::exp((t - back_t) / decay_length) * value, result);
+                }
             }
         }
 
@@ -1842,37 +1847,40 @@ struct WindowFunctionExponentialTimeDecayedCount final : public StatefulWindowFu
         auto & state = getState(workspace);
 
         Float64 result = 0;
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
 
-        if (state.previous_frame_start <= transform->frame_start
-            && transform->frame_start < state.previous_frame_end
-            && state.previous_frame_end <= transform->frame_end)
+        if (transform->frame_start < transform->frame_end)
         {
-            for (RowNumber i = state.previous_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
-            {
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result -= std::exp((prev_t - curr_t) / decay_length);
-            }
-            result += std::exp((state.previous_time - curr_t) / decay_length) * state.previous_sum;
-            for (RowNumber i = state.previous_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length);
-            }
-        }
-        else
-        {
-            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                result += std::exp((prev_t - curr_t) / decay_length);
-            }
-        }
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
 
-        state.previous_sum = result;
-        state.previous_time = curr_t;
-        state.previous_frame_start = transform->frame_start;
-        state.previous_frame_end = transform->frame_end;
+            if (transform->prev_frame_start <= transform->frame_start
+                && transform->frame_start < transform->prev_frame_end
+                && transform->prev_frame_end <= transform->frame_end)
+            {
+                for (RowNumber i = transform->prev_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result -= std::exp((prev_t - back_t) / decay_length);
+                }
+                result += std::exp((state.previous_time - back_t) / decay_length) * state.previous_sum;
+                for (RowNumber i = transform->prev_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length);
+                }
+            }
+            else
+            {
+                for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    result += std::exp((prev_t - back_t) / decay_length);
+                }
+            }
+
+            state.previous_sum = result;
+            state.previous_time = back_t;
+        }
 
         WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, result);
     }
@@ -1935,55 +1943,61 @@ struct WindowFunctionExponentialTimeDecayedAvg final : public StatefulWindowFunc
 
         Float64 count = 0;
         Float64 sum = 0;
-        Float64 curr_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, transform->current_row);
+        Float64 result = std::numeric_limits<Float64>::quiet_NaN();
 
-        if (state.previous_frame_start <= transform->frame_start
-            && transform->frame_start < state.previous_frame_end
-            && state.previous_frame_end <= transform->frame_end)
+        if (transform->frame_start < transform->frame_end)
         {
-            for (RowNumber i = state.previous_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+            RowNumber frame_back = transform->prevRowNumber(transform->frame_end);
+            Float64 back_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, frame_back);
+
+            if (transform->prev_frame_start <= transform->frame_start
+                && transform->frame_start < transform->prev_frame_end
+                && transform->prev_frame_end <= transform->frame_end)
             {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                Float64 decay = std::exp((prev_t - curr_t) / decay_length);
-                sum -= decay * prev_val;
-                count -= decay;
+                for (RowNumber i = transform->prev_frame_start; i < transform->frame_start; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    Float64 decay = std::exp((prev_t - back_t) / decay_length);
+                    sum -= decay * prev_val;
+                    count -= decay;
+                }
+
+                {
+                    Float64 decay = std::exp((state.previous_time - back_t) / decay_length);
+                    sum += decay * state.previous_sum;
+                    count += decay * state.previous_count;
+                }
+
+                for (RowNumber i = transform->prev_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    Float64 decay = std::exp((prev_t - back_t) / decay_length);
+                    sum += decay * prev_val;
+                    count += decay;
+                }
+            }
+            else
+            {
+                for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
+                {
+                    Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
+                    Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
+                    Float64 decay = std::exp((prev_t - back_t) / decay_length);
+                    sum += decay * prev_val;
+                    count += decay;
+                }
             }
 
-            {
-                Float64 decay = std::exp((state.previous_time - curr_t) / decay_length);
-                sum += decay * state.previous_sum;
-                count += decay * state.previous_count;
-            }
+            state.previous_sum = sum;
+            state.previous_count = count;
+            state.previous_time = back_t;
 
-            for (RowNumber i = state.previous_frame_end; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                Float64 decay = std::exp((prev_t - curr_t) / decay_length);
-                sum += decay * prev_val;
-                count += decay;
-            }
-        }
-        else
-        {
-            for (RowNumber i = transform->frame_start; i < transform->frame_end; transform->advanceRowNumber(i))
-            {
-                Float64 prev_val = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_VALUE, i);
-                Float64 prev_t = WindowFunctionHelpers::getValue<Float64>(transform, function_index, ARGUMENT_TIME, i);
-                Float64 decay = std::exp((prev_t - curr_t) / decay_length);
-                sum += decay * prev_val;
-                count += decay;
-            }
+            result = sum/count;
         }
 
-        state.previous_sum = sum;
-        state.previous_count = count;
-        state.previous_time = curr_t;
-        state.previous_frame_start = transform->frame_start;
-        state.previous_frame_end = transform->frame_end;
-
-        WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, sum/count);
+        WindowFunctionHelpers::setValueToOutputColumn<Float64>(transform, function_index, result);
     }
 
     private:
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index e6db8402c5f..424466bca8a 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -198,8 +198,19 @@ public:
         ++x.block;
     }
 
+    RowNumber nextRowNumber(const RowNumber & x) const
+    {
+        RowNumber result = x;
+        advanceRowNumber(result);
+        return result;
+    }
+
     void retreatRowNumber(RowNumber & x) const
     {
+#ifndef NDEBUG
+        auto original_x = x;
+#endif
+
         if (x.row > 0)
         {
             --x.row;
@@ -213,12 +224,19 @@ public:
         x.row = blockAt(x).rows - 1;
 
 #ifndef NDEBUG
-        auto xx = x;
-        advanceRowNumber(xx);
-        assert(xx == x);
+        auto advanced_retreated_x = x;
+        advanceRowNumber(advanced_retreated_x);
+        assert(advanced_retreated_x == original_x);
 #endif
     }
 
+    RowNumber prevRowNumber(const RowNumber & x) const
+    {
+        RowNumber result = x;
+        retreatRowNumber(result);
+        return result;
+    }
+
     auto moveRowNumber(const RowNumber & _x, int64_t offset) const;
     auto moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const;
 
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
index a8890f5bccb..d71d6901cee 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.cpp
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -410,6 +410,14 @@ Chain buildPushingToViewsChain(
     if (result_chain.empty())
         result_chain.addSink(std::make_shared<NullSinkToStorage>(storage_header));
 
+    if (result_chain.getOutputHeader().columns() != 0)
+    {
+        /// Convert result header to empty block.
+        auto dag = ActionsDAG::makeConvertingActions(result_chain.getOutputHeader().getColumnsWithTypeAndName(), {}, ActionsDAG::MatchColumnsMode::Name);
+        auto actions = std::make_shared<ExpressionActions>(std::move(dag));
+        result_chain.addSink(std::make_shared<ConvertingTransform>(result_chain.getOutputHeader(), std::move(actions)));
+    }
+
     return result_chain;
 }
 
diff --git a/src/QueryPipeline/ExecutionSpeedLimits.cpp b/src/QueryPipeline/ExecutionSpeedLimits.cpp
index d66344d5a05..b88e70cd14f 100644
--- a/src/QueryPipeline/ExecutionSpeedLimits.cpp
+++ b/src/QueryPipeline/ExecutionSpeedLimits.cpp
@@ -9,6 +9,8 @@
 namespace ProfileEvents
 {
     extern const Event ThrottlerSleepMicroseconds;
+    extern const Event OverflowBreak;
+    extern const Event OverflowThrow;
 }
 
 
@@ -104,8 +106,10 @@ static bool handleOverflowMode(OverflowMode mode, int code, fmt::format_string<A
     switch (mode)
     {
         case OverflowMode::THROW:
+            ProfileEvents::increment(ProfileEvents::OverflowThrow);
             throw Exception(code, std::move(fmt), std::forward<Args>(args)...);
         case OverflowMode::BREAK:
+            ProfileEvents::increment(ProfileEvents::OverflowBreak);
             return false;
         default:
             throw Exception("Logical error: unknown overflow mode", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/QueryPipeline/QueryPipelineBuilder.cpp b/src/QueryPipeline/QueryPipelineBuilder.cpp
index 340b85efae9..82907d883bc 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.cpp
+++ b/src/QueryPipeline/QueryPipelineBuilder.cpp
@@ -23,6 +23,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/CurrentThread.h>
 #include "Core/SortDescription.h"
+#include <QueryPipeline/narrowPipe.h>
 #include <Processors/DelayedPortsProcessor.h>
 #include <Processors/RowsBeforeLimitCounter.h>
 #include <Processors/Sources/RemoteSource.h>
@@ -195,6 +196,12 @@ void QueryPipelineBuilder::resize(size_t num_streams, bool force, bool strict)
     pipe.resize(num_streams, force, strict);
 }
 
+void QueryPipelineBuilder::narrow(size_t size)
+{
+    checkInitializedAndNotCompleted();
+    narrowPipe(pipe, size);
+}
+
 void QueryPipelineBuilder::addTotalsHavingTransform(ProcessorPtr transform)
 {
     checkInitializedAndNotCompleted();
diff --git a/src/QueryPipeline/QueryPipelineBuilder.h b/src/QueryPipeline/QueryPipelineBuilder.h
index 2d9b8028627..100a2e07341 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.h
+++ b/src/QueryPipeline/QueryPipelineBuilder.h
@@ -20,8 +20,7 @@ class QueryPlan;
 class PipelineExecutor;
 using PipelineExecutorPtr = std::shared_ptr<PipelineExecutor>;
 
-struct SubqueryForSet;
-using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
+class SubqueryForSet;
 
 struct SizeLimits;
 
@@ -94,6 +93,11 @@ public:
     /// Changes the number of output ports if needed. Adds ResizeTransform.
     void resize(size_t num_streams, bool force = false, bool strict = false);
 
+    /// Concat some ports to have no more then size outputs.
+    /// This method is needed for Merge table engine in case of reading from many tables.
+    /// It prevents opening too many files at the same time.
+    void narrow(size_t size);
+
     /// Unite several pipelines together. Result pipeline would have common_header structure.
     /// If collector is used, it will collect only newly-added processors, but not processors from pipelines.
     static QueryPipelineBuilder unitePipelines(
diff --git a/src/QueryPipeline/RemoteInserter.cpp b/src/QueryPipeline/RemoteInserter.cpp
index 58fed6e5466..cd0485ec8e3 100644
--- a/src/QueryPipeline/RemoteInserter.cpp
+++ b/src/QueryPipeline/RemoteInserter.cpp
@@ -67,7 +67,8 @@ RemoteInserter::RemoteInserter(
     /** Send query and receive "header", that describes table structure.
       * Header is needed to know, what structure is required for blocks to be passed to 'write' method.
       */
-    connection.sendQuery(timeouts, query, "", QueryProcessingStage::Complete, &settings, &modified_client_info, false, {});
+    connection.sendQuery(
+        timeouts, query, /* query_parameters */ {}, "", QueryProcessingStage::Complete, &settings, &modified_client_info, false, {});
 
     while (true)
     {
diff --git a/src/QueryPipeline/SizeLimits.cpp b/src/QueryPipeline/SizeLimits.cpp
index 3fe73f61402..76832b1f951 100644
--- a/src/QueryPipeline/SizeLimits.cpp
+++ b/src/QueryPipeline/SizeLimits.cpp
@@ -1,9 +1,17 @@
 #include <QueryPipeline/SizeLimits.h>
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
 #include <string>
 
 
+namespace ProfileEvents
+{
+    extern const Event OverflowThrow;
+    extern const Event OverflowBreak;
+}
+
+
 namespace DB
 {
 
@@ -12,20 +20,26 @@ bool SizeLimits::check(UInt64 rows, UInt64 bytes, const char * what, int too_man
     if (overflow_mode == OverflowMode::THROW)
     {
         if (max_rows && rows > max_rows)
+        {
+            ProfileEvents::increment(ProfileEvents::OverflowThrow);
             throw Exception(
                 too_many_rows_exception_code,
                 "Limit for {} exceeded, max rows: {}, current rows: {}",
                 what,
                 formatReadableQuantity(max_rows),
                 formatReadableQuantity(rows));
+        }
 
         if (max_bytes && bytes > max_bytes)
+        {
+            ProfileEvents::increment(ProfileEvents::OverflowThrow);
             throw Exception(
                 too_many_bytes_exception_code,
                 "Limit for {} exceeded, max bytes: {}, current bytes: {}",
                 what,
                 ReadableSize(max_bytes),
                 ReadableSize(bytes));
+        }
 
         return true;
     }
@@ -37,10 +51,12 @@ bool SizeLimits::softCheck(UInt64 rows, UInt64 bytes) const
 {
     /// For result_overflow_mode = 'break', we check for >= to tell that no more data is needed.
     /// Last chunk will be processed.
-    if (max_rows && rows >= max_rows)
-        return false;
-    if (max_bytes && bytes >= max_bytes)
+    if ((max_rows && rows >= max_rows)
+        || (max_bytes && bytes >= max_bytes))
+    {
+        ProfileEvents::increment(ProfileEvents::OverflowBreak);
         return false;
+    }
     return true;
 }
 
diff --git a/src/Server/HTTP/HTTPServerRequest.cpp b/src/Server/HTTP/HTTPServerRequest.cpp
index bb72c2a4010..3b8df07b772 100644
--- a/src/Server/HTTP/HTTPServerRequest.cpp
+++ b/src/Server/HTTP/HTTPServerRequest.cpp
@@ -46,7 +46,7 @@ HTTPServerRequest::HTTPServerRequest(ContextPtr context, HTTPServerResponse & re
     readRequest(*in);  /// Try parse according to RFC7230
 
     if (getChunkedTransferEncoding())
-        stream = std::make_unique<HTTPChunkedReadBuffer>(std::move(in));
+        stream = std::make_unique<HTTPChunkedReadBuffer>(std::move(in), context->getSettingsRef().http_max_chunk_size);
     else if (hasContentLength())
         stream = std::make_unique<LimitReadBuffer>(std::move(in), getContentLength(), false);
     else if (getMethod() != HTTPRequest::HTTP_GET && getMethod() != HTTPRequest::HTTP_HEAD && getMethod() != HTTPRequest::HTTP_DELETE)
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index cdf856e87d5..5b8e17eb279 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -26,6 +26,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
+#include <Parsers/ParserSetQuery.h>
 
 #include <base/getFQDNOrHostName.h>
 #include <base/scope_guard.h>
@@ -1014,10 +1015,10 @@ bool DynamicQueryHandler::customizeQueryParam(ContextMutablePtr context, const s
     if (key == param_name)
         return true;    /// do nothing
 
-    if (startsWith(key, "param_"))
+    if (startsWith(key, QUERY_PARAMETER_NAME_PREFIX))
     {
         /// Save name and values of substitution in dictionary.
-        const String parameter_name = key.substr(strlen("param_"));
+        const String parameter_name = key.substr(strlen(QUERY_PARAMETER_NAME_PREFIX));
 
         if (!context->getQueryParameters().contains(parameter_name))
             context->setQueryParameter(parameter_name, value);
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 05565063893..b268179ae93 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -57,6 +57,7 @@
 #include <Common/config_version.h>
 
 using namespace std::literals;
+using namespace DB;
 
 
 namespace CurrentMetrics
@@ -64,6 +65,23 @@ namespace CurrentMetrics
     extern const Metric QueryThread;
 }
 
+namespace
+{
+NameToNameMap convertToQueryParameters(const Settings & passed_params)
+{
+    NameToNameMap query_parameters;
+    for (const auto & param : passed_params)
+    {
+        std::string value;
+        ReadBufferFromOwnString buf(param.getValueString());
+        readQuoted(value, buf);
+        query_parameters.emplace(param.getName(), value);
+    }
+    return query_parameters;
+}
+
+}
+
 namespace DB
 {
 
@@ -134,6 +152,8 @@ void TCPHandler::runImpl()
     {
         receiveHello();
         sendHello();
+        if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM)
+            receiveAddendum();
 
         if (!is_interserver_mode) /// In interserver mode queries are executed without a session context.
         {
@@ -190,9 +210,11 @@ void TCPHandler::runImpl()
 
         /// If we need to shut down, or client disconnects.
         if (!tcp_server.isOpen() || server.isCancelled() || in->eof())
+        {
+            LOG_TEST(log, "Closing connection (open: {}, cancelled: {}, eof: {})", tcp_server.isOpen(), server.isCancelled(), in->eof());
             break;
+        }
 
-        Stopwatch watch;
         state.reset();
 
         /// Initialized later.
@@ -371,10 +393,11 @@ void TCPHandler::runImpl()
 
                 /// Send final progress
                 ///
-                /// NOTE: we cannot send Progress for regular INSERT (w/ VALUES)
+                /// NOTE: we cannot send Progress for regular INSERT (with VALUES)
                 /// without breaking protocol compatibility, but it can be done
                 /// by increasing revision.
                 sendProgress();
+                sendSelectProfileEvents();
             }
 
             state.io.onFinish();
@@ -382,8 +405,7 @@ void TCPHandler::runImpl()
             /// Do it before sending end of stream, to have a chance to show log message in client.
             query_scope->logPeakMemoryUsage();
 
-            watch.stop();
-            LOG_DEBUG(log, "Processed in {} sec.", watch.elapsedSeconds());
+            LOG_DEBUG(log, "Processed in {} sec.", state.watch.elapsedSeconds());
             query_duration_already_logged = true;
 
             if (state.is_connection_closed)
@@ -406,6 +428,8 @@ void TCPHandler::runImpl()
             if (e.code() == ErrorCodes::UNKNOWN_PACKET_FROM_CLIENT)
                 throw;
 
+            LOG_TEST(log, "Going to close connection due to exception: {}", e.message());
+
             /// If there is UNEXPECTED_PACKET_FROM_CLIENT emulate network_error
             /// to break the loop, but do not throw to send the exception to
             /// the client.
@@ -435,7 +459,7 @@ void TCPHandler::runImpl()
 // Server should die on std logic errors in debug, like with assert()
 // or ErrorCodes::LOGICAL_ERROR. This helps catch these errors in
 // tests.
-#ifndef NDEBUG
+#ifdef ABORT_ON_LOGICAL_ERROR
         catch (const std::logic_error & e)
         {
             state.io.onException();
@@ -495,6 +519,11 @@ void TCPHandler::runImpl()
             LOG_WARNING(log, "Can't skip data packets after query failure.");
         }
 
+        if (!query_duration_already_logged)
+        {
+            LOG_DEBUG(log, "Processed in {} sec.", state.watch.elapsedSeconds());
+        }
+
         try
         {
             /// QueryState should be cleared before QueryScope, since otherwise
@@ -512,12 +541,6 @@ void TCPHandler::runImpl()
              */
         }
 
-        if (!query_duration_already_logged)
-        {
-            watch.stop();
-            LOG_DEBUG(log, "Processed in {} sec.", watch.elapsedSeconds());
-        }
-
         /// It is important to destroy query context here. We do not want it to live arbitrarily longer than the query.
         query_context.reset();
 
@@ -554,14 +577,14 @@ bool TCPHandler::readDataNext()
     Stopwatch watch(CLOCK_MONOTONIC_COARSE);
 
     /// Poll interval should not be greater than receive_timeout
-    constexpr UInt64 min_timeout_ms = 5000; // 5 ms
-    UInt64 timeout_ms = std::max(min_timeout_ms, std::min(poll_interval * 1000000, static_cast<UInt64>(receive_timeout.totalMicroseconds())));
+    constexpr UInt64 min_timeout_us = 5000; // 5 ms
+    UInt64 timeout_us = std::max(min_timeout_us, std::min(poll_interval * 1000000, static_cast<UInt64>(receive_timeout.totalMicroseconds())));
     bool read_ok = false;
 
     /// We are waiting for a packet from the client. Thus, every `POLL_INTERVAL` seconds check whether we need to shut down.
     while (true)
     {
-        if (static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_ms))
+        if (static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_us))
         {
             /// If client disconnected.
             if (in->eof())
@@ -759,7 +782,22 @@ void TCPHandler::processTablesStatusRequest()
     TablesStatusRequest request;
     request.read(*in, client_tcp_protocol_version);
 
-    ContextPtr context_to_resolve_table_names = (session && session->sessionContext()) ? session->sessionContext() : server.context();
+    ContextPtr context_to_resolve_table_names;
+    if (is_interserver_mode)
+    {
+        /// In interserver mode session context does not exists, because authentication is done for each query.
+        /// We also cannot create query context earlier, because it cannot be created before authentication,
+        /// but query is not received yet. So we have to do this trick.
+        ContextMutablePtr fake_interserver_context = Context::createCopy(server.context());
+        if (!default_database.empty())
+            fake_interserver_context->setCurrentDatabase(default_database);
+        context_to_resolve_table_names = fake_interserver_context;
+    }
+    else
+    {
+        assert(session);
+        context_to_resolve_table_names = session->sessionContext();
+    }
 
     TablesStatusResponse response;
     for (const QualifiedTableName & table_name: request.tables)
@@ -1019,6 +1057,7 @@ std::unique_ptr<Session> TCPHandler::makeSession()
     client_info.connection_client_version_patch = client_version_patch;
     client_info.connection_tcp_protocol_version = client_tcp_protocol_version;
 
+    client_info.quota_key = quota_key;
     client_info.interface = interface;
 
     return res;
@@ -1077,6 +1116,16 @@ void TCPHandler::receiveHello()
     session->authenticate(user, password, socket().peerAddress());
 }
 
+void TCPHandler::receiveAddendum()
+{
+    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY)
+    {
+        readStringBinary(quota_key, *in);
+        if (!is_interserver_mode)
+            session->getClientInfo().quota_key = quota_key;
+    }
+}
+
 
 void TCPHandler::receiveUnexpectedHello()
 {
@@ -1301,6 +1350,10 @@ void TCPHandler::receiveQuery()
 
     readStringBinary(state.query, *in);
 
+    Settings passed_params;
+    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
+        passed_params.read(*in, settings_format);
+
     /// TODO Unify interserver authentication (and make sure that it's secure enough)
     if (is_interserver_mode)
     {
@@ -1354,7 +1407,7 @@ void TCPHandler::receiveQuery()
     query_context = session->makeQueryContext(std::move(client_info));
 
     /// Sets the default database if it wasn't set earlier for the session context.
-    if (!default_database.empty() && !session->sessionContext())
+    if (is_interserver_mode && !default_database.empty())
         query_context->setCurrentDatabase(default_database);
 
     if (state.part_uuids_to_ignore)
@@ -1391,6 +1444,8 @@ void TCPHandler::receiveQuery()
     /// so we have to apply the changes first.
     query_context->setCurrentQueryId(state.query_id);
 
+    query_context->addQueryParameters(convertToQueryParameters(passed_params));
+
     /// For testing hedged requests
     if (unlikely(sleep_after_receiving_query.totalMilliseconds()))
     {
@@ -1427,6 +1482,9 @@ void TCPHandler::receiveUnexpectedQuery()
 
     readStringBinary(skip_string, *in);
 
+    if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS)
+        skip_settings.read(*in, settings_format);
+
     throw NetException("Unexpected packet Query received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
 }
 
@@ -1762,6 +1820,9 @@ void TCPHandler::sendProgress()
 {
     writeVarUInt(Protocol::Server::Progress, *out);
     auto increment = state.progress.fetchValuesAndResetPiecewiseAtomically();
+    UInt64 current_elapsed_ns = state.watch.elapsedNanoseconds();
+    increment.elapsed_ns = current_elapsed_ns - state.prev_elapsed_ns;
+    state.prev_elapsed_ns = current_elapsed_ns;
     increment.write(*out, client_tcp_protocol_version);
     out->next();
 }
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index bea00c815c8..ea5fb2f9fe0 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -102,6 +102,8 @@ struct QueryState
 
     /// To output progress, the difference after the previous sending of progress.
     Progress progress;
+    Stopwatch watch;
+    UInt64 prev_elapsed_ns = 0;
 
     /// Timeouts setter for current query
     std::unique_ptr<TimeoutSetter> timeout_setter;
@@ -155,6 +157,7 @@ private:
     UInt64 client_version_minor = 0;
     UInt64 client_version_patch = 0;
     UInt64 client_tcp_protocol_version = 0;
+    String quota_key;
 
     /// Connection settings, which are extracted from a context.
     bool send_exception_with_stack_trace = true;
@@ -211,6 +214,7 @@ private:
 
     bool receiveProxyHeader();
     void receiveHello();
+    void receiveAddendum();
     bool receivePacket();
     void receiveQuery();
     void receiveIgnoredPartUUIDs();
diff --git a/src/Storages/Cache/SchemaCache.cpp b/src/Storages/Cache/SchemaCache.cpp
new file mode 100644
index 00000000000..7bce1965f1a
--- /dev/null
+++ b/src/Storages/Cache/SchemaCache.cpp
@@ -0,0 +1,114 @@
+#include <Storages/Cache/SchemaCache.h>
+#include <Common/ProfileEvents.h>
+#include <ctime>
+
+namespace ProfileEvents
+{
+    extern const Event SchemaInferenceCacheHits;
+    extern const Event SchemaInferenceCacheMisses;
+    extern const Event SchemaInferenceCacheEvictions;
+    extern const Event SchemaInferenceCacheInvalidations;
+}
+
+namespace DB
+{
+
+SchemaCache::SchemaCache(size_t max_elements_) : max_elements(max_elements_)
+{
+}
+
+void SchemaCache::add(const String & key, const ColumnsDescription & columns)
+{
+    std::lock_guard lock(mutex);
+    addUnlocked(key, columns);
+}
+
+
+void SchemaCache::addMany(const Strings & keys, const ColumnsDescription & columns)
+{
+    std::lock_guard lock(mutex);
+    for (const auto & key : keys)
+        addUnlocked(key, columns);
+}
+
+void SchemaCache::addUnlocked(const String & key, const ColumnsDescription & columns)
+{
+    /// Do nothing if this key is already in cache;
+    if (data.contains(key))
+        return;
+
+    time_t now = std::time(nullptr);
+    auto it = queue.insert(queue.end(), key);
+    data[key] = {SchemaInfo{columns, now}, it};
+    checkOverflow();
+}
+
+void SchemaCache::checkOverflow()
+{
+    if (queue.size() <= max_elements)
+        return;
+
+    auto key = queue.front();
+    data.erase(key);
+    queue.pop_front();
+    ProfileEvents::increment(ProfileEvents::SchemaInferenceCacheEvictions);
+}
+
+std::optional<ColumnsDescription> SchemaCache::tryGet(const String & key, LastModificationTimeGetter get_last_mod_time)
+{
+    std::lock_guard lock(mutex);
+    auto it = data.find(key);
+    if (it == data.end())
+    {
+        ProfileEvents::increment(ProfileEvents::SchemaInferenceCacheMisses);
+        return std::nullopt;
+    }
+
+    auto & schema_info = it->second.schema_info;
+    auto & queue_iterator = it->second.iterator;
+    if (get_last_mod_time)
+    {
+        /// It's important to call get_last_mod_time only if we have key in cache,
+        /// because this function can do some heavy operations.
+        auto last_mod_time = get_last_mod_time();
+        /// If get_last_mod_time function was provided but it returned nullopt, it means that
+        /// it failed to get last modification time, so we cannot safely use value from cache.
+        if (!last_mod_time)
+            return std::nullopt;
+
+        if (*last_mod_time >= schema_info.registration_time)
+        {
+            /// Object was modified after it was added in cache.
+            /// So, stored value is no more valid and we should remove it.
+            ProfileEvents::increment(ProfileEvents::SchemaInferenceCacheInvalidations);
+            queue.erase(queue_iterator);
+            data.erase(key);
+            return std::nullopt;
+        }
+    }
+
+    /// Move key to the end of queue.
+    queue.splice(queue.end(), queue, queue_iterator);
+
+    ProfileEvents::increment(ProfileEvents::SchemaInferenceCacheHits);
+    return schema_info.columns;
+}
+
+void SchemaCache::clear()
+{
+    std::lock_guard lock(mutex);
+    data.clear();
+    queue.clear();
+}
+
+std::unordered_map<String, SchemaCache::SchemaInfo> SchemaCache::getAll()
+{
+    std::lock_guard lock(mutex);
+    std::unordered_map<String, SchemaCache::SchemaInfo> result;
+    for (const auto & [key, value] : data)
+        result[key] = value.schema_info;
+
+    return result;
+}
+
+}
diff --git a/src/Storages/Cache/SchemaCache.h b/src/Storages/Cache/SchemaCache.h
new file mode 100644
index 00000000000..132fbc0a8cb
--- /dev/null
+++ b/src/Storages/Cache/SchemaCache.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <Storages/ColumnsDescription.h>
+#include <unordered_map>
+#include <list>
+#include <mutex>
+#include <optional>
+
+namespace DB
+{
+
+const size_t DEFAULT_SCHEMA_CACHE_ELEMENTS = 4096;
+
+/// Cache that stores columns description by some string key. It's used in schema inference.
+/// It implements LRU semantic: after each access to a key in cache we move this key to
+/// the end of the queue, if we reached the limit of maximum elements in the cache we
+/// remove keys from the beginning of the queue.
+/// It also supports keys invalidations by last modification time. If last modification time
+/// is provided and last modification happened after a key was added to the cache, this key
+/// will be removed from cache.
+class SchemaCache
+{
+public:
+    SchemaCache(size_t max_elements_);
+
+    struct SchemaInfo
+    {
+        ColumnsDescription columns;
+        time_t registration_time;
+    };
+
+    using LastModificationTimeGetter = std::function<std::optional<time_t>()>;
+
+    /// Add new key with a schema
+    void add(const String & key, const ColumnsDescription & columns);
+
+    /// Add many keys with the same schema (usually used for globs)
+    void addMany(const Strings & keys, const ColumnsDescription & columns);
+
+    std::optional<ColumnsDescription> tryGet(const String & key, LastModificationTimeGetter get_last_mod_time = {});
+
+    void clear();
+
+    std::unordered_map<String, SchemaInfo> getAll();
+
+private:
+    void addUnlocked(const String & key, const ColumnsDescription & columns);
+    void checkOverflow();
+
+    using Queue = std::list<String>;
+    using QueueIterator = Queue::iterator;
+
+    struct Cell
+    {
+        SchemaInfo schema_info;
+        QueueIterator iterator;
+    };
+
+    Queue queue;
+    std::unordered_map<String, Cell> data;
+
+    size_t max_elements;
+    std::mutex mutex;
+};
+
+}
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index bf2638f7bc3..ff5a38fcc52 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -538,6 +538,7 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
             address.default_database,
             address.user,
             address.password,
+            address.quota_key,
             address.cluster,
             address.cluster_secret,
             storage.getName() + '_' + address.user, /* client */
@@ -618,11 +619,14 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
         ReadBufferFromFile in(file_path);
         const auto & distributed_header = readDistributedHeader(in, log);
 
-        LOG_DEBUG(log, "Started processing `{}` ({} rows, {} bytes)", file_path,
+        auto connection = pool->get(timeouts, &distributed_header.insert_settings);
+
+        LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
+            file_path,
+            connection->getDescription(),
             formatReadableQuantity(distributed_header.rows),
             formatReadableSizeWithBinarySuffix(distributed_header.bytes));
 
-        auto connection = pool->get(timeouts, &distributed_header.insert_settings);
         RemoteInserter remote{*connection, timeouts,
             distributed_header.insert_query,
             distributed_header.insert_settings,
@@ -717,10 +721,6 @@ struct StorageDistributedDirectoryMonitor::Batch
 
         Stopwatch watch;
 
-        LOG_DEBUG(parent.log, "Sending a batch of {} files ({} rows, {} bytes).", file_indices.size(),
-            formatReadableQuantity(total_rows),
-            formatReadableSizeWithBinarySuffix(total_bytes));
-
         if (!recovered)
         {
             /// For deduplication in Replicated tables to work, in case of error
@@ -749,6 +749,12 @@ struct StorageDistributedDirectoryMonitor::Batch
         auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.getContext()->getSettingsRef());
         auto connection = parent.pool->get(timeouts);
 
+        LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
+            file_indices.size(),
+            connection->getDescription(),
+            formatReadableQuantity(total_rows),
+            formatReadableSizeWithBinarySuffix(total_bytes));
+
         bool batch_broken = false;
         bool batch_marked_as_broken = false;
         try
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
index 0d6beb1733b..5710aa6cd6a 100644
--- a/src/Storages/ExternalDataSourceConfiguration.cpp
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -35,7 +35,7 @@ namespace ErrorCodes
 IMPLEMENT_SETTINGS_TRAITS(EmptySettingsTraits, EMPTY_SETTINGS)
 
 static const std::unordered_set<std::string_view> dictionary_allowed_keys = {
-    "host", "port", "user", "password", "db",
+    "host", "port", "user", "password", "quota_key", "db",
     "database", "table", "schema", "replica",
     "update_field", "update_lag", "invalidate_query", "query",
     "where", "name", "secure", "uri", "collection"};
@@ -84,6 +84,7 @@ void ExternalDataSourceConfiguration::set(const ExternalDataSourceConfiguration
     port = conf.port;
     username = conf.username;
     password = conf.password;
+    quota_key = conf.quota_key;
     database = conf.database;
     table = conf.table;
     schema = conf.schema;
@@ -123,6 +124,7 @@ std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
         configuration.port = config.getInt(collection_prefix + ".port", 0);
         configuration.username = config.getString(collection_prefix + ".user", "");
         configuration.password = config.getString(collection_prefix + ".password", "");
+        configuration.quota_key = config.getString(collection_prefix + ".quota_key", "");
         configuration.database = config.getString(collection_prefix + ".database", "");
         configuration.table = config.getString(collection_prefix + ".table", config.getString(collection_prefix + ".collection", ""));
         configuration.schema = config.getString(collection_prefix + ".schema", "");
@@ -169,6 +171,8 @@ std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
                         configuration.username = arg_value.safeGet<String>();
                     else if (arg_name == "password")
                         configuration.password = arg_value.safeGet<String>();
+                    else if (arg_name == "quota_key")
+                        configuration.quota_key = arg_value.safeGet<String>();
                     else if (arg_name == "database")
                         configuration.database = arg_value.safeGet<String>();
                     else if (arg_name == "table")
@@ -236,6 +240,7 @@ std::optional<ExternalDataSourceInfo> getExternalDataSourceConfiguration(
         configuration.port = dict_config.getInt(dict_config_prefix + ".port", config.getUInt(collection_prefix + ".port", 0));
         configuration.username = dict_config.getString(dict_config_prefix + ".user", config.getString(collection_prefix + ".user", ""));
         configuration.password = dict_config.getString(dict_config_prefix + ".password", config.getString(collection_prefix + ".password", ""));
+        configuration.quota_key = dict_config.getString(dict_config_prefix + ".quota_key", config.getString(collection_prefix + ".quota_key", ""));
         configuration.database = dict_config.getString(dict_config_prefix + ".db", config.getString(dict_config_prefix + ".database",
             config.getString(collection_prefix + ".db", config.getString(collection_prefix + ".database", ""))));
         configuration.table = dict_config.getString(dict_config_prefix + ".table", config.getString(collection_prefix + ".table", ""));
@@ -328,6 +333,7 @@ ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
         common_configuration.port = dict_config.getUInt(dict_config_prefix + ".port", 0);
         common_configuration.username = dict_config.getString(dict_config_prefix + ".user", "");
         common_configuration.password = dict_config.getString(dict_config_prefix + ".password", "");
+        common_configuration.quota_key = dict_config.getString(dict_config_prefix + ".quota_key", "");
         common_configuration.database = dict_config.getString(dict_config_prefix + ".db", dict_config.getString(dict_config_prefix + ".database", ""));
         common_configuration.table = dict_config.getString(fmt::format("{}.table", dict_config_prefix), "");
         common_configuration.schema = dict_config.getString(fmt::format("{}.schema", dict_config_prefix), "");
@@ -359,6 +365,7 @@ ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
                 replica_configuration.port = dict_config.getUInt(replica_name + ".port", common_configuration.port);
                 replica_configuration.username = dict_config.getString(replica_name + ".user", common_configuration.username);
                 replica_configuration.password = dict_config.getString(replica_name + ".password", common_configuration.password);
+                replica_configuration.quota_key = dict_config.getString(replica_name + ".quota_key", common_configuration.quota_key);
 
                 if (replica_configuration.host.empty() || replica_configuration.port == 0
                     || replica_configuration.username.empty() || replica_configuration.password.empty())
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
index 4ed46e1b26c..719fceb7df1 100644
--- a/src/Storages/ExternalDataSourceConfiguration.h
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -19,6 +19,7 @@ struct ExternalDataSourceConfiguration
     UInt16 port = 0;
     String username = "default";
     String password;
+    String quota_key;
     String database;
     String table;
     String schema;
diff --git a/src/Storages/FileLog/StorageFileLog.cpp b/src/Storages/FileLog/StorageFileLog.cpp
index 323bcdc100d..7848b75deec 100644
--- a/src/Storages/FileLog/StorageFileLog.cpp
+++ b/src/Storages/FileLog/StorageFileLog.cpp
@@ -37,6 +37,7 @@ namespace ErrorCodes
     extern const int CANNOT_READ_ALL_DATA;
     extern const int LOGICAL_ERROR;
     extern const int TABLE_METADATA_ALREADY_EXISTS;
+    extern const int DIRECTORY_DOESNT_EXIST;
     extern const int CANNOT_SELECT;
     extern const int QUERY_NOT_ALLOWED;
 }
@@ -72,6 +73,25 @@ StorageFileLog::StorageFileLog(
 
     try
     {
+        if (!attach)
+        {
+            std::error_code ec;
+            std::filesystem::create_directories(metadata_base_path, ec);
+
+            if (ec)
+            {
+                if (ec == std::make_error_code(std::errc::file_exists))
+                {
+                    throw Exception(ErrorCodes::TABLE_METADATA_ALREADY_EXISTS,
+                        "Metadata files already exist by path: {}, remove them manually if it is intended",
+                        metadata_base_path);
+                }
+                else
+                    throw Exception(ErrorCodes::DIRECTORY_DOESNT_EXIST,
+                        "Could not create directory {}, reason: {}", metadata_base_path, ec.message());
+            }
+        }
+
         loadMetaFiles(attach);
         loadFiles();
 
@@ -117,19 +137,6 @@ void StorageFileLog::loadMetaFiles(bool attach)
         /// Load all meta info to file_infos;
         deserialize();
     }
-    /// Create table, just create meta data directory
-    else
-    {
-        if (std::filesystem::exists(metadata_base_path))
-        {
-            throw Exception(
-                ErrorCodes::TABLE_METADATA_ALREADY_EXISTS,
-                "Metadata files already exist by path: {}, remove them manually if it is intended",
-                metadata_base_path);
-        }
-        /// We do not create the metadata_base_path directory at creation time, create it at the moment of serializing
-        /// meta files, such that can avoid unnecessarily create this directory if create table failed.
-    }
 }
 
 void StorageFileLog::loadFiles()
@@ -218,10 +225,6 @@ void StorageFileLog::loadFiles()
 
 void StorageFileLog::serialize() const
 {
-    if (!std::filesystem::exists(metadata_base_path))
-    {
-        std::filesystem::create_directories(metadata_base_path);
-    }
     for (const auto & [inode, meta] : file_infos.meta_by_inode)
     {
         auto full_name = getFullMetaPath(meta.file_name);
@@ -242,10 +245,6 @@ void StorageFileLog::serialize() const
 
 void StorageFileLog::serialize(UInt64 inode, const FileMeta & file_meta) const
 {
-    if (!std::filesystem::exists(metadata_base_path))
-    {
-        std::filesystem::create_directories(metadata_base_path);
-    }
     auto full_name = getFullMetaPath(file_meta.file_name);
     if (!std::filesystem::exists(full_name))
     {
@@ -379,8 +378,7 @@ void StorageFileLog::drop()
 {
     try
     {
-        if (std::filesystem::exists(metadata_base_path))
-            std::filesystem::remove_all(metadata_base_path);
+        std::filesystem::remove_all(metadata_base_path);
     }
     catch (...)
     {
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
index eab5c2ab134..ef6eb5e7a80 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
@@ -3,10 +3,10 @@
 #if USE_HDFS
 #include <mutex>
 #include <Common/logger_useful.h>
-#include <Storages/HDFS/HDFSCommon.h>
 #include <Storages/HDFS/ReadBufferFromHDFS.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 
+
 namespace CurrentMetrics
 {
     extern const Metric AsynchronousReadWait;
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index 57e893e9683..c18726aa7c4 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -65,7 +65,7 @@ namespace
     /* Recursive directory listing with matched paths as a result.
      * Have the same method in StorageFile.
      */
-    Strings LSWithRegexpMatching(const String & path_for_ls, const HDFSFSPtr & fs, const String & for_match)
+    Strings LSWithRegexpMatching(const String & path_for_ls, const HDFSFSPtr & fs, const String & for_match, std::unordered_map<String, time_t> * last_mod_times)
     {
         const size_t first_glob = for_match.find_first_of("*?{");
 
@@ -100,13 +100,15 @@ namespace
                 if (re2::RE2::FullMatch(file_name, matcher))
                 {
                     result.push_back(String(ls.file_info[i].mName));
+                    if (last_mod_times)
+                        (*last_mod_times)[result.back()] = ls.file_info[i].mLastMod;
                 }
             }
             else if (is_directory && looking_for_directory)
             {
                 if (re2::RE2::FullMatch(file_name, matcher))
                 {
-                    Strings result_part = LSWithRegexpMatching(fs::path(full_path) / "", fs, suffix_with_globs.substr(next_slash));
+                    Strings result_part = LSWithRegexpMatching(fs::path(full_path) / "", fs, suffix_with_globs.substr(next_slash), last_mod_times);
                     /// Recursion depth is limited by pattern. '*' works only for depth = 1, for depth = 2 pattern path is '*/*'. So we do not need additional check.
                     std::move(result_part.begin(), result_part.end(), std::back_inserter(result));
                 }
@@ -122,12 +124,12 @@ namespace
         return {uri.substr(begin_of_path), uri.substr(0, begin_of_path)};
     }
 
-    std::vector<String> getPathsList(const String & path_from_uri, const String & uri_without_path, ContextPtr context)
+    std::vector<String> getPathsList(const String & path_from_uri, const String & uri_without_path, ContextPtr context, std::unordered_map<String, time_t> * last_mod_times = nullptr)
     {
         HDFSBuilderWrapper builder = createHDFSBuilder(uri_without_path + "/", context->getGlobalContext()->getConfigRef());
         HDFSFSPtr fs = createHDFSFS(builder.get());
 
-        return LSWithRegexpMatching("/", fs, path_from_uri);
+        return LSWithRegexpMatching("/", fs, path_from_uri, last_mod_times);
     }
 }
 
@@ -186,7 +188,8 @@ ColumnsDescription StorageHDFS::getTableStructureFromData(
     ContextPtr ctx)
 {
     const auto [path_from_uri, uri_without_path] = getPathFromUriAndUriWithoutPath(uri);
-    auto paths = getPathsList(path_from_uri, uri, ctx);
+    std::unordered_map<String, time_t> last_mod_time;
+    auto paths = getPathsList(path_from_uri, uri, ctx, &last_mod_time);
     if (paths.empty() && !FormatFactory::instance().checkIfFormatHasExternalSchemaReader(format))
         throw Exception(
             ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
@@ -194,7 +197,11 @@ ColumnsDescription StorageHDFS::getTableStructureFromData(
             "specify table structure manually",
             format);
 
-    ReadBufferIterator read_buffer_iterator = [&, uri_without_path = uri_without_path, it = paths.begin()]() mutable -> std::unique_ptr<ReadBuffer>
+    std::optional<ColumnsDescription> columns_from_cache;
+    if (ctx->getSettingsRef().schema_inference_use_cache_for_hdfs)
+        columns_from_cache = tryGetColumnsFromCache(paths, path_from_uri, last_mod_time, format, ctx);
+
+    ReadBufferIterator read_buffer_iterator = [&, uri_without_path = uri_without_path, it = paths.begin()](ColumnsDescription &) mutable -> std::unique_ptr<ReadBuffer>
     {
         if (it == paths.end())
             return nullptr;
@@ -203,7 +210,17 @@ ColumnsDescription StorageHDFS::getTableStructureFromData(
         const auto zstd_window_log_max = ctx->getSettingsRef().zstd_window_log_max;
         return wrapReadBufferWithCompressionMethod(std::move(impl), compression, zstd_window_log_max);
     };
-    return readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, paths.size() > 1, ctx);
+
+    ColumnsDescription columns;
+    if (columns_from_cache)
+        columns = *columns_from_cache;
+    else
+        columns = readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, paths.size() > 1, ctx);
+
+    if (ctx->getSettingsRef().schema_inference_use_cache_for_hdfs)
+        addColumnsToCache(paths, path_from_uri, columns, format, ctx);
+
+    return columns;
 }
 
 class HDFSSource::DisclosedGlobIterator::Impl
@@ -427,18 +444,37 @@ public:
 
     void consume(Chunk chunk) override
     {
+        std::lock_guard lock(cancel_mutex);
+        if (cancelled)
+            return;
         writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
+    void onCancel() override
+    {
+        std::lock_guard lock(cancel_mutex);
+        finalize();
+        cancelled = true;
+    }
+
     void onException() override
     {
-        if (!writer)
-            return;
-        onFinish();
+        std::lock_guard lock(cancel_mutex);
+        finalize();
     }
 
     void onFinish() override
     {
+        std::lock_guard lock(cancel_mutex);
+        finalize();
+    }
+
+private:
+    void finalize()
+    {
+        if (!writer)
+            return;
+
         try
         {
             writer->finalize();
@@ -454,9 +490,10 @@ public:
         }
     }
 
-private:
     std::unique_ptr<WriteBuffer> write_buf;
     OutputFormatPtr writer;
+    std::mutex cancel_mutex;
+    bool cancelled = false;
 };
 
 class PartitionedHDFSSink : public PartitionedSink
@@ -712,6 +749,55 @@ NamesAndTypesList StorageHDFS::getVirtuals() const
     return virtual_columns;
 }
 
+SchemaCache & StorageHDFS::getSchemaCache(const ContextPtr & ctx)
+{
+    static SchemaCache schema_cache(ctx->getConfigRef().getUInt("schema_inference_cache_max_elements_for_hdfs", DEFAULT_SCHEMA_CACHE_ELEMENTS));
+    return schema_cache;
+}
+
+std::optional<ColumnsDescription> StorageHDFS::tryGetColumnsFromCache(
+    const Strings & paths,
+    const String & uri_without_path,
+    std::unordered_map<String, time_t> & last_mod_time,
+    const String & format_name,
+    const ContextPtr & ctx)
+{
+    auto & schema_cache = getSchemaCache(ctx);
+    for (const auto & path : paths)
+    {
+        auto get_last_mod_time = [&]() -> std::optional<time_t>
+        {
+            auto it = last_mod_time.find(path);
+            if (it == last_mod_time.end())
+                return std::nullopt;
+            return it->second;
+        };
+
+        String url = fs::path(uri_without_path) / path;
+        String cache_key = getKeyForSchemaCache(url, format_name, {}, ctx);
+        auto columns = schema_cache.tryGet(cache_key, get_last_mod_time);
+        if (columns)
+            return columns;
+    }
+
+    return std::nullopt;
+}
+
+void StorageHDFS::addColumnsToCache(
+    const Strings & paths,
+    const String & uri_without_path,
+    const ColumnsDescription & columns,
+    const String & format_name,
+    const ContextPtr & ctx)
+{
+    auto & schema_cache = getSchemaCache(ctx);
+    Strings sources;
+    sources.reserve(paths.size());
+    std::transform(paths.begin(), paths.end(), std::back_inserter(sources), [&](const String & path){ return fs::path(uri_without_path) / path; });
+    Strings cache_keys = getKeysForSchemaCache(sources, format_name, {}, ctx);
+    schema_cache.addMany(cache_keys, columns);
+}
+
 }
 
 #endif
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index d987820b844..a0d61f4bd2a 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -6,6 +6,7 @@
 
 #include <Processors/ISource.h>
 #include <Storages/IStorage.h>
+#include <Storages/Cache/SchemaCache.h>
 #include <Poco/URI.h>
 #include <Common/logger_useful.h>
 
@@ -65,10 +66,26 @@ public:
         const String & compression_method,
         ContextPtr ctx);
 
+    static SchemaCache & getSchemaCache(const ContextPtr & ctx);
+
 protected:
     friend class HDFSSource;
 
 private:
+    static std::optional<ColumnsDescription> tryGetColumnsFromCache(
+        const Strings & paths,
+        const String & uri_without_path,
+        std::unordered_map<String, time_t> & last_mod_time,
+        const String & format_name,
+        const ContextPtr & ctx);
+
+    static void addColumnsToCache(
+        const Strings & paths,
+        const String & uri_without_path,
+        const ColumnsDescription & columns,
+        const String & format_name,
+        const ContextPtr & ctx);
+
     std::vector<const String> uris;
     String format_name;
     String compression_method;
diff --git a/src/Storages/HDFS/StorageHDFSCluster.cpp b/src/Storages/HDFS/StorageHDFSCluster.cpp
index 08dabfccf55..200c8cb3320 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.cpp
+++ b/src/Storages/HDFS/StorageHDFSCluster.cpp
@@ -41,7 +41,7 @@ StorageHDFSCluster::StorageHDFSCluster(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & compression_method_)
-    : IStorage(table_id_)
+    : IStorageCluster(table_id_)
     , cluster_name(cluster_name_)
     , uri(uri_)
     , format_name(format_name_)
@@ -74,13 +74,7 @@ Pipe StorageHDFSCluster::read(
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
 {
-    auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
-
-    auto iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(context, uri);
-    auto callback = std::make_shared<HDFSSource::IteratorWrapper>([iterator]() mutable -> String
-    {
-        return iterator->next();
-    });
+    createIteratorAndCallback(context);
 
     /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
     Block header =
@@ -99,7 +93,7 @@ Pipe StorageHDFSCluster::read(
         {
             auto connection = std::make_shared<Connection>(
                 node.host_name, node.port, context->getGlobalContext()->getCurrentDatabase(),
-                node.user, node.password, node.cluster, node.cluster_secret,
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
                 "HDFSClusterInititiator",
                 node.compression,
                 node.secure
@@ -140,6 +134,29 @@ QueryProcessingStage::Enum StorageHDFSCluster::getQueryProcessingStage(
 }
 
 
+void StorageHDFSCluster::createIteratorAndCallback(ContextPtr context) const
+{
+    cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
+
+    iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(context, uri);
+    callback = std::make_shared<HDFSSource::IteratorWrapper>([iter = this->iterator]() mutable -> String { return iter->next(); });
+}
+
+
+RemoteQueryExecutor::Extension StorageHDFSCluster::getTaskIteratorExtension(ContextPtr context) const
+{
+    createIteratorAndCallback(context);
+    return RemoteQueryExecutor::Extension{.task_iterator = callback};
+}
+
+
+ClusterPtr StorageHDFSCluster::getCluster(ContextPtr context) const
+{
+    createIteratorAndCallback(context);
+    return cluster;
+}
+
+
 NamesAndTypesList StorageHDFSCluster::getVirtuals() const
 {
     return NamesAndTypesList{
diff --git a/src/Storages/HDFS/StorageHDFSCluster.h b/src/Storages/HDFS/StorageHDFSCluster.h
index 21ae73c11ea..64b5fa86e05 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.h
+++ b/src/Storages/HDFS/StorageHDFSCluster.h
@@ -9,6 +9,7 @@
 
 #include <Client/Connection.h>
 #include <Interpreters/Cluster.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/HDFS/StorageHDFS.h>
 
 namespace DB
@@ -16,7 +17,7 @@ namespace DB
 
 class Context;
 
-class StorageHDFSCluster : public IStorage
+class StorageHDFSCluster : public IStorageCluster
 {
 public:
     StorageHDFSCluster(
@@ -39,11 +40,20 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
+    ClusterPtr getCluster(ContextPtr context) const override;
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ContextPtr context) const override;
+
 private:
     String cluster_name;
     String uri;
     String format_name;
     String compression_method;
+
+    mutable ClusterPtr cluster;
+    mutable std::shared_ptr<HDFSSource::DisclosedGlobIterator> iterator;
+    mutable std::shared_ptr<HDFSSource::IteratorWrapper> callback;
+
+    void createIteratorAndCallback(ContextPtr context) const;
 };
 
 
diff --git a/src/Storages/Hive/HiveCommon.h b/src/Storages/Hive/HiveCommon.h
index 55f79bbaaeb..297b79da935 100644
--- a/src/Storages/Hive/HiveCommon.h
+++ b/src/Storages/Hive/HiveCommon.h
@@ -10,7 +10,7 @@
 #include <ThriftHiveMetastore.h>
 
 #include <base/types.h>
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/PoolBase.h>
 #include <Storages/HDFS/HDFSCommon.h>
 #include <Storages/Hive/HiveFile.h>
@@ -135,7 +135,7 @@ private:
 
     void tryCallHiveClient(std::function<void(ThriftHiveMetastoreClientPool::Entry &)> func);
 
-    LRUCache<String, HiveTableMetadata> table_metadata_cache;
+    CacheBase<String, HiveTableMetadata> table_metadata_cache;
     ThriftHiveMetastoreClientPool client_pool;
 
     Poco::Logger * log = &Poco::Logger::get("HiveMetastoreClient");
diff --git a/src/Storages/Hive/HiveFile.h b/src/Storages/Hive/HiveFile.h
index a4bd345aa48..26e1b844b9d 100644
--- a/src/Storages/Hive/HiveFile.h
+++ b/src/Storages/Hive/HiveFile.h
@@ -170,7 +170,7 @@ protected:
 
 using HiveFilePtr = std::shared_ptr<IHiveFile>;
 using HiveFiles = std::vector<HiveFilePtr>;
-using HiveFilesCache = LRUCache<String, IHiveFile>;
+using HiveFilesCache = CacheBase<String, IHiveFile>;
 using HiveFilesCachePtr = std::shared_ptr<HiveFilesCache>;
 
 class HiveTextFile : public IHiveFile
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index ddd9f526091..01ee5a8c3c5 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -20,7 +20,6 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <IO/ReadBufferFromString.h>
-#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <Storages/Cache/ExternalDataSourceCache.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTCreateQuery.h>
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 03e10f98b49..a61bfeaff57 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -282,7 +282,7 @@ public:
       *
       * SelectQueryInfo is required since the stage can depends on the query
       * (see Distributed() engine and optimize_skip_unused_shards,
-      *  see also MergeTree engine and allow_experimental_projection_optimization).
+      *  see also MergeTree engine and projection optimization).
       * And to store optimized cluster (after optimize_skip_unused_shards).
       * It will also store needed stuff for projection query pipeline.
       *
diff --git a/src/Storages/IStorageCluster.h b/src/Storages/IStorageCluster.h
new file mode 100644
index 00000000000..ecab7266153
--- /dev/null
+++ b/src/Storages/IStorageCluster.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Storages/IStorage.h>
+#include <Interpreters/Cluster.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+
+namespace DB
+{
+
+
+/**
+ *  Base cluster for Storages used in table functions like s3Cluster and hdfsCluster
+ *  Needed for code simplification around parallel_distributed_insert_select
+ */
+class IStorageCluster: public IStorage
+{
+public:
+
+    explicit IStorageCluster(const StorageID & table_id_) : IStorage(table_id_) {}
+
+    virtual ClusterPtr getCluster(ContextPtr context) const = 0;
+    virtual RemoteQueryExecutor::Extension getTaskIteratorExtension(ContextPtr context) const = 0;
+
+    bool isRemote() const override { return true; }
+};
+
+
+}
diff --git a/src/Storages/KVStorageUtils.cpp b/src/Storages/KVStorageUtils.cpp
new file mode 100644
index 00000000000..41aa91eef31
--- /dev/null
+++ b/src/Storages/KVStorageUtils.cpp
@@ -0,0 +1,182 @@
+#include <Storages/KVStorageUtils.h>
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+
+#include <Interpreters/Set.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/evaluateConstantExpression.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+// returns keys may be filter by condition
+bool traverseASTFilter(
+    const std::string & primary_key, const DataTypePtr & primary_key_type, const ASTPtr & elem, const PreparedSetsPtr & prepared_sets, const ContextPtr & context, FieldVectorPtr & res)
+{
+    const auto * function = elem->as<ASTFunction>();
+    if (!function)
+        return false;
+
+    if (function->name == "and")
+    {
+        // one child has the key filter condition is ok
+        for (const auto & child : function->arguments->children)
+            if (traverseASTFilter(primary_key, primary_key_type, child, prepared_sets, context, res))
+                return true;
+        return false;
+    }
+    else if (function->name == "or")
+    {
+        // make sure every child has the key filter condition
+        for (const auto & child : function->arguments->children)
+            if (!traverseASTFilter(primary_key, primary_key_type, child, prepared_sets, context, res))
+                return false;
+        return true;
+    }
+    else if (function->name == "equals" || function->name == "in")
+    {
+        const auto & args = function->arguments->as<ASTExpressionList &>();
+        const ASTIdentifier * ident;
+        std::shared_ptr<IAST> value;
+
+        if (args.children.size() != 2)
+            return false;
+
+        if (function->name == "in")
+        {
+            if (!prepared_sets)
+                return false;
+
+            ident = args.children.at(0)->as<ASTIdentifier>();
+            if (!ident)
+                return false;
+
+            if (ident->name() != primary_key)
+                return false;
+            value = args.children.at(1);
+
+            PreparedSetKey set_key;
+            if ((value->as<ASTSubquery>() || value->as<ASTIdentifier>()))
+                set_key = PreparedSetKey::forSubquery(*value);
+            else
+                set_key = PreparedSetKey::forLiteral(*value, {primary_key_type});
+
+            SetPtr set = prepared_sets->get(set_key);
+            if (!set)
+                return false;
+
+            if (!set->hasExplicitSetElements())
+                return false;
+
+            set->checkColumnsNumber(1);
+            const auto & set_column = *set->getSetElements()[0];
+            for (size_t row = 0; row < set_column.size(); ++row)
+                res->push_back(set_column[row]);
+            return true;
+        }
+        else
+        {
+            if ((ident = args.children.at(0)->as<ASTIdentifier>()))
+                value = args.children.at(1);
+            else if ((ident = args.children.at(1)->as<ASTIdentifier>()))
+                value = args.children.at(0);
+            else
+                return false;
+
+            if (ident->name() != primary_key)
+                return false;
+
+            const auto node = evaluateConstantExpressionAsLiteral(value, context);
+            /// function->name == "equals"
+            if (const auto * literal = node->as<ASTLiteral>())
+            {
+                auto converted_field = convertFieldToType(literal->value, *primary_key_type);
+                if (!converted_field.isNull())
+                    res->push_back(converted_field);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+}
+
+std::pair<FieldVectorPtr, bool> getFilterKeys(
+    const String & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info, const ContextPtr & context)
+{
+    const auto & select = query_info.query->as<ASTSelectQuery &>();
+    if (!select.where())
+        return {{}, true};
+
+    FieldVectorPtr res = std::make_shared<FieldVector>();
+    auto matched_keys = traverseASTFilter(primary_key, primary_key_type, select.where(), query_info.prepared_sets, context, res);
+    return std::make_pair(res, !matched_keys);
+}
+
+std::vector<std::string> serializeKeysToRawString(
+    FieldVector::const_iterator & it,
+    FieldVector::const_iterator end,
+    DataTypePtr key_column_type,
+    size_t max_block_size)
+{
+    size_t num_keys = end - it;
+
+    std::vector<std::string> result;
+    result.reserve(num_keys);
+
+    size_t rows_processed = 0;
+    while (it < end && (max_block_size == 0 || rows_processed < max_block_size))
+    {
+        std::string & serialized_key = result.emplace_back();
+        WriteBufferFromString wb(serialized_key);
+        key_column_type->getDefaultSerialization()->serializeBinary(*it, wb);
+        wb.finalize();
+
+        ++it;
+        ++rows_processed;
+    }
+    return result;
+}
+
+std::vector<std::string> serializeKeysToRawString(const ColumnWithTypeAndName & keys)
+{
+    if (!keys.column)
+        return {};
+
+    size_t num_keys = keys.column->size();
+    std::vector<std::string> result;
+    result.reserve(num_keys);
+
+    for (size_t i = 0; i < num_keys; ++i)
+    {
+        std::string & serialized_key = result.emplace_back();
+        WriteBufferFromString wb(serialized_key);
+        Field field;
+        keys.column->get(i, field);
+        /// TODO(@vdimir): use serializeBinaryBulk
+        keys.type->getDefaultSerialization()->serializeBinary(field, wb);
+        wb.finalize();
+    }
+    return result;
+}
+
+/// In current implementation rocks db can have key with only one column.
+size_t getPrimaryKeyPos(const Block & header, const Names & primary_key)
+{
+    if (primary_key.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Only one primary key is supported");
+    return header.getPositionByName(primary_key[0]);
+}
+
+}
diff --git a/src/Storages/KVStorageUtils.h b/src/Storages/KVStorageUtils.h
new file mode 100644
index 00000000000..e3216164869
--- /dev/null
+++ b/src/Storages/KVStorageUtils.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Common/logger_useful.h>
+#include <Storages/SelectQueryInfo.h>
+
+#include <Interpreters/PreparedSets.h>
+#include <Core/Field.h>
+
+#include <IO/ReadBufferFromString.h>
+
+namespace DB
+{
+
+using FieldVectorPtr = std::shared_ptr<FieldVector>;
+
+class IDataType;
+using DataTypePtr = std::shared_ptr<const IDataType>;
+
+/** Retrieve from the query a condition of the form `key = 'key'`, `key in ('xxx_'), from conjunctions in the WHERE clause.
+  * TODO support key like search
+  */
+std::pair<FieldVectorPtr, bool> getFilterKeys(
+    const std::string & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info, const ContextPtr & context);
+
+template <typename K, typename V>
+void fillColumns(const K & key, const V & value, size_t key_pos, const Block & header, MutableColumns & columns)
+{
+    ReadBufferFromString key_buffer(key);
+    ReadBufferFromString value_buffer(value);
+    for (size_t i = 0; i < header.columns(); ++i)
+    {
+        const auto & serialization = header.getByPosition(i).type->getDefaultSerialization();
+        serialization->deserializeBinary(*columns[i], i == key_pos ? key_buffer : value_buffer);
+    }
+}
+
+std::vector<std::string> serializeKeysToRawString(
+    FieldVector::const_iterator & it,
+    FieldVector::const_iterator end,
+    DataTypePtr key_column_type,
+    size_t max_block_size);
+
+std::vector<std::string> serializeKeysToRawString(const ColumnWithTypeAndName & keys);
+
+/// In current implementation key with only column is supported.
+size_t getPrimaryKeyPos(const Block & header, const Names & primary_key);
+
+}
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index a3f92650426..9095bf6bb35 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include <Common/LRUCache.h>
+#include <Common/CacheBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
 #include <Interpreters/AggregationCommon.h>
@@ -34,14 +34,14 @@ struct MarksWeightFunction
 /** Cache of 'marks' for StorageMergeTree.
   * Marks is an index structure that addresses ranges in column file, corresponding to ranges of primary key.
   */
-class MarkCache : public LRUCache<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>
+class MarkCache : public CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>
 {
 private:
-    using Base = LRUCache<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
+    using Base = CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
 
 public:
-    explicit MarkCache(size_t max_size_in_bytes)
-        : Base(max_size_in_bytes) {}
+    explicit MarkCache(size_t max_size_in_bytes, const String & mark_cache_policy = "")
+        : Base(max_size_in_bytes, 0, mark_cache_policy) {}
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file)
diff --git a/src/Storages/MergeTree/DataPartStorageOnDisk.cpp b/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
index f3b228a0748..1cd6fd0305b 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDisk.cpp
@@ -208,6 +208,8 @@ void DataPartStorageOnDisk::remove(
     const NameSet & names_not_to_remove,
     const MergeTreeDataPartChecksums & checksums,
     std::list<ProjectionChecksums> projections,
+    bool is_temp,
+    MergeTreeDataPartState state,
     Poco::Logger * log) const
 {
     /// NOTE We rename part to delete_tmp_<relative_path> instead of delete_tmp_<name> to avoid race condition
@@ -276,7 +278,7 @@ void DataPartStorageOnDisk::remove(
 
         clearDirectory(
             fs::path(to) / proj_dir_name,
-            can_remove_shared_data, names_not_to_remove, projection.checksums, {}, log, true);
+            can_remove_shared_data, names_not_to_remove, projection.checksums, {}, is_temp, state, log, true);
     }
 
     /// It is possible that we are removing the part which have a written but not loaded projection.
@@ -303,7 +305,7 @@ void DataPartStorageOnDisk::remove(
 
                     clearDirectory(
                         fs::path(to) / name,
-                        can_remove_shared_data, names_not_to_remove, tmp_checksums, {}, log, true);
+                        can_remove_shared_data, names_not_to_remove, tmp_checksums, {}, is_temp, state, log, true);
                 }
                 catch (...)
                 {
@@ -313,7 +315,7 @@ void DataPartStorageOnDisk::remove(
         }
     }
 
-    clearDirectory(to, can_remove_shared_data, names_not_to_remove, checksums, projection_directories, log, false);
+    clearDirectory(to, can_remove_shared_data, names_not_to_remove, checksums, projection_directories, is_temp, state, log, false);
 }
 
 void DataPartStorageOnDisk::clearDirectory(
@@ -322,24 +324,22 @@ void DataPartStorageOnDisk::clearDirectory(
     const NameSet & names_not_to_remove,
     const MergeTreeDataPartChecksums & checksums,
     const std::unordered_set<String> & skip_directories,
+    bool is_temp,
+    MergeTreeDataPartState state,
     Poco::Logger * log,
     bool is_projection) const
 {
     auto disk = volume->getDisk();
 
-    if (checksums.empty())
+    /// It does not make sense to try fast path for incomplete temporary parts, because some files are probably absent.
+    /// Sometimes we add something to checksums.files before actually writing checksums and columns on disk.
+    /// Also sometimes we write checksums.txt and columns.txt in arbitrary order, so this check becomes complex...
+    bool is_temporary_part = is_temp || state == MergeTreeDataPartState::Temporary;
+    bool incomplete_temporary_part = is_temporary_part && (!disk->exists(fs::path(dir) / "checksums.txt") || !disk->exists(fs::path(dir) / "columns.txt"));
+    if (checksums.empty() || incomplete_temporary_part)
     {
-        if (is_projection)
-        {
-            LOG_ERROR(
-                log,
-                "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: checksums.txt is missing",
-                fullPath(disk, dir));
-        }
-
         /// If the part is not completely written, we cannot use fast path by listing files.
         disk->removeSharedRecursive(fs::path(dir) / "", !can_remove_shared_data, names_not_to_remove);
-
         return;
     }
 
diff --git a/src/Storages/MergeTree/DataPartStorageOnDisk.h b/src/Storages/MergeTree/DataPartStorageOnDisk.h
index 2426b5eee80..5b5cff8e636 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDisk.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDisk.h
@@ -49,6 +49,8 @@ public:
         const NameSet & names_not_to_remove,
         const MergeTreeDataPartChecksums & checksums,
         std::list<ProjectionChecksums> projections,
+        bool is_temp,
+        MergeTreeDataPartState state,
         Poco::Logger * log) const override;
 
     std::string getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached) const override;
@@ -120,6 +122,8 @@ private:
         const NameSet & names_not_to_remove,
         const MergeTreeDataPartChecksums & checksums,
         const std::unordered_set<String> & skip_directories,
+        bool is_temp,
+        MergeTreeDataPartState state,
         Poco::Logger * log,
         bool is_projection) const;
 };
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 3609a65bc71..5fe3ee4da28 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -420,6 +420,13 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     if (blocker.isCancelled())
         throw Exception("Fetching of part was cancelled", ErrorCodes::ABORTED);
 
+    /// It should be "tmp-fetch_" and not "tmp_fetch_", because we can fetch part to detached/,
+    /// but detached part name prefix should not contain underscore.
+    static const String TMP_PREFIX = "tmp-fetch_";
+    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+    String part_dir = tmp_prefix + part_name;
+    auto temporary_directory_lock = data.getTemporaryPartDirectoryHolder(part_dir);
+
     /// Validation of the input that may come from malicious replica.
     auto part_info = MergeTreePartInfo::fromPartName(part_name, data.format_version);
     const auto data_settings = data.getSettings();
@@ -555,7 +562,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
         try
         {
-            return downloadPartToDiskRemoteMeta(part_name, replica_path, to_detached, tmp_prefix_, disk, *in, throttler);
+            return downloadPartToDiskRemoteMeta(part_name, replica_path, to_detached, tmp_prefix, disk, *in, throttler);
         }
         catch (const Exception & e)
         {
@@ -575,9 +582,11 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
                 tryLogCurrentException(log);
             }
 
+            temporary_directory_lock = {};
+
             /// Try again but without zero-copy
             return fetchPart(metadata_snapshot, context, part_name, replica_path, host, port, timeouts,
-                user, password, interserver_scheme, throttler, to_detached, tmp_prefix_, nullptr, false, disk);
+                user, password, interserver_scheme, throttler, to_detached, tmp_prefix, nullptr, false, disk);
         }
     }
 
@@ -597,7 +606,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     MergeTreeData::DataPart::Checksums checksums;
     return part_type == "InMemory"
         ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, context, disk, *in, projections, throttler)
-        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, disk, *in, projections, checksums, throttler);
+        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix, sync, disk, *in, projections, checksums, throttler);
 }
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
@@ -646,7 +655,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
             std::make_shared<MergeTreeDataPartInMemory>(data, projection_name, new_part_info, projection_part_storage, new_data_part.get());
 
         new_projection_part->is_temp = false;
-        new_projection_part->setColumns(block.getNamesAndTypesList());
+        new_projection_part->setColumns(block.getNamesAndTypesList(), {});
         MergeTreePartition partition{};
         new_projection_part->partition = std::move(partition);
         new_projection_part->minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
@@ -676,7 +685,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
 
     new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
-    new_data_part->setColumns(block.getNamesAndTypesList());
+    new_data_part->setColumns(block.getNamesAndTypesList(), {});
     new_data_part->minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
     new_data_part->partition.create(metadata_snapshot, block, 0, context);
 
@@ -719,7 +728,7 @@ void Fetcher::downloadBaseOrProjectionPartToDisk(
                 "This may happen if we are trying to download part from malicious replica or logical error.",
                 absolute_file_path, data_part_storage_builder->getRelativePath());
 
-        auto file_out = data_part_storage_builder->writeFile(file_name, file_size, {});
+        auto file_out = data_part_storage_builder->writeFile(file_name, std::min<UInt64>(file_size, DBMS_DEFAULT_BUFFER_SIZE), {});
         HashingWriteBuffer hashing_out(*file_out);
         copyDataWithThrottler(in, hashing_out, file_size, blocker.getCounter(), throttler);
 
@@ -755,7 +764,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const String & part_name,
     const String & replica_path,
     bool to_detached,
-    const String & tmp_prefix_,
+    const String & tmp_prefix,
     bool sync,
     DiskPtr disk,
     PooledReadWriteBufferFromHTTP & in,
@@ -763,8 +772,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     ThrottlerPtr throttler)
 {
-    static const String TMP_PREFIX = "tmp-fetch_";
-    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+    assert(!tmp_prefix.empty());
 
     /// We will remove directory if it's already exists. Make precautions.
     if (tmp_prefix.empty() //-V560
@@ -836,7 +844,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDiskRemoteMeta(
     const String & part_name,
     const String & replica_path,
     bool to_detached,
-    const String & tmp_prefix_,
+    const String & tmp_prefix,
     DiskPtr disk,
     PooledReadWriteBufferFromHTTP & in,
     ThrottlerPtr throttler)
@@ -854,8 +862,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDiskRemoteMeta(
 
     data.lockSharedDataTemporary(part_name, part_id, disk);
 
-    static const String TMP_PREFIX = "tmp-fetch_";
-    String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
+    assert(!tmp_prefix.empty());
 
     String part_dir = tmp_prefix + part_name;
     String part_relative_path = data.getRelativeDataPath() + String(to_detached ? "detached/" : "");
diff --git a/src/Storages/MergeTree/IDataPartStorage.h b/src/Storages/MergeTree/IDataPartStorage.h
index f0173baecb7..946c1c5fd47 100644
--- a/src/Storages/MergeTree/IDataPartStorage.h
+++ b/src/Storages/MergeTree/IDataPartStorage.h
@@ -3,6 +3,7 @@
 #include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/TransactionVersionMetadata.h>
+#include <Storages/MergeTree/MergeTreeDataPartState.h>
 #include <optional>
 
 namespace DB
@@ -116,6 +117,8 @@ public:
         const NameSet & names_not_to_remove,
         const MergeTreeDataPartChecksums & checksums,
         std::list<ProjectionChecksums> projections,
+        bool is_temp,
+        MergeTreeDataPartState state,
         Poco::Logger * log) const = 0;
 
     /// Get a name like 'prefix_partdir_tryN' which does not exist in a root dir.
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 416ef0614f6..1c1871226ba 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -15,6 +15,8 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/PartMetadataManagerOrdinary.h>
 #include <Storages/MergeTree/PartMetadataManagerWithCache.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/ColumnsDescription.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
 #include <Common/CurrentMetrics.h>
@@ -62,6 +64,7 @@ namespace ErrorCodes
     extern const int BAD_SIZE_OF_FILE_IN_DATA_PART;
     extern const int BAD_TTL_FILE;
     extern const int NOT_IMPLEMENTED;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
 }
 
 void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const PartMetadataManagerPtr & manager)
@@ -204,55 +207,55 @@ void IMergeTreeDataPart::MinMaxIndex::appendFiles(const MergeTreeData & data, St
 }
 
 
-static void incrementStateMetric(IMergeTreeDataPart::State state)
+static void incrementStateMetric(MergeTreeDataPartState state)
 {
     switch (state)
     {
-        case IMergeTreeDataPart::State::Temporary:
+        case MergeTreeDataPartState::Temporary:
             CurrentMetrics::add(CurrentMetrics::PartsTemporary);
             return;
-        case IMergeTreeDataPart::State::PreActive:
+        case MergeTreeDataPartState::PreActive:
             CurrentMetrics::add(CurrentMetrics::PartsPreActive);
             CurrentMetrics::add(CurrentMetrics::PartsPreCommitted);
             return;
-        case IMergeTreeDataPart::State::Active:
+        case MergeTreeDataPartState::Active:
             CurrentMetrics::add(CurrentMetrics::PartsActive);
             CurrentMetrics::add(CurrentMetrics::PartsCommitted);
             return;
-        case IMergeTreeDataPart::State::Outdated:
+        case MergeTreeDataPartState::Outdated:
             CurrentMetrics::add(CurrentMetrics::PartsOutdated);
             return;
-        case IMergeTreeDataPart::State::Deleting:
+        case MergeTreeDataPartState::Deleting:
             CurrentMetrics::add(CurrentMetrics::PartsDeleting);
             return;
-        case IMergeTreeDataPart::State::DeleteOnDestroy:
+        case MergeTreeDataPartState::DeleteOnDestroy:
             CurrentMetrics::add(CurrentMetrics::PartsDeleteOnDestroy);
             return;
     }
 }
 
-static void decrementStateMetric(IMergeTreeDataPart::State state)
+static void decrementStateMetric(MergeTreeDataPartState state)
 {
     switch (state)
     {
-        case IMergeTreeDataPart::State::Temporary:
+        case MergeTreeDataPartState::Temporary:
             CurrentMetrics::sub(CurrentMetrics::PartsTemporary);
             return;
-        case IMergeTreeDataPart::State::PreActive:
+        case MergeTreeDataPartState::PreActive:
             CurrentMetrics::sub(CurrentMetrics::PartsPreActive);
             CurrentMetrics::sub(CurrentMetrics::PartsPreCommitted);
             return;
-        case IMergeTreeDataPart::State::Active:
+        case MergeTreeDataPartState::Active:
             CurrentMetrics::sub(CurrentMetrics::PartsActive);
             CurrentMetrics::sub(CurrentMetrics::PartsCommitted);
             return;
-        case IMergeTreeDataPart::State::Outdated:
+        case MergeTreeDataPartState::Outdated:
             CurrentMetrics::sub(CurrentMetrics::PartsOutdated);
             return;
-        case IMergeTreeDataPart::State::Deleting:
+        case MergeTreeDataPartState::Deleting:
             CurrentMetrics::sub(CurrentMetrics::PartsDeleting);
             return;
-        case IMergeTreeDataPart::State::DeleteOnDestroy:
+        case MergeTreeDataPartState::DeleteOnDestroy:
             CurrentMetrics::sub(CurrentMetrics::PartsDeleteOnDestroy);
             return;
     }
@@ -310,7 +313,7 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     , use_metadata_cache(storage.use_metadata_cache)
 {
     if (parent_part)
-        state = State::Active;
+        state = MergeTreeDataPartState::Active;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
 
@@ -336,7 +339,7 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     , use_metadata_cache(storage.use_metadata_cache)
 {
     if (parent_part)
-        state = State::Active;
+        state = MergeTreeDataPartState::Active;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
 
@@ -378,14 +381,14 @@ std::optional<size_t> IMergeTreeDataPart::getColumnPosition(const String & colum
 }
 
 
-void IMergeTreeDataPart::setState(IMergeTreeDataPart::State new_state) const
+void IMergeTreeDataPart::setState(MergeTreeDataPartState new_state) const
 {
     decrementStateMetric(state);
     state = new_state;
     incrementStateMetric(state);
 }
 
-IMergeTreeDataPart::State IMergeTreeDataPart::getState() const
+MergeTreeDataPartState IMergeTreeDataPart::getState() const
 {
     return state;
 }
@@ -434,40 +437,72 @@ std::pair<time_t, time_t> IMergeTreeDataPart::getMinMaxTime() const
 }
 
 
-void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns)
+void IMergeTreeDataPart::setColumns(const NamesAndTypesList & new_columns, const SerializationInfoByName & new_infos)
 {
     columns = new_columns;
+    serialization_infos = new_infos;
 
     column_name_to_position.clear();
     column_name_to_position.reserve(new_columns.size());
     size_t pos = 0;
-
     for (const auto & column : columns)
         column_name_to_position.emplace(column.name, pos++);
+
+    for (const auto & column : columns)
+    {
+        auto it = serialization_infos.find(column.name);
+        auto serialization = it == serialization_infos.end()
+            ? IDataType::getSerialization(column)
+            : IDataType::getSerialization(column, *it->second);
+
+        serializations.emplace(column.name, serialization);
+
+        IDataType::forEachSubcolumn([&](const auto &, const auto & subname, const auto & subdata)
+        {
+            auto full_name = Nested::concatenateName(column.name, subname);
+            serializations.emplace(full_name, subdata.serialization);
+        }, {serialization, nullptr, nullptr, nullptr});
+    }
+
+    columns_description = ColumnsDescription(columns);
 }
 
-void IMergeTreeDataPart::setSerializationInfos(const SerializationInfoByName & new_infos)
+NameAndTypePair IMergeTreeDataPart::getColumn(const String & column_name) const
 {
-    serialization_infos = new_infos;
+    return columns_description.getColumnOrSubcolumn(GetColumnsOptions::AllPhysical, column_name);
 }
 
-SerializationPtr IMergeTreeDataPart::getSerialization(const NameAndTypePair & column) const
+std::optional<NameAndTypePair> IMergeTreeDataPart::tryGetColumn(const String & column_name) const
 {
-    auto it = serialization_infos.find(column.getNameInStorage());
-    return it == serialization_infos.end()
-        ? IDataType::getSerialization(column)
-        : IDataType::getSerialization(column, *it->second);
+    return columns_description.tryGetColumnOrSubcolumn(GetColumnsOptions::AllPhysical, column_name);
+}
+
+SerializationPtr IMergeTreeDataPart::getSerialization(const String & column_name) const
+{
+    auto serialization = tryGetSerialization(column_name);
+    if (!serialization)
+        throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
+            "There is no column or subcolumn {} in part {}", column_name, name);
+
+    return serialization;
+}
+
+SerializationPtr IMergeTreeDataPart::tryGetSerialization(const String & column_name) const
+{
+    auto it = serializations.find(column_name);
+    return it == serializations.end() ? nullptr : it->second;
 }
 
 void IMergeTreeDataPart::removeIfNeeded()
 {
     assert(assertHasValidVersionMetadata());
-    if (!is_temp && state != State::DeleteOnDestroy)
+    if (!is_temp && state != MergeTreeDataPartState::DeleteOnDestroy)
         return;
 
+    std::string path;
     try
     {
-        auto path = data_part_storage->getRelativePath();
+        path = data_part_storage->getRelativePath();
 
         if (!data_part_storage->exists()) // path
             return;
@@ -492,7 +527,7 @@ void IMergeTreeDataPart::removeIfNeeded()
 
         remove();
 
-        if (state == State::DeleteOnDestroy)
+        if (state == MergeTreeDataPartState::DeleteOnDestroy)
         {
             LOG_TRACE(storage.log, "Removed part from old location {}", path);
         }
@@ -503,10 +538,10 @@ void IMergeTreeDataPart::removeIfNeeded()
         /// If it's tmp_merge_<part_name> or tmp_fetch_<part_name>,
         /// then all future attempts to execute part producing operation will fail with "directory already exists".
         /// Seems like it's especially important for remote disks, because removal may fail due to network issues.
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        tryLogCurrentException(__PRETTY_FUNCTION__, "while removiong path: " + path);
         assert(!is_temp);
-        assert(state != State::DeleteOnDestroy);
-        assert(state != State::Temporary);
+        assert(state != MergeTreeDataPartState::DeleteOnDestroy);
+        assert(state != MergeTreeDataPartState::Temporary);
     }
 }
 
@@ -527,7 +562,7 @@ UInt64 IMergeTreeDataPart::getIndexSizeInAllocatedBytes() const
     return res;
 }
 
-void IMergeTreeDataPart::assertState(const std::initializer_list<IMergeTreeDataPart::State> & affordable_states) const
+void IMergeTreeDataPart::assertState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const
 {
     if (!checkState(affordable_states))
     {
@@ -563,36 +598,24 @@ size_t IMergeTreeDataPart::getFileSizeOrZero(const String & file_name) const
     return checksum->second.file_size;
 }
 
-String IMergeTreeDataPart::getColumnNameWithMinimumCompressedSize(
-    const StorageSnapshotPtr & storage_snapshot, bool with_subcolumns) const
+String IMergeTreeDataPart::getColumnNameWithMinimumCompressedSize(bool with_subcolumns) const
 {
-    auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withExtendedObjects();
-    if (with_subcolumns)
-        options.withSubcolumns();
-
-    auto storage_columns = storage_snapshot->getColumns(options);
-    MergeTreeData::AlterConversions alter_conversions;
-    if (!parent_part)
-        alter_conversions = storage.getAlterConversionsForPart(shared_from_this());
+    auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withSubcolumns(with_subcolumns);
+    auto columns_list = columns_description.get(options);
 
     std::optional<std::string> minimum_size_column;
     UInt64 minimum_size = std::numeric_limits<UInt64>::max();
 
-    for (const auto & column : storage_columns)
+    for (const auto & column : columns_list)
     {
-        auto column_name = column.name;
-        auto column_type = column.type;
-        if (alter_conversions.isColumnRenamed(column.name))
-            column_name = alter_conversions.getColumnOldName(column.name);
-
         if (!hasColumnFiles(column))
             continue;
 
-        const auto size = getColumnSize(column_name).data_compressed;
+        const auto size = getColumnSize(column.name).data_compressed;
         if (size < minimum_size)
         {
             minimum_size = size;
-            minimum_size_column = column_name;
+            minimum_size_column = column.name;
         }
     }
 
@@ -847,7 +870,7 @@ CompressionCodecPtr IMergeTreeDataPart::detectDefaultCompressionCodec() const
         if (column_size.data_compressed != 0 && !storage_columns.hasCompressionCodec(part_column.name))
         {
             String path_to_data_file;
-            getSerialization(part_column)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+            getSerialization(part_column.name)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
             {
                 if (path_to_data_file.empty())
                 {
@@ -929,7 +952,6 @@ void IMergeTreeDataPart::appendFilesOfPartitionAndMinMaxIndex(Strings & files) c
 
 void IMergeTreeDataPart::loadChecksums(bool require)
 {
-    //const String path = fs::path(getRelativePath()) / "checksums.txt";
     bool exists = metadata_manager->exists("checksums.txt");
     if (exists)
     {
@@ -940,7 +962,7 @@ void IMergeTreeDataPart::loadChecksums(bool require)
             bytes_on_disk = checksums.getTotalSizeOnDisk();
         }
         else
-            bytes_on_disk = data_part_storage->calculateTotalSizeOnDisk(); //calculateTotalSizeOnDisk(volume->getDisk(), getRelativePath());
+            bytes_on_disk = data_part_storage->calculateTotalSizeOnDisk();
     }
     else
     {
@@ -993,7 +1015,7 @@ void IMergeTreeDataPart::loadRowsCount()
             /// Most trivial types
             if (column.type->isValueRepresentedByNumber()
                 && !column.type->haveSubtypes()
-                && getSerialization(column)->getKind() == ISerialization::Kind::DEFAULT)
+                && getSerialization(column.name)->getKind() == ISerialization::Kind::DEFAULT)
             {
                 auto size = getColumnSize(column.name);
 
@@ -1045,7 +1067,7 @@ void IMergeTreeDataPart::loadRowsCount()
 
         for (const NameAndTypePair & column : columns)
         {
-            ColumnPtr column_col = column.type->createColumn(*getSerialization(column));
+            ColumnPtr column_col = column.type->createColumn(*getSerialization(column.name));
             if (!column_col->isFixedAndContiguous() || column_col->lowCardinality())
                 continue;
 
@@ -1187,8 +1209,7 @@ void IMergeTreeDataPart::loadColumns(bool require)
         infos.readJSON(*in);
     }
 
-    setColumns(loaded_columns);
-    setSerializationInfos(infos);
+    setColumns(loaded_columns, infos);
 }
 
 /// Project part / part with project parts / compact part doesn't support LWD.
@@ -1275,7 +1296,7 @@ catch (Exception & e)
 
 bool IMergeTreeDataPart::wasInvolvedInTransaction() const
 {
-    assert(!version.creation_tid.isEmpty() || (state == State::Temporary /* && std::uncaught_exceptions() */));
+    assert(!version.creation_tid.isEmpty() || (state == MergeTreeDataPartState::Temporary /* && std::uncaught_exceptions() */));
     bool created_by_transaction = !version.creation_tid.isPrehistoric();
     bool removed_by_transaction = version.isRemovalTIDLocked() && version.removal_tid_lock != Tx::PrehistoricTID.getHash();
     return created_by_transaction || removed_by_transaction;
@@ -1299,7 +1320,7 @@ bool IMergeTreeDataPart::assertHasValidVersionMetadata() const
     if (part_is_probably_removed_from_disk)
         return true;
 
-    if (state == State::Temporary)
+    if (state == MergeTreeDataPartState::Temporary)
         return true;
 
     if (!data_part_storage->exists())
@@ -1435,7 +1456,7 @@ void IMergeTreeDataPart::remove() const
         projection_checksums.emplace_back(IDataPartStorage::ProjectionChecksums{.name = p_name, .checksums = projection_part->checksums});
     }
 
-    data_part_storage->remove(can_remove, files_not_to_remove, checksums, projection_checksums, storage.log);
+    data_part_storage->remove(can_remove, files_not_to_remove, checksums, projection_checksums, is_temp, getState(), storage.log);
 }
 
 String IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix, bool detached) const
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 1218740daa0..bdf42223d2f 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -6,6 +6,7 @@
 #include <Storages/IStorage.h>
 #include <Storages/LightweightDeleteDescription.h>
 #include <Storages/MergeTree/IDataPartStorage.h>
+#include <Storages/MergeTree/MergeTreeDataPartState.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
@@ -15,6 +16,7 @@
 #include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
 #include <Storages/MergeTree/KeyCondition.h>
+#include <Storages/ColumnsDescription.h>
 #include <Interpreters/TransactionVersionMetadata.h>
 #include <DataTypes/Serializations/SerializationInfo.h>
 #include <Storages/MergeTree/IPartMetadataManager.h>
@@ -133,15 +135,18 @@ public:
 
     String getTypeName() const { return getType().toString(); }
 
-    void setColumns(const NamesAndTypesList & new_columns);
+    void setColumns(const NamesAndTypesList & new_columns, const SerializationInfoByName & new_infos);
 
     const NamesAndTypesList & getColumns() const { return columns; }
+    const ColumnsDescription & getColumnsDescription() const { return columns_description; }
 
-    void setSerializationInfos(const SerializationInfoByName & new_infos);
+    NameAndTypePair getColumn(const String & name) const;
+    std::optional<NameAndTypePair> tryGetColumn(const String & column_name) const;
 
     const SerializationInfoByName & getSerializationInfos() const { return serialization_infos; }
 
-    SerializationPtr getSerialization(const NameAndTypePair & column) const;
+    SerializationPtr getSerialization(const String & column_name) const;
+    SerializationPtr tryGetSerialization(const String & column_name) const;
 
     /// Throws an exception if part is not stored in on-disk format.
     void assertOnDisk() const;
@@ -168,8 +173,7 @@ public:
 
     /// Returns the name of a column with minimum compressed size (as returned by getColumnSize()).
     /// If no checksums are present returns the name of the first physically existing column.
-    String getColumnNameWithMinimumCompressedSize(
-        const StorageSnapshotPtr & storage_snapshot, bool with_subcolumns) const;
+    String getColumnNameWithMinimumCompressedSize(bool with_subcolumns) const;
 
     bool contains(const IMergeTreeDataPart & other) const { return info.contains(other.info); }
 
@@ -220,45 +224,22 @@ public:
     /// Flag for keep S3 data when zero-copy replication over S3 turned on.
     mutable bool force_keep_shared_data = false;
 
-    /**
-     * Part state is a stage of its lifetime. States are ordered and state of a part could be increased only.
-     * Part state should be modified under data_parts mutex.
-     *
-     * Possible state transitions:
-     * Temporary -> PreActive:       we are trying to add a fetched, inserted or merged part to active set
-     * PreActive -> Outdated:        we could not add a part to active set and are doing a rollback (for example it is duplicated part)
-     * PreActive -> Active:          we successfully added a part to active dataset
-     * PreActive -> Outdated:        a part was replaced by a covering part or DROP PARTITION
-     * Outdated -> Deleting:         a cleaner selected this part for deletion
-     * Deleting -> Outdated:         if an ZooKeeper error occurred during the deletion, we will retry deletion
-     * Active -> DeleteOnDestroy:    if part was moved to another disk
-     */
-    enum class State
-    {
-        Temporary,       /// the part is generating now, it is not in data_parts list
-        PreActive,    /// the part is in data_parts, but not used for SELECTs
-        Active,       /// active data part, used by current and upcoming SELECTs
-        Outdated,        /// not active data part, but could be used by only current SELECTs, could be deleted after SELECTs finishes
-        Deleting,        /// not active data part with identity refcounter, it is deleting right now by a cleaner
-        DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
-    };
-
     using TTLInfo = MergeTreeDataPartTTLInfo;
     using TTLInfos = MergeTreeDataPartTTLInfos;
 
     mutable TTLInfos ttl_infos;
 
     /// Current state of the part. If the part is in working set already, it should be accessed via data_parts mutex
-    void setState(State new_state) const;
-    State getState() const;
+    void setState(MergeTreeDataPartState new_state) const;
+    MergeTreeDataPartState getState() const;
 
-    static constexpr std::string_view stateString(State state) { return magic_enum::enum_name(state); }
+    static constexpr std::string_view stateString(MergeTreeDataPartState state) { return magic_enum::enum_name(state); }
     constexpr std::string_view stateString() const { return stateString(state); }
 
     String getNameWithState() const { return fmt::format("{} (state {})", name, stateString()); }
 
     /// Returns true if state of part is one of affordable_states
-    bool checkState(const std::initializer_list<State> & affordable_states) const
+    bool checkState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const
     {
         for (auto affordable_state : affordable_states)
         {
@@ -269,7 +250,7 @@ public:
     }
 
     /// Throws an exception if state of the part is not in affordable_states
-    void assertState(const std::initializer_list<State> & affordable_states) const;
+    void assertState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const;
 
     /// Primary key (correspond to primary.idx file).
     /// Always loaded in RAM. Contains each index_granularity-th value of primary key tuple.
@@ -527,6 +508,13 @@ private:
     /// Map from name of column to its serialization info.
     SerializationInfoByName serialization_infos;
 
+    /// Serializations for every columns and subcolumns by their names.
+    SerializationByName serializations;
+
+    /// Columns description for more convenient access
+    /// to columns by name and getting subcolumns.
+    ColumnsDescription columns_description;
+
     /// Reads part unique identifier (if exists) from uuid.txt
     void loadUUID();
 
@@ -582,13 +570,12 @@ private:
     /// for this column with default parameters.
     CompressionCodecPtr detectDefaultCompressionCodec() const;
 
-    mutable State state{State::Temporary};
+    mutable MergeTreeDataPartState state{MergeTreeDataPartState::Temporary};
 
     /// This ugly flag is needed for debug assertions only
     mutable bool part_is_probably_removed_from_disk = false;
 };
 
-using MergeTreeDataPartState = IMergeTreeDataPart::State;
 using MergeTreeDataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
 using MergeTreeMutableDataPartPtr = std::shared_ptr<IMergeTreeDataPart>;
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index 3acb4910e28..8c861248580 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -33,8 +33,6 @@ IMergeTreeReader::IMergeTreeReader(
     const ValueSizeMap & avg_value_size_hints_)
     : data_part(data_part_)
     , avg_value_size_hints(avg_value_size_hints_)
-    , columns(columns_)
-    , part_columns(data_part->getColumns())
     , uncompressed_cache(uncompressed_cache_)
     , mark_cache(mark_cache_)
     , settings(settings_)
@@ -42,22 +40,21 @@ IMergeTreeReader::IMergeTreeReader(
     , metadata_snapshot(metadata_snapshot_)
     , all_mark_ranges(all_mark_ranges_)
     , alter_conversions(storage.getAlterConversionsForPart(data_part))
+    /// For wide parts convert plain arrays of Nested to subcolumns
+    /// to allow to use shared offset column from cache.
+    , requested_columns(isWidePart(data_part) ? Nested::convertToSubcolumns(columns_) : columns_)
+    , part_columns(isWidePart(data_part) ? Nested::collect(data_part->getColumns()) : data_part->getColumns())
 {
-    if (isWidePart(data_part))
+    columns_to_read.reserve(requested_columns.size());
+    serializations.reserve(requested_columns.size());
+
+    for (const auto & column : requested_columns)
     {
-        /// For wide parts convert plain arrays of Nested to subcolumns
-        /// to allow to use shared offset column from cache.
-        columns = Nested::convertToSubcolumns(columns);
-        part_columns = Nested::collect(part_columns);
+        columns_to_read.emplace_back(getColumnInPart(column));
+        serializations.emplace_back(getSerializationInPart(column));
     }
-
-    for (const auto & column_from_part : part_columns)
-        columns_from_part[column_from_part.name] = &column_from_part.type;
 }
 
-IMergeTreeReader::~IMergeTreeReader() = default;
-
-
 const IMergeTreeReader::ValueSizeMap & IMergeTreeReader::getAvgValueSizeHints() const
 {
     return avg_value_size_hints;
@@ -67,7 +64,7 @@ void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_e
 {
     try
     {
-        DB::fillMissingColumns(res_columns, num_rows, columns, metadata_snapshot);
+        DB::fillMissingColumns(res_columns, num_rows, requested_columns, metadata_snapshot);
         should_evaluate_missing_defaults = std::any_of(
             res_columns.begin(), res_columns.end(), [](const auto & column) { return column == nullptr; });
     }
@@ -83,7 +80,7 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
 {
     try
     {
-        size_t num_columns = columns.size();
+        size_t num_columns = requested_columns.size();
 
         if (res_columns.size() != num_columns)
             throw Exception("invalid number of columns passed to MergeTreeReader::fillMissingColumns. "
@@ -92,7 +89,7 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
 
         /// Convert columns list to block.
         /// TODO: rewrite with columns interface. It will be possible after changes in ExpressionActions.
-        auto name_and_type = columns.begin();
+        auto name_and_type = requested_columns.begin();
         for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
         {
             if (res_columns[pos] == nullptr)
@@ -102,7 +99,7 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
         }
 
         auto dag = DB::evaluateMissingDefaults(
-                additional_columns, columns, metadata_snapshot->getColumns(), storage.getContext());
+                additional_columns, requested_columns, metadata_snapshot->getColumns(), storage.getContext());
         if (dag)
         {
             dag->addMaterializingOutputActions();
@@ -113,7 +110,7 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
         }
 
         /// Move columns from block.
-        name_and_type = columns.begin();
+        name_and_type = requested_columns.begin();
         for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
             res_columns[pos] = std::move(additional_columns.getByName(name_and_type->name).column);
     }
@@ -125,44 +122,47 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
     }
 }
 
-NameAndTypePair IMergeTreeReader::getColumnFromPart(const NameAndTypePair & required_column) const
+String IMergeTreeReader::getColumnNameInPart(const NameAndTypePair & required_column) const
 {
     auto name_in_storage = required_column.getNameInStorage();
-
-    ColumnsFromPart::ConstLookupResult it;
     if (alter_conversions.isColumnRenamed(name_in_storage))
     {
-        String old_name = alter_conversions.getColumnOldName(name_in_storage);
-        it = columns_from_part.find(old_name);
-    }
-    else
-    {
-        it = columns_from_part.find(name_in_storage);
+        name_in_storage = alter_conversions.getColumnOldName(name_in_storage);
+        return Nested::concatenateName(name_in_storage, required_column.getSubcolumnName());
     }
 
-    if (it == columns_from_part.end())
-        return required_column;
+    return required_column.name;
+}
 
-    const DataTypePtr & type = *it->getMapped();
-    if (required_column.isSubcolumn())
-    {
-        auto subcolumn_name = required_column.getSubcolumnName();
-        auto subcolumn_type = type->tryGetSubcolumnType(subcolumn_name);
+NameAndTypePair IMergeTreeReader::getColumnInPart(const NameAndTypePair & required_column) const
+{
+    auto name_in_part = getColumnNameInPart(required_column);
+    auto column_in_part = part_columns.tryGetColumnOrSubcolumn(GetColumnsOptions::AllPhysical, name_in_part);
+    if (column_in_part)
+        return *column_in_part;
 
-        if (!subcolumn_type)
-            return required_column;
+    return required_column;
+}
 
-        return {String(it->getKey()), subcolumn_name, type, subcolumn_type};
-    }
+SerializationPtr IMergeTreeReader::getSerializationInPart(const NameAndTypePair & required_column) const
+{
+    auto name_in_part = getColumnNameInPart(required_column);
+    auto column_in_part = part_columns.tryGetColumnOrSubcolumn(GetColumnsOptions::AllPhysical, name_in_part);
+    if (!column_in_part)
+        return IDataType::getSerialization(required_column);
 
-    return {String(it->getKey()), type};
+    const auto & infos = data_part->getSerializationInfos();
+    if (auto it = infos.find(column_in_part->getNameInStorage()); it != infos.end())
+        return IDataType::getSerialization(*column_in_part, *it->second);
+
+    return IDataType::getSerialization(*column_in_part);
 }
 
 void IMergeTreeReader::performRequiredConversions(Columns & res_columns) const
 {
     try
     {
-        size_t num_columns = columns.size();
+        size_t num_columns = requested_columns.size();
 
         if (res_columns.size() != num_columns)
         {
@@ -177,24 +177,22 @@ void IMergeTreeReader::performRequiredConversions(Columns & res_columns) const
         }
 
         Block copy_block;
-        auto name_and_type = columns.begin();
+        auto name_and_type = requested_columns.begin();
 
         for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
         {
             if (res_columns[pos] == nullptr)
                 continue;
 
-            copy_block.insert({res_columns[pos], getColumnFromPart(*name_and_type).type, name_and_type->name});
+            copy_block.insert({res_columns[pos], getColumnInPart(*name_and_type).type, name_and_type->name});
         }
 
-        DB::performRequiredConversions(copy_block, columns, storage.getContext());
+        DB::performRequiredConversions(copy_block, requested_columns, storage.getContext());
 
         /// Move columns from block.
-        name_and_type = columns.begin();
+        name_and_type = requested_columns.begin();
         for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
-        {
             res_columns[pos] = std::move(copy_block.getByName(name_and_type->name).column);
-        }
     }
     catch (Exception & e)
     {
@@ -222,9 +220,9 @@ IMergeTreeReader::ColumnPosition IMergeTreeReader::findColumnForOffsets(const St
 
 void IMergeTreeReader::checkNumberOfColumns(size_t num_columns_to_read) const
 {
-    if (num_columns_to_read != columns.size())
+    if (num_columns_to_read != requested_columns.size())
         throw Exception("invalid number of columns passed to MergeTreeReader::readRows. "
-                        "Expected " + toString(columns.size()) + ", "
+                        "Expected " + toString(requested_columns.size()) + ", "
                         "got " + toString(num_columns_to_read), ErrorCodes::LOGICAL_ERROR);
 }
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.h b/src/Storages/MergeTree/IMergeTreeReader.h
index b13db9c3255..453563522a5 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.h
+++ b/src/Storages/MergeTree/IMergeTreeReader.h
@@ -37,7 +37,7 @@ public:
 
     virtual bool canReadIncompleteGranules() const = 0;
 
-    virtual ~IMergeTreeReader();
+    virtual ~IMergeTreeReader() = default;
 
     const ValueSizeMap & getAvgValueSizeHints() const;
 
@@ -52,19 +52,21 @@ public:
     /// try to perform conversions of columns.
     void performRequiredConversions(Columns & res_columns) const;
 
-    const NamesAndTypesList & getColumns() const { return columns; }
-    size_t numColumnsInResult() const { return columns.size(); }
+    const NamesAndTypesList & getColumns() const { return requested_columns; }
+    size_t numColumnsInResult() const { return requested_columns.size(); }
 
-    size_t getFirstMarkToRead() const
-    {
-        return all_mark_ranges.front().begin;
-    }
+    size_t getFirstMarkToRead() const { return all_mark_ranges.front().begin; }
 
     MergeTreeData::DataPartPtr data_part;
 
 protected:
-    /// Returns actual column type in part, which can differ from table metadata.
-    NameAndTypePair getColumnFromPart(const NameAndTypePair & required_column) const;
+    /// Returns actual column name in part, which can differ from table metadata.
+    String getColumnNameInPart(const NameAndTypePair & required_column) const;
+
+    /// Returns actual column name and type in part, which can differ from table metadata.
+    NameAndTypePair getColumnInPart(const NameAndTypePair & required_column) const;
+    /// Returns actual serialization in part, which can differ from table metadata.
+    SerializationPtr getSerializationInPart(const NameAndTypePair & required_column) const;
 
     void checkNumberOfColumns(size_t num_columns_to_read) const;
 
@@ -73,9 +75,11 @@ protected:
     /// Stores states for IDataType::deserializeBinaryBulk
     DeserializeBinaryBulkStateMap deserialize_binary_bulk_state_map;
 
-    /// Columns that are read.
-    NamesAndTypesList columns;
-    NamesAndTypesList part_columns;
+    /// Actual column names and types of columns in part,
+    /// which may differ from table metadata.
+    NamesAndTypes columns_to_read;
+    /// Actual serialization of columns in part.
+    Serializations serializations;
 
     UncompressedCache * uncompressed_cache;
     MarkCache * mark_cache;
@@ -93,10 +97,11 @@ private:
     /// Alter conversions, which must be applied on fly if required
     MergeTreeData::AlterConversions alter_conversions;
 
-    /// Actual data type of columns in part
+    /// Columns that are requested to read.
+    NamesAndTypesList requested_columns;
 
-    using ColumnsFromPart = HashMapWithSavedHash<StringRef, const DataTypePtr *, StringRefHash>;
-    ColumnsFromPart columns_from_part;
+    /// Actual columns description in part.
+    ColumnsDescription part_columns;
 };
 
 }
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
index 48cf720ad67..9be49a9bba4 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
@@ -48,10 +48,10 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
     std::map<String, size_t> stream_counts;
     for (const auto & column : columns)
     {
-        data_part->getSerialization(column)->enumerateStreams(
+        data_part->getSerialization(column.name)->enumerateStreams(
             [&](const ISerialization::SubstreamPath & substream_path)
             {
-                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
+                ++stream_counts[ISerialization::getFileNameForStream(column.name, substream_path)];
             });
     }
 
@@ -59,13 +59,13 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
     const String mrk_extension = data_part->getMarksFileExtension();
     for (const auto & column_name : empty_columns)
     {
-        auto column_with_type = columns.tryGetByName(column_name);
-        if (!column_with_type)
-           continue;
+        auto serialization = data_part->tryGetSerialization(column_name);
+        if (!serialization)
+            continue;
 
         ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
         {
-            String stream_name = ISerialization::getFileNameForStream(*column_with_type, substream_path);
+            String stream_name = ISerialization::getFileNameForStream(column_name, substream_path);
             /// Delete files if they are no longer shared with another column.
             if (--stream_counts[stream_name] == 0)
             {
@@ -74,15 +74,23 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
             }
         };
 
-        data_part->getSerialization(*column_with_type)->enumerateStreams(callback);
+        serialization->enumerateStreams(callback);
         serialization_infos.erase(column_name);
     }
 
     /// Remove files on disk and checksums
-    for (const String & removed_file : remove_files)
+    for (auto itr = remove_files.begin(); itr != remove_files.end();)
     {
-        if (checksums.files.contains(removed_file))
-            checksums.files.erase(removed_file);
+        if (checksums.files.contains(*itr))
+        {
+            checksums.files.erase(*itr);
+            ++itr;
+        }
+        else /// If we have no file in checksums it doesn't exist on disk
+        {
+            LOG_TRACE(storage.log, "Files {} doesn't exist in checksums so it doesn't exist on disk, will not try to remove it", *itr);
+            itr = remove_files.erase(itr);
+        }
     }
 
     /// Remove columns from columns array
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index daf31698aad..b42fe49a1d0 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -10,11 +10,13 @@
 #include <Interpreters/misc.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsConversion.h>
+#include <Functions/indexHint.h>
 #include <Functions/CastOverloadResolver.h>
 #include <Functions/IFunction.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/typeid_cast.h>
+#include <Columns/ColumnSet.h>
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/Set.h>
 #include <Parsers/queryToString.h>
@@ -110,6 +112,275 @@ static String firstStringThatIsGreaterThanAllStringsWithPrefix(const String & pr
     return res;
 }
 
+static void appendColumnNameWithoutAlias(const ActionsDAG::Node & node, WriteBuffer & out, bool legacy = false)
+{
+    switch (node.type)
+    {
+        case (ActionsDAG::ActionType::INPUT): [[fallthrough]];
+        case (ActionsDAG::ActionType::COLUMN):
+            writeString(node.result_name, out);
+            break;
+        case (ActionsDAG::ActionType::ALIAS):
+            appendColumnNameWithoutAlias(*node.children.front(), out, legacy);
+            break;
+        case (ActionsDAG::ActionType::ARRAY_JOIN):
+            writeCString("arrayJoin(", out);
+            appendColumnNameWithoutAlias(*node.children.front(), out, legacy);
+            writeChar(')', out);
+            break;
+        case (ActionsDAG::ActionType::FUNCTION):
+        {
+            auto name = node.function_base->getName();
+            if (legacy && name == "modulo")
+                writeCString("moduleLegacy", out);
+            else
+                writeString(name, out);
+
+            writeChar('(', out);
+            bool first = true;
+            for (const auto * arg : node.children)
+            {
+                if (!first)
+                    writeCString(", ", out);
+                first = false;
+
+                appendColumnNameWithoutAlias(*arg, out, legacy);
+            }
+            writeChar(')', out);
+        }
+    }
+}
+
+static std::string getColumnNameWithoutAlias(const ActionsDAG::Node & node, bool legacy = false)
+{
+    WriteBufferFromOwnString out;
+    appendColumnNameWithoutAlias(node, out, legacy);
+    return std::move(out.str());
+}
+
+class KeyCondition::Tree
+{
+public:
+    explicit Tree(const IAST * ast_) : ast(ast_) { assert(ast); }
+    explicit Tree(const ActionsDAG::Node * dag_) : dag(dag_) { assert(dag); }
+
+    std::string getColumnName() const
+    {
+        if (ast)
+            return ast->getColumnNameWithoutAlias();
+        else
+            return getColumnNameWithoutAlias(*dag);
+    }
+
+    std::string getColumnNameLegacy() const
+    {
+        if (ast)
+        {
+            auto adjusted_ast = ast->clone();
+            KeyDescription::moduloToModuloLegacyRecursive(adjusted_ast);
+            return adjusted_ast->getColumnNameWithoutAlias();
+        }
+        else
+            return getColumnNameWithoutAlias(*dag, true);
+    }
+
+    bool isFunction() const
+    {
+        if (ast)
+            return typeid_cast<const ASTFunction *>(ast);
+        else
+            return dag->type == ActionsDAG::ActionType::FUNCTION;
+    }
+
+    bool isConstant() const
+    {
+        if (ast)
+            return typeid_cast<const ASTLiteral *>(ast);
+        else
+            return dag->column && isColumnConst(*dag->column);
+    }
+
+    ColumnWithTypeAndName getConstant() const
+    {
+        if (!isConstant())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "KeyCondition::Tree node is not a constant");
+
+        ColumnWithTypeAndName res;
+
+        if (ast)
+        {
+            const auto * literal = assert_cast<const ASTLiteral *>(ast);
+            res.type = applyVisitor(FieldToDataType(), literal->value);
+            res.column = res.type->createColumnConst(0, literal->value);
+
+        }
+        else
+        {
+            res.type = dag->result_type;
+            res.column = dag->column;
+        }
+
+        return res;
+    }
+
+    bool tryGetConstant(const Block & block_with_constants, Field & out_value, DataTypePtr & out_type) const
+    {
+        if (ast)
+        {
+            // Constant expr should use alias names if any
+            String column_name = ast->getColumnName();
+
+            if (const auto * lit = ast->as<ASTLiteral>())
+            {
+                /// By default block_with_constants has only one column named "_dummy".
+                /// If block contains only constants it's may not be preprocessed by
+                //  ExpressionAnalyzer, so try to look up in the default column.
+                if (!block_with_constants.has(column_name))
+                    column_name = "_dummy";
+
+                /// Simple literal
+                out_value = lit->value;
+                out_type = block_with_constants.getByName(column_name).type;
+
+                /// If constant is not Null, we can assume it's type is not Nullable as well.
+                if (!out_value.isNull())
+                    out_type = removeNullable(out_type);
+
+                return true;
+            }
+            else if (block_with_constants.has(column_name) && isColumnConst(*block_with_constants.getByName(column_name).column))
+            {
+                /// An expression which is dependent on constants only
+                const auto & expr_info = block_with_constants.getByName(column_name);
+                out_value = (*expr_info.column)[0];
+                out_type = expr_info.type;
+
+                if (!out_value.isNull())
+                    out_type = removeNullable(out_type);
+
+                return true;
+            }
+        }
+        else
+        {
+            if (dag->column && isColumnConst(*dag->column))
+            {
+                out_value = (*dag->column)[0];
+                out_type = dag->result_type;
+
+                if (!out_value.isNull())
+                    out_type = removeNullable(out_type);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    ConstSetPtr tryGetPreparedSet(
+        const PreparedSetsPtr & sets,
+        const std::vector<MergeTreeSetIndex::KeyTuplePositionMapping> & indexes_mapping,
+        const DataTypes & data_types) const
+    {
+        if (sets && ast)
+        {
+            if (ast->as<ASTSubquery>() || ast->as<ASTTableIdentifier>())
+                return sets->get(PreparedSetKey::forSubquery(*ast));
+
+            /// We have `PreparedSetKey::forLiteral` but it is useless here as we don't have enough information
+            /// about types in left argument of the IN operator. Instead, we manually iterate through all the sets
+            /// and find the one for the right arg based on the AST structure (getTreeHash), after that we check
+            /// that the types it was prepared with are compatible with the types of the primary key.
+            auto types_match = [&indexes_mapping, &data_types](const SetPtr & candidate_set)
+            {
+                assert(indexes_mapping.size() == data_types.size());
+
+                for (size_t i = 0; i < indexes_mapping.size(); ++i)
+                    if (!candidate_set->areTypesEqual(indexes_mapping[i].tuple_index, data_types[i]))
+                        return false;
+
+                return true;
+            };
+
+            for (const auto & set : sets->getByTreeHash(ast->getTreeHash()))
+            {
+                if (types_match(set))
+                    return set;
+            }
+        }
+        else if (dag->column)
+        {
+            const IColumn * col = dag->column.get();
+            if (const auto * col_const = typeid_cast<const ColumnConst *>(col))
+                col = &col_const->getDataColumn();
+
+            if (const auto * col_set = typeid_cast<const ColumnSet *>(col))
+            {
+                auto set = col_set->getData();
+                if (set->isCreated())
+                    return set;
+            }
+        }
+
+        return nullptr;
+    }
+
+    FunctionTree asFunction() const;
+
+protected:
+    const IAST * ast = nullptr;
+    const ActionsDAG::Node * dag = nullptr;
+};
+
+class KeyCondition::FunctionTree : public KeyCondition::Tree
+{
+public:
+    std::string getFunctionName() const
+    {
+        if (ast)
+            return assert_cast<const ASTFunction *>(ast)->name;
+        else
+            return dag->function_base->getName();
+    }
+
+    size_t numArguments() const
+    {
+        if (ast)
+        {
+            const auto * func = assert_cast<const ASTFunction *>(ast);
+            return func->arguments ? func->arguments->children.size() : 0;
+        }
+        else
+            return dag->children.size();
+    }
+
+    Tree getArgumentAt(size_t idx) const
+    {
+        if (ast)
+            return Tree(assert_cast<const ASTFunction *>(ast)->arguments->children[idx].get());
+        else
+            return Tree(dag->children[idx]);
+    }
+
+private:
+    using Tree::Tree;
+
+    friend class Tree;
+};
+
+
+KeyCondition::FunctionTree KeyCondition::Tree::asFunction() const
+{
+    if (!isFunction())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "KeyCondition::Tree node is not a function");
+
+    if (ast)
+        return KeyCondition::FunctionTree(ast);
+    else
+        return KeyCondition::FunctionTree(dag);
+}
+
 
 /// A dictionary containing actions to the corresponding functions to turn them into `RPNElement`
 const KeyCondition::AtomMap KeyCondition::atom_map
@@ -401,6 +672,154 @@ ASTPtr cloneASTWithInversionPushDown(const ASTPtr node, const bool need_inversio
     return need_inversion ? makeASTFunction("not", cloned_node) : cloned_node;
 }
 
+static const ActionsDAG::Node & cloneASTWithInversionPushDown(
+    const ActionsDAG::Node & node,
+    ActionsDAG & inverted_dag,
+    std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> to_inverted,
+    const ContextPtr & context,
+    const bool need_inversion)
+{
+    {
+        auto it = to_inverted.find(&node);
+        if (it != to_inverted.end())
+            return *it->second;
+    }
+
+    const ActionsDAG::Node * res = nullptr;
+
+    switch (node.type)
+    {
+        case (ActionsDAG::ActionType::INPUT):
+        {
+            /// Note: inputs order is not important here. Will match columns by names.
+            res = &inverted_dag.addInput({node.column, node.result_type, node.result_name});
+            break;
+        }
+        case (ActionsDAG::ActionType::COLUMN):
+        {
+            res = &inverted_dag.addColumn({node.column, node.result_type, node.result_name});
+            break;
+        }
+        case (ActionsDAG::ActionType::ALIAS):
+        {
+            /// Ignore aliases
+            const auto & alias = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
+            to_inverted[&node] = &alias;
+            return alias;
+        }
+        case (ActionsDAG::ActionType::ARRAY_JOIN):
+        {
+            const auto & arg = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, false);
+            res = &inverted_dag.addArrayJoin(arg, {});
+            break;
+        }
+        case (ActionsDAG::ActionType::FUNCTION):
+        {
+            auto name = node.function_base->getName();
+            if (name == "not")
+            {
+                const auto & arg = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, !need_inversion);
+                to_inverted[&node] = &arg;
+                return arg;
+            }
+
+            if (name == "materialize")
+            {
+                /// Ignore materialize
+                const auto & arg = cloneASTWithInversionPushDown(*node.children.front(), inverted_dag, to_inverted, context, need_inversion);
+                to_inverted[&node] = &arg;
+                return arg;
+            }
+
+            if (name == "indexHint")
+            {
+                ActionsDAG::NodeRawConstPtrs children;
+                if (const auto * adaptor = typeid_cast<const FunctionToOverloadResolverAdaptor *>(node.function_builder.get()))
+                {
+                    if (const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction()))
+                    {
+                        const auto & index_hint_dag = index_hint->getActions();
+                        children = index_hint_dag->getOutputs();
+
+                        for (auto & arg : children)
+                            arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, need_inversion);
+                    }
+                }
+
+                const auto & func = inverted_dag.addFunction(node.function_builder, children, "");
+                to_inverted[&node] = &func;
+                return func;
+            }
+
+            if (need_inversion && (name == "and" || name == "or"))
+            {
+                ActionsDAG::NodeRawConstPtrs children(node.children);
+
+                for (auto & arg : children)
+                    arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, need_inversion);
+
+                FunctionOverloadResolverPtr function_builder;
+
+                if (name == "and")
+                    function_builder = FunctionFactory::instance().get("or", context);
+                else if (name == "or")
+                    function_builder = FunctionFactory::instance().get("and", context);
+
+                assert(function_builder);
+
+                /// We match columns by name, so it is important to fill name correctly.
+                /// So, use empty string to make it automatically.
+                const auto & func = inverted_dag.addFunction(function_builder, children, "");
+                to_inverted[&node] = &func;
+                return func;
+            }
+
+            ActionsDAG::NodeRawConstPtrs children(node.children);
+
+            for (auto & arg : children)
+                arg = &cloneASTWithInversionPushDown(*arg, inverted_dag, to_inverted, context, false);
+
+            auto it = inverse_relations.find(name);
+            if (it != inverse_relations.end())
+            {
+                const auto & func_name = need_inversion ? it->second : it->first;
+                auto function_builder = FunctionFactory::instance().get(func_name, context);
+                const auto & func = inverted_dag.addFunction(function_builder, children, "");
+                to_inverted[&node] = &func;
+                return func;
+            }
+
+            res = &inverted_dag.addFunction(node.function_builder, children, "");
+        }
+    }
+
+    if (need_inversion)
+        res = &inverted_dag.addFunction(FunctionFactory::instance().get("not", context), {res}, "");
+
+    to_inverted[&node] = res;
+    return *res;
+}
+
+static ActionsDAGPtr cloneASTWithInversionPushDown(ActionsDAG::NodeRawConstPtrs nodes, const ContextPtr & context)
+{
+    auto res = std::make_shared<ActionsDAG>();
+
+    std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> to_inverted;
+
+    for (auto & node : nodes)
+        node = &cloneASTWithInversionPushDown(*node, *res, to_inverted, context, false);
+
+    if (nodes.size() > 1)
+    {
+        auto function_builder = FunctionFactory::instance().get("and", context);
+        nodes = {&res->addFunction(function_builder, std::move(nodes), "")};
+    }
+
+    res->getOutputs().swap(nodes);
+
+    return res;
+}
+
 
 inline bool Range::equals(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateEquals(), lhs, rhs); }
 inline bool Range::less(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateLess(), lhs, rhs); }
@@ -434,7 +853,10 @@ static NameSet getAllSubexpressionNames(const ExpressionActions & key_expr)
 }
 
 KeyCondition::KeyCondition(
-    const SelectQueryInfo & query_info,
+    const ASTPtr & query,
+    const ASTs & additional_filter_asts,
+    TreeRewriterResultPtr syntax_analyzer_result,
+    PreparedSetsPtr prepared_sets_,
     ContextPtr context,
     const Names & key_column_names,
     const ExpressionActionsPtr & key_expr_,
@@ -442,7 +864,7 @@ KeyCondition::KeyCondition(
     bool strict_)
     : key_expr(key_expr_)
     , key_subexpr_names(getAllSubexpressionNames(*key_expr))
-    , prepared_sets(query_info.sets)
+    , prepared_sets(prepared_sets_)
     , single_point(single_point_)
     , strict(strict_)
 {
@@ -456,19 +878,41 @@ KeyCondition::KeyCondition(
     /** Evaluation of expressions that depend only on constants.
       * For the index to be used, if it is written, for example `WHERE Date = toDate(now())`.
       */
-    Block block_with_constants = getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context);
+    Block block_with_constants = getBlockWithConstants(query, syntax_analyzer_result, context);
 
-    for (const auto & [name, _] : query_info.syntax_analyzer_result->array_join_result_to_source)
+    for (const auto & [name, _] : syntax_analyzer_result->array_join_result_to_source)
         array_joined_columns.insert(name);
 
-    const ASTSelectQuery & select = query_info.query->as<ASTSelectQuery &>();
-    if (select.where() || select.prewhere())
+    const ASTSelectQuery & select = query->as<ASTSelectQuery &>();
+
+    ASTs filters;
+    if (select.where())
+        filters.push_back(select.where());
+
+    if (select.prewhere())
+        filters.push_back(select.prewhere());
+
+    for (const auto & filter_ast : additional_filter_asts)
+        filters.push_back(filter_ast);
+
+    if (!filters.empty())
     {
         ASTPtr filter_query;
-        if (select.where() && select.prewhere())
-            filter_query = makeASTFunction("and", select.where(), select.prewhere());
+        if (filters.size() == 1)
+        {
+            filter_query = filters.front();
+        }
         else
-            filter_query = select.where() ? select.where() : select.prewhere();
+        {
+            auto function = std::make_shared<ASTFunction>();
+
+            function->name = "and";
+            function->arguments = std::make_shared<ASTExpressionList>();
+            function->children.push_back(function->arguments);
+            function->arguments->children = std::move(filters);
+
+            filter_query = function;
+        }
 
         /** When non-strictly monotonic functions are employed in functional index (e.g. ORDER BY toStartOfHour(dateTime)),
           * the use of NOT operator in predicate will result in the indexing algorithm leave out some data.
@@ -477,7 +921,49 @@ KeyCondition::KeyCondition(
           * To overcome the problem, before parsing the AST we transform it to its semantically equivalent form where all NOT's
           * are pushed down and applied (when possible) to leaf nodes.
           */
-        traverseAST(cloneASTWithInversionPushDown(filter_query), context, block_with_constants);
+        auto ast = cloneASTWithInversionPushDown(filter_query);
+        traverseAST(Tree(ast.get()), context, block_with_constants);
+    }
+    else
+    {
+        rpn.emplace_back(RPNElement::FUNCTION_UNKNOWN);
+    }
+}
+
+KeyCondition::KeyCondition(
+    ActionDAGNodes dag_nodes,
+    TreeRewriterResultPtr syntax_analyzer_result,
+    PreparedSetsPtr prepared_sets_,
+    ContextPtr context,
+    const Names & key_column_names,
+    const ExpressionActionsPtr & key_expr_,
+    bool single_point_,
+    bool strict_)
+    : key_expr(key_expr_)
+    , key_subexpr_names(getAllSubexpressionNames(*key_expr))
+    , prepared_sets(prepared_sets_)
+    , single_point(single_point_)
+    , strict(strict_)
+{
+    for (size_t i = 0, size = key_column_names.size(); i < size; ++i)
+    {
+        const auto & name = key_column_names[i];
+        if (!key_columns.contains(name))
+            key_columns[name] = i;
+    }
+
+    for (const auto & [name, _] : syntax_analyzer_result->array_join_result_to_source)
+        array_joined_columns.insert(name);
+
+    if (!dag_nodes.nodes.empty())
+    {
+        auto inverted_dag = cloneASTWithInversionPushDown(std::move(dag_nodes.nodes), context);
+
+        // std::cerr << "========== inverted dag: " << inverted_dag->dumpDAG() << std::endl;
+
+        Block empty;
+        for (const auto * node : inverted_dag->getOutputs())
+            traverseAST(Tree(node), context, empty);
     }
     else
     {
@@ -499,41 +985,7 @@ bool KeyCondition::addCondition(const String & column, const Range & range)
   */
 bool KeyCondition::getConstant(const ASTPtr & expr, Block & block_with_constants, Field & out_value, DataTypePtr & out_type)
 {
-    // Constant expr should use alias names if any
-    String column_name = expr->getColumnName();
-
-    if (const auto * lit = expr->as<ASTLiteral>())
-    {
-        /// By default block_with_constants has only one column named "_dummy".
-        /// If block contains only constants it's may not be preprocessed by
-        //  ExpressionAnalyzer, so try to look up in the default column.
-        if (!block_with_constants.has(column_name))
-            column_name = "_dummy";
-
-        /// Simple literal
-        out_value = lit->value;
-        out_type = block_with_constants.getByName(column_name).type;
-
-        /// If constant is not Null, we can assume it's type is not Nullable as well.
-        if (!out_value.isNull())
-            out_type = removeNullable(out_type);
-
-        return true;
-    }
-    else if (block_with_constants.has(column_name) && isColumnConst(*block_with_constants.getByName(column_name).column))
-    {
-        /// An expression which is dependent on constants only
-        const auto & expr_info = block_with_constants.getByName(column_name);
-        out_value = (*expr_info.column)[0];
-        out_type = expr_info.type;
-
-        if (!out_value.isNull())
-            out_type = removeNullable(out_type);
-
-        return true;
-    }
-    else
-        return false;
+    return Tree(expr.get()).tryGetConstant(block_with_constants, out_value, out_type);
 }
 
 
@@ -607,9 +1059,9 @@ static FieldRef applyFunction(const FunctionBasePtr & func, const DataTypePtr &
             result_idx = i;
     }
 
-    ColumnsWithTypeAndName args{(*columns)[field.column_idx]};
     if (result_idx == columns->size())
     {
+        ColumnsWithTypeAndName args{(*columns)[field.column_idx]};
         field.columns->emplace_back(ColumnWithTypeAndName {nullptr, func->getResultType(), result_name});
         (*columns)[result_idx].column = func->execute(args, (*columns)[result_idx].type, columns->front().column->size());
     }
@@ -617,18 +1069,19 @@ static FieldRef applyFunction(const FunctionBasePtr & func, const DataTypePtr &
     return {field.columns, field.row_idx, result_idx};
 }
 
-void KeyCondition::traverseAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants)
+void KeyCondition::traverseAST(const Tree & node, ContextPtr context, Block & block_with_constants)
 {
     RPNElement element;
 
-    if (const auto * func = node->as<ASTFunction>())
+    if (node.isFunction())
     {
+        auto func = node.asFunction();
         if (tryParseLogicalOperatorFromAST(func, element))
         {
-            auto & args = func->arguments->children;
-            for (size_t i = 0, size = args.size(); i < size; ++i)
+            size_t num_args = func.numArguments();
+            for (size_t i = 0; i < num_args; ++i)
             {
-                traverseAST(args[i], context, block_with_constants);
+                traverseAST(func.getArgumentAt(i), context, block_with_constants);
 
                 /** The first part of the condition is for the correct support of `and` and `or` functions of arbitrary arity
                   * - in this case `n - 1` elements are added (where `n` is the number of arguments).
@@ -649,7 +1102,6 @@ void KeyCondition::traverseAST(const ASTPtr & node, ContextPtr context, Block &
     rpn.emplace_back(std::move(element));
 }
 
-
 /** The key functional expression constraint may be inferred from a plain column in the expression.
   * For example, if the key contains `toStartOfHour(Timestamp)` and query contains `WHERE Timestamp >= now()`,
   * it can be assumed that if `toStartOfHour()` is monotonic on [now(), inf), the `toStartOfHour(Timestamp) >= toStartOfHour(now())`
@@ -669,6 +1121,7 @@ bool KeyCondition::transformConstantWithValidFunctions(
     std::function<bool(IFunctionBase &, const IDataType &)> always_monotonic) const
 {
     const auto & sample_block = key_expr->getSampleBlock();
+
     for (const auto & node : key_expr->getNodes())
     {
         auto it = key_columns.find(node.result_name);
@@ -764,17 +1217,18 @@ bool KeyCondition::transformConstantWithValidFunctions(
             }
         }
     }
+
     return false;
 }
 
 bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
-    const ASTPtr & node,
+    const Tree & node,
     size_t & out_key_column_num,
     DataTypePtr & out_key_column_type,
     Field & out_value,
     DataTypePtr & out_type)
 {
-    String expr_name = node->getColumnNameWithoutAlias();
+    String expr_name = node.getColumnName();
 
     if (array_joined_columns.contains(expr_name))
         return false;
@@ -803,9 +1257,9 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
 
 /// Looking for possible transformation of `column = constant` into `partition_expr = function(constant)`
 bool KeyCondition::canConstantBeWrappedByFunctions(
-    const ASTPtr & ast, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type)
+    const Tree & node, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type)
 {
-    String expr_name = ast->getColumnNameWithoutAlias();
+    String expr_name = node.getColumnName();
 
     if (array_joined_columns.contains(expr_name))
         return false;
@@ -818,12 +1272,10 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
         /// Replace modulo to moduloLegacy in AST and check if we also have such a column.
         ///
         /// We do not check this in canConstantBeWrappedByMonotonicFunctions.
-        /// The case `f(modulo(...))` for totally monotonic `f ` is consedered to be rare.
+        /// The case `f(modulo(...))` for totally monotonic `f ` is considered to be rare.
         ///
         /// Note: for negative values, we can filter more partitions then needed.
-        auto adjusted_ast = ast->clone();
-        KeyDescription::moduloToModuloLegacyRecursive(adjusted_ast);
-        expr_name = adjusted_ast->getColumnName();
+        expr_name = node.getColumnNameLegacy();
 
         if (!key_subexpr_names.contains(expr_name))
             return false;
@@ -840,18 +1292,18 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
 }
 
 bool KeyCondition::tryPrepareSetIndex(
-    const ASTs & args,
+    const FunctionTree & func,
     ContextPtr context,
     RPNElement & out,
     size_t & out_key_column_num)
 {
-    const ASTPtr & left_arg = args[0];
+    const auto & left_arg = func.getArgumentAt(0);
 
     out_key_column_num = 0;
     std::vector<MergeTreeSetIndex::KeyTuplePositionMapping> indexes_mapping;
     DataTypes data_types;
 
-    auto get_key_tuple_position_mapping = [&](const ASTPtr & node, size_t tuple_index)
+    auto get_key_tuple_position_mapping = [&](const Tree & node, size_t tuple_index)
     {
         MergeTreeSetIndex::KeyTuplePositionMapping index_mapping;
         index_mapping.tuple_index = tuple_index;
@@ -867,13 +1319,19 @@ bool KeyCondition::tryPrepareSetIndex(
     };
 
     size_t left_args_count = 1;
-    const auto * left_arg_tuple = left_arg->as<ASTFunction>();
-    if (left_arg_tuple && left_arg_tuple->name == "tuple")
+    if (left_arg.isFunction())
     {
-        const auto & tuple_elements = left_arg_tuple->arguments->children;
-        left_args_count = tuple_elements.size();
-        for (size_t i = 0; i < left_args_count; ++i)
-            get_key_tuple_position_mapping(tuple_elements[i], i);
+        /// Note: in case of ActionsDAG, tuple may be a constant.
+        /// In this case, there is no keys in tuple. So, we don't have to check it.
+        auto left_arg_tuple = left_arg.asFunction();
+        if (left_arg_tuple.getFunctionName() == "tuple")
+        {
+            left_args_count = left_arg_tuple.numArguments();
+            for (size_t i = 0; i < left_args_count; ++i)
+                get_key_tuple_position_mapping(left_arg_tuple.getArgumentAt(i), i);
+        }
+        else
+            get_key_tuple_position_mapping(left_arg, 0);
     }
     else
         get_key_tuple_position_mapping(left_arg, 0);
@@ -881,42 +1339,11 @@ bool KeyCondition::tryPrepareSetIndex(
     if (indexes_mapping.empty())
         return false;
 
-    const ASTPtr & right_arg = args[1];
+    const auto right_arg = func.getArgumentAt(1);
 
-    SetPtr prepared_set;
-    if (right_arg->as<ASTSubquery>() || right_arg->as<ASTTableIdentifier>())
-    {
-        auto set_it = prepared_sets.find(PreparedSetKey::forSubquery(*right_arg));
-        if (set_it == prepared_sets.end())
-            return false;
-
-        prepared_set = set_it->second;
-    }
-    else
-    {
-        /// We have `PreparedSetKey::forLiteral` but it is useless here as we don't have enough information
-        /// about types in left argument of the IN operator. Instead, we manually iterate through all the sets
-        /// and find the one for the right arg based on the AST structure (getTreeHash), after that we check
-        /// that the types it was prepared with are compatible with the types of the primary key.
-        auto set_ast_hash = right_arg->getTreeHash();
-        auto set_it = std::find_if(
-            prepared_sets.begin(), prepared_sets.end(),
-            [&](const auto & candidate_entry)
-            {
-                if (candidate_entry.first.ast_hash != set_ast_hash)
-                    return false;
-
-                for (size_t i = 0; i < indexes_mapping.size(); ++i)
-                    if (!candidate_entry.second->areTypesEqual(indexes_mapping[i].tuple_index, data_types[i]))
-                        return false;
-
-                return true;
-        });
-        if (set_it == prepared_sets.end())
-            return false;
-
-        prepared_set = set_it->second;
-    }
+    auto prepared_set = right_arg.tryGetPreparedSet(prepared_sets, indexes_mapping, data_types);
+    if (!prepared_set)
+        return false;
 
     /// The index can be prepared if the elements of the set were saved in advance.
     if (!prepared_set->hasExplicitSetElements())
@@ -1006,13 +1433,13 @@ private:
 
 
 bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
-    const ASTPtr & node,
+    const Tree & node,
     ContextPtr context,
     size_t & out_key_column_num,
     DataTypePtr & out_key_res_column_type,
     MonotonicFunctionsChain & out_functions_chain)
 {
-    std::vector<const ASTFunction *> chain_not_tested_for_monotonicity;
+    std::vector<FunctionTree> chain_not_tested_for_monotonicity;
     DataTypePtr key_column_type;
 
     if (!isKeyPossiblyWrappedByMonotonicFunctionsImpl(node, out_key_column_num, key_column_type, chain_not_tested_for_monotonicity))
@@ -1020,28 +1447,26 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
 
     for (auto it = chain_not_tested_for_monotonicity.rbegin(); it != chain_not_tested_for_monotonicity.rend(); ++it)
     {
-        const auto & args = (*it)->arguments->children;
-        auto func_builder = FunctionFactory::instance().tryGet((*it)->name, context);
+        auto function = *it;
+        auto func_builder = FunctionFactory::instance().tryGet(function.getFunctionName(), context);
         if (!func_builder)
             return false;
         ColumnsWithTypeAndName arguments;
         ColumnWithTypeAndName const_arg;
         FunctionWithOptionalConstArg::Kind kind = FunctionWithOptionalConstArg::Kind::NO_CONST;
-        if (args.size() == 2)
+        if (function.numArguments() == 2)
         {
-            if (const auto * arg_left = args[0]->as<ASTLiteral>())
+            if (function.getArgumentAt(0).isConstant())
             {
-                auto left_arg_type = applyVisitor(FieldToDataType(), arg_left->value);
-                const_arg = { left_arg_type->createColumnConst(0, arg_left->value), left_arg_type, "" };
+                const_arg = function.getArgumentAt(0).getConstant();
                 arguments.push_back(const_arg);
                 arguments.push_back({ nullptr, key_column_type, "" });
                 kind = FunctionWithOptionalConstArg::Kind::LEFT_CONST;
             }
-            else if (const auto * arg_right = args[1]->as<ASTLiteral>())
+            else if (function.getArgumentAt(1).isConstant())
             {
                 arguments.push_back({ nullptr, key_column_type, "" });
-                auto right_arg_type = applyVisitor(FieldToDataType(), arg_right->value);
-                const_arg = { right_arg_type->createColumnConst(0, arg_right->value), right_arg_type, "" };
+                const_arg = function.getArgumentAt(1).getConstant();
                 arguments.push_back(const_arg);
                 kind = FunctionWithOptionalConstArg::Kind::RIGHT_CONST;
             }
@@ -1067,10 +1492,10 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
 }
 
 bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctionsImpl(
-    const ASTPtr & node,
+    const Tree & node,
     size_t & out_key_column_num,
     DataTypePtr & out_key_column_type,
-    std::vector<const ASTFunction *> & out_functions_chain)
+    std::vector<FunctionTree> & out_functions_chain)
 {
     /** By itself, the key column can be a functional expression. for example, `intHash32(UserID)`.
       * Therefore, use the full name of the expression for search.
@@ -1078,7 +1503,7 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctionsImpl(
     const auto & sample_block = key_expr->getSampleBlock();
 
     // Key columns should use canonical names for index analysis
-    String name = node->getColumnNameWithoutAlias();
+    String name = node.getColumnName();
 
     if (array_joined_columns.contains(name))
         return false;
@@ -1091,31 +1516,30 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctionsImpl(
         return true;
     }
 
-    if (const auto * func = node->as<ASTFunction>())
+    if (node.isFunction())
     {
-        if (!func->arguments)
-            return false;
+        auto func = node.asFunction();
 
-        const auto & args = func->arguments->children;
-        if (args.size() > 2 || args.empty())
+        size_t num_args = func.numArguments();
+        if (num_args > 2 || num_args == 0)
             return false;
 
         out_functions_chain.push_back(func);
         bool ret = false;
-        if (args.size() == 2)
+        if (num_args == 2)
         {
-            if (args[0]->as<ASTLiteral>())
+            if (func.getArgumentAt(0).isConstant())
             {
-                ret = isKeyPossiblyWrappedByMonotonicFunctionsImpl(args[1], out_key_column_num, out_key_column_type, out_functions_chain);
+                ret = isKeyPossiblyWrappedByMonotonicFunctionsImpl(func.getArgumentAt(1), out_key_column_num, out_key_column_type, out_functions_chain);
             }
-            else if (args[1]->as<ASTLiteral>())
+            else if (func.getArgumentAt(1).isConstant())
             {
-                ret = isKeyPossiblyWrappedByMonotonicFunctionsImpl(args[0], out_key_column_num, out_key_column_type, out_functions_chain);
+                ret = isKeyPossiblyWrappedByMonotonicFunctionsImpl(func.getArgumentAt(0), out_key_column_num, out_key_column_type, out_functions_chain);
             }
         }
         else
         {
-            ret = isKeyPossiblyWrappedByMonotonicFunctionsImpl(args[0], out_key_column_num, out_key_column_type, out_functions_chain);
+            ret = isKeyPossiblyWrappedByMonotonicFunctionsImpl(func.getArgumentAt(0), out_key_column_num, out_key_column_type, out_functions_chain);
         }
         return ret;
     }
@@ -1124,7 +1548,7 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctionsImpl(
 }
 
 
-static void castValueToType(const DataTypePtr & desired_type, Field & src_value, const DataTypePtr & src_type, const ASTPtr & node)
+static void castValueToType(const DataTypePtr & desired_type, Field & src_value, const DataTypePtr & src_type, const KeyCondition::Tree & node)
 {
     try
     {
@@ -1134,13 +1558,13 @@ static void castValueToType(const DataTypePtr & desired_type, Field & src_value,
     {
         throw Exception("Key expression contains comparison between inconvertible types: " +
             desired_type->getName() + " and " + src_type->getName() +
-            " inside " + queryToString(node),
+            " inside " + node.getColumnName(),
             ErrorCodes::BAD_TYPE_OF_FIELD);
     }
 }
 
 
-bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out)
+bool KeyCondition::tryParseAtomFromAST(const Tree & node, ContextPtr context, Block & block_with_constants, RPNElement & out)
 {
     /** Functions < > = != <= >= in `notIn` isNull isNotNull, where one argument is a constant, and the other is one of columns of key,
       *  or itself, wrapped in a chain of possibly-monotonic functions,
@@ -1148,27 +1572,28 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
       */
     Field const_value;
     DataTypePtr const_type;
-    if (const auto * func = node->as<ASTFunction>())
+    if (node.isFunction())
     {
-        const ASTs & args = func->arguments->children;
+        auto func = node.asFunction();
+        size_t num_args = func.numArguments();
 
         DataTypePtr key_expr_type;    /// Type of expression containing key column
         size_t key_column_num = -1;   /// Number of a key column (inside key_column_names array)
         MonotonicFunctionsChain chain;
-        std::string func_name = func->name;
+        std::string func_name = func.getFunctionName();
 
         if (atom_map.find(func_name) == std::end(atom_map))
             return false;
 
-        if (args.size() == 1)
+        if (num_args == 1)
         {
-            if (!(isKeyPossiblyWrappedByMonotonicFunctions(args[0], context, key_column_num, key_expr_type, chain)))
+            if (!(isKeyPossiblyWrappedByMonotonicFunctions(func.getArgumentAt(0), context, key_column_num, key_expr_type, chain)))
                 return false;
 
             if (key_column_num == static_cast<size_t>(-1))
                 throw Exception("`key_column_num` wasn't initialized. It is a bug.", ErrorCodes::LOGICAL_ERROR);
         }
-        else if (args.size() == 2)
+        else if (num_args == 2)
         {
             size_t key_arg_pos;           /// Position of argument with key column (non-const argument)
             bool is_set_const = false;
@@ -1193,7 +1618,7 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
 
             if (functionIsInOrGlobalInOperator(func_name))
             {
-                if (tryPrepareSetIndex(args, context, out, key_column_num))
+                if (tryPrepareSetIndex(func, context, out, key_column_num))
                 {
                     key_arg_pos = 0;
                     is_set_const = true;
@@ -1201,22 +1626,22 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
                 else
                     return false;
             }
-            else if (getConstant(args[1], block_with_constants, const_value, const_type))
+            else if (func.getArgumentAt(1).tryGetConstant(block_with_constants, const_value, const_type))
             {
-                if (isKeyPossiblyWrappedByMonotonicFunctions(args[0], context, key_column_num, key_expr_type, chain))
+                if (isKeyPossiblyWrappedByMonotonicFunctions(func.getArgumentAt(0), context, key_column_num, key_expr_type, chain))
                 {
                     key_arg_pos = 0;
                 }
                 else if (
                     !strict_condition
-                    && canConstantBeWrappedByMonotonicFunctions(args[0], key_column_num, key_expr_type, const_value, const_type))
+                    && canConstantBeWrappedByMonotonicFunctions(func.getArgumentAt(0), key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 0;
                     is_constant_transformed = true;
                 }
                 else if (
                     single_point && func_name == "equals" && !strict_condition
-                    && canConstantBeWrappedByFunctions(args[0], key_column_num, key_expr_type, const_value, const_type))
+                    && canConstantBeWrappedByFunctions(func.getArgumentAt(0), key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 0;
                     is_constant_transformed = true;
@@ -1224,22 +1649,22 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
                 else
                     return false;
             }
-            else if (getConstant(args[0], block_with_constants, const_value, const_type))
+            else if (func.getArgumentAt(0).tryGetConstant(block_with_constants, const_value, const_type))
             {
-                if (isKeyPossiblyWrappedByMonotonicFunctions(args[1], context, key_column_num, key_expr_type, chain))
+                if (isKeyPossiblyWrappedByMonotonicFunctions(func.getArgumentAt(1), context, key_column_num, key_expr_type, chain))
                 {
                     key_arg_pos = 1;
                 }
                 else if (
                     !strict_condition
-                    && canConstantBeWrappedByMonotonicFunctions(args[1], key_column_num, key_expr_type, const_value, const_type))
+                    && canConstantBeWrappedByMonotonicFunctions(func.getArgumentAt(1), key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 1;
                     is_constant_transformed = true;
                 }
                 else if (
                     single_point && func_name == "equals" && !strict_condition
-                    && canConstantBeWrappedByFunctions(args[1], key_column_num, key_expr_type, const_value, const_type))
+                    && canConstantBeWrappedByFunctions(func.getArgumentAt(1), key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 0;
                     is_constant_transformed = true;
@@ -1351,7 +1776,7 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
 
         return atom_it->second(out, const_value);
     }
-    else if (getConstant(node, block_with_constants, const_value, const_type))
+    else if (node.tryGetConstant(block_with_constants, const_value, const_type))
     {
         /// For cases where it says, for example, `WHERE 0 AND something`
 
@@ -1374,25 +1799,24 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
     return false;
 }
 
-bool KeyCondition::tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNElement & out)
+bool KeyCondition::tryParseLogicalOperatorFromAST(const FunctionTree & func, RPNElement & out)
 {
     /// Functions AND, OR, NOT.
     /// Also a special function `indexHint` - works as if instead of calling a function there are just parentheses
     /// (or, the same thing - calling the function `and` from one argument).
-    const ASTs & args = func->arguments->children;
 
-    if (func->name == "not")
+    if (func.getFunctionName() == "not")
     {
-        if (args.size() != 1)
+        if (func.numArguments() != 1)
             return false;
 
         out.function = RPNElement::FUNCTION_NOT;
     }
     else
     {
-        if (func->name == "and" || func->name == "indexHint")
+        if (func.getFunctionName() == "and" || func.getFunctionName() == "indexHint")
             out.function = RPNElement::FUNCTION_AND;
-        else if (func->name == "or")
+        else if (func.getFunctionName() == "or")
             out.function = RPNElement::FUNCTION_OR;
         else
             return false;
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index af85a90dd62..586bc43f791 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -17,6 +17,7 @@ class IFunction;
 using FunctionBasePtr = std::shared_ptr<IFunctionBase>;
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+struct ActionDAGNodes;
 
 /** A field, that can be stored in two representations:
   * - A standalone field.
@@ -205,10 +206,43 @@ class KeyCondition
 {
 public:
     /// Does not take into account the SAMPLE section. all_columns - the set of all columns of the table.
+    KeyCondition(
+        const ASTPtr & query,
+        const ASTs & additional_filter_asts,
+        TreeRewriterResultPtr syntax_analyzer_result,
+        PreparedSetsPtr prepared_sets_,
+        ContextPtr context,
+        const Names & key_column_names,
+        const ExpressionActionsPtr & key_expr,
+        bool single_point_ = false,
+        bool strict_ = false);
+
     KeyCondition(
         const SelectQueryInfo & query_info,
         ContextPtr context,
         const Names & key_column_names,
+        const ExpressionActionsPtr & key_expr_,
+        bool single_point_ = false,
+        bool strict_ = false)
+        : KeyCondition(
+            query_info.query,
+            query_info.filter_asts,
+            query_info.syntax_analyzer_result,
+            query_info.prepared_sets,
+            context,
+            key_column_names,
+            key_expr_,
+            single_point_,
+            strict_)
+    {
+    }
+
+    KeyCondition(
+        ActionDAGNodes dag_nodes,
+        TreeRewriterResultPtr syntax_analyzer_result,
+        PreparedSetsPtr prepared_sets_,
+        ContextPtr context,
+        const Names & key_column_names,
         const ExpressionActionsPtr & key_expr,
         bool single_point_ = false,
         bool strict_ = false);
@@ -342,6 +376,9 @@ private:
 public:
     static const AtomMap atom_map;
 
+    class Tree;
+    class FunctionTree;
+
 private:
     BoolMask checkInRange(
         size_t used_key_size,
@@ -351,9 +388,9 @@ private:
         bool right_bounded,
         BoolMask initial_mask) const;
 
-    void traverseAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants);
-    bool tryParseAtomFromAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out);
-    static bool tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNElement & out);
+    void traverseAST(const Tree & node, ContextPtr context, Block & block_with_constants);
+    bool tryParseAtomFromAST(const Tree & node, ContextPtr context, Block & block_with_constants, RPNElement & out);
+    static bool tryParseLogicalOperatorFromAST(const FunctionTree & func, RPNElement & out);
 
     /** Is node the key column
       *  or expression in which column of key is wrapped by chain of functions,
@@ -362,17 +399,17 @@ private:
       *  and fills chain of possibly-monotonic functions.
       */
     bool isKeyPossiblyWrappedByMonotonicFunctions(
-        const ASTPtr & node,
+        const Tree & node,
         ContextPtr context,
         size_t & out_key_column_num,
         DataTypePtr & out_key_res_column_type,
         MonotonicFunctionsChain & out_functions_chain);
 
     bool isKeyPossiblyWrappedByMonotonicFunctionsImpl(
-        const ASTPtr & node,
+        const Tree & node,
         size_t & out_key_column_num,
         DataTypePtr & out_key_column_type,
-        std::vector<const ASTFunction *> & out_functions_chain);
+        std::vector<FunctionTree> & out_functions_chain);
 
     bool transformConstantWithValidFunctions(
         const String & expr_name,
@@ -383,20 +420,20 @@ private:
         std::function<bool(IFunctionBase &, const IDataType &)> always_monotonic) const;
 
     bool canConstantBeWrappedByMonotonicFunctions(
-        const ASTPtr & node,
+        const Tree & node,
         size_t & out_key_column_num,
         DataTypePtr & out_key_column_type,
         Field & out_value,
         DataTypePtr & out_type);
 
     bool canConstantBeWrappedByFunctions(
-        const ASTPtr & ast, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type);
+        const Tree & node, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type);
 
     /// If it's possible to make an RPNElement
     /// that will filter values (possibly tuples) by the content of 'prepared_set',
     /// do it and return true.
     bool tryPrepareSetIndex(
-        const ASTs & args,
+        const FunctionTree & func,
         ContextPtr context,
         RPNElement & out,
         size_t & out_key_column_num);
@@ -434,7 +471,7 @@ private:
     const NameSet key_subexpr_names;
 
     NameSet array_joined_columns;
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 
     // If true, always allow key_expr to be wrapped by function
     bool single_point;
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index e4eadf9adf7..81840f0cffb 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -28,6 +28,7 @@
 #include <Processors/Transforms/TTLTransform.h>
 #include <Processors/Transforms/TTLCalcTransform.h>
 #include <Processors/Transforms/DistinctSortedTransform.h>
+#include <Processors/Transforms/DistinctTransform.h>
 
 namespace DB
 {
@@ -142,10 +143,8 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     if (global_ctx->data_part_storage_builder->exists())
         throw Exception("Directory " + global_ctx->data_part_storage_builder->getFullPath() + " already exists", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
 
-    global_ctx->data->temporary_parts.add(local_tmp_part_basename);
-    SCOPE_EXIT(
-        global_ctx->data->temporary_parts.remove(local_tmp_part_basename);
-    );
+    if (!global_ctx->parent_part)
+        global_ctx->temporary_directory_lock = global_ctx->data->getTemporaryPartDirectoryHolder(local_tmp_part_basename);
 
     global_ctx->all_column_names = global_ctx->metadata_snapshot->getColumns().getNamesOfPhysical();
     global_ctx->storage_columns = global_ctx->metadata_snapshot->getColumns().getAllPhysical();
@@ -201,8 +200,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
         infos.add(part->getSerializationInfos());
     }
 
-    global_ctx->new_data_part->setColumns(global_ctx->storage_columns);
-    global_ctx->new_data_part->setSerializationInfos(infos);
+    global_ctx->new_data_part->setColumns(global_ctx->storage_columns, infos);
 
     const auto & local_part_min_ttl = global_ctx->new_data_part->ttl_infos.part_min_ttl;
     if (local_part_min_ttl && local_part_min_ttl <= global_ctx->time_of_merge)
@@ -914,8 +912,14 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
     res_pipe.addTransform(std::move(merged_transform));
 
     if (global_ctx->deduplicate)
-        res_pipe.addTransform(std::make_shared<DistinctSortedTransform>(
-            res_pipe.getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+    {
+        if (DistinctSortedTransform::isApplicable(header, sort_description, global_ctx->deduplicate_by_columns))
+            res_pipe.addTransform(std::make_shared<DistinctSortedTransform>(
+                res_pipe.getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+        else
+            res_pipe.addTransform(std::make_shared<DistinctTransform>(
+                res_pipe.getHeader(), SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+    }
 
     if (ctx->need_remove_expired_values)
         res_pipe.addTransform(std::make_shared<TTLTransform>(
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
index 0ddeb70763c..2c338e03973 100644
--- a/src/Storages/MergeTree/MergeTask.h
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -178,6 +178,8 @@ private:
         IMergedBlockOutputStream::WrittenOffsetColumns written_offset_columns{};
 
         MergeTreeTransactionPtr txn;
+
+        scope_guard temporary_directory_lock;
     };
 
     using GlobalRuntimeContextPtr = std::shared_ptr<GlobalRuntimeContext>;
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
index 08142bd8dd1..e2cd797ab92 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
@@ -703,11 +703,11 @@ size_t MergeTreeBaseSelectProcessor::estimateMaxBatchSizeForHugeRanges()
 {
     /// This is an empirical number and it is so,
     /// because we have an adaptive granularity by default.
-    const size_t average_granule_size_bytes = 8UL * 1024 * 1024 * 10; // 10 MiB
+    const size_t average_granule_size_bytes = 1024 * 1024 * 10; // 10 MiB
 
     /// We want to have one RTT per one gigabyte of data read from disk
     /// this could be configurable.
-    const size_t max_size_for_one_request = 8UL * 1024 * 1024 * 1024; // 1 GiB
+    const size_t max_size_for_one_request = 1024 * 1024 * 1024; // 1 GiB
 
     size_t sum_average_marks_size = 0;
     /// getColumnSize is not fully implemented for compact parts
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index 56007c5c5e7..62fac84fc36 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -124,7 +124,7 @@ NameSet injectRequiredColumns(
         */
     if (!have_at_least_one_physical_column)
     {
-        const auto minimum_size_column_name = part->getColumnNameWithMinimumCompressedSize(storage_snapshot, with_subcolumns);
+        const auto minimum_size_column_name = part->getColumnNameWithMinimumCompressedSize(with_subcolumns);
         columns.push_back(minimum_size_column_name);
         /// correctly report added column
         injected_columns.insert(columns.back());
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 8705b9c4969..7314eb84a2c 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -20,6 +20,7 @@
 #include <Columns/ColumnObject.h>
 #include <DataTypes/hasNullable.h>
 #include <Disks/TemporaryFileOnDisk.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/ConcatReadBuffer.h>
@@ -1222,23 +1223,46 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         /// Check extra parts at different disks, in order to not allow to miss data parts at undefined disks.
         std::unordered_set<String> defined_disk_names;
+        /// If disk is wrapped into cached disk, it will not be defined in storage policy.
+        std::unordered_set<String> disk_names_wrapped_in_cache;
 
         for (const auto & disk_ptr : disks)
             defined_disk_names.insert(disk_ptr->getName());
 
+        for (const auto & [_, disk_ptr] : getContext()->getDisksMap())
+        {
+            /// In composable cache with the underlying source disk there might the following structure:
+            /// DiskObjectStorage(CachedObjectStorage(...(CachedObjectStored(ObjectStorage)...)))
+            /// In configuration file each of these layers has a different name, but data path
+            /// (getPath() result) is the same. We need to take it into account here.
+            if (disk_ptr->supportsCache())
+            {
+                if (defined_disk_names.contains(disk_ptr->getName()))
+                {
+                    auto caches = disk_ptr->getCacheLayersNames();
+                    disk_names_wrapped_in_cache.insert(caches.begin(), caches.end());
+                }
+            }
+        }
+
         for (const auto & [disk_name, disk] : getContext()->getDisksMap())
         {
             if (disk->isBroken())
                 continue;
 
-            if (!defined_disk_names.contains(disk_name) && disk->exists(relative_data_path))
+            if (!defined_disk_names.contains(disk_name)
+                && disk->exists(relative_data_path)
+                && !disk_names_wrapped_in_cache.contains(disk_name))
             {
                 for (const auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
                 {
                     if (MergeTreePartInfo::tryParsePartName(it->name(), format_version))
-                        throw Exception(ErrorCodes::UNKNOWN_DISK,
-                            "Part {} was found on disk {} which is not defined in the storage policy",
-                            backQuote(it->name()), backQuote(disk_name));
+                    {
+                        throw Exception(
+                            ErrorCodes::UNKNOWN_DISK,
+                            "Part {} ({}) was found on disk {} which is not defined in the storage policy",
+                            backQuote(it->name()), backQuote(it->path()), backQuote(disk_name));
+                    }
                 }
             }
         }
@@ -1599,6 +1623,12 @@ size_t MergeTreeData::clearOldTemporaryDirectories(size_t custom_directories_lif
     return cleared_count;
 }
 
+scope_guard MergeTreeData::getTemporaryPartDirectoryHolder(const String & part_dir_name)
+{
+    temporary_parts.add(part_dir_name);
+    return [this, part_dir_name]() { temporary_parts.remove(part_dir_name); };
+}
+
 
 MergeTreeData::DataPartsVector MergeTreeData::grabOldParts(bool force)
 {
@@ -2858,6 +2888,13 @@ void MergeTreeData::preparePartForCommit(MutableDataPartPtr & part, Transaction
     part->is_temp = false;
     part->setState(DataPartState::PreActive);
 
+    assert([&]()
+           {
+               String dir_name = fs::path(part->data_part_storage->getRelativePath()).filename();
+               bool may_be_cleaned_up = dir_name.starts_with("tmp_") || dir_name.starts_with("tmp-fetch_");
+               return !may_be_cleaned_up || temporary_parts.contains(dir_name);
+           }());
+
     part->renameTo(part->name, true, builder);
 
     data_parts_indexes.insert(part);
@@ -2939,18 +2976,18 @@ void MergeTreeData::removePartsFromWorkingSet(MergeTreeTransaction * txn, const
         if (part->version.creation_csn != Tx::RolledBackCSN)
             MergeTreeTransaction::removeOldPart(shared_from_this(), part, txn);
 
-        if (part->getState() == IMergeTreeDataPart::State::Active)
+        if (part->getState() == MergeTreeDataPartState::Active)
         {
             removePartContributionToColumnAndSecondaryIndexSizes(part);
             removePartContributionToDataVolume(part);
             removed_active_part = true;
         }
 
-        if (part->getState() == IMergeTreeDataPart::State::Active || clear_without_timeout)
+        if (part->getState() == MergeTreeDataPartState::Active || clear_without_timeout)
             part->remove_time.store(remove_time, std::memory_order_relaxed);
 
-        if (part->getState() != IMergeTreeDataPart::State::Outdated)
-            modifyPartState(part, IMergeTreeDataPart::State::Outdated);
+        if (part->getState() != MergeTreeDataPartState::Outdated)
+            modifyPartState(part, MergeTreeDataPartState::Outdated);
 
         if (isInMemoryPart(part) && getSettings()->in_memory_parts_enable_wal)
             getWriteAheadLog()->dropPart(part->name);
@@ -2970,9 +3007,9 @@ void MergeTreeData::removePartsFromWorkingSetImmediatelyAndSetTemporaryState(con
         if (it_part == data_parts_by_info.end())
             throw Exception("Part " + part->getNameWithState() + " not found in data_parts", ErrorCodes::LOGICAL_ERROR);
 
-        assert(part->getState() == IMergeTreeDataPart::State::PreActive);
+        assert(part->getState() == MergeTreeDataPartState::PreActive);
 
-        modifyPartState(part, IMergeTreeDataPart::State::Temporary);
+        modifyPartState(part, MergeTreeDataPartState::Temporary);
         /// Erase immediately
         data_parts_indexes.erase(it_part);
     }
@@ -3195,8 +3232,10 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
                 pos = (*it)->info.max_block + 1;
                 restored.push_back((*it)->name);
             }
-            else
+            else if ((*it)->info.partition_id == part->info.partition_id)
                 update_error(it);
+            else
+                error = true;
         }
         else
             error = true;
@@ -3217,7 +3256,7 @@ void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr
                 update_error(it);
 
             if ((*it)->getState() != DataPartState::Active)
-                    activate_part(it);
+                activate_part(it);
 
             pos = (*it)->info.max_block + 1;
             restored.push_back((*it)->name);
@@ -5009,7 +5048,13 @@ MergeTreeData::DataPartsVector MergeTreeData::Transaction::commit(MergeTreeData:
                 DataPartsVector covered_parts = data.getActivePartsToReplace(part->info, part->name, covering_part, *owing_parts_lock);
                 if (covering_part)
                 {
-                    LOG_WARNING(data.log, "Tried to commit obsolete part {} covered by {}", part->name, covering_part->getNameWithState());
+                    /// It's totally fine for zero-level parts, because of possible race condition between ReplicatedMergeTreeSink and
+                    /// background queue execution (new part is added to ZK before this function is called,
+                    /// so other replica may produce covering part and replication queue may download covering part).
+                    if (part->info.level)
+                        LOG_WARNING(data.log, "Tried to commit obsolete part {} covered by {}", part->name, covering_part->getNameWithState());
+                    else
+                        LOG_INFO(data.log, "Tried to commit obsolete part {} covered by {}", part->name, covering_part->getNameWithState());
 
                     part->remove_time.store(0, std::memory_order_relaxed); /// The part will be removed without waiting for old_parts_lifetime seconds.
                     data.modifyPartState(part, DataPartState::Outdated);
@@ -5136,6 +5181,7 @@ static void selectBestProjection(
     const MergeTreeDataSelectExecutor & reader,
     const StorageSnapshotPtr & storage_snapshot,
     const SelectQueryInfo & query_info,
+    const ActionDAGNodes & added_filter_nodes,
     const Names & required_columns,
     ProjectionCandidate & candidate,
     ContextPtr query_context,
@@ -5166,6 +5212,7 @@ static void selectBestProjection(
         storage_snapshot->metadata,
         candidate.desc->metadata,
         query_info,
+        added_filter_nodes,
         query_context,
         settings.max_threads,
         max_added_blocks);
@@ -5188,6 +5235,7 @@ static void selectBestProjection(
             storage_snapshot->metadata,
             storage_snapshot->metadata,
             query_info, // TODO syntax_analysis_result set in index
+            added_filter_nodes,
             query_context,
             settings.max_threads,
             max_added_blocks);
@@ -5281,9 +5329,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
             minmax_columns_types = getMinMaxColumnsTypes(partition_key);
 
             minmax_idx_condition.emplace(
-                query_info,
-                query_context,
-                minmax_columns_names,
+                query_info, query_context, minmax_columns_names,
                 getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(query_context)));
             partition_pruner.emplace(metadata_snapshot, query_info, query_context, false /* strict */);
         }
@@ -5489,7 +5535,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
     // In order to properly analyze joins, aliases should be recognized. However, aliases get lost during projection analysis.
     // Let's disable projection if there are any JOIN clauses.
     // TODO: We need a better identifier resolution mechanism for projection analysis.
-    if (select_query->join())
+    if (select_query->hasJoin())
         return std::nullopt;
 
     // INTERPOLATE expressions may include aliases, so aliases should be preserved
@@ -5505,12 +5551,22 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
         query_ptr,
         query_context,
         query_options,
-        std::move(query_info.subquery_for_sets),
-        std::move(query_info.sets));
+        query_info.prepared_sets);
     const auto & analysis_result = select.getAnalysisResult();
 
-    query_info.sets = std::move(select.getQueryAnalyzer()->getPreparedSets());
-    query_info.subquery_for_sets = std::move(select.getQueryAnalyzer()->getSubqueriesForSets());
+    query_info.prepared_sets = select.getQueryAnalyzer()->getPreparedSets();
+    query_info.prewhere_info = analysis_result.prewhere_info;
+
+    const auto & before_where = analysis_result.before_where;
+    const auto & where_column_name = analysis_result.where_column_name;
+
+    /// For PK analysis
+    ActionDAGNodes added_filter_nodes;
+    if (auto additional_filter_info = select.getAdditionalQueryInfo())
+        added_filter_nodes.nodes.push_back(&additional_filter_info->actions->findInOutputs(additional_filter_info->column_name));
+
+    if (before_where)
+        added_filter_nodes.nodes.push_back(&before_where->findInOutputs(where_column_name));
 
     bool can_use_aggregate_projection = true;
     /// If the first stage of the query pipeline is more complex than Aggregating - Expression - Filter - ReadFromStorage,
@@ -5563,7 +5619,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
 
         if (analysis_result.prewhere_info)
         {
-            candidate.prewhere_info = analysis_result.prewhere_info;
+            candidate.prewhere_info = analysis_result.prewhere_info->clone();
 
             auto prewhere_actions = candidate.prewhere_info->prewhere_actions->clone();
             auto prewhere_required_columns = required_columns;
@@ -5738,7 +5794,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
         query_info.minmax_count_projection_block = getMinMaxCountProjectionBlock(
             metadata_snapshot,
             minmax_count_projection_candidate->required_columns,
-            analysis_result.prewhere_info || analysis_result.before_where,
+            !query_info.filter_asts.empty() || analysis_result.prewhere_info || analysis_result.before_where,
             query_info,
             parts,
             normal_parts,
@@ -5780,6 +5836,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
                 metadata_snapshot,
                 metadata_snapshot,
                 query_info,
+                added_filter_nodes,
                 query_context,
                 settings.max_threads,
                 max_added_blocks);
@@ -5811,6 +5868,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
             metadata_snapshot,
             metadata_snapshot,
             query_info,
+            added_filter_nodes,
             query_context,
             settings.max_threads,
             max_added_blocks);
@@ -5836,6 +5894,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
                     reader,
                     storage_snapshot,
                     query_info,
+                    added_filter_nodes,
                     analysis_result.required_columns,
                     candidate,
                     query_context,
@@ -5856,6 +5915,7 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
                     reader,
                     storage_snapshot,
                     query_info,
+                    added_filter_nodes,
                     analysis_result.required_columns,
                     candidate,
                     query_context,
@@ -5885,6 +5945,8 @@ std::optional<ProjectionCandidate> MergeTreeData::getQueryProcessingStageWithAgg
         selected_candidate->aggregate_descriptions = select.getQueryAnalyzer()->aggregates();
     }
 
+    /// Just in case, reset prewhere info calculated from projection.
+    query_info.prewhere_info.reset();
     return *selected_candidate;
 }
 
@@ -5945,7 +6007,7 @@ MergeTreeData & MergeTreeData::checkStructureAndGetMergeTreeData(
     return checkStructureAndGetMergeTreeData(*source_table, src_snapshot, my_snapshot);
 }
 
-MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
+std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAndLoadDataPartOnSameDisk(
     const MergeTreeData::DataPartPtr & src_part,
     const String & tmp_part_prefix,
     const MergeTreePartInfo & dst_part_info,
@@ -5973,6 +6035,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
     String dst_part_name = src_part->getNewName(dst_part_info);
     assert(!tmp_part_prefix.empty());
     String tmp_dst_part_name = tmp_part_prefix + dst_part_name;
+    auto temporary_directory_lock = getTemporaryPartDirectoryHolder(tmp_dst_part_name);
 
     /// Why it is needed if we only hardlink files?
     auto reservation = src_part->data_part_storage->reserve(src_part->getBytesOnDisk());
@@ -6020,7 +6083,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
 
     dst_data_part->loadColumnsChecksumsIndexes(require_part_metadata, true);
     dst_data_part->modification_time = dst_part_storage->getLastModified().epochTime();
-    return dst_data_part;
+    return std::make_pair(dst_data_part, std::move(temporary_directory_lock));
 }
 
 String MergeTreeData::getFullPathOnDisk(const DiskPtr & disk) const
@@ -6072,7 +6135,7 @@ void MergeTreeData::reportBrokenPart(MergeTreeData::DataPartPtr & data_part) con
                 broken_part_callback(part->name);
         }
     }
-    else if (data_part && data_part->getState() == IMergeTreeDataPart::State::Active)
+    else if (data_part && data_part->getState() == MergeTreeDataPartState::Active)
         broken_part_callback(data_part->name);
     else
         LOG_DEBUG(log, "Will not check potentially broken part {} because it's not active", data_part->getNameWithState());
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 024311f4494..68ec191412b 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -142,7 +142,7 @@ public:
     /// After the DataPart is added to the working set, it cannot be changed.
     using DataPartPtr = std::shared_ptr<const DataPart>;
 
-    using DataPartState = IMergeTreeDataPart::State;
+    using DataPartState = MergeTreeDataPartState;
     using DataPartStates = std::initializer_list<DataPartState>;
     using DataPartStateVector = std::vector<DataPartState>;
 
@@ -638,7 +638,7 @@ public:
 
     /// Delete all directories which names begin with "tmp"
     /// Must be called with locked lockForShare() because it's using relative_data_path.
-    size_t clearOldTemporaryDirectories(size_t custom_directories_lifetime_seconds, const NameSet & valid_prefixes = {"tmp_", });
+    size_t clearOldTemporaryDirectories(size_t custom_directories_lifetime_seconds, const NameSet & valid_prefixes = {"tmp_", "tmp-fetch_"});
 
     size_t clearEmptyParts();
 
@@ -792,7 +792,7 @@ public:
         NameSet hardlinks_from_source_part;
     };
 
-    MergeTreeData::MutableDataPartPtr cloneAndLoadDataPartOnSameDisk(
+    std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> cloneAndLoadDataPartOnSameDisk(
         const MergeTreeData::DataPartPtr & src_part, const String & tmp_part_prefix,
         const MergeTreePartInfo & dst_part_info, const StorageMetadataPtr & metadata_snapshot,
         const MergeTreeTransactionPtr & txn, HardlinkedFiles * hardlinked_files,
@@ -1001,6 +1001,9 @@ public:
     /// Used for freezePartitionsByMatcher and unfreezePartitionsByMatcher
     using MatcherFn = std::function<bool(const String &)>;
 
+    /// Returns an object that protects temporary directory from cleanup
+    scope_guard getTemporaryPartDirectoryHolder(const String & part_dir_name);
+
 protected:
     friend class IMergeTreeDataPart;
     friend class MergeTreeDataMergerMutator;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index b22356a38ed..1c5006f4211 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -78,7 +78,7 @@ DataPartStoragePtr MergeTreeDataPartInMemory::flushToDisk(const String & new_rel
     auto new_data_part = storage.createPart(name, new_type, info, new_data_part_storage);
 
     new_data_part->uuid = uuid;
-    new_data_part->setColumns(columns);
+    new_data_part->setColumns(columns, {});
     new_data_part->partition.value = partition.value;
     new_data_part->minmax_idx = minmax_idx;
 
@@ -118,7 +118,7 @@ DataPartStoragePtr MergeTreeDataPartInMemory::flushToDisk(const String & new_rel
             auto projection_data_part
                 = storage.createPart(projection_name, projection_type, projection_info, projection_part_storage_builder->getStorage(), parent_part);
             projection_data_part->is_temp = false; // clean up will be done on parent part
-            projection_data_part->setColumns(projection->getColumns());
+            projection_data_part->setColumns(projection->getColumns(), {});
 
             projection_part_storage_builder->createDirectories();
             const auto & desc = projections.get(name);
diff --git a/src/Storages/MergeTree/MergeTreeDataPartState.h b/src/Storages/MergeTree/MergeTreeDataPartState.h
new file mode 100644
index 00000000000..a52f7559375
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDataPartState.h
@@ -0,0 +1,29 @@
+#pragma once
+
+namespace DB
+{
+
+/**
+     * Part state is a stage of its lifetime. States are ordered and state of a part could be increased only.
+     * Part state should be modified under data_parts mutex.
+     *
+     * Possible state transitions:
+     * Temporary -> PreActive:       we are trying to add a fetched, inserted or merged part to active set
+     * PreActive -> Outdated:        we could not add a part to active set and are doing a rollback (for example it is duplicated part)
+     * PreActive -> Active:          we successfully added a part to active dataset
+     * PreActive -> Outdated:        a part was replaced by a covering part or DROP PARTITION
+     * Outdated -> Deleting:         a cleaner selected this part for deletion
+     * Deleting -> Outdated:         if an ZooKeeper error occurred during the deletion, we will retry deletion
+     * Active -> DeleteOnDestroy:    if part was moved to another disk
+     */
+enum class MergeTreeDataPartState
+{
+    Temporary,       /// the part is generating now, it is not in data_parts list
+    PreActive,    /// the part is in data_parts, but not used for SELECTs
+    Active,       /// active data part, used by current and upcoming SELECTs
+    Outdated,        /// not active data part, but could be used by only current SELECTs, could be deleted after SELECTs finishes
+    Deleting,        /// not active data part with identity refcounter, it is deleting right now by a cleaner
+    DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index 7fe68420310..c7b6ff0c4dd 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -49,7 +49,8 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartWide::getReader(
 {
     auto ptr = std::static_pointer_cast<const MergeTreeDataPartWide>(shared_from_this());
     return std::make_unique<MergeTreeReaderWide>(
-        ptr, columns_to_read, metadata_snapshot, uncompressed_cache,
+        ptr, columns_to_read,
+        metadata_snapshot, uncompressed_cache,
         mark_cache, mark_ranges, reader_settings,
         avg_value_size_hints, profile_callback);
 }
@@ -64,7 +65,8 @@ IMergeTreeDataPart::MergeTreeWriterPtr MergeTreeDataPartWide::getWriter(
     const MergeTreeIndexGranularity & computed_index_granularity) const
 {
     return std::make_unique<MergeTreeDataPartWriterWide>(
-        shared_from_this(), data_part_storage_builder, columns_list, metadata_snapshot, indices_to_recalc,
+        shared_from_this(), data_part_storage_builder,
+        columns_list, metadata_snapshot, indices_to_recalc,
         index_granularity_info.marks_file_extension,
         default_codec_, writer_settings, computed_index_granularity);
 }
@@ -79,7 +81,7 @@ ColumnSize MergeTreeDataPartWide::getColumnSizeImpl(
     if (checksums.empty())
         return size;
 
-    getSerialization(column)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+    getSerialization(column.name)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
         String file_name = ISerialization::getFileNameForStream(column, substream_path);
 
@@ -167,9 +169,9 @@ void MergeTreeDataPartWide::checkConsistency(bool require_part_metadata) const
     {
         if (require_part_metadata)
         {
-            for (const NameAndTypePair & name_type : columns)
+            for (const auto & name_type : columns)
             {
-                getSerialization(name_type)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+                getSerialization(name_type.name)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
                 {
                     String file_name = ISerialization::getFileNameForStream(name_type, substream_path);
                     String mrk_file_name = file_name + index_granularity_info.marks_file_extension;
@@ -194,9 +196,9 @@ void MergeTreeDataPartWide::checkConsistency(bool require_part_metadata) const
     {
         /// Check that all marks are nonempty and have the same size.
         std::optional<UInt64> marks_size;
-        for (const NameAndTypePair & name_type : columns)
+        for (const auto & name_type : columns)
         {
-            getSerialization(name_type)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+            getSerialization(name_type.name)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
             {
                 auto file_path = ISerialization::getFileNameForStream(name_type, substream_path) + index_granularity_info.marks_file_extension;
 
@@ -235,7 +237,7 @@ bool MergeTreeDataPartWide::hasColumnFiles(const NameAndTypePair & column) const
     };
 
     bool res = true;
-    getSerialization(column)->enumerateStreams([&](const auto & substream_path)
+    getSerialization(column.name)->enumerateStreams([&](const auto & substream_path)
     {
         String file_name = ISerialization::getFileNameForStream(column, substream_path);
         if (!check_stream_exists(file_name))
@@ -248,7 +250,7 @@ bool MergeTreeDataPartWide::hasColumnFiles(const NameAndTypePair & column) const
 String MergeTreeDataPartWide::getFileNameForColumn(const NameAndTypePair & column) const
 {
     String filename;
-    getSerialization(column)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
+    getSerialization(column.name)->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
         if (filename.empty())
             filename = ISerialization::getFileNameForStream(column, substream_path);
@@ -259,7 +261,7 @@ String MergeTreeDataPartWide::getFileNameForColumn(const NameAndTypePair & colum
 void MergeTreeDataPartWide::calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const
 {
     std::unordered_set<String> processed_substreams;
-    for (const NameAndTypePair & column : columns)
+    for (const auto & column : columns)
     {
         ColumnSize size = getColumnSizeImpl(column, &processed_substreams);
         each_columns_size[column.name] = size;
@@ -270,7 +272,7 @@ void MergeTreeDataPartWide::calculateEachColumnSizes(ColumnSizeByName & each_col
         if (rows_count != 0
             && column.type->isValueRepresentedByNumber()
             && !column.type->haveSubtypes()
-            && getSerialization(column)->getKind() == ISerialization::Kind::DEFAULT)
+            && getSerialization(column.name)->getKind() == ISerialization::Kind::DEFAULT)
         {
             size_t rows_in_column = size.data_uncompressed / column.type->getSizeOfValueInMemory();
             if (rows_in_column != rows_count)
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index d181a15d08f..771248b99c6 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -67,7 +67,7 @@ void MergeTreeDataPartWriterCompact::addStreams(const NameAndTypePair & column,
     };
 
     ISerialization::SubstreamPath path;
-    data_part->getSerialization(column)->enumerateStreams(path, callback, column.type);
+    data_part->getSerialization(column.name)->enumerateStreams(path, callback, column.type);
 }
 
 namespace
@@ -208,7 +208,7 @@ void MergeTreeDataPartWriterCompact::writeDataBlock(const Block & block, const G
             writeIntBinary(static_cast<UInt64>(0), marks);
 
             writeColumnSingleGranule(
-                block.getByName(name_and_type->name), data_part->getSerialization(*name_and_type),
+                block.getByName(name_and_type->name), data_part->getSerialization(name_and_type->name),
                 stream_getter, granule.start_row, granule.rows_to_write);
 
             /// Each type always have at least one substream
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index e3925940553..3d4aa0a7707 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -121,7 +121,7 @@ void MergeTreeDataPartWriterWide::addStreams(
     };
 
     ISerialization::SubstreamPath path;
-    data_part->getSerialization(column)->enumerateStreams(path, callback, column.type);
+    data_part->getSerialization(column.name)->enumerateStreams(path, callback, column.type);
 }
 
 
@@ -216,7 +216,7 @@ void MergeTreeDataPartWriterWide::write(const Block & block, const IColumn::Perm
     {
         auto & column = block_to_write.getByName(it->name);
 
-        if (data_part->getSerialization(*it)->getKind() != ISerialization::Kind::SPARSE)
+        if (data_part->getSerialization(it->name)->getKind() != ISerialization::Kind::SPARSE)
             column.column = recursiveRemoveSparse(column.column);
 
         if (permutation)
@@ -278,7 +278,7 @@ StreamsWithMarks MergeTreeDataPartWriterWide::getCurrentMarksForColumn(
     ISerialization::SubstreamPath & path)
 {
     StreamsWithMarks result;
-    data_part->getSerialization(column)->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
+    data_part->getSerialization(column.name)->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
         bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
 
@@ -313,7 +313,7 @@ void MergeTreeDataPartWriterWide::writeSingleGranule(
     ISerialization::SerializeBinaryBulkSettings & serialize_settings,
     const Granule & granule)
 {
-    const auto & serialization = data_part->getSerialization(name_and_type);
+    const auto & serialization = data_part->getSerialization(name_and_type.name);
     serialization->serializeBinaryBulkWithMultipleStreams(column, granule.start_row, granule.rows_to_write, serialize_settings, serialization_state);
 
     /// So that instead of the marks pointing to the end of the compressed block, there were marks pointing to the beginning of the next one.
@@ -343,7 +343,7 @@ void MergeTreeDataPartWriterWide::writeColumn(
 
     const auto & [name, type] = name_and_type;
     auto [it, inserted] = serialization_states.emplace(name, nullptr);
-    auto serialization = data_part->getSerialization(name_and_type);
+    auto serialization = data_part->getSerialization(name_and_type.name);
 
     if (inserted)
     {
@@ -405,7 +405,7 @@ void MergeTreeDataPartWriterWide::writeColumn(
 void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const NameAndTypePair & name_type)
 {
     const auto & [name, type] = name_type;
-    const auto & serialization = data_part->getSerialization(name_type);
+    const auto & serialization = data_part->getSerialization(name_type.name);
 
     if (!type->isValueRepresentedByNumber() || type->haveSubtypes() || serialization->getKind() != ISerialization::Kind::DEFAULT)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot validate column of non fixed type {}", type->getName());
@@ -549,7 +549,7 @@ void MergeTreeDataPartWriterWide::fillDataChecksums(IMergeTreeDataPart::Checksum
             if (!serialization_states.empty())
             {
                 serialize_settings.getter = createStreamGetter(*it, written_offset_columns ? *written_offset_columns : offset_columns);
-                data_part->getSerialization(*it)->serializeBinaryBulkStateSuffix(serialize_settings, serialization_states[it->name]);
+                data_part->getSerialization(it->name)->serializeBinaryBulkStateSuffix(serialize_settings, serialization_states[it->name]);
             }
 
             if (write_final_mark)
@@ -583,7 +583,7 @@ void MergeTreeDataPartWriterWide::finishDataSerialization(bool sync)
     {
         if (column.type->isValueRepresentedByNumber()
             && !column.type->haveSubtypes()
-            && data_part->getSerialization(column)->getKind() == ISerialization::Kind::DEFAULT)
+            && data_part->getSerialization(column.name)->getKind() == ISerialization::Kind::DEFAULT)
         {
             validateColumnOfFixedSize(column);
         }
@@ -623,7 +623,7 @@ void MergeTreeDataPartWriterWide::writeFinalMark(
 {
     writeSingleMark(column, offset_columns, 0, path);
     /// Memoize information about offsets
-    data_part->getSerialization(column)->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
+    data_part->getSerialization(column.name)->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
         bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
         if (is_offsets)
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index f13031d17f4..12aec29eab6 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -8,13 +8,16 @@
 #include <Storages/MergeTree/MergeTreeIndexReader.h>
 #include <Storages/MergeTree/KeyCondition.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
+#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/ReadInOrderOptimizer.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSampleRatio.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/Context.h>
 #include <Processors/ConcatProcessor.h>
 #include <Processors/QueryPlan/QueryPlan.h>
@@ -26,7 +29,9 @@
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPlan/QueryIdHolder.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
+#include <Processors/QueryPlan/SortingStep.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Transforms/AggregatingTransform.h>
 
 #include <Core/UUID.h>
 #include <DataTypes/DataTypeDate.h>
@@ -35,12 +40,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
-#include <Storages/VirtualColumnUtils.h>
 
-#include <Interpreters/InterpreterSelectQuery.h>
-
-#include <Processors/Transforms/AggregatingTransform.h>
-#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <IO/WriteBufferFromOStream.h>
 
 #include <Storages/MergeTree/CommonANNIndexes.h>
@@ -186,6 +186,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
         query_info.projection->desc->type,
         query_info.projection->desc->name);
 
+    const ASTSelectQuery & select_query = query_info.query->as<ASTSelectQuery &>();
     QueryPlanResourceHolder resources;
 
     auto projection_plan = std::make_unique<QueryPlan>();
@@ -232,6 +233,25 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
             expression_before_aggregation->setStepDescription("Before GROUP BY");
             projection_plan->addStep(std::move(expression_before_aggregation));
         }
+
+        /// NOTE: input_order_info (for projection and not) is set only if projection is complete
+        if (query_info.has_order_by && !query_info.need_aggregate && query_info.projection->input_order_info)
+        {
+            chassert(query_info.projection->complete);
+
+            SortDescription output_order_descr = InterpreterSelectQuery::getSortDescription(select_query, context);
+            UInt64 limit = InterpreterSelectQuery::getLimitForSorting(select_query, context);
+
+            auto sorting_step = std::make_unique<SortingStep>(
+                projection_plan->getCurrentDataStream(),
+                query_info.projection->input_order_info->order_key_prefix_descr,
+                output_order_descr,
+                settings.max_block_size,
+                limit);
+
+            sorting_step->setStepDescription("ORDER BY for projections");
+            projection_plan->addStep(std::move(sorting_step));
+        }
     }
 
     auto ordinary_query_plan = std::make_unique<QueryPlan>();
@@ -367,7 +387,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
                 InputOrderInfoPtr group_by_info = query_info.projection->input_order_info;
                 SortDescription group_by_sort_description;
                 if (group_by_info && settings.optimize_aggregation_in_order)
-                    group_by_sort_description = getSortDescriptionFromGroupBy(query_info.query->as<ASTSelectQuery &>());
+                    group_by_sort_description = getSortDescriptionFromGroupBy(select_query);
                 else
                     group_by_info = nullptr;
 
@@ -1255,6 +1275,7 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
     const StorageMetadataPtr & metadata_snapshot_base,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
+    const ActionDAGNodes & added_filter_nodes,
     ContextPtr context,
     unsigned num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
@@ -1274,6 +1295,8 @@ MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
 
     return ReadFromMergeTree::selectRangesToRead(
         std::move(parts),
+        query_info.prewhere_info,
+        added_filter_nodes,
         metadata_snapshot_base,
         metadata_snapshot,
         query_info,
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index e01e624a9b7..bb44f260eec 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -60,6 +60,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot_base,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
+        const ActionDAGNodes & added_filter_nodes,
         ContextPtr context,
         unsigned num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 89042e25a0e..97900eef22b 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -321,6 +321,9 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPart(
     else
         part_name = new_part_info.getPartName();
 
+    String part_dir = TMP_PREFIX + part_name;
+    temp_part.temporary_directory_lock = data.getTemporaryPartDirectoryHolder(part_dir);
+
     /// If we need to calculate some columns to sort.
     if (metadata_snapshot->hasSortingKey() || metadata_snapshot->hasSecondaryIndices())
         data.getSortingKeyAndSkipIndicesExpression(metadata_snapshot)->execute(block);
@@ -395,8 +398,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPart(
     SerializationInfoByName infos(columns, settings);
     infos.add(block);
 
-    new_data_part->setColumns(columns);
-    new_data_part->setSerializationInfos(infos);
+    new_data_part->setColumns(columns, infos);
     new_data_part->rows_count = block.rows();
     new_data_part->partition = std::move(partition);
     new_data_part->minmax_idx = std::move(minmax_idx);
@@ -468,8 +470,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPart(
     auto finalizer = out->finalizePartAsync(
         new_data_part,
         data_settings->fsync_after_insert,
-        nullptr, nullptr,
-        context->getWriteSettings());
+        nullptr, nullptr);
 
     temp_part.part = new_data_part;
     temp_part.builder = data_part_storage_builder;
@@ -523,8 +524,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
     SerializationInfoByName infos(columns, settings);
     infos.add(block);
 
-    new_data_part->setColumns(columns);
-    new_data_part->setSerializationInfos(infos);
+    new_data_part->setColumns(columns, infos);
 
     if (new_data_part->isStoredOnDisk())
     {
@@ -584,7 +584,8 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
         columns,
         MergeTreeIndices{},
         compression_codec,
-        NO_TRANSACTION_PTR);
+        NO_TRANSACTION_PTR,
+        false, false, data.getContext()->getWriteSettings());
 
     out->writeWithPermutation(block, perm_ptr);
     auto finalizer = out->finalizePartAsync(new_data_part, false);
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.h b/src/Storages/MergeTree/MergeTreeDataWriter.h
index 29c7baaa775..2f9ab1aae8b 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.h
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.h
@@ -64,6 +64,8 @@ public:
 
         std::vector<Stream> streams;
 
+        scope_guard temporary_directory_lock;
+
         void finalize();
     };
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index 7b194de8103..a80f7093775 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -691,16 +691,15 @@ SetPtr MergeTreeIndexConditionBloomFilter::getPreparedSet(const ASTPtr & node)
     if (header.has(node->getColumnName()))
     {
         const auto & column_and_type = header.getByName(node->getColumnName());
-        const auto & prepared_set_it = query_info.sets.find(getPreparedSetKey(node, column_and_type.type));
-
-        if (prepared_set_it != query_info.sets.end() && prepared_set_it->second->hasExplicitSetElements())
-            return prepared_set_it->second;
+        auto set_key = getPreparedSetKey(node, column_and_type.type);
+        if (auto prepared_set = query_info.prepared_sets->get(set_key))
+            return prepared_set;
     }
     else
     {
-        for (const auto & prepared_set_it : query_info.sets)
-            if (prepared_set_it.first.ast_hash == node->getTreeHash() && prepared_set_it.second->hasExplicitSetElements())
-                return prepared_set_it.second;
+        for (const auto & set : query_info.prepared_sets->getByTreeHash(node->getTreeHash()))
+            if (set->hasExplicitSetElements())
+                return set;
     }
 
     return DB::SetPtr();
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index b244bd489f1..ff924290783 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -146,7 +146,7 @@ MergeTreeConditionFullText::MergeTreeConditionFullText(
     , index_data_types(index_sample_block.getNamesAndTypesList().getTypes())
     , params(params_)
     , token_extractor(token_extactor_)
-    , prepared_sets(query_info.sets)
+    , prepared_sets(query_info.prepared_sets)
 {
     rpn = std::move(
             RPNBuilder<RPNElement>(
@@ -609,11 +609,10 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
     else
         set_key = PreparedSetKey::forLiteral(*right_arg, data_types);
 
-    auto set_it = prepared_sets.find(set_key);
-    if (set_it == prepared_sets.end())
+    auto prepared_set = prepared_sets->get(set_key);
+    if (!prepared_set)
         return false;
 
-    const SetPtr & prepared_set = set_it->second;
     if (!prepared_set->hasExplicitSetElements())
         return false;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index 5f5956553dc..bb4f52a463e 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -142,8 +142,9 @@ private:
     BloomFilterParameters params;
     TokenExtractorPtr token_extractor;
     RPN rpn;
+
     /// Sets from syntax analyzer.
-    PreparedSets prepared_sets;
+    PreparedSetsPtr prepared_sets;
 };
 
 class MergeTreeIndexFullText final : public IMergeTreeIndex
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index 05319ecc62e..b190ac2b2fd 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -157,9 +157,7 @@ void MergeTreeIndexAggregatorMinMax::update(const Block & block, size_t * pos, s
 
 
 MergeTreeIndexConditionMinMax::MergeTreeIndexConditionMinMax(
-    const IndexDescription & index,
-    const SelectQueryInfo & query,
-    ContextPtr context)
+    const IndexDescription & index, const SelectQueryInfo & query, ContextPtr context)
     : index_data_types(index.data_types)
     , condition(query, context, index.column_names, index.expression)
 {
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
index aeb00bfda79..b5cf3431bea 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
@@ -22,6 +22,7 @@ MergeTreeMarksLoader::MergeTreeMarksLoader(
     size_t marks_count_,
     const MergeTreeIndexGranularityInfo & index_granularity_info_,
     bool save_marks_in_cache_,
+    const ReadSettings & read_settings_,
     size_t columns_in_mark_)
     : data_part_storage(std::move(data_part_storage_))
     , mark_cache(mark_cache_)
@@ -29,7 +30,10 @@ MergeTreeMarksLoader::MergeTreeMarksLoader(
     , marks_count(marks_count_)
     , index_granularity_info(index_granularity_info_)
     , save_marks_in_cache(save_marks_in_cache_)
-    , columns_in_mark(columns_in_mark_) {}
+    , columns_in_mark(columns_in_mark_)
+    , read_settings(read_settings_)
+{
+}
 
 const MarkInCompressedFile & MergeTreeMarksLoader::getMark(size_t row_index, size_t column_index)
 {
@@ -66,7 +70,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
     if (!index_granularity_info.is_adaptive)
     {
         /// Read directly to marks.
-        auto buffer = data_part_storage->readFile(mrk_path, ReadSettings().adjustBufferSize(file_size), file_size, std::nullopt);
+        auto buffer = data_part_storage->readFile(mrk_path, read_settings.adjustBufferSize(file_size), file_size, std::nullopt);
         buffer->readStrict(reinterpret_cast<char *>(res->data()), file_size);
 
         if (!buffer->eof())
@@ -75,7 +79,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
     }
     else
     {
-        auto buffer = data_part_storage->readFile(mrk_path, ReadSettings().adjustBufferSize(file_size), file_size, std::nullopt);
+        auto buffer = data_part_storage->readFile(mrk_path, read_settings.adjustBufferSize(file_size), file_size, std::nullopt);
         size_t i = 0;
         while (!buffer->eof())
         {
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.h b/src/Storages/MergeTree/MergeTreeMarksLoader.h
index 3effeeec12b..b176571b6df 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.h
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <Storages/MergeTree/IDataPartStorage.h>
 #include <Storages/MarkCache.h>
+#include <IO/ReadSettings.h>
 
 namespace DB
 {
@@ -19,6 +20,7 @@ public:
         size_t marks_count_,
         const MergeTreeIndexGranularityInfo & index_granularity_info_,
         bool save_marks_in_cache_,
+        const ReadSettings & read_settings_,
         size_t columns_in_mark_ = 1);
 
     const MarkInCompressedFile & getMark(size_t row_index, size_t column_index = 0);
@@ -34,6 +36,7 @@ private:
     bool save_marks_in_cache = false;
     size_t columns_in_mark;
     MarkCache::MappedPtr marks;
+    ReadSettings read_settings;
 
     void loadMarks();
     MarkCache::MappedPtr loadMarksImpl();
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index a10192c4cc1..79854785016 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -8,6 +8,7 @@
 #include <base/range.h>
 #include <Interpreters/castColumn.h>
 #include <DataTypes/DataTypeNothing.h>
+#include <bit>
 
 #ifdef __SSE2__
 #include <emmintrin.h>
@@ -473,7 +474,7 @@ size_t numZerosInTail(const UInt8 * begin, const UInt8 * end)
             count += 64;
         else
         {
-            count += __builtin_clzll(val);
+            count += std::countl_zero(val);
             return count;
         }
     }
@@ -507,7 +508,7 @@ size_t numZerosInTail(const UInt8 * begin, const UInt8 * end)
             count += 64;
         else
         {
-            count += __builtin_clzll(val);
+            count += std::countl_zero(val);
             return count;
         }
     }
@@ -531,7 +532,7 @@ size_t MergeTreeRangeReader::ReadResult::numZerosInTail(const UInt8 * begin, con
 
     size_t count = 0;
 
-#if defined(__SSE2__) && defined(__POPCNT__)
+#if defined(__SSE2__)
     const __m128i zero16 = _mm_setzero_si128();
     while (end - begin >= 64)
     {
@@ -555,7 +556,7 @@ size_t MergeTreeRangeReader::ReadResult::numZerosInTail(const UInt8 * begin, con
             count += 64;
         else
         {
-            count += __builtin_clzll(val);
+            count += std::countl_zero(val);
             return count;
         }
     }
@@ -583,7 +584,7 @@ size_t MergeTreeRangeReader::ReadResult::numZerosInTail(const UInt8 * begin, con
             count += 64;
         else
         {
-            count += __builtin_clzll(val);
+            count += std::countl_zero(val);
             return count;
         }
     }
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 8e2e1d02836..44b5fa1a11b 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -41,34 +41,35 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
           data_part->getMarksCount(),
           data_part->index_granularity_info,
           settings.save_marks_in_cache,
+          settings.read_settings,
           data_part->getColumns().size())
 {
     try
     {
-        size_t columns_num = columns.size();
+        size_t columns_num = columns_to_read.size();
 
         column_positions.resize(columns_num);
         read_only_offsets.resize(columns_num);
-        auto name_and_type = columns.begin();
-        for (size_t i = 0; i < columns_num; ++i, ++name_and_type)
-        {
-            if (name_and_type->isSubcolumn())
-            {
-                auto storage_column_from_part = getColumnFromPart(
-                    {name_and_type->getNameInStorage(), name_and_type->getTypeInStorage()});
 
-                if (!storage_column_from_part.type->tryGetSubcolumnType(name_and_type->getSubcolumnName()))
+        for (size_t i = 0; i < columns_num; ++i)
+        {
+            const auto & column_to_read = columns_to_read[i];
+
+            if (column_to_read.isSubcolumn())
+            {
+                auto storage_column_from_part = getColumnInPart(
+                    {column_to_read.getNameInStorage(), column_to_read.getTypeInStorage()});
+
+                if (!storage_column_from_part.type->tryGetSubcolumnType(column_to_read.getSubcolumnName()))
                     continue;
             }
 
-            auto column_from_part = getColumnFromPart(*name_and_type);
-
-            auto position = data_part->getColumnPosition(column_from_part.getNameInStorage());
-            if (!position && typeid_cast<const DataTypeArray *>(column_from_part.type.get()))
+            auto position = data_part->getColumnPosition(column_to_read.getNameInStorage());
+            if (!position && typeid_cast<const DataTypeArray *>(column_to_read.type.get()))
             {
                 /// If array of Nested column is missing in part,
                 /// we have to read its offsets if they exist.
-                position = findColumnForOffsets(column_from_part.name);
+                position = findColumnForOffsets(column_to_read.name);
                 read_only_offsets[i] = (position != std::nullopt);
             }
 
@@ -143,32 +144,22 @@ size_t MergeTreeReaderCompact::readRows(
         from_mark = next_mark;
 
     size_t read_rows = 0;
-    size_t num_columns = columns.size();
+    size_t num_columns = columns_to_read.size();
     checkNumberOfColumns(num_columns);
 
     MutableColumns mutable_columns(num_columns);
-    auto column_it = columns.begin();
-    for (size_t i = 0; i < num_columns; ++i, ++column_it)
+    for (size_t i = 0; i < num_columns; ++i)
     {
-        if (!column_positions[i])
-            continue;
-
-        auto column_from_part = getColumnFromPart(*column_it);
-        if (res_columns[i] == nullptr)
-        {
-            auto serialization = data_part->getSerialization(column_from_part);
-            res_columns[i] = column_from_part.type->createColumn(*serialization);
-        }
+        if (column_positions[i] && res_columns[i] == nullptr)
+            res_columns[i] = columns_to_read[i].type->createColumn(*serializations[i]);
     }
 
     while (read_rows < max_rows_to_read)
     {
         size_t rows_to_read = data_part->index_granularity.getMarkRows(from_mark);
 
-        auto name_and_type = columns.begin();
-        for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
+        for (size_t pos = 0; pos < num_columns; ++pos)
         {
-            auto column_from_part = getColumnFromPart(*name_and_type);
             if (!res_columns[pos])
                 continue;
 
@@ -177,7 +168,7 @@ size_t MergeTreeReaderCompact::readRows(
                 auto & column = res_columns[pos];
                 size_t column_size_before_reading = column->size();
 
-                readData(column_from_part, column, from_mark, current_task_last_mark, *column_positions[pos], rows_to_read, read_only_offsets[pos]);
+                readData(columns_to_read[pos], column, from_mark, current_task_last_mark, *column_positions[pos], rows_to_read, read_only_offsets[pos]);
 
                 size_t read_rows_in_column = column->size() - column_size_before_reading;
                 if (read_rows_in_column != rows_to_read)
@@ -191,7 +182,7 @@ size_t MergeTreeReaderCompact::readRows(
                     storage.reportBrokenPart(data_part);
 
                 /// Better diagnostics.
-                e.addMessage("(while reading column " + column_from_part.name + ")");
+                e.addMessage("(while reading column " + columns_to_read[pos].name + ")");
                 throw;
             }
             catch (...)
@@ -239,7 +230,7 @@ void MergeTreeReaderCompact::readData(
         const auto & type_in_storage = name_and_type.getTypeInStorage();
         const auto & name_in_storage = name_and_type.getNameInStorage();
 
-        auto serialization = data_part->getSerialization(NameAndTypePair{name_in_storage, type_in_storage});
+        auto serialization = getSerializationInPart({name_in_storage, type_in_storage});
         ColumnPtr temp_column = type_in_storage->createColumn(*serialization);
 
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
@@ -255,7 +246,7 @@ void MergeTreeReaderCompact::readData(
     }
     else
     {
-        auto serialization = data_part->getSerialization(name_and_type);
+        auto serialization = getSerializationInPart(name_and_type);
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
         serialization->deserializeBinaryBulkWithMultipleStreams(column, rows_to_read, deserialize_settings, state, nullptr);
     }
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
index c1b0067dbb0..766c28c99b9 100644
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
@@ -32,10 +32,8 @@ MergeTreeReaderInMemory::MergeTreeReaderInMemory(
         {})
     , part_in_memory(std::move(data_part_))
 {
-    for (const auto & name_and_type : columns)
+    for (const auto & [name, type] : columns_to_read)
     {
-        auto [name, type] = getColumnFromPart(name_and_type);
-
         /// If array of Nested column is missing in part,
         /// we have to read its offsets if they exist.
         if (!part_in_memory->block.has(name) && typeid_cast<const DataTypeArray *>(type.get()))
@@ -64,20 +62,19 @@ size_t MergeTreeReaderInMemory::readRows(
             + toString(total_rows_read) + ". Rows in part: " + toString(part_rows), ErrorCodes::CANNOT_READ_ALL_DATA);
 
     size_t rows_to_read = std::min(max_rows_to_read, part_rows - total_rows_read);
-    auto column_it = columns.begin();
-    for (size_t i = 0; i < num_columns; ++i, ++column_it)
+    for (size_t i = 0; i < num_columns; ++i)
     {
-        auto name_type = getColumnFromPart(*column_it);
+        const auto & column_to_read = columns_to_read[i];
 
         /// Copy offsets, if array of Nested column is missing in part.
-        auto offsets_it = positions_for_offsets.find(name_type.name);
-        if (offsets_it != positions_for_offsets.end() && !name_type.isSubcolumn())
+        auto offsets_it = positions_for_offsets.find(column_to_read.name);
+        if (offsets_it != positions_for_offsets.end() && !column_to_read.isSubcolumn())
         {
             const auto & source_offsets = assert_cast<const ColumnArray &>(
                 *part_in_memory->block.getByPosition(offsets_it->second).column).getOffsets();
 
             if (res_columns[i] == nullptr)
-                res_columns[i] = name_type.type->createColumn();
+                res_columns[i] = column_to_read.type->createColumn();
 
             auto mutable_column = res_columns[i]->assumeMutable();
             auto & res_offstes = assert_cast<ColumnArray &>(*mutable_column).getOffsets();
@@ -87,9 +84,9 @@ size_t MergeTreeReaderInMemory::readRows(
 
             res_columns[i] = std::move(mutable_column);
         }
-        else if (part_in_memory->hasColumnFiles(name_type))
+        else if (part_in_memory->hasColumnFiles(column_to_read))
         {
-            auto block_column = getColumnFromBlock(part_in_memory->block, name_type);
+            auto block_column = getColumnFromBlock(part_in_memory->block, column_to_read);
             if (rows_to_read == part_rows)
             {
                 res_columns[i] = block_column;
@@ -97,7 +94,7 @@ size_t MergeTreeReaderInMemory::readRows(
             else
             {
                 if (res_columns[i] == nullptr)
-                    res_columns[i] = name_type.type->createColumn();
+                    res_columns[i] = column_to_read.type->createColumn();
 
                 auto mutable_column = res_columns[i]->assumeMutable();
                 mutable_column->insertRangeFrom(*block_column, total_rows_read, rows_to_read);
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index 6b43b8ac5c0..d9913f2639f 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -38,8 +38,16 @@ MergeTreeReaderStream::MergeTreeReaderStream(
     , mark_cache(mark_cache_)
     , save_marks_in_cache(settings.save_marks_in_cache)
     , index_granularity_info(index_granularity_info_)
-    , marks_loader(data_part_storage, mark_cache, index_granularity_info->getMarksFilePath(path_prefix),
-        marks_count, *index_granularity_info, save_marks_in_cache) {}
+    , marks_loader(
+        data_part_storage,
+        mark_cache,
+        index_granularity_info->getMarksFilePath(path_prefix),
+        marks_count,
+        *index_granularity_info,
+        save_marks_in_cache,
+        settings.read_settings)
+{
+}
 
 void MergeTreeReaderStream::init()
 {
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 07fe187332e..1274017b865 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnSparse.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/NestedUtils.h>
+#include <DataTypes/DataTypeNested.h>
 #include <Interpreters/inplaceBlockConversions.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Storages/MergeTree/MergeTreeDataPartWide.h>
@@ -47,11 +48,8 @@ MergeTreeReaderWide::MergeTreeReaderWide(
 {
     try
     {
-        for (const NameAndTypePair & column : columns)
-        {
-            auto column_from_part = getColumnFromPart(column);
-            addStreams(column_from_part, profile_callback_, clock_type_);
-        }
+        for (size_t i = 0; i < columns_to_read.size(); ++i)
+            addStreams(columns_to_read[i], serializations[i], profile_callback_, clock_type_);
     }
     catch (...)
     {
@@ -60,7 +58,6 @@ MergeTreeReaderWide::MergeTreeReaderWide(
     }
 }
 
-
 size_t MergeTreeReaderWide::readRows(
     size_t from_mark, size_t current_task_last_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
 {
@@ -80,47 +77,40 @@ size_t MergeTreeReaderWide::readRows(
         {
             /// Request reading of data in advance,
             /// so if reading can be asynchronous, it will also be performed in parallel for all columns.
-            auto name_and_type = columns.begin();
-            for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
+            for (size_t pos = 0; pos < num_columns; ++pos)
             {
-                auto column_from_part = getColumnFromPart(*name_and_type);
                 try
                 {
-                    auto & cache = caches[column_from_part.getNameInStorage()];
-                    prefetch(column_from_part, from_mark, continue_reading, current_task_last_mark, cache, prefetched_streams);
+                    auto & cache = caches[columns_to_read[pos].getNameInStorage()];
+                    prefetch(columns_to_read[pos], serializations[pos], from_mark, continue_reading, current_task_last_mark, cache, prefetched_streams);
                 }
                 catch (Exception & e)
                 {
                     /// Better diagnostics.
-                    e.addMessage("(while reading column " + column_from_part.name + ")");
+                    e.addMessage("(while reading column " + columns_to_read[pos].name + ")");
                     throw;
                 }
             }
         }
 
-        auto name_and_type = columns.begin();
-
-        for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
+        for (size_t pos = 0; pos < num_columns; ++pos)
         {
-            auto column_from_part = getColumnFromPart(*name_and_type);
-            const auto & [name, type] = column_from_part;
+            const auto & column_to_read = columns_to_read[pos];
 
             /// The column is already present in the block so we will append the values to the end.
             bool append = res_columns[pos] != nullptr;
             if (!append)
-            {
-                auto serialization = data_part->getSerialization(column_from_part);
-                res_columns[pos] = type->createColumn(*serialization);
-            }
+                res_columns[pos] = column_to_read.type->createColumn(*serializations[pos]);
 
             auto & column = res_columns[pos];
             try
             {
                 size_t column_size_before_reading = column->size();
-                auto & cache = caches[column_from_part.getNameInStorage()];
+                auto & cache = caches[column_to_read.getNameInStorage()];
 
                 readData(
-                    column_from_part, column, from_mark, continue_reading, current_task_last_mark,
+                    column_to_read, serializations[pos], column,
+                    from_mark, continue_reading, current_task_last_mark,
                     max_rows_to_read, cache, /* was_prefetched =*/ !prefetched_streams.empty());
 
                 /// For elements of Nested, column_size_before_reading may be greater than column size
@@ -131,7 +121,7 @@ size_t MergeTreeReaderWide::readRows(
             catch (Exception & e)
             {
                 /// Better diagnostics.
-                e.addMessage("(while reading column " + name + ")");
+                e.addMessage("(while reading column " + column_to_read.name + ")");
                 throw;
             }
 
@@ -164,8 +154,11 @@ size_t MergeTreeReaderWide::readRows(
     return read_rows;
 }
 
-void MergeTreeReaderWide::addStreams(const NameAndTypePair & name_and_type,
-    const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type)
+void MergeTreeReaderWide::addStreams(
+    const NameAndTypePair & name_and_type,
+    const SerializationPtr & serialization,
+    const ReadBufferFromFileBase::ProfileCallback & profile_callback,
+    clockid_t clock_type)
 {
     ISerialization::StreamCallback callback = [&] (const ISerialization::SubstreamPath & substream_path)
     {
@@ -192,7 +185,7 @@ void MergeTreeReaderWide::addStreams(const NameAndTypePair & name_and_type,
             profile_callback, clock_type, is_lc_dict));
     };
 
-    data_part->getSerialization(name_and_type)->enumerateStreams(callback);
+    serialization->enumerateStreams(callback);
 }
 
 
@@ -246,13 +239,13 @@ void MergeTreeReaderWide::deserializePrefix(
 
 void MergeTreeReaderWide::prefetch(
     const NameAndTypePair & name_and_type,
+    const SerializationPtr & serialization,
     size_t from_mark,
     bool continue_reading,
     size_t current_task_last_mark,
     ISerialization::SubstreamsCache & cache,
     std::unordered_set<std::string> & prefetched_streams)
 {
-    auto serialization = data_part->getSerialization(name_and_type);
     deserializePrefix(serialization, name_and_type, current_task_last_mark, cache);
 
     serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
@@ -272,7 +265,7 @@ void MergeTreeReaderWide::prefetch(
 
 
 void MergeTreeReaderWide::readData(
-    const NameAndTypePair & name_and_type, ColumnPtr & column,
+    const NameAndTypePair & name_and_type, const SerializationPtr & serialization, ColumnPtr & column,
     size_t from_mark, bool continue_reading, size_t current_task_last_mark,
     size_t max_rows_to_read, ISerialization::SubstreamsCache & cache, bool was_prefetched)
 {
@@ -280,9 +273,6 @@ void MergeTreeReaderWide::readData(
     ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
     deserialize_settings.avg_value_size_hint = avg_value_size_hint;
 
-    const auto & name = name_and_type.name;
-    auto serialization = data_part->getSerialization(name_and_type);
-
     deserializePrefix(serialization, name_and_type, current_task_last_mark, cache);
 
     deserialize_settings.getter = [&](const ISerialization::SubstreamPath & substream_path)
@@ -294,7 +284,7 @@ void MergeTreeReaderWide::readData(
             seek_to_mark, current_task_last_mark, cache);
     };
     deserialize_settings.continuous_reading = continue_reading;
-    auto & deserialize_state = deserialize_binary_bulk_state_map[name];
+    auto & deserialize_state = deserialize_binary_bulk_state_map[name_and_type.name];
 
     serialization->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, deserialize_settings, deserialize_state, &cache);
     IDataType::updateAvgValueSizeHint(*column, avg_value_size_hint);
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.h b/src/Storages/MergeTree/MergeTreeReaderWide.h
index 7bb1ccfd173..2137695b6d7 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.h
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.h
@@ -38,17 +38,21 @@ public:
 private:
     FileStreams streams;
 
-    void addStreams(const NameAndTypePair & name_and_type,
-        const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type);
+    void addStreams(
+        const NameAndTypePair & name_and_type,
+        const SerializationPtr & serialization,
+        const ReadBufferFromFileBase::ProfileCallback & profile_callback,
+        clockid_t clock_type);
 
     void readData(
-        const NameAndTypePair & name_and_type, ColumnPtr & column,
+        const NameAndTypePair & name_and_type, const SerializationPtr & serialization, ColumnPtr & column,
         size_t from_mark, bool continue_reading, size_t current_task_last_mark, size_t max_rows_to_read,
         ISerialization::SubstreamsCache & cache, bool was_prefetched);
 
     /// Make next readData more simple by calling 'prefetch' of all related ReadBuffers (column streams).
     void prefetch(
         const NameAndTypePair & name_and_type,
+        const SerializationPtr & serialization,
         size_t from_mark,
         bool continue_reading,
         size_t current_task_last_mark,
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index d8dfa017b7f..89081fe924f 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -128,9 +128,6 @@ struct Settings;
     M(UInt64, concurrent_part_removal_threshold, 100, "Activate concurrent part removal (see 'max_part_removal_threads') only if the number of inactive data parts is at least this.", 0) \
     M(String, storage_policy, "default", "Name of storage disk policy", 0) \
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
-    M(Bool, allow_remote_fs_zero_copy_replication, true, "Allow Zero-copy replication over remote fs.", 0) \
-    M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for Zero-copy table-independet info.", 0) \
-    M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     M(Bool, remove_empty_parts, true, "Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm.", 0) \
     M(Bool, assign_part_uuids, false, "Generate UUIDs for parts. Before enabling check that all replicas support new format.", 0) \
     M(Int64, max_partitions_to_read, -1, "Limit the max number of partitions that can be accessed in one query. <= 0 means unlimited. This setting is the default that can be overridden by the query-level setting with the same name.", 0) \
@@ -143,6 +140,9 @@ struct Settings;
     M(UInt64, part_moves_between_shards_enable, 0, "Experimental/Incomplete feature to move parts between shards. Does not take into account sharding expressions.", 0) \
     M(UInt64, part_moves_between_shards_delay_seconds, 30, "Time to wait before/after moving parts between shards.", 0) \
     M(Bool, use_metadata_cache, false, "Experimental feature to speed up parts loading process by using MergeTree metadata cache", 0) \
+    M(Bool, allow_remote_fs_zero_copy_replication, false, "Don't use this setting in production, because it is not ready.", 0) \
+    M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for Zero-copy table-independet info.", 0) \
+    M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     \
     /** Obsolete settings. Kept for backward compatibility only. */ \
     M(UInt64, min_relative_delay_to_yield_leadership, 120, "Obsolete setting, does nothing.", 0) \
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 9ed8fe0ad14..9b79f89ff98 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -212,7 +212,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
 
             part->minmax_idx->update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
             part->partition.create(metadata_snapshot, block, 0, context);
-            part->setColumns(block.getNamesAndTypesList());
+            part->setColumns(block.getNamesAndTypesList(), {});
             if (metadata_snapshot->hasSortingKey())
                 metadata_snapshot->getSortingKey().expression->execute(block);
 
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index f7da1eb2585..a5bc189e42f 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -23,10 +23,11 @@ MergedBlockOutputStream::MergedBlockOutputStream(
     const MergeTreeTransactionPtr & txn,
     bool reset_columns_,
     bool blocks_are_granules_size,
-    const WriteSettings & write_settings)
+    const WriteSettings & write_settings_)
     : IMergedBlockOutputStream(std::move(data_part_storage_builder_), data_part, metadata_snapshot_, columns_list_, reset_columns_)
     , columns_list(columns_list_)
     , default_codec(default_codec_)
+    , write_settings(write_settings_)
 {
     MergeTreeWriterSettings writer_settings(
         storage.getContext()->getSettings(),
@@ -93,7 +94,7 @@ void MergedBlockOutputStream::Finalizer::Impl::finish()
 {
     writer.finish(sync);
 
-    for (const auto & file_name: files_to_remove_after_finish)
+    for (const auto & file_name : files_to_remove_after_finish)
         data_part_storage_builder->removeFile(file_name);
 
     for (auto & file : written_files)
@@ -133,8 +134,7 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
         MergeTreeData::MutableDataPartPtr & new_part,
         bool sync,
         const NamesAndTypesList * total_columns_list,
-        MergeTreeData::DataPart::Checksums * additional_column_checksums,
-        const WriteSettings & write_settings)
+        MergeTreeData::DataPart::Checksums * additional_column_checksums)
 {
     /// Finish write and get checksums.
     MergeTreeData::DataPart::Checksums checksums;
@@ -162,13 +162,12 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
         serialization_infos.replaceData(new_serialization_infos);
         files_to_remove_after_sync = removeEmptyColumnsFromPart(new_part, part_columns, serialization_infos, checksums);
 
-        new_part->setColumns(part_columns);
-        new_part->setSerializationInfos(serialization_infos);
+        new_part->setColumns(part_columns, serialization_infos);
     }
 
     auto finalizer = std::make_unique<Finalizer::Impl>(*writer, new_part, data_part_storage_builder, files_to_remove_after_sync, sync);
     if (new_part->isStoredOnDisk())
-       finalizer->written_files = finalizePartOnDisk(new_part, checksums, write_settings);
+       finalizer->written_files = finalizePartOnDisk(new_part, checksums);
 
     new_part->rows_count = rows_count;
     new_part->modification_time = time(nullptr);
@@ -186,15 +185,14 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
 
 MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDisk(
     const MergeTreeData::DataPartPtr & new_part,
-    MergeTreeData::DataPart::Checksums & checksums,
-    const WriteSettings & settings)
+    MergeTreeData::DataPart::Checksums & checksums)
 {
     WrittenFiles written_files;
     if (new_part->isProjectionPart())
     {
         if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || isCompactPart(new_part))
         {
-            auto count_out = data_part_storage_builder->writeFile("count.txt", 4096, settings);
+            auto count_out = data_part_storage_builder->writeFile("count.txt", 4096, write_settings);
             HashingWriteBuffer count_out_hashing(*count_out);
             writeIntText(rows_count, count_out_hashing);
             count_out_hashing.next();
@@ -208,7 +206,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
     {
         if (new_part->uuid != UUIDHelpers::Nil)
         {
-            auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::UUID_FILE_NAME, 4096, settings);
+            auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::UUID_FILE_NAME, 4096, write_settings);
             HashingWriteBuffer out_hashing(*out);
             writeUUIDText(new_part->uuid, out_hashing);
             checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
@@ -234,7 +232,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
         }
 
         {
-            auto count_out = data_part_storage_builder->writeFile("count.txt", 4096, settings);
+            auto count_out = data_part_storage_builder->writeFile("count.txt", 4096, write_settings);
             HashingWriteBuffer count_out_hashing(*count_out);
             writeIntText(rows_count, count_out_hashing);
             count_out_hashing.next();
@@ -248,7 +246,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
     if (!new_part->ttl_infos.empty())
     {
         /// Write a file with ttl infos in json format.
-        auto out = data_part_storage_builder->writeFile("ttl.txt", 4096, settings);
+        auto out = data_part_storage_builder->writeFile("ttl.txt", 4096, write_settings);
         HashingWriteBuffer out_hashing(*out);
         new_part->ttl_infos.write(out_hashing);
         checksums.files["ttl.txt"].file_size = out_hashing.count();
@@ -259,7 +257,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
 
     if (!new_part->getSerializationInfos().empty())
     {
-        auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::SERIALIZATION_FILE_NAME, 4096, settings);
+        auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::SERIALIZATION_FILE_NAME, 4096, write_settings);
         HashingWriteBuffer out_hashing(*out);
         new_part->getSerializationInfos().writeJSON(out_hashing);
         checksums.files[IMergeTreeDataPart::SERIALIZATION_FILE_NAME].file_size = out_hashing.count();
@@ -270,7 +268,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
 
     {
         /// Write a file with a description of columns.
-        auto out = data_part_storage_builder->writeFile("columns.txt", 4096, settings);
+        auto out = data_part_storage_builder->writeFile("columns.txt", 4096, write_settings);
         new_part->getColumns().writeText(*out);
         out->preFinalize();
         written_files.emplace_back(std::move(out));
@@ -278,7 +276,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
 
     if (default_codec != nullptr)
     {
-        auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096, settings);
+        auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096, write_settings);
         DB::writeText(queryToString(default_codec->getFullCodecDesc()), *out);
         out->preFinalize();
         written_files.emplace_back(std::move(out));
@@ -291,7 +289,7 @@ MergedBlockOutputStream::WrittenFiles MergedBlockOutputStream::finalizePartOnDis
 
     {
         /// Write file with checksums.
-        auto out = data_part_storage_builder->writeFile("checksums.txt", 4096, settings);
+        auto out = data_part_storage_builder->writeFile("checksums.txt", 4096, write_settings);
         checksums.write(*out);
         out->preFinalize();
         written_files.emplace_back(std::move(out));
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.h b/src/Storages/MergeTree/MergedBlockOutputStream.h
index 70c4bc3b49f..92dcd8dd272 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.h
@@ -58,8 +58,7 @@ public:
             MergeTreeData::MutableDataPartPtr & new_part,
             bool sync,
             const NamesAndTypesList * total_columns_list = nullptr,
-            MergeTreeData::DataPart::Checksums * additional_column_checksums = nullptr,
-            const WriteSettings & settings = {});
+            MergeTreeData::DataPart::Checksums * additional_column_checksums = nullptr);
 
     void finalizePart(
             MergeTreeData::MutableDataPartPtr & new_part,
@@ -76,13 +75,13 @@ private:
     using WrittenFiles = std::vector<std::unique_ptr<WriteBufferFromFileBase>>;
     WrittenFiles finalizePartOnDisk(
             const MergeTreeData::DataPartPtr & new_part,
-            MergeTreeData::DataPart::Checksums & checksums,
-            const WriteSettings & write_settings);
+            MergeTreeData::DataPart::Checksums & checksums);
 
     NamesAndTypesList columns_list;
     IMergeTreeDataPart::MinMaxIndex minmax_idx;
     size_t rows_count = 0;
     CompressionCodecPtr default_codec;
+    WriteSettings write_settings;
 };
 
 using MergedBlockOutputStreamPtr = std::shared_ptr<MergedBlockOutputStream>;
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index deab5e748c7..21e01223e2c 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -87,8 +87,7 @@ MergedColumnOnlyOutputStream::fillChecksums(
             all_checksums.files.erase(removed_file);
     }
 
-    new_part->setColumns(columns);
-    new_part->setSerializationInfos(serialization_infos);
+    new_part->setColumns(columns, serialization_infos);
 
     return checksums;
 }
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index 7d0c37051e7..d0b39684ba2 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -58,7 +58,7 @@ static void splitMutationCommands(
     MutationCommands & for_interpreter,
     MutationCommands & for_file_renames)
 {
-    ColumnsDescription part_columns(part->getColumns());
+    auto part_columns = part->getColumnsDescription();
 
     if (!isWidePart(part))
     {
@@ -140,18 +140,11 @@ static void splitMutationCommands(
             else if (part_columns.has(command.column_name))
             {
                 if (command.type == MutationCommand::Type::READ_COLUMN)
-                {
                     for_interpreter.push_back(command);
-                }
                 else if (command.type == MutationCommand::Type::RENAME_COLUMN)
-                {
                     part_columns.rename(command.column_name, command.rename_to);
-                    for_file_renames.push_back(command);
-                }
-                else
-                {
-                    for_file_renames.push_back(command);
-                }
+
+                for_file_renames.push_back(command);
             }
         }
     }
@@ -441,11 +434,34 @@ std::set<ProjectionDescriptionRawPtr> getProjectionsToRecalculate(
     return projections_to_recalc;
 }
 
+static std::unordered_map<String, size_t> getStreamCounts(
+    const MergeTreeDataPartPtr & data_part, const Names & column_names)
+{
+    std::unordered_map<String, size_t> stream_counts;
+
+    for (const auto & column_name : column_names)
+    {
+        if (auto serialization = data_part->tryGetSerialization(column_name))
+        {
+            auto callback = [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                auto stream_name = ISerialization::getFileNameForStream(column_name, substream_path);
+                ++stream_counts[stream_name];
+            };
+
+            serialization->enumerateStreams(callback);
+        }
+    }
+
+    return stream_counts;
+}
+
 
 /// Files, that we don't need to remove and don't need to hardlink, for example columns.txt and checksums.txt.
 /// Because we will generate new versions of them after we perform mutation.
-NameSet collectFilesToSkip(
+static NameSet collectFilesToSkip(
     const MergeTreeDataPartPtr & source_part,
+    const MergeTreeDataPartPtr & new_part,
     const Block & updated_header,
     const std::set<MergeTreeIndexPtr> & indices_to_recalc,
     const String & mrk_extension,
@@ -453,23 +469,32 @@ NameSet collectFilesToSkip(
 {
     NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
 
+    auto new_stream_counts = getStreamCounts(new_part, new_part->getColumns().getNames());
+    auto source_updated_stream_counts = getStreamCounts(source_part, updated_header.getNames());
+    auto new_updated_stream_counts = getStreamCounts(new_part, updated_header.getNames());
+
     /// Skip updated files
-    for (const auto & entry : updated_header)
+    for (const auto & [stream_name, _] : source_updated_stream_counts)
     {
-        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+        /// If we read shared stream and do not write it
+        /// (e.g. while ALTER MODIFY COLUMN from array of Nested type to String),
+        /// we need to hardlink its files, because they will be lost otherwise.
+        bool need_hardlink = new_updated_stream_counts[stream_name] == 0 && new_stream_counts[stream_name] != 0;
+
+        if (!need_hardlink)
         {
-            String stream_name = ISerialization::getFileNameForStream({entry.name, entry.type}, substream_path);
             files_to_skip.insert(stream_name + ".bin");
             files_to_skip.insert(stream_name + mrk_extension);
-        };
-
-        source_part->getSerialization({entry.name, entry.type})->enumerateStreams(callback);
+        }
     }
+
     for (const auto & index : indices_to_recalc)
     {
-        files_to_skip.insert(index->getFileName() + ".idx");
+        /// Since MinMax index has .idx2 extension, we need to add correct extension.
+        files_to_skip.insert(index->getFileName() + index->getSerializedFileExtension());
         files_to_skip.insert(index->getFileName() + mrk_extension);
     }
+
     for (const auto & projection : projections_to_recalc)
         files_to_skip.insert(projection->getDirectoryName());
 
@@ -482,20 +507,15 @@ NameSet collectFilesToSkip(
 /// from filesystem and in-memory checksums. Ordered result is important,
 /// because we can apply renames that affects each other: x -> z, y -> x.
 static NameToNameVector collectFilesForRenames(
-    MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension)
+    MergeTreeData::DataPartPtr source_part,
+    MergeTreeData::DataPartPtr new_part,
+    const MutationCommands & commands_for_removes,
+    const String & mrk_extension)
 {
     /// Collect counts for shared streams of different columns. As an example, Nested columns have shared stream with array sizes.
-    std::map<String, size_t> stream_counts;
-    for (const auto & column : source_part->getColumns())
-    {
-        source_part->getSerialization(column)->enumerateStreams(
-            [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
-            });
-    }
-
+    auto stream_counts = getStreamCounts(source_part, source_part->getColumns().getNames());
     NameToNameVector rename_vector;
+
     /// Remove old data
     for (const auto & command : commands_for_removes)
     {
@@ -530,9 +550,8 @@ static NameToNameVector collectFilesForRenames(
                 }
             };
 
-            auto column = source_part->getColumns().tryGetByName(command.column_name);
-            if (column)
-                source_part->getSerialization(*column)->enumerateStreams(callback);
+            if (auto serialization = source_part->tryGetSerialization(command.column_name))
+                serialization->enumerateStreams(callback);
         }
         else if (command.type == MutationCommand::Type::RENAME_COLUMN)
         {
@@ -541,8 +560,7 @@ static NameToNameVector collectFilesForRenames(
 
             ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
             {
-                String stream_from = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
-
+                String stream_from = ISerialization::getFileNameForStream(command.column_name, substream_path);
                 String stream_to = boost::replace_first_copy(stream_from, escaped_name_from, escaped_name_to);
 
                 if (stream_from != stream_to)
@@ -552,9 +570,26 @@ static NameToNameVector collectFilesForRenames(
                 }
             };
 
-            auto column = source_part->getColumns().tryGetByName(command.column_name);
-            if (column)
-                source_part->getSerialization(*column)->enumerateStreams(callback);
+            if (auto serialization = source_part->tryGetSerialization(command.column_name))
+                serialization->enumerateStreams(callback);
+        }
+        else if (command.type == MutationCommand::Type::READ_COLUMN)
+        {
+            /// Remove files for streams that exist in source_part,
+            /// but were removed in new_part by MODIFY COLUMN from
+            /// type with higher number of streams (e.g. LowCardinality -> String).
+
+            auto old_streams = getStreamCounts(source_part, source_part->getColumns().getNames());
+            auto new_streams = getStreamCounts(new_part, source_part->getColumns().getNames());
+
+            for (const auto & [old_stream, _] : old_streams)
+            {
+                if (!new_streams.contains(old_stream) && --stream_counts[old_stream] == 0)
+                {
+                    rename_vector.emplace_back(old_stream + ".bin", "");
+                    rename_vector.emplace_back(old_stream + mrk_extension, "");
+                }
+            }
         }
     }
 
@@ -571,9 +606,6 @@ void finalizeMutatedPart(
     const CompressionCodecPtr & codec,
     ContextPtr context)
 {
-    //auto disk = new_data_part->volume->getDisk();
-    //auto part_path = fs::path(new_data_part->getRelativePath());
-
     if (new_data_part->uuid != UUIDHelpers::Nil)
     {
         auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::UUID_FILE_NAME, 4096, context->getWriteSettings());
@@ -611,7 +643,7 @@ void finalizeMutatedPart(
     {
         auto out = data_part_storage_builder->writeFile(IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096, context->getWriteSettings());
         DB::writeText(queryToString(codec->getFullCodecDesc()), *out);
-    }
+    } /// close fd
 
     {
         /// Write a file with a description of columns.
@@ -625,9 +657,14 @@ void finalizeMutatedPart(
     new_data_part->minmax_idx = source_part->minmax_idx;
     new_data_part->modification_time = time(nullptr);
     new_data_part->loadProjections(false, false);
-    new_data_part->setBytesOnDisk(new_data_part->data_part_storage->calculateTotalSizeOnDisk());
-    new_data_part->default_codec = codec;
+
+    /// All information about sizes is stored in checksums.
+    /// It doesn't make sense to touch filesystem for sizes.
+    new_data_part->setBytesOnDisk(new_data_part->checksums.getTotalSizeOnDisk());
+    /// Also use information from checksums
     new_data_part->calculateColumnsAndSecondaryIndicesSizesOnDisk();
+
+    new_data_part->default_codec = codec;
 }
 
 }
@@ -699,6 +736,8 @@ struct MutationContext
     MergeTreeTransactionPtr txn;
 
     MergeTreeData::HardlinkedFiles hardlinked_files;
+
+    scope_guard temporary_directory_lock;
 };
 
 using MutationContextPtr = std::shared_ptr<MutationContext>;
@@ -1131,7 +1170,10 @@ private:
             ctx->new_data_part->getColumns(),
             skip_part_indices,
             ctx->compression_codec,
-            ctx->txn);
+            ctx->txn,
+            false,
+            false,
+            ctx->context->getWriteSettings());
 
         ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
         ctx->mutating_pipeline.setProgressCallback(ctx->progress_callback);
@@ -1464,7 +1506,9 @@ bool MutateTask::prepare()
         ctx->storage_from_source_part, ctx->metadata_snapshot, ctx->commands_for_part, Context::createCopy(context_for_reading)))
     {
         LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {}", ctx->source_part->name, ctx->future_part->part_info.mutation);
-        promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false));
+        auto [part, lock] = ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false);
+        ctx->temporary_directory_lock = std::move(lock);
+        promise.set_value(std::move(part));
         return false;
     }
     else
@@ -1495,15 +1539,18 @@ bool MutateTask::prepare()
     /// FIXME new_data_part is not used in the case when we clone part with cloneAndLoadDataPartOnSameDisk and return false
     /// Is it possible to handle this case earlier?
 
+    String tmp_part_dir_name = "tmp_mut_" + ctx->future_part->name;
+    ctx->temporary_directory_lock = ctx->data->getTemporaryPartDirectoryHolder(tmp_part_dir_name);
+
     auto data_part_storage = std::make_shared<DataPartStorageOnDisk>(
         single_disk_volume,
         ctx->data->getRelativeDataPath(),
-        "tmp_mut_" + ctx->future_part->name);
+        tmp_part_dir_name);
 
     ctx->data_part_storage_builder = std::make_shared<DataPartStorageBuilderOnDisk>(
         single_disk_volume,
         ctx->data->getRelativeDataPath(),
-        "tmp_mut_" + ctx->future_part->name);
+        tmp_part_dir_name);
 
     ctx->new_data_part = ctx->data->createPart(
         ctx->future_part->name, ctx->future_part->type, ctx->future_part->part_info, data_part_storage);
@@ -1519,8 +1566,7 @@ bool MutateTask::prepare()
         ctx->source_part, ctx->updated_header, ctx->storage_columns,
         ctx->source_part->getSerializationInfos(), ctx->commands_for_part);
 
-    ctx->new_data_part->setColumns(new_columns);
-    ctx->new_data_part->setSerializationInfos(new_infos);
+    ctx->new_data_part->setColumns(new_columns, new_infos);
     ctx->new_data_part->partition.assign(ctx->source_part->partition);
 
     /// Don't change granularity type while mutating subset of columns
@@ -1554,11 +1600,17 @@ bool MutateTask::prepare()
 
         ctx->files_to_skip = MutationHelpers::collectFilesToSkip(
             ctx->source_part,
+            ctx->new_data_part,
             ctx->updated_header,
             ctx->indices_to_recalc,
             ctx->mrk_extension,
             ctx->projections_to_recalc);
-        ctx->files_to_rename = MutationHelpers::collectFilesForRenames(ctx->source_part, ctx->for_file_renames, ctx->mrk_extension);
+
+        ctx->files_to_rename = MutationHelpers::collectFilesForRenames(
+            ctx->source_part,
+            ctx->new_data_part,
+            ctx->for_file_renames,
+            ctx->mrk_extension);
 
         if (ctx->indices_to_recalc.empty() &&
             ctx->projections_to_recalc.empty() &&
@@ -1566,7 +1618,11 @@ bool MutateTask::prepare()
             && ctx->files_to_rename.empty())
         {
             LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {} (optimized)", ctx->source_part->name, ctx->future_part->part_info.mutation);
-            promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_mut_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false));
+            /// new_data_part is not used here, another part is created instead (see the comment above)
+            ctx->temporary_directory_lock = {};
+            auto [part, lock] = ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_mut_", ctx->future_part->part_info, ctx->metadata_snapshot, ctx->txn, &ctx->hardlinked_files, false);
+            ctx->temporary_directory_lock = std::move(lock);
+            promise.set_value(std::move(part));
             return false;
         }
 
diff --git a/src/Storages/MergeTree/PartitionPruner.h b/src/Storages/MergeTree/PartitionPruner.h
index fbed0e6ab99..9953c52b593 100644
--- a/src/Storages/MergeTree/PartitionPruner.h
+++ b/src/Storages/MergeTree/PartitionPruner.h
@@ -26,8 +26,7 @@ private:
 public:
     PartitionPruner(const StorageMetadataPtr & metadata, const SelectQueryInfo & query_info, ContextPtr context, bool strict)
         : partition_key(MergeTreePartition::adjustPartitionKey(metadata, context))
-        , partition_condition(
-              query_info, context, partition_key.column_names, partition_key.expression, true /* single_point */, strict)
+        , partition_condition(query_info, context, partition_key.column_names, partition_key.expression, true /* single_point */, strict)
         , useless(strict ? partition_condition.anyUnknownOrAlwaysTrue() : partition_condition.alwaysUnknownOrTrue())
     {
     }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index 53397106a56..a5206d42be9 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -70,23 +70,21 @@ void ReplicatedMergeTreePartCheckThread::enqueuePart(const String & name, time_t
 void ReplicatedMergeTreePartCheckThread::cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info)
 {
     /// Wait for running tasks to finish and temporarily stop checking
-    stop();
-    SCOPE_EXIT({ start(); });
+    auto pause_checking_parts = task->getExecLock();
+
+    std::lock_guard lock(parts_mutex);
+    for (auto it = parts_queue.begin(); it != parts_queue.end();)
     {
-        std::lock_guard lock(parts_mutex);
-        for (auto it = parts_queue.begin(); it != parts_queue.end();)
+        if (drop_range_info.contains(MergeTreePartInfo::fromPartName(it->first, storage.format_version)))
         {
-            if (drop_range_info.contains(MergeTreePartInfo::fromPartName(it->first, storage.format_version)))
-            {
-                /// Remove part from the queue to avoid part resurrection
-                /// if we will check it and enqueue fetch after DROP/REPLACE execution.
-                parts_set.erase(it->first);
-                it = parts_queue.erase(it);
-            }
-            else
-            {
-                ++it;
-            }
+            /// Remove part from the queue to avoid part resurrection
+            /// if we will check it and enqueue fetch after DROP/REPLACE execution.
+            parts_set.erase(it->first);
+            it = parts_queue.erase(it);
+        }
+        else
+        {
+            ++it;
         }
     }
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 2c32d9f266c..c7a7c18848f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1024,7 +1024,7 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
     [[maybe_unused]] bool called_from_alter_query_directly = covering_entry && covering_entry->replace_range_entry
         && covering_entry->replace_range_entry->columns_version < 0;
     [[maybe_unused]] bool called_for_broken_part = !covering_entry;
-    assert(currently_executing_drop_or_replace_range || called_from_alter_query_directly || called_for_broken_part);
+    assert(currently_executing_drop_replace_ranges.contains(part_info) || called_from_alter_query_directly || called_for_broken_part);
 
     for (Queue::iterator it = queue.begin(); it != queue.end();)
     {
@@ -1367,15 +1367,26 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
         /// DROP_RANGE and REPLACE_RANGE entries remove other entries, which produce parts in the range.
         /// If such part producing operations are currently executing, then DROP/REPLACE RANGE wait them to finish.
         /// Deadlock is possible if multiple DROP/REPLACE RANGE entries are executing in parallel and wait each other.
+        /// But it should not happen if ranges are disjoint.
         /// See also removePartProducingOpsInRange(...) and ReplicatedMergeTreeQueue::CurrentlyExecuting.
-        if (currently_executing_drop_or_replace_range)
+
+        if (auto drop_range = entry.getDropRange(format_version))
         {
-            out_postpone_reason = fmt::format(
-                "Not executing log entry {} of type {} for part {} "
-                "because another DROP_RANGE or REPLACE_RANGE entry are currently executing.",
-                entry.znode_name, entry.typeToString(), entry.new_part_name);
-            LOG_TRACE(log, fmt::runtime(out_postpone_reason));
-            return false;
+            auto drop_range_info = MergeTreePartInfo::fromPartName(*drop_range, format_version);
+            for (const auto & info : currently_executing_drop_replace_ranges)
+            {
+                if (drop_range_info.isDisjoint(info))
+                    continue;
+                out_postpone_reason = fmt::format(
+                    "Not executing log entry {} of type {} for part {} "
+                    "because another DROP_RANGE or REPLACE_RANGE entry with not disjoint range {} is currently executing.",
+                    entry.znode_name,
+                    entry.typeToString(),
+                    entry.new_part_name,
+                    info.getPartName());
+                LOG_TRACE(log, fmt::runtime(out_postpone_reason));
+                return false;
+            }
         }
 
         if (entry.isDropPart(format_version))
@@ -1442,10 +1453,11 @@ ReplicatedMergeTreeQueue::CurrentlyExecuting::CurrentlyExecuting(
     const ReplicatedMergeTreeQueue::LogEntryPtr & entry_, ReplicatedMergeTreeQueue & queue_, std::unique_lock<std::mutex> & /* state_lock */)
     : entry(entry_), queue(queue_)
 {
-    if (entry->type == ReplicatedMergeTreeLogEntry::DROP_RANGE || entry->type == ReplicatedMergeTreeLogEntry::REPLACE_RANGE)
+    if (auto drop_range = entry->getDropRange(queue.format_version))
     {
-        assert(!queue.currently_executing_drop_or_replace_range);
-        queue.currently_executing_drop_or_replace_range = true;
+        auto drop_range_info = MergeTreePartInfo::fromPartName(*drop_range, queue.format_version);
+        [[maybe_unused]] bool inserted = queue.currently_executing_drop_replace_ranges.emplace(drop_range_info).second;
+        assert(inserted);
     }
     entry->currently_executing = true;
     ++entry->num_tries;
@@ -1497,10 +1509,11 @@ ReplicatedMergeTreeQueue::CurrentlyExecuting::~CurrentlyExecuting()
 {
     std::lock_guard lock(queue.state_mutex);
 
-    if (entry->type == ReplicatedMergeTreeLogEntry::DROP_RANGE || entry->type == ReplicatedMergeTreeLogEntry::REPLACE_RANGE)
+    if (auto drop_range = entry->getDropRange(queue.format_version))
     {
-        assert(queue.currently_executing_drop_or_replace_range);
-        queue.currently_executing_drop_or_replace_range = false;
+        auto drop_range_info = MergeTreePartInfo::fromPartName(*drop_range, queue.format_version);
+        [[maybe_unused]] bool removed = queue.currently_executing_drop_replace_ranges.erase(drop_range_info);
+        assert(removed);
     }
     entry->currently_executing = false;
     entry->execution_complete.notify_all();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index f4cae7152ef..e8362e5cc6b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -96,7 +96,7 @@ private:
     FuturePartsSet future_parts;
 
     /// Avoid parallel execution of queue enties, which may remove other entries from the queue.
-    bool currently_executing_drop_or_replace_range = false;
+    std::set<MergeTreePartInfo> currently_executing_drop_replace_ranges;
 
     /** What will be the set of active parts after executing all log entries up to log_pointer.
       * Used to determine which merges can be assigned (see ReplicatedMergeTreeMergePredicate)
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index dfb5eb0bd69..11f668bafbe 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -151,13 +151,13 @@ bool ReplicatedMergeTreeRestartingThread::runImpl()
     setNotReadonly();
 
     /// Start queue processing
-    storage.part_check_thread.start();
     storage.background_operations_assignee.start();
     storage.queue_updating_task->activateAndSchedule();
     storage.mutations_updating_task->activateAndSchedule();
     storage.mutations_finalizing_task->activateAndSchedule();
     storage.merge_selecting_task->activateAndSchedule();
     storage.cleanup_thread.start();
+    storage.part_check_thread.start();
 
     return true;
 }
@@ -356,6 +356,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown(bool part_of_full_shut
     storage.mutations_finalizing_task->deactivate();
 
     storage.cleanup_thread.stop();
+    storage.part_check_thread.stop();
 
     /// Stop queue processing
     {
@@ -365,9 +366,6 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown(bool part_of_full_shut
         storage.background_operations_assignee.finish();
     }
 
-    /// Stop part_check_thread after queue processing, because some queue tasks may restart part_check_thread
-    storage.part_check_thread.stop();
-
     LOG_TRACE(log, "Threads finished");
 }
 
diff --git a/src/Storages/MergeTree/TemporaryParts.cpp b/src/Storages/MergeTree/TemporaryParts.cpp
index 4239c8232e5..b868531a72e 100644
--- a/src/Storages/MergeTree/TemporaryParts.cpp
+++ b/src/Storages/MergeTree/TemporaryParts.cpp
@@ -1,24 +1,34 @@
 #include <Storages/MergeTree/TemporaryParts.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 bool TemporaryParts::contains(const std::string & basename) const
 {
     std::lock_guard lock(mutex);
     return parts.contains(basename);
 }
 
-void TemporaryParts::add(std::string basename)
+void TemporaryParts::add(const std::string & basename)
 {
     std::lock_guard lock(mutex);
-    parts.emplace(std::move(basename));
+    bool inserted = parts.emplace(basename).second;
+    if (!inserted)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary part {} already added", basename);
 }
 
 void TemporaryParts::remove(const std::string & basename)
 {
     std::lock_guard lock(mutex);
-    parts.erase(basename);
+    bool removed = parts.erase(basename);
+    if (!removed)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Temporary part {} does not exist", basename);
 }
 
 }
diff --git a/src/Storages/MergeTree/TemporaryParts.h b/src/Storages/MergeTree/TemporaryParts.h
index bc9d270856f..49615f4800f 100644
--- a/src/Storages/MergeTree/TemporaryParts.h
+++ b/src/Storages/MergeTree/TemporaryParts.h
@@ -18,6 +18,10 @@ private:
     /// NOTE: It is pretty short, so use STL is fine.
     std::unordered_set<std::string> parts;
 
+    void add(const std::string & basename);
+    void remove(const std::string & basename);
+
+    friend class MergeTreeData;
 public:
     /// Returns true if passed part name is active.
     /// (is the destination for one of active mutation/merge).
@@ -25,9 +29,6 @@ public:
     /// NOTE: that it accept basename (i.e. dirname), not the path,
     /// since later requires canonical form.
     bool contains(const std::string & basename) const;
-
-    void add(std::string basename);
-    void remove(const std::string & basename);
 };
 
 }
diff --git a/src/Storages/NATS/NATSConnection.cpp b/src/Storages/NATS/NATSConnection.cpp
index 359754bb144..64beb9f2dff 100644
--- a/src/Storages/NATS/NATSConnection.cpp
+++ b/src/Storages/NATS/NATSConnection.cpp
@@ -9,7 +9,6 @@
 namespace DB
 {
 
-//static const auto CONNECT_SLEEP = 200;
 static const auto RETRIES_MAX = 20;
 static const auto CONNECTED_TO_BUFFER_SIZE = 256;
 
@@ -19,6 +18,10 @@ NATSConnectionManager::NATSConnectionManager(const NATSConfiguration & configura
     , log(log_)
     , event_handler(loop.getLoop(), log)
 {
+    const char * val = std::getenv("CLICKHOUSE_NATS_TLS_SECURE");
+    std::string tls_secure = val == nullptr ? std::string("1") : std::string(val);
+    if (tls_secure == "0")
+        skip_verification = true;
 }
 
 
@@ -92,6 +95,9 @@ void NATSConnectionManager::connectImpl()
     if (configuration.secure)
     {
         natsOptions_SetSecure(options, true);
+    }
+    if (skip_verification)
+    {
         natsOptions_SkipServerVerification(options, true);
     }
     if (!configuration.url.empty())
diff --git a/src/Storages/NATS/NATSConnection.h b/src/Storages/NATS/NATSConnection.h
index 78a273164db..c699f859446 100644
--- a/src/Storages/NATS/NATSConnection.h
+++ b/src/Storages/NATS/NATSConnection.h
@@ -65,6 +65,9 @@ private:
     // true if at any point successfully connected to NATS
     bool has_connection = false;
 
+    // use CLICKHOUSE_NATS_TLS_SECURE=0 env var to skip TLS verification of server cert
+    bool skip_verification = false;
+
     std::mutex mutex;
 };
 
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index 0f24aecf72a..969577fdf3f 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -286,7 +286,9 @@ Block ProjectionDescription::calculate(const Block & block, ContextPtr context)
                                                                        : QueryProcessingStage::WithMergeableState})
                        .buildQueryPipeline();
     builder.resize(1);
-    builder.addTransform(std::make_shared<SquashingChunksTransform>(builder.getHeader(), block.rows(), block.bytes()));
+    // Generate aggregated blocks with rows less or equal than the original block.
+    // There should be only one output block after this transformation.
+    builder.addTransform(std::make_shared<SquashingChunksTransform>(builder.getHeader(), block.rows(), 0));
 
     auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
     PullingPipelineExecutor executor(pipeline);
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index fd943fbe1c5..24a2db33dcf 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -3,29 +3,17 @@
 
 #include <DataTypes/DataTypesNumber.h>
 
-#include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/KVStorageUtils.h>
 
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTCreateQuery.h>
 
-#include <IO/WriteBufferFromString.h>
-#include <IO/ReadBufferFromString.h>
-
 #include <QueryPipeline/Pipe.h>
 #include <Processors/ISource.h>
 
 #include <Interpreters/castColumn.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Set.h>
-#include <Interpreters/PreparedSets.h>
 #include <Interpreters/TreeRewriter.h>
-#include <Interpreters/convertFieldToType.h>
 
 #include <Poco/Logger.h>
 #include <Poco/Util/AbstractConfiguration.h>
@@ -74,176 +62,6 @@ static RocksDBOptions getOptionsFromConfig(const Poco::Util::AbstractConfigurati
     return options;
 }
 
-// returns keys may be filter by condition
-static bool traverseASTFilter(
-    const String & primary_key, const DataTypePtr & primary_key_type, const ASTPtr & elem, const PreparedSets & sets, FieldVectorPtr & res)
-{
-    const auto * function = elem->as<ASTFunction>();
-    if (!function)
-        return false;
-
-    if (function->name == "and")
-    {
-        // one child has the key filter condition is ok
-        for (const auto & child : function->arguments->children)
-            if (traverseASTFilter(primary_key, primary_key_type, child, sets, res))
-                return true;
-        return false;
-    }
-    else if (function->name == "or")
-    {
-        // make sure every child has the key filter condition
-        for (const auto & child : function->arguments->children)
-            if (!traverseASTFilter(primary_key, primary_key_type, child, sets, res))
-                return false;
-        return true;
-    }
-    else if (function->name == "equals" || function->name == "in")
-    {
-        const auto & args = function->arguments->as<ASTExpressionList &>();
-        const ASTIdentifier * ident;
-        const IAST * value;
-
-        if (args.children.size() != 2)
-            return false;
-
-        if (function->name == "in")
-        {
-            ident = args.children.at(0)->as<ASTIdentifier>();
-            if (!ident)
-                return false;
-
-            if (ident->name() != primary_key)
-                return false;
-            value = args.children.at(1).get();
-
-            PreparedSetKey set_key;
-            if ((value->as<ASTSubquery>() || value->as<ASTIdentifier>()))
-                set_key = PreparedSetKey::forSubquery(*value);
-            else
-                set_key = PreparedSetKey::forLiteral(*value, {primary_key_type});
-
-            auto set_it = sets.find(set_key);
-            if (set_it == sets.end())
-                return false;
-            SetPtr prepared_set = set_it->second;
-
-            if (!prepared_set->hasExplicitSetElements())
-                return false;
-
-            prepared_set->checkColumnsNumber(1);
-            const auto & set_column = *prepared_set->getSetElements()[0];
-            for (size_t row = 0; row < set_column.size(); ++row)
-                res->push_back(set_column[row]);
-            return true;
-        }
-        else
-        {
-            if ((ident = args.children.at(0)->as<ASTIdentifier>()))
-                value = args.children.at(1).get();
-            else if ((ident = args.children.at(1)->as<ASTIdentifier>()))
-                value = args.children.at(0).get();
-            else
-                return false;
-
-            if (ident->name() != primary_key)
-                return false;
-
-            /// function->name == "equals"
-            if (const auto * literal = value->as<ASTLiteral>())
-            {
-                auto converted_field = convertFieldToType(literal->value, *primary_key_type);
-                if (!converted_field.isNull())
-                    res->push_back(converted_field);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-/** Retrieve from the query a condition of the form `key = 'key'`, `key in ('xxx_'), from conjunctions in the WHERE clause.
-  * TODO support key like search
-  */
-static std::pair<FieldVectorPtr, bool> getFilterKeys(
-    const String & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info)
-{
-    const auto & select = query_info.query->as<ASTSelectQuery &>();
-    if (!select.where())
-        return {{}, true};
-
-    FieldVectorPtr res = std::make_shared<FieldVector>();
-    auto matched_keys = traverseASTFilter(primary_key, primary_key_type, select.where(), query_info.sets, res);
-    return std::make_pair(res, !matched_keys);
-}
-
-template <typename K, typename V>
-static void fillColumns(const K & key, const V & value, size_t key_pos, const Block & header, MutableColumns & columns)
-{
-    ReadBufferFromString key_buffer(key);
-    ReadBufferFromString value_buffer(value);
-    for (size_t i = 0; i < header.columns(); ++i)
-    {
-        const auto & serialization = header.getByPosition(i).type->getDefaultSerialization();
-        serialization->deserializeBinary(*columns[i], i == key_pos ? key_buffer : value_buffer);
-    }
-}
-
-static std::vector<std::string> serializeKeysToRawString(
-    FieldVector::const_iterator & it,
-    FieldVector::const_iterator end,
-    DataTypePtr key_column_type,
-    size_t max_block_size)
-{
-    size_t num_keys = end - it;
-
-    std::vector<std::string> result;
-    result.reserve(num_keys);
-
-    size_t rows_processed = 0;
-    while (it < end && (max_block_size == 0 || rows_processed < max_block_size))
-    {
-        std::string & serialized_key = result.emplace_back();
-        WriteBufferFromString wb(serialized_key);
-        key_column_type->getDefaultSerialization()->serializeBinary(*it, wb);
-        wb.finalize();
-
-        ++it;
-        ++rows_processed;
-    }
-    return result;
-}
-
-static std::vector<std::string> serializeKeysToRawString(const ColumnWithTypeAndName & keys)
-{
-    if (!keys.column)
-        return {};
-
-    size_t num_keys = keys.column->size();
-    std::vector<std::string> result;
-    result.reserve(num_keys);
-
-    for (size_t i = 0; i < num_keys; ++i)
-    {
-        std::string & serialized_key = result.emplace_back();
-        WriteBufferFromString wb(serialized_key);
-        Field field;
-        keys.column->get(i, field);
-        /// TODO(@vdimir): use serializeBinaryBulk
-        keys.type->getDefaultSerialization()->serializeBinary(field, wb);
-        wb.finalize();
-    }
-    return result;
-}
-
-/// In current implementation rocks db can have key with only one column.
-static size_t getPrimaryKeyPos(const Block & header, const Names & primary_key)
-{
-    if (primary_key.size() != 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "RocksDB: only one primary key is supported");
-    return header.getPositionByName(primary_key[0]);
-}
-
 class EmbeddedRocksDBSource : public ISource
 {
 public:
@@ -347,7 +165,7 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
         bool attach,
         ContextPtr context_,
         const String & primary_key_)
-    : IKeyValueStorage(table_id_)
+    : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
     , primary_key{primary_key_}
 {
@@ -461,7 +279,7 @@ Pipe StorageEmbeddedRocksDB::read(
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
-        ContextPtr /*context*/,
+        ContextPtr context_,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
         unsigned num_streams)
@@ -473,7 +291,7 @@ Pipe StorageEmbeddedRocksDB::read(
 
     Block sample_block = storage_snapshot->metadata->getSampleBlock();
     auto primary_key_data_type = sample_block.getByName(primary_key).type;
-    std::tie(keys, all_scan) = getFilterKeys(primary_key, primary_key_data_type, query_info);
+    std::tie(keys, all_scan) = getFilterKeys(primary_key, primary_key_data_type, query_info, context_);
     if (all_scan)
     {
         auto iterator = std::unique_ptr<rocksdb::Iterator>(rocksdb_ptr->NewIterator(rocksdb::ReadOptions()));
@@ -556,7 +374,8 @@ std::vector<rocksdb::Status> StorageEmbeddedRocksDB::multiGet(const std::vector<
 
 Chunk StorageEmbeddedRocksDB::getByKeys(
     const ColumnsWithTypeAndName & keys,
-    PaddedPODArray<UInt8> & null_map) const
+    PaddedPODArray<UInt8> & null_map,
+    const Names &) const
 {
     if (keys.size() != 1)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "StorageEmbeddedRocksDB supports only one key, got: {}", keys.size());
@@ -569,6 +388,12 @@ Chunk StorageEmbeddedRocksDB::getByKeys(
     return getBySerializedKeys(raw_keys, &null_map);
 }
 
+Block StorageEmbeddedRocksDB::getSampleBlock(const Names &) const
+{
+    auto metadata = getInMemoryMetadataPtr();
+    return metadata ? metadata->getSampleBlock() : Block();
+}
+
 Chunk StorageEmbeddedRocksDB::getBySerializedKeys(
     const std::vector<std::string> & keys,
     PaddedPODArray<UInt8> * null_map) const
@@ -586,7 +411,6 @@ Chunk StorageEmbeddedRocksDB::getBySerializedKeys(
     for (const auto & key : keys)
         slices_keys.emplace_back(key);
 
-
     auto statuses = multiGet(slices_keys, values);
     if (null_map)
     {
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index 62c9a0eeae7..55770516b3f 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <shared_mutex>
 #include <Storages/IStorage.h>
-#include <Storages/IKVStorage.h>
+#include <Interpreters/IKeyValueEntity.h>
 #include <rocksdb/status.h>
 
 
@@ -23,7 +23,7 @@ class Context;
 /// Operates with rocksdb data structures via rocksdb API (holds pointer to rocksdb::DB inside for that).
 /// Storage have one primary key.
 /// Values are serialized into raw strings to store in rocksdb.
-class StorageEmbeddedRocksDB final : public IKeyValueStorage, WithContext
+class StorageEmbeddedRocksDB final : public IStorage, public IKeyValueEntity, WithContext
 {
     friend class EmbeddedRocksDBSink;
 public:
@@ -63,7 +63,9 @@ public:
     std::vector<rocksdb::Status> multiGet(const std::vector<rocksdb::Slice> & slices_keys, std::vector<String> & values) const;
     Names getPrimaryKey() const override { return {primary_key}; }
 
-    Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map) const override;
+    Chunk getByKeys(const ColumnsWithTypeAndName & keys, PaddedPODArray<UInt8> & null_map, const Names &) const override;
+
+    Block getSampleBlock(const Names &) const override;
 
     /// Return chunk with data for given serialized keys.
     /// If out_null_map is passed, fill it with 1/0 depending on key was/wasn't found. Result chunk may contain default values.
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index 5046a0b6fe0..758e4736fc1 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Interpreters/PreparedSets.h>
-#include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Core/SortDescription.h>
 #include <Core/Names.h>
@@ -44,9 +43,6 @@ using ClusterPtr = std::shared_ptr<Cluster>;
 struct MergeTreeDataSelectAnalysisResult;
 using MergeTreeDataSelectAnalysisResultPtr = std::shared_ptr<MergeTreeDataSelectAnalysisResult>;
 
-struct SubqueryForSet;
-using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
-
 struct PrewhereInfo
 {
     /// Actions for row level security filter. Applied separately before prewhere_actions.
@@ -64,6 +60,24 @@ struct PrewhereInfo
             : prewhere_actions(std::move(prewhere_actions_)), prewhere_column_name(std::move(prewhere_column_name_)) {}
 
     std::string dump() const;
+
+    PrewhereInfoPtr clone() const
+    {
+        PrewhereInfoPtr prewhere_info = std::make_shared<PrewhereInfo>();
+
+        if (row_level_filter)
+            prewhere_info->row_level_filter = row_level_filter->clone();
+
+        if (prewhere_actions)
+            prewhere_info->prewhere_actions = prewhere_actions->clone();
+
+        prewhere_info->row_level_column_name = row_level_column_name;
+        prewhere_info->prewhere_column_name = prewhere_column_name;
+        prewhere_info->remove_prewhere_column = remove_prewhere_column;
+        prewhere_info->need_filter = need_filter;
+
+        return prewhere_info;
+    }
 };
 
 /// Helper struct to store all the information about the filter expression.
@@ -136,8 +150,13 @@ struct ProjectionCandidate
   *  that can be used during query processing
   *  inside storage engines.
   */
-struct SelectQueryInfoBase
+struct SelectQueryInfo
 {
+
+    SelectQueryInfo()
+        : prepared_sets(std::make_shared<PreparedSets>())
+    {}
+
     ASTPtr query;
     ASTPtr view_query; /// Optimized VIEW query
     ASTPtr original_query; /// Unmodified query for projection analysis
@@ -154,22 +173,25 @@ struct SelectQueryInfoBase
 
     TreeRewriterResultPtr syntax_analyzer_result;
 
-    PrewhereInfoPtr prewhere_info;
-
     /// This is an additional filer applied to current table.
-    /// It is needed only for additional PK filtering.
     ASTPtr additional_filter_ast;
 
+    /// It is needed for PK analysis based on row_level_policy and additional_filters.
+    ASTs filter_asts;
+
     ReadInOrderOptimizerPtr order_optimizer;
     /// Can be modified while reading from storage
     InputOrderInfoPtr input_order_info;
 
     /// Prepared sets are used for indices by storage engine.
     /// Example: x IN (1, 2, 3)
-    PreparedSets sets;
+    PreparedSetsPtr prepared_sets;
 
-    /// Cached value of ExpressionAnalysisResult::has_window
+    /// Cached value of ExpressionAnalysisResult
     bool has_window = false;
+    bool has_order_by = false;
+    bool need_aggregate = false;
+    PrewhereInfoPtr prewhere_info;
 
     ClusterPtr getCluster() const { return !optimized_cluster ? cluster : optimized_cluster; }
 
@@ -181,16 +203,10 @@ struct SelectQueryInfoBase
     bool settings_limit_offset_done = false;
     Block minmax_count_projection_block;
     MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr;
+
+    InputOrderInfoPtr getInputOrderInfo() const
+    {
+        return input_order_info ? input_order_info : (projection ? projection->input_order_info : nullptr);
+    }
 };
-
-/// Contains non-copyable stuff
-struct SelectQueryInfo : SelectQueryInfoBase
-{
-    SelectQueryInfo() = default;
-    SelectQueryInfo(const SelectQueryInfo & other) : SelectQueryInfoBase(other) {}
-
-    /// Make subquery_for_sets reusable across different interpreters.
-    SubqueriesForSets subquery_for_sets;
-};
-
 }
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index b3ea2cb9f5b..cc55b2ae271 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -59,6 +59,8 @@
 #include <TableFunctions/TableFunctionView.h>
 #include <TableFunctions/TableFunctionFactory.h>
 
+#include <Storages/IStorageCluster.h>
+
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -759,55 +761,35 @@ SinkToStoragePtr StorageDistributed::write(const ASTPtr &, const StorageMetadata
 }
 
 
-std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+std::optional<QueryPipeline> StorageDistributed::distributedWriteBetweenDistributedTables(const StorageDistributed & src_distributed, const ASTInsertQuery & query, ContextPtr local_context) const
 {
-    QueryPipeline pipeline;
-
-    const Settings & settings = local_context->getSettingsRef();
-    if (settings.max_distributed_depth && local_context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
-        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
-
-    std::shared_ptr<StorageDistributed> storage_src;
-    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+    const auto & settings = local_context->getSettingsRef();
     auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
-    if (select.list_of_selects->children.size() == 1)
+
+    /// Unwrap view() function.
+    if (src_distributed.remote_table_function_ptr)
     {
-        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
-        {
-            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+        const TableFunctionPtr src_table_function =
+            TableFunctionFactory::instance().get(src_distributed.remote_table_function_ptr, local_context);
+        const TableFunctionView * view_function =
+            assert_cast<const TableFunctionView *>(src_table_function.get());
+        new_query->select = view_function->getSelectQuery().clone();
+    }
+    else
+    {
+        const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
+        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
 
-            if (joined_tables.tablesCount() == 1)
-            {
-                storage_src = std::dynamic_pointer_cast<StorageDistributed>(joined_tables.getLeftTableStorage());
-                if (storage_src)
-                {
-                    /// Unwrap view() function.
-                    if (storage_src->remote_table_function_ptr)
-                    {
-                        const TableFunctionPtr src_table_function =
-                            TableFunctionFactory::instance().get(storage_src->remote_table_function_ptr, local_context);
-                        const TableFunctionView * view_function =
-                            assert_cast<const TableFunctionView *>(src_table_function.get());
-                        new_query->select = view_function->getSelectQuery().clone();
-                    }
-                    else
-                    {
-                        const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
-                        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
+        auto * select = query.select->as<ASTSelectWithUnionQuery &>().list_of_selects->children.at(0)->as<ASTSelectQuery>();
+        auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select->clone());
+        select_with_union_query->list_of_selects->children.push_back(new_select_query);
 
-                        auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select_query->clone());
-                        select_with_union_query->list_of_selects->children.push_back(new_select_query);
+        new_select_query->replaceDatabaseAndTable(src_distributed.getRemoteDatabaseName(), src_distributed.getRemoteTableName());
 
-                        new_select_query->replaceDatabaseAndTable(storage_src->getRemoteDatabaseName(), storage_src->getRemoteTableName());
-
-                        new_query->select = select_with_union_query;
-                    }
-                }
-            }
-        }
+        new_query->select = select_with_union_query;
     }
 
-    const Cluster::AddressesWithFailover & src_addresses = storage_src ? storage_src->getCluster()->getShardsAddresses() : Cluster::AddressesWithFailover{};
+    const Cluster::AddressesWithFailover & src_addresses = src_distributed.getCluster()->getShardsAddresses();
     const Cluster::AddressesWithFailover & dst_addresses = getCluster()->getShardsAddresses();
     /// Compare addresses instead of cluster name, to handle remote()/cluster().
     /// (since for remote()/cluster() the getClusterName() is empty string)
@@ -822,7 +804,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
             LOG_WARNING(log,
                 "Parallel distributed INSERT SELECT is not possible "
                 "(source cluster={} ({} addresses), destination cluster={} ({} addresses))",
-                storage_src ? storage_src->getClusterName() : "<not a Distributed table>",
+                src_distributed.getClusterName(),
                 src_addresses.size(),
                 getClusterName(),
                 dst_addresses.size());
@@ -849,6 +831,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
         new_query_str = buf.str();
     }
 
+    QueryPipeline pipeline;
     ContextMutablePtr query_context = Context::createCopy(local_context);
     ++query_context->getClientInfo().distributed_depth;
 
@@ -882,6 +865,114 @@ std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInser
 }
 
 
+std::optional<QueryPipeline> StorageDistributed::distributedWriteFromClusterStorage(const IStorageCluster & src_storage_cluster, const ASTInsertQuery & query, ContextPtr local_context) const
+{
+    const auto & settings = local_context->getSettingsRef();
+    auto extension = src_storage_cluster.getTaskIteratorExtension(local_context);
+
+    auto dst_cluster = getCluster();
+
+    auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
+    if (settings.parallel_distributed_insert_select == PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL)
+    {
+        new_query->table_id = StorageID(getRemoteDatabaseName(), getRemoteTableName());
+        /// Reset table function for INSERT INTO remote()/cluster()
+        new_query->table_function.reset();
+    }
+
+    String new_query_str;
+    {
+        WriteBufferFromOwnString buf;
+        IAST::FormatSettings ast_format_settings(buf, /*one_line*/ true);
+        ast_format_settings.always_quote_identifiers = true;
+        new_query->IAST::format(ast_format_settings);
+        new_query_str = buf.str();
+    }
+
+    QueryPipeline pipeline;
+    ContextMutablePtr query_context = Context::createCopy(local_context);
+    ++query_context->getClientInfo().distributed_depth;
+
+    /// Here we take addresses from destination cluster and assume source table exists on these nodes
+    for (const auto & replicas : getCluster()->getShardsAddresses())
+    {
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & node : replicas)
+        {
+            auto connection = std::make_shared<Connection>(
+                node.host_name, node.port, query_context->getGlobalContext()->getCurrentDatabase(),
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
+                "ParallelInsertSelectInititiator",
+                node.compression,
+                node.secure
+            );
+
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                connection,
+                new_query_str,
+                Block{},
+                query_context,
+                /*throttler=*/nullptr,
+                Scalars{},
+                Tables{},
+                QueryProcessingStage::Complete,
+                extension);
+
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+            remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
+
+            pipeline.addCompletedPipeline(std::move(remote_pipeline));
+        }
+    }
+
+    return pipeline;
+}
+
+
+std::optional<QueryPipeline> StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+{
+    const Settings & settings = local_context->getSettingsRef();
+    if (settings.max_distributed_depth && local_context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
+
+    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+
+    StoragePtr src_storage;
+
+    if (select.list_of_selects->children.size() == 1)
+    {
+        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
+        {
+            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+
+            if (joined_tables.tablesCount() == 1)
+            {
+                src_storage = joined_tables.getLeftTableStorage();
+            }
+        }
+    }
+
+    if (!src_storage)
+        return {};
+
+    if (auto src_distributed = std::dynamic_pointer_cast<StorageDistributed>(src_storage))
+    {
+        return distributedWriteBetweenDistributedTables(*src_distributed, query, local_context);
+    }
+    else if (auto src_storage_cluster = std::dynamic_pointer_cast<IStorageCluster>(src_storage))
+    {
+        return distributedWriteFromClusterStorage(*src_storage_cluster, query, local_context);
+    }
+    else if (local_context->getClientInfo().distributed_depth == 0)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parallel distributed INSERT SELECT is not possible. "\
+            "Reason: distributed reading is supported only from Distributed engine or *Cluster table functions, but got {} storage", src_storage->getName());
+    }
+
+    return {};
+}
+
+
 void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
     auto name_deps = getDependentViewsByColumn(local_context);
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 7cb25ae46ab..3161f4b50f6 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
 #include <Storages/Distributed/DistributedSettings.h>
 #include <Storages/getStructureOfRemoteTable.h>
@@ -207,6 +208,9 @@ private:
 
     void delayInsertOrThrowIfNeeded() const;
 
+    std::optional<QueryPipeline> distributedWriteFromClusterStorage(const IStorageCluster & src_storage_cluster, const ASTInsertQuery & query, ContextPtr context) const;
+    std::optional<QueryPipeline> distributedWriteBetweenDistributedTables(const StorageDistributed & src_distributed, const ASTInsertQuery & query, ContextPtr context) const;
+
     String remote_database;
     String remote_table;
     ASTPtr remote_table_function_ptr;
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index d138104018a..f4cf1fe5c58 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -264,7 +264,7 @@ ColumnsDescription StorageFile::getTableStructureFromFileDescriptor(ContextPtr c
     /// in case of file descriptor we have a stream of data and we cannot
     /// start reading data from the beginning after reading some data for
     /// schema inference.
-    ReadBufferIterator read_buffer_iterator = [&]()
+    ReadBufferIterator read_buffer_iterator = [&](ColumnsDescription &)
     {
         /// We will use PeekableReadBuffer to create a checkpoint, so we need a place
         /// where we can store the original read buffer.
@@ -308,7 +308,11 @@ ColumnsDescription StorageFile::getTableStructureFromFile(
             "table structure manually",
             format);
 
-    ReadBufferIterator read_buffer_iterator = [&, it = paths.begin()]() mutable -> std::unique_ptr<ReadBuffer>
+    std::optional<ColumnsDescription> columns_from_cache;
+    if (context->getSettingsRef().schema_inference_use_cache_for_file)
+        columns_from_cache = tryGetColumnsFromCache(paths, format, format_settings, context);
+
+    ReadBufferIterator read_buffer_iterator = [&, it = paths.begin()](ColumnsDescription &) mutable -> std::unique_ptr<ReadBuffer>
     {
         if (it == paths.end())
             return nullptr;
@@ -316,7 +320,16 @@ ColumnsDescription StorageFile::getTableStructureFromFile(
         return createReadBuffer(*it++, false, "File", -1, compression_method, context);
     };
 
-    return readSchemaFromFormat(format, format_settings, read_buffer_iterator, paths.size() > 1, context);
+    ColumnsDescription columns;
+    if (columns_from_cache)
+        columns = *columns_from_cache;
+    else
+        columns = readSchemaFromFormat(format, format_settings, read_buffer_iterator, paths.size() > 1, context);
+
+    if (context->getSettingsRef().schema_inference_use_cache_for_file)
+        addColumnsToCache(paths, columns, format, format_settings, context);
+
+    return columns;
 }
 
 bool StorageFile::supportsSubsetOfColumns() const
@@ -444,36 +457,24 @@ public:
 
     using FilesInfoPtr = std::shared_ptr<FilesInfo>;
 
-    static Block getHeader(const StorageMetadataPtr & metadata_snapshot, bool need_path_column, bool need_file_column)
+    static Block getBlockForSource(const Block & block_for_format, const FilesInfoPtr & files_info)
     {
-        auto header = metadata_snapshot->getSampleBlock();
-
-        /// Note: AddingDefaultsTransform doesn't change header.
-
-        if (need_path_column)
-            header.insert(
+        auto res = block_for_format;
+        if (files_info->need_path_column)
+        {
+            res.insert(
                 {DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn(),
                  std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
                  "_path"});
-        if (need_file_column)
-            header.insert(
+        }
+        if (files_info->need_file_column)
+        {
+            res.insert(
                 {DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn(),
                  std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
                  "_file"});
-
-        return header;
-    }
-
-    static Block getBlockForSource(
-        const StorageFilePtr & storage,
-        const StorageSnapshotPtr & storage_snapshot,
-        const ColumnsDescription & columns_description,
-        const FilesInfoPtr & files_info)
-    {
-        if (storage->supportsSubsetOfColumns())
-            return storage_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
-        else
-            return getHeader(storage_snapshot->metadata, files_info->need_path_column, files_info->need_file_column);
+        }
+        return res;
     }
 
     StorageFileSource(
@@ -483,13 +484,15 @@ public:
         UInt64 max_block_size_,
         FilesInfoPtr files_info_,
         ColumnsDescription columns_description_,
+        const Block & block_for_format_,
         std::unique_ptr<ReadBuffer> read_buf_)
-        : ISource(getBlockForSource(storage_, storage_snapshot_, columns_description_, files_info_))
+        : ISource(getBlockForSource(block_for_format_, files_info_))
         , storage(std::move(storage_))
         , storage_snapshot(storage_snapshot_)
         , files_info(std::move(files_info_))
         , read_buf(std::move(read_buf_))
         , columns_description(std::move(columns_description_))
+        , block_for_format(block_for_format_)
         , context(context_)
         , max_block_size(max_block_size_)
     {
@@ -533,15 +536,8 @@ public:
                 if (!read_buf)
                     read_buf = createReadBuffer(current_path, storage->use_table_fd, storage->getName(), storage->table_fd, storage->compression_method, context);
 
-                auto get_block_for_format = [&]() -> Block
-                {
-                    if (storage->supportsSubsetOfColumns())
-                        return storage_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
-                    return storage_snapshot->metadata->getSampleBlock();
-                };
-
-                auto format = context->getInputFormat(
-                    storage->format_name, *read_buf, get_block_for_format(), max_block_size, storage->format_settings);
+                auto format
+                    = context->getInputFormat(storage->format_name, *read_buf, block_for_format, max_block_size, storage->format_settings);
 
                 QueryPipelineBuilder builder;
                 builder.init(Pipe(format));
@@ -627,6 +623,7 @@ private:
     std::unique_ptr<PullingPipelineExecutor> reader;
 
     ColumnsDescription columns_description;
+    Block block_for_format;
 
     ContextPtr context;    /// TODO Untangle potential issues with context lifetime.
     UInt64 max_block_size;
@@ -693,13 +690,30 @@ Pipe StorageFile::read(
 
     for (size_t i = 0; i < num_streams; ++i)
     {
-        const auto get_columns_for_format = [&]() -> ColumnsDescription
+        ColumnsDescription columns_description;
+        Block block_for_format;
+        if (supportsSubsetOfColumns())
         {
-            if (supportsSubsetOfColumns())
-                return storage_snapshot->getDescriptionForColumns(column_names);
-            else
-                return storage_snapshot->metadata->getColumns();
-        };
+            auto fetch_columns = column_names;
+            const auto & virtuals = getVirtuals();
+            std::erase_if(
+                fetch_columns,
+                [&](const String & col)
+                {
+                    return std::any_of(
+                        virtuals.begin(), virtuals.end(), [&](const NameAndTypePair & virtual_col) { return col == virtual_col.name; });
+                });
+
+            if (fetch_columns.empty())
+                fetch_columns.push_back(ExpressionActions::getSmallestColumn(storage_snapshot->metadata->getColumns().getAllPhysical()));
+            columns_description = storage_snapshot->getDescriptionForColumns(fetch_columns);
+        }
+        else
+        {
+            columns_description = storage_snapshot->metadata->getColumns();
+        }
+
+        block_for_format = storage_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
 
         /// In case of reading from fd we have to check whether we have already created
         /// the read buffer from it in Storage constructor (for schema inference) or not.
@@ -710,7 +724,14 @@ Pipe StorageFile::read(
             read_buffer = std::move(peekable_read_buffer_from_fd);
 
         pipes.emplace_back(std::make_shared<StorageFileSource>(
-            this_ptr, storage_snapshot, context, max_block_size, files_info, get_columns_for_format(), std::move(read_buffer)));
+            this_ptr,
+            storage_snapshot,
+            context,
+            max_block_size,
+            files_info,
+            columns_description,
+            block_for_format,
+            std::move(read_buffer)));
     }
 
     return Pipe::unitePipes(std::move(pipes));
@@ -810,18 +831,37 @@ public:
 
     void consume(Chunk chunk) override
     {
+        std::lock_guard cancel_lock(cancel_mutex);
+        if (cancelled)
+            return;
         writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
+    void onCancel() override
+    {
+        std::lock_guard cancel_lock(cancel_mutex);
+        finalize();
+        cancelled = true;
+    }
+
     void onException() override
     {
-        if (!writer)
-            return;
-        onFinish();
+        std::lock_guard cancel_lock(cancel_mutex);
+        finalize();
     }
 
     void onFinish() override
     {
+        std::lock_guard cancel_lock(cancel_mutex);
+        finalize();
+    }
+
+private:
+    void finalize()
+    {
+        if (!writer)
+            return;
+
         try
         {
             writer->finalize();
@@ -836,7 +876,6 @@ public:
         }
     }
 
-private:
     StorageMetadataPtr metadata_snapshot;
     String table_name_for_log;
 
@@ -854,6 +893,9 @@ private:
     ContextPtr context;
     int flags;
     std::unique_lock<std::shared_timed_mutex> lock;
+
+    std::mutex cancel_mutex;
+    bool cancelled = false;
 };
 
 class PartitionedStorageFileSink : public PartitionedSink
@@ -1192,4 +1234,48 @@ NamesAndTypesList StorageFile::getVirtuals() const
         {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
         {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
 }
+
+SchemaCache & StorageFile::getSchemaCache(const ContextPtr & context)
+{
+    static SchemaCache schema_cache(context->getConfigRef().getUInt("schema_inference_cache_max_elements_for_file", DEFAULT_SCHEMA_CACHE_ELEMENTS));
+    return schema_cache;
+}
+
+std::optional<ColumnsDescription> StorageFile::tryGetColumnsFromCache(
+    const Strings & paths, const String & format_name, const std::optional<FormatSettings> & format_settings, ContextPtr context)
+{
+    /// Check if the cache contains one of the paths.
+    auto & schema_cache = getSchemaCache(context);
+    struct stat file_stat{};
+    for (const auto & path : paths)
+    {
+        auto get_last_mod_time = [&]() -> std::optional<time_t>
+        {
+            if (0 != stat(path.c_str(), &file_stat))
+                return std::nullopt;
+
+            return file_stat.st_mtime;
+        };
+
+        String cache_key = getKeyForSchemaCache(path, format_name, format_settings, context);
+        auto columns = schema_cache.tryGet(cache_key, get_last_mod_time);
+        if (columns)
+            return columns;
+    }
+
+    return std::nullopt;
+}
+
+void StorageFile::addColumnsToCache(
+    const Strings & paths,
+    const ColumnsDescription & columns,
+    const String & format_name,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context)
+{
+    auto & schema_cache = getSchemaCache(context);
+    Strings cache_keys = getKeysForSchemaCache(paths, format_name, format_settings, context);
+    schema_cache.addMany(cache_keys, columns);
+}
+
 }
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index f47f6172c1c..e60e5f6b371 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
+#include <Storages/Cache/SchemaCache.h>
 
 #include <Common/logger_useful.h>
 
@@ -86,6 +87,8 @@ public:
         const std::optional<FormatSettings> & format_settings,
         ContextPtr context);
 
+    static SchemaCache & getSchemaCache(const ContextPtr & context);
+
 protected:
     friend class StorageFileSource;
     friend class StorageFileSink;
@@ -93,6 +96,16 @@ protected:
 private:
     void setStorageMetadata(CommonArguments args);
 
+    static std::optional<ColumnsDescription> tryGetColumnsFromCache(
+        const Strings & paths, const String & format_name, const std::optional<FormatSettings> & format_settings, ContextPtr context);
+
+    static void addColumnsToCache(
+        const Strings & paths,
+        const ColumnsDescription & columns,
+        const String & format_name,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context);
+
     std::string format_name;
     // We use format settings from global context + CREATE query for File table
     // function -- in this case, format_settings is set.
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index d875b4ee80c..9cac1e57297 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -220,7 +220,10 @@ ColumnPtr fillColumnWithRandomData(
         {
             auto column = ColumnInt32::create();
             column->getData().resize(limit);
-            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int32), rng);
+
+            for (size_t i = 0; i < limit; ++i)
+                column->getData()[i] = (rng() % static_cast<UInt64>(DATE_LUT_SIZE)) - DAYNUM_OFFSET_EPOCH;
+
             return column;
         }
         case TypeIndex::UInt32: [[fallthrough]];
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 5e161fc2e6a..2e3e1d443ae 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -14,7 +14,7 @@
 #include <Interpreters/castColumn.h>
 #include <Common/quoteString.h>
 #include <Common/Exception.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 #include <Compression/CompressedWriteBuffer.h>
 #include <Processors/ISource.h>
@@ -45,8 +45,8 @@ StorageJoin::StorageJoin(
     const Names & key_names_,
     bool use_nulls_,
     SizeLimits limits_,
-    ASTTableJoin::Kind kind_,
-    ASTTableJoin::Strictness strictness_,
+    JoinKind kind_,
+    JoinStrictness strictness_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
@@ -279,8 +279,8 @@ void registerStorageJoin(StorageFactory & factory)
                 "Storage Join requires at least 3 parameters: Join(ANY|ALL|SEMI|ANTI, LEFT|INNER|RIGHT, keys...).",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        ASTTableJoin::Strictness strictness = ASTTableJoin::Strictness::Unspecified;
-        ASTTableJoin::Kind kind = ASTTableJoin::Kind::Comma;
+        JoinStrictness strictness = JoinStrictness::Unspecified;
+        JoinKind kind = JoinKind::Comma;
 
         if (auto opt_strictness_id = tryGetIdentifierName(engine_args[0]))
         {
@@ -289,19 +289,19 @@ void registerStorageJoin(StorageFactory & factory)
             if (strictness_str == "any")
             {
                 if (old_any_join)
-                    strictness = ASTTableJoin::Strictness::RightAny;
+                    strictness = JoinStrictness::RightAny;
                 else
-                    strictness = ASTTableJoin::Strictness::Any;
+                    strictness = JoinStrictness::Any;
             }
             else if (strictness_str == "all")
-                strictness = ASTTableJoin::Strictness::All;
+                strictness = JoinStrictness::All;
             else if (strictness_str == "semi")
-                strictness = ASTTableJoin::Strictness::Semi;
+                strictness = JoinStrictness::Semi;
             else if (strictness_str == "anti")
-                strictness = ASTTableJoin::Strictness::Anti;
+                strictness = JoinStrictness::Anti;
         }
 
-        if (strictness == ASTTableJoin::Strictness::Unspecified)
+        if (strictness == JoinStrictness::Unspecified)
             throw Exception("First parameter of storage Join must be ANY or ALL or SEMI or ANTI (without quotes).",
                             ErrorCodes::BAD_ARGUMENTS);
 
@@ -310,20 +310,20 @@ void registerStorageJoin(StorageFactory & factory)
             const String kind_str = Poco::toLower(*opt_kind_id);
 
             if (kind_str == "left")
-                kind = ASTTableJoin::Kind::Left;
+                kind = JoinKind::Left;
             else if (kind_str == "inner")
-                kind = ASTTableJoin::Kind::Inner;
+                kind = JoinKind::Inner;
             else if (kind_str == "right")
-                kind = ASTTableJoin::Kind::Right;
+                kind = JoinKind::Right;
             else if (kind_str == "full")
             {
-                if (strictness == ASTTableJoin::Strictness::Any)
-                    strictness = ASTTableJoin::Strictness::RightAny;
-                kind = ASTTableJoin::Kind::Full;
+                if (strictness == JoinStrictness::Any)
+                    strictness = JoinStrictness::RightAny;
+                kind = JoinKind::Full;
             }
         }
 
-        if (kind == ASTTableJoin::Kind::Comma)
+        if (kind == JoinKind::Comma)
             throw Exception("Second parameter of storage Join must be LEFT or INNER or RIGHT or FULL (without quotes).",
                             ErrorCodes::BAD_ARGUMENTS);
 
@@ -444,7 +444,7 @@ private:
     std::unique_ptr<void, std::function<void(void *)>> position; /// type erasure
 
 
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
+    template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps>
     Chunk createChunk(const Maps & maps)
     {
         MutableColumns mut_columns = restored_block.cloneEmpty().mutateColumns();
@@ -491,7 +491,7 @@ private:
         return Chunk(std::move(columns), num_rows);
     }
 
-    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Map>
+    template <JoinKind KIND, JoinStrictness STRICTNESS, typename Map>
     size_t fillColumns(const Map & map, MutableColumns & columns)
     {
         size_t rows_added = 0;
@@ -506,33 +506,33 @@ private:
 
         for (; it != end; ++it)
         {
-            if constexpr (STRICTNESS == ASTTableJoin::Strictness::RightAny)
+            if constexpr (STRICTNESS == JoinStrictness::RightAny)
             {
                 fillOne<Map>(columns, column_indices, it, key_pos, rows_added);
             }
-            else if constexpr (STRICTNESS == ASTTableJoin::Strictness::All)
+            else if constexpr (STRICTNESS == JoinStrictness::All)
             {
                 fillAll<Map>(columns, column_indices, it, key_pos, rows_added);
             }
-            else if constexpr (STRICTNESS == ASTTableJoin::Strictness::Any)
+            else if constexpr (STRICTNESS == JoinStrictness::Any)
             {
-                if constexpr (KIND == ASTTableJoin::Kind::Left || KIND == ASTTableJoin::Kind::Inner)
+                if constexpr (KIND == JoinKind::Left || KIND == JoinKind::Inner)
                     fillOne<Map>(columns, column_indices, it, key_pos, rows_added);
-                else if constexpr (KIND == ASTTableJoin::Kind::Right)
+                else if constexpr (KIND == JoinKind::Right)
                     fillAll<Map>(columns, column_indices, it, key_pos, rows_added);
             }
-            else if constexpr (STRICTNESS == ASTTableJoin::Strictness::Semi)
+            else if constexpr (STRICTNESS == JoinStrictness::Semi)
             {
-                if constexpr (KIND == ASTTableJoin::Kind::Left)
+                if constexpr (KIND == JoinKind::Left)
                     fillOne<Map>(columns, column_indices, it, key_pos, rows_added);
-                else if constexpr (KIND == ASTTableJoin::Kind::Right)
+                else if constexpr (KIND == JoinKind::Right)
                     fillAll<Map>(columns, column_indices, it, key_pos, rows_added);
             }
-            else if constexpr (STRICTNESS == ASTTableJoin::Strictness::Anti)
+            else if constexpr (STRICTNESS == JoinStrictness::Anti)
             {
-                if constexpr (KIND == ASTTableJoin::Kind::Left)
+                if constexpr (KIND == JoinKind::Left)
                     fillOne<Map>(columns, column_indices, it, key_pos, rows_added);
-                else if constexpr (KIND == ASTTableJoin::Kind::Right)
+                else if constexpr (KIND == JoinKind::Right)
                     fillAll<Map>(columns, column_indices, it, key_pos, rows_added);
             }
             else
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index acb127c5a2c..390af09422c 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -4,7 +4,7 @@
 #include <Storages/StorageSet.h>
 #include <Storages/TableLockHolder.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Interpreters/join_common.h>
+#include <Interpreters/JoinUtils.h>
 
 
 namespace DB
@@ -31,8 +31,8 @@ public:
         const Names & key_names_,
         bool use_nulls_,
         SizeLimits limits_,
-        ASTTableJoin::Kind kind_,
-        ASTTableJoin::Strictness strictness_,
+        JoinKind kind_,
+        JoinStrictness strictness_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
@@ -76,14 +76,10 @@ public:
     Block getRightSampleBlock() const
     {
         auto metadata_snapshot = getInMemoryMetadataPtr();
-        Block block = metadata_snapshot->getSampleBlock().sortColumns();
+        Block block = metadata_snapshot->getSampleBlock();
         if (use_nulls && isLeftOrFull(kind))
-        {
             for (auto & col : block)
-            {
                 JoinCommon::convertColumnToNullable(col);
-            }
-        }
         return block;
     }
 
@@ -94,8 +90,8 @@ private:
     const Names key_names;
     bool use_nulls;
     SizeLimits limits;
-    ASTTableJoin::Kind kind;                    /// LEFT | INNER ...
-    ASTTableJoin::Strictness strictness;        /// ANY | ALL
+    JoinKind kind;                    /// LEFT | INNER ...
+    JoinStrictness strictness;        /// ANY | ALL
     bool overwrite;
 
     std::shared_ptr<TableJoin> table_join;
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index ccb88992732..c6bc55fd620 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -729,6 +729,7 @@ void StorageLog::rename(const String & new_path_to_table_data, const StorageID &
 {
     assert(table_path != new_path_to_table_data);
     {
+        disk->createDirectories(new_path_to_table_data);
         disk->moveDirectory(table_path, new_path_to_table_data);
 
         table_path = new_path_to_table_data;
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 0afc7a0df7e..16af2269f61 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -2,6 +2,7 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/StorageMerge.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/StorageView.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/checkAndGetLiteralArgument.h>
@@ -23,6 +24,8 @@
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/Sources/NullSource.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/Transforms/MaterializingTransform.h>
@@ -216,7 +219,7 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(
 }
 
 
-SelectQueryInfo StorageMerge::getModifiedQueryInfo(
+SelectQueryInfo getModifiedQueryInfo(
     const SelectQueryInfo & query_info, ContextPtr modified_context, const StorageID & current_storage_id, bool is_merge_engine)
 {
     SelectQueryInfo modified_query_info = query_info;
@@ -248,7 +251,11 @@ void StorageMerge::read(
     const size_t max_block_size,
     unsigned num_streams)
 {
-    Pipes pipes;
+    /** Just in case, turn off optimization "transfer to PREWHERE",
+      * since there is no certainty that it works when one of table is MergeTree and other is not.
+      */
+    auto modified_context = Context::createCopy(local_context);
+    modified_context->setSetting("optimize_move_to_prewhere", false);
 
     bool has_database_virtual_column = false;
     bool has_table_virtual_column = false;
@@ -265,53 +272,8 @@ void StorageMerge::read(
             real_column_names.push_back(column_name);
     }
 
-    /** Just in case, turn off optimization "transfer to PREWHERE",
-      * since there is no certainty that it works when one of table is MergeTree and other is not.
-      */
-    auto modified_context = Context::createCopy(local_context);
-    modified_context->setSetting("optimize_move_to_prewhere", false);
-
-    /// What will be result structure depending on query processed stage in source tables?
-    Block header = getHeaderForProcessingStage(column_names, storage_snapshot, query_info, local_context, processed_stage);
-
-    /** First we make list of selected tables to find out its size.
-      * This is necessary to correctly pass the recommended number of threads to each table.
-      */
     StorageListWithLocks selected_tables
-        = getSelectedTables(local_context, query_info.query, has_database_virtual_column, has_table_virtual_column);
-
-    query_plan.addInterpreterContext(modified_context);
-
-    QueryPlanResourceHolder resources;
-
-    if (selected_tables.empty())
-    {
-        auto modified_query_info = getModifiedQueryInfo(query_info, modified_context, getStorageID(), false);
-        /// FIXME: do we support sampling in this case?
-        auto pipe = createSources(
-            resources,
-            {},
-            modified_query_info,
-            processed_stage,
-            max_block_size,
-            header,
-            {},
-            {},
-            real_column_names,
-            modified_context,
-            0,
-            has_database_virtual_column,
-            has_table_virtual_column);
-
-        IStorage::readFromPipe(query_plan, std::move(pipe), column_names, storage_snapshot, query_info, local_context, getName());
-        return;
-    }
-
-    size_t tables_count = selected_tables.size();
-    Float64 num_streams_multiplier
-        = std::min(static_cast<unsigned>(tables_count), std::max(1U, static_cast<unsigned>(local_context->getSettingsRef().max_streams_multiplier_for_merge_tables)));
-    num_streams *= num_streams_multiplier;
-    size_t remaining_streams = num_streams;
+        = getSelectedTables(modified_context, query_info.query, has_database_virtual_column, has_table_virtual_column);
 
     InputOrderInfoPtr input_sorting_info;
     if (query_info.order_optimizer)
@@ -320,7 +282,7 @@ void StorageMerge::read(
         {
             auto storage_ptr = std::get<1>(*it);
             auto storage_metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
-            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, local_context);
+            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, modified_context);
             if (it == selected_tables.begin())
                 input_sorting_info = current_info;
             else if (!current_info || (input_sorting_info && *current_info != *input_sorting_info))
@@ -333,7 +295,95 @@ void StorageMerge::read(
         query_info.input_order_info = input_sorting_info;
     }
 
-    auto sample_block = getInMemoryMetadataPtr()->getSampleBlock();
+    query_plan.addInterpreterContext(modified_context);
+
+    /// What will be result structure depending on query processed stage in source tables?
+    Block common_header = getHeaderForProcessingStage(column_names, storage_snapshot, query_info, local_context, processed_stage);
+
+    auto step = std::make_unique<ReadFromMerge>(
+        common_header,
+        std::move(selected_tables),
+        real_column_names,
+        has_database_virtual_column,
+        has_table_virtual_column,
+        max_block_size,
+        num_streams,
+        shared_from_this(),
+        storage_snapshot,
+        query_info,
+        std::move(modified_context),
+        processed_stage);
+
+    query_plan.addStep(std::move(step));
+}
+
+ReadFromMerge::ReadFromMerge(
+    Block common_header_,
+    StorageListWithLocks selected_tables_,
+    Names column_names_,
+    bool has_database_virtual_column_,
+    bool has_table_virtual_column_,
+    size_t max_block_size,
+    size_t num_streams,
+    StoragePtr storage,
+    StorageSnapshotPtr storage_snapshot,
+    const SelectQueryInfo & query_info_,
+    ContextMutablePtr context_,
+    QueryProcessingStage::Enum processed_stage)
+    : ISourceStep(DataStream{.header = common_header_})
+    , required_max_block_size(max_block_size)
+    , requested_num_streams(num_streams)
+    , common_header(std::move(common_header_))
+    , selected_tables(std::move(selected_tables_))
+    , column_names(std::move(column_names_))
+    , has_database_virtual_column(has_database_virtual_column_)
+    , has_table_virtual_column(has_table_virtual_column_)
+    , storage_merge(std::move(storage))
+    , merge_storage_snapshot(std::move(storage_snapshot))
+    , query_info(query_info_)
+    , context(std::move(context_))
+    , common_processed_stage(processed_stage)
+{
+}
+
+void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    if (selected_tables.empty())
+    {
+        pipeline.init(Pipe(std::make_shared<NullSource>(output_stream->header)));
+        return;
+    }
+
+    size_t tables_count = selected_tables.size();
+    Float64 num_streams_multiplier
+        = std::min(static_cast<unsigned>(tables_count), std::max(1U, static_cast<unsigned>(context->getSettingsRef().max_streams_multiplier_for_merge_tables)));
+    size_t num_streams = requested_num_streams * num_streams_multiplier;
+    size_t remaining_streams = num_streams;
+
+    InputOrderInfoPtr input_sorting_info;
+    if (query_info.order_optimizer)
+    {
+        for (auto it = selected_tables.begin(); it != selected_tables.end(); ++it)
+        {
+            auto storage_ptr = std::get<1>(*it);
+            auto storage_metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
+            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, context);
+            if (it == selected_tables.begin())
+                input_sorting_info = current_info;
+            else if (!current_info || (input_sorting_info && *current_info != *input_sorting_info))
+                input_sorting_info.reset();
+
+            if (!input_sorting_info)
+                break;
+        }
+
+        query_info.input_order_info = input_sorting_info;
+    }
+
+    auto sample_block = merge_storage_snapshot->getMetadataForQuery()->getSampleBlock();
+
+    std::vector<std::unique_ptr<QueryPipelineBuilder>> pipelines;
+    QueryPlanResourceHolder resources;
 
     for (const auto & table : selected_tables)
     {
@@ -351,20 +401,20 @@ void StorageMerge::read(
         Aliases aliases;
         auto storage_metadata_snapshot = storage->getInMemoryMetadataPtr();
         auto storage_columns = storage_metadata_snapshot->getColumns();
-        auto nested_storage_snaphsot = storage->getStorageSnapshot(storage_metadata_snapshot, local_context);
+        auto nested_storage_snaphsot = storage->getStorageSnapshot(storage_metadata_snapshot, context);
 
-        auto modified_query_info = getModifiedQueryInfo(query_info, modified_context, storage->getStorageID(), storage->as<StorageMerge>());
-        auto syntax_result = TreeRewriter(local_context).analyzeSelect(
+        auto modified_query_info = getModifiedQueryInfo(query_info, context, storage->getStorageID(), storage->as<StorageMerge>());
+        auto syntax_result = TreeRewriter(context).analyzeSelect(
             modified_query_info.query, TreeRewriterResult({}, storage, nested_storage_snaphsot));
 
         Names column_names_as_aliases;
-        bool with_aliases = processed_stage == QueryProcessingStage::FetchColumns && !storage_columns.getAliases().empty();
+        bool with_aliases = common_processed_stage == QueryProcessingStage::FetchColumns && !storage_columns.getAliases().empty();
         if (with_aliases)
         {
             ASTPtr required_columns_expr_list = std::make_shared<ASTExpressionList>();
             ASTPtr column_expr;
 
-            for (const auto & column : real_column_names)
+            for (const auto & column : column_names)
             {
                 const auto column_default = storage_columns.getDefault(column);
                 bool is_alias = column_default && column_default->kind == ColumnDefaultKind::Alias;
@@ -373,11 +423,11 @@ void StorageMerge::read(
                 {
                     column_expr = column_default->expression->clone();
                     replaceAliasColumnsInQuery(column_expr, storage_metadata_snapshot->getColumns(),
-                                               syntax_result->array_join_result_to_source, local_context);
+                                               syntax_result->array_join_result_to_source, context);
 
                     auto column_description = storage_columns.get(column);
                     column_expr = addTypeConversionToAST(std::move(column_expr), column_description.type->getName(),
-                                                         storage_metadata_snapshot->getColumns().getAll(), local_context);
+                                                         storage_metadata_snapshot->getColumns().getAll(), context);
                     column_expr = setAlias(column_expr, column);
 
                     auto type = sample_block.getByName(column).type;
@@ -389,54 +439,55 @@ void StorageMerge::read(
                 required_columns_expr_list->children.emplace_back(std::move(column_expr));
             }
 
-            syntax_result = TreeRewriter(local_context).analyze(
-                required_columns_expr_list, storage_columns.getAllPhysical(), storage, storage->getStorageSnapshot(storage_metadata_snapshot, local_context));
+            syntax_result = TreeRewriter(context).analyze(
+                required_columns_expr_list, storage_columns.getAllPhysical(), storage, storage->getStorageSnapshot(storage_metadata_snapshot, context));
 
-            auto alias_actions = ExpressionAnalyzer(required_columns_expr_list, syntax_result, local_context).getActionsDAG(true);
+            auto alias_actions = ExpressionAnalyzer(required_columns_expr_list, syntax_result, context).getActionsDAG(true);
 
             column_names_as_aliases = alias_actions->getRequiredColumns().getNames();
             if (column_names_as_aliases.empty())
                 column_names_as_aliases.push_back(ExpressionActions::getSmallestColumn(storage_metadata_snapshot->getColumns().getAllPhysical()));
         }
 
-        auto source_pipe = createSources(
-            resources,
+        auto source_pipeline = createSources(
             nested_storage_snaphsot,
             modified_query_info,
-            processed_stage,
-            max_block_size,
-            header,
+            common_processed_stage,
+            required_max_block_size,
+            common_header,
             aliases,
             table,
-            column_names_as_aliases.empty() ? real_column_names : column_names_as_aliases,
-            modified_context,
-            current_streams,
-            has_database_virtual_column,
-            has_table_virtual_column);
+            column_names_as_aliases.empty() ? column_names : column_names_as_aliases,
+            context,
+            current_streams);
 
-        if (!source_pipe.empty())
+        if (source_pipeline && source_pipeline->initialized())
         {
-            query_plan.addStorageHolder(std::get<1>(table));
-            query_plan.addTableLock(std::get<2>(table));
+            resources.storage_holders.push_back(std::get<1>(table));
+            resources.table_locks.push_back(std::get<2>(table));
 
-            pipes.emplace_back(std::move(source_pipe));
+            pipelines.emplace_back(std::move(source_pipeline));
         }
     }
 
-    auto pipe = Pipe::unitePipes(std::move(pipes));
+    if (pipelines.empty())
+    {
+        pipeline.init(Pipe(std::make_shared<NullSource>(output_stream->header)));
+        return;
+    }
 
-    if (!pipe.empty() && !query_info.input_order_info)
+    pipeline = QueryPipelineBuilder::unitePipelines(std::move(pipelines));
+
+    if (!query_info.input_order_info)
         // It's possible to have many tables read from merge, resize(num_streams) might open too many files at the same time.
         // Using narrowPipe instead. But in case of reading in order of primary key, we cannot do it,
         // because narrowPipe doesn't preserve order.
-        narrowPipe(pipe, num_streams);
+        pipeline.narrow(num_streams);
 
-    IStorage::readFromPipe(query_plan, std::move(pipe), column_names, storage_snapshot, query_info, local_context, getName());
-    query_plan.addResources(std::move(resources));
+    pipeline.addResources(std::move(resources));
 }
 
-Pipe StorageMerge::createSources(
-    QueryPlanResourceHolder & resources,
+QueryPipelineBuilderPtr ReadFromMerge::createSources(
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & modified_query_info,
     const QueryProcessingStage::Enum & processed_stage,
@@ -447,25 +498,19 @@ Pipe StorageMerge::createSources(
     Names & real_column_names,
     ContextMutablePtr modified_context,
     size_t streams_num,
-    bool has_database_virtual_column,
-    bool has_table_virtual_column,
     bool concat_streams)
 {
     const auto & [database_name, storage, _, table_name] = storage_with_lock;
     auto & modified_select = modified_query_info.query->as<ASTSelectQuery &>();
 
-    Pipe pipe;
+    QueryPipelineBuilderPtr builder;
 
     if (!storage)
     {
-        auto builder = InterpreterSelectQuery(
+        return std::make_unique<QueryPipelineBuilder>(InterpreterSelectQuery(
             modified_query_info.query, modified_context,
             Pipe(std::make_shared<SourceFromSingleChunk>(header)),
-            SelectQueryOptions(processed_stage).analyze()).buildQueryPipeline();
-
-        pipe = QueryPipelineBuilder::getPipe(std::move(builder), resources);
-
-        return pipe;
+            SelectQueryOptions(processed_stage).analyze()).buildQueryPipeline());
     }
 
     if (!modified_select.final() && storage->needRewriteQueryWithFinal(real_column_names))
@@ -484,24 +529,43 @@ Pipe StorageMerge::createSources(
             real_column_names.push_back(ExpressionActions::getSmallestColumn(storage_snapshot->metadata->getColumns().getAllPhysical()));
 
         QueryPlan plan;
-        storage->read(
-            plan,
-            real_column_names,
-            storage_snapshot,
-            modified_query_info,
-            modified_context,
-            processed_stage,
-            max_block_size,
-            UInt32(streams_num));
+        if (StorageView * view = dynamic_cast<StorageView *>(storage.get()))
+        {
+            /// For view storage, we need to rewrite the `modified_query_info.view_query` to optimize read.
+            /// The most intuitive way is to use InterpreterSelectQuery.
+
+            /// Intercept the settings
+            modified_context->setSetting("max_threads", streams_num);
+            modified_context->setSetting("max_streams_to_max_threads_ratio", 1);
+            modified_context->setSetting("max_block_size", max_block_size);
+
+            InterpreterSelectQuery(
+                modified_query_info.query, modified_context, storage, view->getInMemoryMetadataPtr(), SelectQueryOptions(processed_stage))
+                .buildQueryPlan(plan);
+        }
+        else
+        {
+            storage->read(
+                plan,
+                real_column_names,
+                storage_snapshot,
+                modified_query_info,
+                modified_context,
+                processed_stage,
+                max_block_size,
+                UInt32(streams_num));
+
+        }
 
         if (!plan.isInitialized())
             return {};
 
-        auto builder = plan.buildQueryPipeline(
+        if (auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(plan.getRootNode()->step.get()))
+            read_from_merge_tree->addFilterNodes(added_filter_nodes);
+
+        builder = plan.buildQueryPipeline(
             QueryPlanOptimizationSettings::fromContext(modified_context),
             BuildQueryPipelineSettings::fromContext(modified_context));
-
-        pipe = QueryPipelineBuilder::getPipe(std::move(*builder), resources);
     }
     else if (processed_stage > storage_stage)
     {
@@ -515,28 +579,27 @@ Pipe StorageMerge::createSources(
         InterpreterSelectQuery interpreter{
             modified_query_info.query, modified_context, SelectQueryOptions(processed_stage).ignoreProjections()};
 
-
-        pipe = QueryPipelineBuilder::getPipe(interpreter.buildQueryPipeline(), resources);
+        builder = std::make_unique<QueryPipelineBuilder>(interpreter.buildQueryPipeline());
 
         /** Materialization is needed, since from distributed storage the constants come materialized.
           * If you do not do this, different types (Const and non-Const) columns will be produced in different threads,
           * And this is not allowed, since all code is based on the assumption that in the block stream all types are the same.
           */
-        pipe.addSimpleTransform([](const Block & stream_header) { return std::make_shared<MaterializingTransform>(stream_header); });
+        builder->addSimpleTransform([](const Block & stream_header) { return std::make_shared<MaterializingTransform>(stream_header); });
     }
 
-    if (!pipe.empty())
+    if (builder->initialized())
     {
-        if (concat_streams && pipe.numOutputPorts() > 1)
+        if (concat_streams && builder->getNumStreams() > 1)
         {
             // It's possible to have many tables read from merge, resize(1) might open too many files at the same time.
             // Using concat instead.
-            pipe.addTransform(std::make_shared<ConcatProcessor>(pipe.getHeader(), pipe.numOutputPorts()));
+            builder->addTransform(std::make_shared<ConcatProcessor>(builder->getHeader(), builder->getNumStreams()));
         }
 
         /// Add virtual columns if we don't already have them.
 
-        Block pipe_header = pipe.getHeader();
+        Block pipe_header = builder->getHeader();
 
         if (has_database_virtual_column && !pipe_header.has("_database"))
         {
@@ -550,7 +613,7 @@ Pipe StorageMerge::createSources(
                 std::move(adding_column_dag),
                 ExpressionActionsSettings::fromContext(modified_context, CompileExpressions::yes));
 
-            pipe.addSimpleTransform([&](const Block & stream_header)
+            builder->addSimpleTransform([&](const Block & stream_header)
             {
                 return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions);
             });
@@ -568,7 +631,7 @@ Pipe StorageMerge::createSources(
                 std::move(adding_column_dag),
                 ExpressionActionsSettings::fromContext(modified_context, CompileExpressions::yes));
 
-            pipe.addSimpleTransform([&](const Block & stream_header)
+            builder->addSimpleTransform([&](const Block & stream_header)
             {
                 return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions);
             });
@@ -576,10 +639,10 @@ Pipe StorageMerge::createSources(
 
         /// Subordinary tables could have different but convertible types, like numeric types of different width.
         /// We must return streams with structure equals to structure of Merge table.
-        convertingSourceStream(header, storage_snapshot->metadata, aliases, modified_context, modified_query_info.query, pipe, processed_stage);
+        convertingSourceStream(header, storage_snapshot->metadata, aliases, modified_context, modified_query_info.query, *builder, processed_stage);
     }
 
-    return pipe;
+    return builder;
 }
 
 StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
@@ -747,19 +810,19 @@ void StorageMerge::alter(
     setInMemoryMetadata(storage_metadata);
 }
 
-void StorageMerge::convertingSourceStream(
+void ReadFromMerge::convertingSourceStream(
     const Block & header,
     const StorageMetadataPtr & metadata_snapshot,
     const Aliases & aliases,
     ContextPtr local_context,
     ASTPtr & query,
-    Pipe & pipe,
+    QueryPipelineBuilder & builder,
     QueryProcessingStage::Enum processed_stage)
 {
-    Block before_block_header = pipe.getHeader();
+    Block before_block_header = builder.getHeader();
 
     auto storage_sample_block = metadata_snapshot->getSampleBlock();
-    auto pipe_columns = pipe.getHeader().getNamesAndTypesList();
+    auto pipe_columns = builder.getHeader().getNamesAndTypesList();
 
     for (const auto & alias : aliases)
     {
@@ -772,21 +835,21 @@ void StorageMerge::convertingSourceStream(
         auto actions_dag = expression_analyzer.getActionsDAG(true, false);
         auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
 
-        pipe.addSimpleTransform([&](const Block & stream_header)
+        builder.addSimpleTransform([&](const Block & stream_header)
         {
             return std::make_shared<ExpressionTransform>(stream_header, actions);
         });
     }
 
     {
-        auto convert_actions_dag = ActionsDAG::makeConvertingActions(pipe.getHeader().getColumnsWithTypeAndName(),
+        auto convert_actions_dag = ActionsDAG::makeConvertingActions(builder.getHeader().getColumnsWithTypeAndName(),
                                                                      header.getColumnsWithTypeAndName(),
                                                                      ActionsDAG::MatchColumnsMode::Name);
         auto actions = std::make_shared<ExpressionActions>(
             convert_actions_dag,
             ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
 
-        pipe.addSimpleTransform([&](const Block & stream_header)
+        builder.addSimpleTransform([&](const Block & stream_header)
         {
             return std::make_shared<ExpressionTransform>(stream_header, actions);
         });
@@ -809,7 +872,7 @@ void StorageMerge::convertingSourceStream(
             if (!header_column.type->equals(*before_column.type.get()))
             {
                 NamesAndTypesList source_columns = metadata_snapshot->getSampleBlock().getNamesAndTypesList();
-                auto virtual_column = *getVirtuals().tryGetByName("_table");
+                auto virtual_column = *storage_merge->getVirtuals().tryGetByName("_table");
                 source_columns.emplace_back(NameAndTypePair{virtual_column.name, virtual_column.type});
                 auto syntax_result = TreeRewriter(local_context).analyze(where_expression, source_columns);
                 ExpressionActionsPtr actions = ExpressionAnalyzer{where_expression, syntax_result, local_context}.getActions(false, false);
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index f6dae239e79..6bf68660803 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <Common/OptimizedRegularExpression.h>
+#include <Storages/SelectQueryInfo.h>
 #include <Storages/IStorage.h>
+#include <Processors/QueryPlan/ISourceStep.h>
 
 
 namespace DB
@@ -105,7 +107,64 @@ private:
     NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
 
-protected:
+    ColumnsDescription getColumnsDescriptionFromSourceTables() const;
+
+    friend class ReadFromMerge;
+};
+
+class ReadFromMerge final : public ISourceStep
+{
+public:
+    static constexpr auto name = "ReadFromMerge";
+    String getName() const override { return name; }
+
+    using StorageWithLockAndName = std::tuple<String, StoragePtr, TableLockHolder, String>;
+    using StorageListWithLocks = std::list<StorageWithLockAndName>;
+    using DatabaseTablesIterators = std::vector<DatabaseTablesIteratorPtr>;
+
+    ReadFromMerge(
+        Block common_header_,
+        StorageListWithLocks selected_tables_,
+        Names column_names_,
+        bool has_database_virtual_column_,
+        bool has_table_virtual_column_,
+        size_t max_block_size,
+        size_t num_streams,
+        StoragePtr storage,
+        StorageSnapshotPtr storage_snapshot,
+        const SelectQueryInfo & query_info_,
+        ContextMutablePtr context_,
+        QueryProcessingStage::Enum processed_stage);
+
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+
+    void addFilter(ActionsDAGPtr expression, std::string column_name)
+    {
+        added_filter_dags.push_back(expression);
+        added_filter_nodes.nodes.push_back(&expression->findInOutputs(column_name));
+    }
+
+private:
+    const size_t required_max_block_size;
+    const size_t requested_num_streams;
+    const Block common_header;
+
+    StorageListWithLocks selected_tables;
+    Names column_names;
+    bool has_database_virtual_column;
+    bool has_table_virtual_column;
+    StoragePtr storage_merge;
+    StorageSnapshotPtr merge_storage_snapshot;
+
+    SelectQueryInfo query_info;
+    ContextMutablePtr context;
+    QueryProcessingStage::Enum common_processed_stage;
+
+    std::vector<ActionsDAGPtr> added_filter_dags;
+    ActionDAGNodes added_filter_nodes;
+
+    std::string added_filter_column_name;
+
     struct AliasData
     {
         String name;
@@ -115,8 +174,7 @@ protected:
 
     using Aliases = std::vector<AliasData>;
 
-    Pipe createSources(
-        QueryPlanResourceHolder & resources,
+    QueryPipelineBuilderPtr createSources(
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
         const QueryProcessingStage::Enum & processed_stage,
@@ -127,19 +185,12 @@ protected:
         Names & real_column_names,
         ContextMutablePtr modified_context,
         size_t streams_num,
-        bool has_database_virtual_column,
-        bool has_table_virtual_column,
         bool concat_streams = false);
 
     void convertingSourceStream(
         const Block & header, const StorageMetadataPtr & metadata_snapshot, const Aliases & aliases,
         ContextPtr context, ASTPtr & query,
-        Pipe & pipe, QueryProcessingStage::Enum processed_stage);
-
-    static SelectQueryInfo getModifiedQueryInfo(
-        const SelectQueryInfo & query_info, ContextPtr modified_context, const StorageID & current_storage_id, bool is_merge_engine);
-
-    ColumnsDescription getColumnsDescriptionFromSourceTables() const;
+        QueryPipelineBuilder & builder, QueryProcessingStage::Enum processed_stage);
 };
 
 }
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 30d8449df95..908372b462e 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -123,7 +123,7 @@ void StorageMergeTree::startup()
 
     /// Temporary directories contain incomplete results of merges (after forced restart)
     ///  and don't allow to reinitialize them, so delete each of them immediately
-    clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_"});
+    clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_", "tmp-fetch_"});
 
     /// NOTE background task will also do the above cleanups periodically.
     time_after_previous_cleanup_parts.restart();
@@ -1594,6 +1594,7 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
 
     DataPartsVector src_parts = src_data.getVisibleDataPartsVectorInPartition(local_context, partition_id);
     MutableDataPartsVector dst_parts;
+    std::vector<scope_guard> dst_parts_locks;
 
     static const String TMP_PREFIX = "tmp_replace_from_";
 
@@ -1608,8 +1609,9 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
         Int64 temp_index = insert_increment.get();
         MergeTreePartInfo dst_part_info(partition_id, temp_index, temp_index, src_part->info.level);
 
-        auto dst_part = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, my_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
+        auto [dst_part, part_lock] = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, my_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
         dst_parts.emplace_back(std::move(dst_part));
+        dst_parts_locks.emplace_back(std::move(part_lock));
     }
 
     /// ATTACH empty part set
@@ -1687,6 +1689,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
 
     DataPartsVector src_parts = src_data.getVisibleDataPartsVectorInPartition(local_context, partition_id);
     MutableDataPartsVector dst_parts;
+    std::vector<scope_guard> dst_parts_locks;
 
     static const String TMP_PREFIX = "tmp_move_from_";
 
@@ -1701,8 +1704,9 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
         Int64 temp_index = insert_increment.get();
         MergeTreePartInfo dst_part_info(partition_id, temp_index, temp_index, src_part->info.level);
 
-        auto dst_part = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
+        auto [dst_part, part_lock] = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, local_context->getCurrentTransaction(), {}, false);
         dst_parts.emplace_back(std::move(dst_part));
+        dst_parts_locks.emplace_back(std::move(part_lock));
     }
 
     /// empty part set
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 1ec14f643d4..393cdf76c7a 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -41,14 +41,17 @@
 #include <Storages/Freeze.h>
 
 #include <Databases/DatabaseOnDisk.h>
+#include <Databases/DatabaseReplicated.h>
 
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTOptimizeQuery.h>
 #include <Parsers/ASTPartition.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ExpressionListParsers.h>
@@ -58,6 +61,7 @@
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
+#include <Processors/Sinks/EmptySink.h>
 
 #include <IO/ReadBufferFromString.h>
 #include <IO/Operators.h>
@@ -72,6 +76,7 @@
 #include <Interpreters/InterserverCredentials.h>
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/JoinedTables.h>
 
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/IBackup.h>
@@ -158,6 +163,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int CONCURRENT_ACCESS_NOT_SUPPORTED;
     extern const int CHECKSUM_DOESNT_MATCH;
+    extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
 }
 
 namespace ActionLocks
@@ -466,7 +472,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         }
         /// Temporary directories contain uninitialized results of Merges or Fetches (after forced restart),
         /// don't allow to reinitialize them, delete each of them immediately.
-        clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_"});
+        clearOldTemporaryDirectories(0, {"tmp_", "delete_tmp_", "tmp-fetch_"});
         clearOldWriteAheadLogs();
         if (getSettings()->merge_tree_enable_clear_old_broken_detached)
             clearOldBrokenPartsFromDetachedDirecory();
@@ -506,9 +512,19 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
     if (replicas.empty())
         return;
 
+    /// Current replica must always be present in the list as the first element because we use local mutation status
+    /// to check for mutation errors. So if it is not there, just add it.
+    const Strings * all_required_replicas = &replicas;
+    Strings extended_list_of_replicas;
+    if (replicas.front() != replica_name)
+    {
+        extended_list_of_replicas.push_back(replica_name);
+        extended_list_of_replicas.insert(extended_list_of_replicas.end(), replicas.begin(), replicas.end());
+        all_required_replicas = &extended_list_of_replicas;
+    }
 
     std::set<String> inactive_replicas;
-    for (const String & replica : replicas)
+    for (const String & replica : *all_required_replicas)
     {
         LOG_DEBUG(log, "Waiting for {} to apply mutation {}", replica, mutation_id);
         zkutil::EventPtr wait_event = std::make_shared<Poco::Event>();
@@ -1097,19 +1113,18 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
     }
 }
 
-void StorageReplicatedMergeTree::setTableStructure(
+void StorageReplicatedMergeTree::setTableStructure(const StorageID & table_id, const ContextPtr & local_context,
     ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff)
 {
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
-    StorageInMemoryMetadata new_metadata = metadata_diff.getNewMetadata(new_columns, getContext(), old_metadata);
+    StorageInMemoryMetadata new_metadata = metadata_diff.getNewMetadata(new_columns, local_context, old_metadata);
 
     /// Even if the primary/sorting/partition keys didn't change we must reinitialize it
     /// because primary/partition key column types might have changed.
     checkTTLExpressions(new_metadata, old_metadata);
     setProperties(new_metadata, old_metadata);
 
-    auto table_id = getStorageID();
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(getContext(), table_id, new_metadata);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
 }
 
 
@@ -1947,6 +1962,8 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
         String replica;
 
         MergeTreeData::HardlinkedFiles hardlinked_files;
+
+        scope_guard temporary_part_lock;
     };
 
     using PartDescriptionPtr = std::shared_ptr<PartDescription>;
@@ -2193,8 +2210,10 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
             if (part_desc->checksum_hex != part_desc->src_table_part->checksums.getTotalChecksumHex())
                 throw Exception("Checksums of " + part_desc->src_table_part->name + " is suddenly changed", ErrorCodes::UNFINISHED);
 
-            part_desc->res_part = cloneAndLoadDataPartOnSameDisk(
+            auto [res_part, temporary_part_lock] = cloneAndLoadDataPartOnSameDisk(
                 part_desc->src_table_part, TMP_PREFIX + "clone_", part_desc->new_part_info, metadata_snapshot, NO_TRANSACTION_PTR, &part_desc->hardlinked_files, false);
+            part_desc->res_part = std::move(res_part);
+            part_desc->temporary_part_lock = std::move(temporary_part_lock);
         }
         else if (!part_desc->replica.empty())
         {
@@ -3831,7 +3850,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
 
     if (!to_detached)
     {
-        if (auto part = getPartIfExists(part_info, {IMergeTreeDataPart::State::Outdated, IMergeTreeDataPart::State::Deleting}))
+        if (auto part = getPartIfExists(part_info, {MergeTreeDataPartState::Outdated, MergeTreeDataPartState::Deleting}))
         {
             LOG_DEBUG(log, "Part {} should be deleted after previous attempt before fetch", part->name);
             /// Force immediate parts cleanup to delete the part that was left from the previous fetch attempt.
@@ -3933,12 +3952,15 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
     std::optional<CurrentlySubmergingEmergingTagger> tagger_ptr;
     std::function<MutableDataPartPtr()> get_part;
     MergeTreeData::HardlinkedFiles hardlinked_files;
+    scope_guard part_to_clone_lock;
 
     if (part_to_clone)
     {
         get_part = [&, part_to_clone]()
         {
-            return cloneAndLoadDataPartOnSameDisk(part_to_clone, "tmp_clone_", part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, false);
+            auto [cloned_part, lock] = cloneAndLoadDataPartOnSameDisk(part_to_clone, "tmp_clone_", part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, false);
+            part_to_clone_lock = std::move(lock);
+            return cloned_part;
         };
     }
     else
@@ -4034,7 +4056,10 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
         /// The same part is being written right now (but probably it's not committed yet).
         /// We will check the need for fetch later.
         if (e.code() == ErrorCodes::DIRECTORY_ALREADY_EXISTS)
+        {
+            LOG_TRACE(log, "Not fetching part: {}", e.message());
             return false;
+        }
 
         throw;
     }
@@ -4067,7 +4092,7 @@ DataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
     auto zookeeper = getZooKeeper();
     const auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
 
-    if (auto part = getPartIfExists(part_info, {IMergeTreeDataPart::State::Outdated, IMergeTreeDataPart::State::Deleting}))
+    if (auto part = getPartIfExists(part_info, {MergeTreeDataPartState::Outdated, MergeTreeDataPartState::Deleting}))
     {
         LOG_DEBUG(log, "Part {} should be deleted after previous attempt before fetch", part->name);
         /// Force immediate parts cleanup to delete the part that was left from the previous fetch attempt.
@@ -4146,7 +4171,10 @@ DataPartStoragePtr StorageReplicatedMergeTree::fetchExistsPart(
         /// The same part is being written right now (but probably it's not committed yet).
         /// We will check the need for fetch later.
         if (e.code() == ErrorCodes::DIRECTORY_ALREADY_EXISTS)
+        {
+            LOG_TRACE(log, "Not fetching part: {}", e.message());
             return nullptr;
+        }
 
         throw;
     }
@@ -4433,8 +4461,9 @@ SinkToStoragePtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, con
     bool deduplicate = storage_settings_ptr->replicated_deduplication_window != 0 && query_settings.insert_deduplicate;
 
     // TODO: should we also somehow pass list of columns to deduplicate on to the ReplicatedMergeTreeSink?
+    // TODO: insert_quorum = 'auto' would be supported in https://github.com/ClickHouse/ClickHouse/pull/39970, now it's same as 0.
     return std::make_shared<ReplicatedMergeTreeSink>(
-        *this, metadata_snapshot, query_settings.insert_quorum,
+        *this, metadata_snapshot, query_settings.insert_quorum.valueOr(0),
         query_settings.insert_quorum_timeout.totalMilliseconds(),
         query_settings.max_partitions_per_insert_block,
         query_settings.insert_quorum_parallel,
@@ -4443,6 +4472,106 @@ SinkToStoragePtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, con
 }
 
 
+std::optional<QueryPipeline> StorageReplicatedMergeTree::distributedWriteFromClusterStorage(const std::shared_ptr<IStorageCluster> & src_storage_cluster, const ASTInsertQuery & query, ContextPtr local_context)
+{
+    const auto & settings = local_context->getSettingsRef();
+    auto extension = src_storage_cluster->getTaskIteratorExtension(local_context);
+
+    /// Here we won't check that the cluster formed from table replicas is a subset of a cluster specified in s3Cluster/hdfsCluster table function
+    auto src_cluster = src_storage_cluster->getCluster(local_context);
+
+    /// Actually the query doesn't change, we just serialize it to string
+    String query_str;
+    {
+        WriteBufferFromOwnString buf;
+        IAST::FormatSettings ast_format_settings(buf, /*one_line*/ true);
+        ast_format_settings.always_quote_identifiers = true;
+        query.IAST::format(ast_format_settings);
+        query_str = buf.str();
+    }
+
+    QueryPipeline pipeline;
+    ContextMutablePtr query_context = Context::createCopy(local_context);
+    ++query_context->getClientInfo().distributed_depth;
+
+    for (const auto & replicas : src_cluster->getShardsAddresses())
+    {
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & node : replicas)
+        {
+            auto connection = std::make_shared<Connection>(
+                node.host_name, node.port, query_context->getGlobalContext()->getCurrentDatabase(),
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
+                "ParallelInsertSelectInititiator",
+                node.compression,
+                node.secure
+            );
+
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                connection,
+                query_str,
+                Block{},
+                query_context,
+                /*throttler=*/nullptr,
+                Scalars{},
+                Tables{},
+                QueryProcessingStage::Complete,
+                extension);
+
+            QueryPipeline remote_pipeline(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote));
+            remote_pipeline.complete(std::make_shared<EmptySink>(remote_query_executor->getHeader()));
+
+            pipeline.addCompletedPipeline(std::move(remote_pipeline));
+        }
+    }
+
+    return pipeline;
+}
+
+std::optional<QueryPipeline> StorageReplicatedMergeTree::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+{
+    /// Do not enable parallel distributed INSERT SELECT in case when query probably comes from another server
+    if (local_context->getClientInfo().query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
+        return {};
+
+    const Settings & settings = local_context->getSettingsRef();
+    if (settings.max_distributed_depth && local_context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
+
+    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+
+    StoragePtr src_storage;
+
+    if (select.list_of_selects->children.size() == 1)
+    {
+        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
+        {
+            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+
+            if (joined_tables.tablesCount() == 1)
+            {
+                src_storage = joined_tables.getLeftTableStorage();
+            }
+        }
+    }
+
+    if (!src_storage)
+        return {};
+
+    if (auto src_distributed = std::dynamic_pointer_cast<IStorageCluster>(src_storage))
+    {
+        return distributedWriteFromClusterStorage(src_distributed, query, local_context);
+    }
+    else if (local_context->getClientInfo().distributed_depth == 0)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parallel distributed INSERT SELECT is not possible. Reason: distributed "\
+            "reading into Replicated table is supported only from *Cluster table functions, but got {} storage", src_storage->getName());
+    }
+
+    return {};
+}
+
+
 bool StorageReplicatedMergeTree::optimize(
     const ASTPtr &,
     const StorageMetadataPtr &,
@@ -4604,7 +4733,31 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
     requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "columns", entry.columns_str, -1));
     requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "metadata", entry.metadata_str, -1));
 
-    zookeeper->multi(requests);
+    auto table_id = getStorageID();
+    auto alter_context = getContext();
+
+    auto database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
+    bool is_in_replicated_database = database->getEngineName() == "Replicated";
+
+    if (is_in_replicated_database)
+    {
+        auto mutable_alter_context = Context::createCopy(getContext());
+        const auto * replicated = dynamic_cast<const DatabaseReplicated *>(database.get());
+        mutable_alter_context->makeQueryContext();
+        auto alter_txn = std::make_shared<ZooKeeperMetadataTransaction>(zookeeper, replicated->getZooKeeperPath(),
+                                                                       /* is_initial_query */ false, /* task_zk_path */ "");
+        mutable_alter_context->initZooKeeperMetadataTransaction(alter_txn);
+        alter_context = mutable_alter_context;
+
+        for (auto & op : requests)
+            alter_txn->addOp(std::move(op));
+        requests.clear();
+        /// Requests will be executed by database in setTableStructure
+    }
+    else
+    {
+        zookeeper->multi(requests);
+    }
 
     {
         auto table_lock_holder = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
@@ -4612,13 +4765,14 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
         LOG_INFO(log, "Metadata changed in ZooKeeper. Applying changes locally.");
 
         auto metadata_diff = ReplicatedMergeTreeTableMetadata(*this, getInMemoryMetadataPtr()).checkAndFindDiff(metadata_from_entry, getInMemoryMetadataPtr()->getColumns(), getContext());
-        setTableStructure(std::move(columns_from_entry), metadata_diff);
+        setTableStructure(table_id, alter_context, std::move(columns_from_entry), metadata_diff);
         metadata_version = entry.alter_version;
 
         LOG_INFO(log, "Applied changes to the metadata of the table. Current metadata version: {}", metadata_version);
     }
 
     /// This transaction may not happen, but it's OK, because on the next retry we will eventually create/update this node
+    /// TODO Maybe do in in one transaction for Replicated database?
     zookeeper->createOrUpdate(fs::path(replica_path) / "metadata_version", std::to_string(metadata_version), zkutil::CreateMode::Persistent);
 
     return true;
@@ -5132,9 +5286,28 @@ void StorageReplicatedMergeTree::checkTableCanBeRenamed(const StorageID & new_na
         return;
 
     if (renaming_restrictions == RenamingRestrictions::DO_NOT_ALLOW)
-        throw Exception("Cannot rename Replicated table, because zookeeper_path contains implicit 'database' or 'table' macro. "
-                        "We cannot rename path in ZooKeeper, so path may become inconsistent with table name. If you really want to rename table, "
-                        "you should edit metadata file first and restart server or reattach the table.", ErrorCodes::NOT_IMPLEMENTED);
+    {
+        auto old_name = getStorageID();
+        bool is_server_startup = Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER
+            && !Context::getGlobalContextInstance()->isServerCompletelyStarted();
+        bool move_to_atomic = old_name.uuid == UUIDHelpers::Nil && new_name.uuid != UUIDHelpers::Nil;
+
+        bool likely_converting_ordinary_to_atomic = is_server_startup && move_to_atomic;
+        if (likely_converting_ordinary_to_atomic)
+        {
+            LOG_INFO(log, "Table {} should not be renamed, because zookeeper_path contains implicit 'database' or 'table' macro. "
+                          "We cannot rename path in ZooKeeper, so path may become inconsistent with table name. "
+                          "However, we allow renaming while converting Ordinary database to Atomic, because all tables will be renamed back",
+                          old_name.getNameForLogs());
+            return;
+        }
+
+        throw Exception(
+            "Cannot rename Replicated table, because zookeeper_path contains implicit 'database' or 'table' macro. "
+            "We cannot rename path in ZooKeeper, so path may become inconsistent with table name. If you really want to rename table, "
+            "you should edit metadata file first and restart server or reattach the table.",
+            ErrorCodes::NOT_IMPLEMENTED);
+    }
 
     assert(renaming_restrictions == RenamingRestrictions::ALLOW_PRESERVING_UUID);
     if (!new_name.hasUUID() && getStorageID().hasUUID())
@@ -5974,7 +6147,7 @@ void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t
         {
             if (*it == replica_name)
             {
-                std::iter_swap(it, replicas.rbegin());
+                std::iter_swap(it, replicas.begin());
                 break;
             }
         }
@@ -6366,6 +6539,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     {
         DataPartsVector src_parts;
         MutableDataPartsVector dst_parts;
+        std::vector<scope_guard> dst_parts_locks;
         Strings block_id_paths;
         Strings part_checksums;
         std::vector<EphemeralLockInZooKeeper> ephemeral_locks;
@@ -6432,10 +6606,11 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
             bool copy_instead_of_hardlink = storage_settings_ptr->allow_remote_fs_zero_copy_replication
                                             && src_part->isStoredOnRemoteDiskWithZeroCopySupport();
 
-            auto dst_part = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
+            auto [dst_part, part_lock] = cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
 
             src_parts.emplace_back(src_part);
             dst_parts.emplace_back(dst_part);
+            dst_parts_locks.emplace_back(std::move(part_lock));
             ephemeral_locks.emplace_back(std::move(*lock));
             block_id_paths.emplace_back(block_id_path);
             part_checksums.emplace_back(hash_hex);
@@ -6635,6 +6810,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
         Coordination::Stat dest_alter_partition_version_stat;
         zookeeper->get(dest_alter_partition_version_path, &dest_alter_partition_version_stat);
         std::vector<MergeTreeData::HardlinkedFiles> hardlinked_files_for_parts;
+        std::vector<scope_guard> temporary_parts_locks;
 
         for (const auto & src_part : src_all_parts)
         {
@@ -6661,10 +6837,11 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
             bool copy_instead_of_hardlink = storage_settings_ptr->allow_remote_fs_zero_copy_replication
                                             && src_part->isStoredOnRemoteDiskWithZeroCopySupport();
 
-            auto dst_part = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
+            auto [dst_part, dst_part_lock] = dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info, dest_metadata_snapshot, NO_TRANSACTION_PTR, &hardlinked_files, copy_instead_of_hardlink);
 
             src_parts.emplace_back(src_part);
             dst_parts.emplace_back(dst_part);
+            temporary_parts_locks.emplace_back(std::move(dst_part_lock));
             ephemeral_locks.emplace_back(std::move(*lock));
             block_id_paths.emplace_back(block_id_path);
             part_checksums.emplace_back(hash_hex);
@@ -7867,7 +8044,7 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
     if (settings->assign_part_uuids)
         new_data_part->uuid = UUIDHelpers::generateV4();
 
-    new_data_part->setColumns(columns);
+    new_data_part->setColumns(columns, {});
     new_data_part->rows_count = block.rows();
 
     {
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index c35e2d5cf5c..3f03fb70f7a 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -4,6 +4,7 @@
 #include <atomic>
 #include <pcg_random.hpp>
 #include <Storages/IStorage.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Storages/MergeTree/MergeTreePartsMover.h>
@@ -136,6 +137,8 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    std::optional<QueryPipeline> distributedWrite(const ASTInsertQuery & /*query*/, ContextPtr /*context*/) override;
+
     bool optimize(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
@@ -465,6 +468,8 @@ private:
     std::mutex last_broken_disks_mutex;
     std::set<String> last_broken_disks;
 
+    static std::optional<QueryPipeline> distributedWriteFromClusterStorage(const std::shared_ptr<IStorageCluster> & src_storage_cluster, const ASTInsertQuery & query, ContextPtr context);
+
     template <class Func>
     void foreachActiveParts(Func && func, bool select_sequential_consistency) const;
 
@@ -486,7 +491,8 @@ private:
 
     /// A part of ALTER: apply metadata changes only (data parts are altered separately).
     /// Must be called under IStorage::lockForAlter() lock.
-    void setTableStructure(ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff);
+    void setTableStructure(const StorageID & table_id, const ContextPtr & local_context,
+                           ColumnsDescription new_columns, const ReplicatedMergeTreeTableMetadata::Diff & metadata_diff);
 
     /** Check that the set of parts corresponds to that in ZK (/replicas/me/parts/).
       * If any parts described in ZK are not locally, throw an exception.
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 130bc75a65c..fea45dfc8fd 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -90,12 +90,16 @@ public:
         const S3::URI & globbed_uri_,
         ASTPtr & query_,
         const Block & virtual_header_,
-        ContextPtr context_)
+        ContextPtr context_,
+        std::unordered_map<String, S3::ObjectInfo> * object_infos_,
+        Strings * read_keys_)
         : WithContext(context_)
         , client(client_)
         , globbed_uri(globbed_uri_)
         , query(query_)
         , virtual_header(virtual_header_)
+        , object_infos(object_infos_)
+        , read_keys(read_keys_)
     {
         if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
             throw Exception("Expression can not have wildcards inside bucket name", ErrorCodes::UNEXPECTED_EXPRESSION);
@@ -187,6 +191,8 @@ private:
                 if (re2::RE2::FullMatch(key, *matcher))
                 {
                     String path = fs::path(globbed_uri.bucket) / key;
+                    if (object_infos)
+                        (*object_infos)[path] = {.size = size_t(row.GetSize()), .last_modification_time = row.GetLastModified().Millis() / 1000};
                     String file = path.substr(path.find_last_of('/') + 1);
                     if (path_column)
                         path_column->insert(path);
@@ -221,6 +227,9 @@ private:
 
         /// It returns false when all objects were returned
         is_finished = !outcome.GetResult().GetIsTruncated();
+
+        if (read_keys)
+            read_keys->insert(read_keys->end(), buffer.begin(), buffer.end());
     }
 
     std::mutex mutex;
@@ -235,6 +244,8 @@ private:
     Aws::S3::Model::ListObjectsV2Outcome outcome;
     std::unique_ptr<re2::RE2> matcher;
     bool is_finished{false};
+    std::unordered_map<String, S3::ObjectInfo> * object_infos;
+    Strings * read_keys;
 };
 
 StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
@@ -242,8 +253,10 @@ StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
     const S3::URI & globbed_uri_,
     ASTPtr query,
     const Block & virtual_header,
-    ContextPtr context)
-    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_, query, virtual_header, context))
+    ContextPtr context,
+    std::unordered_map<String, S3::ObjectInfo> * object_infos_,
+    Strings * read_keys_)
+    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_, query, virtual_header, context, object_infos_, read_keys_))
 {
 }
 
@@ -395,7 +408,8 @@ StorageS3Source::StorageS3Source(
     const String & bucket_,
     const String & version_id_,
     std::shared_ptr<IteratorWrapper> file_iterator_,
-    const size_t download_thread_num_)
+    const size_t download_thread_num_,
+    const std::unordered_map<String, S3::ObjectInfo> & object_infos_)
     : ISource(getHeader(sample_block_, requested_virtual_columns_))
     , WithContext(context_)
     , name(std::move(name_))
@@ -412,6 +426,7 @@ StorageS3Source::StorageS3Source(
     , requested_virtual_columns(requested_virtual_columns_)
     , file_iterator(file_iterator_)
     , download_thread_num(download_thread_num_)
+    , object_infos(object_infos_)
 {
     initialize();
 }
@@ -455,7 +470,12 @@ bool StorageS3Source::initialize()
 
 std::unique_ptr<ReadBuffer> StorageS3Source::createS3ReadBuffer(const String & key)
 {
-    const size_t object_size = DB::S3::getObjectSize(client, bucket, key, version_id, false);
+    size_t object_size;
+    auto it = object_infos.find(fs::path(bucket) / key);
+    if (it != object_infos.end())
+        object_size = it->second.size;
+    else
+        object_size = DB::S3::getObjectSize(client, bucket, key, version_id, false);
 
     auto download_buffer_size = getContext()->getSettings().max_download_buffer_size;
     const bool use_parallel_download = download_buffer_size > 0 && download_thread_num > 1;
@@ -599,18 +619,37 @@ public:
 
     void consume(Chunk chunk) override
     {
+        std::lock_guard lock(cancel_mutex);
+        if (cancelled)
+            return;
         writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
+    void onCancel() override
+    {
+        std::lock_guard lock(cancel_mutex);
+        finalize();
+        cancelled = true;
+    }
+
     void onException() override
     {
-        if (!writer)
-            return;
-        onFinish();
+        std::lock_guard lock(cancel_mutex);
+        finalize();
     }
 
     void onFinish() override
     {
+        std::lock_guard lock(cancel_mutex);
+        finalize();
+    }
+
+private:
+    void finalize()
+    {
+        if (!writer)
+            return;
+
         try
         {
             writer->finalize();
@@ -625,11 +664,12 @@ public:
         }
     }
 
-private:
     Block sample_block;
     std::optional<FormatSettings> format_settings;
     std::unique_ptr<WriteBuffer> write_buf;
     OutputFormatPtr writer;
+    bool cancelled = false;
+    std::mutex cancel_mutex;
 };
 
 
@@ -786,27 +826,34 @@ std::shared_ptr<StorageS3Source::IteratorWrapper> StorageS3::createFileIterator(
     ContextPtr local_context,
     ASTPtr query,
     const Block & virtual_block,
-    const std::vector<String> & read_tasks)
+    const std::vector<String> & read_tasks,
+    std::unordered_map<String, S3::ObjectInfo> * object_infos,
+    Strings * read_keys)
 {
     if (distributed_processing)
     {
         return std::make_shared<StorageS3Source::IteratorWrapper>(
-            [read_tasks_iterator = std::make_shared<StorageS3Source::ReadTasksIterator>(read_tasks, local_context->getReadTaskCallback())]() -> String
+            [read_tasks_iterator = std::make_shared<StorageS3Source::ReadTasksIterator>(read_tasks, local_context->getReadTaskCallback()), read_keys]() -> String
         {
-                return read_tasks_iterator->next();
+                auto key = read_tasks_iterator->next();
+                if (read_keys)
+                    read_keys->push_back(key);
+                return key;
         });
     }
     else if (is_key_with_globs)
     {
         /// Iterate through disclosed globs and make a source for each file
         auto glob_iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
-            *s3_configuration.client, s3_configuration.uri, query, virtual_block, local_context);
+            *s3_configuration.client, s3_configuration.uri, query, virtual_block, local_context, object_infos, read_keys);
         return std::make_shared<StorageS3Source::IteratorWrapper>([glob_iterator]() { return glob_iterator->next(); });
     }
     else
     {
         auto keys_iterator
             = std::make_shared<StorageS3Source::KeysIterator>(keys, s3_configuration.uri.bucket, query, virtual_block, local_context);
+        if (read_keys)
+            *read_keys = keys;
         return std::make_shared<StorageS3Source::IteratorWrapper>([keys_iterator]() { return keys_iterator->next(); });
     }
 }
@@ -851,7 +898,8 @@ Pipe StorageS3::read(
         local_context,
         query_info.query,
         virtual_block,
-        read_tasks_used_in_schema_inference);
+        read_tasks_used_in_schema_inference,
+        &object_infos);
 
     ColumnsDescription columns_description;
     Block block_for_format;
@@ -894,7 +942,8 @@ Pipe StorageS3::read(
             s3_configuration.uri.bucket,
             s3_configuration.uri.version_id,
             iterator_wrapper,
-            max_download_threads));
+            max_download_threads,
+            object_infos));
     }
     auto pipe = Pipe::unitePipes(std::move(pipes));
 
@@ -1131,11 +1180,12 @@ ColumnsDescription StorageS3::getTableStructureFromData(
     const String & compression_method,
     bool distributed_processing,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr ctx)
+    ContextPtr ctx,
+    std::unordered_map<String, S3::ObjectInfo> * object_infos)
 {
     S3Configuration s3_configuration{ uri, access_key_id, secret_access_key, {}, {}, S3Settings::ReadWriteSettings(ctx->getSettingsRef()) };
     updateS3Configuration(ctx, s3_configuration);
-    return getTableStructureFromDataImpl(format, s3_configuration, compression_method, distributed_processing, uri.key.find_first_of("*?{") != std::string::npos, format_settings, ctx);
+    return getTableStructureFromDataImpl(format, s3_configuration, compression_method, distributed_processing, uri.key.find_first_of("*?{") != std::string::npos, format_settings, ctx, nullptr, object_infos);
 }
 
 ColumnsDescription StorageS3::getTableStructureFromDataImpl(
@@ -1146,12 +1196,20 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
     bool is_key_with_globs,
     const std::optional<FormatSettings> & format_settings,
     ContextPtr ctx,
-    std::vector<String> * read_keys_in_distributed_processing)
+    std::vector<String> * read_keys_in_distributed_processing,
+    std::unordered_map<String, S3::ObjectInfo> * object_infos)
 {
-    auto file_iterator
-        = createFileIterator(s3_configuration, {s3_configuration.uri.key}, is_key_with_globs, distributed_processing, ctx, nullptr, {});
+    std::vector<String> read_keys;
 
-    ReadBufferIterator read_buffer_iterator = [&, first = true]() mutable -> std::unique_ptr<ReadBuffer>
+    auto file_iterator
+        = createFileIterator(s3_configuration, {s3_configuration.uri.key}, is_key_with_globs, distributed_processing, ctx, nullptr, {}, {}, object_infos, &read_keys);
+
+    std::optional<ColumnsDescription> columns_from_cache;
+    size_t prev_read_keys_size = read_keys.size();
+    if (ctx->getSettingsRef().schema_inference_use_cache_for_s3)
+        columns_from_cache = tryGetColumnsFromCache(read_keys.begin(), read_keys.end(), s3_configuration, object_infos, format, format_settings, ctx);
+
+    ReadBufferIterator read_buffer_iterator = [&, first = true](ColumnsDescription & cached_columns) mutable -> std::unique_ptr<ReadBuffer>
     {
         auto key = (*file_iterator)();
 
@@ -1167,8 +1225,17 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
             return nullptr;
         }
 
-        if (distributed_processing && read_keys_in_distributed_processing)
-            read_keys_in_distributed_processing->push_back(key);
+        /// S3 file iterator could get new keys after new iteration, check them in schema cache.
+        if (ctx->getSettingsRef().schema_inference_use_cache_for_s3 && read_keys.size() > prev_read_keys_size)
+        {
+            columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end(), s3_configuration, object_infos, format, format_settings, ctx);
+            prev_read_keys_size = read_keys.size();
+            if (columns_from_cache)
+            {
+                cached_columns = *columns_from_cache;
+                return nullptr;
+            }
+        }
 
         first = false;
         const auto zstd_window_log_max = ctx->getSettingsRef().zstd_window_log_max;
@@ -1179,7 +1246,19 @@ ColumnsDescription StorageS3::getTableStructureFromDataImpl(
             zstd_window_log_max);
     };
 
-    return readSchemaFromFormat(format, format_settings, read_buffer_iterator, is_key_with_globs, ctx);
+    ColumnsDescription columns;
+    if (columns_from_cache)
+        columns = *columns_from_cache;
+    else
+        columns = readSchemaFromFormat(format, format_settings, read_buffer_iterator, is_key_with_globs, ctx);
+
+    if (ctx->getSettingsRef().schema_inference_use_cache_for_s3)
+        addColumnsToCache(read_keys, s3_configuration, columns, format, format_settings, ctx);
+
+    if (distributed_processing && read_keys_in_distributed_processing)
+        *read_keys_in_distributed_processing = std::move(read_keys);
+
+    return columns;
 }
 
 
@@ -1268,6 +1347,74 @@ bool StorageS3::supportsPartitionBy() const
     return true;
 }
 
+SchemaCache & StorageS3::getSchemaCache(const ContextPtr & ctx)
+{
+    static SchemaCache schema_cache(ctx->getConfigRef().getUInt("schema_inference_cache_max_elements_for_s3", DEFAULT_SCHEMA_CACHE_ELEMENTS));
+    return schema_cache;
+}
+
+std::optional<ColumnsDescription> StorageS3::tryGetColumnsFromCache(
+    const Strings::const_iterator & begin,
+    const Strings::const_iterator & end,
+    const S3Configuration & s3_configuration,
+    std::unordered_map<String, S3::ObjectInfo> * object_infos,
+    const String & format_name,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & ctx)
+{
+    auto & schema_cache = getSchemaCache(ctx);
+    for (auto it = begin; it < end; ++it)
+    {
+        String path = fs::path(s3_configuration.uri.bucket) / *it;
+        auto get_last_mod_time = [&]() -> std::optional<time_t>
+        {
+            S3::ObjectInfo info;
+            /// Check if we already have information about this object.
+            /// If no, request it and remember for possible future usage.
+            if (object_infos && object_infos->contains(path))
+                info = (*object_infos)[path];
+            else
+            {
+                /// Note that in case of exception in getObjectInfo returned info will be empty,
+                /// but schema cache will handle this case and won't return columns from cache
+                /// because we can't say that it's valid without last modification time.
+                info = S3::getObjectInfo(s3_configuration.client, s3_configuration.uri.bucket, *it, s3_configuration.uri.version_id, false);
+                if (object_infos)
+                    (*object_infos)[path] = info;
+            }
+
+            if (info.last_modification_time)
+                return info.last_modification_time;
+            return std::nullopt;
+        };
+
+        String source = fs::path(s3_configuration.uri.uri.getHost() + std::to_string(s3_configuration.uri.uri.getPort())) / path;
+        String cache_key = getKeyForSchemaCache(source, format_name, format_settings, ctx);
+        auto columns = schema_cache.tryGet(cache_key, get_last_mod_time);
+        if (columns)
+            return columns;
+    }
+
+    return std::nullopt;
+}
+
+void StorageS3::addColumnsToCache(
+    const Strings & keys,
+    const S3Configuration & s3_configuration,
+    const ColumnsDescription & columns,
+    const String & format_name,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & ctx)
+{
+    auto host_and_bucket = fs::path(s3_configuration.uri.uri.getHost() + std::to_string(s3_configuration.uri.uri.getPort())) / s3_configuration.uri.bucket;
+    Strings sources;
+    sources.reserve(keys.size());
+    std::transform(keys.begin(), keys.end(), std::back_inserter(sources), [&](const String & key){ return host_and_bucket / key; });
+    Strings cache_keys = getKeysForSchemaCache(sources, format_name, format_settings, ctx);
+    auto & schema_cache = getSchemaCache(ctx);
+    schema_cache.addMany(cache_keys, columns);
+}
+
 }
 
 #endif
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index c0e5b80c709..3a02237570d 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -18,6 +18,7 @@
 #include <IO/CompressionMethod.h>
 #include <Interpreters/Context.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
+#include <Storages/Cache/SchemaCache.h>
 
 namespace Aws::S3
 {
@@ -40,7 +41,9 @@ public:
             const S3::URI & globbed_uri_,
             ASTPtr query,
             const Block & virtual_header,
-            ContextPtr context);
+            ContextPtr context,
+            std::unordered_map<String, S3::ObjectInfo> * object_infos = nullptr,
+            Strings * read_keys_ = nullptr);
 
         String next();
 
@@ -94,7 +97,8 @@ public:
         const String & bucket,
         const String & version_id,
         std::shared_ptr<IteratorWrapper> file_iterator_,
-        size_t download_thread_num);
+        size_t download_thread_num,
+        const std::unordered_map<String, S3::ObjectInfo> & object_infos_);
 
     String getName() const override;
 
@@ -128,6 +132,8 @@ private:
 
     Poco::Logger * log = &Poco::Logger::get("StorageS3Source");
 
+    std::unordered_map<String, S3::ObjectInfo> object_infos;
+
     /// Recreate ReadBuffer and Pipeline for each file.
     bool initialize();
 
@@ -190,7 +196,8 @@ public:
         const String & compression_method,
         bool distributed_processing,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr ctx);
+        ContextPtr ctx,
+        std::unordered_map<String, S3::ObjectInfo> * object_infos = nullptr);
 
     static void processNamedCollectionResult(StorageS3Configuration & configuration, const std::vector<std::pair<String, ASTPtr>> & key_value_args);
 
@@ -204,6 +211,8 @@ public:
         S3Settings::ReadWriteSettings rw_settings;
     };
 
+    static SchemaCache & getSchemaCache(const ContextPtr & ctx);
+
 private:
     friend class StorageS3Cluster;
     friend class TableFunctionS3Cluster;
@@ -223,6 +232,8 @@ private:
 
     std::vector<String> read_tasks_used_in_schema_inference;
 
+    std::unordered_map<String, S3::ObjectInfo> object_infos;
+
     static void updateS3Configuration(ContextPtr, S3Configuration &);
 
     static std::shared_ptr<StorageS3Source::IteratorWrapper> createFileIterator(
@@ -233,7 +244,9 @@ private:
         ContextPtr local_context,
         ASTPtr query,
         const Block & virtual_block,
-        const std::vector<String> & read_tasks = {});
+        const std::vector<String> & read_tasks = {},
+        std::unordered_map<String, S3::ObjectInfo> * object_infos = nullptr,
+        Strings * read_keys = nullptr);
 
     static ColumnsDescription getTableStructureFromDataImpl(
         const String & format,
@@ -243,9 +256,27 @@ private:
         bool is_key_with_globs,
         const std::optional<FormatSettings> & format_settings,
         ContextPtr ctx,
-        std::vector<String> * read_keys_in_distributed_processing = nullptr);
+        std::vector<String> * read_keys_in_distributed_processing = nullptr,
+        std::unordered_map<String, S3::ObjectInfo> * object_infos = nullptr);
 
     bool supportsSubsetOfColumns() const override;
+
+    static std::optional<ColumnsDescription> tryGetColumnsFromCache(
+        const Strings::const_iterator & begin,
+        const Strings::const_iterator & end,
+        const S3Configuration & s3_configuration,
+        std::unordered_map<String, S3::ObjectInfo> * object_infos,
+        const String & format_name,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & ctx);
+
+    static void addColumnsToCache(
+        const Strings & keys,
+        const S3Configuration & s3_configuration,
+        const ColumnsDescription & columns,
+        const String & format_name,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & ctx);
 };
 
 }
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index 297f806d086..0c5e69cb906 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -56,7 +56,7 @@ StorageS3Cluster::StorageS3Cluster(
     const ConstraintsDescription & constraints_,
     ContextPtr context_,
     const String & compression_method_)
-    : IStorage(table_id_)
+    : IStorageCluster(table_id_)
     , s3_configuration{S3::URI{Poco::URI{filename_}}, access_key_id_, secret_access_key_, {}, {}, S3Settings::ReadWriteSettings(context_->getSettingsRef())}
     , filename(filename_)
     , cluster_name(cluster_name_)
@@ -105,12 +105,7 @@ Pipe StorageS3Cluster::read(
     unsigned /*num_streams*/)
 {
     StorageS3::updateS3Configuration(context, s3_configuration);
-
-    auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
-
-    auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
-        *s3_configuration.client, s3_configuration.uri, query_info.query, virtual_block, context);
-    auto callback = std::make_shared<StorageS3Source::IteratorWrapper>([iterator]() mutable -> String { return iterator->next(); });
+    createIteratorAndCallback(query_info.query, context);
 
     /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
     Block header =
@@ -129,7 +124,7 @@ Pipe StorageS3Cluster::read(
         {
             auto connection = std::make_shared<Connection>(
                 node.host_name, node.port, context->getGlobalContext()->getCurrentDatabase(),
-                node.user, node.password, node.cluster, node.cluster_secret,
+                node.user, node.password, node.quota_key, node.cluster, node.cluster_secret,
                 "S3ClusterInititiator",
                 node.compression,
                 node.secure
@@ -170,6 +165,29 @@ QueryProcessingStage::Enum StorageS3Cluster::getQueryProcessingStage(
 }
 
 
+void StorageS3Cluster::createIteratorAndCallback(ASTPtr query, ContextPtr context) const
+{
+    cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettingsRef());
+    iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
+        *s3_configuration.client, s3_configuration.uri, query, virtual_block, context);
+    callback = std::make_shared<StorageS3Source::IteratorWrapper>([iter = this->iterator]() mutable -> String { return iter->next(); });
+}
+
+
+RemoteQueryExecutor::Extension StorageS3Cluster::getTaskIteratorExtension(ContextPtr context) const
+{
+    createIteratorAndCallback(/*query=*/nullptr, context);
+    return RemoteQueryExecutor::Extension{.task_iterator = callback};
+}
+
+
+ClusterPtr StorageS3Cluster::getCluster(ContextPtr context) const
+{
+    createIteratorAndCallback(/*query=*/nullptr, context);
+    return cluster;
+}
+
+
 NamesAndTypesList StorageS3Cluster::getVirtuals() const
 {
     return virtual_columns;
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index f823d1fdf04..e18c33e79da 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -10,6 +10,7 @@
 #include "Client/Connection.h"
 #include <Interpreters/Cluster.h>
 #include <IO/S3Common.h>
+#include <Storages/IStorageCluster.h>
 #include <Storages/StorageS3.h>
 
 namespace DB
@@ -17,7 +18,7 @@ namespace DB
 
 class Context;
 
-class StorageS3Cluster : public IStorage
+class StorageS3Cluster : public IStorageCluster
 {
 public:
     StorageS3Cluster(
@@ -42,15 +43,22 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
+    RemoteQueryExecutor::Extension getTaskIteratorExtension(ContextPtr context) const override;
+    ClusterPtr getCluster(ContextPtr context) const override;
 private:
     StorageS3::S3Configuration s3_configuration;
-
     String filename;
     String cluster_name;
     String format_name;
     String compression_method;
     NamesAndTypesList virtual_columns;
     Block virtual_block;
+
+    mutable ClusterPtr cluster;
+    mutable std::shared_ptr<StorageS3Source::DisclosedGlobIterator> iterator;
+    mutable std::shared_ptr<StorageS3Source::IteratorWrapper> callback;
+
+    void createIteratorAndCallback(ASTPtr query, ContextPtr context) const;
 };
 
 
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index 2f586a3c26c..48f8adfece2 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -81,12 +81,11 @@ SetOrJoinSink::SetOrJoinSink(
 
 void SetOrJoinSink::consume(Chunk chunk)
 {
-    /// Sort columns in the block. This is necessary, since Set and Join count on the same column order in different blocks.
-    Block sorted_block = getHeader().cloneWithColumns(chunk.detachColumns()).sortColumns();
+    Block block = getHeader().cloneWithColumns(chunk.detachColumns());
 
-    table.insertBlock(sorted_block, getContext());
+    table.insertBlock(block, getContext());
     if (persistent)
-        backup_stream.write(sorted_block);
+        backup_stream.write(block);
 }
 
 void SetOrJoinSink::onFinish()
@@ -147,9 +146,7 @@ StorageSet::StorageSet(
     : StorageSetOrJoinBase{disk_, relative_path_, table_id_, columns_, constraints_, comment, persistent_}
     , set(std::make_shared<Set>(SizeLimits(), false, true))
 {
-
     Block header = getInMemoryMetadataPtr()->getSampleBlock();
-    header = header.sortColumns();
     set->setHeader(header.getColumnsWithTypeAndName());
 
     restore();
@@ -170,7 +167,6 @@ void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_sn
     disk->createDirectories(fs::path(path) / "tmp/");
 
     Block header = metadata_snapshot->getSampleBlock();
-    header = header.sortColumns();
 
     increment = 0;
     set = std::make_shared<Set>(SizeLimits(), false, true);
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index e3f477936db..0ecbdb0db10 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -320,6 +320,7 @@ void StorageStripeLog::rename(const String & new_path_to_table_data, const Stora
 {
     assert(table_path != new_path_to_table_data);
     {
+        disk->createDirectories(new_path_to_table_data);
         disk->moveDirectory(table_path, new_path_to_table_data);
 
         table_path = new_path_to_table_data;
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 15ae23305f3..8b115f5824e 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -15,7 +15,6 @@
 #include <IO/ConnectionTimeoutsContext.h>
 #include <IO/IOThreadPool.h>
 #include <IO/ParallelReadBuffer.h>
-#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromHTTP.h>
 #include <IO/WriteHelpers.h>
 
@@ -447,18 +446,36 @@ StorageURLSink::StorageURLSink(
 
 void StorageURLSink::consume(Chunk chunk)
 {
+    std::lock_guard lock(cancel_mutex);
+    if (cancelled)
+        return;
     writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
 }
 
+void StorageURLSink::onCancel()
+{
+    std::lock_guard lock(cancel_mutex);
+    finalize();
+    cancelled = true;
+}
+
 void StorageURLSink::onException()
 {
-    if (!writer)
-        return;
-    onFinish();
+    std::lock_guard lock(cancel_mutex);
+    finalize();
 }
 
 void StorageURLSink::onFinish()
 {
+    std::lock_guard lock(cancel_mutex);
+    finalize();
+}
+
+void StorageURLSink::finalize()
+{
+    if (!writer)
+        return;
+
     try
     {
         writer->finalize();
@@ -574,8 +591,11 @@ ColumnsDescription IStorageURLBase::getTableStructureFromData(
         urls_to_check = {uri};
     }
 
+    std::optional<ColumnsDescription> columns_from_cache;
+    if (context->getSettingsRef().schema_inference_use_cache_for_url)
+        columns_from_cache = tryGetColumnsFromCache(urls_to_check, headers, credentials, format, format_settings, context);
 
-    ReadBufferIterator read_buffer_iterator = [&, it = urls_to_check.cbegin()]() mutable -> std::unique_ptr<ReadBuffer>
+    ReadBufferIterator read_buffer_iterator = [&, it = urls_to_check.cbegin()](ColumnsDescription &) mutable -> std::unique_ptr<ReadBuffer>
     {
         if (it == urls_to_check.cend())
             return nullptr;
@@ -598,7 +618,16 @@ ColumnsDescription IStorageURLBase::getTableStructureFromData(
         return buf;
     };
 
-    return readSchemaFromFormat(format, format_settings, read_buffer_iterator, urls_to_check.size() > 1, context);
+    ColumnsDescription columns;
+    if (columns_from_cache)
+        columns = *columns_from_cache;
+    else
+        columns = readSchemaFromFormat(format, format_settings, read_buffer_iterator, urls_to_check.size() > 1, context);
+
+    if (context->getSettingsRef().schema_inference_use_cache_for_url)
+        addColumnsToCache(urls_to_check, columns, format, format_settings, context);
+
+    return columns;
 }
 
 bool IStorageURLBase::supportsSubsetOfColumns() const
@@ -779,6 +808,87 @@ SinkToStoragePtr IStorageURLBase::write(const ASTPtr & query, const StorageMetad
     }
 }
 
+SchemaCache & IStorageURLBase::getSchemaCache(const ContextPtr & context)
+{
+    static SchemaCache schema_cache(context->getConfigRef().getUInt("schema_inference_cache_max_elements_for_url", DEFAULT_SCHEMA_CACHE_ELEMENTS));
+    return schema_cache;
+}
+
+std::optional<ColumnsDescription> IStorageURLBase::tryGetColumnsFromCache(
+    const Strings & urls,
+    const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers,
+    const Poco::Net::HTTPBasicCredentials & credentials,
+    const String & format_name,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context)
+{
+    auto & schema_cache = getSchemaCache(context);
+    for (const auto & url : urls)
+    {
+        auto get_last_mod_time = [&]() -> std::optional<time_t>
+        {
+            auto last_mod_time = getLastModificationTime(url, headers, credentials, context);
+            /// Some URLs could not have Last-Modified header, in this case we cannot be sure that
+            /// data wasn't changed after adding it's schema to cache. Use schema from cache only if
+            /// special setting for this case is enabled.
+            if (!last_mod_time && !context->getSettingsRef().schema_inference_cache_require_modification_time_for_url)
+                return 0;
+            return last_mod_time;
+        };
+
+        String cache_key = getKeyForSchemaCache(url, format_name, format_settings, context);
+        auto columns = schema_cache.tryGet(cache_key, get_last_mod_time);
+        if (columns)
+            return columns;
+    }
+
+    return std::nullopt;
+}
+
+void IStorageURLBase::addColumnsToCache(
+    const Strings & urls,
+    const ColumnsDescription & columns,
+    const String & format_name,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context)
+{
+    auto & schema_cache = getSchemaCache(context);
+    Strings cache_keys = getKeysForSchemaCache(urls, format_name, format_settings, context);
+    schema_cache.addMany(cache_keys, columns);
+}
+
+std::optional<time_t> IStorageURLBase::getLastModificationTime(
+    const String & url,
+    const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers,
+    const Poco::Net::HTTPBasicCredentials & credentials,
+    const ContextPtr & context)
+{
+    try
+    {
+        ReadWriteBufferFromHTTP buf(
+            Poco::URI(url),
+            Poco::Net::HTTPRequest::HTTP_GET,
+            {},
+            ConnectionTimeouts::getHTTPTimeouts(context),
+            credentials,
+            context->getSettingsRef().max_http_get_redirects,
+            DBMS_DEFAULT_BUFFER_SIZE,
+            context->getReadSettings(),
+            headers,
+            ReadWriteBufferFromHTTP::Range{},
+            &context->getRemoteHostFilter(),
+            true,
+            false,
+            false);
+
+        return buf.getLastModificationTime();
+    }
+    catch (...)
+    {
+        return std::nullopt;
+    }
+}
+
 StorageURL::StorageURL(
     const String & uri_,
     const StorageID & table_id_,
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 79371242bb1..fb0d8e8fa43 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -8,6 +8,7 @@
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
+#include <Storages/Cache/SchemaCache.h>
 
 
 namespace DB
@@ -48,6 +49,8 @@ public:
         const std::optional<FormatSettings> & format_settings,
         ContextPtr context);
 
+    static SchemaCache & getSchemaCache(const ContextPtr & context);
+
 protected:
     IStorageURLBase(
         const String & uri_,
@@ -97,6 +100,27 @@ protected:
 
 private:
     virtual Block getHeaderBlock(const Names & column_names, const StorageSnapshotPtr & storage_snapshot) const = 0;
+
+    static std::optional<ColumnsDescription> tryGetColumnsFromCache(
+        const Strings & urls,
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers,
+        const Poco::Net::HTTPBasicCredentials & credentials,
+        const String & format_name,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context);
+
+    static void addColumnsToCache(
+        const Strings & urls,
+        const ColumnsDescription & columns,
+        const String & format_name,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context);
+
+    static std::optional<time_t> getLastModificationTime(
+        const String & url,
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers,
+        const Poco::Net::HTTPBasicCredentials & credentials,
+        const ContextPtr & context);
 };
 
 class StorageURLSink : public SinkToStorage
@@ -114,12 +138,16 @@ public:
 
     std::string getName() const override { return "StorageURLSink"; }
     void consume(Chunk chunk) override;
+    void onCancel() override;
     void onException() override;
     void onFinish() override;
 
 private:
+    void finalize();
     std::unique_ptr<WriteBuffer> write_buf;
     OutputFormatPtr writer;
+    std::mutex cancel_mutex;
+    bool cancelled = false;
 };
 
 class StorageURL : public IStorageURLBase
diff --git a/src/Storages/System/StorageSystemBackups.cpp b/src/Storages/System/StorageSystemBackups.cpp
index ccdd6678a88..e7146711c4a 100644
--- a/src/Storages/System/StorageSystemBackups.cpp
+++ b/src/Storages/System/StorageSystemBackups.cpp
@@ -15,12 +15,15 @@ namespace DB
 NamesAndTypesList StorageSystemBackups::getNamesAndTypes()
 {
     NamesAndTypesList names_and_types{
-        {"uuid", std::make_shared<DataTypeUUID>()},
-        {"backup_name", std::make_shared<DataTypeString>()},
+        {"id", std::make_shared<DataTypeString>()},
+        {"name", std::make_shared<DataTypeString>()},
         {"status", std::make_shared<DataTypeEnum8>(getBackupStatusEnumValues())},
-        {"status_changed_time", std::make_shared<DataTypeDateTime>()},
+        {"num_files", std::make_shared<DataTypeUInt64>()},
+        {"uncompressed_size", std::make_shared<DataTypeUInt64>()},
+        {"compressed_size", std::make_shared<DataTypeUInt64>()},
         {"error", std::make_shared<DataTypeString>()},
-        {"internal", std::make_shared<DataTypeUInt8>()},
+        {"start_time", std::make_shared<DataTypeDateTime>()},
+        {"end_time", std::make_shared<DataTypeDateTime>()},
     };
     return names_and_types;
 }
@@ -29,21 +32,27 @@ NamesAndTypesList StorageSystemBackups::getNamesAndTypes()
 void StorageSystemBackups::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     size_t column_index = 0;
-    auto & column_uuid = assert_cast<ColumnUUID &>(*res_columns[column_index++]);
-    auto & column_backup_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
+    auto & column_id = assert_cast<ColumnString &>(*res_columns[column_index++]);
+    auto & column_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_status = assert_cast<ColumnInt8 &>(*res_columns[column_index++]);
-    auto & column_status_changed_time = assert_cast<ColumnUInt32 &>(*res_columns[column_index++]);
+    auto & column_num_files = assert_cast<ColumnUInt64 &>(*res_columns[column_index++]);
+    auto & column_uncompressed_size = assert_cast<ColumnUInt64 &>(*res_columns[column_index++]);
+    auto & column_compressed_size = assert_cast<ColumnUInt64 &>(*res_columns[column_index++]);
     auto & column_error = assert_cast<ColumnString &>(*res_columns[column_index++]);
-    auto & column_internal = assert_cast<ColumnUInt8 &>(*res_columns[column_index++]);
+    auto & column_start_time = assert_cast<ColumnUInt32 &>(*res_columns[column_index++]);
+    auto & column_end_time = assert_cast<ColumnUInt32 &>(*res_columns[column_index++]);
 
     auto add_row = [&](const BackupsWorker::Info & info)
     {
-        column_uuid.insertValue(info.uuid);
-        column_backup_name.insertData(info.backup_name.data(), info.backup_name.size());
+        column_id.insertData(info.id.data(), info.id.size());
+        column_name.insertData(info.name.data(), info.name.size());
         column_status.insertValue(static_cast<Int8>(info.status));
-        column_status_changed_time.insertValue(info.status_changed_time);
+        column_num_files.insertValue(info.num_files);
+        column_uncompressed_size.insertValue(info.uncompressed_size);
+        column_compressed_size.insertValue(info.compressed_size);
         column_error.insertData(info.error_message.data(), info.error_message.size());
-        column_internal.insertValue(info.internal);
+        column_start_time.insertValue(std::chrono::system_clock::to_time_t(info.start_time));
+        column_end_time.insertValue(std::chrono::system_clock::to_time_t(info.end_time));
     };
 
     for (const auto & entry : context->getBackupsWorker().getAllInfos())
diff --git a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
index 56c96a0857c..dde90ce459a 100644
--- a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
@@ -21,7 +21,6 @@ const char * auto_config_build[]
     "LINK_FLAGS", "@FULL_EXE_LINKER_FLAGS_NORMALIZED@",
     "BUILD_COMPILE_DEFINITIONS", "@BUILD_COMPILE_DEFINITIONS@",
     "STATIC", "@USE_STATIC_LIBRARIES@",
-    "SPLIT_BINARY", "@CLICKHOUSE_SPLIT_BINARY@",
     "USE_EMBEDDED_COMPILER", "@USE_EMBEDDED_COMPILER@",
     "USE_GLIBC_COMPATIBILITY", "@GLIBC_COMPATIBILITY@",
     "USE_JEMALLOC", "@ENABLE_JEMALLOC@",
@@ -59,7 +58,6 @@ const char * auto_config_build[]
     "USE_AWS_S3", "@USE_AWS_S3@",
     "USE_CASSANDRA", "@USE_CASSANDRA@",
     "USE_YAML_CPP", "@USE_YAML_CPP@",
-    "CLICKHOUSE_SPLIT_BINARY", "@CLICKHOUSE_SPLIT_BINARY@",
     "USE_SENTRY", "@USE_SENTRY@",
     "USE_DATASKETCHES", "@USE_DATASKETCHES@",
     "USE_AVRO", "@USE_AVRO@",
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 1e303d1aeaa..096e2aa206d 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -39,20 +39,8 @@ void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr co
     {
         if (const auto * replicated = typeid_cast<const DatabaseReplicated *>(name_and_database.second.get()))
         {
-            // A quick fix for stateless tests with DatabaseReplicated. Its ZK
-            // node can be destroyed at any time. If another test lists
-            // system.clusters to get client command line suggestions, it will
-            // get an error when trying to get the info about DB from ZK.
-            // Just ignore these inaccessible databases. A good example of a
-            // failing test is `01526_client_start_and_exit`.
-            try
-            {
-                writeCluster(res_columns, {name_and_database.first, replicated->getCluster()});
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
+            if (auto database_cluster = replicated->tryGetCluster())
+                writeCluster(res_columns, {name_and_database.first, database_cluster});
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index d86a0d4f5df..a5d90655155 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -7,6 +7,7 @@ const char * auto_contributors[] {
     "243f6a88 85a308d3",
     "243f6a8885a308d313198a2e037",
     "3ldar-nasyrov",
+    "546",
     "7",
     "821008736@qq.com",
     "ANDREI STAROVEROV",
@@ -15,6 +16,7 @@ const char * auto_contributors[] {
     "Ahmed Dardery",
     "Aimiyoo",
     "Akazz",
+    "AlPerevyshin",
     "Alain BERRIER",
     "Albert Kidrachev",
     "Alberto",
@@ -215,6 +217,7 @@ const char * auto_contributors[] {
     "DF5HSE",
     "DIAOZHAFENG",
     "Dale McDiarmid",
+    "Dale Mcdiarmid",
     "Dan Roscigno",
     "DanRoscigno",
     "Daniel Bershatsky",
@@ -261,6 +264,7 @@ const char * auto_contributors[] {
     "Dongdong Yang",
     "DoomzD",
     "Dr. Strange Looker",
+    "Duc Canh Le",
     "DuckSoft",
     "Egor O'Sten",
     "Egor Savin",
@@ -293,6 +297,7 @@ const char * auto_contributors[] {
     "Fabiano Francesconi",
     "Fadi Hadzh",
     "Fan()",
+    "Fangyuan Deng",
     "FawnD2",
     "Federico Ceratto",
     "Federico Rodriguez",
@@ -349,6 +354,7 @@ const char * auto_contributors[] {
     "HuFuwang",
     "Hui Wang",
     "ILya Limarenko",
+    "Ignat Loskutov",
     "Igor",
     "Igor Hatarist",
     "Igor Mineev",
@@ -412,6 +418,7 @@ const char * auto_contributors[] {
     "John Skopis",
     "Jonatas Freitas",
     "Jordi Villar",
+    "Josh Taylor",
     "João Figueiredo",
     "Julian Gilyadov",
     "Julian Zhou",
@@ -461,10 +468,12 @@ const char * auto_contributors[] {
     "Leopold Schabel",
     "Lev Borodin",
     "Lewinma",
+    "Li Yin",
     "Liu Cong",
     "LiuCong",
     "LiuYangkuan",
     "Lopatin Konstantin",
+    "Lorenzo Mangani",
     "Loud_Scream",
     "Lucid Dreams",
     "Luis Bosque",
@@ -477,6 +486,7 @@ const char * auto_contributors[] {
     "Maksim",
     "Maksim Fedotov",
     "Maksim Kita",
+    "Mallik Hassan",
     "Malte",
     "Marat IDRISOV",
     "Marcelo Rodriguez",
@@ -556,6 +566,7 @@ const char * auto_contributors[] {
     "Mikhail f. Shiryaev",
     "MikuSugar",
     "Milad Arabi",
+    "Mingliang Pan",
     "Misko Lee",
     "Mohamad Fadhil",
     "Mohammad Hossein Sekhavat",
@@ -605,6 +616,7 @@ const char * auto_contributors[] {
     "Nikolay Vasiliev",
     "Nikolay Volosatov",
     "Nir Peled",
+    "Nityananda Gohain",
     "Niu Zhaojie",
     "Odin Hultgren Van Der Horst",
     "Okada Haruki",
@@ -738,7 +750,9 @@ const char * auto_contributors[] {
     "Simon Podlipsky",
     "Sina",
     "Sjoerd Mulder",
+    "SkyhotQin",
     "Slach",
+    "Smita Kulkarni",
     "Snow",
     "Sofia Antipushina",
     "Stanislav Pavlovichev",
@@ -747,6 +761,7 @@ const char * auto_contributors[] {
     "Stefan Thies",
     "Stepan",
     "Stepan Herold",
+    "Stephan",
     "Steve-金勇",
     "Stig Bakken",
     "Storozhuk Kostiantyn",
@@ -763,6 +778,7 @@ const char * auto_contributors[] {
     "Tai White",
     "Taleh Zaliyev",
     "Tangaev",
+    "Tanya Bragin",
     "Tatiana",
     "Tatiana Kirillova",
     "Teja",
@@ -910,6 +926,8 @@ const char * auto_contributors[] {
     "alesapin",
     "alex-zaitsev",
     "alex.lvxin",
+    "alexX512",
+    "alexander goryanets",
     "alexander kozhikhov",
     "alexey-milovidov",
     "alexeypavlenko",
@@ -968,6 +986,7 @@ const char * auto_contributors[] {
     "chertus",
     "chou.fan",
     "christophe.kalenzaga",
+    "clickhouse-robot-curie",
     "cms",
     "cmsxbc",
     "cn-ds",
@@ -1197,6 +1216,7 @@ const char * auto_contributors[] {
     "mwish",
     "myrrc",
     "nagorny",
+    "nathanbegbie",
     "nauta",
     "nautaa",
     "ndchikin",
@@ -1233,6 +1253,7 @@ const char * auto_contributors[] {
     "proller",
     "pufit",
     "pyos",
+    "pzhdfy",
     "qianlixiang",
     "qianmoQ",
     "qieqieplus",
@@ -1242,6 +1263,7 @@ const char * auto_contributors[] {
     "r1j1k",
     "rainbowsysu",
     "redclusive",
+    "renwujie",
     "rfraposa",
     "ritaank",
     "rnbondarenko",
@@ -1319,11 +1341,13 @@ const char * auto_contributors[] {
     "vitstn",
     "vivarum",
     "vladimir golovchenko",
+    "vsrsvas",
     "vxider",
     "vzakaznikov",
     "wangchao",
     "wangdh15",
     "weeds085490",
+    "whysage",
     "wuxiaobai24",
     "wzl",
     "xPoSx",
diff --git a/src/Storages/System/StorageSystemFilesystemCache.cpp b/src/Storages/System/StorageSystemFilesystemCache.cpp
index 2baddadec90..ba94cb01b75 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCache.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileSegment.h>
 #include <Common/FileCacheFactory.h>
 #include <Interpreters/Context.h>
@@ -24,6 +24,7 @@ NamesAndTypesList StorageSystemFilesystemCache::getNamesAndTypes()
         {"cache_hits", std::make_shared<DataTypeUInt64>()},
         {"references", std::make_shared<DataTypeUInt64>()},
         {"downloaded_size", std::make_shared<DataTypeUInt64>()},
+        {"persistent", std::make_shared<DataTypeNumber<UInt8>>()}
     };
 }
 
@@ -55,6 +56,7 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
             res_columns[6]->insert(file_segment->getHitsCount());
             res_columns[7]->insert(file_segment->getRefCount());
             res_columns[8]->insert(file_segment->getDownloadedSize());
+            res_columns[9]->insert(file_segment->isPersistent());
         }
     }
 }
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 1b207d1d165..07f3cd0ccc5 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -98,7 +98,7 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
 void StorageSystemParts::processNextStorage(
     ContextPtr context, MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
 {
-    using State = IMergeTreeDataPart::State;
+    using State = MergeTreeDataPartState;
     MergeTreeData::DataPartStateVector all_parts_state;
     MergeTreeData::DataPartsVector all_parts;
 
diff --git a/src/Storages/System/StorageSystemPartsColumns.cpp b/src/Storages/System/StorageSystemPartsColumns.cpp
index cebcfc492bf..87a5afe2439 100644
--- a/src/Storages/System/StorageSystemPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemPartsColumns.cpp
@@ -117,7 +117,7 @@ void StorageSystemPartsColumns::processNextStorage(
         auto index_size_in_bytes = part->getIndexSizeInBytes();
         auto index_size_in_allocated_bytes = part->getIndexSizeInAllocatedBytes();
 
-        using State = IMergeTreeDataPart::State;
+        using State = MergeTreeDataPartState;
 
         size_t column_position = 0;
         for (const auto & column : part->getColumns())
@@ -227,7 +227,7 @@ void StorageSystemPartsColumns::processNextStorage(
             if (columns_mask[src_index++])
                 columns[res_index++]->insert(column_size.marks);
 
-            auto serialization = part->getSerialization(column);
+            auto serialization = part->getSerialization(column.name);
             if (columns_mask[src_index++])
                 columns[res_index++]->insert(ISerialization::kindToString(serialization->getKind()));
 
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 7314c1e5012..3934e7c9623 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -92,7 +92,7 @@ StorageSystemProjectionParts::StorageSystemProjectionParts(const StorageID & tab
 void StorageSystemProjectionParts::processNextStorage(
     ContextPtr, MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
 {
-    using State = IMergeTreeDataPart::State;
+    using State = MergeTreeDataPartState;
     MergeTreeData::DataPartStateVector all_parts_state;
     MergeTreeData::ProjectionPartsVector all_parts = info.getProjectionParts(all_parts_state, has_state_column);
     for (size_t part_number = 0; part_number < all_parts.projection_parts.size(); ++part_number)
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
index 78a6df58761..0847010faaa 100644
--- a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
@@ -122,7 +122,7 @@ void StorageSystemProjectionPartsColumns::processNextStorage(
         auto index_size_in_bytes = part->getIndexSizeInBytes();
         auto index_size_in_allocated_bytes = part->getIndexSizeInAllocatedBytes();
 
-        using State = IMergeTreeDataPart::State;
+        using State = MergeTreeDataPartState;
 
         size_t column_position = 0;
         auto & columns_info = projection_columns_info[part->name];
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.cpp b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
index a482f5d87ca..662255d6afd 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.cpp
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
@@ -1,7 +1,7 @@
 #include "StorageSystemRemoteDataPaths.h"
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeArray.h>
-#include <Common/IFileCache.h>
+#include <Common/FileCache.h>
 #include <Common/FileCacheFactory.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
@@ -56,7 +56,8 @@ Pipe StorageSystemRemoteDataPaths::read(
             disk->getRemotePathsRecursive("data", remote_paths_by_local_path);
 
             FileCachePtr cache;
-            auto cache_base_path = disk->getCacheBasePath();
+            auto cache_base_path = disk->supportsCache() ? disk->getCacheBasePath() : "";
+
             if (!cache_base_path.empty())
                 cache = FileCacheFactory::instance().get(cache_base_path);
 
diff --git a/src/Storages/System/StorageSystemSchemaInferenceCache.cpp b/src/Storages/System/StorageSystemSchemaInferenceCache.cpp
new file mode 100644
index 00000000000..1a32128c7e0
--- /dev/null
+++ b/src/Storages/System/StorageSystemSchemaInferenceCache.cpp
@@ -0,0 +1,74 @@
+#include <Storages/System/StorageSystemSchemaInferenceCache.h>
+#include <Storages/StorageFile.h>
+#include <Storages/StorageS3.h>
+#include <Storages/StorageURL.h>
+#include <Storages/HDFS/StorageHDFS.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Interpreters/Context.h>
+#include <IO/WriteHelpers.h>
+#include <Formats/ReadSchemaUtils.h>
+
+namespace DB
+{
+
+static String getSchemaString(const ColumnsDescription & columns)
+{
+    WriteBufferFromOwnString buf;
+    const auto & names_and_types = columns.getAll();
+    for (auto it = names_and_types.begin(); it != names_and_types.end(); ++it)
+    {
+        if (it != names_and_types.begin())
+            writeCString(", ", buf);
+        writeString(it->name, buf);
+        writeChar(' ', buf);
+        writeString(it->type->getName(), buf);
+    }
+
+    return buf.str();
+}
+
+NamesAndTypesList StorageSystemSchemaInferenceCache::getNamesAndTypes()
+{
+    return {
+        {"storage", std::make_shared<DataTypeString>()},
+        {"source", std::make_shared<DataTypeString>()},
+        {"format", std::make_shared<DataTypeString>()},
+        {"additional_format_info", std::make_shared<DataTypeString>()},
+        {"registration_time", std::make_shared<DataTypeDateTime>()},
+        {"schema", std::make_shared<DataTypeString>()}
+    };
+}
+
+
+static void fillDataImpl(MutableColumns & res_columns, SchemaCache & schema_cache, const String & storage_name)
+{
+    auto s3_schema_cache_data = schema_cache.getAll();
+    String source;
+    String format;
+    String additional_format_info;
+    for (const auto & [key, schema_info] : s3_schema_cache_data)
+    {
+        splitSchemaCacheKey(key, source, format, additional_format_info);
+        res_columns[0]->insert(storage_name);
+        res_columns[1]->insert(source);
+        res_columns[2]->insert(format);
+        res_columns[3]->insert(additional_format_info);
+        res_columns[4]->insert(schema_info.registration_time);
+        res_columns[5]->insert(getSchemaString(schema_info.columns));
+    }
+}
+
+void StorageSystemSchemaInferenceCache::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+{
+    fillDataImpl(res_columns, StorageFile::getSchemaCache(context), "File");
+#if USE_AWS_S3
+    fillDataImpl(res_columns, StorageS3::getSchemaCache(context), "S3");
+#endif
+#if USE_HDFS
+    fillDataImpl(res_columns, StorageHDFS::getSchemaCache(context), "HDFS");
+#endif
+    fillDataImpl(res_columns, StorageURL::getSchemaCache(context), "URL");
+}
+
+}
diff --git a/src/Storages/System/StorageSystemSchemaInferenceCache.h b/src/Storages/System/StorageSystemSchemaInferenceCache.h
new file mode 100644
index 00000000000..357bd687da6
--- /dev/null
+++ b/src/Storages/System/StorageSystemSchemaInferenceCache.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+#include <Storages/Cache/SchemaCache.h>
+
+namespace DB
+{
+
+class StorageSystemSchemaInferenceCache final : public IStorageSystemOneBlock<StorageSystemSchemaInferenceCache>
+{
+public:
+    std::string getName() const override { return "SystemSettingsChanges"; }
+
+    static NamesAndTypesList getNamesAndTypes();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+};
+
+}
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index dbef2df953b..ab1ffdf209a 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -74,6 +74,7 @@
 #include <Storages/System/StorageSystemFilesystemCache.h>
 #include <Storages/System/StorageSystemRemoteDataPaths.h>
 #include <Storages/System/StorageSystemCertificates.h>
+#include <Storages/System/StorageSystemSchemaInferenceCache.h>
 
 #ifdef OS_LINUX
 #include <Storages/System/StorageSystemStackTrace.h>
@@ -133,6 +134,7 @@ void attachSystemTablesLocal(ContextPtr context, IDatabase & system_database)
     attach<StorageSystemLicenses>(context, system_database, "licenses");
     attach<StorageSystemTimeZones>(context, system_database, "time_zones");
     attach<StorageSystemBackups>(context, system_database, "backups");
+    attach<StorageSystemSchemaInferenceCache>(context, system_database, "schema_inference_cache");
 #ifdef OS_LINUX
     attach<StorageSystemStackTrace>(context, system_database, "stack_trace");
 #endif
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index 40cf650f690..43e31b8e4f4 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <Core/NamesAndTypes.h>
 
 #include <Interpreters/Context.h>
@@ -154,14 +155,13 @@ bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block
     std::function<bool(const ASTPtr &)> is_constant = [&block, &context](const ASTPtr & node)
     {
         auto actions = std::make_shared<ActionsDAG>(block.getColumnsWithTypeAndName());
-        PreparedSets prepared_sets;
-        SubqueriesForSets subqueries_for_sets;
+        PreparedSetsPtr prepared_sets = std::make_shared<PreparedSets>();
         const NamesAndTypesList source_columns;
         const NamesAndTypesList aggregation_keys;
         const ColumnNumbersList grouping_set_keys;
 
         ActionsVisitor::Data visitor_data(
-            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, subqueries_for_sets, true, true, true, false,
+            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, true, true, true, false,
             { aggregation_keys, grouping_set_keys, GroupByKind::NONE });
         ActionsVisitor(visitor_data).visit(node);
         actions = visitor_data.getActions();
diff --git a/src/Storages/examples/get_current_inserts_in_replicated.cpp b/src/Storages/examples/get_current_inserts_in_replicated.cpp
index d7dedbcab9c..0d04cbd260e 100644
--- a/src/Storages/examples/get_current_inserts_in_replicated.cpp
+++ b/src/Storages/examples/get_current_inserts_in_replicated.cpp
@@ -85,7 +85,7 @@ try
         for (BlockInfo & block : block_infos)
         {
             Coordination::GetResponse resp = block.contents_future.get();
-            if (resp.error == Coordination::Error::ZOK && lock_holder_paths.count(resp.data))
+            if (resp.error == Coordination::Error::ZOK && lock_holder_paths.contains(resp.data))
             {
                 ++total_count;
                 current_inserts[block.partition].insert(block.number);
diff --git a/src/TableFunctions/Hive/TableFunctionHive.cpp b/src/TableFunctions/Hive/TableFunctionHive.cpp
index 12371df4e3c..ea682ce8c1f 100644
--- a/src/TableFunctions/Hive/TableFunctionHive.cpp
+++ b/src/TableFunctions/Hive/TableFunctionHive.cpp
@@ -14,7 +14,7 @@
 #include <Storages/Hive/StorageHive.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Common/logger_useful.h>
 
 namespace DB
diff --git a/src/TableFunctions/ITableFunctionFileLike.cpp b/src/TableFunctions/ITableFunctionFileLike.cpp
index e2391787726..8be2341b81d 100644
--- a/src/TableFunctions/ITableFunctionFileLike.cpp
+++ b/src/TableFunctions/ITableFunctionFileLike.cpp
@@ -1,5 +1,5 @@
 #include <TableFunctions/ITableFunctionFileLike.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
diff --git a/src/TableFunctions/TableFunctionExecutable.cpp b/src/TableFunctions/TableFunctionExecutable.cpp
index b84008f5ac8..260b80c40f3 100644
--- a/src/TableFunctions/TableFunctionExecutable.cpp
+++ b/src/TableFunctions/TableFunctionExecutable.cpp
@@ -2,9 +2,12 @@
 
 #include <Common/Exception.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/parseQuery.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageExecutable.h>
 #include <DataTypes/DataTypeFactory.h>
@@ -48,7 +51,7 @@ void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, Contex
     std::vector<String> script_name_with_arguments;
     boost::split(script_name_with_arguments, script_name_with_arguments_value, [](char c){ return c == ' '; });
 
-    script_name = script_name_with_arguments[0];
+    script_name = std::move(script_name_with_arguments[0]);
     script_name_with_arguments.erase(script_name_with_arguments.begin());
     arguments = std::move(script_name_with_arguments);
     format = checkAndGetLiteralArgument<String>(args[1], "format");
@@ -56,14 +59,26 @@ void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, Contex
 
     for (size_t i = 3; i < args.size(); ++i)
     {
-        ASTPtr query = args[i]->children.at(0);
-        if (!query->as<ASTSelectWithUnionQuery>())
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                "Table function '{}' argument is invalid input query {}",
-                getName(),
-                query->formatForErrorMessage());
-
-        input_queries.emplace_back(std::move(query));
+        if (args[i]->as<ASTSetQuery>())
+        {
+            settings_query = std::move(args[i]);
+        }
+        else
+        {
+            ASTPtr query = args[i]->children.at(0);
+            if (query->as<ASTSelectWithUnionQuery>())
+            {
+                input_queries.emplace_back(std::move(query));
+            }
+            else
+            {
+                throw Exception(
+                    ErrorCodes::UNSUPPORTED_METHOD,
+                    "Table function '{}' argument is invalid {}",
+                    getName(),
+                    args[i]->formatForErrorMessage());
+            }
+        }
     }
 }
 
@@ -79,6 +94,8 @@ StoragePtr TableFunctionExecutable::executeImpl(const ASTPtr & /*ast_function*/,
     ExecutableSettings settings;
     settings.script_name = script_name;
     settings.script_arguments = arguments;
+    if (settings_query != nullptr)
+        settings.applyChanges(settings_query->as<ASTSetQuery>()->changes);
 
     auto storage = std::make_shared<StorageExecutable>(storage_id, format, settings, input_queries, getActualTableStructure(context), ConstraintsDescription{});
     storage->startup();
diff --git a/src/TableFunctions/TableFunctionExecutable.h b/src/TableFunctions/TableFunctionExecutable.h
index 128ee8e46fc..820da077ca2 100644
--- a/src/TableFunctions/TableFunctionExecutable.h
+++ b/src/TableFunctions/TableFunctionExecutable.h
@@ -6,6 +6,7 @@ namespace DB
 {
 
 class Context;
+class ASTSetQuery;
 
 /* executable(script_name_optional_arguments, format, structure, input_query) - creates a temporary storage from executable file
  *
@@ -32,5 +33,6 @@ private:
     String format;
     String structure;
     std::vector<ASTPtr> input_queries;
+    ASTPtr settings_query = nullptr;
 };
 }
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 6f8f0db46a0..fd474f037b3 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -1,5 +1,5 @@
 #include <TableFunctions/TableFunctionFile.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 #include "Parsers/IAST_fwd.h"
 #include "registerTableFunctions.h"
diff --git a/src/TableFunctions/TableFunctionFormat.cpp b/src/TableFunctions/TableFunctionFormat.cpp
index d47f8353e18..0aac91d6095 100644
--- a/src/TableFunctions/TableFunctionFormat.cpp
+++ b/src/TableFunctions/TableFunctionFormat.cpp
@@ -50,7 +50,7 @@ void TableFunctionFormat::parseArguments(const ASTPtr & ast_function, ContextPtr
 
 ColumnsDescription TableFunctionFormat::getActualTableStructure(ContextPtr context) const
 {
-    ReadBufferIterator read_buffer_iterator = [&]()
+    ReadBufferIterator read_buffer_iterator = [&](ColumnsDescription &)
     {
         return std::make_unique<ReadBufferFromString>(data);
     };
diff --git a/src/TableFunctions/TableFunctionGenerateRandom.cpp b/src/TableFunctions/TableFunctionGenerateRandom.cpp
index 083e4a54190..8d1c06c7c4d 100644
--- a/src/TableFunctions/TableFunctionGenerateRandom.cpp
+++ b/src/TableFunctions/TableFunctionGenerateRandom.cpp
@@ -12,7 +12,7 @@
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionGenerateRandom.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 #include "registerTableFunctions.h"
 
diff --git a/src/TableFunctions/TableFunctionHDFS.cpp b/src/TableFunctions/TableFunctionHDFS.cpp
index e8d25bfd476..ed3000ec152 100644
--- a/src/TableFunctions/TableFunctionHDFS.cpp
+++ b/src/TableFunctions/TableFunctionHDFS.cpp
@@ -6,7 +6,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionHDFS.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 namespace DB
 {
diff --git a/src/TableFunctions/TableFunctionHDFSCluster.cpp b/src/TableFunctions/TableFunctionHDFSCluster.cpp
index b5e14a91b91..4a68fec1a5e 100644
--- a/src/TableFunctions/TableFunctionHDFSCluster.cpp
+++ b/src/TableFunctions/TableFunctionHDFSCluster.cpp
@@ -13,7 +13,7 @@
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionHDFS.h>
 #include <TableFunctions/TableFunctionHDFSCluster.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/IAST_fwd.h>
 
diff --git a/src/TableFunctions/TableFunctionInput.cpp b/src/TableFunctions/TableFunctionInput.cpp
index 0f26cab3683..df87afcad3c 100644
--- a/src/TableFunctions/TableFunctionInput.cpp
+++ b/src/TableFunctions/TableFunctionInput.cpp
@@ -1,6 +1,6 @@
 #include <TableFunctions/TableFunctionInput.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Common/Exception.h>
diff --git a/src/TableFunctions/TableFunctionMongoDB.cpp b/src/TableFunctions/TableFunctionMongoDB.cpp
index 5e96b85e64c..962afed8c11 100644
--- a/src/TableFunctions/TableFunctionMongoDB.cpp
+++ b/src/TableFunctions/TableFunctionMongoDB.cpp
@@ -9,7 +9,7 @@
 
 #include <TableFunctions/TableFunctionMongoDB.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <TableFunctions/registerTableFunctions.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/ColumnsDescription.h>
diff --git a/src/TableFunctions/TableFunctionNull.cpp b/src/TableFunctions/TableFunctionNull.cpp
index f5d5a92ec1a..1a35830b06c 100644
--- a/src/TableFunctions/TableFunctionNull.cpp
+++ b/src/TableFunctions/TableFunctionNull.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/ASTFunction.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageNull.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionNull.h>
 #include <Interpreters/evaluateConstantExpression.h>
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index 101d946a3f9..e81b67d70a4 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -7,7 +7,7 @@
 #include <Interpreters/Context.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionS3.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageS3.h>
diff --git a/src/TableFunctions/TableFunctionS3Cluster.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
index fab74c07e11..d76bd954d27 100644
--- a/src/TableFunctions/TableFunctionS3Cluster.cpp
+++ b/src/TableFunctions/TableFunctionS3Cluster.cpp
@@ -14,7 +14,7 @@
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionS3.h>
 #include <TableFunctions/TableFunctionS3Cluster.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/IAST_fwd.h>
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index cc399587542..f4742792573 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -9,7 +9,7 @@
 #include <Storages/StorageURL.h>
 #include <Storages/StorageExternalDistributed.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Formats/FormatFactory.h>
 
 
diff --git a/src/TableFunctions/TableFunctionValues.cpp b/src/TableFunctions/TableFunctionValues.cpp
index 3f16b35fce5..8d52cff4879 100644
--- a/src/TableFunctions/TableFunctionValues.cpp
+++ b/src/TableFunctions/TableFunctionValues.cpp
@@ -11,7 +11,7 @@
 
 #include <TableFunctions/TableFunctionValues.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 #include <Interpreters/convertFieldToType.h>
 #include <Interpreters/evaluateConstantExpression.h>
diff --git a/src/TableFunctions/TableFunctionViewIfPermitted.cpp b/src/TableFunctions/TableFunctionViewIfPermitted.cpp
index dbc4d40d079..ba3d2cb9d16 100644
--- a/src/TableFunctions/TableFunctionViewIfPermitted.cpp
+++ b/src/TableFunctions/TableFunctionViewIfPermitted.cpp
@@ -8,7 +8,7 @@
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionViewIfPermitted.h>
-#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include "registerTableFunctions.h"
 
diff --git a/tests/ci/.gitignore b/tests/ci/.gitignore
new file mode 100644
index 00000000000..b1230661a88
--- /dev/null
+++ b/tests/ci/.gitignore
@@ -0,0 +1,3 @@
+*_lambda/lambda-venv
+*_lambda/lambda-package
+*_lambda/lambda-package.zip
diff --git a/tests/ci/ast_fuzzer_check.py b/tests/ci/ast_fuzzer_check.py
index 9ccae89b403..9f3ddbe9932 100644
--- a/tests/ci/ast_fuzzer_check.py
+++ b/tests/ci/ast_fuzzer_check.py
@@ -58,7 +58,7 @@ if __name__ == "__main__":
 
     pr_info = PRInfo()
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, check_name)
     if rerun_helper.is_already_finished_by_status():
@@ -117,7 +117,7 @@ if __name__ == "__main__":
         "core.gz": os.path.join(workspace_path, "core.gz"),
     }
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     for f in paths:
         try:
             paths[f] = s3_helper.upload_test_report_to_s3(paths[f], s3_prefix + "/" + f)
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index 3976e2ba916..610877a5508 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -15,6 +15,7 @@ from env_helper import (
     IMAGES_PATH,
     REPO_COPY,
     S3_BUILDS_BUCKET,
+    S3_DOWNLOAD,
     TEMP_PATH,
 )
 from s3_helper import S3Helper
@@ -39,7 +40,7 @@ def _can_export_binaries(build_config: BuildConfig) -> bool:
         return False
     if build_config["bundled"] != "bundled":
         return False
-    if build_config["splitted"] == "splitted":
+    if build_config["libraries"] == "shared":
         return False
     if build_config["sanitizer"] != "":
         return True
@@ -68,8 +69,8 @@ def get_packager_cmd(
         cmd += f" --build-type={build_config['build_type']}"
     if build_config["sanitizer"]:
         cmd += f" --sanitizer={build_config['sanitizer']}"
-    if build_config["splitted"] == "splitted":
-        cmd += " --split-binary"
+    if build_config["libraries"] == "shared":
+        cmd += " --shared-libraries"
     if build_config["tidy"] == "enable":
         cmd += " --clang-tidy"
 
@@ -142,11 +143,9 @@ def check_for_success_run(
     for url in build_results:
         url_escaped = url.replace("+", "%2B").replace(" ", "%20")
         if BUILD_LOG_NAME in url:
-            log_url = f"https://s3.amazonaws.com/{S3_BUILDS_BUCKET}/{url_escaped}"
+            log_url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{url_escaped}"
         else:
-            build_urls.append(
-                f"https://s3.amazonaws.com/{S3_BUILDS_BUCKET}/{url_escaped}"
-            )
+            build_urls.append(f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{url_escaped}")
     if not log_url:
         # log is uploaded the last, so if there's no log we need to rerun the build
         return
@@ -250,7 +249,7 @@ def main():
 
     logging.info("Repo copy path %s", REPO_COPY)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     version = get_version_from_repo(git=Git(True))
     release_or_pr, performance_pr = get_release_or_pr(pr_info, version)
diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
index 4bb7a619b9f..7ebebb881bc 100644
--- a/tests/ci/build_report_check.py
+++ b/tests/ci/build_report_check.py
@@ -4,6 +4,7 @@ import json
 import logging
 import os
 import sys
+import atexit
 from typing import Dict, List, Tuple
 
 from github import Github
@@ -21,7 +22,7 @@ from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
 from commit_status_helper import (
     get_commit,
-    fail_simple_check,
+    update_mergeable_check,
 )
 from ci_config import CI_CONFIG
 from rerun_helper import RerunHelper
@@ -37,7 +38,7 @@ class BuildResult:
         build_type,
         sanitizer,
         bundled,
-        splitted,
+        libraries,
         status,
         elapsed_seconds,
         with_coverage,
@@ -46,7 +47,7 @@ class BuildResult:
         self.build_type = build_type
         self.sanitizer = sanitizer
         self.bundled = bundled
-        self.splitted = splitted
+        self.libraries = libraries
         self.status = status
         self.elapsed_seconds = elapsed_seconds
         self.with_coverage = with_coverage
@@ -91,7 +92,7 @@ def get_failed_report(
         build_type="unknown",
         sanitizer="unknown",
         bundled="unknown",
-        splitted="unknown",
+        libraries="unknown",
         status=message,
         elapsed_seconds=0,
         with_coverage=False,
@@ -108,7 +109,7 @@ def process_report(
         build_type=build_config["build_type"],
         sanitizer=build_config["sanitizer"],
         bundled=build_config["bundled"],
-        splitted=build_config["splitted"],
+        libraries=build_config["libraries"],
         status="success" if build_report["status"] else "failure",
         elapsed_seconds=build_report["elapsed_seconds"],
         with_coverage=False,
@@ -154,16 +155,19 @@ def main():
             needs_data = json.load(file_handler)
             required_builds = len(needs_data)
 
-    # A report might be empty in case of `do not test` label, for example.
-    # We should still be able to merge such PRs.
-    all_skipped = needs_data is not None and all(
+    if needs_data is not None and all(
         i["result"] == "skipped" for i in needs_data.values()
-    )
+    ):
+        logging.info("All builds are skipped, exiting")
+        sys.exit(0)
 
     logging.info("The next builds are required: %s", ", ".join(needs_data))
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo()
+
+    atexit.register(update_mergeable_check, gh, pr_info, build_check_name)
+
     rerun_helper = RerunHelper(gh, pr_info, build_check_name)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
@@ -237,12 +241,10 @@ def main():
     total_groups = len(build_results)
     logging.info("Totally got %s artifact groups", total_groups)
     if total_groups == 0:
-        if not all_skipped:
-            fail_simple_check(gh, pr_info, f"{build_check_name} failed")
         logging.error("No success builds, failing check")
         sys.exit(1)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commits/master"
     branch_name = "master"
@@ -308,8 +310,6 @@ def main():
     )
 
     if summary_status == "error":
-        if not all_skipped:
-            fail_simple_check(gh, pr_info, f"{build_check_name} failed")
         sys.exit(1)
 
 
diff --git a/tests/ci/ccache_utils.py b/tests/ci/ccache_utils.py
index bd155b02cb4..cfe07363589 100644
--- a/tests/ci/ccache_utils.py
+++ b/tests/ci/ccache_utils.py
@@ -7,9 +7,10 @@ import os
 import shutil
 from pathlib import Path
 
-import requests
+import requests  # type: ignore
 
 from compress_files import decompress_fast, compress_fast
+from env_helper import S3_DOWNLOAD, S3_BUILDS_BUCKET
 
 DOWNLOAD_RETRIES_COUNT = 5
 
@@ -73,7 +74,7 @@ def get_ccache_if_not_exists(
         for obj in objects:
             if ccache_name in obj:
                 logging.info("Found ccache on path %s", obj)
-                url = "https://s3.amazonaws.com/clickhouse-builds/" + obj
+                url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{obj}"
                 compressed_cache = os.path.join(temp_path, os.path.basename(obj))
                 dowload_file_with_progress(url, compressed_cache)
 
diff --git a/tests/ci/cherry_pick.py b/tests/ci/cherry_pick.py
index 334a24ed7af..a0a77a2684e 100644
--- a/tests/ci/cherry_pick.py
+++ b/tests/ci/cherry_pick.py
@@ -206,7 +206,13 @@ Merge it only if you intend to backport changes to the target branch, otherwise
         )
         self.cherrypick_pr.add_to_labels(Labels.LABEL_CHERRYPICK)
         self.cherrypick_pr.add_to_labels(Labels.LABEL_DO_NOT_TEST)
-        self.cherrypick_pr.add_to_assignees(self.pr.assignee)
+        if self.pr.assignees:
+            logging.info(
+                "Assing to assignees of the original PR: %s",
+                ", ".join(user.login for user in self.pr.assignees),
+            )
+            self.cherrypick_pr.add_to_assignees(*self.pr.assignees)
+        logging.info("Assign to the author of the original PR: %s", self.pr.user.login)
         self.cherrypick_pr.add_to_assignees(self.pr.user)
 
     def create_backport(self):
@@ -238,7 +244,13 @@ Merge it only if you intend to backport changes to the target branch, otherwise
             head=self.backport_branch,
         )
         self.backport_pr.add_to_labels(Labels.LABEL_BACKPORT)
-        self.backport_pr.add_to_assignees(self.pr.assignee)
+        if self.pr.assignees:
+            logging.info(
+                "Assing to assignees of the original PR: %s",
+                ", ".join(user.login for user in self.pr.assignees),
+            )
+            self.cherrypick_pr.add_to_assignees(*self.pr.assignees)
+        logging.info("Assign to the author of the original PR: %s", self.pr.user.login)
         self.backport_pr.add_to_assignees(self.pr.user)
 
     @property
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index 10db5d05ad4..4b2cf4df743 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -14,7 +14,7 @@ CI_CONFIG = {
             "package_type": "deb",
             "static_binary_name": "amd64",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "additional_pkgs": True,
             "tidy": "disable",
             "with_coverage": False,
@@ -25,7 +25,7 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "coverity",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
             "official": False,
@@ -37,7 +37,7 @@ CI_CONFIG = {
             "package_type": "deb",
             "static_binary_name": "aarch64",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "additional_pkgs": True,
             "tidy": "disable",
             "with_coverage": False,
@@ -48,7 +48,7 @@ CI_CONFIG = {
             "sanitizer": "address",
             "package_type": "deb",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -58,17 +58,17 @@ CI_CONFIG = {
             "sanitizer": "undefined",
             "package_type": "deb",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
         "package_tsan": {
-            "compiler": "clang-13",
+            "compiler": "clang-15",
             "build_type": "",
             "sanitizer": "thread",
             "package_type": "deb",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -78,7 +78,7 @@ CI_CONFIG = {
             "sanitizer": "memory",
             "package_type": "deb",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -88,7 +88,7 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "deb",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -98,7 +98,7 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -109,17 +109,17 @@ CI_CONFIG = {
             "package_type": "binary",
             "static_binary_name": "debug-amd64",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "enable",
             "with_coverage": False,
         },
-        "binary_splitted": {
+        "binary_shared": {
             "compiler": "clang-14",
             "build_type": "",
             "sanitizer": "",
             "package_type": "binary",
             "bundled": "bundled",
-            "splitted": "splitted",
+            "libraries": "shared",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -130,7 +130,7 @@ CI_CONFIG = {
             "package_type": "binary",
             "static_binary_name": "macos",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -140,7 +140,7 @@ CI_CONFIG = {
             "sanitizer": "",
             "package_type": "binary",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -151,7 +151,7 @@ CI_CONFIG = {
             "package_type": "binary",
             "static_binary_name": "freebsd",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -162,7 +162,7 @@ CI_CONFIG = {
             "package_type": "binary",
             "static_binary_name": "macos-aarch64",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -173,7 +173,7 @@ CI_CONFIG = {
             "package_type": "binary",
             "static_binary_name": "powerpc64le",
             "bundled": "bundled",
-            "splitted": "unsplitted",
+            "libraries": "static",
             "tidy": "disable",
             "with_coverage": False,
         },
@@ -192,7 +192,7 @@ CI_CONFIG = {
         ],
         "ClickHouse special build check": [
             "binary_tidy",
-            "binary_splitted",
+            "binary_shared",
             "binary_darwin",
             "binary_aarch64",
             "binary_freebsd",
@@ -297,7 +297,7 @@ CI_CONFIG = {
             "required_build": "package_release",
         },
         "Split build smoke test": {
-            "required_build": "binary_splitted",
+            "required_build": "binary_shared",
         },
         "Unit tests (release-clang)": {
             "required_build": "binary_release",
@@ -345,3 +345,18 @@ CI_CONFIG = {
         },
     },
 }  # type: dict
+
+# checks required by Mergeable Check
+REQUIRED_CHECKS = [
+    "Fast test",
+    "Style Check",
+    "ClickHouse build check",
+    "ClickHouse special build check",
+    "Stateful tests (release)",
+    "Stateless tests (release)",
+    "Unit tests (release-clang)",
+    "Unit tests (asan)",
+    "Unit tests (msan)",
+    "Unit tests (tsan)",
+    "Unit tests (ubsan)",
+]
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index c595dc559df..a81334860d1 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -32,7 +32,18 @@ class ClickHouseHelper:
         }
 
         for i in range(5):
-            response = requests.post(url, params=params, data=json_str, headers=auth)
+            try:
+                response = requests.post(
+                    url, params=params, data=json_str, headers=auth
+                )
+            except Exception as e:
+                logging.warning(
+                    "Received exception while sending data to %s on %s attempt: %s",
+                    url,
+                    i,
+                    e,
+                )
+                continue
 
             logging.info("Response content '%s'", response.content)
 
diff --git a/tests/ci/codebrowser_check.py b/tests/ci/codebrowser_check.py
index 6e7f98bd82a..97036c6fc7b 100644
--- a/tests/ci/codebrowser_check.py
+++ b/tests/ci/codebrowser_check.py
@@ -7,7 +7,7 @@ import logging
 
 from github import Github
 
-from env_helper import IMAGES_PATH, REPO_COPY
+from env_helper import IMAGES_PATH, REPO_COPY, S3_TEST_REPORTS_BUCKET, S3_DOWNLOAD
 from stopwatch import Stopwatch
 from upload_result_helper import upload_results
 from s3_helper import S3Helper
@@ -23,7 +23,7 @@ def get_run_command(repo_path, output_path, image):
     cmd = (
         "docker run " + f"--volume={repo_path}:/repo_folder "
         f"--volume={output_path}:/test_output "
-        f"-e 'DATA=https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/data' {image}"
+        f"-e 'DATA={S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/data' {image}"
     )
     return cmd
 
@@ -35,13 +35,13 @@ if __name__ == "__main__":
 
     temp_path = os.getenv("TEMP_PATH", os.path.abspath("."))
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     if not os.path.exists(temp_path):
         os.makedirs(temp_path)
 
     docker_image = get_image_with_version(IMAGES_PATH, "clickhouse/codebrowser")
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     result_path = os.path.join(temp_path, "result_path")
     if not os.path.exists(result_path):
@@ -69,7 +69,10 @@ if __name__ == "__main__":
         report_path, s3_path_prefix, "clickhouse-test-reports"
     )
 
-    index_html = '<a href="https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/index.html">HTML report</a>'
+    index_html = (
+        '<a href="{S3_DOWNLOAD}/{S3_TEST_REPORTS_BUCKET}/codebrowser/index.html">'
+        "HTML report</a>"
+    )
 
     test_results = [(index_html, "Look at the report")]
 
diff --git a/tests/ci/commit_status_helper.py b/tests/ci/commit_status_helper.py
index 83b6203c050..8b9d28502c1 100644
--- a/tests/ci/commit_status_helper.py
+++ b/tests/ci/commit_status_helper.py
@@ -4,12 +4,13 @@ import csv
 import os
 import time
 from typing import Optional
+import logging
 
-from ci_config import CI_CONFIG
+from ci_config import CI_CONFIG, REQUIRED_CHECKS
 from env_helper import GITHUB_REPOSITORY, GITHUB_RUN_URL
 from github import Github
 from github.Commit import Commit
-from pr_info import SKIP_SIMPLE_CHECK_LABEL
+from pr_info import SKIP_MERGEABLE_CHECK_LABEL
 
 RETRY = 5
 
@@ -82,26 +83,59 @@ def post_labels(gh, pr_info, labels_names):
         pull_request.add_to_labels(label)
 
 
-def fail_simple_check(gh, pr_info, description):
-    if SKIP_SIMPLE_CHECK_LABEL in pr_info.labels:
-        return
-    commit = get_commit(gh, pr_info.sha)
+def fail_mergeable_check(commit, description):
     commit.create_status(
-        context="Simple Check",
+        context="Mergeable Check",
         description=description,
         state="failure",
         target_url=GITHUB_RUN_URL,
     )
 
 
-def create_simple_check(gh, pr_info):
-    commit = get_commit(gh, pr_info.sha)
-    for status in commit.get_statuses():
-        if "Simple Check" in status.context:
-            return
+def reset_mergeable_check(commit, description=""):
     commit.create_status(
-        context="Simple Check",
-        description="Skipped",
+        context="Mergeable Check",
+        description=description,
         state="success",
         target_url=GITHUB_RUN_URL,
     )
+
+
+def update_mergeable_check(gh, pr_info, check_name):
+    if SKIP_MERGEABLE_CHECK_LABEL in pr_info.labels:
+        return
+
+    logging.info("Update Mergeable Check by %s", check_name)
+
+    commit = get_commit(gh, pr_info.sha)
+    checks = {
+        check.context: check.state
+        for check in filter(
+            lambda check: (check.context in REQUIRED_CHECKS),
+            # get_statuses() returns generator, which cannot be reversed - we need comprehension
+            # pylint: disable=unnecessary-comprehension
+            reversed([status for status in commit.get_statuses()]),
+        )
+    }
+
+    success = []
+    fail = []
+    for name, state in checks.items():
+        if state == "success":
+            success.append(name)
+        else:
+            fail.append(name)
+
+    if fail:
+        description = "failed: " + ", ".join(fail)
+        if success:
+            description += "; succeeded: " + ", ".join(success)
+        if len(description) > 140:
+            description = description[:137] + "..."
+        fail_mergeable_check(commit, description)
+        return
+
+    description = ", ".join(success)
+    if len(description) > 140:
+        description = description[:137] + "..."
+    reset_mergeable_check(commit, description)
diff --git a/tests/ci/compatibility_check.py b/tests/ci/compatibility_check.py
index 71a959a064c..39d027ad3c0 100644
--- a/tests/ci/compatibility_check.py
+++ b/tests/ci/compatibility_check.py
@@ -119,7 +119,7 @@ if __name__ == "__main__":
 
     pr_info = PRInfo()
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, CHECK_NAME)
     if rerun_helper.is_already_finished_by_status():
@@ -169,7 +169,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_result(
         result_path, server_log_path
     )
diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
index 5742bc6c22e..181555f3a94 100644
--- a/tests/ci/docker_images_check.py
+++ b/tests/ci/docker_images_check.py
@@ -460,7 +460,7 @@ def main():
     with open(changed_json, "w", encoding="utf-8") as images_file:
         json.dump(result_images, images_file)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     s3_path_prefix = (
         str(pr_info.number) + "/" + pr_info.sha + "/" + NAME.lower().replace(" ", "_")
@@ -477,7 +477,7 @@ def main():
     if not args.reports:
         return
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     post_commit_status(gh, pr_info.sha, NAME, description, status, url)
 
     prepared_events = prepare_tests_results_for_clickhouse(
diff --git a/tests/ci/docker_manifests_merge.py b/tests/ci/docker_manifests_merge.py
index aa13bbea2fb..09b7a99da78 100644
--- a/tests/ci/docker_manifests_merge.py
+++ b/tests/ci/docker_manifests_merge.py
@@ -203,7 +203,7 @@ def main():
         json.dump(changed_images, ci)
 
     pr_info = PRInfo()
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, [], NAME)
 
@@ -221,7 +221,7 @@ def main():
     if len(description) >= 140:
         description = description[:136] + "..."
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     post_commit_status(gh, pr_info.sha, NAME, description, status, url)
 
     prepared_events = prepare_tests_results_for_clickhouse(
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index 710c18a56cb..e0053f09664 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -16,7 +16,7 @@ from build_check import get_release_or_pr
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
 from commit_status_helper import post_commit_status
 from docker_images_check import DockerImage
-from env_helper import CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET
+from env_helper import CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from git_helper import Git
 from pr_info import PRInfo
@@ -309,8 +309,7 @@ def main():
         pr_info = PRInfo()
         release_or_pr, _ = get_release_or_pr(pr_info, args.version)
         args.bucket_prefix = (
-            f"https://s3.amazonaws.com/{S3_BUILDS_BUCKET}/"
-            f"{release_or_pr}/{pr_info.sha}"
+            f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{release_or_pr}/{pr_info.sha}"
         )
 
     if args.push:
@@ -336,7 +335,7 @@ def main():
                 status = "failure"
 
     pr_info = pr_info or PRInfo()
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, [], NAME)
 
@@ -351,7 +350,7 @@ def main():
     if len(description) >= 140:
         description = description[:136] + "..."
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     post_commit_status(gh, pr_info.sha, NAME, description, status, url)
 
     prepared_events = prepare_tests_results_for_clickhouse(
diff --git a/tests/ci/docs_check.py b/tests/ci/docs_check.py
index d6131535ef8..c95770b646d 100644
--- a/tests/ci/docs_check.py
+++ b/tests/ci/docs_check.py
@@ -47,7 +47,7 @@ if __name__ == "__main__":
 
     pr_info = PRInfo(need_changed_files=True)
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, NAME)
     if rerun_helper.is_already_finished_by_status():
@@ -120,7 +120,7 @@ if __name__ == "__main__":
         else:
             lines.append(("Non zero exit code", "FAIL"))
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     ch_helper = ClickHouseHelper()
 
     report_url = upload_results(
diff --git a/tests/ci/docs_release.py b/tests/ci/docs_release.py
index 4a9686ec99f..355e4af7426 100644
--- a/tests/ci/docs_release.py
+++ b/tests/ci/docs_release.py
@@ -39,7 +39,7 @@ if __name__ == "__main__":
     temp_path = TEMP_PATH
     repo_path = REPO_COPY
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo()
     rerun_helper = RerunHelper(gh, pr_info, NAME)
     if rerun_helper.is_already_finished_by_status():
@@ -106,7 +106,7 @@ if __name__ == "__main__":
         else:
             lines.append(("Non zero exit code", "FAIL"))
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     report_url = upload_results(
         s3_helper, pr_info.number, pr_info.sha, lines, additional_files, NAME
diff --git a/tests/ci/env_helper.py b/tests/ci/env_helper.py
index dd081523db1..12c21398781 100644
--- a/tests/ci/env_helper.py
+++ b/tests/ci/env_helper.py
@@ -1,6 +1,8 @@
 import os
 from os import path as p
 
+from build_download_helper import get_with_retries
+
 module_dir = p.abspath(p.dirname(__file__))
 git_root = p.abspath(p.join(module_dir, "..", ".."))
 
@@ -20,5 +22,41 @@ IMAGES_PATH = os.getenv("IMAGES_PATH", TEMP_PATH)
 REPORTS_PATH = os.getenv("REPORTS_PATH", p.abspath(p.join(module_dir, "./reports")))
 REPO_COPY = os.getenv("REPO_COPY", git_root)
 RUNNER_TEMP = os.getenv("RUNNER_TEMP", p.abspath(p.join(module_dir, "./tmp")))
+S3_URL = os.getenv("S3_URL", "https://s3.amazonaws.com")
+S3_DOWNLOAD = os.getenv("S3_DOWNLOAD", S3_URL)
 S3_BUILDS_BUCKET = os.getenv("S3_BUILDS_BUCKET", "clickhouse-builds")
 S3_TEST_REPORTS_BUCKET = os.getenv("S3_TEST_REPORTS_BUCKET", "clickhouse-test-reports")
+
+# These parameters are set only on demand, and only once
+_GITHUB_JOB_ID = ""
+_GITHUB_JOB_URL = ""
+
+
+def GITHUB_JOB_ID() -> str:
+    global _GITHUB_JOB_ID
+    global _GITHUB_JOB_URL
+    if _GITHUB_JOB_ID:
+        return _GITHUB_JOB_ID
+    jobs = []
+    while not _GITHUB_JOB_ID:
+        response = get_with_retries(
+            f"https://api.github.com/repos/{GITHUB_REPOSITORY}/"
+            f"actions/runs/{GITHUB_RUN_ID}/jobs?per_page=100"
+        )
+        data = response.json()
+        jobs.extend(data["jobs"])
+        for job in data["jobs"]:
+            if job["name"] != GITHUB_JOB:
+                continue
+            _GITHUB_JOB_ID = job["id"]
+            _GITHUB_JOB_URL = job["html_url"]
+            return _GITHUB_JOB_ID
+        if len(jobs) == data["total_count"]:
+            _GITHUB_JOB_ID = "0"
+
+    return _GITHUB_JOB_ID
+
+
+def GITHUB_JOB_URL() -> str:
+    GITHUB_JOB_ID()
+    return _GITHUB_JOB_URL
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index 2768eccd53a..038289406de 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -5,6 +5,7 @@ import subprocess
 import os
 import csv
 import sys
+import atexit
 
 from github import Github
 
@@ -16,7 +17,7 @@ from upload_result_helper import upload_results
 from docker_pull_helper import get_image_with_version
 from commit_status_helper import (
     post_commit_status,
-    fail_simple_check,
+    update_mergeable_check,
 )
 from clickhouse_helper import (
     ClickHouseHelper,
@@ -30,6 +31,9 @@ from ccache_utils import get_ccache_if_not_exists, upload_ccache
 
 NAME = "Fast test"
 
+# Will help to avoid errors like _csv.Error: field larger than field limit (131072)
+csv.field_size_limit(sys.maxsize)
+
 
 def get_fasttest_cmd(
     workspace, output_path, ccache_path, repo_path, pr_number, commit_sha, image
@@ -93,7 +97,9 @@ if __name__ == "__main__":
 
     pr_info = PRInfo()
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
+
+    atexit.register(update_mergeable_check, gh, pr_info, NAME)
 
     rerun_helper = RerunHelper(gh, pr_info, NAME)
     if rerun_helper.is_already_finished_by_status():
@@ -102,7 +108,7 @@ if __name__ == "__main__":
 
     docker_image = get_image_with_version(temp_path, "clickhouse/fasttest")
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     workspace = os.path.join(temp_path, "fasttest-workspace")
     if not os.path.exists(workspace):
@@ -222,5 +228,4 @@ if __name__ == "__main__":
         if FORCE_TESTS_LABEL in pr_info.labels and state != "error":
             print(f"'{FORCE_TESTS_LABEL}' enabled, will report success")
         else:
-            fail_simple_check(gh, pr_info, f"{NAME} failed")
             sys.exit(1)
diff --git a/tests/ci/finish_check.py b/tests/ci/finish_check.py
index 0697f52abed..a0b7f14ecfb 100644
--- a/tests/ci/finish_check.py
+++ b/tests/ci/finish_check.py
@@ -30,7 +30,7 @@ if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
 
     pr_info = PRInfo(need_orgs=True)
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     commit = get_commit(gh, pr_info.sha)
 
     url = GITHUB_RUN_URL
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index b73e6f9d708..388f93f34ec 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -6,6 +6,7 @@ import logging
 import os
 import subprocess
 import sys
+import atexit
 
 from github import Github
 
@@ -22,6 +23,7 @@ from commit_status_helper import (
     get_commit,
     override_status,
     post_commit_status_to_file,
+    update_mergeable_check,
 )
 from clickhouse_helper import (
     ClickHouseHelper,
@@ -86,7 +88,8 @@ def get_run_command(
 
     envs = [
         f"-e MAX_RUN_TIME={int(0.9 * kill_timeout)}",
-        '-e S3_URL="https://clickhouse-datasets.s3.amazonaws.com"',
+        # a static link, don't use S3_URL or S3_DOWNLOAD
+        '-e S3_URL="https://s3.amazonaws.com/clickhouse-datasets"',
     ]
 
     if flaky_check:
@@ -205,10 +208,12 @@ if __name__ == "__main__":
     flaky_check = "flaky" in check_name.lower()
 
     run_changed_tests = flaky_check or validate_bugix_check
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     pr_info = PRInfo(need_changed_files=run_changed_tests)
 
+    atexit.register(update_mergeable_check, gh, pr_info, check_name)
+
     if not os.path.exists(temp_path):
         os.makedirs(temp_path)
 
@@ -310,7 +315,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     state, description, test_results, additional_logs = process_results(
         result_path, server_log_path
diff --git a/tests/ci/get_robot_token.py b/tests/ci/get_robot_token.py
index cb79d9ae01a..4fb8cb8f49f 100644
--- a/tests/ci/get_robot_token.py
+++ b/tests/ci/get_robot_token.py
@@ -15,7 +15,7 @@ def get_best_robot_token(token_prefix_env_name="github_robot_token_", total_toke
     for i in range(1, total_tokens + 1):
         token_name = token_prefix_env_name + str(i)
         token = get_parameter_from_ssm(token_name, True, client)
-        gh = Github(token)
+        gh = Github(token, per_page=100)
         rest, _ = gh.rate_limiting
         tokens[token] = rest
 
diff --git a/tests/ci/github_helper.py b/tests/ci/github_helper.py
index 46cf7d2b726..685d9f2c841 100644
--- a/tests/ci/github_helper.py
+++ b/tests/ci/github_helper.py
@@ -5,11 +5,12 @@ from datetime import date, datetime, timedelta
 from pathlib import Path
 from os import path as p
 from time import sleep
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
 import github
 from github.GithubException import RateLimitExceededException
 from github.Issue import Issue
+from github.NamedUser import NamedUser
 from github.PullRequest import PullRequest
 from github.Repository import Repository
 
@@ -120,21 +121,15 @@ class GitHub(github.Github):
                 return
 
     def get_pull_cached(
-        self, repo: Repository, number: int, updated_at: Optional[datetime] = None
+        self, repo: Repository, number: int, obj_updated_at: Optional[datetime] = None
     ) -> PullRequest:
-        pr_cache_file = self.cache_path / f"{number}.pickle"
-        if updated_at is None:
-            updated_at = datetime.now() - timedelta(hours=-1)
+        cache_file = self.cache_path / f"pr-{number}.pickle"
 
-        def _get_pr(path: Path) -> PullRequest:
-            with open(path, "rb") as prfd:
-                return self.load(prfd)  # type: ignore
-
-        if pr_cache_file.is_file():
-            cached_pr = _get_pr(pr_cache_file)
-            if updated_at <= cached_pr.updated_at:
+        if cache_file.is_file():
+            is_updated, cached_pr = self._is_cache_updated(cache_file, obj_updated_at)
+            if is_updated:
                 logger.debug("Getting PR #%s from cache", number)
-                return cached_pr
+                return cached_pr  # type: ignore
         logger.debug("Getting PR #%s from API", number)
         for i in range(self.retries):
             try:
@@ -144,11 +139,56 @@ class GitHub(github.Github):
                 if i == self.retries - 1:
                     raise
                 self.sleep_on_rate_limit()
-        logger.debug("Caching PR #%s from API in %s", number, pr_cache_file)
-        with open(pr_cache_file, "wb") as prfd:
+        logger.debug("Caching PR #%s from API in %s", number, cache_file)
+        with open(cache_file, "wb") as prfd:
             self.dump(pr, prfd)  # type: ignore
         return pr
 
+    def get_user_cached(
+        self, login: str, obj_updated_at: Optional[datetime] = None
+    ) -> NamedUser:
+        cache_file = self.cache_path / f"user-{login}.pickle"
+
+        if cache_file.is_file():
+            is_updated, cached_user = self._is_cache_updated(cache_file, obj_updated_at)
+            if is_updated:
+                logger.debug("Getting user %s from cache", login)
+                return cached_user  # type: ignore
+        logger.debug("Getting PR #%s from API", login)
+        for i in range(self.retries):
+            try:
+                user = self.get_user(login)
+                break
+            except RateLimitExceededException:
+                if i == self.retries - 1:
+                    raise
+                self.sleep_on_rate_limit()
+        logger.debug("Caching user %s from API in %s", login, cache_file)
+        with open(cache_file, "wb") as prfd:
+            self.dump(user, prfd)  # type: ignore
+        return user
+
+    def _get_cached(self, path: Path):
+        with open(path, "rb") as ob_fd:
+            return self.load(ob_fd)  # type: ignore
+
+    def _is_cache_updated(
+        self, cache_file: Path, obj_updated_at: Optional[datetime]
+    ) -> Tuple[bool, object]:
+        cached_obj = self._get_cached(cache_file)
+        # We don't want the cache_updated being always old,
+        # for example in cases when the user is not updated for ages
+        cache_updated = max(
+            datetime.fromtimestamp(cache_file.stat().st_mtime), cached_obj.updated_at
+        )
+        if obj_updated_at is None:
+            # When we don't know about the object is updated or not,
+            # we update it once per hour
+            obj_updated_at = datetime.now() - timedelta(hours=1)
+        if obj_updated_at <= cache_updated:
+            return True, cached_obj
+        return False, cached_obj
+
     @property
     def cache_path(self):
         return self._cache_path
diff --git a/tests/ci/integration_test_check.py b/tests/ci/integration_test_check.py
index 1c53247c072..3709a7271d7 100644
--- a/tests/ci/integration_test_check.py
+++ b/tests/ci/integration_test_check.py
@@ -180,7 +180,7 @@ if __name__ == "__main__":
         logging.info("Skipping '%s' (no pr-bugfix)", check_name)
         sys.exit(0)
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, check_name_with_group)
     if rerun_helper.is_already_finished_by_status():
@@ -249,7 +249,7 @@ if __name__ == "__main__":
     ch_helper = ClickHouseHelper()
     mark_flaky_tests(ch_helper, check_name, test_results)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     report_url = upload_results(
         s3_helper,
         pr_info.number,
diff --git a/tests/ci/keeper_jepsen_check.py b/tests/ci/keeper_jepsen_check.py
index 3c2f72f73d1..a0695d3283a 100644
--- a/tests/ci/keeper_jepsen_check.py
+++ b/tests/ci/keeper_jepsen_check.py
@@ -9,7 +9,7 @@ import boto3
 from github import Github
 import requests
 
-from env_helper import REPO_COPY, TEMP_PATH
+from env_helper import REPO_COPY, TEMP_PATH, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from stopwatch import Stopwatch
 from upload_result_helper import upload_results
 from s3_helper import S3Helper
@@ -159,7 +159,7 @@ if __name__ == "__main__":
         logging.info("Not jepsen test label in labels list, skipping")
         sys.exit(0)
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, CHECK_NAME)
     if rerun_helper.is_already_finished_by_status():
@@ -192,7 +192,7 @@ if __name__ == "__main__":
     # run (see .github/workflows/jepsen.yml) So we cannot add explicit
     # dependency on a build job and using busy loop on it's results. For the
     # same reason we are using latest docker image.
-    build_url = f"https://s3.amazonaws.com/clickhouse-builds/{release_or_pr}/{pr_info.sha}/{build_name}/clickhouse"
+    build_url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{release_or_pr}/{pr_info.sha}/{build_name}/clickhouse"
     head = requests.head(build_url)
     counter = 0
     while head.status_code != 200:
@@ -248,7 +248,7 @@ if __name__ == "__main__":
         description = "No Jepsen output log"
         test_result = [("No Jepsen output log", "FAIL")]
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     report_url = upload_results(
         s3_helper,
         pr_info.number,
diff --git a/tests/ci/performance_comparison_check.py b/tests/ci/performance_comparison_check.py
index baf2593130a..40befc78de2 100644
--- a/tests/ci/performance_comparison_check.py
+++ b/tests/ci/performance_comparison_check.py
@@ -15,7 +15,7 @@ from github import Github
 from commit_status_helper import get_commit, post_commit_status
 from ci_config import CI_CONFIG
 from docker_pull_helper import get_image_with_version
-from env_helper import GITHUB_EVENT_PATH, GITHUB_RUN_URL
+from env_helper import GITHUB_EVENT_PATH, GITHUB_RUN_URL, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
 from rerun_helper import RerunHelper
@@ -80,13 +80,13 @@ if __name__ == "__main__":
     with open(GITHUB_EVENT_PATH, "r", encoding="utf-8") as event_file:
         event = json.load(event_file)
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo(event)
     commit = get_commit(gh, pr_info.sha)
 
     docker_env = ""
 
-    docker_env += " -e S3_URL=https://s3.amazonaws.com/clickhouse-builds"
+    docker_env += f" -e S3_URL={S3_DOWNLOAD}/{S3_BUILDS_BUCKET}"
     docker_env += f" -e BUILD_NAME={required_build}"
 
     if pr_info.number == 0:
@@ -197,7 +197,7 @@ if __name__ == "__main__":
     }
 
     s3_prefix = f"{pr_info.number}/{pr_info.sha}/{check_name_prefix}/"
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     uploaded = {}  # type: Dict[str, str]
     for name, path in paths.items():
         try:
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index 86b3081f98c..2acd0e4c811 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -15,7 +15,7 @@ from env_helper import (
 )
 
 FORCE_TESTS_LABEL = "force tests"
-SKIP_SIMPLE_CHECK_LABEL = "skip simple check"
+SKIP_MERGEABLE_CHECK_LABEL = "skip mergeable check"
 
 DIFF_IN_DOCUMENTATION_EXT = [
     ".html",
diff --git a/tests/ci/push_to_artifactory.py b/tests/ci/push_to_artifactory.py
index 98de315ddae..6b407eb5bd8 100755
--- a/tests/ci/push_to_artifactory.py
+++ b/tests/ci/push_to_artifactory.py
@@ -9,7 +9,7 @@ from typing import Dict, List, Tuple
 
 from artifactory import ArtifactorySaaSPath  # type: ignore
 from build_download_helper import dowload_build_with_progress
-from env_helper import RUNNER_TEMP, S3_BUILDS_BUCKET
+from env_helper import RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
 from git_helper import TAG_REGEXP, commit, removeprefix, removesuffix
 
 
@@ -98,7 +98,7 @@ class Packages:
 
 class S3:
     template = (
-        "https://s3.amazonaws.com/"
+        f"{S3_DOWNLOAD}/"
         # "clickhouse-builds/"
         f"{S3_BUILDS_BUCKET}/"
         # "33333/" or "21.11/" from --release, if pull request is omitted
diff --git a/tests/ci/release.py b/tests/ci/release.py
index b07deffa1fb..b5a4c5d5c9e 100755
--- a/tests/ci/release.py
+++ b/tests/ci/release.py
@@ -96,10 +96,17 @@ class Release:
 
     def check_prerequisites(self):
         """
-        Check tooling installed in the system
+        Check tooling installed in the system, `git` is checked by Git() init
         """
-        self.run("gh auth status")
-        self.run("git status")
+        try:
+            self.run("gh auth status")
+        except subprocess.SubprocessError:
+            logging.error(
+                "The github-cli either not installed or not setup, please follow "
+                "the instructions on https://github.com/cli/cli#installation and "
+                "https://cli.github.com/manual/"
+            )
+            raise
 
     def do(self, check_dirty: bool, check_branch: bool, with_release_branch: bool):
         self.check_prerequisites()
@@ -141,6 +148,7 @@ class Release:
                 with self.stable():
                     logging.info("Stable part of the releasing is done")
 
+        self.log_post_workflows()
         self.log_rollback()
 
     def check_no_tags_after(self):
@@ -178,13 +186,22 @@ class Release:
 
     def log_rollback(self):
         if self._rollback_stack:
-            rollback = self._rollback_stack
+            rollback = self._rollback_stack.copy()
             rollback.reverse()
             logging.info(
                 "To rollback the action run the following commands:\n  %s",
                 "\n  ".join(rollback),
             )
 
+    def log_post_workflows(self):
+        logging.info(
+            "To verify all actions are running good visit the following links:\n  %s",
+            "\n  ".join(
+                f"https://github.com/{self.repo}/actions/workflows/{action}.yml"
+                for action in ("release", "tags_stable")
+            ),
+        )
+
     @contextmanager
     def create_release_branch(self):
         self.check_no_tags_after()
@@ -335,7 +352,7 @@ class Release:
             yield
         except (Exception, KeyboardInterrupt):
             logging.warning("Rolling back checked out %s for %s", ref, orig_ref)
-            self.run(f"git reset --hard; git checkout {orig_ref}")
+            self.run(f"git reset --hard; git checkout -f {orig_ref}")
             raise
         else:
             if with_checkout_back and need_rollback:
diff --git a/tests/ci/report.py b/tests/ci/report.py
index 83d89e628a2..7d84185b863 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -34,6 +34,7 @@ th {{ cursor: pointer; }}
 <a href="{commit_url}">Commit</a>
 {additional_urls}
 <a href="{task_url}">Task (github actions)</a>
+<a href="{job_url}">Job (github actions)</a>
 </p>
 {test_part}
 </body>
@@ -150,6 +151,7 @@ def create_test_html_report(
     test_result,
     raw_log_url,
     task_url,
+    job_url,
     branch_url,
     branch_name,
     commit_url,
@@ -236,12 +238,17 @@ def create_test_html_report(
         [_get_html_url(url) for url in sorted(additional_urls, key=_get_html_url_name)]
     )
 
+    raw_log_name = os.path.basename(raw_log_url)
+    if "?" in raw_log_name:
+        raw_log_name = raw_log_name.split("?")[0]
+
     result = HTML_BASE_TEST_TEMPLATE.format(
         title=_format_header(header, branch_name),
         header=_format_header(header, branch_name, branch_url),
-        raw_log_name=os.path.basename(raw_log_url),
+        raw_log_name=raw_log_name,
         raw_log_url=raw_log_url,
         task_url=task_url,
+        job_url=job_url,
         test_part=test_part,
         branch_name=branch_name,
         commit_url=commit_url,
@@ -255,20 +262,7 @@ HTML_BASE_BUILD_TEMPLATE = """
 <html>
 <head>
   <style>
-@font-face {{
-    font-family:'Yandex Sans Display Web';
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot);
-    src:url(https://yastatic.net/adv-www/_/H63jN0veW07XQUIA2317lr9UIm8.eot?#iefix) format('embedded-opentype'),
-            url(https://yastatic.net/adv-www/_/sUYVCPUAQE7ExrvMS7FoISoO83s.woff2) format('woff2'),
-            url(https://yastatic.net/adv-www/_/v2Sve_obH3rKm6rKrtSQpf-eB7U.woff) format('woff'),
-            url(https://yastatic.net/adv-www/_/PzD8hWLMunow5i3RfJ6WQJAL7aI.ttf) format('truetype'),
-            url(https://yastatic.net/adv-www/_/lF_KG5g4tpQNlYIgA0e77fBSZ5s.svg#YandexSansDisplayWeb-Regular) format('svg');
-    font-weight:400;
-    font-style:normal;
-    font-stretch:normal
-}}
-
-body {{ font-family: "Yandex Sans Display Web", Arial, sans-serif; background: #EEE; }}
+body {{ font-family: "DejaVu Sans", "Noto Sans", Arial, sans-serif; background: #EEE; }}
 h1 {{ margin-left: 10px; }}
 th, td {{ border: 0; padding: 5px 10px 5px 10px; text-align: left; vertical-align: top; line-height: 1.5; background-color: #FFF;
 border: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }}
@@ -290,7 +284,7 @@ tr:hover td {{filter: brightness(95%);}}
 <th>Build type</th>
 <th>Sanitizer</th>
 <th>Bundled</th>
-<th>Splitted</th>
+<th>Libraries</th>
 <th>Status</th>
 <th>Build log</th>
 <th>Build time</th>
@@ -335,7 +329,7 @@ def create_build_html_report(
             row += "<td>{}</td>".format("none")
 
         row += "<td>{}</td>".format(build_result.bundled)
-        row += "<td>{}</td>".format(build_result.splitted)
+        row += "<td>{}</td>".format(build_result.libraries)
 
         if build_result.status:
             style = _get_status_style(build_result.status)
diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
index 2777fe55fd7..5e6542f6e4c 100644
--- a/tests/ci/run_check.py
+++ b/tests/ci/run_check.py
@@ -10,7 +10,7 @@ from commit_status_helper import (
     get_commit,
     post_labels,
     remove_labels,
-    create_simple_check,
+    reset_mergeable_check,
 )
 from env_helper import GITHUB_RUN_URL, GITHUB_REPOSITORY, GITHUB_SERVER_URL
 from get_robot_token import get_best_robot_token
@@ -196,7 +196,7 @@ if __name__ == "__main__":
 
     pr_info = PRInfo(need_orgs=True, pr_event_from_api=True, need_changed_files=True)
     can_run, description, labels_state = should_run_checks_for_pr(pr_info)
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
     commit = get_commit(gh, pr_info.sha)
 
     description_error, category = check_pr_description(pr_info)
@@ -228,7 +228,7 @@ if __name__ == "__main__":
     if pr_labels_to_remove:
         remove_labels(gh, pr_info, pr_labels_to_remove)
 
-    create_simple_check(gh, pr_info)
+    reset_mergeable_check(commit, "skipped")
 
     if description_error:
         print(
diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
index 91e67135f6f..24ff013d69a 100644
--- a/tests/ci/s3_helper.py
+++ b/tests/ci/s3_helper.py
@@ -9,7 +9,14 @@ from multiprocessing.dummy import Pool
 
 import boto3  # type: ignore
 
-from env_helper import S3_TEST_REPORTS_BUCKET, S3_BUILDS_BUCKET, RUNNER_TEMP, CI
+from env_helper import (
+    S3_TEST_REPORTS_BUCKET,
+    S3_BUILDS_BUCKET,
+    RUNNER_TEMP,
+    CI,
+    S3_URL,
+    S3_DOWNLOAD,
+)
 from compress_files import compress_file_fast
 
 
@@ -33,9 +40,11 @@ def _flatten_list(lst):
 
 
 class S3Helper:
-    def __init__(self, host):
+    def __init__(self, host=S3_URL, download_host=S3_DOWNLOAD):
         self.session = boto3.session.Session(region_name="us-east-1")
         self.client = self.session.client("s3", endpoint_url=host)
+        self.host = host
+        self.download_host = download_host
 
     def _upload_file_to_s3(self, bucket_name, file_path, s3_path):
         logging.debug(
@@ -98,13 +107,8 @@ class S3Helper:
         logging.info("Upload %s to %s. Meta: %s", file_path, s3_path, metadata)
         # last two replacements are specifics of AWS urls:
         # https://jamesd3142.wordpress.com/2018/02/28/amazon-s3-and-the-plus-symbol/
-        return (
-            "https://s3.amazonaws.com/{bucket}/{path}".format(
-                bucket=bucket_name, path=s3_path
-            )
-            .replace("+", "%2B")
-            .replace(" ", "%20")
-        )
+        url = f"{self.download_host}/{bucket_name}/{s3_path}"
+        return url.replace("+", "%2B").replace(" ", "%20")
 
     def upload_test_report_to_s3(self, file_path, s3_path):
         if CI:
@@ -175,9 +179,7 @@ class S3Helper:
                     t = time.time()
             except Exception as ex:
                 logging.critical("Failed to upload file, expcetion %s", ex)
-            return "https://s3.amazonaws.com/{bucket}/{path}".format(
-                bucket=bucket_name, path=s3_path
-            )
+            return f"{self.download_host}/{bucket_name}/{s3_path}"
 
         p = Pool(256)
 
@@ -286,6 +288,13 @@ class S3Helper:
 
         return result
 
+    def exists(self, key, bucket=S3_BUILDS_BUCKET):
+        try:
+            self.client.head_object(Bucket=bucket, Key=key)
+            return True
+        except Exception:
+            return False
+
     @staticmethod
     def copy_file_to_local(bucket_name, file_path, s3_path):
         local_path = os.path.abspath(
diff --git a/tests/ci/split_build_smoke_check.py b/tests/ci/split_build_smoke_check.py
index 9237df23a26..c6bf1051c87 100644
--- a/tests/ci/split_build_smoke_check.py
+++ b/tests/ci/split_build_smoke_check.py
@@ -76,7 +76,7 @@ if __name__ == "__main__":
 
     pr_info = PRInfo()
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, CHECK_NAME)
     if rerun_helper.is_already_finished_by_status():
@@ -126,7 +126,7 @@ if __name__ == "__main__":
     )
 
     ch_helper = ClickHouseHelper()
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     report_url = upload_results(
         s3_helper,
         pr_info.number,
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index 6bd4c580687..e644eef3bc8 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -31,7 +31,10 @@ def get_run_command(
 ):
     cmd = (
         "docker run --cap-add=SYS_PTRACE "
-        "-e S3_URL='https://clickhouse-datasets.s3.amazonaws.com' "
+        # a static link, don't use S3_URL or S3_DOWNLOAD
+        "-e S3_URL='https://s3.amazonaws.com/clickhouse-datasets' "
+        # For dmesg
+        "--privileged "
         f"--volume={build_path}:/package_folder "
         f"--volume={result_folder}:/test_output "
         f"--volume={repo_tests_path}:/usr/share/clickhouse-test "
@@ -109,7 +112,7 @@ if __name__ == "__main__":
 
     pr_info = PRInfo()
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
 
     rerun_helper = RerunHelper(gh, pr_info, check_name)
     if rerun_helper.is_already_finished_by_status():
@@ -148,7 +151,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_results(
         result_path, server_log_path, run_log_path
     )
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
index 7ba0dc2a297..23a1dd467d7 100644
--- a/tests/ci/style_check.py
+++ b/tests/ci/style_check.py
@@ -5,6 +5,7 @@ import logging
 import os
 import subprocess
 import sys
+import atexit
 
 
 from clickhouse_helper import (
@@ -12,7 +13,7 @@ from clickhouse_helper import (
     mark_flaky_tests,
     prepare_tests_results_for_clickhouse,
 )
-from commit_status_helper import fail_simple_check, post_commit_status
+from commit_status_helper import post_commit_status, update_mergeable_check
 from docker_pull_helper import get_image_with_version
 from env_helper import GITHUB_WORKSPACE, RUNNER_TEMP
 from get_robot_token import get_best_robot_token
@@ -150,6 +151,8 @@ if __name__ == "__main__":
 
     gh = GitHub(get_best_robot_token())
 
+    atexit.register(update_mergeable_check, gh, pr_info, NAME)
+
     rerun_helper = RerunHelper(gh, pr_info, NAME)
     if rerun_helper.is_already_finished_by_status():
         logging.info("Check is already finished according to github status, exiting")
@@ -163,7 +166,7 @@ if __name__ == "__main__":
         os.makedirs(temp_path)
 
     docker_image = get_image_with_version(temp_path, "clickhouse/style-test")
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
 
     cmd = (
         f"docker run -u $(id -u ${{USER}}):$(id -g ${{USER}}) --cap-add=SYS_PTRACE "
@@ -202,5 +205,4 @@ if __name__ == "__main__":
     ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
 
     if state in ["error", "failure"]:
-        fail_simple_check(gh, pr_info, f"{NAME} failed")
         sys.exit(1)
diff --git a/tests/ci/team_keys_lambda/.gitignore b/tests/ci/team_keys_lambda/.gitignore
deleted file mode 100644
index 4c845d295ee..00000000000
--- a/tests/ci/team_keys_lambda/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-lambda-venv
-lambda-package.zip
diff --git a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
index 7b89ea11ede..defa400453f 100644
--- a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
+++ b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
@@ -1,15 +1,26 @@
 #!/usr/bin/env bash
 set -xeo pipefail
 
-VENV=lambda-venv
-py_exec=$(which python3)
-py_version=$(basename "$(readlink -f "$py_exec")")
-rm -rf "$VENV" lambda-package.zip
-virtualenv "$VENV"
-source "$VENV/bin/activate"
-pip install -r requirements.txt
-PACKAGES="$VENV/lib/$py_version/site-packages"
-cp app.py "$PACKAGES/"
-( cd "$PACKAGES" && zip -r ../../../../lambda-package.zip . )
+WORKDIR=$(dirname "$0")
+cd "$WORKDIR"
 
-aws lambda update-function-code --function-name team-keys-lambda --zip-file fileb://lambda-package.zip
+PY_EXEC=python3.9
+LAMBDA_NAME=$(basename "$PWD")
+LAMBDA_NAME=${LAMBDA_NAME//_/-}
+PACKAGE=lambda-package
+rm -rf "$PACKAGE" "$PACKAGE".zip
+mkdir "$PACKAGE"
+cp app.py "$PACKAGE"
+if [ -f requirements.txt ]; then
+  VENV=lambda-venv
+  rm -rf "$VENV" lambda-package.zip
+  "$PY_EXEC" -m venv "$VENV"
+  # shellcheck disable=SC1091
+  source "$VENV/bin/activate"
+  pip install -r requirements.txt
+  cp -rT "$VENV/lib/$PY_EXEC/site-packages/" "$PACKAGE"
+  rm -r "$PACKAGE"/{pip,pip-*,setuptools,setuptools-*}
+fi
+( cd "$PACKAGE" && zip -9 -r ../"$PACKAGE".zip . )
+
+aws lambda update-function-code --function-name "$LAMBDA_NAME" --zip-file fileb://"$PACKAGE".zip
diff --git a/tests/ci/unit_tests_check.py b/tests/ci/unit_tests_check.py
index c2329fab955..c2dfab9dddc 100644
--- a/tests/ci/unit_tests_check.py
+++ b/tests/ci/unit_tests_check.py
@@ -4,6 +4,7 @@ import logging
 import os
 import sys
 import subprocess
+import atexit
 
 from github import Github
 
@@ -14,7 +15,7 @@ from pr_info import PRInfo
 from build_download_helper import download_unit_tests
 from upload_result_helper import upload_results
 from docker_pull_helper import get_image_with_version
-from commit_status_helper import post_commit_status
+from commit_status_helper import post_commit_status, update_mergeable_check
 from clickhouse_helper import (
     ClickHouseHelper,
     mark_flaky_tests,
@@ -114,7 +115,9 @@ if __name__ == "__main__":
 
     pr_info = PRInfo()
 
-    gh = Github(get_best_robot_token())
+    gh = Github(get_best_robot_token(), per_page=100)
+
+    atexit.register(update_mergeable_check, gh, pr_info, check_name)
 
     rerun_helper = RerunHelper(gh, pr_info, check_name)
     if rerun_helper.is_already_finished_by_status():
@@ -147,7 +150,7 @@ if __name__ == "__main__":
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    s3_helper = S3Helper("https://s3.amazonaws.com")
+    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_result(test_output)
 
     ch_helper = ClickHouseHelper()
diff --git a/tests/ci/upload_result_helper.py b/tests/ci/upload_result_helper.py
index 289fc4b3184..0fde4408176 100644
--- a/tests/ci/upload_result_helper.py
+++ b/tests/ci/upload_result_helper.py
@@ -2,7 +2,12 @@ import os
 import logging
 import ast
 
-from env_helper import GITHUB_SERVER_URL, GITHUB_REPOSITORY, GITHUB_RUN_URL
+from env_helper import (
+    GITHUB_JOB_URL,
+    GITHUB_REPOSITORY,
+    GITHUB_RUN_URL,
+    GITHUB_SERVER_URL,
+)
 from report import ReportColorTheme, create_test_html_report
 
 
@@ -66,13 +71,11 @@ def upload_results(
         branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/pull/{pr_number}"
     commit_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commit/{commit_sha}"
 
-    task_url = GITHUB_RUN_URL
-
     if additional_urls:
         raw_log_url = additional_urls[0]
         additional_urls.pop(0)
     else:
-        raw_log_url = task_url
+        raw_log_url = GITHUB_JOB_URL()
 
     statuscolors = (
         ReportColorTheme.bugfixcheck if "bugfix validate check" in check_name else None
@@ -82,7 +85,8 @@ def upload_results(
         check_name,
         test_results,
         raw_log_url,
-        task_url,
+        GITHUB_RUN_URL,
+        GITHUB_JOB_URL(),
         branch_url,
         branch_name,
         commit_url,
diff --git a/tests/ci/version_helper.py b/tests/ci/version_helper.py
index 08ee052cf1a..de98b8431de 100755
--- a/tests/ci/version_helper.py
+++ b/tests/ci/version_helper.py
@@ -65,14 +65,20 @@ class ClickHouseVersion:
         return method()
 
     def major_update(self) -> "ClickHouseVersion":
+        if self._git is not None:
+            self._git.update()
         return ClickHouseVersion(self.major + 1, 1, 1, self.revision + 1, self._git)
 
     def minor_update(self) -> "ClickHouseVersion":
+        if self._git is not None:
+            self._git.update()
         return ClickHouseVersion(
             self.major, self.minor + 1, 1, self.revision + 1, self._git
         )
 
     def patch_update(self) -> "ClickHouseVersion":
+        if self._git is not None:
+            self._git.update()
         return ClickHouseVersion(
             self.major, self.minor, self.patch + 1, self.revision, self._git
         )
diff --git a/tests/ci/worker/dockerhub_proxy_template.sh b/tests/ci/worker/dockerhub_proxy_template.sh
index add15158d94..38f2bc6486a 100644
--- a/tests/ci/worker/dockerhub_proxy_template.sh
+++ b/tests/ci/worker/dockerhub_proxy_template.sh
@@ -1,6 +1,20 @@
 #!/usr/bin/env bash
 set -xeuo pipefail
 
+# Add cloudflare DNS as a fallback
+# Get default gateway interface
+IFACE=$(ip --json route list | jq '.[]|select(.dst == "default").dev' --raw-output)
+# `Link 2 (eth0): 172.31.0.2`
+ETH_DNS=$(resolvectl dns "$IFACE") || :
+CLOUDFLARE_NS=1.1.1.1
+if [[ "$ETH_DNS" ]] && [[ "${ETH_DNS#*: }" != *"$CLOUDFLARE_NS"* ]]; then
+  # Cut the leading legend
+  ETH_DNS=${ETH_DNS#*: }
+  # shellcheck disable=SC2206
+  new_dns=(${ETH_DNS} "$CLOUDFLARE_NS")
+  resolvectl dns "$IFACE" "${new_dns[@]}"
+fi
+
 mkdir /home/ubuntu/registrystorage
 
 sed -i 's/preserve_hostname: false/preserve_hostname: true/g' /etc/cloud/cloud.cfg
diff --git a/tests/ci/worker/init_runner.sh b/tests/ci/worker/init_runner.sh
index 74ad4be2547..3dfd1761e88 100644
--- a/tests/ci/worker/init_runner.sh
+++ b/tests/ci/worker/init_runner.sh
@@ -17,6 +17,20 @@ export RUNNER_URL="https://github.com/ClickHouse"
 INSTANCE_ID=$(ec2metadata --instance-id)
 export INSTANCE_ID
 
+# Add cloudflare DNS as a fallback
+# Get default gateway interface
+IFACE=$(ip --json route list | jq '.[]|select(.dst == "default").dev' --raw-output)
+# `Link 2 (eth0): 172.31.0.2`
+ETH_DNS=$(resolvectl dns "$IFACE") || :
+CLOUDFLARE_NS=1.1.1.1
+if [[ "$ETH_DNS" ]] && [[ "${ETH_DNS#*: }" != *"$CLOUDFLARE_NS"* ]]; then
+  # Cut the leading legend
+  ETH_DNS=${ETH_DNS#*: }
+  # shellcheck disable=SC2206
+  new_dns=(${ETH_DNS} "$CLOUDFLARE_NS")
+  resolvectl dns "$IFACE" "${new_dns[@]}"
+fi
+
 # combine labels
 RUNNER_TYPE=$(/usr/local/bin/aws ec2 describe-tags --filters "Name=resource-id,Values=$INSTANCE_ID" --query "Tags[?Key=='github:runner-type'].Value" --output text)
 LABELS="self-hosted,Linux,$(uname -m),$RUNNER_TYPE"
diff --git a/tests/ci/workflow_approve_rerun_lambda/Dockerfile b/tests/ci/workflow_approve_rerun_lambda/Dockerfile
deleted file mode 100644
index 0d50224c51d..00000000000
--- a/tests/ci/workflow_approve_rerun_lambda/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM public.ecr.aws/lambda/python:3.9
-
-# Install the function's dependencies using file requirements.txt
-# from your project folder.
-
-COPY requirements.txt  .
-RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
-
-# Copy function code
-COPY app.py ${LAMBDA_TASK_ROOT}
-
-# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
-CMD [ "app.handler" ]
diff --git a/tests/ci/workflow_approve_rerun_lambda/app.py b/tests/ci/workflow_approve_rerun_lambda/app.py
index 43f15059980..29f3271a34c 100644
--- a/tests/ci/workflow_approve_rerun_lambda/app.py
+++ b/tests/ci/workflow_approve_rerun_lambda/app.py
@@ -3,15 +3,12 @@
 from collections import namedtuple
 import fnmatch
 import json
-import os
 import time
 
 import jwt
 import requests  # type: ignore
 import boto3  # type: ignore
 
-API_URL = os.getenv("API_URL", "https://api.github.com/repos/ClickHouse/ClickHouse")
-
 SUSPICIOUS_CHANGED_FILES_NUMBER = 200
 
 SUSPICIOUS_PATTERNS = [
@@ -27,7 +24,7 @@ SUSPICIOUS_PATTERNS = [
 MAX_RETRY = 5
 
 # Number of times a check can re-run as a whole.
-# It is needed, because we are using AWS "spot" instances, that are terminated very frequently.
+# It is needed, because we are using AWS "spot" instances, that are terminated often
 MAX_WORKFLOW_RERUN = 20
 
 WorkflowDescription = namedtuple(
@@ -46,6 +43,7 @@ WorkflowDescription = namedtuple(
         "rerun_url",
         "jobs_url",
         "attempt",
+        "repo_url",
         "url",
     ],
 )
@@ -189,10 +187,11 @@ def is_trusted_contributor(pr_user_login, pr_user_orgs):
     return False
 
 
-def _exec_get_with_retry(url):
+def _exec_get_with_retry(url, token):
+    headers = {"Authorization": f"token {token}"}
     for i in range(MAX_RETRY):
         try:
-            response = requests.get(url)
+            response = requests.get(url, headers=headers)
             response.raise_for_status()
             return response.json()
         except Exception as ex:
@@ -228,9 +227,9 @@ def _exec_post_with_retry(url, token, data=None):
     raise Exception("Cannot execute POST request with retry")
 
 
-def _get_pull_requests_from(owner, branch):
-    url = f"{API_URL}/pulls?head={owner}:{branch}"
-    return _exec_get_with_retry(url)
+def _get_pull_requests_from(repo_url, owner, branch, token):
+    url = f"{repo_url}/pulls?head={owner}:{branch}"
+    return _exec_get_with_retry(url, token)
 
 
 def get_workflow_description_from_event(event):
@@ -248,6 +247,7 @@ def get_workflow_description_from_event(event):
     rerun_url = event["workflow_run"]["rerun_url"]
     url = event["workflow_run"]["html_url"]
     api_url = event["workflow_run"]["url"]
+    repo_url = event["repository"]["url"]
     return WorkflowDescription(
         name=name,
         action=action,
@@ -262,24 +262,24 @@ def get_workflow_description_from_event(event):
         jobs_url=jobs_url,
         rerun_url=rerun_url,
         url=url,
+        repo_url=repo_url,
         api_url=api_url,
     )
 
 
-def get_pr_author_and_orgs(pull_request):
+def get_pr_author_and_orgs(pull_request, token):
     author = pull_request["user"]["login"]
-    orgs = _exec_get_with_retry(pull_request["user"]["organizations_url"])
+    orgs = _exec_get_with_retry(pull_request["user"]["organizations_url"], token)
     return author, [org["id"] for org in orgs]
 
 
-def get_changed_files_for_pull_request(pull_request):
-    number = pull_request["number"]
+def get_changed_files_for_pull_request(pull_request, token):
+    url = pull_request["url"]
 
     changed_files = set([])
     for i in range(1, 31):
         print("Requesting changed files page", i)
-        url = f"{API_URL}/pulls/{number}/files?page={i}&per_page=100"
-        data = _exec_get_with_retry(url)
+        data = _exec_get_with_retry(f"{url}/files?page={i}&per_page=100", token)
         print(f"Got {len(data)} changed files")
         if len(data) == 0:
             print("No more changed files")
@@ -317,14 +317,13 @@ def check_suspicious_changed_files(changed_files):
     return False
 
 
-def approve_run(run_id, token):
-    url = f"{API_URL}/actions/runs/{run_id}/approve"
+def approve_run(workflow_description: WorkflowDescription, token):
+    url = f"{workflow_description.api_url}/approve"
     _exec_post_with_retry(url, token)
 
 
 def label_manual_approve(pull_request, token):
-    number = pull_request["number"]
-    url = f"{API_URL}/issues/{number}/labels"
+    url = f"{pull_request['url']}/labels"
     data = {"labels": "manual approve"}
 
     _exec_post_with_retry(url, token, data)
@@ -343,14 +342,14 @@ def get_token_from_aws():
     return get_access_token(encoded_jwt, installation_id)
 
 
-def get_workflow_jobs(workflow_description):
+def get_workflow_jobs(workflow_description, token):
     jobs_url = (
         workflow_description.api_url + f"/attempts/{workflow_description.attempt}/jobs"
     )
     jobs = []
     i = 1
     while True:
-        got_jobs = _exec_get_with_retry(jobs_url + f"?page={i}")
+        got_jobs = _exec_get_with_retry(jobs_url + f"?page={i}", token)
         if len(got_jobs["jobs"]) == 0:
             break
 
@@ -360,7 +359,7 @@ def get_workflow_jobs(workflow_description):
     return jobs
 
 
-def check_need_to_rerun(workflow_description):
+def check_need_to_rerun(workflow_description, token):
     if workflow_description.attempt >= MAX_WORKFLOW_RERUN:
         print(
             "Not going to rerun workflow because it's already tried more than two times"
@@ -368,7 +367,7 @@ def check_need_to_rerun(workflow_description):
         return False
     print("Going to check jobs")
 
-    jobs = get_workflow_jobs(workflow_description)
+    jobs = get_workflow_jobs(workflow_description, token)
     print("Got jobs", len(jobs))
     for job in jobs:
         if job["conclusion"] not in ("success", "skipped"):
@@ -395,17 +394,30 @@ def rerun_workflow(workflow_description, token):
         _exec_post_with_retry(workflow_description.rerun_url, token)
 
 
-def main(event):
-    token = get_token_from_aws()
-    event_data = json.loads(event["body"])
-    print("The body received:", event["body"])
-    workflow_description = get_workflow_description_from_event(event_data)
+def check_workflow_completed(
+    event_data, workflow_description: WorkflowDescription, token: str
+) -> bool:
+    if workflow_description.action == "completed":
+        attempt = 0
+        # Nice and reliable GH API sends from time to time such events, e.g:
+        # action='completed', conclusion=None, status='in_progress',
+        # So let's try receiving a real workflow data
+        while workflow_description.conclusion is None and attempt < MAX_RETRY:
+            progressive_sleep = 3 * sum(i + 1 for i in range(attempt))
+            time.sleep(progressive_sleep)
+            event_data["workflow_run"] = _exec_get_with_retry(
+                workflow_description.api_url, token
+            )
+            workflow_description = get_workflow_description_from_event(event_data)
+            attempt += 1
+
+        if workflow_description.conclusion != "failure":
+            print(
+                "Workflow finished with status "
+                f"{workflow_description.conclusion}, exiting"
+            )
+            return True
 
-    print("Got workflow description", workflow_description)
-    if (
-        workflow_description.action == "completed"
-        and workflow_description.conclusion == "failure"
-    ):
         print(
             "Workflow",
             workflow_description.url,
@@ -418,11 +430,24 @@ def main(event):
                 workflow_description.name,
                 "not in list of rerunable workflows",
             )
-            return
+            return True
 
-        if check_need_to_rerun(workflow_description):
+        if check_need_to_rerun(workflow_description, token):
             rerun_workflow(workflow_description, token)
-            return
+            return True
+
+    return False
+
+
+def main(event):
+    token = get_token_from_aws()
+    event_data = json.loads(event["body"])
+    print("The body received:", event["body"])
+    workflow_description = get_workflow_description_from_event(event_data)
+
+    print("Got workflow description", workflow_description)
+    if check_workflow_completed(event_data, workflow_description, token):
+        return
 
     if workflow_description.action != "requested":
         print("Exiting, event action is", workflow_description.action)
@@ -430,30 +455,31 @@ def main(event):
 
     if workflow_description.workflow_id in TRUSTED_WORKFLOW_IDS:
         print("Workflow in trusted list, approving run")
-        approve_run(workflow_description.run_id, token)
+        approve_run(workflow_description, token)
         return
 
     pull_requests = _get_pull_requests_from(
-        workflow_description.fork_owner_login, workflow_description.fork_branch
+        workflow_description.repo_url,
+        workflow_description.fork_owner_login,
+        workflow_description.fork_branch,
+        token,
     )
 
     print("Got pull requests for workflow", len(pull_requests))
-    if len(pull_requests) > 1:
-        raise Exception("Received more than one PR for workflow run")
-
-    if len(pull_requests) < 1:
-        raise Exception("Cannot find any pull requests for workflow run")
+    if len(pull_requests) != 1:
+        print(f"Can't continue with non-uniq PRs: {pull_requests}")
+        return
 
     pull_request = pull_requests[0]
     print("Pull request for workflow number", pull_request["number"])
 
-    author, author_orgs = get_pr_author_and_orgs(pull_request)
+    author, author_orgs = get_pr_author_and_orgs(pull_request, token)
     if is_trusted_contributor(author, author_orgs):
         print("Contributor is trusted, approving run")
-        approve_run(workflow_description.run_id, token)
+        approve_run(workflow_description, token)
         return
 
-    changed_files = get_changed_files_for_pull_request(pull_request)
+    changed_files = get_changed_files_for_pull_request(pull_request, token)
     print(f"Totally have {len(changed_files)} changed files in PR:", changed_files)
     if check_suspicious_changed_files(changed_files):
         print(
@@ -463,8 +489,12 @@ def main(event):
         label_manual_approve(pull_request, token)
     else:
         print(f"Pull Request {pull_request['number']} has no suspicious changes")
-        approve_run(workflow_description.run_id, token)
+        approve_run(workflow_description, token)
 
 
 def handler(event, _):
-    main(event)
+    try:
+        main(event)
+    except Exception:
+        print("Received event: ", event)
+        raise
diff --git a/tests/ci/workflow_approve_rerun_lambda/build_and_deploy_archive.sh b/tests/ci/workflow_approve_rerun_lambda/build_and_deploy_archive.sh
new file mode 120000
index 00000000000..96ba3fa024e
--- /dev/null
+++ b/tests/ci/workflow_approve_rerun_lambda/build_and_deploy_archive.sh
@@ -0,0 +1 @@
+../team_keys_lambda/build_and_deploy_archive.sh
\ No newline at end of file
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 952fc7fb0a9..3d62746dc48 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -55,8 +55,6 @@ MESSAGES_TO_RETRY = [
     "ConnectionPoolWithFailover: Connection failed at try",
     "DB::Exception: New table appeared in database being dropped or detached. Try again",
     "is already started to be removing by another replica right now",
-    "DB::Exception: Cannot enqueue query",
-    "is executing longer than distributed_ddl_task_timeout",  # FIXME
 ]
 
 MAX_RETRIES = 3
@@ -182,6 +180,15 @@ def get_db_engine(args, database_name):
     return ""  # Will use default engine
 
 
+def get_create_database_settings(args, testcase_args):
+    create_database_settings = dict()
+    if testcase_args:
+        create_database_settings["log_comment"] = testcase_args.testcase_basename
+    if args.db_engine == "Ordinary":
+        create_database_settings["allow_deprecated_database_ordinary"] = 1
+    return create_database_settings
+
+
 def get_zookeeper_session_uptime(args):
     try:
         if args.replicated_database:
@@ -448,6 +455,7 @@ class SettingsRandomizer:
         "compile_sort_description": lambda: random.randint(0, 1),
         "merge_tree_coarse_index_granularity": lambda: random.randint(2, 32),
         "optimize_distinct_in_order": lambda: random.randint(0, 1),
+        "optimize_sorting_by_input_stream_properties": lambda: random.randint(0, 1),
     }
 
     @staticmethod
@@ -537,9 +545,7 @@ class TestCase:
             clickhouse_execute(
                 args,
                 "CREATE DATABASE " + database + get_db_engine(testcase_args, database),
-                settings={
-                    "log_comment": testcase_args.testcase_basename,
-                },
+                settings=get_create_database_settings(args, testcase_args),
             )
 
             os.environ["CLICKHOUSE_DATABASE"] = database
@@ -914,7 +920,7 @@ class TestCase:
         description_full += result.description
         description_full += "\n"
 
-        if result.status == TestStatus.FAIL:
+        if result.status == TestStatus.FAIL and self.testcase_args:
             description_full += "Database: " + self.testcase_args.testcase_database
 
         result.description = description_full
@@ -1179,15 +1185,21 @@ class TestSuite:
         def is_shebang(line: str) -> bool:
             return line.startswith("#!")
 
+        def find_tag_line(file):
+            for line in file:
+                line = line.strip()
+                if line and not is_shebang(line):
+                    return line
+            return ''
+
         def load_tags_from_file(filepath):
+            comment_sign = get_comment_sign(filepath)
             with open(filepath, "r", encoding="utf-8") as file:
                 try:
-                    line = file.readline()
-                    if is_shebang(line):
-                        line = file.readline()
+                    line = find_tag_line(file)
                 except UnicodeDecodeError:
                     return []
-            return parse_tags_from_line(line, get_comment_sign(filepath))
+            return parse_tags_from_line(line, comment_sign)
 
         all_tags = {}
         start_time = datetime.now()
@@ -1559,7 +1571,7 @@ def collect_build_flags(args):
         args,
         "SELECT value FROM system.settings WHERE name = 'allow_deprecated_database_ordinary'",
     )
-    if value == b"1":
+    if value == b"1" or args.db_engine == "Ordinary":
         result.append(BuildFlags.ORDINARY_DATABASE)
 
     value = int(
@@ -1746,10 +1758,7 @@ def main(args):
         stop_time = time() + args.global_time_limit
 
     if args.zookeeper is None:
-        try:
-            args.zookeeper = int(extract_key(" --key zookeeper | grep . | wc -l")) > 0
-        except ValueError:
-            args.zookeeper = False
+        args.zookeeper = True
 
     if args.shard is None:
         args.shard = bool(extract_key(' --key listen_host | grep -E "127.0.0.2|::"'))
@@ -1763,6 +1772,7 @@ def main(args):
                     args,
                     f"CREATE DATABASE IF NOT EXISTS {db_name} "
                     f"{get_db_engine(args, db_name)}",
+                    settings=get_create_database_settings(args, None),
                 )
             except HTTPError as e:
                 total_time = (datetime.now() - start_time).total_seconds()
diff --git a/tests/config/client_config.xml b/tests/config/client_config.xml
index fd5a85d8c4f..a93935ee111 100644
--- a/tests/config/client_config.xml
+++ b/tests/config/client_config.xml
@@ -11,4 +11,7 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
+
+    <!-- Default timeout is 5 sec. Set it to 10 to avoid tests flakiness with slow builds (debug, tsan) -->
+    <sync_request_timeout>10</sync_request_timeout>
 </config>
diff --git a/tests/config/config.d/azure_storage_conf.xml b/tests/config/config.d/azure_storage_conf.xml
new file mode 100644
index 00000000000..f42bb8e3cf8
--- /dev/null
+++ b/tests/config/config.d/azure_storage_conf.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <azure>
+                <type>azure_blob_storage</type>
+                <storage_account_url>http://localhost:10000/devstoreaccount1</storage_account_url>
+                <container_name>cont</container_name>
+                <skip_access_check>false</skip_access_check>
+                <!-- default credentials for Azurite storage account -->
+                <account_name>devstoreaccount1</account_name>
+                <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
+                <max_single_part_upload_size>33554432</max_single_part_upload_size>
+            </azure>
+            <cached_azure>
+                <type>cache</type>
+                <disk>azure</disk>
+                <path>azure_cache/</path>
+                <max_size>100000000000</max_size>
+                <cache_on_write_operations>1</cache_on_write_operations>
+            </cached_azure>
+        </disks>
+        <policies>
+            <azure_cache>
+                <volumes>
+                    <main>
+                        <disk>cached_azure</disk>
+                    </main>
+                </volumes>
+            </azure_cache>
+        </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/config/config.d/keeper_port.xml b/tests/config/config.d/keeper_port.xml
index 8cea9044dd0..cffd325e968 100644
--- a/tests/config/config.d/keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -3,6 +3,8 @@
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
 
+        <create_snapshot_on_exit>true</create_snapshot_on_exit>
+
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>100000</session_timeout_ms>
diff --git a/tests/config/config.d/merge_tree_old_dirs_cleanup.xml b/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
new file mode 100644
index 00000000000..41932cb6d61
--- /dev/null
+++ b/tests/config/config.d/merge_tree_old_dirs_cleanup.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <merge_tree>
+        <!-- Default is 86400 (1 day), but we have protection from removal of tmp dirs that are currently in use -->
+        <temporary_directories_lifetime>1</temporary_directories_lifetime>
+        <!-- Default is 60 seconds, but let's make tests more aggressive -->
+        <merge_tree_clear_old_temporary_directories_interval_seconds>10</merge_tree_clear_old_temporary_directories_interval_seconds>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/prometheus.xml b/tests/config/config.d/prometheus.xml
new file mode 100644
index 00000000000..7f8dbd1601f
--- /dev/null
+++ b/tests/config/config.d/prometheus.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <prometheus>
+        <endpoint>/metrics</endpoint>
+        <port>9988</port>
+    </prometheus>
+</clickhouse>
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index cfabf3d1e19..de41478f74a 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -1,49 +1,151 @@
 <clickhouse>
     <storage_configuration>
         <disks>
-            <s3_cache>
+            <!-- s3 disks -->
+            <s3_disk>
                 <type>s3</type>
+                <path>s3_disk/</path>
                 <endpoint>http://localhost:11111/test/00170_test/</endpoint>
                 <access_key_id>clickhouse</access_key_id>
                 <secret_access_key>clickhouse</secret_access_key>
-                <data_cache_enabled>1</data_cache_enabled>
-                <cache_enabled>0</cache_enabled>
-                <data_cache_max_size>22548578304</data_cache_max_size>
+            </s3_disk>
+            <s3_disk_2>
+                <type>s3</type>
+                <path>s3_disk_2/</path>
+                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_disk_2>
+            <s3_disk_3>
+                <type>s3</type>
+                <path>s3_disk_3/</path>
+                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_disk_3>
+            <s3_disk_4>
+                <type>s3</type>
+                <path>s3_disk_4/</path>
+                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_disk_4>
+            <s3_disk_5>
+                <type>s3</type>
+                <path>s3_disk_5/</path>
+                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_disk_5>
+            <s3_disk_6>
+                <type>s3</type>
+                <path>s3_disk_6/</path>
+                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_disk_6>
+            <!-- cache for s3 disks -->
+            <s3_cache>
+                <type>cache</type>
+                <disk>s3_disk</disk>
+                <path>s3_disk_cache/</path>
+                <max_size>22548578304</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
-                <data_cache_path>./s3_cache/</data_cache_path>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
             </s3_cache>
             <s3_cache_2>
-                <type>s3</type>
-                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
-                <access_key_id>clickhouse</access_key_id>
-                <secret_access_key>clickhouse</secret_access_key>
-                <data_cache_enabled>1</data_cache_enabled>
-                <cache_enabled>0</cache_enabled>
-                <data_cache_max_size>22548578304</data_cache_max_size>
-                <cache_on_write_operations>0</cache_on_write_operations>
+                <type>cache</type>
+                <disk>s3_disk_2</disk>
+                <path>s3_cache_2/</path>
+                <max_size>22548578304</max_size>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
             </s3_cache_2>
             <s3_cache_3>
-                <type>s3</type>
-                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
-                <access_key_id>clickhouse</access_key_id>
-                <secret_access_key>clickhouse</secret_access_key>
-                <data_cache_enabled>1</data_cache_enabled>
-                <cache_enabled>0</cache_enabled>
+                <type>cache</type>
+                <disk>s3_disk_3</disk>
+                <path>s3_disk_3_cache/</path>
+                <max_size>22548578304</max_size>
                 <data_cache_max_size>22548578304</data_cache_max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <enable_cache_hits_threshold>1</enable_cache_hits_threshold>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
             </s3_cache_3>
             <s3_cache_4>
-                <type>s3</type>
-                <endpoint>http://localhost:11111/test/00170_test/</endpoint>
-                <access_key_id>clickhouse</access_key_id>
-                <secret_access_key>clickhouse</secret_access_key>
-                <data_cache_enabled>1</data_cache_enabled>
-                <cache_enabled>0</cache_enabled>
-                <data_cache_max_size>22548578304</data_cache_max_size>
+                <type>cache</type>
+                <disk>s3_disk_4</disk>
+                <path>s3_cache_4/</path>
+                <max_size>22548578304</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <enable_filesystem_query_cache_limit>1</enable_filesystem_query_cache_limit>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
             </s3_cache_4>
+            <s3_cache_5>
+                <type>cache</type>
+                <disk>s3_disk_5</disk>
+                <path>s3_cache_5/</path>
+                <max_size>22548578304</max_size>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+            </s3_cache_5>
+            <s3_cache_small>
+                <type>cache</type>
+                <disk>s3_disk_6</disk>
+                <path>s3_cache_small/</path>
+                <max_size>1000</max_size>
+                <do_not_evict_index_and_mark_files>1</do_not_evict_index_and_mark_files>
+            </s3_cache_small>
+            <!-- local disks -->
+            <local_disk>
+                <type>local</type>
+                <path>local_disk/</path>
+            </local_disk>
+            <local_disk_2>
+                <type>local</type>
+                <path>local_disk_2/</path>
+            </local_disk_2>
+            <local_disk_3>
+                <type>local</type>
+                <path>local_disk_3/</path>
+            </local_disk_3>
+            <!-- cache for local disks -->
+            <local_cache>
+                <type>cache</type>
+                <disk>local_disk</disk>
+                <path>local_cache/</path>
+                <max_size>22548578304</max_size>
+                <cache_on_write_operations>1</cache_on_write_operations>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+            </local_cache>
+            <local_cache_2>
+                <type>cache</type>
+                <disk>local_disk</disk>
+                <path>local_cache_2/</path>
+                <max_size>22548578304</max_size>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+            </local_cache_2>
+            <local_cache_3>
+                <type>cache</type>
+                <disk>local_disk_3</disk>
+                <path>local_cache_3/</path>
+                <max_size>22548578304</max_size>
+                <cache_on_write_operations>1</cache_on_write_operations>
+                <enable_cache_hits_threshold>1</enable_cache_hits_threshold>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+            </local_cache_3>
+            <!-- multi layer cache -->
+            <s3_cache_multi>
+                <type>cache</type>
+                <disk>s3_cache_5</disk>
+                <path>s3_cache_multi/</path>
+                <max_size>22548578304</max_size>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+            </s3_cache_multi>
+            <s3_cache_multi_2>
+                <type>cache</type>
+                <disk>s3_cache_multi</disk>
+                <path>s3_cache_multi_2/</path>
+                <max_size>22548578304</max_size>
+                <do_not_evict_index_and_mark_files>0</do_not_evict_index_and_mark_files>
+            </s3_cache_multi_2>
         </disks>
         <policies>
             <s3_cache>
@@ -74,6 +176,41 @@
                     </main>
                 </volumes>
             </s3_cache_4>
+            <s3_cache_multi>
+                <volumes>
+                    <main>
+                        <disk>s3_cache_multi_2</disk>
+                    </main>
+                </volumes>
+            </s3_cache_multi>
+            <s3_cache_small>
+                <volumes>
+                    <main>
+                        <disk>s3_cache_small</disk>
+                    </main>
+                </volumes>
+            </s3_cache_small>
+            <local_cache>
+                <volumes>
+                    <main>
+                        <disk>local_cache</disk>
+                    </main>
+                </volumes>
+            </local_cache>
+            <local_cache_2>
+                <volumes>
+                    <main>
+                        <disk>local_cache_2</disk>
+                    </main>
+                </volumes>
+            </local_cache_2>
+            <local_cache_3>
+                <volumes>
+                    <main>
+                        <disk>local_cache_3</disk>
+                    </main>
+                </volumes>
+            </local_cache_3>
         </policies>
     </storage_configuration>
 </clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index a9e66ebb633..eca1bfc3501 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -29,12 +29,14 @@ ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/max_concurrent_queries.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/merge_tree_settings.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/merge_tree_old_dirs_cleanup.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/keeper_port.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/merge_tree.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/metadata_cache.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/tcp_with_proxy.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/prometheus.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_lists.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_path.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/transactions.xml $DEST_SERVER_PATH/config.d/
@@ -80,6 +82,10 @@ ln -sf $SRC_PATH/dhparam.pem $DEST_SERVER_PATH/
 ln -sf --backup=simple --suffix=_original.xml \
    $SRC_PATH/config.d/query_masking_rules.xml $DEST_SERVER_PATH/config.d/
 
+# We randomize creating the snapshot on exit for Keeper to test out using older snapshots
+create_snapshot_on_exit=$(($RANDOM % 2))
+sed --follow-symlinks -i "s|<create_snapshot_on_exit>true</create_snapshot_on_exit>|<create_snapshot_on_exit>$create_snapshot_on_exit</create_snapshot_on_exit>|" $DEST_SERVER_PATH/config.d/keeper_port.xml
+
 if [[ -n "$USE_POLYMORPHIC_PARTS" ]] && [[ "$USE_POLYMORPHIC_PARTS" -eq 1 ]]; then
     ln -sf $SRC_PATH/config.d/polymorphic_parts.xml $DEST_SERVER_PATH/config.d/
 fi
@@ -94,7 +100,17 @@ if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TR
     ln -sf $SRC_PATH/config.d/logger_trace.xml $DEST_SERVER_PATH/config.d/
 fi
 
+ARM="aarch64"
+OS="$(uname -m)"
 if [[ -n "$EXPORT_S3_STORAGE_POLICIES" ]]; then
+    echo "$OS"
+    if [[ "$USE_DATABASE_REPLICATED" -eq 1 ]] || [[ "$OS" == "$ARM" ]]; then
+        echo "Azure configuration will not be added"
+    else
+        echo "Adding azure configuration"
+        ln -sf $SRC_PATH/config.d/azure_storage_conf.xml $DEST_SERVER_PATH/config.d/
+    fi
+
     ln -sf $SRC_PATH/config.d/storage_conf.xml $DEST_SERVER_PATH/config.d/
     ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/users.d/
 fi
diff --git a/tests/config/users.d/database_replicated.xml b/tests/config/users.d/database_replicated.xml
index 279591494c1..2b96e7418b6 100644
--- a/tests/config/users.d/database_replicated.xml
+++ b/tests/config/users.d/database_replicated.xml
@@ -6,7 +6,7 @@
             <database_replicated_initial_query_timeout_sec>120</database_replicated_initial_query_timeout_sec>
             <distributed_ddl_task_timeout>120</distributed_ddl_task_timeout>
             <database_replicated_always_detach_permanently>1</database_replicated_always_detach_permanently>
-            <distributed_ddl_entry_format_version>2</distributed_ddl_entry_format_version>
+            <database_replicated_enforce_synchronous_settings>1</database_replicated_enforce_synchronous_settings>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index 68c695f57a0..1482c068be5 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -1,8 +1,4 @@
-if(CLICKHOUSE_SPLIT_BINARY)
-    set (TEST_USE_BINARIES CLICKHOUSE_TESTS_SERVER_BIN_PATH=${ClickHouse_BINARY_DIR}/programs/clickhouse-server CLICKHOUSE_TESTS_CLIENT_BIN_PATH=${ClickHouse_BINARY_DIR}/programs/clickhouse-client)
-else()
-    set (TEST_USE_BINARIES CLICKHOUSE_TESTS_SERVER_BIN_PATH=${ClickHouse_BINARY_DIR}/programs/clickhouse CLICKHOUSE_TESTS_CLIENT_BIN_PATH=${ClickHouse_BINARY_DIR}/programs/clickhouse)
-endif()
+set (TEST_USE_BINARIES CLICKHOUSE_TESTS_SERVER_BIN_PATH=${ClickHouse_BINARY_DIR}/programs/clickhouse CLICKHOUSE_TESTS_CLIENT_BIN_PATH=${ClickHouse_BINARY_DIR}/programs/clickhouse)
 
 find_program(DOCKER_CMD docker)
 find_program(DOCKER_COMPOSE_CMD docker-compose)
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 18d46908524..f0160dcd444 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -31,6 +31,7 @@ sudo -H pip install \
     kafka-python \
     kazoo \
     minio \
+    lz4 \
     protobuf \
     psycopg2-binary \
     pymongo \
@@ -147,7 +148,7 @@ will automagically detect the types of variables and only the small diff of two
 
 ### Troubleshooting
 
-If tests failing for misterious reasons, this may help:
+If tests failing for mysterious reasons, this may help:
 
 ```
 sudo service docker stop
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index f03a6d2ab23..a4407d5b442 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -4,6 +4,8 @@ import tempfile
 import logging
 from threading import Timer
 
+DEFAULT_QUERY_TIMEOUT = 600
+
 
 class Client:
     def __init__(self, host, port=9000, command="/usr/bin/clickhouse-client"):
@@ -16,6 +18,23 @@ class Client:
 
         self.command += ["--host", self.host, "--port", str(self.port), "--stacktrace"]
 
+    def stacktraces_on_timeout_decorator(func):
+        def wrap(self, *args, **kwargs):
+            try:
+                return func(self, *args, **kwargs)
+            except sp.TimeoutExpired:
+                # I failed to make pytest print stacktraces using print(...) or logging.debug(...), so...
+                self.get_query_request(
+                    "INSERT INTO TABLE FUNCTION file('stacktraces_on_timeout.txt', 'TSVRaw', 'tn String, tid UInt64, qid String, st String') "
+                    "SELECT thread_name, thread_id, query_id, arrayStringConcat(arrayMap(x -> demangle(addressToSymbol(x)), trace), '\n') AS res FROM system.stack_trace "
+                    "SETTINGS allow_introspection_functions=1",
+                    timeout=60,
+                ).get_answer_and_error()
+                raise
+
+        return wrap
+
+    @stacktraces_on_timeout_decorator
     def query(
         self,
         sql,
@@ -80,6 +99,7 @@ class Client:
 
         return CommandRequest(command, stdin, timeout, ignore_error)
 
+    @stacktraces_on_timeout_decorator
     def query_and_get_error(
         self,
         sql,
@@ -100,6 +120,7 @@ class Client:
             database=database,
         ).get_error()
 
+    @stacktraces_on_timeout_decorator
     def query_and_get_answer_with_error(
         self,
         sql,
@@ -170,7 +191,7 @@ class CommandRequest:
             self.timer.start()
 
     def get_answer(self):
-        self.process.wait()
+        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
         self.stderr_file.seek(0)
 
@@ -197,7 +218,7 @@ class CommandRequest:
         return stdout
 
     def get_error(self):
-        self.process.wait()
+        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
         self.stderr_file.seek(0)
 
@@ -221,7 +242,7 @@ class CommandRequest:
         return stderr
 
     def get_answer_and_error(self):
-        self.process.wait()
+        self.process.wait(timeout=DEFAULT_QUERY_TIMEOUT)
         self.stdout_file.seek(0)
         self.stderr_file.seek(0)
 
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 7700fc2dffd..ad1cefe6055 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -30,6 +30,7 @@ try:
     import pymongo
     import pymysql
     import nats
+    import ssl
     import meilisearch
     from confluent_kafka.avro.cached_schema_registry_client import (
         CachedSchemaRegistryClient,
@@ -215,9 +216,27 @@ def check_rabbitmq_is_available(rabbitmq_id):
     return p.returncode == 0
 
 
-async def check_nats_is_available(nats_ip):
-    nc = await nats.connect("{}:4444".format(nats_ip), user="click", password="house")
-    return nc.is_connected
+async def check_nats_is_available(nats_port, ssl_ctx=None):
+    nc = await nats_connect_ssl(
+        nats_port, user="click", password="house", ssl_ctx=ssl_ctx
+    )
+    available = nc.is_connected
+    await nc.close()
+    return available
+
+
+async def nats_connect_ssl(nats_port, user, password, ssl_ctx=None):
+    if not ssl_ctx:
+        ssl_ctx = ssl.create_default_context()
+        ssl_ctx.check_hostname = False
+        ssl_ctx.verify_mode = ssl.CERT_NONE
+    nc = await nats.connect(
+        "tls://localhost:{}".format(nats_port),
+        user=user,
+        password=password,
+        tls=ssl_ctx,
+    )
+    return nc
 
 
 def enable_consistent_hash_plugin(rabbitmq_id):
@@ -237,6 +256,24 @@ def enable_consistent_hash_plugin(rabbitmq_id):
     return p.returncode == 0
 
 
+def get_instances_dir(name):
+    instances_dir_name = "_instances"
+
+    worker_name = os.environ.get("PYTEST_XDIST_WORKER", "")
+    run_id = os.environ.get("INTEGRATION_TESTS_RUN_ID", "")
+
+    if worker_name:
+        instances_dir_name += "_" + worker_name
+
+    if name:
+        instances_dir_name += "_" + name
+
+    if run_id:
+        instances_dir_name += "_" + shlex.quote(run_id)
+
+    return instances_dir_name
+
+
 def extract_test_name(base_path):
     """Extracts the name of the test based to a path to its test*.py file
     Must be unique in each test directory (because it's used to make instances dir and to stop docker containers from previous run)
@@ -249,16 +286,6 @@ def extract_test_name(base_path):
     return name
 
 
-def get_instances_dir():
-    if (
-        "INTEGRATION_TESTS_RUN_ID" in os.environ
-        and os.environ["INTEGRATION_TESTS_RUN_ID"]
-    ):
-        return "_instances_" + shlex.quote(os.environ["INTEGRATION_TESTS_RUN_ID"])
-    else:
-        return "_instances"
-
-
 class ClickHouseCluster:
     """ClickHouse cluster with several instances and (possibly) ZooKeeper.
 
@@ -318,24 +345,14 @@ class ClickHouseCluster:
         )
         # docker-compose removes everything non-alphanumeric from project names so we do it too.
         self.project_name = re.sub(r"[^a-z0-9]", "", project_name.lower())
-        instances_dir_name = "_instances"
-        if self.name:
-            instances_dir_name += "_" + self.name
-
-        if (
-            "INTEGRATION_TESTS_RUN_ID" in os.environ
-            and os.environ["INTEGRATION_TESTS_RUN_ID"]
-        ):
-            instances_dir_name += "_" + shlex.quote(
-                os.environ["INTEGRATION_TESTS_RUN_ID"]
-            )
-
-        self.instances_dir = p.join(self.base_dir, instances_dir_name)
+        self.instances_dir_name = get_instances_dir(self.name)
+        self.instances_dir = p.join(self.base_dir, self.instances_dir_name)
         self.docker_logs_path = p.join(self.instances_dir, "docker.log")
         self.env_file = p.join(self.instances_dir, DEFAULT_ENV_NAME)
         self.env_variables = {}
         self.env_variables["TSAN_OPTIONS"] = "second_deadlock_stack=1"
         self.env_variables["CLICKHOUSE_WATCHDOG_ENABLE"] = "0"
+        self.env_variables["CLICKHOUSE_NATS_TLS_SECURE"] = "0"
         self.up_called = False
 
         custom_dockerd_host = custom_dockerd_host or os.environ.get(
@@ -464,9 +481,11 @@ class ClickHouseCluster:
         self.rabbitmq_logs_dir = os.path.join(self.rabbitmq_dir, "logs")
 
         self.nats_host = "nats1"
-        self.nats_ip = None
         self.nats_port = 4444
         self.nats_docker_id = None
+        self.nats_dir = p.abspath(p.join(self.instances_dir, "nats"))
+        self.nats_cert_dir = os.path.join(self.nats_dir, "cert")
+        self.nats_ssl_context = None
 
         # available when with_nginx == True
         self.nginx_host = "nginx"
@@ -551,8 +570,41 @@ class ClickHouseCluster:
         self.is_up = False
         self.env = os.environ.copy()
         logging.debug(f"CLUSTER INIT base_config_dir:{self.base_config_dir}")
+        if p.exists(self.instances_dir):
+            shutil.rmtree(self.instances_dir, ignore_errors=True)
+            logging.debug(f"Removed :{self.instances_dir}")
+        os.mkdir(self.instances_dir)
+
+    def print_all_docker_pieces(self):
+        res_networks = subprocess.check_output(
+            f"docker network ls --filter name='{self.project_name}*'",
+            shell=True,
+            universal_newlines=True,
+        )
+        logging.debug(
+            f"Docker networks for project {self.project_name} are {res_networks}"
+        )
+        res_containers = subprocess.check_output(
+            f"docker container ls -a --filter name='{self.project_name}*'",
+            shell=True,
+            universal_newlines=True,
+        )
+        logging.debug(
+            f"Docker containers for project {self.project_name} are {res_containers}"
+        )
+        res_volumes = subprocess.check_output(
+            f"docker volume ls --filter name='{self.project_name}*'",
+            shell=True,
+            universal_newlines=True,
+        )
+        logging.debug(
+            f"Docker volumes for project {self.project_name} are {res_volumes}"
+        )
 
     def cleanup(self):
+        logging.debug("Cleanup called")
+        self.print_all_docker_pieces()
+
         if (
             os.environ
             and "DISABLE_CLEANUP" in os.environ
@@ -564,7 +616,8 @@ class ClickHouseCluster:
         # Just in case kill unstopped containers from previous launch
         try:
             unstopped_containers = self.get_running_containers()
-            if unstopped_containers:
+            logging.debug(f"Unstopped containers: {unstopped_containers}")
+            if len(unstopped_containers):
                 logging.debug(
                     f"Trying to kill unstopped containers: {unstopped_containers}"
                 )
@@ -578,26 +631,33 @@ class ClickHouseCluster:
                     logging.debug(f"Unstopped containers killed.")
             else:
                 logging.debug(f"No running containers for project: {self.project_name}")
+        except Exception as ex:
+            logging.debug(f"Got exception removing containers {str(ex)}")
+
+        # # Just in case remove unused networks
+        try:
+            logging.debug("Trying to prune unused networks...")
+
+            list_networks = subprocess.check_output(
+                f"docker network ls -q --filter name='{self.project_name}'",
+                shell=True,
+                universal_newlines=True,
+            ).splitlines()
+            if list_networks:
+                logging.debug(f"Trying to remove networks: {list_networks}")
+                run_and_check(f"docker network rm {' '.join(list_networks)}")
+                logging.debug(f"Networks removed: {list_networks}")
         except:
             pass
 
-        # # Just in case remove unused networks
-        # try:
-        #     logging.debug("Trying to prune unused networks...")
-
-        #     run_and_check(['docker', 'network', 'prune', '-f'])
-        #     logging.debug("Networks pruned")
-        # except:
-        #     pass
-
         # Remove unused images
-        # try:
-        #     logging.debug("Trying to prune unused images...")
+        try:
+            logging.debug("Trying to prune unused images...")
 
-        #     run_and_check(['docker', 'image', 'prune', '-f'])
-        #     logging.debug("Images pruned")
-        # except:
-        #     pass
+            run_and_check(["docker", "image", "prune", "-f"])
+            logging.debug("Images pruned")
+        except:
+            pass
 
         # Remove unused volumes
         try:
@@ -640,9 +700,7 @@ class ClickHouseCluster:
             f"docker container list --all --filter name='{filter_name}' --format '{format}'",
             shell=True,
         )
-        containers = dict(
-            line.split(":", 1) for line in containers.decode("utf8").splitlines()
-        )
+        containers = dict(line.split(":", 1) for line in containers.splitlines())
         return containers
 
     def copy_file_from_container_to_container(
@@ -1046,6 +1104,7 @@ class ClickHouseCluster:
         env_variables["NATS_HOST"] = self.nats_host
         env_variables["NATS_INTERNAL_PORT"] = "4444"
         env_variables["NATS_EXTERNAL_PORT"] = str(self.nats_port)
+        env_variables["NATS_CERT_DIR"] = self.nats_cert_dir
 
         self.base_cmd.extend(
             ["--file", p.join(docker_compose_yml_dir, "docker_compose_nats.yml")]
@@ -1818,7 +1877,7 @@ class ClickHouseCluster:
                 errors += [str(ex)]
                 time.sleep(0.5)
 
-        run_and_check(["docker-compose", "ps", "--services", "--all"])
+        run_and_check(["docker", "ps", "--all"])
         logging.error("Can't connect to MySQL:{}".format(errors))
         raise Exception("Cannot wait MySQL container")
 
@@ -1840,7 +1899,7 @@ class ClickHouseCluster:
                 logging.debug("Can't connect to MySQL 8 " + str(ex))
                 time.sleep(0.5)
 
-        run_and_check(["docker-compose", "ps", "--services", "--all"])
+        run_and_check(["docker", "ps", "--all"])
         raise Exception("Cannot wait MySQL 8 container")
 
     def wait_mysql_cluster_to_start(self, timeout=180):
@@ -1865,7 +1924,7 @@ class ClickHouseCluster:
                 errors += [str(ex)]
                 time.sleep(0.5)
 
-        run_and_check(["docker-compose", "ps", "--services", "--all"])
+        run_and_check(["docker", "ps", "--all"])
         logging.error("Can't connect to MySQL:{}".format(errors))
         raise Exception("Cannot wait MySQL container")
 
@@ -1967,10 +2026,12 @@ class ClickHouseCluster:
             raise Exception("Cannot wait RabbitMQ container")
         return False
 
-    def wait_nats_is_available(self, nats_ip, max_retries=5):
+    def wait_nats_is_available(self, max_retries=5):
         retries = 0
         while True:
-            if asyncio.run(check_nats_is_available(nats_ip)):
+            if asyncio.run(
+                check_nats_is_available(self.nats_port, ssl_ctx=self.nats_ssl_context)
+            ):
                 break
             else:
                 retries += 1
@@ -1979,25 +2040,6 @@ class ClickHouseCluster:
                 logging.debug("Waiting for NATS to start up")
                 time.sleep(1)
 
-    def wait_nginx_to_start(self, timeout=60):
-        self.nginx_ip = self.get_instance_ip(self.nginx_host)
-        start = time.time()
-        while time.time() - start < timeout:
-            try:
-                self.exec_in_container(
-                    self.nginx_id,
-                    ["curl", "-X", "PUT", "-d", "Test", "http://test.com/test.txt"],
-                )
-                res = self.exec_in_container(
-                    self.nginx_id, ["curl", "-X", "GET", "http://test.com/test.txt"]
-                )
-                assert res == "Test"
-                print("nginx static files server is available")
-                return
-            except Exception as ex:
-                print("Can't connect to nginx: " + str(ex))
-                time.sleep(0.5)
-
     def wait_zookeeper_secure_to_start(self, timeout=20):
         logging.debug("Wait ZooKeeper Secure to start")
         start = time.time()
@@ -2180,6 +2222,14 @@ class ClickHouseCluster:
                 logging.debug("Can't connect to Minio: %s", str(ex))
                 time.sleep(1)
 
+        try:
+            with open(os.path.join(self.minio_dir, "docker.log"), "w+") as f:
+                subprocess.check_call(  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+                    self.base_minio_cmd + ["logs"], stdout=f
+                )
+        except Exception as e:
+            logging.debug("Unable to get logs from docker.")
+
         raise Exception("Can't wait Minio to start")
 
     def wait_azurite_to_start(self, timeout=180):
@@ -2250,15 +2300,13 @@ class ClickHouseCluster:
 
         raise Exception("Can't wait Cassandra to start")
 
-    def start(self, destroy_dirs=True):
+    def start(self):
         pytest_xdist_logging_to_separate_files.setup()
         logging.info("Running tests in {}".format(self.base_path))
 
-        logging.debug(
-            "Cluster start called. is_up={}, destroy_dirs={}".format(
-                self.is_up, destroy_dirs
-            )
-        )
+        logging.debug(f"Cluster start called. is_up={self.is_up}")
+        self.print_all_docker_pieces()
+
         if self.is_up:
             return
 
@@ -2268,23 +2316,9 @@ class ClickHouseCluster:
             logging.warning("Cleanup failed:{e}")
 
         try:
-            # clickhouse_pull_cmd = self.base_cmd + ['pull']
-            # print(f"Pulling images for {self.base_cmd}")
-            # retry_exception(10, 5, subprocess_check_call, Exception, clickhouse_pull_cmd)
-
-            if destroy_dirs and p.exists(self.instances_dir):
-                logging.debug(f"Removing instances dir {self.instances_dir}")
-                shutil.rmtree(self.instances_dir)
-
             for instance in list(self.instances.values()):
-                logging.debug(
-                    (
-                        "Setup directory for instance: {} destroy_dirs: {}".format(
-                            instance.name, destroy_dirs
-                        )
-                    )
-                )
-                instance.create_dir(destroy_dir=destroy_dirs)
+                logging.debug(f"Setup directory for instance: {instance.name}")
+                instance.create_dir()
 
             _create_env_file(os.path.join(self.env_file), self.env_variables)
             self.docker_client = docker.DockerClient(
@@ -2453,11 +2487,24 @@ class ClickHouseCluster:
 
             if self.with_nats and self.base_nats_cmd:
                 logging.debug("Setup NATS")
+                os.makedirs(self.nats_cert_dir)
+                env = os.environ.copy()
+                env["NATS_CERT_DIR"] = self.nats_cert_dir
+                run_and_check(
+                    p.join(self.base_dir, "nats_certs.sh"),
+                    env=env,
+                    detach=False,
+                    nothrow=False,
+                )
+
+                self.nats_ssl_context = ssl.create_default_context()
+                self.nats_ssl_context.load_verify_locations(
+                    p.join(self.nats_cert_dir, "ca", "ca-cert.pem")
+                )
                 subprocess_check_call(self.base_nats_cmd + common_opts)
                 self.nats_docker_id = self.get_instance_docker_id("nats1")
                 self.up_called = True
-                self.nats_ip = self.get_instance_ip("nats1")
-                self.wait_nats_is_available(self.nats_ip)
+                self.wait_nats_is_available()
 
             if self.with_hdfs and self.base_hdfs_cmd:
                 logging.debug("Setup HDFS")
@@ -2484,7 +2531,6 @@ class ClickHouseCluster:
                 )
                 self.up_called = True
                 self.nginx_docker_id = self.get_instance_docker_id("nginx")
-                self.wait_nginx_to_start()
 
             if self.with_mongo and self.base_mongo_cmd:
                 logging.debug("Setup Mongo")
@@ -2684,13 +2730,9 @@ class ClickHouseCluster:
     def pause_container(self, instance_name):
         subprocess_check_call(self.base_cmd + ["pause", instance_name])
 
-    #    subprocess_check_call(self.base_cmd + ['kill', '-s SIGSTOP', instance_name])
-
     def unpause_container(self, instance_name):
         subprocess_check_call(self.base_cmd + ["unpause", instance_name])
 
-    #    subprocess_check_call(self.base_cmd + ['kill', '-s SIGCONT', instance_name])
-
     def open_bash_shell(self, instance_name):
         os.system(" ".join(self.base_cmd + ["exec", instance_name, "/bin/bash"]))
 
@@ -3121,7 +3163,69 @@ class ClickHouseInstance:
         params=None,
         user=None,
         password=None,
-        expect_fail_and_get_error=False,
+        port=8123,
+        timeout=None,
+        retry_strategy=None,
+    ):
+        output, error = self.http_query_and_get_answer_with_error(
+            sql,
+            data=data,
+            method=method,
+            params=params,
+            user=user,
+            password=password,
+            port=port,
+            timeout=timeout,
+            retry_strategy=retry_strategy,
+        )
+
+        if error:
+            raise Exception("ClickHouse HTTP server returned " + error)
+
+        return output
+
+    # Connects to the instance via HTTP interface, sends a query, expects an error and return the error message
+    def http_query_and_get_error(
+        self,
+        sql,
+        data=None,
+        method=None,
+        params=None,
+        user=None,
+        password=None,
+        port=8123,
+        timeout=None,
+        retry_strategy=None,
+    ):
+        output, error = self.http_query_and_get_answer_with_error(
+            sql,
+            data=data,
+            method=method,
+            params=params,
+            user=user,
+            password=password,
+            port=port,
+            timeout=timeout,
+            retry_strategy=retry_strategy,
+        )
+
+        if not error:
+            raise Exception(
+                "ClickHouse HTTP server is expected to fail, but succeeded: " + output
+            )
+
+        return error
+
+    # Connects to the instance via HTTP interface, sends a query and returns both the answer and the error message
+    # as a tuple (output, error).
+    def http_query_and_get_answer_with_error(
+        self,
+        sql,
+        data=None,
+        method=None,
+        params=None,
+        user=None,
+        password=None,
         port=8123,
         timeout=None,
         retry_strategy=None,
@@ -3155,23 +3259,11 @@ class ClickHouseInstance:
 
         r = requester.request(method, url, data=data, auth=auth, timeout=timeout)
 
-        def http_code_and_message():
-            code = r.status_code
-            return str(code) + " " + http.client.responses[code] + ": " + r.text
+        if r.ok:
+            return (r.text, None)
 
-        if expect_fail_and_get_error:
-            if r.ok:
-                raise Exception(
-                    "ClickHouse HTTP server is expected to fail, but succeeded: "
-                    + r.text
-                )
-            return http_code_and_message()
-        else:
-            if not r.ok:
-                raise Exception(
-                    "ClickHouse HTTP server returned " + http_code_and_message()
-                )
-            return r.text
+        code = r.status_code
+        return (None, str(code) + " " + http.client.responses[code] + ": " + r.text)
 
     # Connects to the instance via HTTP interface, sends a query and returns the answer
     def http_request(self, url, method="GET", params=None, data=None, headers=None):
@@ -3181,20 +3273,6 @@ class ClickHouseInstance:
             method=method, url=url, params=params, data=data, headers=headers
         )
 
-    # Connects to the instance via HTTP interface, sends a query, expects an error and return the error message
-    def http_query_and_get_error(
-        self, sql, data=None, params=None, user=None, password=None
-    ):
-        logging.debug(f"Executing query {sql} on {self.name} via HTTP interface")
-        return self.http_query(
-            sql=sql,
-            data=data,
-            params=params,
-            user=user,
-            password=password,
-            expect_fail_and_get_error=True,
-        )
-
     def stop_clickhouse(self, stop_wait_sec=30, kill=False):
         if not self.stay_alive:
             raise Exception(
@@ -3590,14 +3668,14 @@ class ClickHouseInstance:
                     "bash",
                     "-c",
                     "echo 'ATTACH DATABASE system ENGINE=Ordinary' > /var/lib/clickhouse/metadata/system.sql",
-                ],
+                ]
             )
             self.exec_in_container(
                 [
                     "bash",
                     "-c",
                     "echo 'ATTACH DATABASE system ENGINE=Ordinary' > /var/lib/clickhouse/metadata/default.sql",
-                ],
+                ]
             )
         self.exec_in_container(
             ["bash", "-c", "{} --daemon".format(self.clickhouse_start_command)],
@@ -3752,14 +3830,9 @@ class ClickHouseInstance:
             ["bash", "-c", f"sed -i 's/{replace}/{replacement}/g' {path_to_config}"]
         )
 
-    def create_dir(self, destroy_dir=True):
+    def create_dir(self):
         """Create the instance directory and all the needed files there."""
 
-        if destroy_dir:
-            self.destroy_dir()
-        elif p.exists(self.path):
-            return
-
         os.makedirs(self.path)
 
         instance_config_dir = p.abspath(p.join(self.path, "configs"))
@@ -4023,10 +4096,6 @@ class ClickHouseInstance:
                 )
             )
 
-    def destroy_dir(self):
-        if p.exists(self.path):
-            shutil.rmtree(self.path)
-
     def wait_for_path_exists(self, path, seconds):
         while seconds > 0:
             seconds -= 1
diff --git a/tests/integration/helpers/ssl_context.py b/tests/integration/helpers/ssl_context.py
new file mode 100644
index 00000000000..fa9024ae3e7
--- /dev/null
+++ b/tests/integration/helpers/ssl_context.py
@@ -0,0 +1,12 @@
+import ssl
+
+
+class WrapSSLContextWithSNI(ssl.SSLContext):
+    def __new__(cls, ssl_host, *args, **kwargs):
+        self = super().__new__(cls, *args, **kwargs)
+        self._server_hostname = ssl_host
+        return self
+
+    def wrap_socket(self, sock, *args, **kwargs):
+        kwargs["server_hostname"] = self._server_hostname
+        return super().wrap_socket(sock, *args, **kwargs)
diff --git a/tests/integration/parallel_skip.json b/tests/integration/parallel_skip.json
index 8587e8d4120..3b4d1f2f29a 100644
--- a/tests/integration/parallel_skip.json
+++ b/tests/integration/parallel_skip.json
@@ -46,5 +46,8 @@
   "test_storage_s3/test.py::test_url_reconnect_in_the_middle",
   "test_system_metrics/test.py::test_readonly_metrics",
   "test_system_replicated_fetches/test.py::test_system_replicated_fetches",
-  "test_zookeeper_config_load_balancing/test.py::test_round_robin"
+  "test_zookeeper_config_load_balancing/test.py::test_round_robin",
+
+  "test_user_ip_restrictions/test.py::test_ipv4",
+  "test_user_ip_restrictions/test.py::test_ipv6"
 ]
diff --git a/tests/integration/pytest.ini b/tests/integration/pytest.ini
index 2a57ea5a229..772c96f7361 100644
--- a/tests/integration/pytest.ini
+++ b/tests/integration/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-python_files = test*.py
+python_files = test_*/test*.py
 norecursedirs = _instances*
 timeout = 900
 junit_duration_report = call
diff --git a/tests/integration/runner b/tests/integration/runner
index cd07875ad1d..f0d87b23a83 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -345,7 +345,7 @@ if __name__ == "__main__":
                 f"docker volume create {VOLUME_NAME}_volume", shell=True
             )
         except Exception as ex:
-            print("Volume creationg failed, probably it already exists, exception", ex)
+            print("Volume creation failed, probably it already exists, exception", ex)
         # TODO: this part cleans out stale volumes produced by container name
         # randomizer, we should remove it after Sep 2022
         try:
@@ -383,6 +383,7 @@ if __name__ == "__main__":
         --volume=/run:/run/host:ro \
         {dockerd_internal_volume} -e DOCKER_CLIENT_TIMEOUT=300 -e COMPOSE_HTTP_TIMEOUT=600 \
         -e XTABLES_LOCKFILE=/run/host/xtables.lock \
+        -e PYTHONUNBUFFERED=1 \
         {env_tags} {env_cleanup} -e PYTEST_OPTS='{parallel} {opts} {tests_list} -vvv' {img} {command}".format(
         net=net,
         tty=tty,
diff --git a/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml b/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml
index 1207e2703de..6c55d61481a 100644
--- a/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml
+++ b/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml
@@ -26,9 +26,6 @@
                 <ip>127.0.0.1</ip>
                 <host>clientA1.com</host>
                 <host>clientA3.com</host>
-                <host_regexp>clientB\d+\.ru</host_regexp>
-                <host_regexp>clientC\d+\.ru$</host_regexp>
-                <host_regexp>^clientD\d+\.ru$</host_regexp>
             </networks>
         </default>
     </users>
diff --git a/tests/integration/test_allowed_client_hosts/test.py b/tests/integration/test_allowed_client_hosts/test.py
index db2ba464b38..1fc9d0432cb 100644
--- a/tests/integration/test_allowed_client_hosts/test.py
+++ b/tests/integration/test_allowed_client_hosts/test.py
@@ -1,4 +1,5 @@
 import pytest
+import logging
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
@@ -7,15 +8,6 @@ server = cluster.add_instance("server", user_configs=["configs/users.d/network.x
 clientA1 = cluster.add_instance("clientA1", hostname="clientA1.com")
 clientA2 = cluster.add_instance("clientA2", hostname="clientA2.com")
 clientA3 = cluster.add_instance("clientA3", hostname="clientA3.com")
-clientB1 = cluster.add_instance("clientB1", hostname="clientB001.ru")
-clientB2 = cluster.add_instance("clientB2", hostname="clientB002.ru")
-clientB3 = cluster.add_instance("clientB3", hostname="xxx.clientB003.rutracker.com")
-clientC1 = cluster.add_instance("clientC1", hostname="clientC01.ru")
-clientC2 = cluster.add_instance("clientC2", hostname="xxx.clientC02.ru")
-clientC3 = cluster.add_instance("clientC3", hostname="xxx.clientC03.rutracker.com")
-clientD1 = cluster.add_instance("clientD1", hostname="clientD0001.ru")
-clientD2 = cluster.add_instance("clientD2", hostname="xxx.clientD0002.ru")
-clientD3 = cluster.add_instance("clientD3", hostname="clientD0003.ru")
 
 
 def check_clickhouse_is_ok(client_node, server_node):
@@ -29,6 +21,13 @@ def check_clickhouse_is_ok(client_node, server_node):
 
 def query_from_one_node_to_another(client_node, server_node, query):
     check_clickhouse_is_ok(client_node, server_node)
+    res1 = client_node.exec_in_container(["ip", "address", "show"])
+    res2 = client_node.exec_in_container(["host", "clientA1.com"])
+    res3 = client_node.exec_in_container(["host", "clientA2.com"])
+    res4 = client_node.exec_in_container(["host", "clientA3.com"])
+
+    logging.debug(f"IP: {res1}, A1 {res2}, A2 {res3}, A3 {res4}")
+
     return client_node.exec_in_container(
         [
             "bash",
@@ -55,6 +54,13 @@ def setup_nodes():
         )
         query(server, "INSERT INTO test_allowed_client_hosts VALUES (5)")
 
+        s = query(server, "SELECT fqdn(), hostName()")
+        a1 = query(clientA1, "SELECT fqdn(), hostName()")
+        a2 = query(clientA2, "SELECT fqdn(), hostName()")
+        a3 = query(clientA3, "SELECT fqdn(), hostName()")
+
+        logging.debug(f"s:{s}, a1:{a1}, a2:{a2}, a3:{a3}")
+
         yield cluster
 
     finally:
@@ -63,7 +69,6 @@ def setup_nodes():
 
 def test_allowed_host():
     expected_to_pass = [clientA1, clientA3]
-    expected_to_fail = [clientA2]
 
     # Reverse DNS lookup currently isn't working as expected in this test.
     # For example, it gives something like "vitbartestallowedclienthosts_clientB1_1.vitbartestallowedclienthosts_default" instead of "clientB001.ru".
@@ -79,6 +84,10 @@ def test_allowed_host():
             == "5\n"
         )
 
+
+def test_denied_host():
+    expected_to_fail = [clientA2]
+
     for client_node in expected_to_fail:
         with pytest.raises(Exception, match=r"default: Authentication failed"):
             query_from_one_node_to_another(
diff --git a/tests/integration/test_allowed_url_from_config/test.py b/tests/integration/test_allowed_url_from_config/test.py
index da9d4404c82..3106cf12702 100644
--- a/tests/integration/test_allowed_url_from_config/test.py
+++ b/tests/integration/test_allowed_url_from_config/test.py
@@ -49,6 +49,8 @@ def test_config_with_hosts(start_cluster):
     assert "not allowed" in node1.query_and_get_error(
         "CREATE TABLE table_test_1_4 (word String) Engine=URL('https://yandex2.ru', CSV)"
     )
+    node1.query("DROP TABLE table_test_1_1")
+    node1.query("DROP TABLE table_test_1_2")
 
 
 def test_config_with_only_primary_hosts(start_cluster):
@@ -86,6 +88,11 @@ def test_config_with_only_primary_hosts(start_cluster):
         "CREATE TABLE table_test_2_6 (word String) Engine=URL('https://yandex2.ru', CSV)"
     )
 
+    node2.query("DROP TABLE table_test_2_1")
+    node2.query("DROP TABLE table_test_2_2")
+    node2.query("DROP TABLE table_test_2_3")
+    node2.query("DROP TABLE table_test_2_4")
+
 
 def test_config_with_only_regexp_hosts(start_cluster):
     assert (
@@ -106,6 +113,8 @@ def test_config_with_only_regexp_hosts(start_cluster):
     assert "not allowed" in node3.query_and_get_error(
         "CREATE TABLE table_test_3_4 (word String) Engine=URL('https://yandex2.ru', CSV)"
     )
+    node3.query("DROP TABLE table_test_3_1")
+    node3.query("DROP TABLE table_test_3_2")
 
 
 def test_config_without_allowed_hosts_section(start_cluster):
@@ -139,6 +148,11 @@ def test_config_without_allowed_hosts_section(start_cluster):
         )
         == ""
     )
+    node4.query("DROP TABLE table_test_4_1")
+    node4.query("DROP TABLE table_test_4_2")
+    node4.query("DROP TABLE table_test_4_3")
+    node4.query("DROP TABLE table_test_4_4")
+    node4.query("DROP TABLE table_test_4_5")
 
 
 def test_config_without_allowed_hosts(start_cluster):
@@ -267,6 +281,7 @@ def test_redirect(start_cluster):
     assert "not allowed" in node7.query_and_get_error(
         "SET max_http_get_redirects=1; SELECT * from table_test_7_1"
     )
+    node7.query("DROP TABLE table_test_7_1")
 
 
 def test_HDFS(start_cluster):
diff --git a/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml b/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml
index 4235083f5ca..cb87abcc693 100644
--- a/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_azure_blob_storage_zero_copy_replication/configs/config.d/storage_conf.xml
@@ -43,4 +43,7 @@
         <cluster>test_cluster</cluster>
     </macros>
 
+    <merge_tree>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
+    </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_backup_restore_new/test.py b/tests/integration/test_backup_restore_new/test.py
index 47f7c47d608..fc44bf5ee13 100644
--- a/tests/integration/test_backup_restore_new/test.py
+++ b/tests/integration/test_backup_restore_new/test.py
@@ -301,21 +301,21 @@ def test_async():
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
 
     backup_name = new_backup_name()
-    [id, _, status] = instance.query(
+    [id, status] = instance.query(
         f"BACKUP TABLE test.table TO {backup_name} ASYNC"
     ).split("\t")
 
-    assert status == "MAKING_BACKUP\n" or status == "BACKUP_COMPLETE\n"
+    assert status == "CREATING_BACKUP\n" or status == "BACKUP_CREATED\n"
 
     assert_eq_with_retry(
         instance,
-        f"SELECT status, error FROM system.backups WHERE uuid='{id}'",
-        TSV([["BACKUP_COMPLETE", ""]]),
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
+        TSV([["BACKUP_CREATED", ""]]),
     )
 
     instance.query("DROP TABLE test.table")
 
-    [id, _, status] = instance.query(
+    [id, status] = instance.query(
         f"RESTORE TABLE test.table FROM {backup_name} ASYNC"
     ).split("\t")
 
@@ -323,7 +323,7 @@ def test_async():
 
     assert_eq_with_retry(
         instance,
-        f"SELECT status, error FROM system.backups WHERE uuid='{id}'",
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
         TSV([["RESTORED", ""]]),
     )
 
@@ -335,31 +335,51 @@ def test_async_backups_to_same_destination(interface):
     create_and_fill_table()
     backup_name = new_backup_name()
 
-    ids = []
-    for _ in range(2):
-        if interface == "http":
-            res = instance.http_query(f"BACKUP TABLE test.table TO {backup_name} ASYNC")
-        else:
-            res = instance.query(f"BACKUP TABLE test.table TO {backup_name} ASYNC")
-        ids.append(res.split("\t")[0])
+    # The first backup.
+    if interface == "http":
+        res = instance.http_query(f"BACKUP TABLE test.table TO {backup_name} ASYNC")
+    else:
+        res = instance.query(f"BACKUP TABLE test.table TO {backup_name} ASYNC")
+    id1 = res.split("\t")[0]
 
-    [id1, id2] = ids
+    # The second backup to the same destination.
+    if interface == "http":
+        res, err = instance.http_query_and_get_answer_with_error(
+            f"BACKUP TABLE test.table TO {backup_name} ASYNC"
+        )
+    else:
+        res, err = instance.query_and_get_answer_with_error(
+            f"BACKUP TABLE test.table TO {backup_name} ASYNC"
+        )
+
+    # The second backup to the same destination is expected to fail. It can either fail immediately or after a while.
+    # If it fails immediately we won't even get its ID.
+    id2 = None if err else res.split("\t")[0]
+
+    ids = [id1]
+    if id2:
+        ids.append(id2)
+    ids_for_query = "[" + ", ".join(f"'{id}'" for id in ids) + "]"
 
     assert_eq_with_retry(
         instance,
-        f"SELECT status FROM system.backups WHERE uuid IN ['{id1}', '{id2}'] AND status == 'MAKING_BACKUP'",
+        f"SELECT status FROM system.backups WHERE id IN {ids_for_query} AND status == 'CREATING_BACKUP'",
         "",
     )
 
+    # The first backup should succeed.
     assert instance.query(
-        f"SELECT status, error FROM system.backups WHERE uuid='{id1}'"
-    ) == TSV([["BACKUP_COMPLETE", ""]])
+        f"SELECT status, error FROM system.backups WHERE id='{id1}'"
+    ) == TSV([["BACKUP_CREATED", ""]])
 
-    assert (
-        instance.query(f"SELECT status FROM system.backups WHERE uuid='{id2}'")
-        == "FAILED_TO_BACKUP\n"
-    )
+    if id2:
+        # The second backup should fail.
+        assert (
+            instance.query(f"SELECT status FROM system.backups WHERE id='{id2}'")
+            == "BACKUP_FAILED\n"
+        )
 
+    # Check that the first backup is all right.
     instance.query("DROP TABLE test.table")
     instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -758,8 +778,8 @@ def test_system_users_async():
 
     assert_eq_with_retry(
         instance,
-        f"SELECT status, error FROM system.backups WHERE uuid='{id}'",
-        TSV([["BACKUP_COMPLETE", ""]]),
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
+        TSV([["BACKUP_CREATED", ""]]),
     )
 
     instance.query("DROP USER u1")
@@ -770,7 +790,7 @@ def test_system_users_async():
 
     assert_eq_with_retry(
         instance,
-        f"SELECT status, error FROM system.backups WHERE uuid='{id}'",
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
         TSV([["RESTORED", ""]]),
     )
 
@@ -884,6 +904,101 @@ def test_restore_partition():
     )
 
 
+def test_operation_id():
+    create_and_fill_table(n=30)
+
+    backup_name = new_backup_name()
+
+    [id, status] = instance.query(
+        f"BACKUP TABLE test.table TO {backup_name} SETTINGS id='first' ASYNC"
+    ).split("\t")
+
+    assert id == "first"
+    assert status == "CREATING_BACKUP\n" or status == "BACKUP_CREATED\n"
+
+    assert_eq_with_retry(
+        instance,
+        f"SELECT status, error FROM system.backups WHERE id='first'",
+        TSV([["BACKUP_CREATED", ""]]),
+    )
+
+    instance.query("DROP TABLE test.table")
+
+    [id, status] = instance.query(
+        f"RESTORE TABLE test.table FROM {backup_name} SETTINGS id='second' ASYNC"
+    ).split("\t")
+
+    assert id == "second"
+    assert status == "RESTORING\n" or status == "RESTORED\n"
+
+    assert_eq_with_retry(
+        instance,
+        f"SELECT status, error FROM system.backups WHERE id='second'",
+        TSV([["RESTORED", ""]]),
+    )
+
+    # Reuse the same ID again
+    instance.query("DROP TABLE test.table")
+
+    [id, status] = instance.query(
+        f"RESTORE TABLE test.table FROM {backup_name} SETTINGS id='first'"
+    ).split("\t")
+
+    assert id == "first"
+    assert status == "RESTORED\n"
+
+
+def test_system_backups():
+    create_and_fill_table(n=30)
+
+    backup_name = new_backup_name()
+
+    id = instance.query(f"BACKUP TABLE test.table TO {backup_name}").split("\t")[0]
+
+    [name, status, num_files, uncompressed_size, compressed_size, error] = (
+        instance.query(
+            f"SELECT name, status, num_files, uncompressed_size, compressed_size, error FROM system.backups WHERE id='{id}'"
+        )
+        .strip("\n")
+        .split("\t")
+    )
+
+    escaped_backup_name = backup_name.replace("'", "\\'")
+    num_files = int(num_files)
+    compressed_size = int(compressed_size)
+    uncompressed_size = int(uncompressed_size)
+    assert name == escaped_backup_name
+    assert status == "BACKUP_CREATED"
+    assert num_files > 1
+    assert uncompressed_size > 1
+    assert compressed_size == uncompressed_size
+    assert error == ""
+
+    backup_name = new_backup_name()
+    expected_error = "Table test.non_existent_table was not found"
+    assert expected_error in instance.query_and_get_error(
+        f"BACKUP TABLE test.non_existent_table TO {backup_name}"
+    )
+
+    escaped_backup_name = backup_name.replace("'", "\\'")
+    [status, num_files, uncompressed_size, compressed_size, error] = (
+        instance.query(
+            f"SELECT status, num_files, uncompressed_size, compressed_size, error FROM system.backups WHERE name='{escaped_backup_name}'"
+        )
+        .strip("\n")
+        .split("\t")
+    )
+
+    num_files = int(num_files)
+    compressed_size = int(compressed_size)
+    uncompressed_size = int(uncompressed_size)
+    assert status == "BACKUP_FAILED"
+    assert num_files == 0
+    assert uncompressed_size == 0
+    assert compressed_size == 0
+    assert expected_error in error
+
+
 def test_mutation():
     create_and_fill_table(engine="MergeTree ORDER BY tuple()", n=5)
 
diff --git a/tests/integration/test_backup_restore_on_cluster/test.py b/tests/integration/test_backup_restore_on_cluster/test.py
index d1898213725..09915c8e789 100644
--- a/tests/integration/test_backup_restore_on_cluster/test.py
+++ b/tests/integration/test_backup_restore_on_cluster/test.py
@@ -396,21 +396,21 @@ def test_replicated_database_async():
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
 
     backup_name = new_backup_name()
-    [id, _, status] = node1.query(
+    [id, status] = node1.query(
         f"BACKUP DATABASE mydb ON CLUSTER 'cluster' TO {backup_name} ASYNC"
     ).split("\t")
 
-    assert status == "MAKING_BACKUP\n" or status == "BACKUP_COMPLETE\n"
+    assert status == "CREATING_BACKUP\n" or status == "BACKUP_CREATED\n"
 
     assert_eq_with_retry(
         node1,
-        f"SELECT status, error FROM system.backups WHERE uuid='{id}' AND NOT internal",
-        TSV([["BACKUP_COMPLETE", ""]]),
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
+        TSV([["BACKUP_CREATED", ""]]),
     )
 
     node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' NO DELAY")
 
-    [id, _, status] = node1.query(
+    [id, status] = node1.query(
         f"RESTORE DATABASE mydb ON CLUSTER 'cluster' FROM {backup_name} ASYNC"
     ).split("\t")
 
@@ -418,7 +418,7 @@ def test_replicated_database_async():
 
     assert_eq_with_retry(
         node1,
-        f"SELECT status, error FROM system.backups WHERE uuid='{id}' AND NOT internal",
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
         TSV([["RESTORED", ""]]),
     )
 
@@ -439,56 +439,73 @@ def test_async_backups_to_same_destination(interface, on_cluster):
         "ORDER BY x"
     )
 
+    nodes = [node1, node2]
     node1.query("INSERT INTO tbl VALUES (1)")
 
     backup_name = new_backup_name()
-
-    ids = []
-    nodes = [node1, node2]
     on_cluster_part = "ON CLUSTER 'cluster'" if on_cluster else ""
+
+    # Multiple backups to the same destination.
+    ids = []
     for node in nodes:
         if interface == "http":
-            res = node.http_query(
+            res, err = node.http_query_and_get_answer_with_error(
                 f"BACKUP TABLE tbl {on_cluster_part} TO {backup_name} ASYNC"
             )
         else:
-            res = node.query(
+            res, err = node.query_and_get_answer_with_error(
                 f"BACKUP TABLE tbl {on_cluster_part} TO {backup_name} ASYNC"
             )
-        ids.append(res.split("\t")[0])
 
-    [id1, id2] = ids
+        # The second backup to the same destination is expected to fail. It can either fail immediately or after a while.
+        # If it fails immediately we won't even get its ID.
+        if not err:
+            ids.append(res.split("\t")[0])
 
-    for i in range(len(nodes)):
+    ids_for_query = "[" + ", ".join(f"'{id}'" for id in ids) + "]"
+
+    for node in nodes:
         assert_eq_with_retry(
-            nodes[i],
-            f"SELECT status FROM system.backups WHERE uuid='{ids[i]}' AND status == 'MAKING_BACKUP'",
+            node,
+            f"SELECT status FROM system.backups WHERE id IN {ids_for_query} AND status == 'CREATING_BACKUP'",
             "",
         )
 
-    num_completed_backups = sum(
+    num_created_backups = sum(
         [
             int(
-                nodes[i]
-                .query(
-                    f"SELECT count() FROM system.backups WHERE uuid='{ids[i]}' AND status == 'BACKUP_COMPLETE' AND NOT internal"
-                )
-                .strip()
+                node.query(
+                    f"SELECT count() FROM system.backups WHERE id IN {ids_for_query} AND status == 'BACKUP_CREATED'"
+                ).strip()
             )
-            for i in range(len(nodes))
+            for node in nodes
         ]
     )
 
-    if num_completed_backups != 1:
-        for i in range(len(nodes)):
+    num_failed_backups = sum(
+        [
+            int(
+                node.query(
+                    f"SELECT count() FROM system.backups WHERE id IN {ids_for_query} AND status == 'BACKUP_FAILED'"
+                ).strip()
+            )
+            for node in nodes
+        ]
+    )
+
+    # Only one backup should succeed.
+    if (num_created_backups != 1) or (num_failed_backups != len(ids) - 1):
+        for node in nodes:
             print(
-                nodes[i].query(
-                    f"SELECT status, error FROM system.backups WHERE uuid='{ids[i]}' AND NOT internal"
+                node.query(
+                    f"SELECT status, error FROM system.backups WHERE id IN {ids_for_query}"
                 )
             )
 
-    assert num_completed_backups == 1
+    assert num_created_backups == 1
+    assert num_failed_backups == len(ids) - 1
 
+    # Check that the succeeded backup is all right.
     node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
     node1.query(f"RESTORE TABLE tbl FROM {backup_name}")
     assert node1.query("SELECT * FROM tbl") == "1\n"
@@ -817,27 +834,25 @@ def test_stop_other_host_during_backup(kill):
 
     assert_eq_with_retry(
         node1,
-        f"SELECT status FROM system.backups WHERE uuid='{id}' AND status == 'MAKING_BACKUP' AND NOT internal",
+        f"SELECT status FROM system.backups WHERE id='{id}' AND status == 'CREATING_BACKUP'",
         "",
         retry_count=100,
     )
 
-    status = node1.query(
-        f"SELECT status FROM system.backups WHERE uuid='{id}' AND NOT internal"
-    ).strip()
+    status = node1.query(f"SELECT status FROM system.backups WHERE id='{id}'").strip()
 
     if kill:
-        assert status in ["BACKUP_COMPLETE", "FAILED_TO_BACKUP"]
+        assert status in ["BACKUP_CREATED", "BACKUP_FAILED"]
     else:
-        assert status == "BACKUP_COMPLETE"
+        assert status == "BACKUP_CREATED"
 
     node2.start_clickhouse()
 
-    if status == "BACKUP_COMPLETE":
+    if status == "BACKUP_CREATED":
         node1.query("DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
         node1.query(f"RESTORE TABLE tbl ON CLUSTER 'cluster' FROM {backup_name}")
         assert node1.query("SELECT * FROM tbl ORDER BY x") == TSV([3, 5])
-    elif status == "FAILED_TO_BACKUP":
+    elif status == "BACKUP_FAILED":
         assert not os.path.exists(
             os.path.join(get_path_to_backup(backup_name), ".backup")
         )
diff --git a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
index 8eaed5ac486..2269ccda828 100644
--- a/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
+++ b/tests/integration/test_backup_restore_on_cluster/test_concurrency.py
@@ -122,13 +122,13 @@ def test_concurrent_backups_on_same_node():
 
     assert_eq_with_retry(
         node0,
-        f"SELECT status FROM system.backups WHERE status == 'MAKING_BACKUP' AND uuid IN {ids_list}",
+        f"SELECT status FROM system.backups WHERE status == 'CREATING_BACKUP' AND id IN {ids_list}",
         "",
     )
 
     assert node0.query(
-        f"SELECT status, error FROM system.backups WHERE uuid IN {ids_list} AND NOT internal"
-    ) == TSV([["BACKUP_COMPLETE", ""]] * num_concurrent_backups)
+        f"SELECT status, error FROM system.backups WHERE id IN {ids_list}"
+    ) == TSV([["BACKUP_CREATED", ""]] * num_concurrent_backups)
 
     for backup_name in backup_names:
         node0.query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
@@ -156,14 +156,14 @@ def test_concurrent_backups_on_different_nodes():
     for i in range(num_concurrent_backups):
         assert_eq_with_retry(
             nodes[i],
-            f"SELECT status FROM system.backups WHERE status == 'MAKING_BACKUP' AND uuid = '{ids[i]}'",
+            f"SELECT status FROM system.backups WHERE status == 'CREATING_BACKUP' AND id = '{ids[i]}'",
             "",
         )
 
     for i in range(num_concurrent_backups):
         assert nodes[i].query(
-            f"SELECT status, error FROM system.backups WHERE uuid = '{ids[i]}' AND NOT internal"
-        ) == TSV([["BACKUP_COMPLETE", ""]])
+            f"SELECT status, error FROM system.backups WHERE id = '{ids[i]}'"
+        ) == TSV([["BACKUP_CREATED", ""]])
 
     for i in range(num_concurrent_backups):
         nodes[i].query(f"DROP TABLE tbl ON CLUSTER 'cluster' NO DELAY")
@@ -244,14 +244,14 @@ def test_create_or_drop_tables_during_backup(db_engine, table_engine):
     for node in nodes:
         assert_eq_with_retry(
             node,
-            f"SELECT status from system.backups WHERE uuid IN {ids_list} AND (status == 'MAKING_BACKUP')",
+            f"SELECT status from system.backups WHERE id IN {ids_list} AND (status == 'CREATING_BACKUP')",
             "",
         )
 
     for node in nodes:
         assert_eq_with_retry(
             node,
-            f"SELECT status, error from system.backups WHERE uuid IN {ids_list} AND (status == 'FAILED_TO_BACKUP')",
+            f"SELECT status, error from system.backups WHERE id IN {ids_list} AND (status == 'BACKUP_FAILED')",
             "",
         )
 
@@ -259,7 +259,7 @@ def test_create_or_drop_tables_during_backup(db_engine, table_engine):
     for node in nodes:
         for id in ids:
             backup_name = node.query(
-                f"SELECT backup_name FROM system.backups WHERE uuid='{id}' FORMAT RawBLOB"
+                f"SELECT name FROM system.backups WHERE id='{id}' FORMAT RawBLOB"
             ).strip()
             if backup_name:
                 backup_names[id] = backup_name
diff --git a/tests/integration/test_backward_compatibility/test_convert_ordinary.py b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
index c509dade0b8..afc44c91fc4 100644
--- a/tests/integration/test_backward_compatibility/test_convert_ordinary.py
+++ b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
@@ -7,6 +7,7 @@ node = cluster.add_instance(
     image="yandex/clickhouse-server",
     tag="19.17.8.54",
     stay_alive=True,
+    with_zookeeper=True,
     with_installed_binary=True,
 )
 
@@ -25,7 +26,7 @@ def q(query):
     return node.query(query, settings={"log_queries": 1})
 
 
-def test_convert_system_db_to_atomic(start_cluster):
+def check_convert_system_db_to_atomic():
     q(
         "CREATE TABLE t(date Date, id UInt32) ENGINE = MergeTree PARTITION BY toYYYYMM(date) ORDER BY id"
     )
@@ -75,3 +76,167 @@ def test_convert_system_db_to_atomic(start_cluster):
         "1\n" == errors_count
         and "1\n" == node.count_in_log("Can't receive Netlink response")
     )
+
+
+def create_some_tables(db):
+    node.query("CREATE TABLE {}.t1 (n int) ENGINE=Memory".format(db))
+    node.query(
+        "CREATE TABLE {}.mt1 (n int) ENGINE=MergeTree order by n".format(db),
+    )
+    node.query(
+        "CREATE TABLE {}.mt2 (n int) ENGINE=MergeTree order by n".format(db),
+    )
+    node.query(
+        "CREATE TABLE {}.rmt1 (n int, m int) ENGINE=ReplicatedMergeTree('/test/rmt1/{}', '1') order by n".format(
+            db, db
+        ),
+    )
+    node.query(
+        "CREATE TABLE {}.rmt2 (n int, m int) ENGINE=ReplicatedMergeTree('/test/{}/rmt2', '1') order by n".format(
+            db, db
+        ),
+    )
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"sed --follow-symlinks -i 's|/test/{db}/rmt2|/test/{{database}}/{{table}}|' /var/lib/clickhouse/metadata/{db}/rmt2.sql",
+        ]
+    )
+    node.query(
+        "CREATE MATERIALIZED VIEW {}.mv1 (n int) ENGINE=ReplicatedMergeTree('/test/{}/mv1/', '1') order by n AS SELECT n FROM {}.rmt1".format(
+            db, db, db
+        ),
+    )
+    node.query(
+        "CREATE MATERIALIZED VIEW {}.mv2 (n int) ENGINE=MergeTree order by n AS SELECT n FROM {}.rmt2".format(
+            db, db
+        ),
+    )
+    node.query(
+        "CREATE DICTIONARY {}.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB '{}')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db, db)
+    )
+    node.query(
+        "CREATE DICTIONARY {}.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB '{}')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db, db)
+    )
+    node.query(
+        "CREATE TABLE {}.merge (n int) ENGINE=Merge('{}', '(mt)|(mv)')".format(db, db)
+    )
+    node.query("CREATE TABLE {}.detached (n int) ENGINE=Log".format(db))
+
+
+def check_convert_all_dbs_to_atomic():
+    node.query(
+        "CREATE DATABASE ordinary ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    node.query(
+        "CREATE DATABASE other ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    node.query(
+        "CREATE DATABASE `.o r d i n a r y.` ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    node.query("CREATE DATABASE atomic ENGINE=Atomic")
+    node.query("CREATE DATABASE mem ENGINE=Memory")
+    node.query("CREATE DATABASE lazy ENGINE=Lazy(1)")
+
+    tables_with_data = ["mt1", "mt2", "rmt1", "rmt2", "mv1", "mv2", "detached"]
+
+    for db in ["ordinary", "other", "atomic"]:
+        create_some_tables(db)
+        for table in tables_with_data:
+            node.query("INSERT INTO {}.{} (n) VALUES ({})".format(db, table, len(db)))
+
+    node.query(
+        "CREATE TABLE `.o r d i n a r y.`.`t. a. b. l. e.` (n int) ENGINE=MergeTree ORDER BY n"
+    )
+    node.query("CREATE TABLE lazy.table (n int) ENGINE=Log")
+
+    # Introduce some cross dependencies
+    node.query(
+        "CREATE TABLE ordinary.l (n DEFAULT dictGet('other.d1', 'm', toUInt64(3))) ENGINE=Log"
+    )
+    node.query(
+        "CREATE TABLE other.l (n DEFAULT dictGet('ordinary.d1', 'm', toUInt64(3))) ENGINE=StripeLog"
+    )
+
+    node.query(
+        "CREATE TABLE atomic.l (n DEFAULT dictGet('ordinary.d1', 'm', toUInt64(3))) ENGINE=TinyLog"
+    )
+
+    tables_without_data = ["t1", "d1", "d2", "merge", "l"]
+
+    # 6 tables + 2 inner tables of MVs, each contains 2 rows
+    for db in ["ordinary", "other"]:
+        assert "12\t{}\n".format(12 * len(db)) == node.query(
+            "SELECT count(), sum(n) FROM {}.merge".format(db)
+        )
+
+    # 6 tables, MVs contain 2 rows (inner tables does not match regexp)
+    assert "8\t{}\n".format(8 * len("atomic")) == node.query(
+        "SELECT count(), sum(n) FROM atomic.merge".format(db)
+    )
+
+    node.query("DETACH TABLE ordinary.detached PERMANENTLY")
+
+    node.exec_in_container(
+        ["bash", "-c", f"touch /var/lib/clickhouse/flags/convert_ordinary_to_atomic"]
+    )
+    node.restart_clickhouse()
+
+    assert "Ordinary\n" == node.query(
+        "SELECT engine FROM system.databases where name='ordinary'"
+    )
+    node.query("ATTACH TABLE ordinary.detached")
+
+    node.exec_in_container(
+        ["bash", "-c", f"touch /var/lib/clickhouse/flags/convert_ordinary_to_atomic"]
+    )
+    node.restart_clickhouse()
+
+    assert (
+        ".o r d i n a r y.\natomic\ndefault\nordinary\nother\nsystem\n"
+        == node.query(
+            "SELECT name FROM system.databases WHERE engine='Atomic' ORDER BY name"
+        )
+    )
+    assert "Lazy\nMemory\n" == node.query(
+        "SELECT engine FROM system.databases WHERE name IN ('mem', 'lazy') ORDER BY name"
+    )
+    assert "t. a. b. l. e.\n" == node.query("SHOW TABLES FROM `.o r d i n a r y.`")
+    assert "table\n" == node.query("SHOW TABLES FROM lazy")
+
+    for db in ["ordinary", "other", "atomic"]:
+        assert "\n".join(
+            sorted(tables_with_data + tables_without_data) + [""]
+        ) == node.query("SHOW TABLES FROM {} NOT LIKE '%inner%'".format(db))
+
+    for db in ["ordinary", "other"]:
+        assert "8\t{}\n".format(8 * len(db)) == node.query(
+            "SELECT count(), sum(n) FROM {}.merge".format(db)
+        )
+
+    for db in ["ordinary", "other", "atomic"]:
+        for table in tables_with_data:
+            node.query(
+                "INSERT INTO {}.{} (n) VALUES ({})".format(db, table, len(db) * 3)
+            )
+
+    for db in ["ordinary", "other", "atomic"]:
+        assert "16\t{}\n".format(16 * len(db) * 2) == node.query(
+            "SELECT count(), sum(n) FROM {}.merge".format(db)
+        )
+        assert "2\t{}\n".format(2 * len(db) * 2) == node.query(
+            "SELECT count(), sum(n) FROM {}.detached".format(db)
+        )
+
+
+def test_convert_ordinary_to_atomic(start_cluster):
+    check_convert_system_db_to_atomic()
+    check_convert_all_dbs_to_atomic()
diff --git a/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py b/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
new file mode 100644
index 00000000000..fcdedd29dad
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
@@ -0,0 +1,45 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance("node1", with_zookeeper=False)
+node2 = cluster.add_instance(
+    "node2",
+    with_zookeeper=False,
+    image="yandex/clickhouse-server",
+    tag="21.7.2.7",
+    stay_alive=True,
+    with_installed_binary=True,
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_select_aggregate_alias_column(start_cluster):
+    node1.query(
+        "create table tab (x UInt64, y String, z Nullable(Int64)) engine = Memory"
+    )
+    node2.query(
+        "create table tab (x UInt64, y String, z Nullable(Int64)) engine = Memory"
+    )
+    node1.query("insert into tab values (1, 'a', null)")
+    node2.query("insert into tab values (1, 'a', null)")
+
+    node1.query(
+        "select count(), count(1), count(x), count(y), count(z) from remote('node{1,2}', default, tab)"
+    )
+    node2.query(
+        "select count(), count(1), count(x), count(y), count(z) from remote('node{1,2}', default, tab)"
+    )
+
+    node1.query("drop table tab")
+    node2.query("drop table tab")
diff --git a/tests/integration/test_cluster_discovery/config/config_observer.xml b/tests/integration/test_cluster_discovery/config/config_observer.xml
new file mode 100644
index 00000000000..84d9539169e
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/config/config_observer.xml
@@ -0,0 +1,24 @@
+<clickhouse>
+    <allow_experimental_cluster_discovery/>
+    <remote_servers>
+        <test_auto_cluster>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster</path>
+                <observer/>
+            </discovery>
+        </test_auto_cluster>
+        <two_shards>
+            <!-- just to check that there's no conflict between automatic and manual clusters -->
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </two_shards>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_cluster_discovery/config/config_shard3.xml b/tests/integration/test_cluster_discovery/config/config_shard3.xml
index ab66fdc2ab7..2c706f7c268 100644
--- a/tests/integration/test_cluster_discovery/config/config_shard3.xml
+++ b/tests/integration/test_cluster_discovery/config/config_shard3.xml
@@ -1,5 +1,5 @@
 <clickhouse>
-    <allow_experimental_cluster_discovery>1</allow_experimental_cluster_discovery>
+    <allow_experimental_cluster_discovery/>
     <remote_servers>
         <test_auto_cluster>
             <discovery>
diff --git a/tests/integration/test_cluster_discovery/test.py b/tests/integration/test_cluster_discovery/test.py
index 311c955d1e3..4dd892553c4 100644
--- a/tests/integration/test_cluster_discovery/test.py
+++ b/tests/integration/test_cluster_discovery/test.py
@@ -7,17 +7,24 @@ from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
-shard_configs = {i: f"config/config_shard{i}.xml" for i in [1, 3]}
+shard_configs = {
+    "node0": "config/config.xml",
+    "node1": "config/config_shard1.xml",
+    "node2": "config/config.xml",
+    "node3": "config/config_shard3.xml",
+    "node4": "config/config.xml",
+    "node_observer": "config/config_observer.xml",
+}
 
-nodes = [
-    cluster.add_instance(
-        f"node{i}",
-        main_configs=[shard_configs.get(i, "config/config.xml")],
+nodes = {
+    node_name: cluster.add_instance(
+        node_name,
+        main_configs=[shard_config],
         stay_alive=True,
         with_zookeeper=True,
     )
-    for i in range(5)
-]
+    for node_name, shard_config in shard_configs.items()
+}
 
 
 @pytest.fixture(scope="module")
@@ -37,24 +44,28 @@ def check_on_cluster(
     """
     assert 1 <= retries <= 6
 
+    node_results = {}
     for retry in range(1, retries + 1):
-        nodes_res = {
-            node.name: int(
-                node.query(
-                    f"SELECT {what} FROM system.clusters WHERE cluster = '{cluster_name}'"
-                )
+        for node in nodes:
+            if node_results.get(node.name) == expected:
+                # do not retry node after success
+                continue
+            query_text = (
+                f"SELECT {what} FROM system.clusters WHERE cluster = '{cluster_name}'"
             )
-            for node in nodes
-        }
-        if all(actual == expected for actual in nodes_res.values()):
+            node_results[node.name] = int(node.query(query_text))
+
+        if all(actual == expected for actual in node_results.values()):
             break
 
+        print(f"Retry {retry}/{retries} unsuccessful, result: {node_results}")
+
         if retry != retries:
             time.sleep(2**retry)
     else:
         msg = msg or f"Wrong '{what}' result"
         raise Exception(
-            f"{msg}: {nodes_res}, expected: {expected} (after {retries} retries)"
+            f"{msg}: {node_results}, expected: {expected} (after {retries} retries)"
         )
 
 
@@ -73,21 +84,43 @@ def test_cluster_discovery_startup_and_stop(start_cluster):
         msg="Wrong shard_num count in cluster",
     )
 
-    total_shards = len(shard_configs) + 1
-    check_nodes_count([nodes[0], nodes[2]], len(nodes))
-    check_shard_num([nodes[0], nodes[2]], total_shards)
+    # `- 1` because one node is an observer
+    total_shards = len(set(shard_configs.values())) - 1
+    total_nodes = len(nodes) - 1
 
-    nodes[1].stop_clickhouse(kill=True)
-    check_nodes_count([nodes[0], nodes[2]], len(nodes) - 1)
-    check_shard_num([nodes[0], nodes[2]], total_shards - 1)
+    check_nodes_count(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_nodes
+    )
+    check_shard_num(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_shards
+    )
 
-    nodes[3].stop_clickhouse()
-    check_nodes_count([nodes[0], nodes[2]], len(nodes) - 2)
+    nodes["node1"].stop_clickhouse(kill=True)
+    check_nodes_count(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_nodes - 1
+    )
 
-    nodes[1].start_clickhouse()
-    check_nodes_count([nodes[0], nodes[2]], len(nodes) - 1)
+    # node1 was the only node in shard '1'
+    check_shard_num(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_shards - 1
+    )
 
-    nodes[3].start_clickhouse()
-    check_nodes_count([nodes[0], nodes[2]], len(nodes))
+    nodes["node3"].stop_clickhouse()
+    check_nodes_count(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_nodes - 2
+    )
 
-    check_nodes_count([nodes[1], nodes[2]], 2, cluster_name="two_shards", retries=1)
+    nodes["node1"].start_clickhouse()
+    check_nodes_count(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_nodes - 1
+    )
+
+    nodes["node3"].start_clickhouse()
+    check_nodes_count(
+        [nodes["node0"], nodes["node2"], nodes["node_observer"]], total_nodes
+    )
+
+    # regular cluster is not affected
+    check_nodes_count(
+        [nodes["node1"], nodes["node2"]], 2, cluster_name="two_shards", retries=1
+    )
diff --git a/tests/integration/test_concurrent_backups_s3/test.py b/tests/integration/test_concurrent_backups_s3/test.py
index 608144843d9..d3ca1fd35a7 100644
--- a/tests/integration/test_concurrent_backups_s3/test.py
+++ b/tests/integration/test_concurrent_backups_s3/test.py
@@ -45,7 +45,7 @@ def test_concurrent_backups(start_cluster):
 
     assert_eq_with_retry(
         node,
-        "SELECT count() FROM system.backups WHERE status != 'BACKUP_COMPLETE' and status != 'FAILED_TO_BACKUP'",
+        "SELECT count() FROM system.backups WHERE status != 'BACKUP_CREATED' and status != 'BACKUP_FAILED'",
         "0",
         retry_count=100,
     )
diff --git a/website/css/blog.css b/tests/integration/test_concurrent_threads_soft_limit/__init__.py
similarity index 100%
rename from website/css/blog.css
rename to tests/integration/test_concurrent_threads_soft_limit/__init__.py
diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml
new file mode 100644
index 00000000000..6c1f8f33de1
--- /dev/null
+++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_default.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <query_log>
+      <database>system</database>
+      <table>query_log</table>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml
new file mode 100644
index 00000000000..5f93f2dc319
--- /dev/null
+++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <concurrent_threads_soft_limit_num>1</concurrent_threads_soft_limit_num>
+    <query_log>
+      <database>system</database>
+      <table>query_log</table>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml
new file mode 100644
index 00000000000..f3b8c6a03b4
--- /dev/null
+++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_defined_50.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <concurrent_threads_soft_limit_num>50</concurrent_threads_soft_limit_num>
+    <query_log>
+      <database>system</database>
+      <table>query_log</table>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml
new file mode 100644
index 00000000000..77303cb0c35
--- /dev/null
+++ b/tests/integration/test_concurrent_threads_soft_limit/configs/config_limit_reached.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <concurrent_threads_soft_limit_num>10</concurrent_threads_soft_limit_num>
+    <query_log>
+      <database>system</database>
+      <table>query_log</table>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml b/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml
new file mode 100644
index 00000000000..63fefbb803b
--- /dev/null
+++ b/tests/integration/test_concurrent_threads_soft_limit/configs/users.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <profiles>
+        <default>
+            <log_queries>1</log_queries>
+            <max_threads>100</max_threads>
+        </default>
+    </profiles>
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+    <quotas>
+        <default>
+        </default>
+    </quotas>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_threads_soft_limit/test.py b/tests/integration/test_concurrent_threads_soft_limit/test.py
new file mode 100644
index 00000000000..2f76f44ddc2
--- /dev/null
+++ b/tests/integration/test_concurrent_threads_soft_limit/test.py
@@ -0,0 +1,126 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+import threading
+import time
+from helpers.client import QueryRuntimeException
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=["configs/config_default.xml"],
+    user_configs=["configs/users.xml"],
+)
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=["configs/config_defined_50.xml"],
+    user_configs=["configs/users.xml"],
+)
+node3 = cluster.add_instance(
+    "node3",
+    main_configs=["configs/config_defined_1.xml"],
+    user_configs=["configs/users.xml"],
+)
+node4 = cluster.add_instance(
+    "node4",
+    main_configs=["configs/config_limit_reached.xml"],
+    user_configs=["configs/users.xml"],
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_concurrent_threads_soft_limit_default(started_cluster):
+    node1.query(
+        "SELECT count(*) FROM numbers_mt(10000000)",
+        query_id="test_concurrent_threads_soft_limit_1",
+    )
+    node1.query("SYSTEM FLUSH LOGS")
+    assert (
+        node1.query(
+            "select length(thread_ids) from system.query_log where current_database = currentDatabase() and type = 'QueryFinish' and query_id = 'test_concurrent_threads_soft_limit_1'"
+        )
+        == "102\n"
+    )
+
+
+def test_concurrent_threads_soft_limit_defined_50(started_cluster):
+    node2.query(
+        "SELECT count(*) FROM numbers_mt(10000000)",
+        query_id="test_concurrent_threads_soft_limit_2",
+    )
+    node2.query("SYSTEM FLUSH LOGS")
+    assert (
+        node2.query(
+            "select length(thread_ids) from system.query_log where current_database = currentDatabase() and type = 'QueryFinish' and query_id = 'test_concurrent_threads_soft_limit_2'"
+        )
+        == "52\n"
+    )
+
+
+def test_concurrent_threads_soft_limit_defined_1(started_cluster):
+    node3.query(
+        "SELECT count(*) FROM numbers_mt(10000000)",
+        query_id="test_concurrent_threads_soft_limit_3",
+    )
+    node3.query("SYSTEM FLUSH LOGS")
+    assert (
+        node3.query(
+            "select length(thread_ids) from system.query_log where current_database = currentDatabase() and type = 'QueryFinish' and query_id = 'test_concurrent_threads_soft_limit_3'"
+        )
+        == "3\n"
+    )
+
+
+# In config_limit_reached.xml there is concurrent_threads_soft_limit=10
+# Background query starts in a separate thread to reach this limit.
+# When this limit is reached the foreground query gets less than 5 queries despite the fact that it has settings max_threads=5
+def test_concurrent_threads_soft_limit_limit_reached(started_cluster):
+    def background_query():
+        try:
+            node4.query(
+                "SELECT count(*) FROM numbers_mt(1e11) settings max_threads=100",
+                query_id="background_query",
+            )
+        except QueryRuntimeException:
+            pass
+
+    background_thread = threading.Thread(target=background_query)
+    background_thread.start()
+
+    def limit_reached():
+        s_count = node4.query(
+            "SELECT sum(length(thread_ids)) FROM system.processes"
+        ).strip()
+        if s_count:
+            count = int(s_count)
+        else:
+            count = 0
+        return count >= 10
+
+    while not limit_reached():
+        time.sleep(0.1)
+
+    node4.query(
+        "SELECT count(*) FROM numbers_mt(10000000) settings max_threads=5",
+        query_id="test_concurrent_threads_soft_limit_4",
+    )
+
+    node4.query("SYSTEM FLUSH LOGS")
+    s_count = node4.query(
+        "select length(thread_ids) from system.query_log where current_database = currentDatabase() and type = 'QueryFinish' and query_id = 'test_concurrent_threads_soft_limit_4'"
+    ).strip()
+    if s_count:
+        count = int(s_count)
+    else:
+        count = 0
+    assert count < 5
+    node4.query("KILL QUERY WHERE query_id = 'background_query' SYNC")
+    background_thread.join()
diff --git a/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml b/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml
index 031e2257ba0..259ce83c03f 100644
--- a/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml
@@ -1,5 +1,6 @@
 <clickhouse>
 	<remote_url_allow_hosts>
         <host>node1</host>
+        <host>node4</host>
     </remote_url_allow_hosts>
 </clickhouse>
diff --git a/tests/integration/test_dictionaries_redis/test.py b/tests/integration/test_dictionaries_redis/test.py
index bc8170ab08d..c2dc73db782 100644
--- a/tests/integration/test_dictionaries_redis/test.py
+++ b/tests/integration/test_dictionaries_redis/test.py
@@ -1,14 +1,14 @@
 import os
 import shutil
 import pytest
+import logging
 from helpers.cluster import ClickHouseCluster
 from helpers.dictionary import Field, Row, Dictionary, DictionaryStructure, Layout
 from helpers.external_sources import SourceRedis
 
-cluster = None
+cluster = ClickHouseCluster(__file__)
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 dict_configs_path = os.path.join(SCRIPT_DIR, "configs/dictionaries")
-node = None
 
 KEY_FIELDS = {
     "simple": [Field("KeyField", "UInt64", is_key=True, default_value_for_get=9999999)],
@@ -70,8 +70,6 @@ DICTIONARIES = []
 
 
 def get_dict(source, layout, fields, suffix_name=""):
-    global dict_configs_path
-
     structure = DictionaryStructure(layout, fields)
     dict_name = source.name + "_" + layout.name + "_" + suffix_name
     dict_path = os.path.join(dict_configs_path, dict_name + ".xml")
@@ -82,13 +80,9 @@ def get_dict(source, layout, fields, suffix_name=""):
     return dictionary
 
 
-def setup_module(module):
+def generate_dict_configs():
     global DICTIONARIES
     global cluster
-    global node
-    global dict_configs_path
-
-    cluster = ClickHouseCluster(__file__)
 
     if os.path.exists(dict_configs_path):
         shutil.rmtree(dict_configs_path)
@@ -126,8 +120,8 @@ def setup_module(module):
         for source in sources:
             for layout in LAYOUTS:
                 if not source.compatible_with_layout(layout):
-                    print(
-                        "Source", source.name, "incompatible with layout", layout.name
+                    logging.debug(
+                        f"Source {source.name} incompatible with layout {layout.name}"
                     )
                     continue
 
@@ -137,7 +131,9 @@ def setup_module(module):
     main_configs = []
     dictionaries = []
     for fname in os.listdir(dict_configs_path):
-        dictionaries.append(os.path.join(dict_configs_path, fname))
+        path = os.path.join(dict_configs_path, fname)
+        logging.debug(f"Found dictionary {path}")
+        dictionaries.append(path)
 
     node = cluster.add_instance(
         "node", main_configs=main_configs, dictionaries=dictionaries, with_redis=True
@@ -147,13 +143,15 @@ def setup_module(module):
 @pytest.fixture(scope="module", autouse=True)
 def started_cluster():
     try:
+        generate_dict_configs()
+
         cluster.start()
         assert len(FIELDS) == len(VALUES)
         for dicts in DICTIONARIES:
             for dictionary in dicts:
-                print("Preparing", dictionary.name)
+                logging.debug(f"Preparing {dictionary.name}")
                 dictionary.prepare_source(cluster)
-                print("Prepared")
+                logging.debug(f"Prepared {dictionary.name}")
 
         yield cluster
 
@@ -161,14 +159,19 @@ def started_cluster():
         cluster.shutdown()
 
 
-@pytest.mark.parametrize("id", list(range(len(FIELDS))))
+def get_entity_id(entity):
+    return FIELDS[entity].name
+
+
+@pytest.mark.parametrize("id", list(range(len(FIELDS))), ids=get_entity_id)
 def test_redis_dictionaries(started_cluster, id):
-    print("id:", id)
+    logging.debug(f"Run test with id: {id}")
 
     dicts = DICTIONARIES[id]
     values = VALUES[id]
     field = FIELDS[id]
 
+    node = started_cluster.instances["node"]
     node.query("system reload dictionaries")
 
     for dct in dicts:
@@ -193,10 +196,9 @@ def test_redis_dictionaries(started_cluster, id):
             for query in dct.get_select_get_or_default_queries(field, row):
                 queries_with_answers.append((query, field.default_value_for_get))
 
-        node.query("system reload dictionary {}".format(dct.name))
+        node.query(f"system reload dictionary {dct.name}")
 
         for query, answer in queries_with_answers:
-            print(query)
             assert node.query(query) == str(answer) + "\n"
 
     # Checks, that dictionaries can be reloaded.
diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
index e08ff555c20..e69794638f1 100644
--- a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
+++ b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
@@ -6,6 +6,12 @@
                 <type>web</type>
                 <endpoint>http://nginx:80/test1/</endpoint>
             </web>
+            <cached_web>
+                <type>cache</type>
+                <disk>web</disk>
+                <path>cached_web_cache/</path>
+                <max_size>100000000</max_size>
+            </cached_web>
         </disks>
         <policies>
             <web>
@@ -15,6 +21,13 @@
                     </main>
                 </volumes>
             </web>
+            <cached_web>
+                <volumes>
+                    <main>
+                        <disk>cached_web</disk>
+                    </main>
+                </volumes>
+            </cached_web>
         </policies>
     </storage_configuration>
 </clickhouse>
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index b82c35e617f..87ac0d1af35 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -104,7 +104,7 @@ def test_usage(cluster, node_name):
             )
         )
 
-        node2.query("DROP TABLE test{}".format(i))
+        node2.query("DROP TABLE test{} SYNC".format(i))
         print(f"Ok {i}")
 
 
@@ -131,4 +131,63 @@ def test_incorrect_usage(cluster):
     result = node2.query_and_get_error("TRUNCATE TABLE test0")
     assert "Table is read-only" in result
 
-    node2.query("DROP TABLE test0")
+    node2.query("DROP TABLE test0 SYNC")
+
+
+@pytest.mark.parametrize("node_name", ["node2"])
+def test_cache(cluster, node_name):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances[node_name]
+    global uuids
+    assert len(uuids) == 3
+    for i in range(3):
+        node2.query(
+            """
+            ATTACH TABLE test{} UUID '{}'
+            (id Int32) ENGINE = MergeTree() ORDER BY id
+            SETTINGS storage_policy = 'cached_web';
+        """.format(
+                i, uuids[i], i, i
+            )
+        )
+
+        result = node2.query(
+            """
+            SYSTEM DROP FILESYSTEM CACHE;
+            SELECT count() FROM system.filesystem_cache;
+        """
+        )
+        assert int(result) == 0
+
+        result = node2.query("SELECT * FROM test{} settings max_threads=20".format(i))
+
+        result = node2.query(
+            """
+            SELECT count() FROM system.filesystem_cache;
+        """
+        )
+        assert int(result) > 0
+
+        result = node2.query("SELECT count() FROM test{}".format(i))
+        assert int(result) == 500000 * (i + 1)
+
+        result = node2.query(
+            "SELECT id FROM test{} WHERE id % 56 = 3 ORDER BY id".format(i)
+        )
+        assert result == node1.query(
+            "SELECT id FROM data{} WHERE id % 56 = 3 ORDER BY id".format(i)
+        )
+
+        result = node2.query(
+            "SELECT id FROM test{} WHERE id > 789999 AND id < 999999 ORDER BY id".format(
+                i
+            )
+        )
+        assert result == node1.query(
+            "SELECT id FROM data{} WHERE id > 789999 AND id < 999999 ORDER BY id".format(
+                i
+            )
+        )
+
+        node2.query("DROP TABLE test{} SYNC".format(i))
+        print(f"Ok {i}")
diff --git a/tests/integration/test_distributed_ddl/test.py b/tests/integration/test_distributed_ddl/test.py
index 85d0a5f0999..065795b55eb 100755
--- a/tests/integration/test_distributed_ddl/test.py
+++ b/tests/integration/test_distributed_ddl/test.py
@@ -49,6 +49,7 @@ def test_default_database(test_cluster):
     test_cluster.ddl_check_query(
         instance,
         "CREATE TABLE null ON CLUSTER 'cluster2' (s String DEFAULT 'escape\t\nme') ENGINE = Null",
+        settings={"distributed_ddl_entry_format_version": 2},
     )
 
     contents = instance.query(
@@ -57,7 +58,9 @@ def test_default_database(test_cluster):
     assert TSV(contents) == TSV("ch1\tdefault\nch2\ttest2\nch3\tdefault\nch4\ttest2\n")
 
     test_cluster.ddl_check_query(
-        instance, "DROP TABLE IF EXISTS null ON CLUSTER cluster2"
+        instance,
+        "DROP TABLE IF EXISTS null ON CLUSTER cluster2",
+        settings={"distributed_ddl_entry_format_version": 2},
     )
     test_cluster.ddl_check_query(
         instance, "DROP DATABASE IF EXISTS test2 ON CLUSTER 'cluster'"
diff --git a/tests/integration/test_distributed_ddl_on_cross_replication/configs/settings.xml b/tests/integration/test_distributed_ddl_on_cross_replication/configs/settings.xml
new file mode 100644
index 00000000000..2387e2661e4
--- /dev/null
+++ b/tests/integration/test_distributed_ddl_on_cross_replication/configs/settings.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <distributed_ddl_entry_format_version>2</distributed_ddl_entry_format_version>
+        </default>
+    </profiles>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl_on_cross_replication/test.py b/tests/integration/test_distributed_ddl_on_cross_replication/test.py
index b89091d4034..2b710b4a3e3 100644
--- a/tests/integration/test_distributed_ddl_on_cross_replication/test.py
+++ b/tests/integration/test_distributed_ddl_on_cross_replication/test.py
@@ -7,18 +7,21 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/settings.xml"],
     with_zookeeper=True,
     macros={"shard": 1, "replica": 1, "shard_bk": 3, "replica_bk": 2},
 )
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/settings.xml"],
     with_zookeeper=True,
     macros={"shard": 2, "replica": 1, "shard_bk": 1, "replica_bk": 2},
 )
 node3 = cluster.add_instance(
     "node3",
     main_configs=["configs/remote_servers.xml"],
+    user_configs=["configs/settings.xml"],
     with_zookeeper=True,
     macros={"shard": 3, "replica": 1, "shard_bk": 2, "replica_bk": 2},
 )
diff --git a/website/css/docsearch.css b/tests/integration/test_distributed_default_database/__init__.py
similarity index 100%
rename from website/css/docsearch.css
rename to tests/integration/test_distributed_default_database/__init__.py
diff --git a/tests/integration/test_distributed_default_database/configs/remote_servers.xml b/tests/integration/test_distributed_default_database/configs/remote_servers.xml
new file mode 100644
index 00000000000..58641d93fc6
--- /dev/null
+++ b/tests/integration/test_distributed_default_database/configs/remote_servers.xml
@@ -0,0 +1,18 @@
+<clickhouse>
+    <remote_servers>
+        <secure>
+            <secret>foo</secret>
+            <node>
+                <host>node1</host>
+                <port>9000</port>
+                <default_database>r0</default_database>
+            </node>
+            <node>
+                <host>node2</host>
+                <port>9000</port>
+                <default_database>r1</default_database>
+            </node>
+        </secure>
+    </remote_servers>
+</clickhouse>
+
diff --git a/tests/integration/test_distributed_default_database/configs/users.xml b/tests/integration/test_distributed_default_database/configs/users.xml
new file mode 100644
index 00000000000..a49b1363433
--- /dev/null
+++ b/tests/integration/test_distributed_default_database/configs/users.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <profiles>
+        <default>
+            <prefer_localhost_replica>false</prefer_localhost_replica>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+
+    <quotas>
+        <default>
+        </default>
+    </quotas>
+</clickhouse>
diff --git a/tests/integration/test_distributed_default_database/test.py b/tests/integration/test_distributed_default_database/test.py
new file mode 100644
index 00000000000..ef69533416b
--- /dev/null
+++ b/tests/integration/test_distributed_default_database/test.py
@@ -0,0 +1,51 @@
+"""
+This test is similar to test_cross_replication, except
+in this test we write into per-node tables and read from the distributed table.
+
+The default database in the distributed table definition is left empty on purpose to test
+default database deduction.
+"""
+import pytest
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+from contextlib import contextmanager
+
+
+def bootstrap(cluster):
+    for i, node in enumerate(list(cluster.instances.values())):
+        node.query(f"CREATE DATABASE IF NOT EXISTS r{i}")
+        node.query(f"CREATE TABLE r{i}.test_data(v UInt64) ENGINE = Memory()")
+        node.query(f"INSERT INTO r{i}.test_data SELECT * FROM numbers(10)")
+        node.query(
+            f"""CREATE TABLE default.test AS r{i}.test_data ENGINE = Distributed(secure, '', test_data, rand())"""
+        )
+
+
+@contextmanager
+def start_cluster():
+    cluster_disabled = ClickHouseCluster(__file__)
+    cluster_disabled.add_instance(
+        "node1",
+        main_configs=["configs/remote_servers.xml"],
+        user_configs=["configs/users.xml"],
+    )
+    cluster_disabled.add_instance(
+        "node2",
+        main_configs=["configs/remote_servers.xml"],
+        user_configs=["configs/users.xml"],
+    )
+    try:
+        cluster_disabled.start()
+        bootstrap(cluster_disabled)
+        yield cluster_disabled
+    finally:
+        cluster_disabled.shutdown()
+
+
+def test_query():
+    with start_cluster() as cluster:
+        node1 = cluster.instances["node1"]
+        assert TSV(node1.query("SELECT count() FROM default.test")) == TSV("20")
diff --git a/tests/integration/test_encrypted_disk/test.py b/tests/integration/test_encrypted_disk/test.py
index 4e6d1db9e99..17a30676f7f 100644
--- a/tests/integration/test_encrypted_disk/test.py
+++ b/tests/integration/test_encrypted_disk/test.py
@@ -252,3 +252,21 @@ EOF""".format(
     # Detach the part encrypted with the wrong key and check that another part containing "(2,'data'),(3,'data')" still can be read.
     node.query("ALTER TABLE encrypted_test DETACH PART '{}'".format(FIRST_PART_NAME))
     assert node.query(select_query) == "(2,'data'),(3,'data')"
+
+
+def test_read_in_order():
+    node.query(
+        "CREATE TABLE encrypted_test(`a` UInt64,  `b` String(150)) ENGINE = MergeTree() ORDER BY (a, b) SETTINGS storage_policy='encrypted_policy'"
+    )
+
+    node.query(
+        "INSERT INTO encrypted_test SELECT * FROM generateRandom('a UInt64, b FixedString(150)') LIMIT 100000"
+    )
+
+    node.query(
+        "SELECT * FROM encrypted_test ORDER BY a, b SETTINGS optimize_read_in_order=1 FORMAT Null"
+    )
+
+    node.query(
+        "SELECT * FROM encrypted_test ORDER BY a, b SETTINGS optimize_read_in_order=0 FORMAT Null"
+    )
diff --git a/tests/integration/test_executable_table_function/test.py b/tests/integration/test_executable_table_function/test.py
index e3ac11eef87..801a3c7c14a 100644
--- a/tests/integration/test_executable_table_function/test.py
+++ b/tests/integration/test_executable_table_function/test.py
@@ -163,6 +163,19 @@ def test_executable_function_input_multiple_pipes_python(started_cluster):
     assert actual == expected
 
 
+def test_executable_function_input_slow_python_timeout_increased(started_cluster):
+    skip_test_msan(node)
+    query = "SELECT * FROM executable('input_slow.py', 'TabSeparated', 'value String', {source}, SETTINGS {settings})"
+    settings = "command_termination_timeout = 26, command_read_timeout = 26000, command_write_timeout = 26000"
+    assert node.query(query.format(source="(SELECT 1)", settings=settings)) == "Key 1\n"
+    assert (
+        node.query(
+            query.format(source="(SELECT id FROM test_data_table)", settings=settings)
+        )
+        == "Key 0\nKey 1\nKey 2\n"
+    )
+
+
 def test_executable_storage_no_input_bash(started_cluster):
     skip_test_msan(node)
     node.query("DROP TABLE IF EXISTS test_table")
diff --git a/website/css/highlight.css b/tests/integration/test_fetch_memory_usage/__init__.py
similarity index 100%
rename from website/css/highlight.css
rename to tests/integration/test_fetch_memory_usage/__init__.py
diff --git a/tests/integration/test_fetch_memory_usage/configs/config.xml b/tests/integration/test_fetch_memory_usage/configs/config.xml
new file mode 100644
index 00000000000..8cfdcf973f4
--- /dev/null
+++ b/tests/integration/test_fetch_memory_usage/configs/config.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <max_server_memory_usage>1000000000</max_server_memory_usage>
+</clickhouse>
diff --git a/tests/integration/test_fetch_memory_usage/test.py b/tests/integration/test_fetch_memory_usage/test.py
new file mode 100644
index 00000000000..a4371140150
--- /dev/null
+++ b/tests/integration/test_fetch_memory_usage/test.py
@@ -0,0 +1,59 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node", main_configs=["configs/config.xml"], with_zookeeper=True
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_huge_column(started_cluster):
+
+    if (
+        node.is_built_with_thread_sanitizer()
+        or node.is_built_with_memory_sanitizer()
+        or node.is_built_with_address_sanitizer()
+    ):
+        pytest.skip("sanitizer build has higher memory consumption; also it is slow")
+
+    # max_server_memory_usage is set to 1GB
+    # Added column should be 1e6 * 2000 ~= 2GB
+    # ALTER ADD COLUMN + MATRIALIZE COLUMN should not cause big memory consumption
+    node.query(
+        """
+        create table test_fetch (x UInt64) engine = ReplicatedMergeTree('/clickhouse/tables/test_fetch', 'r1') order by x settings index_granularity=1024;
+        insert into test_fetch select number from numbers(1e6);
+
+        set mutations_sync=1;
+        alter table test_fetch add column y String default repeat(' ', 2000) CODEC(NONE);
+        alter table test_fetch materialize column y;
+
+        create table test_fetch2 (x UInt64, y String default repeat(' ', 2000) CODEC(NONE)) engine = ReplicatedMergeTree('/clickhouse/tables/test_fetch', 'r2') order by x settings index_granularity=1024;
+    """
+    )
+
+    # Here we just check that fetch has started.
+    node.query(
+        """
+        set receive_timeout=1;
+        system sync replica test_fetch2;
+    """,
+        ignore_error=True,
+    )
+
+    # Here we check that fetch did not use too much memory.
+    # See https://github.com/ClickHouse/ClickHouse/issues/39915
+    maybe_exception = node.query(
+        "select last_exception from system.replication_queue where last_exception like '%Memory limit%';"
+    )
+    assert maybe_exception == ""
diff --git a/tests/integration/test_file_schema_inference_cache/__init__.py b/tests/integration/test_file_schema_inference_cache/__init__.py
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml b/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml
new file mode 100644
index 00000000000..de7e27921f0
--- /dev/null
+++ b/tests/integration/test_file_schema_inference_cache/configs/config.d/query_log.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <query_log>
+        <database>system</database>
+        <table>query_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>300</flush_interval_milliseconds>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml b/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml
new file mode 100644
index 00000000000..de3c4cbe57f
--- /dev/null
+++ b/tests/integration/test_file_schema_inference_cache/configs/config.d/schema_cache.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <schema_inference_cache_max_elements_for_file>2</schema_inference_cache_max_elements_for_file>
+</clickhouse>
diff --git a/tests/integration/test_file_schema_inference_cache/test.py b/tests/integration/test_file_schema_inference_cache/test.py
new file mode 100755
index 00000000000..30c9a788d6f
--- /dev/null
+++ b/tests/integration/test_file_schema_inference_cache/test.py
@@ -0,0 +1,151 @@
+import pytest
+import time
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    stay_alive=True,
+    main_configs=[
+        "configs/config.d/query_log.xml",
+        "configs/config.d/schema_cache.xml",
+    ],
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def get_profile_event_for_query(node, query, profile_event):
+    node.query("system flush logs")
+    query = query.replace("'", "\\'")
+    return int(
+        node.query(
+            f"select ProfileEvents['{profile_event}'] from system.query_log where query='{query}' and type = 'QueryFinish' order by event_time desc limit 1"
+        )
+    )
+
+
+def check_cache_misses(node, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node, f"desc file('{file}')", "SchemaInferenceCacheMisses"
+        )
+        == amount
+    )
+
+
+def check_cache_hits(node, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node, f"desc file('{file}')", "SchemaInferenceCacheHits"
+        )
+        == amount
+    )
+
+
+def check_cache_invalidations(node, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node, f"desc file('{file}')", "SchemaInferenceCacheInvalidations"
+        )
+        == amount
+    )
+
+
+def check_cache_evictions(node, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node, f"desc file('{file}')", "SchemaInferenceCacheEvictions"
+        )
+        == amount
+    )
+
+
+def check_cache(node, expected_files):
+    sources = node.query("select source from system.schema_inference_cache")
+    assert sorted(map(lambda x: x.strip().split("/")[-1], sources.split())) == sorted(
+        expected_files
+    )
+
+
+def test(start_cluster):
+    node.query("insert into function file('data.jsonl') select * from numbers(100)")
+    time.sleep(1)
+
+    node.query("desc file('data.jsonl')")
+    check_cache(node, ["data.jsonl"])
+    check_cache_misses(node, "data.jsonl")
+
+    node.query("desc file('data.jsonl')")
+    check_cache_hits(node, "data.jsonl")
+
+    node.query("insert into function file('data.jsonl') select * from numbers(100)")
+    time.sleep(1)
+
+    node.query("desc file('data.jsonl')")
+    check_cache_invalidations(node, "data.jsonl")
+
+    node.query("insert into function file('data1.jsonl') select * from numbers(100)")
+    time.sleep(1)
+
+    node.query("desc file('data1.jsonl')")
+    check_cache(node, ["data.jsonl", "data1.jsonl"])
+    check_cache_misses(node, "data1.jsonl")
+
+    node.query("desc file('data1.jsonl')")
+    check_cache_hits(node, "data1.jsonl")
+
+    node.query("insert into function file('data2.jsonl') select * from numbers(100)")
+    time.sleep(1)
+
+    node.query("desc file('data2.jsonl')")
+    check_cache(node, ["data1.jsonl", "data2.jsonl"])
+    check_cache_misses(node, "data2.jsonl")
+    check_cache_evictions(node, "data2.jsonl")
+
+    node.query("desc file('data2.jsonl')")
+    check_cache_hits(node, "data2.jsonl")
+
+    node.query("desc file('data1.jsonl')")
+    check_cache_hits(node, "data1.jsonl")
+
+    node.query("desc file('data.jsonl')")
+    check_cache(node, ["data.jsonl", "data1.jsonl"])
+    check_cache_misses(node, "data.jsonl")
+    check_cache_evictions(node, "data.jsonl")
+
+    node.query("desc file('data2.jsonl')")
+    check_cache(node, ["data.jsonl", "data2.jsonl"])
+    check_cache_misses(node, "data2.jsonl")
+    check_cache_evictions(node, "data2.jsonl")
+
+    node.query("desc file('data2.jsonl')")
+    check_cache_hits(node, "data2.jsonl")
+
+    node.query("desc file('data.jsonl')")
+    check_cache_hits(node, "data.jsonl")
+
+    node.query("insert into function file('data3.jsonl') select * from numbers(100)")
+    time.sleep(1)
+
+    node.query("desc file('data*.jsonl')")
+    check_cache_hits(node, "data*.jsonl")
+
+    node.query("system drop schema cache for file")
+    check_cache(node, [])
+
+    node.query("desc file('data*.jsonl')")
+    check_cache_misses(node, "data*.jsonl", 4)
+
+    node.query("system drop schema cache")
+    check_cache(node, [])
+
+    node.query("desc file('data*.jsonl')")
+    check_cache_misses(node, "data*.jsonl", 4)
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem
index 036e0a3b655..3f9b9661fcb 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/ca-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFhTCCA22gAwIBAgIUVM3x4bsymB902aSmqQ3OCNSfqCQwDQYJKoZIhvcNAQEL
+MIIFhTCCA22gAwIBAgIUA29DmsDX5fK0u88nQ43zRJB/X9YwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjAxMDI4
-MDYzNzExWhcNMzAxMDI2MDYzNzExWjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTQzMzI3WhcNMzIwODA1MTQzMzI3WjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQsw
-CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMKSY4+t
-V/E+GFt0eKUjRLYui+0662Gqp3/5U3n2NXUeeZEFf6c85v3uyyVLnr1lyWM8dYFG
-gR7esvZejequG1bA6OPXbet45veiBVWDANeIXw1Mpr5191wmQ/Jb4Eic9c+GSEiE
-UXWP7Ebx0WXZIuh22ESvtUYmrjHI4r1+W2HjbSPQ5ISVA7x5r1LiQzZu0bZ4FfRf
-C5s0IhM3DIvvmwu9P1Zwn10/UTOcbrGfDGYklKUZ/JBrXVffMs3n16xnFLSjp59v
-V6vqoiP9X7mLcMuBBbe1l+YIQZt0iN0lzqXf6+gXYRS9rLjpNKYiA8Ejbivtel25
-fzi3pIF+FFHG7bRCLd78eUh2cNC+Wt7AZKXtlGyG7+hCd0fEBrmEzQWP2pXPyQI2
-7SnOSa/mQzCGfETfDRWcDFN0fYA2RHLZSEp/ImxGPeCiAKMg6wecYKcPj5QVWL8F
-R9RN8B2i37DEs+dtHpuGdRY8mGoVnkQiP6MXKF6RJV8PG5BFBpIWrdUr6XdXPZLs
-fpXQ9iVNxRzj1Qs3x3b2Da38hxSWTSP1zbkBPlMkXRuw+5m8PpkBpiarXF+4i7MM
-RCsg07AIKilTM3p21qFLnKMCgCAZX16zPVfBPBipPbk3EjfFPWQ29v5KHm6zFxn6
-mBk+2nOmaSXhAjGexHjhikl76SZhA0Re17PXAgMBAAGjUzBRMB0GA1UdDgQWBBTZ
-k26nfmjd7o/kNQ7wt+0xnFS3FzAfBgNVHSMEGDAWgBTZk26nfmjd7o/kNQ7wt+0x
-nFS3FzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQA1vfdcnkXt
-8TSDJJl+PBJTvpKjipAyilipXjpq4vjxTBVtivdUekpV7U8O28RoOOSqtLWaN7uX
-rTZyRJK61mWkyJdnS+YPhUG0cvNp7faHXJf9NB74hO57j00kPE5zYvUl35/zRd28
-146omM3s9dMf6yKKoESib5Ixm4zntDkqH5Yi88U6/ODwm8jJuJxkJBdYBUtRA4Ky
-ETML7GL9Vm2A5QTGBue8nTlYpy1avUK8lsP8W4S3zX8lKuTok4fxmd8TsVMgYLKF
-67QKDboPeJNN/Il74Yvd6KhHO5AkcvjLHbwV8NRMi8+0vtQWcpSysrZfoeFS3kcD
-lJL532F8IP2mMPsx3ARKEsYZWGKtEjQIUuI0sSIbN2V01nbKQ7zj1tNBe6xhnzyx
-Uthx05WWl7YLtM75/Wycesz7ZKxkKbGPu9nhvEhRJjrDT0p0Tjx+of2qKkCkdXRw
-QkrGROFvkMcn/YXs95YDZ97pKb355zMiqpBXKqsPHbrgDZbbowmEOgCPiYbxgzce
-TVAr00uofy+uFfrdtUGpKncmmvFtVBuNo4Pj9tdsRkDuO8Y10jFIG+2S2gKeTAsy
-japTT3FjHjGm9KF/QtbK7RZdxzcn1eUuOO3mF4dj30le0E4iOh6XxFlth3ppoOeb
-Z1kFHCU8MtmoINIVYP23aJy8pm1d8D/2Kw==
+CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOaoVw/g
+75YIIgSUqiTQa/AJ9ShPACfv5XCJO2yB2i0FjYXdLzjC5fvYwMLBbi/pVv1UhArK
+OOhpVqsGgv6U+hC5b2jiRw3O13T6aSQMrj0E/OVLIUqR+326r+typvbkRM962oVs
+AIy3NLs40PNF7urBXzzJK7jQhUGAfRta5MlHLhovLrWKPqh01vAe0nyni4k4afj0
+yHkMCkr8SeQk8gI6KAADQWX/ic0MUBOyH1yM0O60hoFM0LCNcsIcGRL7qoiVnCqY
+WzsUZNSYXmpE/w9Ylk+YQIzYdjwcktj/tS1SMD4zMRzqb39tpoxKzFNAO5oKIXdc
++UN87DrOKSdkF3C6w1WDhVrKFz5Ny+cvq2WzhDi+AAj7xBCaLTXyGp6K8CuQ05ft
+t2fXoXBjlclerL9radzuuyvcn/Kl23NNW/AIEBH9ZCxweK7IgYBXkasXVWseD6PO
+M/1rwBD8ODMfe4Ew9YlUTeEhBuDd6no8rx5cqrTc5pVTAkv0cbSkeGdum8BocEpy
+ibdBZ0iqUKpNJVC0BY4VrhQJaS+CjRWo5OqxLTjzgCdys0Rp0IjvrTOB5+2YrGz0
+hP0RmGW57dWevFDgSOwwZkFRGegTbFV0pi3Ryrp68P4c+KMb32zeV2O2HF7aoDMd
+bGosZlI9o3rW9zCz/OYxz3WjfxdIdNWk6woTAgMBAAGjUzBRMB0GA1UdDgQWBBSA
+3YX1WHa5G+5FitZMLBjzpEKSsTAfBgNVHSMEGDAWgBSA3YX1WHa5G+5FitZMLBjz
+pEKSsTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQB151qyDTjO
+bQmswRAq1IGOLGb5TGBq/BwVlPUOhl0lTQihJwBg+YUK1ArLokQm4+ZAN3jCGXkn
+7piNjWkgc3EVp2ft2YVgpfTQNPJQAIqUx/TLB6XJd1K4ODB2Ra8Pcdb6QIxXz8vB
+rDlwHp4+JsHLbEjNX+pPyys/w/YS1yNJz6wJbUtuRWqFxyUtja9hsH8TZFvnXa17
+hx15ZgKGhhxrAw3xAvUzOScIL4SzCDnFA1F1zqFvc4i4xKK4xQPnmkUb7Uqv9bbM
+rNXyt0m3tm29ijb0BT55NVSoz9Ch45U71t2SoQyPEjMqwfm0I1pmtx2SJe7eRXbk
+8sv8yc9T2RUoHz+0vgrAIxQEbOaR66obYS1cGYLAVDtkuEbw2q68porHL1jXBX38
+d77WTTUfKZ9huaQDzdFAbr0FbF+sljjbrjXpLY5l0AT6YAahMJMpxTFo/VYuBqkB
+2M4bPAHWOwN8DcI4zUwIigU/TAv5eB7q9w5rKLBLbFfRb9WDpuQbBSH12Wwn7uj7
+/ClUrANcIFgsCpzDoIt19VxgxmGSIteqefqXCJfV3UuUrjRZvzuL3q89RmPdphM9
+qCnAVX4FWWv8XVxgnR2SJ6mdSfi+Uchvkg5dQOoAF/iq+Hv/xbOwv68voSffbbTj
+awu89VRltD0WvorZgM8ROM8jkUfM3/C6BA==
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem
index cd28012e236..68517fb0178 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/ca-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCkmOPrVfxPhhb
-dHilI0S2LovtOuthqqd/+VN59jV1HnmRBX+nPOb97sslS569ZcljPHWBRoEe3rL2
-Xo3qrhtWwOjj123reOb3ogVVgwDXiF8NTKa+dfdcJkPyW+BInPXPhkhIhFF1j+xG
-8dFl2SLodthEr7VGJq4xyOK9flth420j0OSElQO8ea9S4kM2btG2eBX0XwubNCIT
-NwyL75sLvT9WcJ9dP1EznG6xnwxmJJSlGfyQa11X3zLN59esZxS0o6efb1er6qIj
-/V+5i3DLgQW3tZfmCEGbdIjdJc6l3+voF2EUvay46TSmIgPBI24r7XpduX84t6SB
-fhRRxu20Qi3e/HlIdnDQvlrewGSl7ZRshu/oQndHxAa5hM0Fj9qVz8kCNu0pzkmv
-5kMwhnxE3w0VnAxTdH2ANkRy2UhKfyJsRj3gogCjIOsHnGCnD4+UFVi/BUfUTfAd
-ot+wxLPnbR6bhnUWPJhqFZ5EIj+jFyhekSVfDxuQRQaSFq3VK+l3Vz2S7H6V0PYl
-TcUc49ULN8d29g2t/IcUlk0j9c25AT5TJF0bsPuZvD6ZAaYmq1xfuIuzDEQrINOw
-CCopUzN6dtahS5yjAoAgGV9esz1XwTwYqT25NxI3xT1kNvb+Sh5usxcZ+pgZPtpz
-pmkl4QIxnsR44YpJe+kmYQNEXtez1wIDAQABAoICAQCpIab51ayEP33cwbm9kpK/
-6mYnqPfCxh0j2Q7/DU4aqIrzzNvR+9avFUvw93LdIAWXBY7++NJ0ixD1p+uk/AM3
-viizJSifb1EWIPiSBHZO5HP7k42+Mbz7lSerHMIxXH8wDYH3x00n7Btu7/Udm0oE
-2InV6wagHC9/hyfRoGy/Anp0j7iUpxPAWeZVHele/6W7/1bWPWhRWVflbAyz92vH
-IJJWCT/+RnPHcUuniqG0iEfN3HD2+N0C7Tm0UrvfWRteioPCy35iKmsW7cCwAM3j
-mBvoPSn1A2hEQWBXG+4tsh/Wd7wj01y4v77MSvUIhkvWU2/y2LQGEVwmU/pFu64T
-ZZ6+unfhCPqblvUyXLCZ2qwnYO9XiMv5j9v7E7m+6FIsnDPwC9smxuMdZ9C8frlV
-PUdIkirIDO3NtGFHawWwbI/5iQgg3IM4qwVtsJNdrR3c+GZ7Xvk/0HU3VykT4J5w
-CfAkrTClT6COm2G9mUjdXpdoXA1uoB1hj7vYs6ktSt3gKN8bz3qF2oNm+DH6xaUA
-pvouIY/QDPzAHSzm2efYInVBh7lvyMIIx5eYmp2R9cxep0/p8QbsCNsfSJyN7ay1
-xo/V+8BavGtO+jOgobiTKupxWQrn/RYYIQvqFSPb/HoA+6aXvWnvvHoHDrHaNbgO
-KXs3nWlR2vTklUC46zUdQQKCAQEA81BygvrL3MPsl+fh6rHKIrOqZph6z5LMNjTP
-1todV7OFProS6eftKM+D1zj/LIo1GaO9qu4GseZkS+NEAfCPQWXrRDcjId0ZsywR
-eMSO8v7OIO247+WXOnx5HoQiolin/mVs6wUgfxM64OripV2CVLwF5D5w/woq5SuK
-7qdn1LTiiTOJkurv7cpQLnsZusV3hlbnkrM+SDaw6E3jjGRRKs06+ouUYw7YZdv9
-KxIJVepk5Bpy2FFlevC5JZ0W0Fgq+i0FmwwCr5hwT0h/DZ3a4JUh3t7NdmxRVjbm
-WwTQLdrA2PeJ1YtdHCQA3gaqzYmmer75+IuBK3ZCKTI5NS0l6wKCAQEAzLdefA2E
-HChSsH5guznksYGW5D0lXlA21hcs3xIixcpvcizBEfCyltZK7TgeFaZ6FOBra5XA
-ctOsR+0VVVMUEEH+r0MOS5j2VEQUxwiilr5iar/+HTM4rrJ78hxzBTDJsc4lquhq
-ytTSVEyYZ+U5yHoxHWZJ7RISTpNFEIFfMbH/S109YDwoXQAJ6qdu3kktLohxpAAo
-nA/oeGi1+UDqr3KfUCC6hfZ0bt2OkA2IfFCP7xZ4rRiRl+fjkCLrIslR6rdbSYD1
-d8xr2ub5uP6gIPo9tEdC3AO9/mlpeIR92JRcwmXwHP1KCZNhmGxc6npJogUhnfag
-B/F5OJ6dLI0SxQKCAQEAxVsNZxxSW2E3+QcHAjzvfjJJFyq7Ar9JkPZJVzZX8pkU
-jQqU6NFMVnvrrpj2sYPxCjj8UTb8izQbSkqvEPu01xD6QbyPbJpQjDpEebbFVGhF
-fgQUq9GIVtI70/rNtO1AZmKSdBcWgrxwV5tt9z/fxSc1iCr1sIjovjYRXP7Ag5Gs
-5ii9gEO8FR6y5uDGv+4HwxmegCmPbTefSu5Skb+U7qjFHBA3bhnOgOBte5AHrn6P
-E044tSlgrNWw98dxh9DcG0yFbXvSeeelwUlGdR8DOIL+lC4YbePyHYIuWsmOqoLz
-RYmTbXi7L2Yspeq2hD0QoiNh0q4lOcGUbKHmMTHLvQKCAQB+yjs8vepKvjaolT03
-+F1KCyb3aV+RkEDGTEhASK08r2pi3pEdmWQiw8pYLd+ELT2DXJNraK5u7+bODWqf
-E/tjLlydE/zwmWZHPntX4mNA1d2CnDK4xxaeLHFTvIcIefURqMnvlk8+HJ3AFEh4
-YKJvJi7xNH8o035/J/sog9f/oWyqsq7mwZuGLhX2PYkPJ2dSYLNxjZ+ZOMkUelXq
-cGhqDaXaLMsZWVE3sQUw9xDHXeYngFVxb7wMx1RL2zSisOmJY9KoLbTaY8ORKmkU
-SK/IfPRmiZRBTBgKUCNAv15qG0lwJU6XxdBrKdrSWpsZpm+gZ2kwuqTXBpm7lZFn
-HGC5AoIBABSoejuKUD5eCWIgnLwX3D1XnnIV1yHJCDEIXs5FmNfeT8BX8A2JItJj
-7NnfRxGL3l62Qo1h4Leo4M8XdrbCnlD61QlqrRkmff5JUCv2dVQfG72Hyj4S4hWC
-6AHnG59U46vberljdmIj4FHm3AZP3W3LLW3sUZEkyjEFvaHpRNejFw4jXxbB5Tas
-7ObWT/JJ/6zzmW65m5rDzHvV8vf5sPN6KQaAL2+KZGV7s8P4KccTyr2jwBoqyI+l
-8Fa/OVC4O9xwvrt4flUuQWMT3Y7j37v5FJg0lCJPUpRAGNdfZYJJt2INHe0XsX0v
-z6BihHf8+GVDIxxQroO9XAdgMPExVeM=
+MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQDmqFcP4O+WCCIE
+lKok0GvwCfUoTwAn7+VwiTtsgdotBY2F3S84wuX72MDCwW4v6Vb9VIQKyjjoaVar
+BoL+lPoQuW9o4kcNztd0+mkkDK49BPzlSyFKkft9uq/rcqb25ETPetqFbACMtzS7
+ONDzRe7qwV88ySu40IVBgH0bWuTJRy4aLy61ij6odNbwHtJ8p4uJOGn49Mh5DApK
+/EnkJPICOigAA0Fl/4nNDFATsh9cjNDutIaBTNCwjXLCHBkS+6qIlZwqmFs7FGTU
+mF5qRP8PWJZPmECM2HY8HJLY/7UtUjA+MzEc6m9/baaMSsxTQDuaCiF3XPlDfOw6
+ziknZBdwusNVg4Vayhc+TcvnL6tls4Q4vgAI+8QQmi018hqeivArkNOX7bdn16Fw
+Y5XJXqy/a2nc7rsr3J/ypdtzTVvwCBAR/WQscHiuyIGAV5GrF1VrHg+jzjP9a8AQ
+/DgzH3uBMPWJVE3hIQbg3ep6PK8eXKq03OaVUwJL9HG0pHhnbpvAaHBKcom3QWdI
+qlCqTSVQtAWOFa4UCWkvgo0VqOTqsS0484AncrNEadCI760zgeftmKxs9IT9EZhl
+ue3VnrxQ4EjsMGZBURnoE2xVdKYt0cq6evD+HPijG99s3ldjthxe2qAzHWxqLGZS
+PaN61vcws/zmMc91o38XSHTVpOsKEwIDAQABAoIB/0/ezc6EnOp1E6zcvsK1aUGI
+T00eaGfkXukgnBjJkvBAVlfXIWTRn+DR01dC0PQCfoZJgY3CeKby4g/8fIz2rwpI
+s4etLYQiDLXPacYwB1Ldo4eki3k35oOyEoP8xi57zdCDI4J5XBG4T+SEyBJINCfK
+7C+YxOVni5AE3xE/hlQOQsp0BJp+CEN6E+R7fIWtuu8Fe8rIgAw9PTUUY80kDQOp
+W/RK0fEli5Ia/K6oHX9JJYiSCYj4xSzWKH1pH0WgsqjVYeP0ocDTfDT0jhdrkKqD
+evKNXL3DJ+K35CG4pkBlrdZymEPUcbhyMLJFrNWBd5qFMtVAerWnqn/BemCS7eSv
+DRJHMv7ecYtNy9lvtv6GPwGBR5yROhQI53GdytoWKJJ3wO3T9Onm8p3rM9yd5vwG
+YUsHAjSz6vl3JUdVz6Q8dHzzetOcwcDBHQw2oQVKq4N3F5GlI1dF4n5BOBkVnhXU
+MEpzJ1ZkaTbC1hwhQZBLNXTbqNm2FYilLNVCRH3eok136WCKdZ3/p3Ijbt9U0AQO
+PMZZr6lmdklTCQXjIy7GLAV7d5ewTKhh8EKIrEPU6z4yHKao6j404icFmybCff7H
+l25ZXGo0gE4WoQ4nhsqg7R3cQQd9OhSaN4g/Oec2rC8R1IrqYhZC/J82ImqfpjZT
+IpdY2Xf2aVoaNUGF3UkCggEBAOkr832iuIIdQqRczUz8EuDR96Lvq4y2CoGT5OXo
+0mJcdNlMGDiESCtgLLhH2XoGxauyZH/R4M2KmnbehGwqR2SfDP9/DmIS+9MvhWFx
+urZZQ/hWCRA5I6semiymdAlBxFtyHLHpBsmz87IzqaFBJ4E3sgMTV/2n0uO9E14s
++4ntwjZBCXgdkpL/nk0FKdhVwbd8/QqR1bbWlFjSk/CNK1qzK/rlJfrxcQrcux1G
+xUFOOL6I0jM7dJ5HYY2J1WWwAPvRTe7ek3/5CNuCnuHd6bgN07svUuLaWkorV0X4
+hOOKT2t78Pilln8dODcvVKAdruRSGZTDxjUMiGp1fiLrH5cCggEBAP09YJAPiiHY
+g5xjyV9xGGAETQlAcT2/i+Fw3Qyzlnz5b0KQi55BzKwlQ+KGdZiL8nwSyyyjex4D
+wptcSsB9JmDpaDblP+9S+jAkhB//fyHV+/Lh75a8YKJrx5uRvzq4e6wfXNxld5jF
+taJ7DVl7FIao5yNimw1Yk390ZT6zFeFtyvAqGBdDbUDm+fR+F9CaZ53col85xEX7
++8IyHTVqkjymo3VpL7utzKUWTTjbtwer1lNsac+e66U77zZuX1CrrpOcjUUwMjZy
+IJ2wDPwfZcwSO/ZnnVwIbKVbXHOyL0MQJewgyptkoekJvDEdvRTa1J1mlTN4bWI5
+FPFGVWWfeOUCggEBAL5EdQ5iB7l08vp4F7boQuddrnswo4XQzkXqTvAkyfglhdwD
+Mgh8OP/cHOHLD3V5rTdr/IIo2w4eOekhrmEtJtC+0LZ0EWKKJx+vOWHIkhlWQhaU
+7hRk6+worpocwbcECZytQykSA833n7YcXiENr5TLw+CqmjSMC5R2pyVEA4YLk1z+
+OSHgz8hP+fbTbc/wOoDl5v4G/qOR+b95Jes25te+OPckoZdiCWJZt/4tz6x4jek8
+cHoJ3CGEEeCTRqURt9vEcZmn2iilKEsnDUs18A+WiN3HwhUHJII9V5vrLVUXebM1
+ke70ABh92W9+mcmGLz50mBdCoayMK4zjjygjQMUCggEAVtFn/XuWW6wi0sbTDslz
+FdfjoTxallTI2+0Zm3UmLopFPojXlNXyGUJdV5fJURcJdsfqp88UMmIPobuuVPeS
+5L6gX9GQbbgA1ehu85lgOHVn/wi+XusOJiDVOdxptvPwUj4eU+Dlc5a0gpO1K+wq
+SVA2jccMaTLovlVlMG2tHq/JVzTXNYKEPi/xmYRxHa8RvukZMZRYWbXdxeHwaZOz
+tt9aQrJhDvKyqhZPOyL4SMT8oXUVgXx2RRubEwob20hAfZK6S/IOBORzkhv9F6Kb
+/65wqDU1mYu506bSt0drNI6gsac8TrHdYEtaHWyYmkG7iorUs+She38eUulN9Z0K
+kQKCAQAMEJ+DjajF2Dpie52JOIM9d6SqUHR12VYOrnfsBo+eJS2VmREQ7SOtoExg
+IYnRedtl8w0YdwQZzhAPAvSCBn6IyhWmQ4sTCbLYBGAymLqK1eiwFY5/pzcHjtDS
+xKagDyaRNy7PmnoSTX0Syz7wBTdfjuMWrz26lKXSZN4qEt2Ai7GxzMZc3gchDbId
+BGjHMXytT++6H7o0xDzIoXKRYzUYRmbo+H5U4v/ys5xYhLNjQYkoXiU4tAJTcsRf
+9nk+1h4FcuSlN+kWOuS3N9rXDo4BpkPI1b5b/dvhRLXKxliCYRyc+D5zr6yXNV8q
+jDYqa8eTSy3vYm27Vpkn79VwU/GW
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem
index e1f44d5c733..bb120b19459 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/client-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFLzCCAxcCFDfClSKkmi07ivIl0HnWf6SmJVblMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFLzCCAxcCFAvW84itKCH78WIRdgQjG7HUPr87MA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIwMTAyODA2Mzcx
-NFoXDTMwMDcyODA2MzcxNFowVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE0MzMz
+MFoXDTMyMDgwNTE0MzMzMFowVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UE
-AwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAynkPl+kW
-iMW2ACkZDN26HzCbfudqPANt6JIYFdIq3scs/uqWf7jdsrlyw4j0YeMHLe6tL/NJ
-klYBjd5LcxcZe1e7nlES74ShvplX6W1TlJoIp2OVwbhQSn98ctvBsj66g2kdiKae
-Bjt811bxw2FbU6aDXGZyUi2NMWNU1pRW80znXuZ0mwcSsV05eStnR2kCx9g58fUe
-mEkUMDumFvNQdI2cdxCBQp7Z0lFV90jD1cHAS0pc9EQnj43gIlnjKdoUyjgavLPA
-03uhVCjQwK/tIsnu5JtAn+bHhjBST4dHEEbyukoYXqdAGgMLNNble/vIANMG99mn
-KnkEoUS1N3M/fpprjJzmz1ElGq1JOL5mpcho56AdY4tCzPo8crUXkMz7BJ4HcqcG
-fKjN/gb+2erDK6QGQExUyHXH9d/Vho2Ok91mIxyp2a+hayHFm1pyoTth/tr1f6ZQ
-MCMdgTY82ue76nehBejtD/XNN35k75jbqkjLc2lythyL8vnNa3nhml/Gupbggkyp
-4iPU/04Ta2JAK1Gat+0chcVJpOiFr7K4YFNrVocoLyCRZ8KxCAdiaFbYFDAcmKr4
-rCVQcu4q3ZvJuCx4eQ1M5NwJezulUykrJ02l3xzJ/r6aOBo3mMwRR0Kq5REYowTu
-VXbVzhH4U2fPBuW18tQd4ZlALjURdnrqY98CAwEAATANBgkqhkiG9w0BAQsFAAOC
-AgEAdP/4Nh37vRcDhZD7vqeC8WhqmRlwWzJeOpukcXuuyAhCDmktQpnYooDxYqz/
-2khlPFhltt4/kfyZF0F8kQe+W+563pUd81syttxw0XvpfHDo/sQ2HYJTvowUUA+9
-EViLu1wcyujdsOO3bpFz6DClMp8bQy4imC32TZyc4BSx7QBR/mJD3VE16gWl/R2K
-GIpdEE6Afz4L8OMr15XE90mT6xsvX1hp3+P2UWtSVDJQrTdy2/FCMXeM1OfYP0LT
-f3U5I5SPN4WJfRMIFkULbqyjU2UXuSAEg7nwlli9TgizjAXt6oJsDBYrqIWSuDog
-b/1JKCQdonkyDG5U0gZ1yaT88/V+BoXVo1xJt0Jeo1L42wPii8zJHVAbi2EPCz9V
-GQ6p3P6ZiSeoRa3EgYI0KxEQSNjYlhOLWrGvPW3dhrkOcVPncx0kFuwHjkKIMajZ
-7gvh8CU8aZ0z58h4LIGYMAfwebdEz9XeFM0qPVNO8io0W8VxjQiv7O+OOsjkIm1E
-7GjKW80orEonQ4X/uGYJv+nx1ZcV2vzNMEA5ZeoXjYBetGO9+SqBw8F7KO2Wnz+k
-vXgXs04J4HcISwc5xbAb5yiZDOSBjwSUqYtwC6nt9XXX/gXnQ2BX/G6lt8mNEx/G
-GHXNA6Zl/GQmONFBUqdctyFwf555LgsvhDs2WzxLxLX9HrA=
+AwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjBiM9glH
+uCLSBpVM5oOjCP3dj4nM1yN++w6oxh4mcUhQlU971JL32KDs6go3VC+6/KkAPAYs
+zcI8gS5OyBXfUyel1cJOJ1nQY3KuEGSEkb0wEEB/eQOBjK93OD9vKw7LMtDwm9gy
+pqnaZUqcet0+xTbBWpTktiJn3Hly7HSAhvogTp/qYqbsR5O8AMzn7et14lRHGT+F
+fgY3Sk+yGwk41Mw8VvM9lNCiXJbdQuKuZPxZLE1OLSMMOoaQGYFbrEqdV8SGva5z
+y6IfoeZk26TMTSJ8W6+iKWqdWgnh4FXE5gshb4xSI5uio8OdfwziPqtzWYVEJ1tp
+Tg3eqP8rYmLEguF+MSrrjX9f6/BQ848CVHXym+18E6bi8cMoOaha9unn0Q1UqqLu
+eAd2jQNBLIWTQ2WAXIg4FmBhKMksYhLuDJhlgOhHKOjjYSPWvev0BNjuzXEipgW6
+U+uh+xN71u5na/2teEUdJYXYqvFo45wvWwL2xUwnr1/6aQAIn2VagubLWtMX5RlN
+kLcYkYJPoySj56a1riCqyv4pjBuk+fEZywDaQUaNukuFNIOrx7+07VDwzxJ6qZA4
+4C8Pq8F80gn8lgAbsKjaDwGktjO2R20smr5JZHkpJIzw2ET79lT+N5y+HJmX0Hw6
+fkorPUYDE6kLu9WYiHRTAzkGFwCEZYipjVkCAwEAATANBgkqhkiG9w0BAQsFAAOC
+AgEAQLBoRJUJB4kUQc3D/TlkuwPvPWYmYjGZhy+fgwQIWRTzdRaldnzVAkxUYWh5
+dyg3aYt3MaHhu996uo0shxgY6M++AJY8Fy01dqrrf/HX1E+GfywRVC5nWxe6ivkN
+aSsUO9tydcopKnMQQqbXpIQ10LjY+Kj8PQDuROLxRrnpwv38yaoeyclTjt2YITCu
+n7LteC6090KrMzjFuFAZeglEB8QD3eLfbNh0rwCj8dDcvy86Zr+/BvhgFRLq7ZLU
+IiawxlzUhs8cycjc3PZfQaNJLOXChqrbI30eVoNNlEtKhwI9fLWiRq3KMoapmCIW
+EDBh4lm1ljrRZXjDHmgWPhmFnu9l5dN/xPQgACa4zqyFfv/iDDLBVahoIiph0/7s
+nlbBAEhbVmhxMUfV8h9boix7y2JhjzUZC1XCsPbKx8niOHtXRBJNehms80aiKkA7
+FyPKcx8Boluv7rFf8xsUPp2q8Pjda+Ll8Nm4316spxCKh5KBZp1vpXbQdfGOv1+S
+6KeL8TNOKXzetCvRMj72wckCtPFt0xA6FInbGn+5e3XSDyPcPrS1zL+mglS9fZGo
+eis0H7zhBHxNOL8PFfsaaUUW82Ad1oxY6NugPr4km7zeTWQ1gkbYpusUxuX8SLj5
+O7DNGUSkQoASbgsLkBt2P+TlXupJZlufedpjcN4PW/2qRKo=
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem
index 3c53302873f..b15e6dc2cbb 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/client-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDKeQ+X6RaIxbYA
-KRkM3bofMJt+52o8A23okhgV0irexyz+6pZ/uN2yuXLDiPRh4wct7q0v80mSVgGN
-3ktzFxl7V7ueURLvhKG+mVfpbVOUmginY5XBuFBKf3xy28GyPrqDaR2Ipp4GO3zX
-VvHDYVtTpoNcZnJSLY0xY1TWlFbzTOde5nSbBxKxXTl5K2dHaQLH2Dnx9R6YSRQw
-O6YW81B0jZx3EIFCntnSUVX3SMPVwcBLSlz0RCePjeAiWeMp2hTKOBq8s8DTe6FU
-KNDAr+0iye7km0Cf5seGMFJPh0cQRvK6Shhep0AaAws01uV7+8gA0wb32acqeQSh
-RLU3cz9+mmuMnObPUSUarUk4vmalyGjnoB1ji0LM+jxytReQzPsEngdypwZ8qM3+
-Bv7Z6sMrpAZATFTIdcf139WGjY6T3WYjHKnZr6FrIcWbWnKhO2H+2vV/plAwIx2B
-Njza57vqd6EF6O0P9c03fmTvmNuqSMtzaXK2HIvy+c1reeGaX8a6luCCTKniI9T/
-ThNrYkArUZq37RyFxUmk6IWvsrhgU2tWhygvIJFnwrEIB2JoVtgUMByYqvisJVBy
-7irdm8m4LHh5DUzk3Al7O6VTKSsnTaXfHMn+vpo4GjeYzBFHQqrlERijBO5VdtXO
-EfhTZ88G5bXy1B3hmUAuNRF2eupj3wIDAQABAoICACvwJZAjxv4bWamjQYpnO5K1
-K6lYctdfLyS/P3bMyvzZYExZgBtrdMDqOZtxRwdPCynOl8rGEvssqt2sldb99kur
-+E0c7u0HbUo9YLSJQxAGdUZN+Bu38cSY8drDEb+qmTMXRo93COf1VNwuQ/zQTc9T
-XUJaAQkQVYmYMrr2KgBWegdAH6Hc4ROYVXaUEq+OfEn+BGUbem41vanR5/MnDhic
-+o1kCYj5i+92Mx+crNLgXuh31MA1YhhnA3Kw6vkUGFrh3fuBTqEWPSZUTSjjhKR+
-CdeWUWnh3P6j0djsVGGV4+rFVZCE3wZGDtKCp/5F31s+cE6s7vfqlzSgAmtsGSTv
-Vd1cFf/W1qkx0y8EyUN5EdA8HMeJJdNayc8RZsbtYzByMII54ryGxSa9S5M0iKNR
-vjk3ogdz54AmQuMOVZHOoBkmNCuTPeHavNoo5xxtC+Qezrj1IvCfcMUhOFdRDTPd
-bJwJYr9X9HrD8/geSUkQeAXGXMpcOljigk7HZz9u0CdbK85su6jKvCLSmvIUIlYd
-Le77oI2CJmcgawDGHRnr8bt/GQEM3nbPt4HzMrYhKxPyrax1AhIFMfROJjeib1a/
-lGBiHFJGQ8y7qCZmgPqNMxgKZibe8IM3OmdLTqMWqn0fl+rq5TinEqVTfG7Lzd+m
-uEgSHTUDMxiB+6iv+OmRAoIBAQDumfH9dsOwyA9vd6H6V6e59SON5aRixOLZsY1M
-BEG1CdWNOP9iq5uChz2LLUmXg9KZmoBdFzf5RSO2QXDB+fZwbDM2ugq7BtW8RNj2
-piG8Hfm0JA9x6xEq9a4XulA//bs3/LqmSWNVIUqxOItPYVa2VvaIo9mrTRJ6DZCe
-+nTxZyI/QOY0haeh0OoI3bShOsgLPUrr28higD97fuDM1zWHjfRkBPOA83qObG7I
-bDd/t2xYMylBCLuG7hm/2NOPKX0a3Z4Cxwb7UOQwYAqiGPzd8ibCZaGCLVUkPD+9
-LlztaGfZMxWLPt7U+OwgCq1AMeNiGPFCNrqy/2Zo5IFhuuWtAoIBAQDZPLFys1Tx
-yagx97v9sLz/WEYkfN/Gp2DPVyFB8hMT3zj6G+FHEt72XYyQFM3GtD6JlUbwcStv
-GgW4MawA7A7Jtyj9WXAj/YeGbkZfT9cVaxiB4mYXTvLvDvAixHwob4HAJ73i3R47
-lc7E6oJqNoyQvlIRCeOWkMIZYNy7eVRWun5TdmV4w/i6TdswJ1ZcbZGm/VZeUpyT
-pBzVf3XrpFNZpCcLnsi/fHOpu2gOdP8ynoeOJ0y7pigAMrqGS+MVwKVcpVUcOPZr
-bg0HFCQ6L1fdp3UmMBGLD8lMEOcfH7aTqAO3CC0NGu7npQCmsQTeMlW5Zjwr9lwj
-DllUEyIIoek7AoIBABe9t6dpvtUDQw3rUHGxcR3+t1fyJqYxQwU4Nn/+2G7kGJyh
-tD+kJagaPtRvYCg0VKs2BVm96rLh30jOQCL89TmAeqQSZOjxKClAjHoWU7r9HJCB
-GgxSwHWO1pDD2CJV4+ARRJ0xJjIdSupRXwM6Az/HbWZxL0JtO85rNR2sfCBdC7pR
-gdZuChz+xZq2PLfiOm9r3N2VE95BNo/aMxIOw+PGCzA8keId1+79+RP2OJt7q8sm
-5A71iHtHi8ZcE8jl7u3SaVuLZDVzehEaLVStudN3ucWUCTsDuboOSKVRTKvOvK6O
-97DQQ6nbTtttVInTrPVg1/inq3IOGamMOxd3Wk0CggEBAJBF+7+mlEKkX/0Xf5Wj
-vFGFSchP2rpvTR9GyYKnh74J4ShSPdJbGRLb3E+QUX2nFWWAa4WiU2tNCAFlk8tk
-+wlCiImBzbVJWqmQMVJ5jundn4AbYRwXxcW40Qj2H1Mngy+f9T9nBP4jpxgmewiZ
-Q8+ZZp2ESM8lQpNiPhaQJNAYuW8q0Ydb96Obs3eOmI94AWS7GZI5IV34f2HXbfRa
-xTRijb/s63wo5hQSr6/ySc5PdM2XEiIJ3sUK68/nNGCs+eXGs/izaAy/IQ3TdZ/i
-82L1JRuAjxYhHNpU23pTMIlt61Gyr2Dlw0a60ezi4c3D9iTUXiAAVP6/N9pbfp3n
-EiMCggEBALJHpSPkphZT/z8+olAzmpG5hXF2wz5Tf06ripGKXOAjo77xMTqoOv8F
-MrTnNtd08vV0rKiGS3yv7yESp+wWH52h3wIAA2BBXGfWpKaf172faUfWRQNdAF9x
-bKJzHHSLOI/YIkzOuH/nZJVaN9K+8+IFEehUFrItXeqrsTIo7HyO5M7uqZb6OkVa
-cbOPbAZCkSB+5WEZ9ioOtL1qGvqIovMxixyUrBWUSnse5iiheMMym6Af5396owEP
-i4OYkjk+NuXGFCI/q2HZV28+3ENsLcgkAR5VRLRrkc1UYZahWUxoXGqDRKnGkOmc
-V3Xoig0C2fgC/iiuaMKUh9T9dBnFsjw=
+MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCMGIz2CUe4ItIG
+lUzmg6MI/d2PiczXI377DqjGHiZxSFCVT3vUkvfYoOzqCjdUL7r8qQA8BizNwjyB
+Lk7IFd9TJ6XVwk4nWdBjcq4QZISRvTAQQH95A4GMr3c4P28rDssy0PCb2DKmqdpl
+Spx63T7FNsFalOS2ImfceXLsdICG+iBOn+pipuxHk7wAzOft63XiVEcZP4V+BjdK
+T7IbCTjUzDxW8z2U0KJclt1C4q5k/FksTU4tIww6hpAZgVusSp1XxIa9rnPLoh+h
+5mTbpMxNInxbr6Ipap1aCeHgVcTmCyFvjFIjm6Kjw51/DOI+q3NZhUQnW2lODd6o
+/ytiYsSC4X4xKuuNf1/r8FDzjwJUdfKb7XwTpuLxwyg5qFr26efRDVSqou54B3aN
+A0EshZNDZYBciDgWYGEoySxiEu4MmGWA6Eco6ONhI9a96/QE2O7NcSKmBbpT66H7
+E3vW7mdr/a14RR0lhdiq8WjjnC9bAvbFTCevX/ppAAifZVqC5sta0xflGU2QtxiR
+gk+jJKPnprWuIKrK/imMG6T58RnLANpBRo26S4U0g6vHv7TtUPDPEnqpkDjgLw+r
+wXzSCfyWABuwqNoPAaS2M7ZHbSyavklkeSkkjPDYRPv2VP43nL4cmZfQfDp+Sis9
+RgMTqQu71ZiIdFMDOQYXAIRliKmNWQIDAQABAoICACyTWTKltESyC5qdoajM5LCl
+OfyEb4FaoXoXaXsUN84eoMlJT5DNLIAogAlds8odH8VprpHqsxHLBj5iMh3226aV
+PG5d00kxCh3CbQD5Qrcud58MLqMeCvftEqV6hZAxNlVWZuBnc4JVFBDboxtyzxin
++fCs5HLRUrOzju4OiaCo8GOj/UtjalXB+3VTvU4V993KTA8MB5kYODp0TirNDeCj
+lWVjIsp5cde9BuzTvIKUSnlOpZu2BZuPmkULRFR3L0YwWWD8I4r87Eyyxo+eiYTX
+frMbmKDN9AAkmdKr56j8jKh2AOKkkCTERpYYztn66opm3U8ahlCYGCs0eaTl4Tl9
+I1fgKY/8LfRThwXrb0R2ymdpH1enL7ymDDh8IUyLM2au18JivngNvqLBNh6PfGZs
+iAbgj2Cj1pKSmRzVEdYqKVJdjBanIQEmUq0X+dglIYbnrRdN613TVfVofT3qYpYd
+scX6XuC9kjQFZLPDuvN1vgFU/E4JImQ+AFD++w2FkunbVjXNuGqat+MV9vkWAVHB
+OK0pMcQHELjJ82grTLnJPVrNgE5rPGtQYHnE86Z6RJyokp044QvpgCq2w/jJPoZE
+Ud0+c5ROyW1ivowYw5GlTcpQ8eJ3X63nVgjdE/IpCw5r6T6S0Ajj+FNy2cVUxJ/o
+sR/dlzBL5qP3qDPSGkZrAoIBAQDBteLIHXs7nlCdP5j1IuI1rxOiV7097rnFcIoZ
+MjR1wLd01z6CZZHJbd1vYcf80B3K+7SXz3mxzGtyWqRWJqPJZRpps4GgcxSTz+kd
+rFhZdhjQIFFdj8xnlGYFwNbMNPb4zEViEmqtXn3VNzVysx3et0gPNUKnc3LXfXFv
+4tWhppMXcNRPRwkRjfaLuUVskb81gOz3dSr7Ocpb6SvwKtpk/eiBawWYtSAZYUaC
+Se1bA9JT9O4/QDz9O58HJid3Xm4ToPB827eTRS0M8rleco3oIVMhrDNaW6qLxYP/
+qcCBp7/DbimGmyE3qyolJ5RgKF8wogXqHSLJCRJcUlffKGGHAoIBAQC5JSYLbSBk
+Zpl1aemeev5PIewlUgjA2bP7ePUiFVXwnuwLzLJGsUrPetjRJB1HaGFTD+4i4ANI
+KPUV52kQD+HOzihZ8yU1ZtYhn9liFHp9NE/F99pOn7axVp0FmGZZDjdcq/iTr+MT
+tool4K0614g/g9a/Zca/I5uR460a5HXv+yBObpwDlQcaDCbKY/g3KqvetxK9w7/u
+17iIff8EDx9JCMHZIHj0EMPdNbAZ2nRss6ZbX1OYvNDO4650tXwb36oQm7Tql29c
+Lq9DKSWHo1O63b47URKM25HgbNxUOjVmqPvYSNdiXLLUxTZErAiB0mfUqeV8zChB
+TQI0+pAcU9IfAoIBACDdaheHoPPRfV3gf2P/wh9Xj944QpwyV4Re/p8dvHbJ9pY1
+Op7G+sARCsOt9E85RAS/RbmH8t6ujwA8zqrrLViq9Zs/YFvHipM1cBift/GdrsII
+6aUVE5nzPIf3WroUtl4p0g+8jirR4El/b2sBZqz1rZ0e7SsZ1D8pQki4VIRzjXsp
+omu84pX+3vh/u36bD7TVJd8qGtu6x1FmsxSxQJJn3b2vWai5+jM0JNFQF5wcft/N
+q2pBzNct+WIuH/4JoGVmJccZRAEReH485CRZDSh4FvGclK3c5YeHQEjtFQMqYceX
+diYnRbB7MtBQ8cSKtPO8WYKJ5O/0wQ+2zL/IyxsCggEABna1jVCSAO9UDDVWYqII
+ntqgU+05QQJYtj7S0A3OokfqFb9fufgWlIfFagfIveV3AF9eAPmxI6PKaqlZkaX8
+TCwGXJ2QfvzIHQRnonT0kcpxvoeYp4YL6sULVlarvBAy/plCZGWPl/CXghsF8Tf1
+GcKQjL4Q4jtsAvvf30B6nZY22oYiDD33sYEbGZXD5Kkotu3NSbK70KrXVmyPqqSc
+gwA7RElN77dmHyLwsvZdei4LcMUzNfHhmFd6j7iGTLLSTSIifs4qpR08ISwek02w
+bqWvLoL2EtTXku46AvbFRoA/yp1AZ760v5ji/CLFaULfPR1xVZoLDbyShyb4QQTs
+IQKCAQBmwrWSiihrKlZt5+USXwSB+Cu1IccP3o6rgFavtwSkSyJ3NDJn+NUNFLMJ
+D8YsFl9ro+rTZfb3pqKmKFRETETGh21yLtDhyfuqba+XmdJf/Iu/AEzOcR8QF5lL
+eVH9otc7qprWziXMF9t1ZUuWfqcwlPu6YGqv0eYiyFAY1jZF1csbr92uFvt0Ucev
+tN8cAyCSzjn5zZQwVRMD+wLNGYMRf+kUaiPTKUPGDP/FdY5fDDc/VVfvCBtvs1B0
+tm7moF4/CF9YhsoqNI4dmJw/khwhM1D+UkECaZboawtYDWOw7QG+xvaBeyiGGZ7s
+LsDx2wx9jPQV6wuu4ZB+v8JMSbPb
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem b/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem
index 60b819c9709..8892ed1f4d9 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/client-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEmzCCAoMCAQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xp
-ZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAynkPl+kWiMW2ACkZ
-DN26HzCbfudqPANt6JIYFdIq3scs/uqWf7jdsrlyw4j0YeMHLe6tL/NJklYBjd5L
-cxcZe1e7nlES74ShvplX6W1TlJoIp2OVwbhQSn98ctvBsj66g2kdiKaeBjt811bx
-w2FbU6aDXGZyUi2NMWNU1pRW80znXuZ0mwcSsV05eStnR2kCx9g58fUemEkUMDum
-FvNQdI2cdxCBQp7Z0lFV90jD1cHAS0pc9EQnj43gIlnjKdoUyjgavLPA03uhVCjQ
-wK/tIsnu5JtAn+bHhjBST4dHEEbyukoYXqdAGgMLNNble/vIANMG99mnKnkEoUS1
-N3M/fpprjJzmz1ElGq1JOL5mpcho56AdY4tCzPo8crUXkMz7BJ4HcqcGfKjN/gb+
-2erDK6QGQExUyHXH9d/Vho2Ok91mIxyp2a+hayHFm1pyoTth/tr1f6ZQMCMdgTY8
-2ue76nehBejtD/XNN35k75jbqkjLc2lythyL8vnNa3nhml/Gupbggkyp4iPU/04T
-a2JAK1Gat+0chcVJpOiFr7K4YFNrVocoLyCRZ8KxCAdiaFbYFDAcmKr4rCVQcu4q
-3ZvJuCx4eQ1M5NwJezulUykrJ02l3xzJ/r6aOBo3mMwRR0Kq5REYowTuVXbVzhH4
-U2fPBuW18tQd4ZlALjURdnrqY98CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQCS
-2GjAzmqJidkh4qxwztOG1ufnZmPmVX9b2j3O284Kfm3dgqF9wKRCfKP9Te/pn+xO
-zCTqO5yMcNDTVapIawZ07JWdAbRO7Laj9GYNJwnO7xDpjCcuUwfmGXRSgNQpNzL3
-zuYty/sBKmwZ7+LzKG6jjaqSMtw0LglWO94GtdURilpH4VjOCkp9RraDCrKICYn4
-UQhx80ieI4jwxuyZ6I5UJQuabCQ8PdrKQEBOnPGfMYqf+0JRDKIvHWQJvbx43Pyp
-d69hJeY0742zRXVPk/W+2p2BhIE/uQWabLp6bqQhc6ZHINuMq1N60NdLMAu5iRoj
-vhTiOB/uMG/GBOVswAnCNjn0jTlJd0qoY5EFMrXyDZ+cobmbZiQ0hUCrtV2kP7/5
-swOeMTa5dqoLqklvon8RjQlJvzPYMUV6CA5vU4mmeXORNgRmYuVG3xpZkSGB+XtW
-QiK0u+4bPLKGslJjowZJvlE7A/ANzwSuGqiLs/UIAnA6URlg0K6gGyzc6c9kVi2k
-ryH/Yv72cZ0jE4vpHagM1Ka21VfyS6RAuQxH3OveIi6OViKqGexhPBuja1eIjxVy
-yc4i9Y/iZFNXn8AH1bMeXlWoG92Rsm0zhj+Oe082LkF72gwf8p4Khw/otbquGJzX
-V24aeSrQCo+lxen7tooDo6BThGjNVnZQOIQSQJqtqA==
+ZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjBiM9glHuCLSBpVM
+5oOjCP3dj4nM1yN++w6oxh4mcUhQlU971JL32KDs6go3VC+6/KkAPAYszcI8gS5O
+yBXfUyel1cJOJ1nQY3KuEGSEkb0wEEB/eQOBjK93OD9vKw7LMtDwm9gypqnaZUqc
+et0+xTbBWpTktiJn3Hly7HSAhvogTp/qYqbsR5O8AMzn7et14lRHGT+FfgY3Sk+y
+Gwk41Mw8VvM9lNCiXJbdQuKuZPxZLE1OLSMMOoaQGYFbrEqdV8SGva5zy6IfoeZk
+26TMTSJ8W6+iKWqdWgnh4FXE5gshb4xSI5uio8OdfwziPqtzWYVEJ1tpTg3eqP8r
+YmLEguF+MSrrjX9f6/BQ848CVHXym+18E6bi8cMoOaha9unn0Q1UqqLueAd2jQNB
+LIWTQ2WAXIg4FmBhKMksYhLuDJhlgOhHKOjjYSPWvev0BNjuzXEipgW6U+uh+xN7
+1u5na/2teEUdJYXYqvFo45wvWwL2xUwnr1/6aQAIn2VagubLWtMX5RlNkLcYkYJP
+oySj56a1riCqyv4pjBuk+fEZywDaQUaNukuFNIOrx7+07VDwzxJ6qZA44C8Pq8F8
+0gn8lgAbsKjaDwGktjO2R20smr5JZHkpJIzw2ET79lT+N5y+HJmX0Hw6fkorPUYD
+E6kLu9WYiHRTAzkGFwCEZYipjVkCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQCA
+Er/tM9cVjcKdhZlpwlki5hUFhJUTHQ8MQ3W323dY8Twx40VS/Y0vrVGTS8abAfkd
+WwrzpqWyPqARXcu7KKw9bk/YAr5l6+1DFY/nk/F4cf5jyHA2d7GrxGfPQ65YI8lx
+Hl5taFqJNzEIypGnMqbjP0C5k8+6m2JdEgheXBO7TCfXMtZHu9f7nUdM6JCefWYF
+qaEFjOtYCbjCjP47fO0N7K8DD/Lt1rYouQbVc60k+gjigVTAIBCcWdjNLSP6XxX6
+yOEITwPQZ/Li+uFHBhWentAkyqM5EnPViVF/6MxyLGtBadJJYILN6MROXA+5nkzG
+ypcU25YCgxaXctX1iZnXr6A7or+u1CRNc3WYDFLHYWdnnbIuam5SDy/GBLyQ024T
+xHLcpyOka9tPvh0Fzjh4MeNX3ebn5n1xbEEsvt8VEBucWj3W3yPe/nUiAFzk8GyO
+i+IL/DcfQVY48kP8MElEf4enVk8izRTPu4x6+mnMTPnpmfV0Ks5r3OAM0eyhvluR
+9HotGibhFb4P2junEEEvnS/o9/rpte/LUaEWcZ6mNXlCU6HoBkYGEsQ5nD8k4TdY
+bUmiCUfDT7ubAS42E4K0bqISCt/bWr0N0TVCpSkjMlThzJdwv5slblYr7h/aVlOi
+zmBIcF1pawXXy1zxMbBTcnV+or911GfhFfr38ZT9qg==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem
index 3e2f4e7a16f..628b2cc758a 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-cert.pem
@@ -1,31 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFSTCCAzGgAwIBAgIUN8KVIqSaLTuK8iXQedZ/pKYlVuQwDQYJKoZIhvcNAQEL
+MIIFpTCCA42gAwIBAgIUbfek2TYwQ5N81VJDbeqTfSfKn9wwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjAxMDI4
-MDYzNzEyWhcNMzAwNzI4MDYzNzEyWjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTQzMzI5WhcNMzIwODA1MTQzMzI5WjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ8w
-DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCv
-bbMHZ/fsnqclKmRK7Br6b+qGlXfzF3m8nmbkj0sffXz1lHD9lVyDb2MghOMDstoD
-set9xYwBasD3sFuIxgtVi1zMqFHe7Dj8pu8HkWm/9siZ0KkLOJQNvPPtRfcif7R6
-btDJgnEEGr+GZWxoo664fYUNT4bF/Ds7hqVPxVfUFJloeuficQXbwb8oAdjuGr6D
-0njXUJuE33N2C7a2kpySs6s2JosgxCIpUvPNEciWD5dJOESE4v6KlM9f15lwck+3
-e4Vjp1HXKOIdw5owdtnUtqXEefQE/8NwXW1e3HckiNLSZRnv6Es7ZbP3HjmlYW34
-GgHpbwxbe2A7z4ZrFjg/O6UQxNuz2vJUE+54tPr/VVkTxhrDo+ST/CH5eWhY3tq1
-okatu8jbAys5XeQR+IHiYR/JPVupuynNm8fHsaWvFOcNMfckRsU50r2CysFTsJoY
-Y+vNP01PU/RduPeH4iEO35s/Du/iNrTNyZQr+hc353txR2HTa9WjwnQt0xSvh/EU
-LsH6TbDVsu9eJu4Eg4Z4IW9KOtUYiwn2aWlq3aUA3XBh2TSvjp8UbDVPdVn0AVdf
-G0p+HBV9+fiAMEOv0YCksuj2eYtAVrFcJQ/scc6NVoRPz/+r+v5jKUDp1IpG0wLe
-C/kzJ4o/S8TY5wdtZ5fUACwRs6zCE0yT9Wyc1txp9QIDAQABoxMwETAPBgNVHREE
-CDAGhwQKBaxNMA0GCSqGSIb3DQEBCwUAA4ICAQB5t5kEGSpbEwrodv25k2J14Zv/
-ypRgPbo3QHPgpIJnDLhioxh7ju2yPECw7x9V8QnwxLYvTJTrQ5MZDzM2z8T56bJs
-jXxFaOmgE5wSOcugszqsBQ2vGgrZujR+tob2xVAVjBTHh66JBQL9pbPPDi7AAGok
-Zh+LZFcjyEUs7IzkSL7UtsvV49ify76ziXuhwQdfAD/MCsnrkdrRInHmXs+umH7h
-Wvh91iFKqwEhLx5l4Ojb/LREuBS7W1iXsUWdj4aQUxBxjSS7amX8UoLJTXgVYEN/
-Lf8tJfHL3UqKx8WjlFEaqef7+JMW9Jn3ZB0zWaKeawatOrlGQ0E9qTTTmDVyygkT
-l1q1pkPX8UAq+pq4SPOpUEn+QOfDWTFtun1rsrdLTKyO6j4Nfi2QDqwhwvUK9PGh
-SJHqFCLhFTihDTfSQ39n45frOBLhbx882ex6N1biLFPzPsIFBjKwrItJsSSBzo+B
-gVMfbtwxde1hk/KBhyHN9Fll9rzqhA9Xt1/4gAookeeLsWT4yX7RRdp2YrINdgw5
-a4bjVo9FbRS8DGYgjDRAqq3Khp1J6EzCIWxcLNWZNfxBdI9thxQNNUQR9g8n6yM0
-9oHcAib47ybEgRQ4owXCoBOujklQJmJyrVEk+yOFQxUqWu6zMrrU29j6YhqT//x+
-IZu+bd0qm9vdws6oGw==
+DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDB
+/ur60jGIgANqpSLGpkOYE57GiWQ+P+nPvhvKSdnHnJa2DGDNo6B62uzxDNmOhk1z
+PF/fl8qPyt55H4zKVI12Jh6UGIOBUkCivqY/G6hGHmRnycJVne/zhgB9ELwPJgV0
+H7V5CjbXeGNk8Cy5VN5QyNFrhgUexUyASNXAUgC15Py1DKej03G8Osc/+X35iLuo
+L42Nz3kgcDOVD/jcvdXcfk4UVs3J/cRk0vnnTsxYhmvSOFR1Rvxwmze/zJ5eUtdf
+171y57sBuyx5NETJO3lRqse1tVUdBbHoSG94K7Ssjg25LbvxIjayv/BpWeN4gvEw
+tIUMTidTdJso4KlNmGhiE0f1Lc2rKq5WulcFT7vA58vHzPrY2RanjtfMSMZIrAb6
+ZnXzdhLbojHGfQOAHxkttzJfgqF4czjGUbdG5n1mMUDSs0C8HAHAAWpEwiW2Ae8g
+CmEGym+iYnXXMu8EuBBEPseKAoRIsXsQ6+9b+5aWfNbQz1uBd78deuCbz5LhsAsJ
+hfK0iDD+JkZL/0xxqJR9OBMtjKrTCPDqnAAa4koXgeJXpSB7Ol8kzW+EXh/tsS4w
+5PmDwt95CqRYPLgKn0ReBMchRRQkEFEKvJUSftC9Jc0txCihCsB5+IdZ5LkbjQqO
+vHGDsEz4SqXVo3Kg0zhXpQqmLz9HTOFe0EyuWz1DXQIDAQABo28wbTArBgNVHREE
+JDAigiBpbnRlZ3JhdGlvbi10ZXN0cy5jbGlja2hvdXNlLmNvbTAdBgNVHQ4EFgQU
+kcTqp4uYx046EVRqWpEQWwJMVhcwHwYDVR0jBBgwFoAUgN2F9Vh2uRvuRYrWTCwY
+86RCkrEwDQYJKoZIhvcNAQELBQADggIBAN6REE4Qk4qdi8AqYNIgcmRTI+PN/wC1
+ThJmDT72KO7+KBPAOTF1l64poK1BoBzFJGW5F3FMF13UEz1yzOiSzR63W1MIQQw+
+vaqLiIt8COG8V/EjceSR9jVU3xPVinI8eWLWGzNbNra/+CVICDFFypHSkomDEg/i
+JNS2mbhPaiXOsuBQZ5I4CVuICKqy8EUX0WgG56zNODGlyo4dmL2SYxjhdAZKYxPR
+gYlBRj5hbfgnz4HgVd+WMJMwwGoOTjZXBlc8X+w057vhYnMLYv8LZVVp3MJicJ4K
+8IXw6kFCz27JZqTnNJUIG2ZiQyL7lxEyP9mXC1nXF7g06J4+Uzdw02+cqDCy4COK
+7vTtS6kBpE7OnUEwEy9izXl8gVfYwieUy2cHVDZQxM2MgEerbW5qzdSIJmXIUj/A
+IjDSJWsik7LAoBWtaqOntTSztuKTGh3cbSckNv8S1lITQ3sH6kGws4pMEy6c+YDK
+Njg/w3esZwd+5xdybYbixxRMWHqLqvBygB+ze63jCtHaF2MDrTovh7q9+0Bute+i
+1vbxNIM9L/uilXKlCMI33duP7m/XtqW+OIOxPAU2fZJ/A/C5rpGScXKe7Jx4FVUS
+cwViH49/oeIFseZvO/ujiGdQJGPyjfz7NehJ/hOR6TyxHMl45rjD/8zr2gbdEfE3
+Lk7Br4HITZTr
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf b/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf
index 83d9b03ccb7..49859873222 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-ext.cnf
@@ -1 +1 @@
-subjectAltName=IP:10.5.172.77
+subjectAltName=DNS:integration-tests.clickhouse.com
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem
index c3edbb3b244..99b9f1805f6 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCvbbMHZ/fsnqcl
-KmRK7Br6b+qGlXfzF3m8nmbkj0sffXz1lHD9lVyDb2MghOMDstoDset9xYwBasD3
-sFuIxgtVi1zMqFHe7Dj8pu8HkWm/9siZ0KkLOJQNvPPtRfcif7R6btDJgnEEGr+G
-ZWxoo664fYUNT4bF/Ds7hqVPxVfUFJloeuficQXbwb8oAdjuGr6D0njXUJuE33N2
-C7a2kpySs6s2JosgxCIpUvPNEciWD5dJOESE4v6KlM9f15lwck+3e4Vjp1HXKOId
-w5owdtnUtqXEefQE/8NwXW1e3HckiNLSZRnv6Es7ZbP3HjmlYW34GgHpbwxbe2A7
-z4ZrFjg/O6UQxNuz2vJUE+54tPr/VVkTxhrDo+ST/CH5eWhY3tq1okatu8jbAys5
-XeQR+IHiYR/JPVupuynNm8fHsaWvFOcNMfckRsU50r2CysFTsJoYY+vNP01PU/Rd
-uPeH4iEO35s/Du/iNrTNyZQr+hc353txR2HTa9WjwnQt0xSvh/EULsH6TbDVsu9e
-Ju4Eg4Z4IW9KOtUYiwn2aWlq3aUA3XBh2TSvjp8UbDVPdVn0AVdfG0p+HBV9+fiA
-MEOv0YCksuj2eYtAVrFcJQ/scc6NVoRPz/+r+v5jKUDp1IpG0wLeC/kzJ4o/S8TY
-5wdtZ5fUACwRs6zCE0yT9Wyc1txp9QIDAQABAoICAEp4ijCRrUiwjQoU9eBsXIOF
-8QxS9Umn5JDyuYE7Z0ul7N8ftdughVZyeaU7ZFeUnEJHTE3nB6kuVV6Qajskv3kA
-IVPr/F1i8Eoo333Z+Ad6zuulDa3qxccTOIW4VtI5Xjc/RbjVe/6fEEEQWzYMjkZZ
-Wpss8Gypx8dcQF8dykwItpsI2dlh23fPxsNIDXv+tHOnbI8S9AIzDYPGMzlMAdWx
-GfRx5kvxlwLt6PtcGkfBtJprnYLADghsZaAtGUEH9dlRQW3tgKuS+nJiL9l1CsHn
-C3Xdw34/yQqxTpWfh6BlyQFx09HpTc6YPQ6hsR0IwDM7byZWcut+83pQfaKGGzfg
-tXQvMOA8LFYKR9nBMJTvUmpwWIWfXlS2NU8AvJapdgbFvLksjPxuKKXB5zZgnaHY
-QH5DqXT+QhHDWLKuo925lh7j8Z3OAZsUvKfhFstYhXRENm8/pkKpkDEDD2Pkjxll
-QnQfCg+qCySgfjf5962DdqkepJUWuTCnmIJrn8H4eheMfEs8QRZAuYt6F7cNqdD/
-VREGeQ45/5pfPZslK7yVn2SRcVFL/CHg8BR1YalusHtOQsXJRU3Wczd3c4/H6xJw
-7xpRuKsit/W/iFjgmg8ai6Q2xJu9wcOMb12jSPIzOywadUvMuxr80z71g3ZzJUIq
-VoTWR4brjgfgVwaXoJphAoIBAQDYh4MlD4y1yKCdCXbonANiM4C8as4Tiy4yHryO
-Wwrm8zlBnNYlA7Dvz92JHYPYAef+uz9761B7H1UE0fQhj3qzdUdT/79ay8ITSKFf
-5yZR3OBcv+GUCKCkMX+M9fhC5L3YTZNMvSjhfcf7Z6Wf7qjEQ+qgVu+vhm+++ReP
-6Fa4GB1xjMpbzAj1eh5Pt504NKPYjwojHbkhzrGc3hx3auYksh2JA7wOaQsuLw0R
-BJP5EaDn+ByoM77agxGcynWZNDzayy0qHkblAa4PilIbYTt/2/uBhGzCwitVAViB
-LO2JMMmNSdi9/+6tAhLViY/aNLU5MuGy4g12KhovDttt4fEtAoIBAQDPaDBlYne5
-TgJHxhRwyJmVrpunHolAeqIjUvDkuZfbgGNXjJmamLrHqcIAZqvLdTeRQPgG83Bg
-aW6l5kjVzYa/++LCfqSSwqln/OAvzII7+h4XbwYyWn8m/R5Qg8GNAdS/T5J6HqOw
-hmZAZVTo6qCcOgOnkdzCBWScEh+LsKcGJ7+WjY25MKUCSdfbFav42vlnI8TeMiKW
-Yr/v9i4j6VpIl+TiVViiPCWz0yPuG/L63cqnGL2r6PgJnQloGLfRhrahAv0eClVr
-qIRNzGpOJ8H28tZqIlXqtzIc7uVXGFv7mlem8qbjH3xpXtrIlTXfpyU43ZJX5D9f
-2hdeYQEbeIjpAoIBAQC2cjCBqMGCZoNW7qOfyd1cAFOH72Kmuw54ssdkF7hu8yAa
-dgFGfP64gmiDYTg3aRvG2pXaX2OX6sWjYxkWsiPMVJR+Za8h3TAxOXCoM0dpkPgH
-jrKPHlnlH8P+zT6bdsu0F2F3NqfcoDRCVIoM4XaYsTVgVwBs4JUF0DMXUcjII6Gj
-jOLxSFGALZ6ewvMZadlo3tXG0wOsRdIIgGpyAMPcxav3SAtMBRyjlIepADeClWUE
-MF5NKBS3X9sWRs2iAo8IOExdAdfwnGLCu2UFpv8QdBZOgnt1+0+xt4mQhn+7qj0Z
-7NBQ//ZnFqkx/lAUp3bPtFzScoCvQTiA0D76LngdAoIBAB/BQfej1dTHPs4iY6rI
-68rhCu/RWw5GOGDUKBG84KU4yPz0h+gFjkNXmF5bWd4yuilBGzhlOUVpnwlDcs9Z
-QlJOjG9e2G+n4iwLqX9n/mCUcNsBop8+/8zGYEfPhGjEaQBJfJG58zHpweoGGbP3
-iFOjBkA3sub50Gec1ruadlgY6dpxHcvGyNzK1YOzk7rsO9cwwMmMP4Nq5xwkQvg4
-mBwZNW/5xTJBpzwbDZs9KDyEjKx8uz2A08kVBAWuEya/S2LnhD1/M4jiKi+HJpeE
-usvGblGdpC3lkoSfhvmIvzyMavMin66SeYfgf/rJ7Y+qlaZZNjjCt3lDeOR4UaUV
-FVECggEAfstkAVKF0grLfJ0NNdQBg9AYtudiRVVdCQe9UMoJCtTLemaOZt2beDk5
-yZ1JvlbuqSTBEqPNECqZMOTxaPUtY6dfkRDI8zTY+MsT2OE9Q75+HYB+Jr/GMAKn
-258pjju4emDSaGjmOHFefuti7ODeELQtmoaNL7qOZuTAsoVxa5P+xvsFSq4Nkv1+
-TiYLuzZdZHcIf+qZIRm5/P2mvuSmL/SZkh/2kdhPQqib8q2cpzBULj0cNpt13P0c
-hB5sujZTY6PjFtZUlMIcTJ6xtzjiVM7Gf4jOf+kxvszcQpkOTg2UXdCac8+uquwU
-mBf26auAKORLhL9eFF9XY8tojdEmdA==
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDB/ur60jGIgANq
+pSLGpkOYE57GiWQ+P+nPvhvKSdnHnJa2DGDNo6B62uzxDNmOhk1zPF/fl8qPyt55
+H4zKVI12Jh6UGIOBUkCivqY/G6hGHmRnycJVne/zhgB9ELwPJgV0H7V5CjbXeGNk
+8Cy5VN5QyNFrhgUexUyASNXAUgC15Py1DKej03G8Osc/+X35iLuoL42Nz3kgcDOV
+D/jcvdXcfk4UVs3J/cRk0vnnTsxYhmvSOFR1Rvxwmze/zJ5eUtdf171y57sBuyx5
+NETJO3lRqse1tVUdBbHoSG94K7Ssjg25LbvxIjayv/BpWeN4gvEwtIUMTidTdJso
+4KlNmGhiE0f1Lc2rKq5WulcFT7vA58vHzPrY2RanjtfMSMZIrAb6ZnXzdhLbojHG
+fQOAHxkttzJfgqF4czjGUbdG5n1mMUDSs0C8HAHAAWpEwiW2Ae8gCmEGym+iYnXX
+Mu8EuBBEPseKAoRIsXsQ6+9b+5aWfNbQz1uBd78deuCbz5LhsAsJhfK0iDD+JkZL
+/0xxqJR9OBMtjKrTCPDqnAAa4koXgeJXpSB7Ol8kzW+EXh/tsS4w5PmDwt95CqRY
+PLgKn0ReBMchRRQkEFEKvJUSftC9Jc0txCihCsB5+IdZ5LkbjQqOvHGDsEz4SqXV
+o3Kg0zhXpQqmLz9HTOFe0EyuWz1DXQIDAQABAoICAAcpdZxf8TM0Yqvnv9Jspfcx
+1j1HKjvAGU4xmw4LTu53IftDlrlQzqZqea/mhQulequD8ZgsHu7TEwaOuyBnIbfY
+bW2TQBugoUFA35tZ1osMKTHJuZJ2m7q2WkNDwGWgxjfEyerXjTHEQIsj8MrAztpV
+p6GcF4lMyGe+CKIqhNsyQoAeoPvD3SGRW/TJLbTuLttlMgknvTWM3uKkbdAcdA5J
+XXGTyNIpu7vrLA21k4a7I7Tlnnyb68rueA7tK3WZAlmH+fcJhhZoxhoNa3Kwbuis
+cOYM9UD2ilxkfDUIDAoIzonlHdinpjRQMLx69JJo5yWgrH7JTdtfZTELpkR2mXfg
+/qxons5qMhvK4fsxMGWVw0PHMtlY2V9y/+3lJVXIAaErqzxnrg7exVHhD4t1N2A9
+Zeg/W/cFnGOVjTTspKivhCo4mZAymqnOYAL/6njhPSHHaxEbnfNEOrNd8LsxsqRg
+zkYy671G9Y5sO26zPwK9zeSxP22Jq/EQgHdQ5GXiEmlWRFuE/NnKNuzb5EsuWBwr
+rhiJukInFRrBVstlYcVb+WwbH38x9+P8EeLRTSxvT98mNiq2jBQ/nZ/esUFk21tV
+Hi13vUwYBN8RhrJwrcFWpHAeu/4Ev5E2TMAltvaHIYjJ4WI2CSFSCKBVXs3w5vGv
+Grf+5byro7EPn3S3cU2DAoIBAQDXrXL1vZ7eGoXP+j7DQiuhVTUSfDXq1QRe7tiq
+woHkgYqxBpXfnJsas7lCJvZdDS6Dz9EOwhPp392isfiyTXPlaX1hhqLYfaJ6ygX6
+eE6zQyatWJjMNNCljT3TU0og4WbJOGTgJWvy/ma9h/P7bZpttAa3b0dBGBPg/oxR
+ekt8K7xbUA0Q+gWoRyDSCEyfsDNpO+3ENJHpLcgfr+oHMWtShVCs/txM/C24zVGb
+fqXdRuGIv2UrTBRpB4hP1+Ye0PI77xn1Els+1VlVV4nmmlvTtJfumT9XmoscUbB0
+ZEj9Xwlol0x9GwYAOg59ZPhrsDhSnCQfcLlBv43gEfNHeL0nAoIBAQDmQ8HUr+su
+a4E+ZafLNYUs+sZQMrcQ4onOlJTpe9J84kNlnRD+DQWPWtrg4XTH1LelbepRW2k8
+pYuh+cZqnb1Etwl7A7V4VBak9Xxrk0pz3JcrUejr3biyERzt9hLk3NtLskXBTJbx
+gOjXZJwJ7MggofhDZY7Lrw3JVZFwQ/3KdRSzGxXJLQxggboJHfDN7SyuK9GakDCV
+BabNnuLpC5R1Uy2+I2LHmrr8hfWwl0G+0Mb3XAniWbJuhW4t0+mpRA1oSz5JvH+e
+inGczbL7wZFDGFiNwhbeagYm3EK0MeFqyikSqDZPJRsq8vXc34vDA5cJmAbWVDwb
+6sZ7rmURHtXbAoIBAFXGVYIF97i9M5qTG4LsPg3bpU/Etmy+aw6WTvUahi4qls3w
+oIpd7hGgiH0WocRACc/CRpJn/SN2NN8PiKjgxMboPUUcFoei74uF7Pq//gytGCS4
+p4wPNSuiEISLC2AoRIiiNPwv5c6t/o5CE3ZbEJ+wiTtKtjvdJ4rDsWp2CK9JdY+b
+NpcZ2EYkg5kEU/TuToP7oYP2pFDoND7l510U+mnHO16RvWugn05v2ZTNuYlXNzr7
+Y3DkwPlEVaHra0m2L6BGZzxgIInMr8qRFfbwTLTVjdcGe3qLq+eHVXX0rFKYCVXf
+VjwrEyfj7v9PuLybSMsR7gvS+Np9JB+JBAfYrOECggEAPoJAWTuUbZqTkFvKTDjw
+OUCum1DZL4VAAcuGDUgm4O4Pe8NCvKTOUJdKeefaavENFaScCo/1JpiOKl+DBKhj
+nAbQVQuxtMOnDgryRsXKXV+RzhnDUFx1aimJH/RANs7Z3Ve85fejtlXXX7mZPnx/
+65PssGced57C8FgBTme2usJD50dAB8fp5zzwQs9U8qIjEfklQn9IIPxSxtkOIlOZ
+bqww67/xbdxMTIcVJmY5W9KTYM0khcTx0lz4hwpTETc/KIPcmenI/0H4C6gvoXZv
+t7YhPAJncON5Xg1HMmGkHvhYZA80BxI8qNEh+17YMw2DcABMQtzFIJMAZMz39MjZ
+JwKCAQEAqKsCe5N2Fgi5IEbjMFUpRDOMRvVILupWwur0INvgKKpaGOvuMlC6DcdZ
+M0gToD1ImliUcp0h/z9KRX658P1faEwzEMlHrP18VOz4GNccMkfRkd2LeuAjGHPg
+q0Knrty/uEwE8P1VcsG24dz9XhoOjiniFScTovWE0CKahZCWJMJyBbN81uyFDR8f
+021NWlWXNxQyWTWqxSuxJb76BSGOcriPvTs2jysxk9BBhPDS6LsQpy7HMr2/Hlfj
+GiykSjqz6vcdvaJVumSizhTO8uciypGNh/p6XAB+nByHJikSSRgfDi+poxFU2mOn
+D2Oh5R687eaQzdCtM9lxkUiKuREc+Q==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem b/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem
index 1d2c2053431..08b34a22c97 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/server-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEmzCCAoMCAQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGc2Vy
-dmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAr22zB2f37J6nJSpk
-Suwa+m/qhpV38xd5vJ5m5I9LH3189ZRw/ZVcg29jIITjA7LaA7HrfcWMAWrA97Bb
-iMYLVYtczKhR3uw4/KbvB5Fpv/bImdCpCziUDbzz7UX3In+0em7QyYJxBBq/hmVs
-aKOuuH2FDU+Gxfw7O4alT8VX1BSZaHrn4nEF28G/KAHY7hq+g9J411CbhN9zdgu2
-tpKckrOrNiaLIMQiKVLzzRHIlg+XSThEhOL+ipTPX9eZcHJPt3uFY6dR1yjiHcOa
-MHbZ1LalxHn0BP/DcF1tXtx3JIjS0mUZ7+hLO2Wz9x45pWFt+BoB6W8MW3tgO8+G
-axY4PzulEMTbs9ryVBPueLT6/1VZE8Yaw6Pkk/wh+XloWN7ataJGrbvI2wMrOV3k
-EfiB4mEfyT1bqbspzZvHx7GlrxTnDTH3JEbFOdK9gsrBU7CaGGPrzT9NT1P0Xbj3
-h+IhDt+bPw7v4ja0zcmUK/oXN+d7cUdh02vVo8J0LdMUr4fxFC7B+k2w1bLvXibu
-BIOGeCFvSjrVGIsJ9mlpat2lAN1wYdk0r46fFGw1T3VZ9AFXXxtKfhwVffn4gDBD
-r9GApLLo9nmLQFaxXCUP7HHOjVaET8//q/r+YylA6dSKRtMC3gv5MyeKP0vE2OcH
-bWeX1AAsEbOswhNMk/VsnNbcafUCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQAX
-jRopZcCxRE3Ir/9NeoH7zl0ySWMP2m27tiO9ts/iiRqqz8RRyoyXwBxjvdWP+T8i
-QO4z0YiuIBQxybBh5S8cyFsI5webf8srRfWBfrUa9Sa28XXdfVtWEkYxNy9Qg3+C
-9YQh2GhIMAnnm9lqd0AjtIsMIrswDwy3t8goqXh68Vz9/lzuJXfqP4xQEsbPWy1e
-7hTJI7E/BLGpSmCe20HHzmnQd3TtSWVpR/JZCorAd13ePt07rSifrrYNpPCkvEyK
-h9xVWF00rp+ftwDaHPaDVuYfMVN3N0HEM+I8377P8IW8FsQGkDZe8IYCdkRZGotY
-tFue8/71IekfNokrfXLJw4fCF1gGjx4WWRZvzbFvSiWQZAxwX6Jt2iA/qn05Hv6f
-KO3Up9MXF6JqLG3HFRAeMNBhwMpBLYAgGN4uK5S4PBMtbujbgm0ELhDcJv0SrZ4r
-am2pzL2h4aoZF8pCPyLubwicFu2SfoWhX6XPRRStuz1g57KX7f41T0xGz5U0PJ/n
-Ln7tcUBxEZfhkkWHbdVBgI5CrYQtAGSUU5hE6bNEXeH5VN3TodXXFcoYvgQ2LSb5
-f8QKG97x60Aqbq8VdPExPqczjalli9JSaIXfP9pL2F/1PJ6pbZPbeCLMYPvZUxSJ
-YnJlvQ2V4uAQJEdEXzMns0drU5+tJTe4hB66uBE2vQ==
+dmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwf7q+tIxiIADaqUi
+xqZDmBOexolkPj/pz74byknZx5yWtgxgzaOgetrs8QzZjoZNczxf35fKj8reeR+M
+ylSNdiYelBiDgVJAor6mPxuoRh5kZ8nCVZ3v84YAfRC8DyYFdB+1eQo213hjZPAs
+uVTeUMjRa4YFHsVMgEjVwFIAteT8tQyno9NxvDrHP/l9+Yi7qC+Njc95IHAzlQ/4
+3L3V3H5OFFbNyf3EZNL5507MWIZr0jhUdUb8cJs3v8yeXlLXX9e9cue7AbsseTRE
+yTt5UarHtbVVHQWx6EhveCu0rI4NuS278SI2sr/waVnjeILxMLSFDE4nU3SbKOCp
+TZhoYhNH9S3NqyquVrpXBU+7wOfLx8z62NkWp47XzEjGSKwG+mZ183YS26Ixxn0D
+gB8ZLbcyX4KheHM4xlG3RuZ9ZjFA0rNAvBwBwAFqRMIltgHvIAphBspvomJ11zLv
+BLgQRD7HigKESLF7EOvvW/uWlnzW0M9bgXe/HXrgm8+S4bALCYXytIgw/iZGS/9M
+caiUfTgTLYyq0wjw6pwAGuJKF4HiV6UgezpfJM1vhF4f7bEuMOT5g8LfeQqkWDy4
+Cp9EXgTHIUUUJBBRCryVEn7QvSXNLcQooQrAefiHWeS5G40Kjrxxg7BM+Eql1aNy
+oNM4V6UKpi8/R0zhXtBMrls9Q10CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQBf
+noaya7jlIg+klZHUrZC/eURotZlAWfnNPf8uKvh6MrJIe659Av9oN8ORfSAR4X8G
+mqtCy4fTkhqdmuRRE/yzIJ0YmOyUUe87G35Ei/mD8hlZZj+n1v8o+cJfmhWGpEX+
+CmO76Z0DaxRsUa2nDHvZkFCbQiaapzO/l/zKVADHIjuxqQLt1tPDyIf768CX0VZW
+ZGElYO/vjPvt5fvd44mT2i8VNsqmyC5Csv947rVtkeh+DE652iUeuhD80rCdoL+R
+cqdbd/4fQE4wea3o+BS460QMQWii8XrC4/Xv4aWACLm8aNFK/8LFlzPoetbZ/WZ+
+duRg26caxPQT0V9PCq9pCwPv/vA9+rzQrf5sHdJvPUEdFD/UoMiedTrDBWFAeRYs
+sxzKOm1VSw8wDfx+2FIzpVBauXEFKa9uEp0cUkpFULQj5V0ZuQ+TNCGpeABfDgiz
+77uufuHSv2ucGl5Qh9/tcNqDtJFD2NzUo/Iv0/a2Q1bt7SpaHkTKfe30KJZjn3gL
+1t/dlYLK/HcyQiV+WRGUjqXb7Lr5XOjBlW3zEewjZ+Ti081kGArzkQ8XU2HbotPW
+lHk+B8DDLZjzclGp/NM4MySBid2LirpZ6MmKLagPm032kByjrP6bb5KkMBMTw/Lp
+SN3mSo1DKcqv3KDGGxjl7jssFy3h8j6uxZG2iOAHVg==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem
index 0b2117674d5..297b9d8382e 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIUGi5763gLrWzkBKSEOkeo1gyKdlUwDQYJKoZIhvcNAQEL
+MIIFjTCCA3WgAwIBAgIUJB3UA/J9kPvfzCI4o95767VhQMYwDQYJKoZIhvcNAQEL
 BQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xpZW50MB4XDTIw
-MTEwMjIyMzE0NloXDTMwMTAzMTIyMzE0NlowVjELMAkGA1UEBhMCUlUxEzARBgNV
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xpZW50MB4XDTIy
+MDgwODE0MzMzMVoXDTMyMDgwNTE0MzMzMVowVjELMAkGA1UEBhMCUlUxEzARBgNV
 BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
 ZDEPMA0GA1UEAwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAyJGQ+Vg/8ryZ4dgv5cIRRxQeNVNi7amKf+GGZr8ARVLlh+zcz7sWa/stRpQI
-Q57F8DHuOvy+Q3FsCtwVcXBI8uNkgmTxwHlq8rqaG5usPb97VejiPrShK4U4h3XM
-uZIkLC5pGpo+nHi6BtX8oBXP1BT5++cow/2kQGn0/f+fOjrjpD8jmapnyaUoEloA
-laS8Rw9Qw/CGXzSRuUb+w0glDZ3w0ys7XevjWS/2lXHbDy0OnLwlhvQIJb6v/DJW
-JGWTZD1cZ+JHwaLS5OE9vLlCmIAPdmqo1m2IHDsFgHsZGYcRZ9c6t1Jh0FQewol1
-KFtgbPHDMSYZd2EwrdYbYConrqFleT8AxwOyQNQeZ0tkOCML2cKNtTKLcLPA2E9h
-jZqJ8U1ydr1zSwSi/u6bbIhJM9LnBEAxVwzRAut2lpXdtoPQLfNd7NRfFGafOAvN
-cYbhf8Drw4pBTtqmlkHguHlDHdwYWOhi/HkuvyZso3T/aQKAd/clAwH0bKfhWuTY
-ugyf2yr81WornoPwSDdLis04174g9qc7mGKVjL4JKNl1kyUmGwqEGV7m37hwqy5t
-bSH9SPYMLq+qesB+3Nig2O5WJC2uw9ebMTAdzhC6AKxt6WsF2eTlh8UQdCh4PT8d
-cyaLBQ0y/OGdg7HU1afeHTXN0FiTvvBT/Bh1Xjbz8dfq4h8CAwEAAaNTMFEwHQYD
-VR0OBBYEFKe9PZgSPYKS4G4wlDh47FW5hGaKMB8GA1UdIwQYMBaAFKe9PZgSPYKS
-4G4wlDh47FW5hGaKMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
-AJsaPvL7Tb0JJhBv8I+DLXAPmX7ITnpOmK5xoSJxdJVrPEqqnA/K/nJqB0qb5+vt
-oYyq91IIIMClySOmA42oNHT7UmsuFRCXMg1wW3x+DwLAHMBL0L3us+0FkCLXUTey
-0QMcg3mvWTeQR5ShA8qZTXiv2z7NZudtOA6UznMjXsiHmRAJa0B+L0/JStaRmRZy
-m5u59sRyoJ9C8rIFTa5gfBFahjMkm0r1QkafIkpimMLhzsofYNvJ7ZmxBoXSqs6S
-Z0Orl0lpNa1sUedm7axoQ10ZXv43kHfLbEB2AIIr8AN+oFAe8Lh1+KALphGPXsFS
-zjSQ6kbeSHhoaZCN87Jb0RHC5EQCN5POWSM/cq5WnUMtAtq6JttawaSxw2yP0/ps
-Gl8ZUqFGAmo864BLAEbD/wXOGSpUSudN3ITdrlWAM63bmjFfEZH2rD6kmbmliZWN
-JcQwwT6sinof1sDBW3qCie/vPh1HNKZG/oA85zndrOCIrMb5yHC3uhYpMeEV4zSi
-m8beFGJPKoNl8Fn7Y9GA+7BuhLSaW2FZMN4bn1aub4kifohjjdjXoRwnQ79CGdkl
-g7U9hmqzxcjG1ObQsCBrTmO5ju39rDTm8DJohhoAu4c+fUOwXPUE8vTXhklxphfF
-lNzuwdJ8yqLxzD7ouuIL2580LJjRTEwbg0S7zxNjQAAx
+AgEAoV8aye0BoxzfceFGzWGVKyKqVgDiexc00MvBRm+c7lA/LH3J6LjNimsRXrNg
+AKJPzFEeuGnwPiKOh3OVzYq86OIEHLhxpWQH+ZW5POlm3+JMXlR9VLSQmCdECw2d
+rOTKvDWjNP6KrAcnKA2xLwbGA+GzG1u0QDKRoyc1k+Z4aKfsfK1VJYToZh0G6Mrd
+6+/EOJBzP/PSeHJwI3fiiNfeHJiumGBoCDmXooxL5RUc6jEx294TGbhhoL99GHAS
+Lq7TxUY82AkU7wrSwPYRyKGAyOkW5dMB/iVJ09Wa9y6e00iCVLaNwmC344TWkvUi
+/ClA6x+7W8D88bC41b3VVzLpyGZk6Nux+2vcpkbDCvzNp81DWAUejWMyE44GkPUu
+ucX2xtKnwIVB6vKaPFrJx/9gYXmKcvUMn/HQvHweP6yrF1LD8mJ1PQfqxrYj6td2
+7qcKs91/uHv5+4ce33uyoJtSOHQ/SDT+1+uE0F6bnV36XlT5FLZ5Fu7sfVZ0e9ZG
+iVAKCplRCkhahyJWryMNGPdYY+HG/rZqRBDYsgKPg8vzA4IjO/238YWWneWnnMu/
+vEJXJoYfmaxE5p5bcQtJ7Uvv0MktoLUIsNyRvmBQHmgovzBdZXI2ol6B7vb0qCBP
+76lt3jFPPD/LcB+qCpVvycA7fqqJYv5OFipfpyXl2UYU0+MCAwEAAaNTMFEwHQYD
+VR0OBBYEFBU4+VDY7JE5EyHgWdo+Pfu1Hy2jMB8GA1UdIwQYMBaAFBU4+VDY7JE5
+EyHgWdo+Pfu1Hy2jMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AJnQ+YFBEOq9w9ztP+DFkzySvLFaVIsk7IyTtiovTmnGGIARfmn5LMuWpmyI5Ndi
+iWsTX3YFZjMKIfiwfmA5Wa3botAxPNgNO5JCgH69+jkMlYIr+VQSy2MmagsZulpj
+iHowKtg9duelCKJ87tBDt8vPX0N9m4GkS3FSOI47vGp1fLW3kaDOv6q3p/cLwvXZ
+uI2xQKd2c2xycYY6vUyTCUyQkQr3fwIEqPq1Faz9ofyDfibZ1agmJEnuCIuB6ZYb
+mU1amYNeC5ykQ6S3vT65bvUGCPHE/aT9QlJ8HEyf+E4CUTZMOHVj4qYp30fZ7ssY
+i4ZArzVncIntvr27KBvq+oRjAMZfEyHWnhjcxqBv/MOzexd3/5h1CvVUolnCPZ+U
+AVFhk9GCs2er9UxmNfcNh7KwDFV7KsmhHmrRt8TTwi/XxN2pHbJ3zBwnsLPh9OeY
+EgmxW/jCNl7EOhyYbT6KNHxHBWUFLsHBFW3PASvwF/UGKq4BYsvTLNTcYtzGw+NC
+upmezU0Fs+0mGAYX3fgSvODnl9Ft9E9ZOKjN/EedmMVADPqoH5xmiMV0KXETTbVW
+0B2HCkQxV7knAiKwOGSLOy/rL5jdrd7QSdGi4nkb1MoljXRbd7nemXxXlIVJ+4vv
+RI8IpcCcqa+Csd04+/ZU53RJPWuRI2qNN/eFxpBdtP3O
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem
index 389f213b5d0..a0e8c04ec45 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem
+++ b/tests/integration/test_grpc_protocol_ssl/configs/wrong-client-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDIkZD5WD/yvJnh
-2C/lwhFHFB41U2LtqYp/4YZmvwBFUuWH7NzPuxZr+y1GlAhDnsXwMe46/L5DcWwK
-3BVxcEjy42SCZPHAeWryupobm6w9v3tV6OI+tKErhTiHdcy5kiQsLmkamj6ceLoG
-1fygFc/UFPn75yjD/aRAafT9/586OuOkPyOZqmfJpSgSWgCVpLxHD1DD8IZfNJG5
-Rv7DSCUNnfDTKztd6+NZL/aVcdsPLQ6cvCWG9Aglvq/8MlYkZZNkPVxn4kfBotLk
-4T28uUKYgA92aqjWbYgcOwWAexkZhxFn1zq3UmHQVB7CiXUoW2Bs8cMxJhl3YTCt
-1htgKieuoWV5PwDHA7JA1B5nS2Q4IwvZwo21Motws8DYT2GNmonxTXJ2vXNLBKL+
-7ptsiEkz0ucEQDFXDNEC63aWld22g9At813s1F8UZp84C81xhuF/wOvDikFO2qaW
-QeC4eUMd3BhY6GL8eS6/JmyjdP9pAoB39yUDAfRsp+Fa5Ni6DJ/bKvzVaiueg/BI
-N0uKzTjXviD2pzuYYpWMvgko2XWTJSYbCoQZXubfuHCrLm1tIf1I9gwur6p6wH7c
-2KDY7lYkLa7D15sxMB3OELoArG3pawXZ5OWHxRB0KHg9Px1zJosFDTL84Z2DsdTV
-p94dNc3QWJO+8FP8GHVeNvPx1+riHwIDAQABAoICADEjOJld/YzCmBC0nkdz3DfF
-vgDihQIk30GlRwA1GyPgw0shxJdABqY9y0HXUo7+fw/xq6PX9+UeDJI8iSRZlgWr
-oBwyDuhQ1trQzKCm6vPVzammfIdQSYwX/1lwis+L9kC8vhM+Zsh+61RxaIrvzRLw
-cK4+W8Zoha0iSFtSHPhvJQZAUcB79yF3zPFyC2KeEWJ3Zhoa+1Cn2GvD8PZ23l0P
-rMiPduPzvqdDEO5cDocRStsrXSZK8xQMO6FV07TnDc0pG1J4JYxTD8fzRuTNnnsu
-JJumVebyvr3r19U6U1Plu2XtXP08uaoIceDHPGS+vkjykhegdezBauOr6NkOetnm
-q7uPeSqCZKlLK7WKPPLLsMaO6ospfcbmChn8OwK7OuFj3PpMz40pyj2rB9iec5HJ
-tWkf9MFKJpmsxudwUzD0YB7u8/75thKObMmCLbBYg0KW0koPxEhl3paGnwz+40mn
-0IsPL07CV9/hvPQcjY269XPkOPPiJHmahuCnLHHXPjeTOv3M5sW2cQBW/riKhXRF
-HOrkkXC4rNKDj6JWtSf05RL+8YbGDvhhyNsi/khtEZBxukQ/OwE2pnhEtcE1WIJS
-eVbxQxArgSeZs+6gwhSwMlVz5IeqKuAncEauVfroEhzkdTX54Kd16p08PcL7s6T8
-p6WptMteyFTXdK2RCScBAoIBAQDppoI696GXJdaKr5BJBW/TAJ1nzy6FQw1X7G5i
-AWo2fGvChQCOyCSwiKIitQo4lf2MVggzHLQuXKfejcz2Oghg2d94tKWRVaTy1KPl
-qldlPbE2C+hAZWdMAA/z5AgG4vNorHtODDOhCdfxJ4Ht06G/RwZUlxyLJUptX7Qt
-el32J/n1juPUKBiVKvSms7WnG0gBhDi789dn8LJGciQ7P17B9N+Z1aV9xAcj3cjx
-HbH4xMr9LajnfpAMqQYvJHywTxFFHl13dGD2RSeEyD/ZtHjwcesmWMjF+NnOMUli
-PCs7iAaZ0PsJ34GL9wFJ4x4YaJT5TEx3dUQvpRxO5jNfUDePAoIBAQDbwPheJAdD
-vpzM/Qz/RO+3btG5f7yRVWRyIrs0mSvWYP7dvGIAFPzaK9iRIys8PsB1pXm7vDjD
-CEG9sHghEHaHtll2qQ5o1vvRK8aMk08YRV4idTUuVXXfaHao+K1rGb9iS0ss/ORe
-m34UB23omGrn2GTaWHQgcxuclmRKvT5PGeQ/Nc2+wgvoiostoGLXUcAJ5AtSBPV/
-Vr1g+osV/ho0z2Z9PLYWG1hggx2+4huqZpQdLcQBEobNOThRQA+IfdTerx4jiB0p
-4YeiFRSNEZ6d7QChTvQUWmdsABATBBVPcaGdUH5ZfGytjOkMjbIMlIsWoJH00Biq
-YXuxDcqgCeRxAoIBAQC1wmgwww6bbD33aRfPFkGlXScV6GACHuU0bqJ37y3W8PdL
-PPfwGtYf1kp6wWcQGe5By3NZf4zTPBUC1kCJkx+NaC+l0LGz23ITzUMqmFagVVuT
-9bNY1QmEX9AJJGzyHn7IANVzI57OOcAYw2kZv7Zl/DR6fYsg24OIjhi2ACk0Imka
-k2u8UOy+rcngHJDFTD25oEgaPlhlbSLiFk0FIgjuzTVckIzKx0HerttwZm9aXIyk
-Y26vlw8sKhi7d6Df7sI6iKKhGJGNQsK5UqYJD5G9SoFpNUwKZcnZ0xGJL9FZ4Dly
-UtXXGl3GqgIAnoN87W5meOpLS5gdkE3zOrTgAqEVAoIBAQDbLwrLIxZX3Iwa7Z8E
-EWcjx5XJdn3HW6u3J6sfWFNgHRi4Y0hAGq7kkO0OPkzGZzShYy4bMS5QYTDpGVWI
-bRo8XIW5E/+6VAuQ4x/DYL54T+AHcG5dy4GpFlGcUYTvGRxJ1x2hPpAtSNwk8BAQ
-+c1PeAeHvMf/AbCdq2dXIJBAZ2vAHFMdnAAyrdUJ6joL1486jkk4Qpf2rbZwPxVx
-FyReXis0aNSZEidBBCYsGOxNNskunVItW6Q2l4bzi3iyxAcJIRNnj0C/YCJfaLU5
-y0Qw8o45Vj2e+1jCYQGnZeA3f/gZp4qOiMsBA1YDXmUjpRlhtUA/NTwU3Ox5eW8L
-1zIRAoIBAHtIeWclcp0q/Owjghk6IWqldfWjHqtWeG9saOf+EjqxnIfLaKxaOtgx
-A7j7nbO7D4coZ/rByLAFubs5hdDkKlZULBMM1mtdprJP0uNdVxFTcGk79a4CvbAs
-kH5Jd8wfR2MnMQp6PAFjyN3VX0zFZx1gYJd4nl7XT3jO1t9oL8xFG8foZ7NMYwek
-MbyysZkSsXlfCHvqTDJKEm4VCttMOYaDd86hJtdqibEfb9lg2jx04Yc7rbRtCHlZ
-jfyA2TczituYZ2ESaSIiAk7QXvMzH6vbCM3yCJwFQ9dMJtz4e07rQOyrzqwvUUBU
-G8i1dUPnAE+ptBu6wVo+RrverCmfe4Q=
+MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQChXxrJ7QGjHN9x
+4UbNYZUrIqpWAOJ7FzTQy8FGb5zuUD8sfcnouM2KaxFes2AAok/MUR64afA+Io6H
+c5XNirzo4gQcuHGlZAf5lbk86Wbf4kxeVH1UtJCYJ0QLDZ2s5Mq8NaM0/oqsByco
+DbEvBsYD4bMbW7RAMpGjJzWT5nhop+x8rVUlhOhmHQboyt3r78Q4kHM/89J4cnAj
+d+KI194cmK6YYGgIOZeijEvlFRzqMTHb3hMZuGGgv30YcBIurtPFRjzYCRTvCtLA
+9hHIoYDI6Rbl0wH+JUnT1Zr3Lp7TSIJUto3CYLfjhNaS9SL8KUDrH7tbwPzxsLjV
+vdVXMunIZmTo27H7a9ymRsMK/M2nzUNYBR6NYzITjgaQ9S65xfbG0qfAhUHq8po8
+WsnH/2BheYpy9Qyf8dC8fB4/rKsXUsPyYnU9B+rGtiPq13bupwqz3X+4e/n7hx7f
+e7Kgm1I4dD9INP7X64TQXpudXfpeVPkUtnkW7ux9VnR71kaJUAoKmVEKSFqHIlav
+Iw0Y91hj4cb+tmpEENiyAo+Dy/MDgiM7/bfxhZad5aecy7+8Qlcmhh+ZrETmnltx
+C0ntS+/QyS2gtQiw3JG+YFAeaCi/MF1lcjaiXoHu9vSoIE/vqW3eMU88P8twH6oK
+lW/JwDt+qoli/k4WKl+nJeXZRhTT4wIDAQABAoICAADbd1IiTbNsTa2WXktssh+t
+X/fz/5Va0rTXQvAZBgg9aeXWceeoGljFZ9gNHjydSszm6MG0Yl/aIXq2Z6cqDlsz
+CYWONKBbJIW0FhdXlWx+uxwh2RvwQk0PTFe+BfFAspOxueu9Ucbx2h3m22LzZ22R
+hI49Jvso/vK9xxWW5bCHT9omYOuW8Ksg4AQFloyQf1uI55aBOO7bNh2iHz8jMnK2
+xvACocWFaiOlbikfOxeYFPqPi/duLiqYnyqtkb3TakbuhW06Yx+VUE2mdlgOr5dM
+UbWn23yvqFw/6BevFONCITB1BdIbXxljf8ZTwhCn4XM+UxRSNVB4DrX9UQWqZ2k0
+egOq7L7pAJxDsS0lxelRc4RsplTBXwTHTpzqKapxM+kBM6hzTPHh8jcbdSxZFyvL
+j2kfkTf9MZYQLnYmPL6P5zEl6xTeiANjSa/h9kugH3jOUs313nk3oyqb7UgIRv7X
+TEUvFLsu+Y4DWV0cU0gJZzPTwJLy3Ygn87g3xKogLCi4QAWmJFhXl0jkYOMNdZTr
+Kt4XnwmnXQSLg1clATjPLOaEHC+QSnPvqZ6CLxfDHk+7FMsmam+Jhy5hHnlsI/pu
+fXjmHOH71mWa6iV5I7U4tfmmWislgA6x4XDW4N5IW24ixuKlCwpYXBIjGyFkxkEt
+IGtywK4xGsRMuVPi0tGRAoIBAQDUP0rku/itv5deva/LxWnVKFJK8xCi+zaqOjxU
+REkZmpLEFhd8VSjWerVO03rZoO9MCQUW+Nrkef2lrUjaR2odgzpiLvlW/gR+wW33
+WMYeD0JvSGk1YRubUl0NyeqOZy9+ptLHzzsTH2oBRw8+YncEm3+Wald4S01WEZtn
+k2l0yNBXCMktN64IA89lqKKaPQ5JBWl+8K4Jm+qI7Ms9yqbfCoOVKFneq5gcM+3a
+y/UbnER19YYWZeISGH9mHQAun+t+hyNN1euGJSzIic3ofuchd9888x+2AaWhJZWg
+l/rmcMWcQKyIbviwrC+LcgBjR+p1/ElRFv+VCZzB9lu/YM2xAoIBAQDCov+t3UFN
+2HsjQSeDldbDaK+Tn/n3piXPiQMOC7IWWVrSZseUVmGfizTvkfS4TLQu0yfJe6Xd
++wOidppl5CFleM62sz34lBglMVgAdjR7bjL1q+NOnHzSZQV8U9jPgHR2T28p2QXW
+wBfiBDG070Ibnf7LNJbx7Qc0j1vYi0CS3Y3HrioxE4qY8ZWaBDD+KCtB57+/prni
+eEggYiU+2HnBlDqq9JDOfQ3KRN4FdzAEuv5zSWakBgWtbwGZw4FvH66JV6bC5riN
+qGnnXhwVZ6X/EOK8MthRGRTO6GZ0K0bTIX9egg7ZicS2IWWCYWrTtnbho5gEnm+W
+eC3QLFCve7vTAoIBADtag8AZTL6R4GuvEfUi/KiOQQ0Skelx5OSPqoVKH0MYtcg+
+AU1UpznrUL59Z1JqreCOeSzmZJgWATeOkNvxspwUMYR5bGLGYE1uHClaWvTXAZYL
+Iti5kjXKP5l2iLBP7Lk3P6R+sB913ngC/iFM+cmBDpnqnRFXxYW3IMVDNO9ipNhh
+7ZhGhNVa82mTUf1d65vB9rF37sNjJaAqz980x5uB3jAc+5zIUZ45a1+PP7j75y0x
+ftDOpvy2exH8NCvVrs5QTjAbDWUTCkX+O2Wz70Ctu/DYcFq+dSnuT7x8I77DdI9w
+io8QsVz+mcEeHTumRcu+xGX3z3tHF94p3ZhUItECggEAfGn8zYJ0z/HlJG/tdis9
+kMNGGDNWcXr/CF4oWb4YJDkR2RRh1uwwku9E8y51I6nEM3o+IIitSeu+MwdlQmRF
+BLvoRtjkcBUaKgwUmJb2jT+vy2IIdqOJFmQE0ag3GsydpVK5WCKlnNRFb/AGZgXa
+WBTyXapMInDE/k/1AcJhkH+WtWEbDyvSmFk0q7KqLow2unYNF9DXWXBRioGyFS4D
+Bj5eEhEqzxMY0Yab9Rpu01dEdyUgOxCuaGJgv409G29A/gHNUyBwL/zLVV3Ozc/n
+R9ffVzWZGJ3Tsz7S3scbCrKK3Dp+i4eI+nL2lBT5WEN2Ul1kOu+bnK9NeZgaK1II
+iQKCAQAuV2dJfttt01vjgDtkM2jb7KYes8SVPiLH9R+iZSQCe6VqXxZm3Fw6Xw7T
+eNdtqQBabWE4ezX6LyrnYItYbS9cC3XcwZeOgUkyK8SSUgzcpKKJ4enjyBW7wGSp
+Et+vrPj+iR3AjGviMadFG7+T7Dv0nn9nwQZ0//g9Yaf+Rs9xKXkdAnNrStus9BMG
+7CST39DILA5PnFCqti5PW5Kl0q+Ny1XROLMNeHFZAXq14IhPuvPUWAMaz2DyAaqg
+9oAL4puftBZy9hUble2xWcYcmUkyA14ODHrKI/bri0m9uVbrh2vPchPCVbaaJiGg
+dE4gQb0CXsqX/+ScWhPHfbEoC2r9
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_grpc_protocol_ssl/test.py b/tests/integration/test_grpc_protocol_ssl/test.py
index 60c3ccd7a9d..80599126dcf 100644
--- a/tests/integration/test_grpc_protocol_ssl/test.py
+++ b/tests/integration/test_grpc_protocol_ssl/test.py
@@ -4,8 +4,10 @@ import sys
 import grpc
 from helpers.cluster import ClickHouseCluster, run_and_check
 
+# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
+# The client have to verify server certificate against that name. Client uses SNI
+SSL_HOST = "integration-tests.clickhouse.com"
 GRPC_PORT = 9100
-NODE_IP = "10.5.172.77"  # It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 DEFAULT_ENCODING = "utf-8"
 
@@ -30,12 +32,10 @@ import clickhouse_grpc_pb2_grpc
 
 # Utilities
 
-node_ip_with_grpc_port = NODE_IP + ":" + str(GRPC_PORT)
 config_dir = os.path.join(SCRIPT_DIR, "./configs")
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
-    ipv4_address=NODE_IP,
     main_configs=[
         "configs/grpc_config.xml",
         "configs/server-key.pem",
@@ -45,18 +45,26 @@ node = cluster.add_instance(
 )
 
 
+def get_grpc_url(instance=node):
+    return f"{instance.ip_address}:{GRPC_PORT}"
+
+
 def create_secure_channel():
     ca_cert = open(os.path.join(config_dir, "ca-cert.pem"), "rb").read()
     client_key = open(os.path.join(config_dir, "client-key.pem"), "rb").read()
     client_cert = open(os.path.join(config_dir, "client-cert.pem"), "rb").read()
     credentials = grpc.ssl_channel_credentials(ca_cert, client_key, client_cert)
-    channel = grpc.secure_channel(node_ip_with_grpc_port, credentials)
+    channel = grpc.secure_channel(
+        get_grpc_url(),
+        credentials,
+        options=(("grpc.ssl_target_name_override", SSL_HOST),),
+    )
     grpc.channel_ready_future(channel).result(timeout=10)
     return channel
 
 
 def create_insecure_channel():
-    channel = grpc.insecure_channel(node_ip_with_grpc_port)
+    channel = grpc.insecure_channel(get_grpc_url())
     grpc.channel_ready_future(channel).result(timeout=2)
     return channel
 
@@ -66,7 +74,7 @@ def create_secure_channel_with_wrong_client_certificate():
     client_key = open(os.path.join(config_dir, "wrong-client-key.pem"), "rb").read()
     client_cert = open(os.path.join(config_dir, "wrong-client-cert.pem"), "rb").read()
     credentials = grpc.ssl_channel_credentials(ca_cert, client_key, client_cert)
-    channel = grpc.secure_channel(node_ip_with_grpc_port, credentials)
+    channel = grpc.secure_channel(get_grpc_url(), credentials)
     grpc.channel_ready_future(channel).result(timeout=2)
     return channel
 
diff --git a/tests/integration/test_keeper_four_word_command/test.py b/tests/integration/test_keeper_four_word_command/test.py
index b60a8389cd0..e8136d322d3 100644
--- a/tests/integration/test_keeper_four_word_command/test.py
+++ b/tests/integration/test_keeper_four_word_command/test.py
@@ -227,8 +227,8 @@ def test_cmd_mntr(started_cluster):
         # contains:
         #   10 nodes created by test
         #   3 nodes created by clickhouse "/clickhouse/task_queue/ddl"
-        #   1 root node
-        assert int(result["zk_znode_count"]) == 11
+        #   1 root node, 2 keeper system nodes
+        assert int(result["zk_znode_count"]) == 13
         assert int(result["zk_watch_count"]) == 2
         assert int(result["zk_ephemerals_count"]) == 2
         assert int(result["zk_approximate_data_size"]) > 0
@@ -369,7 +369,7 @@ def test_cmd_srvr(started_cluster):
         assert int(result["Connections"]) == 1
         assert int(result["Zxid"]) > 14
         assert result["Mode"] == "leader"
-        assert result["Node count"] == "11"
+        assert result["Node count"] == "13"
 
     finally:
         destroy_zk_client(zk)
@@ -407,7 +407,7 @@ def test_cmd_stat(started_cluster):
         assert int(result["Connections"]) == 1
         assert int(result["Zxid"]) > 14
         assert result["Mode"] == "leader"
-        assert result["Node count"] == "11"
+        assert result["Node count"] == "13"
 
         # filter connection statistics
         cons = [n for n in data.split("\n") if "=" in n]
diff --git a/tests/integration/test_keeper_snapshot_on_exit/__init__.py b/tests/integration/test_keeper_snapshot_on_exit/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_on_exit/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_snapshot_on_exit/configs/enable_keeper1.xml b/tests/integration/test_keeper_snapshot_on_exit/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..e4d5ae9aa82
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_on_exit/configs/enable_keeper1.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>
+        <create_snapshot_on_exit>true</create_snapshot_on_exit>
+
+        <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>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_on_exit/configs/enable_keeper2.xml b/tests/integration/test_keeper_snapshot_on_exit/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..216e6905a56
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_on_exit/configs/enable_keeper2.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>
+        <create_snapshot_on_exit>false</create_snapshot_on_exit>
+
+        <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>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_on_exit/test.py b/tests/integration/test_keeper_snapshot_on_exit/test.py
new file mode 100644
index 00000000000..1ca5888ab4d
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_on_exit/test.py
@@ -0,0 +1,52 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+import os
+from kazoo.client import KazooClient
+
+cluster = ClickHouseCluster(__file__)
+CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs")
+
+node1 = cluster.add_instance(
+    "node1", main_configs=["configs/enable_keeper1.xml"], stay_alive=True
+)
+
+node2 = cluster.add_instance(
+    "node2", main_configs=["configs/enable_keeper2.xml"], stay_alive=True
+)
+
+
+def get_fake_zk(node, timeout=30.0):
+    _fake_zk_instance = KazooClient(
+        hosts=cluster.get_instance_ip(node.name) + ":9181", timeout=timeout
+    )
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_snapshot_on_exit(started_cluster):
+    zk_conn = get_fake_zk(node1)
+
+    zk_conn.create("/some_path", b"some_data")
+
+    node1.stop_clickhouse()
+    assert node1.contains_in_log("Created persistent snapshot")
+
+    node1.start_clickhouse()
+    assert node1.contains_in_log("Loaded snapshot")
+
+    node2.stop_clickhouse()
+    assert not node2.contains_in_log("Created persistent snapshot")
+
+    node2.start_clickhouse()
+    assert node2.contains_in_log("No existing snapshots")
diff --git a/tests/integration/test_keeper_zookeeper_converter/test.py b/tests/integration/test_keeper_zookeeper_converter/test.py
index 72b0d0cdd87..50a9ee6a4a7 100644
--- a/tests/integration/test_keeper_zookeeper_converter/test.py
+++ b/tests/integration/test_keeper_zookeeper_converter/test.py
@@ -193,11 +193,18 @@ def compare_states(zk1, zk2, path="/", exclude_paths=[]):
     second_children = list(sorted(zk2.get_children(path)))
     print("Got children left", first_children)
     print("Got children rigth", second_children)
-    assert first_children == second_children, "Childrens are not equal on path " + path
+
+    if path == "/":
+        assert set(first_children) ^ set(second_children) == set(["keeper"])
+    else:
+        assert first_children == second_children, (
+            "Childrens are not equal on path " + path
+        )
 
     for children in first_children:
-        print("Checking child", os.path.join(path, children))
-        compare_states(zk1, zk2, os.path.join(path, children), exclude_paths)
+        if path != "/" or children != "keeper":
+            print("Checking child", os.path.join(path, children))
+            compare_states(zk1, zk2, os.path.join(path, children), exclude_paths)
 
 
 @pytest.mark.parametrize(("create_snapshots"), [True, False])
diff --git a/tests/integration/test_match_process_uid_against_data_owner/test.py b/tests/integration/test_match_process_uid_against_data_owner/test.py
index bbcee941833..65e4e902853 100644
--- a/tests/integration/test_match_process_uid_against_data_owner/test.py
+++ b/tests/integration/test_match_process_uid_against_data_owner/test.py
@@ -33,7 +33,7 @@ def test_different_user(started_cluster):
         node.start_clickhouse(start_wait_sec=3)
 
     log = node.grep_in_log("Effective")
-    expected_message = "Effective user of the process \(.*\) does not match the owner of the data \(.*\)\. Run under 'sudo -u .*'\."
+    expected_message = "Effective user of the process \\(.+?\\) does not match the owner of the data \\(.+?\\)\\. Run under 'sudo -u .*'\\."
     if re.search(expected_message, log) is None:
         pytest.fail(
             'Expected the server to fail with a message "{}", but the last message is "{}"'.format(
diff --git a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
index d7ea0c13a93..22d4633685e 100644
--- a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
@@ -2126,9 +2126,9 @@ def materialized_database_mysql_date_type_to_date32(
     mysql_node.query(
         "CREATE TABLE test_database.a (a INT(11) NOT NULL PRIMARY KEY, b date DEFAULT NULL)"
     )
-    # can't support date that less than 1925 year for now
-    mysql_node.query("INSERT INTO test_database.a VALUES(1, '1900-04-16')")
-    # test date that is older than 1925
+    # can't support date that less than 1900 year for now
+    mysql_node.query("INSERT INTO test_database.a VALUES(1, '1899-04-16')")
+    # test date that is older than 1900
     mysql_node.query("INSERT INTO test_database.a VALUES(3, '1971-02-16')")
     mysql_node.query("INSERT INTO test_database.a VALUES(4, '2101-05-16')")
 
diff --git a/tests/integration/test_merge_tree_azure_blob_storage/test.py b/tests/integration/test_merge_tree_azure_blob_storage/test.py
index bc549210b39..668432d4a69 100644
--- a/tests/integration/test_merge_tree_azure_blob_storage/test.py
+++ b/tests/integration/test_merge_tree_azure_blob_storage/test.py
@@ -3,16 +3,11 @@ import time
 import os
 
 import pytest
-from helpers.cluster import ClickHouseCluster, get_instances_dir
+from helpers.cluster import ClickHouseCluster
 from helpers.utility import generate_values, replace_config, SafeThread
 
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CONFIG_PATH = os.path.join(
-    SCRIPT_DIR,
-    "./{}/node/configs/config.d/storage_conf.xml".format(get_instances_dir()),
-)
-
 NODE_NAME = "node"
 TABLE_NAME = "blob_storage_table"
 AZURE_BLOB_STORAGE_DISK = "blob_storage_disk"
@@ -51,7 +46,7 @@ def azure_query(node, query, try_num=3):
             return node.query(query)
         except Exception as ex:
             retriable_errors = [
-                "DB::Exception: Azure::Core::Http::TransportException: Connection was closed by the server while trying to read a response",
+                "DB::Exception: Azure::Core::Http::TransportException: Connection was closed by the server while trying to read a response"
             ]
             retry = False
             for error in retriable_errors:
@@ -160,13 +155,7 @@ def test_inserts_selects(cluster):
     )
 
 
-@pytest.mark.parametrize(
-    "merge_vertical",
-    [
-        (True),
-        (False),
-    ],
-)
+@pytest.mark.parametrize("merge_vertical", [(True), (False)])
 def test_insert_same_partition_and_merge(cluster, merge_vertical):
     settings = {}
     if merge_vertical:
@@ -498,6 +487,12 @@ def test_freeze_unfreeze(cluster):
 def test_apply_new_settings(cluster):
     node = cluster.instances[NODE_NAME]
     create_table(node, TABLE_NAME)
+    config_path = os.path.join(
+        SCRIPT_DIR,
+        "./{}/node/configs/config.d/storage_conf.xml".format(
+            cluster.instances_dir_name
+        ),
+    )
 
     azure_query(
         node, f"INSERT INTO {TABLE_NAME} VALUES {generate_values('2020-01-03', 4096)}"
@@ -505,7 +500,7 @@ def test_apply_new_settings(cluster):
 
     # Force multi-part upload mode.
     replace_config(
-        CONFIG_PATH,
+        config_path,
         "<max_single_part_upload_size>33554432</max_single_part_upload_size>",
         "<max_single_part_upload_size>4096</max_single_part_upload_size>",
     )
@@ -522,10 +517,16 @@ def test_apply_new_settings(cluster):
 def test_restart_during_load(cluster):
     node = cluster.instances[NODE_NAME]
     create_table(node, TABLE_NAME)
+    config_path = os.path.join(
+        SCRIPT_DIR,
+        "./{}/node/configs/config.d/storage_conf.xml".format(
+            cluster.instances_dir_name
+        ),
+    )
 
     # Force multi-part upload mode.
     replace_config(
-        CONFIG_PATH, "<container_already_exists>false</container_already_exists>", ""
+        config_path, "<container_already_exists>false</container_already_exists>", ""
     )
 
     azure_query(
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
index e414ae5a259..3ee49744a61 100644
--- a/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
@@ -27,22 +27,16 @@
                 <path>/</path>
             </hdd>
             <s3_with_cache>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root/data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
-                <data_cache_enabled>1</data_cache_enabled>
+                <type>cache</type>
+                <disk>s3</disk>
+                <path>/s3_with_cache/</path>
+                <max_size>1000000000</max_size>
             </s3_with_cache>
             <s3_with_cache_and_jbod>
-                <type>s3</type>
-                <endpoint>http://minio1:9001/root/data/</endpoint>
-                <access_key_id>minio</access_key_id>
-                <secret_access_key>minio123</secret_access_key>
-                <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
-                <data_cache_enabled>1</data_cache_enabled>
-                <data_cache_path>/jbod1/</data_cache_path>
-                <data_cache_max_size>1000000000</data_cache_max_size>
+                <type>cache</type>
+                <disk>s3</disk>
+                <path>/jbod1/</path>
+                <max_size>1000000000</max_size>
             </s3_with_cache_and_jbod>
         </disks>
         <policies>
@@ -90,4 +84,8 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
+
+    <database_catalog_unused_dir_hide_timeout_sec>0</database_catalog_unused_dir_hide_timeout_sec>
+    <database_catalog_unused_dir_rm_timeout_sec>60</database_catalog_unused_dir_rm_timeout_sec>
+    <database_catalog_unused_dir_cleanup_period_sec>1</database_catalog_unused_dir_cleanup_period_sec>
 </clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
index 3ce2a08ae74..544f064bdff 100644
--- a/tests/integration/test_merge_tree_s3/test.py
+++ b/tests/integration/test_merge_tree_s3/test.py
@@ -3,15 +3,11 @@ import time
 import os
 
 import pytest
-from helpers.cluster import ClickHouseCluster, get_instances_dir
+from helpers.cluster import ClickHouseCluster
 from helpers.utility import generate_values, replace_config, SafeThread
 
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CONFIG_PATH = os.path.join(
-    SCRIPT_DIR,
-    "./{}/node/configs/config.d/storage_conf.xml".format(get_instances_dir()),
-)
 
 
 @pytest.fixture(scope="module")
@@ -24,6 +20,7 @@ def cluster():
                 "configs/config.d/storage_conf.xml",
                 "configs/config.d/bg_processing_pool_conf.xml",
             ],
+            stay_alive=True,
             with_minio=True,
         )
 
@@ -577,6 +574,13 @@ def test_s3_disk_apply_new_settings(cluster, node_name):
     node = cluster.instances[node_name]
     create_table(node, "s3_test")
 
+    config_path = os.path.join(
+        SCRIPT_DIR,
+        "./{}/node/configs/config.d/storage_conf.xml".format(
+            cluster.instances_dir_name
+        ),
+    )
+
     def get_s3_requests():
         node.query("SYSTEM FLUSH LOGS")
         return int(
@@ -593,7 +597,7 @@ def test_s3_disk_apply_new_settings(cluster, node_name):
 
     # Force multi-part upload mode.
     replace_config(
-        CONFIG_PATH,
+        config_path,
         "<s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>",
         "<s3_max_single_part_upload_size>0</s3_max_single_part_upload_size>",
     )
@@ -709,3 +713,27 @@ def test_cache_with_full_disk_space(cluster, node_name):
         "Insert into cache is skipped due to insufficient disk space"
     )
     node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+def test_store_cleanup_disk_s3(cluster, node_name):
+    node = cluster.instances[node_name]
+    node.query("DROP TABLE IF EXISTS s3_test SYNC")
+    node.query(
+        "CREATE TABLE s3_test UUID '00000000-1000-4000-8000-000000000001' (n UInt64) Engine=MergeTree() ORDER BY n SETTINGS storage_policy='s3';"
+    )
+    node.query("INSERT INTO s3_test SELECT 1")
+
+    node.stop_clickhouse(kill=True)
+    path_to_data = "/var/lib/clickhouse/"
+    node.exec_in_container(["rm", f"{path_to_data}/metadata/default/s3_test.sql"])
+    node.start_clickhouse()
+
+    node.wait_for_log_line(
+        "Removing unused directory", timeout=90, look_behind_lines=1000
+    )
+    node.wait_for_log_line("directories from store")
+    node.query(
+        "CREATE TABLE s3_test UUID '00000000-1000-4000-8000-000000000001' (n UInt64) Engine=MergeTree() ORDER BY n SETTINGS storage_policy='s3';"
+    )
+    node.query("INSERT INTO s3_test SELECT 1")
diff --git a/tests/integration/test_merge_tree_s3_restore/test.py b/tests/integration/test_merge_tree_s3_restore/test.py
index f4acc4ac91e..0652c31951d 100644
--- a/tests/integration/test_merge_tree_s3_restore/test.py
+++ b/tests/integration/test_merge_tree_s3_restore/test.py
@@ -5,28 +5,22 @@ import string
 import time
 
 import pytest
-from helpers.cluster import ClickHouseCluster, get_instances_dir
+from helpers.cluster import ClickHouseCluster
 
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-NOT_RESTORABLE_CONFIG_PATH = os.path.join(
-    SCRIPT_DIR,
-    "./{}/node_not_restorable/configs/config.d/storage_conf_not_restorable.xml".format(
-        get_instances_dir()
-    ),
-)
 COMMON_CONFIGS = [
     "configs/config.d/bg_processing_pool_conf.xml",
     "configs/config.d/clusters.xml",
 ]
 
 
-def replace_config(old, new):
-    config = open(NOT_RESTORABLE_CONFIG_PATH, "r")
+def replace_config(path, old, new):
+    config = open(path, "r")
     config_lines = config.readlines()
     config.close()
     config_lines = [line.replace(old, new) for line in config_lines]
-    config = open(NOT_RESTORABLE_CONFIG_PATH, "w")
+    config = open(path, "w")
     config.writelines(config_lines)
     config.close()
 
@@ -507,6 +501,12 @@ def test_restore_mutations(cluster, db_atomic):
 def test_migrate_to_restorable_schema(cluster):
     db_atomic = True
     node = cluster.instances["node_not_restorable"]
+    config_path = os.path.join(
+        SCRIPT_DIR,
+        "./{}/node_not_restorable/configs/config.d/storage_conf_not_restorable.xml".format(
+            cluster.instances_dir_name
+        ),
+    )
 
     create_table(node, "test", db_atomic=db_atomic)
     uuid = get_table_uuid(node, db_atomic, "test")
@@ -525,7 +525,9 @@ def test_migrate_to_restorable_schema(cluster):
     )
 
     replace_config(
-        "<send_metadata>false</send_metadata>", "<send_metadata>true</send_metadata>"
+        config_path,
+        "<send_metadata>false</send_metadata>",
+        "<send_metadata>true</send_metadata>",
     )
     node.restart_clickhouse()
 
diff --git a/tests/integration/test_part_moves_between_shards/test.py b/tests/integration/test_part_moves_between_shards/test.py
index 1dbe5324124..8fef44305ea 100644
--- a/tests/integration/test_part_moves_between_shards/test.py
+++ b/tests/integration/test_part_moves_between_shards/test.py
@@ -165,10 +165,7 @@ def test_deduplication_while_move(started_cluster):
         assert TSV(
             n.query(
                 "SELECT count() FROM test_deduplication_d",
-                settings={
-                    "allow_experimental_query_deduplication": 1,
-                    "allow_experimental_projection_optimization": 1,
-                },
+                settings={"allow_experimental_query_deduplication": 1},
             )
         ) == TSV("2")
 
diff --git a/tests/integration/test_quota/test.py b/tests/integration/test_quota/test.py
index fd5a6599a59..4f98b9a0d0d 100644
--- a/tests/integration/test_quota/test.py
+++ b/tests/integration/test_quota/test.py
@@ -486,7 +486,7 @@ def test_exceed_quota():
     )
 
     assert re.search(
-        "Quota.*has\ been\ exceeded",
+        "Quota.*has been exceeded",
         instance.query_and_get_error("SELECT * from test_table"),
     )
     system_quota_usage(
diff --git a/tests/integration/test_reload_max_table_size_to_drop/test.py b/tests/integration/test_reload_max_table_size_to_drop/test.py
index da7dba12fa0..90e60e5cfa4 100644
--- a/tests/integration/test_reload_max_table_size_to_drop/test.py
+++ b/tests/integration/test_reload_max_table_size_to_drop/test.py
@@ -2,18 +2,13 @@ import os
 import time
 
 import pytest
-from helpers.cluster import ClickHouseCluster, get_instances_dir
+from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance("node", main_configs=["configs/max_table_size_to_drop.xml"])
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
-CONFIG_PATH = os.path.join(
-    SCRIPT_DIR,
-    "./{}/node/configs/config.d/max_table_size_to_drop.xml".format(get_instances_dir()),
-)
-
 
 @pytest.fixture(scope="module")
 def start_cluster():
@@ -29,6 +24,12 @@ def start_cluster():
 
 def test_reload_max_table_size_to_drop(start_cluster):
     node.query("INSERT INTO test VALUES (now(), 0)")
+    config_path = os.path.join(
+        SCRIPT_DIR,
+        "./{}/node/configs/config.d/max_table_size_to_drop.xml".format(
+            start_cluster.instances_dir_name
+        ),
+    )
 
     time.sleep(5)  # wait for data part commit
 
@@ -37,14 +38,14 @@ def test_reload_max_table_size_to_drop(start_cluster):
     assert out == ""
     assert err != ""
 
-    config = open(CONFIG_PATH, "r")
+    config = open(config_path, "r")
     config_lines = config.readlines()
     config.close()
     config_lines = [
         line.replace("<max_table_size_to_drop>1", "<max_table_size_to_drop>1000000")
         for line in config_lines
     ]
-    config = open(CONFIG_PATH, "w")
+    config = open(config_path, "w")
     config.writelines(config_lines)
     config.close()
 
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 11ca0d2f962..f716fac8508 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -3,6 +3,7 @@ import shutil
 import time
 import re
 import pytest
+import threading
 
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry, assert_logs_contain
@@ -417,7 +418,7 @@ def test_alters_from_different_replicas(started_cluster):
         "distributed_ddl_task_timeout": 5,
         "distributed_ddl_output_mode": "null_status_on_timeout",
     }
-    assert "shard1|replica2\t\\N\t\\N" in main_node.query(
+    assert "shard1\treplica2\tQUEUED\t" in main_node.query(
         "ALTER TABLE testdb.concurrent_test ADD COLUMN Added2 UInt32;",
         settings=settings,
     )
@@ -425,7 +426,7 @@ def test_alters_from_different_replicas(started_cluster):
         "distributed_ddl_task_timeout": 5,
         "distributed_ddl_output_mode": "never_throw",
     }
-    assert "shard1|replica2\t\\N\t\\N" in competing_node.query(
+    assert "shard1\treplica2\tQUEUED\t" in competing_node.query(
         "ALTER TABLE testdb.concurrent_test ADD COLUMN Added1 UInt32 AFTER Added0;",
         settings=settings,
     )
@@ -495,11 +496,11 @@ def test_alters_from_different_replicas(started_cluster):
     )
     res = main_node.query("ALTER TABLE testdb.concurrent_test DELETE WHERE UserID % 2")
     assert (
-        "shard1|replica1" in res
-        and "shard1|replica2" in res
-        and "shard1|replica3" in res
+        "shard1\treplica1\tOK" in res
+        and "shard1\treplica2\tOK" in res
+        and "shard1\treplica3\tOK" in res
     )
-    assert "shard2|replica1" in res and "shard2|replica2" in res
+    assert "shard2\treplica1\tOK" in res and "shard2\treplica2\tOK" in res
 
     expected = (
         "1\t1\tmain_node\n"
@@ -553,6 +554,62 @@ def test_alters_from_different_replicas(started_cluster):
     snapshot_recovering_node.query("DROP DATABASE testdb SYNC")
 
 
+def create_some_tables(db):
+    settings = {"distributed_ddl_task_timeout": 0}
+    main_node.query(
+        "CREATE TABLE {}.t1 (n int) ENGINE=Memory".format(db), settings=settings
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.t2 (s String) ENGINE=Memory".format(db), settings=settings
+    )
+    main_node.query(
+        "CREATE TABLE {}.mt1 (n int) ENGINE=MergeTree order by n".format(db),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.mt2 (n int) ENGINE=MergeTree order by n".format(db),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE TABLE {}.rmt1 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.rmt2 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE TABLE {}.rmt3 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE TABLE {}.rmt5 (n int) ENGINE=ReplicatedMergeTree order by n".format(db),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE MATERIALIZED VIEW {}.mv1 (n int) ENGINE=ReplicatedMergeTree order by n AS SELECT n FROM recover.rmt1".format(
+            db
+        ),
+        settings=settings,
+    )
+    dummy_node.query(
+        "CREATE MATERIALIZED VIEW {}.mv2 (n int) ENGINE=ReplicatedMergeTree order by n  AS SELECT n FROM recover.rmt2".format(
+            db
+        ),
+        settings=settings,
+    )
+    main_node.query(
+        "CREATE DICTIONARY {}.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db)
+    )
+    dummy_node.query(
+        "CREATE DICTIONARY {}.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
+        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB 'recover')) "
+        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())".format(db)
+    )
+
+
 def test_recover_staled_replica(started_cluster):
     main_node.query(
         "CREATE DATABASE recover ENGINE = Replicated('/clickhouse/databases/recover', 'shard1', 'replica1');"
@@ -565,52 +622,7 @@ def test_recover_staled_replica(started_cluster):
     )
 
     settings = {"distributed_ddl_task_timeout": 0}
-    main_node.query("CREATE TABLE recover.t1 (n int) ENGINE=Memory", settings=settings)
-    dummy_node.query(
-        "CREATE TABLE recover.t2 (s String) ENGINE=Memory", settings=settings
-    )
-    main_node.query(
-        "CREATE TABLE recover.mt1 (n int) ENGINE=MergeTree order by n",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE TABLE recover.mt2 (n int) ENGINE=MergeTree order by n",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE TABLE recover.rmt1 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE TABLE recover.rmt2 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE TABLE recover.rmt3 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE TABLE recover.rmt5 (n int) ENGINE=ReplicatedMergeTree order by n",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE MATERIALIZED VIEW recover.mv1 (n int) ENGINE=ReplicatedMergeTree order by n AS SELECT n FROM recover.rmt1",
-        settings=settings,
-    )
-    dummy_node.query(
-        "CREATE MATERIALIZED VIEW recover.mv2 (n int) ENGINE=ReplicatedMergeTree order by n  AS SELECT n FROM recover.rmt2",
-        settings=settings,
-    )
-    main_node.query(
-        "CREATE DICTIONARY recover.d1 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
-        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt1' PASSWORD '' DB 'recover')) "
-        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())"
-    )
-    dummy_node.query(
-        "CREATE DICTIONARY recover.d2 (n int DEFAULT 0, m int DEFAULT 1) PRIMARY KEY n "
-        "SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'rmt2' PASSWORD '' DB 'recover')) "
-        "LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT())"
-    )
+    create_some_tables("recover")
 
     for table in ["t1", "t2", "mt1", "mt2", "rmt1", "rmt2", "rmt3", "rmt5"]:
         main_node.query("INSERT INTO recover.{} VALUES (42)".format(table))
@@ -867,3 +879,106 @@ def test_sync_replica(started_cluster):
     )
     assert lp1 == max_lp
     assert lp2 == max_lp
+
+
+def test_force_synchronous_settings(started_cluster):
+    main_node.query(
+        "CREATE DATABASE test_force_synchronous_settings ENGINE = Replicated('/clickhouse/databases/test2', 'shard1', 'replica1');"
+    )
+    dummy_node.query(
+        "CREATE DATABASE test_force_synchronous_settings ENGINE = Replicated('/clickhouse/databases/test2', 'shard1', 'replica2');"
+    )
+    snapshotting_node.query(
+        "CREATE DATABASE test_force_synchronous_settings ENGINE = Replicated('/clickhouse/databases/test2', 'shard2', 'replica1');"
+    )
+    main_node.query(
+        "CREATE TABLE test_force_synchronous_settings.t (n int) ENGINE=ReplicatedMergeTree('/test/same/path/{shard}', '{replica}') ORDER BY tuple()"
+    )
+    main_node.query(
+        "INSERT INTO test_force_synchronous_settings.t SELECT * FROM numbers(10)"
+    )
+    snapshotting_node.query(
+        "INSERT INTO test_force_synchronous_settings.t SELECT * FROM numbers(10)"
+    )
+    snapshotting_node.query(
+        "SYSTEM SYNC DATABASE REPLICA test_force_synchronous_settings"
+    )
+    dummy_node.query("SYSTEM SYNC DATABASE REPLICA test_force_synchronous_settings")
+
+    snapshotting_node.query("SYSTEM STOP MERGES test_force_synchronous_settings.t")
+
+    def start_merges_func():
+        time.sleep(5)
+        snapshotting_node.query("SYSTEM START MERGES test_force_synchronous_settings.t")
+
+    start_merges_thread = threading.Thread(target=start_merges_func)
+    start_merges_thread.start()
+
+    settings = {
+        "mutations_sync": 2,
+        "database_replicated_enforce_synchronous_settings": 1,
+    }
+    main_node.query(
+        "ALTER TABLE test_force_synchronous_settings.t UPDATE n = n * 10 WHERE 1",
+        settings=settings,
+    )
+    assert "10\t450\n" == snapshotting_node.query(
+        "SELECT count(), sum(n) FROM test_force_synchronous_settings.t"
+    )
+    start_merges_thread.join()
+
+    def select_func():
+        dummy_node.query(
+            "SELECT sleepEachRow(1) FROM test_force_synchronous_settings.t"
+        )
+
+    select_thread = threading.Thread(target=select_func)
+    select_thread.start()
+
+    settings = {"database_replicated_enforce_synchronous_settings": 1}
+    snapshotting_node.query(
+        "DROP TABLE test_force_synchronous_settings.t SYNC", settings=settings
+    )
+    main_node.query(
+        "CREATE TABLE test_force_synchronous_settings.t (n String) ENGINE=ReplicatedMergeTree('/test/same/path/{shard}', '{replica}') ORDER BY tuple()"
+    )
+    select_thread.join()
+
+
+def test_recover_digest_mismatch(started_cluster):
+    main_node.query(
+        "CREATE DATABASE recover_digest_mismatch ENGINE = Replicated('/clickhouse/databases/recover_digest_mismatch', 'shard1', 'replica1');"
+    )
+    dummy_node.query(
+        "CREATE DATABASE recover_digest_mismatch ENGINE = Replicated('/clickhouse/databases/recover_digest_mismatch', 'shard1', 'replica2');"
+    )
+
+    create_some_tables("recover_digest_mismatch")
+
+    ways_to_corrupt_metadata = [
+        f"mv /var/lib/clickhouse/metadata/recover_digest_mismatch/t1.sql /var/lib/clickhouse/metadata/recover_digest_mismatch/m1.sql",
+        f"sed --follow-symlinks -i 's/Int32/String/' /var/lib/clickhouse/metadata/recover_digest_mismatch/mv1.sql",
+        f"rm -f /var/lib/clickhouse/metadata/recover_digest_mismatch/d1.sql",
+        # f"rm -rf /var/lib/clickhouse/metadata/recover_digest_mismatch/", # Directory already exists
+        f"rm -rf /var/lib/clickhouse/store",
+    ]
+
+    for command in ways_to_corrupt_metadata:
+        need_remove_is_active_node = "rm -rf" in command
+        dummy_node.stop_clickhouse(kill=not need_remove_is_active_node)
+        dummy_node.exec_in_container(["bash", "-c", command])
+        dummy_node.start_clickhouse()
+
+        query = (
+            "SELECT name, uuid, create_table_query FROM system.tables WHERE database='recover_digest_mismatch' AND name NOT LIKE '.inner_id.%' "
+            "ORDER BY name SETTINGS show_table_uuid_in_table_create_query_if_not_nil=1"
+        )
+        expected = main_node.query(query)
+
+        if "rm -rf" in command:
+            # NOTE Otherwise it fails to recreate ReplicatedMergeTree table due to "Replica already exists"
+            main_node.query(
+                "SYSTEM DROP REPLICA '2' FROM DATABASE recover_digest_mismatch"
+            )
+
+        assert_eq_with_retry(dummy_node, query, expected)
diff --git a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
index 55e0988218f..1b1ead2d7cb 100644
--- a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
@@ -59,6 +59,7 @@
     <merge_tree>
         <min_bytes_for_wide_part>1024000</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_replicated_merge_tree_s3_restore/test.py b/tests/integration/test_replicated_merge_tree_s3_restore/test.py
index d743dedbdde..fc13c8a1184 100644
--- a/tests/integration/test_replicated_merge_tree_s3_restore/test.py
+++ b/tests/integration/test_replicated_merge_tree_s3_restore/test.py
@@ -5,7 +5,7 @@ import string
 import time
 
 import pytest
-from helpers.cluster import ClickHouseCluster, get_instances_dir
+from helpers.cluster import ClickHouseCluster
 
 
 COMMON_CONFIGS = ["configs/config.d/clusters.xml"]
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
index bfd7366b9dc..f4a34256ef8 100644
--- a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
@@ -21,6 +21,7 @@
 
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_s3_cluster/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
index 18f15763633..39275e99abd 100644
--- a/tests/integration/test_s3_cluster/configs/cluster.xml
+++ b/tests/integration/test_s3_cluster/configs/cluster.xml
@@ -20,8 +20,23 @@
         </shard>
     </cluster_simple>
 
+
+    <!-- A part of the cluster above, represents only one shard-->
+    <first_shard>
+        <shard>
+            <replica>
+                <host>s0_0_0</host>
+                <port>9000</port>
+            </replica>
+            <replica>
+                <host>s0_0_1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </first_shard>
+
     </remote_servers>
     <macros>
         <default_cluster_macro>cluster_simple</default_cluster_macro>
     </macros>
-</clickhouse>
\ No newline at end of file
+</clickhouse>
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
index 2cbb36fcf06..2384aa6e059 100644
--- a/tests/integration/test_s3_cluster/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -34,10 +34,24 @@ def started_cluster():
     try:
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance(
-            "s0_0_0", main_configs=["configs/cluster.xml"], with_minio=True
+            "s0_0_0",
+            main_configs=["configs/cluster.xml"],
+            macros={"replica": "node1", "shard": "shard1"},
+            with_minio=True,
+            with_zookeeper=True,
+        )
+        cluster.add_instance(
+            "s0_0_1",
+            main_configs=["configs/cluster.xml"],
+            macros={"replica": "replica2", "shard": "shard1"},
+            with_zookeeper=True,
+        )
+        cluster.add_instance(
+            "s0_1_0",
+            main_configs=["configs/cluster.xml"],
+            macros={"replica": "replica1", "shard": "shard2"},
+            with_zookeeper=True,
         )
-        cluster.add_instance("s0_0_1", main_configs=["configs/cluster.xml"])
-        cluster.add_instance("s0_1_0", main_configs=["configs/cluster.xml"])
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -55,17 +69,17 @@ def test_select_all(started_cluster):
     pure_s3 = node.query(
         """
     SELECT * from s3(
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
-        'minio', 'minio123', 'CSV', 
-        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
+        'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     ORDER BY (name, value, polygon)"""
     )
     # print(pure_s3)
     s3_distibuted = node.query(
         """
     SELECT * from s3Cluster(
-        'cluster_simple', 
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'cluster_simple',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)"""
     )
     # print(s3_distibuted)
@@ -78,15 +92,15 @@ def test_count(started_cluster):
     pure_s3 = node.query(
         """
     SELECT count(*) from s3(
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
-        'minio', 'minio123', 'CSV', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
+        'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
     # print(pure_s3)
     s3_distibuted = node.query(
         """
     SELECT count(*) from s3Cluster(
-        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')"""
     )
@@ -125,13 +139,13 @@ def test_union_all(started_cluster):
     SELECT * FROM
     (
         SELECT * from s3(
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 
-            'minio', 'minio123', 'CSV', 
-            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+            'http://minio1:9001/root/data/{clickhouse,database}/*',
+            'minio', 'minio123', 'CSV',
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
         UNION ALL
         SELECT * from s3(
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 
-            'minio', 'minio123', 'CSV', 
+            'http://minio1:9001/root/data/{clickhouse,database}/*',
+            'minio', 'minio123', 'CSV',
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     )
     ORDER BY (name, value, polygon)
@@ -143,13 +157,13 @@ def test_union_all(started_cluster):
     SELECT * FROM
     (
         SELECT * from s3Cluster(
-            'cluster_simple', 
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'cluster_simple',
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
         UNION ALL
         SELECT * from s3Cluster(
-            'cluster_simple', 
-            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'cluster_simple',
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
             'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     )
     ORDER BY (name, value, polygon)
@@ -166,12 +180,12 @@ def test_wrong_cluster(started_cluster):
         """
     SELECT count(*) from s3Cluster(
         'non_existent_cluster',
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     UNION ALL
     SELECT count(*) from s3Cluster(
         'non_existent_cluster',
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*',
         'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
     """
     )
@@ -184,14 +198,137 @@ def test_ambiguous_join(started_cluster):
     result = node.query(
         """
     SELECT l.name, r.value from s3Cluster(
-        'cluster_simple', 
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'cluster_simple',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') as l
     JOIN s3Cluster(
-        'cluster_simple', 
-        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'cluster_simple',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
         'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') as r
     ON l.name = r.name
     """
     )
     assert "AMBIGUOUS_COLUMN_NAME" not in result
+
+
+def test_distributed_insert_select(started_cluster):
+    first_replica_first_shard = started_cluster.instances["s0_0_0"]
+    second_replica_first_shard = started_cluster.instances["s0_0_1"]
+    first_replica_second_shard = started_cluster.instances["s0_1_0"]
+
+    first_replica_first_shard.query(
+        """
+    CREATE TABLE insert_select_local ON CLUSTER 'cluster_simple' (a String, b UInt64)
+    ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/insert_select', '{replica}')
+    ORDER BY (a, b);
+        """
+    )
+
+    first_replica_first_shard.query(
+        """
+    CREATE TABLE insert_select_distributed ON CLUSTER 'cluster_simple' as insert_select_local
+    ENGINE = Distributed('cluster_simple', default, insert_select_local, b % 2);
+        """
+    )
+
+    for file_number in range(100):
+        first_replica_first_shard.query(
+            """
+        INSERT INTO TABLE FUNCTION s3('http://minio1:9001/root/data/generated/file_{}.csv', 'minio', 'minio123', 'CSV','a String, b UInt64')
+        SELECT repeat('{}', 10), number from numbers(100);
+            """.format(
+                file_number, file_number
+            )
+        )
+
+    first_replica_first_shard.query(
+        """
+    INSERT INTO insert_select_distributed SELECT * FROM s3Cluster(
+        'cluster_simple',
+        'http://minio1:9001/root/data/generated/*.csv', 'minio', 'minio123', 'CSV','a String, b UInt64'
+    ) SETTINGS parallel_distributed_insert_select=1;
+        """
+    )
+
+    for line in (
+        first_replica_first_shard.query("""SELECT * FROM insert_select_local;""")
+        .strip()
+        .split("\n")
+    ):
+        _, b = line.split()
+        assert int(b) % 2 == 0
+
+    for line in (
+        second_replica_first_shard.query("""SELECT * FROM insert_select_local;""")
+        .strip()
+        .split("\n")
+    ):
+        _, b = line.split()
+        assert int(b) % 2 == 0
+
+    for line in (
+        first_replica_second_shard.query("""SELECT * FROM insert_select_local;""")
+        .strip()
+        .split("\n")
+    ):
+        _, b = line.split()
+        assert int(b) % 2 == 1
+
+
+def test_distributed_insert_select_with_replicated(started_cluster):
+    first_replica_first_shard = started_cluster.instances["s0_0_0"]
+    second_replica_first_shard = started_cluster.instances["s0_0_1"]
+
+    first_replica_first_shard.query(
+        """
+    CREATE TABLE insert_select_replicated_local ON CLUSTER 'first_shard' (a String, b UInt64)
+    ENGINE=ReplicatedMergeTree('/clickhouse/tables/{shard}/insert_select_with_replicated', '{replica}')
+    ORDER BY (a, b);
+        """
+    )
+
+    for replica in [first_replica_first_shard, second_replica_first_shard]:
+        replica.query(
+            """
+            SYSTEM STOP FETCHES;
+            """
+        )
+        replica.query(
+            """
+            SYSTEM STOP MERGES;
+            """
+        )
+
+    for file_number in range(100):
+        first_replica_first_shard.query(
+            """
+        INSERT INTO TABLE FUNCTION s3('http://minio1:9001/root/data/generated_replicated/file_{}.csv', 'minio', 'minio123', 'CSV','a String, b UInt64')
+        SELECT repeat('{}', 10), number from numbers(100);
+            """.format(
+                file_number, file_number
+            )
+        )
+
+    first_replica_first_shard.query(
+        """
+    INSERT INTO insert_select_replicated_local SELECT * FROM s3Cluster(
+        'first_shard',
+        'http://minio1:9001/root/data/generated_replicated/*.csv', 'minio', 'minio123', 'CSV','a String, b UInt64'
+    ) SETTINGS parallel_distributed_insert_select=1;
+        """
+    )
+
+    first = int(
+        first_replica_first_shard.query(
+            """SELECT count(*) FROM insert_select_replicated_local"""
+        ).strip()
+    )
+    second = int(
+        second_replica_first_shard.query(
+            """SELECT count(*) FROM insert_select_replicated_local"""
+        ).strip()
+    )
+
+    assert first != 0
+    assert second != 0
+    assert first + second == 100 * 100
diff --git a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
index 181144b0473..bc5273036cb 100644
--- a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
+++ b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
@@ -69,6 +69,7 @@
     <merge_tree>
         <min_bytes_for_wide_part>1024</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
+        <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
diff --git a/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml b/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml
index c4889186e38..7b426faf66b 100644
--- a/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml
+++ b/tests/integration/test_s3_zero_copy_ttl/configs/s3.xml
@@ -21,6 +21,9 @@
             </volumes>
         </s3_and_default>
     </policies>
-
   </storage_configuration>
+
+  <merge_tree>
+    <allow_remote_fs_zero_copy_replication>true</allow_remote_fs_zero_copy_replication>
+  </merge_tree>
 </clickhouse>
diff --git a/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem
index 293e1c7f564..a64cd623750 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/ca-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFhTCCA22gAwIBAgIUVRNcr0jCH3vSTxg8QYQH6CCtyF4wDQYJKoZIhvcNAQEL
+MIIFhTCCA22gAwIBAgIUQOHzlr+pa+RiBlRROQnQgfkDRUMwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwMjE4
-MDk0MzA2WhcNMzIwMjE2MDk0MzA2WjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTcwNTQwWhcNMzIwODA1MTcwNTQwWjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQsw
-CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALwojNvu
-fXQYQ4tucqNOEDHf2sNgxwxqY6QdtJ+zNfVjsK4I3Vqo8TtzxfDYGolkYem/bYJM
-xQar9ehUm9ok/0kJgIo8vDXxxDJtvjz5Fd5oFWJLMxojLE9NSa0A4m18jGfbFNsF
-XoU0njiInyzNaU9d4bMpaweseCZdt9Y4LR93FkuhSU/v18lWQPob8SSIij059IZP
-sEUxpDOTxclAmG/Knd/6v3ecVFiQgexZM0gCtf7kcw41mxsAaP/mOexodIZDR70Y
-LYjL7R2ZGhpClfQc8SO5NSpfEqsfreDX7XoaCTsy7/rqr3Nfiby6sc//awG0Ww/f
-FRf2+2BU2xEwOVa3i5wU5raYY6eqFLK9q9c2IWPSqYzAmvhK2pqWQ/iaCU/Q89ow
-SbKudJTLK8Y6v9LW4Q8ZLZF+CzS5cI+QEfIYqTLFdInH1BLoxx7cymEv07CDkcTo
-2WtV8GdMph2P3U/9NoXQDonjCSj0lQUjgUdcrBPaIIVbIn6/5vfw8LQa8PoGDhIx
-AYQkqPR+LHxCqIMzdqKZ+OXD/HPhiigpxLhF7mVRLvvoyrOZVJbcu1qmgCcQw0IE
-fWzvWne+9cYC9lgt8+/k6d6B1uhYsIwwhgoj0dffFjc0sF6zfceGK+H1K2JCE0aY
-zT1HlvSoZdA7lEs5xbGJnkBHqlOvQ63ynXCzAgMBAAGjUzBRMB0GA1UdDgQWBBTn
-AtgFU20JF7kTZCKlY7/hi0kYRzAfBgNVHSMEGDAWgBTnAtgFU20JF7kTZCKlY7/h
-i0kYRzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCpiWgJ1XUw
-a8Bdeznsa57oy+5mqQZWpRVkzTQRHEGV850OGh7WQ6u9kVAHefaHH9hsVxyggton
-6/MDsu4KL5jqKmJaIAepPIOw6DTc2zs044I7W/rxRp+w1hL2TS+EahMrSPwdzCcl
-NNAM0dXocGylf6qwwMqiYAR1K3UIrlyq4QTr1oEPIqJBkDg1JDYrt4T2DroPjW20
-5hlCQ/tft5ddGL0EFEaKWwAcPFm7jAwJiz2eUqmT6PcmaZ24qPn5RXVkaBAkrSga
-1WgM8r3LGu2EKhdiDc5hRJKjS8RZyLvZNNzlL3+N42nGmGZkND5bV6u82OD+qn17
-LRZOt0Cr70HqszSYk/67ijjaa4n/fuuAqorV+yYB8accRXtoi00nxykT+H+yI1rD
-swvcrfDvhUgY5zmunWyQUYh0q/2Hj75GbLup3Cd0B4MrBwqyCqcEugM4OSf6aRMr
-e/vjeggTVPN08xE1LUkugalx0B0aoO6qFahJ2CmkAcYLLlS2N+F7TMuPavc0kVxD
-I3qA5G9zvNCliSLX2+kM+LzslI8+pP/A98bvh6nW4HtZkI0jq1ks7XR0GeOhCI8E
-0l/YuElxxgKhN4INKhhMoDKqPib4z8gbmkenR2CenQCpfLMIrhTXZgtw+gvEgpIE
-/QK97G8XPqga6zn471wrYJnuyJli+sP7aw==
+CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALgd5Tta
++M/XAGMhdi44sKEp7f81kTwqUib4mkHj9Nyp0MKMo9KodV+t60Fej/L0D9Fm1N3V
+Q+CC4numWWyaBK6hFdfkU5wvbzZnBx8KozMoeiPLPes6QOl9VWkq3lpBDLAcEZM6
+LMsvNy1jsUdQ06lLy6j1lH9dgIe77qNf9UxZhtCJ4ZslogI8oY3q6D/UI1oCpx5L
+J42OyOoCGbTFwzwtHhMw5WKI0EHXEOWwXubdM7P3ETxTjp2+vYPSXj5Irq5XVyfd
+tkCJ7GWouB9x5vYa9Y6DC0J/cgOsdrLBbvLGMTubbFjO87musc1DCb9Svpu/IQDP
+PawdFTn4ASPny3vt0TMRa/O8nBkrIW84O820ddXZhBb0tNT/q+ftffec2rOas7U4
+kE7YzbQthk9otBqvPX+VeCjFJ5Kx3KTOiPGc/eyWHoJbjvwNrnFuEWIiN/1TqhCc
+Y3Qq8cud601yu3dBtCrNAEDCclfnRO0wdKNgkP3u2/lWY4xvMyJfxhNsb/R4R8Z6
+VVYQ4vJXoON0GGYs9D2KURlo+bMIz9hLtZLshK+voOetmRhUmYKa1gE3UxWLmJQM
+/p8A7Zihr4OMv5ioH/hnXvVcSJj9VcsPMF3Z/RhllvOxN4TBLyZ0hW55oEz3B4Bn
+IbA8LcRJUwfQTKtrVHyt07NLbQm0Kp7YYO8FAgMBAAGjUzBRMB0GA1UdDgQWBBRP
+/aq+8kGTfMRAmPgrNaaEHkdKEzAfBgNVHSMEGDAWgBRP/aq+8kGTfMRAmPgrNaaE
+HkdKEzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCycqlIfQMF
+bxjczVV+ootUWeiD9Qo8w3VosQtR6PYxDkFZGgP2/aD3wIRNSBpmRfnHCdv1sURB
+XkKpqG3E22NRDLHwjmXjI8y5BkUxX1xwL9WX5pe9yZTn3eZu6lPtXrhcPnuMvsxs
+X+aP0Y30iMEpHTxLlvV4yNso7ZucXaunWfQTKV18FuXROPgwwnbcZscCQhTxOA+d
+JrB+8WD3BwwzmJU8Whmojmt4pYhzS7q47OIfkxIGugtZbtSxAWXBMGrV0KJkipr+
+omYUV1qCbYXZgh+h2+JtNdBpIZ3K+i3esXT14N9e72oysmoYFQN4Qol8lMgZ3Jdr
+cTH3m1zg1fOne7KT30XKyfTr4iYoph9WHrcv1XwxwYzPbMI+HdMJX2M30V3HEMRY
+RLoafxUZNkFdpWcx29Dok1AI/aVU4vE4+32YdctSJNVPrT/V+Y3dX8skt8tgrnbg
+JnrFCpEuVhkNiwgTS6ktH2ecdpY2VqesUENJtw+m85cCBjxd8XYhRNoFBPQp8SAv
+hEeGc+hIjXYffy6AUo9p+45uOU+RBPKH4hSleESkrI7duajEXaPPl/wJeQYhqvWp
+imbAJtqwI6aCf78NOlbzWiTWJt3g+4kla6oJTInGAdYHcOwwY1KwMWKtSO2ARHjM
+wCCDUCIbtJgxTrUk1Kgty5ipLgP64m29Pw==
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem b/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem
index e85dca8553e..26616a084fb 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/ca-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQC8KIzb7n10GEOL
-bnKjThAx39rDYMcMamOkHbSfszX1Y7CuCN1aqPE7c8Xw2BqJZGHpv22CTMUGq/Xo
-VJvaJP9JCYCKPLw18cQybb48+RXeaBViSzMaIyxPTUmtAOJtfIxn2xTbBV6FNJ44
-iJ8szWlPXeGzKWsHrHgmXbfWOC0fdxZLoUlP79fJVkD6G/EkiIo9OfSGT7BFMaQz
-k8XJQJhvyp3f+r93nFRYkIHsWTNIArX+5HMONZsbAGj/5jnsaHSGQ0e9GC2Iy+0d
-mRoaQpX0HPEjuTUqXxKrH63g1+16Ggk7Mu/66q9zX4m8urHP/2sBtFsP3xUX9vtg
-VNsRMDlWt4ucFOa2mGOnqhSyvavXNiFj0qmMwJr4StqalkP4mglP0PPaMEmyrnSU
-yyvGOr/S1uEPGS2Rfgs0uXCPkBHyGKkyxXSJx9QS6Mce3MphL9Owg5HE6NlrVfBn
-TKYdj91P/TaF0A6J4wko9JUFI4FHXKwT2iCFWyJ+v+b38PC0GvD6Bg4SMQGEJKj0
-fix8QqiDM3aimfjlw/xz4YooKcS4Re5lUS776MqzmVSW3LtapoAnEMNCBH1s71p3
-vvXGAvZYLfPv5OnegdboWLCMMIYKI9HX3xY3NLBes33Hhivh9StiQhNGmM09R5b0
-qGXQO5RLOcWxiZ5AR6pTr0Ot8p1wswIDAQABAoICAQCO/c4Wccb7TFlAhD4wpumd
-zX5GDq0WXV+94CldWGdARnOFvwzhkhRJ1zDtWH3KPfQ/HJBPfqIY8OQfnPUYMhej
-3MnHxGJQKJyuqkHxumYJMFZX7cg3K9XHqne8NzjcddOKNa9Cx3DOkG9RjVpSRQSs
-IS+d5XMGUOa6WWyVKvn3uJvD/B1n12DJDHiy2jtHRVCxOPMAg1z1KMWdwMaFrEZs
-ZrHV/ow1jSN4btGd2SgkqJLA08IwYUKvoX8qQj9wzu0G/+hr5wzrsfZQEQMKQ+IL
-s1b6jAzAV6IrVBbjEZXSviiXyZ0gteuCJW/acpMg+/3JPNQbWrCAFt1wluwowto/
-JAFIvlh29hfE5c+HEMpQNa0tdj7jepBn/0YEbgwpayMikKiLZXEpgheWCGypAQWp
-Hm+N0Ym7HSGe82obxi8EjKRnNwFUtotWzUBKeo9aFwPZHLFlspljd+5ynDvKqXnk
-txYZj6K3TtMs30HAG6fqxSPyiZ5W+5yF7nt6qLODs6m4Os+lrk1GnoqC0/uLMzIU
-CRJKulrJOK4/Z2tPn9IAhcREbS4oROUeNqqo0Cfs3ssvkV7JTHF4IsKhCmElMmGa
-bevOI+pvdjfECShy0Jnbtni6ece/II4/edfUp9kWN45xZLpzDjfqCVD66JS9g6ZU
-i/EVll+d5zaI2TzzwZgHUQKCAQEA3d8siwXbq7x0cAB013+tvkvGMJ2EuS1TWdLk
-a2P6CAnlZMWvv2cPSd2WpimHjqKxrbn6VE79mOc2l9Y1NOUUWWZATrhN7V8xMapQ
-0YiYCHeaMERUAUKdzCgRN2/mRbZCBzpPBbWbb6NtKfRFJsD9zAe2JBwDVh9hvAL8
-YVBoczrEfj1ILnmtPhAJVI6s6rDsA4MgKjLs0Tt7Cc7rQxqNSpHEvwv1yLQmjp0N
-L5b1TEt7fqVJ9dirykJquBYEKf55Z1qZhQzmnbu9OPnzeqGDakl5F/UsXDB5Bokp
-ilcV+nFbh175Q+gTEhaSacGW8gzRw6j18PuciBjeWVEM5hhxOwKCAQEA2RnRMjv9
-46jQarJTFbIHg1SqrR87GSLnt6672M5TX9frzxMCuVDjKgdecstvLjm6X+/cPQKT
-Q3javJnJXT4cx//1J7RLO6ZBVSCZf3//XntdHdFVJf5ySQtK+MJyfxjpzP6KBPfb
-WPrva8p29ejbBdtsOT0M6gY5tPfadU2XEaf+BoyX9NUmu1U46Iqi+eCOjR+GVvhP
-pJzGgLeOsaRVCfc9I7XPoVu3AEx5Kt55yRYm4fyGPsAd+mRDbIXMXdL0k8CfWWDr
-8TT5rqKI+gFPFQCwToBW3DwHIGY+3RmoXFfQ0IJaKwOk4AB7m6HC3mv1crtjTFSM
-9p74oQzNX7UG6QKCAQBEs2cygRTdH5SaXbnQRKvC4emzggLn5/4IMUIjcqioNpA+
-XOwngzz7rU6JkxBzfTMxTQYTdwYVg3qnF2AQSeK8L+o3teADYVd1PnyZ9QbGkGpB
-CddNMJh17+4s0UxnR6E4Zbi0VuCTd/JEbGvBLT8pHzYqBjaOQ1dbBT2q0GAXVhoj
-0Mv6ABlBv2t0MF2gqjnaeI7MIkqsGxPlHJpChAU+EtbuJUDs7cOGo2DC3KaGAlVy
-CLJXGslO7rPm3oJZkn97HlWtGiqKquhTrSnUThDIJ4oEfhlHTocbG/ut53tZuiIS
-T7k1arYFAtJBRv17Y7bMNBQ7k12L0s9+rpck5GqjAoIBAQCVBPSkj6tZbpII+viu
-5rHjguVYyhwtx9jYK1eDnTR7kGGrlPgErjIPslkxYNSjHTsCCUnakv70jGtQlBs1
-JqJo4hesNkSB4D/uJ99VNk3a08D566uP1dUqsFa44/flp/ssG/gvKtbkf/KBwcrg
-RwK4RYJG09IefUF1J8BLToQIuZBTfIP9qaXZZskWTbtK28ndsqrq3a0FaBuVVOnc
-o9k/avcLoQuxTZwS12tAcs+TqOHtswGO5x5stg/V2Q2LxXbeSJTYq/+oZN2R8r0l
-JmrbFsruR4fXylh189jouWjoYdrSlPdBmVG99HbkQCfbtq0XIOsrBMpxqnMtUPVT
-4ZWpAoIBAQCrao4XHpRM3KsfPqdkg0vqFDBA+LzKlWu1fl8w5TGpFK8H1tv5kHNv
-h0XmeU5cXwiweri3KjQz7h+qVBHZeAvyrEoxJQdImax+5OUy7lysDs+SL02gLZb3
-Z7g+u4Buwx+cv4O7hwUEDDk/5X3NBFk7/iwztKUtM+Fl8jt9K3K24s87xXp9YevI
-UEawden9jVcuXQjEUrwz8cjoz/y25vK5pQ6k82PVImkMZK99/PmgmGyOl7hdRA3F
-ff0Kb8pRGmV/cWRKzHaC8QchW8jdU2EGxMkrFl1DvoVKLbyDf1glRncKP9iozHAR
-+s184IJCUvyMxH83uKKAiBGaDRC+Lbm7
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC4HeU7WvjP1wBj
+IXYuOLChKe3/NZE8KlIm+JpB4/TcqdDCjKPSqHVfretBXo/y9A/RZtTd1UPgguJ7
+pllsmgSuoRXX5FOcL282ZwcfCqMzKHojyz3rOkDpfVVpKt5aQQywHBGTOizLLzct
+Y7FHUNOpS8uo9ZR/XYCHu+6jX/VMWYbQieGbJaICPKGN6ug/1CNaAqceSyeNjsjq
+Ahm0xcM8LR4TMOViiNBB1xDlsF7m3TOz9xE8U46dvr2D0l4+SK6uV1cn3bZAiexl
+qLgfceb2GvWOgwtCf3IDrHaywW7yxjE7m2xYzvO5rrHNQwm/Ur6bvyEAzz2sHRU5
++AEj58t77dEzEWvzvJwZKyFvODvNtHXV2YQW9LTU/6vn7X33nNqzmrO1OJBO2M20
+LYZPaLQarz1/lXgoxSeSsdykzojxnP3slh6CW478Da5xbhFiIjf9U6oQnGN0KvHL
+netNcrt3QbQqzQBAwnJX50TtMHSjYJD97tv5VmOMbzMiX8YTbG/0eEfGelVWEOLy
+V6DjdBhmLPQ9ilEZaPmzCM/YS7WS7ISvr6DnrZkYVJmCmtYBN1MVi5iUDP6fAO2Y
+oa+DjL+YqB/4Z171XEiY/VXLDzBd2f0YZZbzsTeEwS8mdIVueaBM9weAZyGwPC3E
+SVMH0Eyra1R8rdOzS20JtCqe2GDvBQIDAQABAoICACUNdyVz0GDbbuuEP2lb5Uf5
+zTiwChNmnPPU0g5ylsOVtTqB3TI2zrA7qv2TzzpgnZJRtIMUOT3EeVnTB2oQsOKH
+7oJtI9ppvWLgZxF7LY7NFY+AhmyBY7DZlUe95dOaBbinXW4Ypg0Z6mvLBVFJ1d7b
+LxhIm+Lp6UTnsEXWuOHtnnD3Xpy/fRQgKY8K+ERoJ9kkcYdqLoKReqOFWrEDn5/L
+oKLSE0e6KtclNfRTgzXIzG/qR+CxHCFo0nDl9CtqqyTQ1Oxj9RqV5yoqQyuo24cp
+s8NDYg+24DYXDig5P1/CPQQ26h4RQAFdQ9EALcUAHPXxB+5Gxq2NiMkKvQgBzPRC
+92yD8IDarjwizeP5hKCOVCAyspHxtOFgMS8LpHQ4ul++sOPSYV8pL+v0dOhs0aky
+96PZyZWsvnN/CVNXuuTAi0RvyUDTGhxt4mc9TUe8+XqFC9P1BHaCyg+jxbEjJCWR
+YnJfBiL0auXSL6R/RZ+LSRQtS5RUMNKESYNHFYVik/mQHZoy/1W4pOoe25fnQ8f9
+/80IIzsGq7RDVHgsbPCKgwN7dpDMhTmWcjrC31+oOTWFmIkDkp+dS37ErO6f9kLF
+e5syBKTvbV2yscKCTWXkoE9kgCk0TVlwysWKUQtRV3JKsy//YLH/PfjfH/PdWBvv
+CXRmZJTH7+Ua5RIEGoT9AoIBAQDD+GMnfYkSOPZPNv6BA3AW7PvX3lwCE5eRorsD
+G1hBfYbh582/yG7pRvSTxdxH400jwCU7Et2wlxj4ClZxOyBoeaOi+8wxZB4xFpGG
+e7OhGaQJ2Vd4LWqjdb178Qk2a4q8oOsciHoQQzJhTZhd+iiJLpnTIDTR13OVJKeF
+Xi4FFk3GPOq7TpugMdQXZ1XB7rh5t9lDjeYRVj0fDU5amBONPKcVYO8lIZElsZjQ
+EzfxAeYEJxN+SaNkUUGew3QDZI/caF0nji4WcuEH2LracshoQaCl5MLaPJpMJIOv
+aCa442AO1vpRWNyk9dZDjrm6+MjkR1gYPTSaaNll3lmqr2AvAoIBAQDwg/sJOFWa
+Hq4lMD5MuX/u7We5HcT1QOzlVsXBEiGiUNcQUuQ+leIZRqJSosEpgnuVS33sbc4r
+fDngZJLItwezQ7A/1LqzJVgHb0Qp4Sq0ak905ibjpRd19y9E3tx47KqNzziYcp0M
+8t+gOBH5tDWHk8fjcujMuwRaQoHoJvDVl7jSoPhYVh8BIS1lKvYz5/hk/2yG43AF
+MIjbUvC4b3yMiPXmvoUKjZNrAM/5f3E4A7SW1aCLEJ1Humepd3pLUrZsma6qq9x8
+lb2MQeW3UG/Yrfo1NquocX9KjHawGe3vTrPWoi0FQMYVHPKQB0oeLd/dkveYOl8B
+DPEcUEBDrMMLAoIBAQC0fvCEjOFVAVYLu/FJTqtM0lVbjBheaUEvCB0LTYJKP52e
+MGyW+br97TaTbKfpJngEN5OTB1tcrK54trzLadP9phuLoDOAQmB0gf7jSMg312/5
+Ck/ABsSzbVxq7aS4lPChr+0cyK70j4+1g0yVMjVntJ5FkOJVbAWvFqWc9xOX5+UW
+c0EX59z6/SoFrE2WY5NRuH3J9MY0raN6GD1Uv8EyUuzpifB52KLhfuPqsejSeBct
+N/iCVrzBRv4Thp4yCctfDFjQd+oHDyQon/vp+9KOA/Q9F6hIbY0IGJGZW2pe3D27
+LVI83oXLAgqpCqoShdYyO2vuV2E93thtNRCNXx5NAoIBAE3/Lvi1eSUqz+SleX6e
+JXvRJ3Lj0YyLSoexFR5gh+HAf43+o6AcMR9rRZawyx1wAC3RNnvmvBZkCczYMLXA
+jVG4IL8CeK1B7gMzNRKzv4qUc0IApRnr3ujViVG3SB46+bBVRBBEEuQxGw41QLcO
+ltFpvkfnatGB0I6IxOIJRs6tjjVYGFFlVFakcLk/Lmp0zpvKLWKs/RXhwHAHvKLD
+HMviWoRCwphCg00PDWLmzkuRAA5uJssSTz8Elztg0Jr+rsQXLoqQg0cvtDF46UsC
+XdMR0HNTUGWmsNX3KUJAlmWlyzJOk3UBpXsRUSQeCQ4yaEfNsld+jnKjxMkeyUhp
+DTMCggEBAJs4Ng8C7Pp3q/cP8/lRaei89NueSINNXKKxzuKNg6iy6w9kOqPZef6+
+MoAe14I0UX3051mUcz1RqJU34iOC1p2CjjfM7eT8Ue9TULHeMqc1wj6xseSqZYWM
+3R41p96lum179pC+hRGRl2l418xx1/bo079sB8yS/qsUiDyBIBkASgiulXkYDBER
+T7L99aqXHrBlEu1S1THcYt8GOqOUuYZ7+RK9i9+Irk58zN/Pkucj0QMHN4WVInYA
+kepOlUn0KlUlyn8g9Ii7gZKHFKbv4F5QIdXE5tXX88sRtqHG7GYMFa7kZMGG6bIX
+7MqACWG/2mFExJnaXtgA2HS8NYPKUcQ=
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem
index bd6eea62094..3a953f1b941 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client1-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCAxgCFAXxDGdWf+MHldd68lQPasjUzyRfMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFMDCCAxgCFC1il5+r7ZqfWcm+w5gJP/pffeI1MA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDIxODA5NDMw
-OVoXDTMyMDIxNjA5NDMwOVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE3MDU0
+OVoXDTMyMDgwNTE3MDU0OVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UE
-AwwHY2xpZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMBU0fao
-RrITeF4kpN81p7qirX/Gc56+Cux6u7RF1O6WU9v+V5jLw8chQZ87z4QSrFiT1ZnT
-pwWYPwJ+pDk6AWEoiKuOaceOh0bjZCuxADHs+qQrye5D8GXvyFvWE2cT1pD5JNEZ
-DSl2YHqNs4uTGRP9BP817iRDcuvdxpanaWxfXGfehJRMiEVgKDs+RUpoW4aVNivI
-InrUWc4RXXkzaJKqhpCU3jAJBV4jSD5ZnA8PUfcoAj6z6T3I6phuDfRP5ldA3br8
-yg0hCB7Y5QrO5lRAgEoIuNnC+U6/AIwWPI36Rjiwg3EUwI/BIiL4AWjzkjSdr0mn
-zyHPRk4pcn01T0GTpQi6tfZZpumDD3LkPuEy9svMpJ8ntqDnAsIJVjbg1S60hHes
-yYHoQw1HxU0vrncxwcQkVaPLx0uGlioaLlvu83AVnWXbylZXsV/pLy6dE3H51GBF
-DX3Zj6nkuJitk8/hNp440/Lve7SaKFPo5NdH+8ACWGdFdz3zxgPuhBDoxEeqj4c1
-FQA1ABXx2akW3lQ5VxTAg5AYORvVhJTozosr+Kn3MlRdZjl94tnVByD8MGLLE0C4
-L/qXR/IlbkOCz5LHapdC5j62ZEBwiElmMO/tMGl4ORV9tdTBrRZ9DMmKek2E8Qwz
-y770PGkhp1cTzZt6UfZEympowmfjtiZfHIq1AgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggIBAHwRpqnpcD3EW588GSDZhZrVf3nS9M06ljQGtDUqNSI4XJp1cVT1sMaa4LjM
-cWgHtayFw+jbDLwioXHjMlV+8tERH+0x+qsADG349caDYT/OF13v/jyuboUZ9AqE
-KpfOQH7jCLU7rEbEl6kvT3F3xaHJg8mE7msyRFfguB2JrqZkKIj4HANxJUJo4PwB
-5bq9nE3AVNAgUeQEwfu0r5SjroNpcHfm7xWqMK2mDMCsy/DvI7n97Q7vZajcTT0x
-UXfgx+3CLEvLMpa2myE5OIMOeLzfZwxrxyNH7BdZsROnkGv1cX+9HZpYcue/UDxp
-P2OApbTuZKaTJOyMADc17s0seE0DTAHnHAWrJwVhf8wYKKtEs+i+Sw5LNSkh5fgS
-hTzGF93yClDYzWEqMSKhKPeimtpz4ZBNuGf471KbpVbUKJJvJmOxqoZ5S0kpFILL
-YMALf652uf5or5d0cDNvcJTwvMi6evchIV17d/jH+MxyJQs9VCkMpJxFbMrXb3YB
-b57K3Z25P6w3Qfj4zuKQFANari7Gs6qSiaUBiEhEdTQlGspkq+FLndtX818sbMk5
-LAK6JaUH0ywV2jn5XSW0irQLDXqb6Q0bSyw6pdpDjk0o4UW67JCE4kGagRDnfSqL
-ZODvO/dEtVLyAsjmOx8MkqLyseI7VESVd8eiJAyL0sifh+/E
+AwwHY2xpZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGHbRBS
++W5wgB0Nv66ODxB8lU1xCj/4imLZPZcLzPdtL0fR1TS+G8KjGSrxznEph4NbnFR7
+cE6fKtuC/OSSUMcBeRiXZxjW1+uYjGp6HGJYuyaeVKMrhP2W7BD9GuMu1l0k6+6K
+R8gGCW+09ROH8Uy6rvCI+aGl6pgwabKzYWIu04EgIsdCgj9aRpkyxoTwFdriDJng
+bTutXrPCC+LaozYJBD4tnwBzSfpMlP+1rEPc/Mpt4beDyLA9vp15uVYQNaJKopvu
+CoflqLE04QhcMdubsUjQSikutz5x/chElyWG8w/5kjAKZmdwJLa/yxg3NsCoPdmS
+j4aVwQwK0seY5o6yUpdADc0W2BzQ8veuQoSX/rWsf/lWQe2VG7aEn84TSJoUWwgX
+LIRQuFdyjE13w0VdprJo6Z07Yuuo3cJ9dnnmh/LOZL84tLC4o4qSsnb5UjjS7HWC
+IDVtsvz61tKyApJZ1IvsrEshj602whrIDTCZ6jMhpBLpZIj8GRxSRKxpC+Nqu5Zp
+sovCNWbpYAkBns7svwEZaRfKY1Sm6bbgcZk1VaMKUIPHqUjndVkKjZ7SeptXCf2K
+v18xEaXDLerg99IhRzUlNvv/MKrG1Y9ukO2xb7UBvFPzkeiL09MHTR1bZcvowiSO
+3IlBvCixjuHur5UtsGX4wszpSrhtaCYqZG37AgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggIBAFsyHyCiYGXGB1M/dSqnsXm4t7VtnaAKJxNYGtx4pv23jdgU56QgLpCXU6k/
+tOE0uNLTbIuDPRGPAPNlyazFG7Dk6OuEQZ6rTGpcgvgJMZisLynSUhSC1AO+10F+
+w/84EjzF11SrU/OuOh8UcKdNBQVJUu5MU3BVzoK6h+g5iG95KDAPpk/7yw46WMJJ
+HI7PR2H2Xu8/7I9LyRl1kqMvzOEvLX0bLlQw5HZ8H/kEgxSOtUG8BqmQgxHL/EwI
+kfYu7X7t/f9oqzi/AlFWtBBQg/SPDPpsf7uyxfcjduCiDtNxjAa7OId40WHrLoCD
+5NqU8ssphuCKf9kxFp16SB8tkVjo7wJoWCgr8HHqArdOVpS+RNB3fjwvnDt+JXM6
+Xi6Ui6WBrTp7T/VQS2jMz04BbpVLnJcQXX1ri+zqQfM4KFsroZWTz/+WMdSD/tHS
+6vnfDUKFEvN7GdN0hpV94r+YinbC9UTgRC7V6prrao24mU4EjaHjQJ+c6tymNzye
+azPSoqJiYhDdFq/txxNp+OusBshz5sAl9yJye5vvvdCsClG/6USWVfcixBw9vhcp
+m6LmgZd6Gc4cROHG5kGQNwPG8IHfr9hljGQGxnH2lvcRt8t/hEhP3NX+G4n4ihKx
+g63Iv+ZMUHnHLs6qfQo7ll8150IrLTXubEKnH6M70/75j4wq
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem
index 8bc1e656566..767afd6e2c9 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client1-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDAVNH2qEayE3he
-JKTfNae6oq1/xnOevgrseru0RdTullPb/leYy8PHIUGfO8+EEqxYk9WZ06cFmD8C
-fqQ5OgFhKIirjmnHjodG42QrsQAx7PqkK8nuQ/Bl78hb1hNnE9aQ+STRGQ0pdmB6
-jbOLkxkT/QT/Ne4kQ3Lr3caWp2lsX1xn3oSUTIhFYCg7PkVKaFuGlTYryCJ61FnO
-EV15M2iSqoaQlN4wCQVeI0g+WZwPD1H3KAI+s+k9yOqYbg30T+ZXQN26/MoNIQge
-2OUKzuZUQIBKCLjZwvlOvwCMFjyN+kY4sINxFMCPwSIi+AFo85I0na9Jp88hz0ZO
-KXJ9NU9Bk6UIurX2Wabpgw9y5D7hMvbLzKSfJ7ag5wLCCVY24NUutIR3rMmB6EMN
-R8VNL653McHEJFWjy8dLhpYqGi5b7vNwFZ1l28pWV7Ff6S8unRNx+dRgRQ192Y+p
-5LiYrZPP4TaeONPy73u0mihT6OTXR/vAAlhnRXc988YD7oQQ6MRHqo+HNRUANQAV
-8dmpFt5UOVcUwIOQGDkb1YSU6M6LK/ip9zJUXWY5feLZ1Qcg/DBiyxNAuC/6l0fy
-JW5Dgs+Sx2qXQuY+tmRAcIhJZjDv7TBpeDkVfbXUwa0WfQzJinpNhPEMM8u+9Dxp
-IadXE82belH2RMpqaMJn47YmXxyKtQIDAQABAoICAAEBsKOg19XgwjWD7ZT5e+o/
-JbdQe5RuHDKGperYnres871oBF9ZWan2I5jIwFpJmrtP8sM+V1ZxKItDzGo8QnuW
-sbhsI2OW/GBDmmecIosgWWN4kzL7CgwOiDbq1OkqMmpJ04aAohAAfZrGmRT27R+s
-qFUJnDh2XeicHYj2UVfu29XzVTBNgj0StsMwnT45c5ktuL3b60pHSD0K3DlhKn/y
-AohJLyyDL5MBjkQ9RdLSWrR3ciOP332iSpAHq20G6ga04TQ0VH5jGN7IddJrqMry
-F3nLt+Pz4EgoOcGB8Ekx8SIk0ltKJ4PZF+uk7qT0+WPrG1rAVRYxNoX8M4wyNjr4
-TcAZsV2DnGdnp+2u0SSzMczeop5hPTJKxaLaPw1JOoIk5fqW94MbEHqGnEXEIN+D
-OWeUKWZ/B1YubavOeR+c3STZrh2SgmhKk6g5NMFlfnyvolPu47H8NOrewOhVG+TZ
-gsQoGxSyOXwZTQ/Jd6Yg9lek8nKJBc4Res7ia/x3H+gjjRoNFI+L2HQnWztx5YMZ
-H9M6hcpclZubO/w4iLq9OB2QUHn7aIT3lWRV/xS0Yh2zGCufasaMA1KSKC5zq0Fk
-gCzAkYDq/ymrJs3LQQ0wegKd1akL4z5fxmXTn2v2BGoEd52uuxhL0mM/9zzRxdR2
-IsOgAym+siLXMCHTDbdVAoIBAQDuMcea66WKidS+A9frCEsabYccKzrdMEhs6Mle
-orFieMC+3ZpzFIBkXPZ522I+M4nIdBKuRw9PnYTE5t30euOj60Oq905j2a+Ho4ki
-kW6dC+tNDF49Hqxn9e99xbvTUi97dREcERlHA+AnRektEciyD17bi88aUy9w83Mw
-G5Z+ej+9o40w8+TDopE2SIJhUAHR6LOAMq1v5y1lmTn0sbTuxZFLA0qWX9aGLi+T
-4RD0MzJAtKJDbr3yPTLHAXmaMSKHhWYYgWTH9iwEhGQAm5VJy3oNJUkM7ej7Yfs7
-aTDOk61egCKhEHdWavP68MqmNOPHgnq4/edmvQnhfKtI8SMnAoIBAQDOtWDi/OnU
-ZjZPnmJwwoPuXe6IjYg47bFRGv94xEpSesCAYdXNaNLPl0f/Ut9y3nXr+j+XqJWo
-UqtRGFu2i9lUK3cu90GLXEaLbYWGcgL8YnJu0senLxkqxPWcGxoKmbo3xMjqk/pF
-EVZ5e1qqVTlrB4q7QWmLKrS8YlcaTnChPeSBRFfryg/xvQ11Hxtq89SKkTH4ps16
-0KtiCxvfQHVASyRLIKLdyabPInB+yP3Fsn4BIx8jGtOQ/OCY01TXq9OyaRu2hJTk
-qsjOLnqf6huM2so3X0Tw8AdgNoF96JJvfhwiPI5CSo9UKjhuvus1Ip5ZFFNo4Ngy
-n3Zlgp1HxZzDAoIBAQC9ffqmo3sxqI8Hj3UxdIqS/rlyzm1o0+V6RwMT92gYx6nG
-7fLWRGQT8+TdcotIoqWlQ7oszTlABDdAkc3XlgANQre1hkLlqqM6y/3n8zzFUVsj
-E4jRJNrRZdTeAPV4mzRNCgfPhUbPuSSU+cgT48b+6L10+VeMQMtIF1T226uw+L5G
-tps3a3/9pxHQ1oRquESKYo6SmT5i/M2fuvNhWBJxtdjtjTPER4AZhRqykWV0cFo1
-Ib7I2Ivh74+6w9Ciux4WJCjhq+aqMYw5F72awitU5rw1QwlHcOldO0irrfZ3EQLm
-YBesfLYDmNh6NR9ydDcVXBcXnl593DvFF/IH+FYXAoIBAQCQZydLCzHy3oC8eEH+
-0fRGljooDO+IDYzcwwaLgF0HZ5eJWE97EuqKeP2kAWn2HjC07Hp2YSBDmZTyrxiK
-2wG1CjRVjAeu6oShrJ4mAQnS9JdKkldFlOJ4/WUza79yflgX05IkRcIFdAo8DY+W
-BLl66qbhD95CiU//dpew2fFWwx0ZrPvazar7zn1TP6rwuWvWbX5CXYyYaqP/dxE+
-khIXGyc8kI0WcWPlugJqn9CgxoO+GaIL7Ra1Z+MjACd6DyBxt3nTtKUrZZ+oYdHq
-Wypp6QJxUk2gH56XeRxXMBz0ZF4VEMa0ys98FY6c1yULVqbWRhvK3aBLJRkZ6vgj
-BorvAoIBAASy89mnP7d9jY7pSg/8znsUF8fQwKpRJZKS+8xgbzsZP+zT7CjxCbPL
-xcNK0fl6pRBv+gyIM013R7J1uvZJ3W6rspVxlXOvofvwYSuLOjwsZA26RM8s7Do5
-e62Bg7PUHbbaD+C8HzbJlyXeQ++oddWPbIkxJMwhP1Uvy3wA6c7E7w/UACZvv20J
-KriU33QmW/o0YpOX8xBVwgsCld+IfUIYm1S1mpU6k3oUfGIA5iyKx1XLTMhlaYUG
-dTdExwxQp73Jk585qWSpaiQ05OrgYyzZ8OHA2kRTPK+54HSwRfn6senf3TakZHBi
-zjy/DZmOU/a/EiR7MCGg+jS1x9GBxOE=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDBh20QUvlucIAd
+Db+ujg8QfJVNcQo/+Ipi2T2XC8z3bS9H0dU0vhvCoxkq8c5xKYeDW5xUe3BOnyrb
+gvzkklDHAXkYl2cY1tfrmIxqehxiWLsmnlSjK4T9luwQ/RrjLtZdJOvuikfIBglv
+tPUTh/FMuq7wiPmhpeqYMGmys2FiLtOBICLHQoI/WkaZMsaE8BXa4gyZ4G07rV6z
+wgvi2qM2CQQ+LZ8Ac0n6TJT/taxD3PzKbeG3g8iwPb6deblWEDWiSqKb7gqH5aix
+NOEIXDHbm7FI0EopLrc+cf3IRJclhvMP+ZIwCmZncCS2v8sYNzbAqD3Zko+GlcEM
+CtLHmOaOslKXQA3NFtgc0PL3rkKEl/61rH/5VkHtlRu2hJ/OE0iaFFsIFyyEULhX
+coxNd8NFXaayaOmdO2LrqN3CfXZ55ofyzmS/OLSwuKOKkrJ2+VI40ux1giA1bbL8
++tbSsgKSWdSL7KxLIY+tNsIayA0wmeozIaQS6WSI/BkcUkSsaQvjaruWabKLwjVm
+6WAJAZ7O7L8BGWkXymNUpum24HGZNVWjClCDx6lI53VZCo2e0nqbVwn9ir9fMRGl
+wy3q4PfSIUc1JTb7/zCqxtWPbpDtsW+1AbxT85Hoi9PTB00dW2XL6MIkjtyJQbwo
+sY7h7q+VLbBl+MLM6Uq4bWgmKmRt+wIDAQABAoICAF9pe5lFNyk+OMNaMGsIKaAo
+s9kyxmlkiSGT1fweesZvo5RGfNVcdsY+b92OyodbAK7/3vJ9yxBQA6qmiTTNeBqs
+/L1lg5Qo89n44x1pp43LDjXLcJHjllUJ78euaW+g+1l/pvv7W8lfRI64yez/pDT+
+gtoexefuq1qt36aVLolf6bGrHMpdXWaLhOvprxsCXNwFf03r6h62ak64d/C3dyjg
+SCG5jz8DF/FZiUoKkOwCSvUoOFSoGazePBhaV0f5hN/G6SV0NefrD4CSP/HFtmT9
+fOmXm0Bzgi88tvBh9JyxTCtPkUWzEuqjTM52f1QogIt6Rsf6LF2ffkYIHgP+u4e5
+dDFw2RAZg1DFZrZOyIKW+fyDqftdSj5LEN/AKofc0os4qzCXktcl+x8KSxlGnhn5
+i9V3ZwvaV4ivMxWQ7EO1Jftqgy2OBwTiFHkeVQ8eC7676pTx18UmN0L2heybA0Rq
+I9mrzYCDYBn0HGYdb0xplPpDuj/g7zLx+Edn6CEoaXGwU1kT7SoNwfVsix8/+k2x
+jYee+f2EjbHmBKA7UeXkLcMa1QpjIipMX5gWBYa6ACV+xdDrvoMDjrRx7A2j4FF/
+T/tv2GjRWeqWB6bySVA7l92Lltm3RLsW82GBr7I9a8xScUYLa0AfNeeBmS5AIgCA
+5FhQ7ivlZ56VWemfiTXpAoIBAQDNp6syo1svZJIBQiZIQRxh1H080wtYDi5Yan2R
+loQbjbEitzXC1+rFNtspHuOc0frv5XBvbxOJwXmEsXcS8sWDQBKadr4RDdPGeMDa
+SA0If8aWN2BjcILfY9VjJzbL4DY2Tfua9OmIrGvx0LMfPpl+6LXgZzCgPv/o+39i
+Kv/ISHEsJITloVeuMq5Py0k6+KXepYWAvdrLkEfxg0gl7Ds2TZDOs58gZRb0lW9+
+u7VOtN9EFd6KZtaU1HfBXUBM57Jlt+aIBOGom8LB/XX7bBi6puIqZOK4VqGR+29j
+wj1lnX7npfy8dZoCEplTvp3AY7pTO1BrkNluOcacmnSTGtfjAoIBAQDw59P0M0/z
+82MwpGCDilXgqXY+SWk8JvRY5raAthqWrjiAkuA9hjh02PXmRLhExs9owsptuP5q
+CckFOyoILZFA4IexlvPgyW2rPZFyrMpI98YYG6Lyw0aMSyDX/rBKJA9cServSjzc
+1eLT9uPP43L3EkWLtgocHnD1lZ0YSkAe2ehTGEiNOnaW5H81csK07LPYdEvV8wup
+aFNZdcUMJt/V8/C2nkAQpLsgGMLRKYgw3KX7JmtkQsldjK0j9rl7eVH65LdjBXuH
+cRMS1qRJgHl5+Yemr7890aGomhD37RMYUKbd0NCQIn2ISxtWF0pWra8+zg0fhPiP
+EGPbeNVVI30JAoIBAQC1B/Vhu/7Wtzb3OJ2uWPJ9A6nC0xxXRRRy7Drg35gnERFu
+t8vxWlPliqZdij1enFDCwDu7PBH833zy260v1tka8lnt8rzZEkzrlvxcqbQfWSsc
+rF6C6lWqA52hjLFlwla2cusauqCgmPbkhIxI4rgHyR3hDbT2Or7W/hxh8+v5CBvn
+ebYq1V3zj9V1lENAUATi+t2MOJPTQYyzApeOGmb9JEZmTiOzRolwf+MHsoClaf5n
+VsDxIBmgJW/NnSKvD/4wIDQkY/eojoRgc5dZ3QvfsmvAWdJh5pCPir/BFwko2/0M
+OUdDNlp9nJWv7Em9Q4yPG9Vs+rMLnnxA+o3HuId1AoIBACSQWzg2TY1ORKDOYiO0
+7GHj9qFvjPxnQTD5G3wfp5t1J/hD0qsj4w/BGllv1rQBpNtWrVjH+j1n7M3RdAi3
+udMqAQ5wReW5TN7vwlKwbSd0C+n+z9We0+dZQ8vkyScHoBk20uSs1N4DzKC1WVBl
+Sj671DhnUdOAv05W/fgA1QiZtExgZCqjU/qFBdW77Fd/kbBpvlTjxcJZpkTuvhCh
+GdokY0WkcT7Vcd1mRLNwZU5dPwgGhcg65ss/HcxWl0JpYIr/CeKKo3wkKmvyjg7l
+5AoiWHdxN0qPtcScVbT7k6leHGWQWwd1ZK46EBUaBdtwEygqKA2/peY4658VEPQS
+JdkCggEAGLjOV5XjLMliu8tWrOYE/nBZT00KOd4er1nojcxrRd5q2MDbqMqSi5xV
+hibl8Egasdx+Sc8+HLazGPFizNrxd6Ahs3tBdUpYClk4dqnV1X9XK9WV1Un6ULD7
+qzhYQ1gJhQLg/rPxg1BLR/Gl3LahlDdaLvDFTEYPz48oVTszC1yQ8A/Do466TuXf
+qF5yPBkt/lxasqMa7ZLCUBMZDF/FGL6x0Z9HDcJc9nv1dLFc5vggoEzts8S8Rmue
+WwNcwQsuXEuhpRv+Uf3pimoNm7qfPx9vKS4qxHswHCoC4yIxM2VaALUSCq4KicII
+3UTpTl6z0FqLEeB20OY2dIyoPhdNoA==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem
index b821609068b..d60adf1f62d 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client1-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMBU0faoRrITeF4k
-pN81p7qirX/Gc56+Cux6u7RF1O6WU9v+V5jLw8chQZ87z4QSrFiT1ZnTpwWYPwJ+
-pDk6AWEoiKuOaceOh0bjZCuxADHs+qQrye5D8GXvyFvWE2cT1pD5JNEZDSl2YHqN
-s4uTGRP9BP817iRDcuvdxpanaWxfXGfehJRMiEVgKDs+RUpoW4aVNivIInrUWc4R
-XXkzaJKqhpCU3jAJBV4jSD5ZnA8PUfcoAj6z6T3I6phuDfRP5ldA3br8yg0hCB7Y
-5QrO5lRAgEoIuNnC+U6/AIwWPI36Rjiwg3EUwI/BIiL4AWjzkjSdr0mnzyHPRk4p
-cn01T0GTpQi6tfZZpumDD3LkPuEy9svMpJ8ntqDnAsIJVjbg1S60hHesyYHoQw1H
-xU0vrncxwcQkVaPLx0uGlioaLlvu83AVnWXbylZXsV/pLy6dE3H51GBFDX3Zj6nk
-uJitk8/hNp440/Lve7SaKFPo5NdH+8ACWGdFdz3zxgPuhBDoxEeqj4c1FQA1ABXx
-2akW3lQ5VxTAg5AYORvVhJTozosr+Kn3MlRdZjl94tnVByD8MGLLE0C4L/qXR/Il
-bkOCz5LHapdC5j62ZEBwiElmMO/tMGl4ORV9tdTBrRZ9DMmKek2E8Qwzy770PGkh
-p1cTzZt6UfZEympowmfjtiZfHIq1AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-fGx/D6rNeaVO/vSUGX5q1iJKd8Gnw+/8NRgbuvCDuDOSy8LyqnLmVntj8q9FHpJM
-SRH3LnylMVFZdybso2ZbhR1UDReGvHCtKICG3LLP1uWwy5nS3mkGBHFm9COyFP21
-kWOit1+106gEhg2f/NXh31HFmh+myepLjPEj5KxvnQhQfaQESsDYDZAs6/qT1mqp
-A7GixOXh7hIFBJ97cU7fKby0Wtv7GqKAYQkaf26ImoGijtMPIlzvwJboJWmOYzIH
-zrOHqspFkJD8YvYOwLIKdahViqXU7POL9uRn0vFyaXVcyXRq83Pz+bPSW9AFYsYG
-ukSZiJs1yCINZI/Mk1vlfaZWYPIbBkJZ0Ny0vw112dIEilWAkVdsmJyV95aBddQI
-Md64CYWZbV5P7/0QOX+v2ZQpWVnaV0m07K6VVuTL3bw6BQ9fcj7vaql6wl8jl/9l
-nEotaZiY1f1pUUko3XzXpZEFB1lGBHupuS/Plz8pfFefN/7sOZoWn1VhD9I1A8uh
-b2mg6hyQ7pe2NrHOTY1+L1xxxKKHt01kvDhws09qxRXtNsLrL8tl94i1ndLjHIwD
-/VRnVU04E/VoTKaEXuETLZwOZu8pLwdiejrWEAmtsbmmcKq/Bk42wa+Wrmge2Chs
-V8EOAtq91AjUcQeh7s2fV6yWweMGm1J6pdkNWckCsUs=
+ZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMGHbRBS+W5wgB0N
+v66ODxB8lU1xCj/4imLZPZcLzPdtL0fR1TS+G8KjGSrxznEph4NbnFR7cE6fKtuC
+/OSSUMcBeRiXZxjW1+uYjGp6HGJYuyaeVKMrhP2W7BD9GuMu1l0k6+6KR8gGCW+0
+9ROH8Uy6rvCI+aGl6pgwabKzYWIu04EgIsdCgj9aRpkyxoTwFdriDJngbTutXrPC
+C+LaozYJBD4tnwBzSfpMlP+1rEPc/Mpt4beDyLA9vp15uVYQNaJKopvuCoflqLE0
+4QhcMdubsUjQSikutz5x/chElyWG8w/5kjAKZmdwJLa/yxg3NsCoPdmSj4aVwQwK
+0seY5o6yUpdADc0W2BzQ8veuQoSX/rWsf/lWQe2VG7aEn84TSJoUWwgXLIRQuFdy
+jE13w0VdprJo6Z07Yuuo3cJ9dnnmh/LOZL84tLC4o4qSsnb5UjjS7HWCIDVtsvz6
+1tKyApJZ1IvsrEshj602whrIDTCZ6jMhpBLpZIj8GRxSRKxpC+Nqu5ZpsovCNWbp
+YAkBns7svwEZaRfKY1Sm6bbgcZk1VaMKUIPHqUjndVkKjZ7SeptXCf2Kv18xEaXD
+Lerg99IhRzUlNvv/MKrG1Y9ukO2xb7UBvFPzkeiL09MHTR1bZcvowiSO3IlBvCix
+juHur5UtsGX4wszpSrhtaCYqZG37AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
+aCqXR9C9dZPY8ohqtRTPYcmYTURPAMIRnDvfjtUc9896GIJYR696gh3s7oxXo4c5
+85acI5E8LY0zrtq1yOHRSlsmoIp+Tm36a+K1C1H8IZGvwLhUGXogj7eWzGOTTFx2
+OK9m5QiaL3w4p0P2magOlDxA/PCJ1Uqnz5eWbdHT3TBFIgwpRosK7j+/n5eLfgP8
+gaAUhEW1cUxIcFy/nB1TUhrsj60IaDgfgDsKq98c3sDIf6pdzrRuk6m2ur3eVoHp
+1gcDn/XhVcF57cvhi0kdBNA65pKfgvHVhFx2YUdb1nlPjkwDrkWTF/HyRxMxs7a6
+g97PvBHvTc8wojnZpRbXdQyaoNjAhJzpcXaJ8qPU8+P8FnFFEsX94nh+u0FTqtZF
+DRm8opUwYGrPCznb/u70wlMMgeGFD8BSQ83TfwlEug6J85Kfh0Vp8Z9gD/GNN4sp
+RLFChDgU58TmaG+gFAufhUJjDoSwZ2LepwhI585pdePvUNOL+q4hl6dL9pfGKVxu
+gwdvM345CJGwbIOhnol6kfakjp3mSqejXGIjnxdzbTKJkGqhwLcL3A06Y37xykRJ
+nkHN4ahhLnFEc/k9O1SwcvTTR1Ct06bYGRNbVrjy1RWCsjyCWokSArOdslh3K8K3
+rva3aKss6TWYg2Qjce10pMaluRbIoEkx+0iII9vujoc=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem
index 886cc533fcc..996bcf41d94 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client2-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCAxgCFAXxDGdWf+MHldd68lQPasjUzyRgMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFMDCCAxgCFGtzLs/dg4kQgBYqaATBtAwv8dB3MA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDIxODA5NDMw
-OVoXDTMyMDIxNjA5NDMwOVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE3MDU0
+OVoXDTMyMDgwNTE3MDU0OVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UE
-AwwHY2xpZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOGIanwq
-rZCqMT+ePwRkiQnD0gyVt5+kwkb8X+fdBJRF0kr70YfzMpKdZP4l4W6C0Jv/ysIH
-usrI5pQxcFAIe/7DLW0JPkMLKgXsOtPNZPIkc7WYkq3cbzB0ZTsK8O3IYhwn0dAY
-O49T//YqM3TLTFsG89B6uCEg7dQiP9hh6boic8M/WyAseOkJNfw+wYcTWhl1toKc
-dLbo8ehESUtVhCOPVT602zBUYFkleqKPeHJ/gzl3/mTnqfeUBljGI2aXwOl7r6rI
-D/or7wew2HZ81dTGDqB+yqUhBIVNseJPHOuKbke2E2qWVzAkRnX4b2ehsSaSknpC
-KGWyLibaQyR0/Gt8Duu1XIsZKeFjCw27yogSTQ6xTUhLDF1anQyoJX9btSQZsTbD
-3vtHbD1O07KSfiG0Z1p8LaR10RAFA7f3HLwwy6c9ExpGu5ED+co8aO5Xp5wysg8X
-fYZYx4CaY3moQPJPDS6eOpUXd/6h27Fm34h9VdSj2p6j9JYsmTeEgb0x+JjAQyRS
-+Koj/tbSbBqjbvO+FUaldRlHCHYCQTnjsSNBf7SxqE9lfgFitcgiHKSdD7QIfwNB
-EK1o7L8OugC/SQtHGe3ngUGuNmHI9w6ItGuVqoJYP3Hwa6ClGmYlTRLoAj8NkBib
-toxwGIspTlTzmmLXpqeZTPaA2K5eiq8O5DKvAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggIBALp4L1aky2jfgk18tney56sUL2Us2aHqyOz9LlowWFdNMtCKo0WKpZ1qXGfQ
-92QE+zc/MEdmv3V/H1MmSr7trTq1u7E5vVVI9Lq2lNbRLDQLi1+qd9E7Kdl6Oxw/
-Ecc8oxIbg86p83HhzPfJG64m3x6S6m2c4sNrHRAO/gxxJex6ZSFfQwYJZFlcvvBX
-CH70RBtBG/ggasVtwqBuuIRNJ2gAtiWG2RtyGlOjPiAg7nUQiYlXLHVOjvrKDvrI
-KTjzRdEUMqKtIrNUBHSbWZlxKZ2Ddavshg/0T0reAN/u5KTDxiGaQxlVEA7xfm+j
-etqjzTz7LnKuRsA+Z8UUYaV6mKYfKObDoUs/12IomRCUTQi1K8MP3fGmmk+4Xiyu
-+t15EqWJzhjuT2RjCAL47X6ksdOtonX9t29l6ykCvYpK1mlzG+EhqDyMIn62TNfx
-OFjWwhIFgyEUWtwkihIKtv3ZVtrJVO/j+HCUfq+6IpjYHdlpdb4OaHgBtpokOtM8
-PmTHJbP2bxmNIMAU1WTfV+e/JkdTKHJclC5DTGF48yRgdKSOTq0G1eJYh4DhlEIM
-vOw2rXeWR6VSkvA5vF7HANEptl1tkT3dsKR4BXkSIO16ldWBEHMM4UeXx85GGM0k
-TRON4FWBMi6PXX6mrmPXcUW7AyKG2JL9gNlxRgWHVK7xmZyp
+AwwHY2xpZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPpDQjGP
+dPUiGXybmTEEbneSxXDaz/+2H4Dl9QLq3NnqozavqqZksseYsvOwLbzdZ92sRLHf
+5B1Wwo2h3SbOGtb6CD3NMqV5P/nvHghn3KD60l5Jy81W8aJ+pwra8tVf/O0oDcJ2
+qwHABhMYm7cf7vk3Llt4clQ2g9wj6o4UuCFjGXDqPLxO+xN2Qtx9YZdxUGTrUtww
+FgaoJiUqoeuagMtJ2OlmTsRM8VNnddLqEnqTWNtV3hloH709fA4RzudCOhHDwx2p
++zKDwDTnOFgOVaX0I76CZ/eZ3qU4cwIZ5bJaJjowi0XCP0Pk3LYQ+wPrDsIuP1td
+xVAlU0rXXePxi0yrwDLzTi8PPogwkMSkfSRf4xlgQRlnQjdya4A6h7VTvh92tpMD
+i6EP1JA1nTNebOf5AjKwNHQ6B5XuTRP0PEUIDAfV9mNriR5vnn+oM44AM7FQ+tFw
+Jbc8CQX6487M9KGsHmVsf60fWCBmgZicof0XSpVrnMDJdGARzgmxz4z/Eunrr9uu
+p0SttZdWns1lLwWpbnrCk7I3F4SZ8On3Yf+RxFLZvBJjvHKfRopi81YkralkKfu+
+Se6TE0QpkPEEaXW5zqvVkt1gW9j79zeBZRFzjuT35F5m7fWi6e7V/W2crtw4lGxH
+/LYX397ZP7i7cT6N+g4JYkeLgMy18S1jiZtHAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggIBAJjXO5KD3JrWkcfdvYgdXVRLQDVecwnvUDAP1R2Cw7+iZRfmWccESKTly1HM
++71ThCt7wSFqSxkE/nl6/4cKgNGHG1Zw0Iy4RCMmA5vxiNzgSmUg/3jyl+smQZzf
+8e1iDAezlsEJrohCcUTKocv5fl9qWKspZ7Kc6XKQ1q7YbUyh1ZZpzh3mHZ6XhSo1
+EGMXrlcKUst/hkKGiuONOP3qRjsb+lMRZ1IpIB1uIT/NddnQw08Ah25nVSRtc0z5
+b5edvvzspLZ25brsHBzKtHHg46FwMTi+UfMgQoEsV3DXNB/sWT5V+60AYrPA2mss
+5MNhGSQlteinYD8f0LxO2Ocoxl5vArzlgDjx+BY1H2etI0xv3u5U09FXqvnbNQj2
+5kbjJXI+wBXxi+CSy029fBBaU4OpjT3TM8VTFFBL1MEe38ZkAX47HcWOenN+xHsq
+dFDZ1so5ZYRbPgPhytEE0CWL8fNatjtPCTQTOrZVZW5uKJfUJog6gYbe/YxSKfqx
+QtDf10xpSB8L9ooCyyBIx55YctpEtCuj48HXe0vMBBQvFTx+C9XikqTqGjc2kIdU
+GNK2uImXLUas09UTXzm4rGTgf+hM2ixHd8/7K0TATh5eMlK0td/unXf+/yWmBEcz
+FaZyYeygPcv4U1NXAFdcY//5qZuIF38H4HbQ2QISH5G6LPff
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem
index 462916c0670..76f56dd68f0 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client2-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDhiGp8Kq2QqjE/
-nj8EZIkJw9IMlbefpMJG/F/n3QSURdJK+9GH8zKSnWT+JeFugtCb/8rCB7rKyOaU
-MXBQCHv+wy1tCT5DCyoF7DrTzWTyJHO1mJKt3G8wdGU7CvDtyGIcJ9HQGDuPU//2
-KjN0y0xbBvPQerghIO3UIj/YYem6InPDP1sgLHjpCTX8PsGHE1oZdbaCnHS26PHo
-RElLVYQjj1U+tNswVGBZJXqij3hyf4M5d/5k56n3lAZYxiNml8Dpe6+qyA/6K+8H
-sNh2fNXUxg6gfsqlIQSFTbHiTxzrim5HthNqllcwJEZ1+G9nobEmkpJ6Qihlsi4m
-2kMkdPxrfA7rtVyLGSnhYwsNu8qIEk0OsU1ISwxdWp0MqCV/W7UkGbE2w977R2w9
-TtOykn4htGdafC2kddEQBQO39xy8MMunPRMaRruRA/nKPGjuV6ecMrIPF32GWMeA
-mmN5qEDyTw0unjqVF3f+oduxZt+IfVXUo9qeo/SWLJk3hIG9MfiYwEMkUviqI/7W
-0mwao27zvhVGpXUZRwh2AkE547EjQX+0sahPZX4BYrXIIhyknQ+0CH8DQRCtaOy/
-DroAv0kLRxnt54FBrjZhyPcOiLRrlaqCWD9x8GugpRpmJU0S6AI/DZAYm7aMcBiL
-KU5U85pi16anmUz2gNiuXoqvDuQyrwIDAQABAoICAHZuu3RuuOxB41DEGdWFsczV
-7wS6zk1gKME8IGTS1GfEbpT/vd1FYaZKTtGDNOlieoehAGl5w6Zfb24ctBzjB7IV
-7lHWy8JLJ4sqrQ2ySzM43yZac5QnMKBiTxJ9QV2sn5CnfG9pekVe2Af9yz2m0Hbw
-pLIy72Q+NYXzYlGPwTwEgYPjTkgL8oZ1VssabWgwSl0aSng2DrhKhVXyHgcYZiaC
-S0J9mKi9dkb5/ndFHfwKZ++Syp1UZhXjvp15lvd181DoqavmGTXHQmNog5NdJLDy
-PJYdXu7t8sDJtwLfhpFOBXFU9MdBIZHfSr0CdAYYi710tMTM3wfgVIoEjcOkRzRx
-36O66ehHfcyNsK52Z+DZ6uR4c+MOG0kzTiHQhyxjiu+3nYMGw1XdyE+k+eZDMPd3
-vTaR7kYOQvVvdOVAUuFZG9mK2p0mpofb9cFxFD0vJUqTYXxSdKUNIexR4mWQJw/h
-rWOg/42GK4iLY2X6/CsDh6pTsM+HCzwmTGGkL54FvDsB2AhAhXPz/kGiBRTrh9/p
-QBxacSPoqN+kF3u2qZRPEmjuimiW2AaXARbTABNSBQJIEmWzWOVdgUBVetGoN/ML
-8mcYDmXhAc6F96eqPj0dX8cHfqYPguPhtzLj5V6XGym7hYQyOLBcE7tr2BcdjUfM
-V6OFHsPNmsYWZ9F6zCv5AoIBAQD3M6gziCA0G0cG05ef0C3D9OVGWpHqr0yiR3MO
-ZKsYbJJn4WOtWWvo8N5oqZBQ8VIoyGd1eiSIDuxXEWniFWjn57QN2nrDNTsEQPgk
-HzomgFzuDZ7V4JsjJ9F2nAG5i2HoEwKNHdzfni6mhwGaapd+4GlET0jlC71p+h0X
-CPsD6Jwabp6OUyT+xm8XW3mTWskBzKfq0OPbsdv8UB1dPt6jVrkjoe76TlTsWXWi
-U9p9/h6kI984R9T10J61c21dokuL/KlHqb6TIQY3RcCgm2bfucmuawIq6vs1PBrK
-VCvMX1BuTva9CYg/+hxm9Ky08jFWSCEEtzaORyN+4mmf4maFAoIBAQDpj1NoI7RP
-mYqG9vHyXSDUUNbchpLOFKIaeh2DGk0sFmLi/obglsxOKu8K3r/EobNt+vpDTBxI
-1EjPWdKuaXNYYjNjrVmPHdHPoHD8JmXzJDbZnXSylV9MVYSMNF+7BWUiPg3/QC7b
-1a+ljJH/KEWFb0xrIfNPxVzyq8dyFOxcmLfRVLYlEW+fRYeaZ3QApxGi/BoYK8KN
-vG8f/a8jpPwYCVa3JJ7/donEtsbxTkm66aacn8Vo2Y/tdo0nxyqC9PyBU+tV0u4w
-aYtEZ28kpC9QheRx8D7WzhvsFc/KsshiB6jddjOVR6VgiUFCo+b/5PqpyZVTVrcs
-tj8062A3KvyjAoIBAGRPn/eZS4gZcY8BmcuODKQx4j/UTNXw4KYRXE0A6LT2icqB
-mZMkcDeMVpQeCqPt6SsHd4QiVmSnuZvzQwYtLe69BUGB4MMJ/LLTMl5mFZC+Efe/
-qy6bABkZ9VOuJr0GJGqqHCTrc0+CvudwbWQd0O/5XH4NtkTLqMcyaU+Jo2KIp5/K
-N6kFcEO6fiX6RrFW665BP/p3XZ8u41fVorTN6EZb0LD26yTDWI64FpYSdN0fm4t7
-yv7ply9QwrZa6oxOaV2a345nASBvDDito2cI6IvstjyCy9RimiGWDEECOuup2deJ
-T3KSRanAcnoM23Bpvz+F8XAacJb3ox2//qCUnIkCggEBAJHl2XllTF6pEFLs8giv
-SjG26fFKE2yukPCvNb5O8MRIm68mxkSHjsqJoVeN/Act57MdI7ZkVgrcqTr15ljT
-QJ2GgomSoS54tzbXB51Ls0XmamkYJezkyGobxbf7g42Fej6guwenJV5oJtfobs8Q
-bhVDiF4oECDVrhFdYzKNhXT2ZWVbYIjZUnwQ5/t5Aorh0m+Ywgg1VcxKWLSIOR6w
-ElZFhyjStIvqlXcPokjc2cvr5wtR9vRfa7wv4U9m59R0i0OSk6DCKc6OL9QkNNaT
-xYasjR7rr6VpjSG2Il6BvhEWrdLh4qku30zlkKG7VzKk7Dyh0ykDM1u34NYC7tCn
-hrcCggEBAO+Rnkk5eYYqGk/64+Qy5qA7djvvZ8AgihwJL3+ZUDSOxh0W+Er4NB6n
-j0kI22N//D2j6hg93TNj9jI6lISfmY+TSikr/P+bQPGXl8wvekQxpjT5JhCYI93M
-LXnSULuy7J1ujkMGdxEvfOTjvmD0ejtnuaGd+jM7hx4QNBbJj4VdV+r5BQOJAlfY
-gk6n3RgAnu86szquWM6dObIz9BWtIcMVGlxA7yDmxjVDDHLwGpcwG+MTQRcHoeT6
-2+b7FtVN1NFLazfgPS3bxKs5jaUB+Ibm9BD8B7THviNikqRYqwoJMWpJgdWo/lOQ
-X0ueOR40kfa077G7jNfb03qOPUR1mFw=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQD6Q0Ixj3T1Ihl8
+m5kxBG53ksVw2s//th+A5fUC6tzZ6qM2r6qmZLLHmLLzsC283WfdrESx3+QdVsKN
+od0mzhrW+gg9zTKleT/57x4IZ9yg+tJeScvNVvGifqcK2vLVX/ztKA3CdqsBwAYT
+GJu3H+75Ny5beHJUNoPcI+qOFLghYxlw6jy8TvsTdkLcfWGXcVBk61LcMBYGqCYl
+KqHrmoDLSdjpZk7ETPFTZ3XS6hJ6k1jbVd4ZaB+9PXwOEc7nQjoRw8Mdqfsyg8A0
+5zhYDlWl9CO+gmf3md6lOHMCGeWyWiY6MItFwj9D5Ny2EPsD6w7CLj9bXcVQJVNK
+113j8YtMq8Ay804vDz6IMJDEpH0kX+MZYEEZZ0I3cmuAOoe1U74fdraTA4uhD9SQ
+NZ0zXmzn+QIysDR0OgeV7k0T9DxFCAwH1fZja4keb55/qDOOADOxUPrRcCW3PAkF
++uPOzPShrB5lbH+tH1ggZoGYnKH9F0qVa5zAyXRgEc4Jsc+M/xLp66/brqdErbWX
+Vp7NZS8FqW56wpOyNxeEmfDp92H/kcRS2bwSY7xyn0aKYvNWJK2pZCn7vknukxNE
+KZDxBGl1uc6r1ZLdYFvY+/c3gWURc47k9+ReZu31ounu1f1tnK7cOJRsR/y2F9/e
+2T+4u3E+jfoOCWJHi4DMtfEtY4mbRwIDAQABAoICAEnNkfTJqKUt9DQyMuAovWcX
+6pAYh2SS0gGST0oX9x9wucdD0OCXK73/Ay8oUqSy6pGN3whRzZT1ZBSemnh6KaIi
+RFHtdLUl578OTF4QOxliPq29t5OLw2C3Vw21eg2A7DcIK96gXlf6yA/TnwBHM5Nd
+OZeSEq1RElvWX7Kc25xE/Fi3S0gBRrv7kUYy15fwu9O3Lk1vBN/bsLwfMXcorjjF
+Q2m5WRs80aJWDYIws1hgocC1NvVpJosJWc9QYyMB/dwFTkIuQb0o64LueUhGme2B
+7RSeooh7YRR6bDg/aOTK/yED9d6RpVShZpFuuofyRvzu5JJOOgUjrMeSccbqEbjq
+VNjkdxoNl917TBezIR/KioXS/gauL4VF9coZostGohDnLIdJrVXwisAZFU9676pn
+hFGaZ+vVl6oiWAFwwmbkSo423cIbc+dxMfHtYElbEfGm4LOLrybS3K3sg0gn8HZq
+p/AISM2l/282peWjHfa1SXedvvDF1WFJRaB0GuzodkhsqEXXSyAQlc4veNiacNt4
+UQCYiOatcKzvBofgICyX/lTQN/TYdfo57tjCZxnOrDHwpcHH6xRcpuRnDphTV3KD
+g2JgUKbvBcZgY03nS7JonzhuOMNd+AUT9Oof1VSS9KKRYLu/eJxl8/6dR7Mcmv5W
+fCzEqNVvaigKkeVQEq9hAoIBAQD/73EFWGS+DfKuivyxGAdxAf37eyFRIQYL5Xz5
+xB1h+GjtfdxrigNM0hLHQ+B0209ZwZzl/O37OvW8x8V/Sj/YrY/BYQIGu5quD6lL
+NbuEnhLMlU/yANukumNMDbDKo4Fgx+QY+y23zEIFNzraoKH61JH2VrWQ9qfrupaW
+qVdUE/LtdZ6/Ar2pKnysLYsUpgZX9mashKg6fNfJWyLqfj3frVD7RM5NTNgwD5as
+vnSAkvMLJV1997+57W68E3ALnGxf8UbTxAX8iQ6yig6Oo3bA5er6qt5wbH5m12ml
+0UnPvhGNO1eRnX85rkH4okGJCG6ln+wPXbkc2igVH4Tlg/HxAoIBAQD6U3M4JkNE
+kVRqke8di5D/HUpsIG2t21DTgihLrg6iNsjdaznvgzRGRAIQCLP14qRoibMsLN8k
+zfr+I4QlE2dyIn++fJkaOq/xRvODSDNRRg5M1ttprvAK0QCvbgKgkYxxqpRzOuD9
+Aowpq5YGhHbe8g+aAoYGU9kYbx0XhzU2ZDCqbQP41e3f5OnFrNm8YCzazsJ1fNEU
+H7ktT+vCP9g2DtZWF0zFdDeHo4f+h7DcLGaEkvAPpRWQ0qL5tZ7vPZL2GXO9gz6o
+aeD5fiMZVUV/SOr51MWIcSIXa+oftxhkZxGqjJrm7Q0cJu3ic7yFXa+9nVaQd8r5
+oWRIvFxRCii3AoIBAQCgdf3VTRs0cUhDGI7fdWJM/uO/RO6Zj+vbj5Ewgz2sy/L1
+W2DT5560Dk2Js0vJ2CpC6vm01ERcrBWfu1xety2aaw7jPi/oCr0q/lS0+8ZKmlTN
+AZwy7UjIWbeh2j+KfMLD6+9dnjWGs8B8xqjWo7mKqrWszaZecdbMG5sIcLl41F0N
+dh4GQfCpXCL4TEGTu5fklG7BIRbcPKOJ8eLNREMEtwQ71WLG4jP0xgFA4tPmPLu2
+tEGOlcMWDf/MWR95mCP2by5p3M+oCkI1vArucRwmSsBtUq3NrKf/UHVDahkt70vP
+0XHQsP8wKcng2dHe2XON0dtNswQ5S6mvvKg0wenxAoIBADmuEuWEQ4nAJwBrYfqf
+1yhBmo1xp3QhDe2+lwRhNfQAxaXneDENPXVXZFZHexgUQifoWsW6DSzQ3Z3Dl0Zn
+wzVUZ7T/xtN5ZGMnIyND9rcqek8QTvx6F8uWPx8tLSPMhd0HHi+zCHakKKHNbMNR
+sIZMpnWpUTKSDXsI1149hHBlA6WxevHScX5eo9Mtsfoq+wrsC3jA6vhFGwkq2jsn
+NO2324F42vLAha8Walam84S4ImM37GLeeiqlrnH1fIrJ2FwmnzmyzTRHOVSj0Pic
+Ymgi6Cnq8h0vXFijQA5QxSkVaseuoF7HjnbHLZc5bd4ZKU56u6CMSdPdcVslM+xk
+d98CggEAYleUQS65Nk2EWj6nLXD8HuVDWbKLXgP2Q4VpORDHpT4isboSTtR6mMwR
+huncQX5lvUZqZNRvKIS/IfW/2CiAF+3IhUxx8r+AUyrc7OClp1keH26c52/RYoJM
+sl4DfQE/DooWvieQTx4rILiEYrPWwQLYfuDs+dSgnaugr49s431PeVyxlH/849aI
+dHnwInBd7sdbN11e6xErry4LU95imkRhg+y+QdiOE2N1Q6I3G2Jn+n4NhIWJfjlS
+Dysosye3R96FsFQohVMosVLTL9mCT8J6LFIK8CjRcvhSQmaTmXjTuisIUntBA9zl
+PK2zQzz0JkpsDD7mGM+S6apZHiLgHg==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem
index 846f6db84dc..89cde777a45 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client2-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOGIanwqrZCqMT+e
-PwRkiQnD0gyVt5+kwkb8X+fdBJRF0kr70YfzMpKdZP4l4W6C0Jv/ysIHusrI5pQx
-cFAIe/7DLW0JPkMLKgXsOtPNZPIkc7WYkq3cbzB0ZTsK8O3IYhwn0dAYO49T//Yq
-M3TLTFsG89B6uCEg7dQiP9hh6boic8M/WyAseOkJNfw+wYcTWhl1toKcdLbo8ehE
-SUtVhCOPVT602zBUYFkleqKPeHJ/gzl3/mTnqfeUBljGI2aXwOl7r6rID/or7wew
-2HZ81dTGDqB+yqUhBIVNseJPHOuKbke2E2qWVzAkRnX4b2ehsSaSknpCKGWyLiba
-QyR0/Gt8Duu1XIsZKeFjCw27yogSTQ6xTUhLDF1anQyoJX9btSQZsTbD3vtHbD1O
-07KSfiG0Z1p8LaR10RAFA7f3HLwwy6c9ExpGu5ED+co8aO5Xp5wysg8XfYZYx4Ca
-Y3moQPJPDS6eOpUXd/6h27Fm34h9VdSj2p6j9JYsmTeEgb0x+JjAQyRS+Koj/tbS
-bBqjbvO+FUaldRlHCHYCQTnjsSNBf7SxqE9lfgFitcgiHKSdD7QIfwNBEK1o7L8O
-ugC/SQtHGe3ngUGuNmHI9w6ItGuVqoJYP3Hwa6ClGmYlTRLoAj8NkBibtoxwGIsp
-TlTzmmLXpqeZTPaA2K5eiq8O5DKvAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-3DJlf7AkZklzzswgm487f+y2bB7IYr55JwENASDxQEOdVcdgLC3IWu3hLiFwdqac
-0Sw2OHZuETwJiIX3fD+qUT6TgbsP21W7wEQ4jfKg/bsXFMbrvw/ILkOW2JLTH4Cc
-9ylCN+46dQ9heATkiF/Co+uASz9IoSDdtoycA3BuKGBZI8VGa56QmJOOsMM5NgxT
-RTh2r23tV4E8AGYj3HC+b1rzK1RTlsj/m5nM9Jv0/NqoV1cprS1ONr8CBhN0ttuA
-WLrG+DUZTMJYFabqTptlgejQFhiFp5HT5A+eXgZ8uEUX1I3q5jq1BEWtLdmJNZ45
-QViSJOokH/+1kfRSWiAH7pdBz4URLBcsDhAag4J7kV38t7fgdaIizY8R2Ss82iEP
-xqa4A0PA065wB44zng/VrPrHoH1YnGRugXEnrqgcipC0FxUl3oQjvwOSR/E7yFU0
-GIr1MpRcyrd0z4p16783qnMpE1Aa0msED2SBKIK13WcNY+CtDF/wO47ZNywl1hBo
-VkM+ohPpmonaVXNGdpdoZpeGjkBUbqkn+so4aYkX/WuZ6vY2vwdV0prD1vdAFfD2
-AeJx5ypu5aeKn6nK0eMy6W/VEJx6RLCiYVOCIcssgy31rmk4iLQJP2StYVK2mZKp
-5aSR4eTv1/XlMujq+ZqcuUqA1id9wP7908Xr0DzdNdA=
+ZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPpDQjGPdPUiGXyb
+mTEEbneSxXDaz/+2H4Dl9QLq3NnqozavqqZksseYsvOwLbzdZ92sRLHf5B1Wwo2h
+3SbOGtb6CD3NMqV5P/nvHghn3KD60l5Jy81W8aJ+pwra8tVf/O0oDcJ2qwHABhMY
+m7cf7vk3Llt4clQ2g9wj6o4UuCFjGXDqPLxO+xN2Qtx9YZdxUGTrUtwwFgaoJiUq
+oeuagMtJ2OlmTsRM8VNnddLqEnqTWNtV3hloH709fA4RzudCOhHDwx2p+zKDwDTn
+OFgOVaX0I76CZ/eZ3qU4cwIZ5bJaJjowi0XCP0Pk3LYQ+wPrDsIuP1tdxVAlU0rX
+XePxi0yrwDLzTi8PPogwkMSkfSRf4xlgQRlnQjdya4A6h7VTvh92tpMDi6EP1JA1
+nTNebOf5AjKwNHQ6B5XuTRP0PEUIDAfV9mNriR5vnn+oM44AM7FQ+tFwJbc8CQX6
+487M9KGsHmVsf60fWCBmgZicof0XSpVrnMDJdGARzgmxz4z/Eunrr9uup0SttZdW
+ns1lLwWpbnrCk7I3F4SZ8On3Yf+RxFLZvBJjvHKfRopi81YkralkKfu+Se6TE0Qp
+kPEEaXW5zqvVkt1gW9j79zeBZRFzjuT35F5m7fWi6e7V/W2crtw4lGxH/LYX397Z
+P7i7cT6N+g4JYkeLgMy18S1jiZtHAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
+h9/gIGo83p/F0NDDWGr4P9LxdrE+kkaZF2BxRv2rkty/OC1Qe2lcJPWaEOQY07an
+witmxGPaZB6e764J9z/C2l8hoh9LFAIZ+gPBzMEqPBO2/5WYWjjPzzUlkTBczIdo
+mCZywvYMrdPQ/F2LnZd8iQO0pmFUGC92vV9Hb/i3y7RthnJWRYv+2F/D5ZWE07sz
+xA0gwmnY8d8/G+O2CwgGsHLl2tByfnePDqq+ogwRKXtsPeJwWloFvnPRHE0OmkHf
+n2XHbbLMS/m8Wi5utN/LpMV+WITQHMxGPGXcX6XOWVFQuesfI7DKoqZzk/aB2IFO
+tu2deFdfnrj3Md8PRAQBe0Ufig0gl6EvutdmiNCeiDloPwV4gLvH7SLQmLheOPP2
+CQZh1skRxhPmnJYD4rrsMGv86dlhEvtnxCO+cUrxnUAAr81BAX/Fo1Img0rPaanD
+N4/FG7LnU/Rk8g9roN/8v8s62CnyxcQ4UAvSWAaRrudpErDk+L24Ib4UCtcYiGSB
+Dj2tK5SMfcXn+bR2HTdVIKHWHIK1X6bS7Jn9ZXlDg/MCyCILeOmW523FoLfTvNVH
+IY9MgNe5KDX7dpPCAJFWwmidekNz+sSbpu6Br8IgWd6SuTEx8Lmb9GB0V7P2CHlE
+1ASW5YJMgVPJLQ9LQhRIim2+pL3Pz/SM+oijeSyEoSw=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem
index ce9a472cb9a..848ecd9492d 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client3-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCAxgCFAXxDGdWf+MHldd68lQPasjUzyRhMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFMDCCAxgCFDtXgZV+Jd7/OrySQd+e1dVblQe/MA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDIxODA5NDMw
-OVoXDTMyMDIxNjA5NDMwOVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE3MDU0
+OVoXDTMyMDgwNTE3MDU0OVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UE
-AwwHY2xpZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN8Bt8gv
-50J66lQ+l/NUW+lqW4DesmSLv1BnjDd5SSA8tfczt999/l1epAGeEN/Pl4dAxXP/
-cxpx+J+xF6SKNxQ0RP+PHQMiDzCUgBq4OKs09kDQ/uvycUZlQuWPtR610TWjZR5r
-VrNSwJQp3VGDdNyEbKj/yd6Yi5NC1iLuqPC20fw5/9BVTm1P2wWX7nv1AWs235s2
-yAG7pLNcgPiTfSmXyyT31YBjb9Onun7gv7exI/3K9mS+aWq6ci1xAXtykVCs551T
-OQmDAUxda041YghEThO4MrZa6uSZqVwnoUcXTla+8biLYb3+9CnIjM5whAOTR+9r
-jpsuuXEUOsrX9Mgb1HTS+ksmrA+Eka7MdVi60Hoon09uNvcTM8CSKNgnTzcPCM6t
-J4NHDiimJM5WA/eY8i3NNCTa1HUGEeIK51UOdjIFKsvzG0TCI2FM7jQLJK5S38tI
-deZ98iQbguVGhoCvRotLEAwW1M2rSOu7bxAZU4QJ93IuUfkLn2BipOuyuR55Z/6F
-z5Jij/1lK2/pKWhntUHTIpG+bBHDF++0LN0aB29uIwYRkoz9JUgnNz4FDVbLvJ+z
-5Ywr61t8AujZdfMZDpRYlzfWPGej8pm7/Eux5jgx/3jcLtqfqkfZLSuFjBKfkUU1
-eGsC80RupMJKIeppv541W6nQJlmJYKv7DCvrAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggIBAD+YMVntBdeq7xJEL7xU4QEHzUGhDWodGMJfmswcxe7gf5Nztcq5YIug+akL
-ewg0wzgCA5YGz00J92sKDF16RmYyPfkxmrCYdNGwISjNJyEEcPEVkdAzwILjv2Lq
-0shFlSsf+Zp/M4XhHeirmzz/jJ9KHlzEYoCz1WOn+UGF12KgV2oQOamJSWOMCoMh
-81oy90V5IlCBqnYfZCYj7cbYLBd5jZMZ+7lsVnxttzPTg1gIoP6vrLT32Ubnzx9N
-IoAeiUg7az/fbnuOkJtu0cjz9aSdpjm2h2giyVAFJ8DkQ9C92tdr9DWZKn7rDO16
-TMdv0q8NFjRGhqdmqWUG6o2cUmQsJ/ZiIcHx5X1b7j7PYSS+ae9zi1tcpHAN6kCw
-WHguIf5I8MIZxE741ZMBokFSIqd6Bh1EP/TUx1+g2a/nH3ZaNd4/KKADxfUU2Y58
-UwdKeX9YpcRz+NNO+1h3NoE1a/i0dhwiBf4OzBiV0WpAjQHT95IlQxTxfHFp42IH
-GrbqIS3qK5DKlNFkBBk1beKxBGKmTH+Pw6fhjkuPYQzjmGo4xluivfeT8SiBT2iO
-uIGLd+sitIooom0KEjHuHS9cdZ5XEPIUDAFhmIt7Y5K8J2fs+xtYzhibg3n0Q6qh
-xTx7GzhTA1HSUE/467af5J3CSfpGAjZQZo/t2/A6tCumzk9F
+AwwHY2xpZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKHIdR/Q
+waHkIn5z3cc+HNtMfHcKgVGzVDTobggUpWSwVUwa0DMq3OTcNrEnT6zZyUrrv1n1
+6aykGPjRzJ+SZX1ohu8X4EHssBOGaNXUH/AYyfOKMLMGN9AU7dQzNKjuJGkbBXsf
+CtmQbQ+/ThMhE4X2bNxEULLudGEfKKQ09LZaqVjhhdVCbuOhx4SPMDJB58Ko10HQ
+t7Mh1B3nUTJXFherTr5bcsazQhC6e5i5ySlBnJDnsa9+DMzopiUqMrqqb84WuMKs
+zzqjlZXDxTRkAX7nGEU2wjGCx+moPaGLGZs2f1VjBOR7HoNGMAEhmHQhWsIgBCsZ
+nDHgAc327Gz1xqsjVd/HrrywJyZfO7ZhxMdmF6MH7eRQjfZGe0+Oajc/7EtFWXg7
+fWdafJ38HGoO8hVjlthKfAFxM5NWjvS7I06IQRwMGGApP5bx3uFmUUixtl/FLa6t
+jRKfzaXbX8b0p8HUMbeyvQAZemw+vA+nuKir3DtNIrpqfeXraCMUiEpI8fCRm29S
+BvfEsDXCZxBje+nma8g27po8vCaHST+8sjwnNeiW4w6NpQbqqmnvzpf2ivm1U2su
+2H1E0EA58zrUoKD13BQzFjccgwodlyutUfk0xYQLrRMOqggtMhsjFDIuNegnPgTH
+t7DSyAAg9H0QBXlrd9Ic/OiFMLsb3bu6eeu/AgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggIBAHeimTo5afyFhpaH30D9j3EXXExt482nSCPZQbYm+taPVxEiJ4vAs9pa032S
+LnA2CC4D74K2Ykd+B/mDGgT5lVpnWuP9VL3wpRErRy6TgkYAJwsEnRLGltNhbuT1
+lup3J4dFgR3tOgwxohjY9FlauZBA5Wu1neZDxXK9UTeAmP0HOb8iXh/goXEvmPLA
+HAVHmCrSD0lgEpgB6mg72fb0AkPQq1wlzVBbVtaVgByQP561WmGW6eHO7sqwcO/a
+/0Fhd299ChMdnzbHToRt6VFET+oEiCOwF+yEQBRWbjPjCjG+6nYHJh6FxE2ABtEr
+Ebr3/7//Q6C8uD32swxXjZaCPEtBC0NNoDW5yi2D7xNHyc+4XHJnRo/v2rPry1RI
+Bbwepp2aaCrs38uxut/qXka2xRTyDCimDezJFPxTigJoJ9CgxGTQeJe0R0d5uzlJ
+FBtIdyJf6HDKzxNJqB0+wJTYiIiSl0VFPtBYJynMXA82SJuyvCMVgqj+uK4xBr51
+APqdWJR6nBoHaFURD105KiQRM9EVHrbnE38xn4DRN3STeKUlEP94zb3fo3UexJVE
++MWWqNJRdMtUE9j1LRX/P1So4c7BeFp0op0CxJrpXlRmRcWV5lBYhK+WtT8oiZHf
+SVSJ8Chol77vm1gVVbJVHIrrH3cfWefv/2Y5fpwuQg6yk/u6
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem b/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem
index b7464eb2866..9807809578f 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client3-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDfAbfIL+dCeupU
-PpfzVFvpaluA3rJki79QZ4w3eUkgPLX3M7ffff5dXqQBnhDfz5eHQMVz/3Macfif
-sRekijcUNET/jx0DIg8wlIAauDirNPZA0P7r8nFGZULlj7UetdE1o2Uea1azUsCU
-Kd1Rg3TchGyo/8nemIuTQtYi7qjwttH8Of/QVU5tT9sFl+579QFrNt+bNsgBu6Sz
-XID4k30pl8sk99WAY2/Tp7p+4L+3sSP9yvZkvmlqunItcQF7cpFQrOedUzkJgwFM
-XWtONWIIRE4TuDK2WurkmalcJ6FHF05WvvG4i2G9/vQpyIzOcIQDk0fva46bLrlx
-FDrK1/TIG9R00vpLJqwPhJGuzHVYutB6KJ9Pbjb3EzPAkijYJ083DwjOrSeDRw4o
-piTOVgP3mPItzTQk2tR1BhHiCudVDnYyBSrL8xtEwiNhTO40CySuUt/LSHXmffIk
-G4LlRoaAr0aLSxAMFtTNq0jru28QGVOECfdyLlH5C59gYqTrsrkeeWf+hc+SYo/9
-ZStv6SloZ7VB0yKRvmwRwxfvtCzdGgdvbiMGEZKM/SVIJzc+BQ1Wy7yfs+WMK+tb
-fALo2XXzGQ6UWJc31jxno/KZu/xLseY4Mf943C7an6pH2S0rhYwSn5FFNXhrAvNE
-bqTCSiHqab+eNVup0CZZiWCr+wwr6wIDAQABAoIB/0I0QFst3XnfA7H+4x1Z7e9d
-o8yeUFeJJUK5eub9Grh3TY4VzICM5vbRId9ZDalj95gvom7NZ15yd1zxNhOi9LcK
-zXERC4vikJ/bdix4hFpPXsvfP87MKtS7OyDriNmVIIbL+zkMpLCX4JQb2ZhZblgI
-+DkztrpejxEoxmmYcI8Ft1Ep5sfyi1XoXx1J/YLPOZyarcdme/oHut2EmMUzA/VV
-GvnemYOEAa7UHImOL1xZOlYd6wf9f04wC7Vx1v7PBFTu/9O04TnxqnEBStns/y11
-GbjA9k0ssI8tDxpMqZRxVtBp31jqCBpflhzRbPvca1SkZLavN6baODNZzhpqAkDX
-3R4lU5C7wu4jtzydUyEsCFNdtkGKlxpZRbRZk+keUC+HeCmXPED7p9egwF6Zi8VI
-oaXl1KvHZO2W5x/BV9I1taEPhmOuRR49KxkU4e+IjqaWYN1qsqYqCs/od22Rah72
-KT+thr0mdxC4lb+pvteafricUQuq/dSbEY/lva7PhPQRKVX/VxOaAxBnhA1LHVgZ
-imsW8W3eOQYJbxniTrz9EblWAg4dCcupsjMDUDUyACB/E6isDtYU1J2im6p4gbqw
-tXg3bRh7KruIHbPSJyrFm1uqe+v97TLhpwPHKCsxE4HiJgRzaQDRckLJQebqNp3Y
-e7kLLjg6uGsjAl6OwKECggEBAP5bLGVrmBmAz8RYPnG1MQWlsFg/eIhMFCqMjT3P
-swPUU2VJKC3TC3OwFLxlAr0lkXol+8L8aEvxGjHksleA+1z0lav43b1/2jKgLgI6
-Ym5BxMJa+sUJpI6K7CedJ6wf2ozbpVXazvNBZ3o2l0QbC/KpX886CZH9YJgn7N0M
-TfPe9er5zmETdHGTWtA0sDI8fZ8XndKmnWG9KTQCGur6gemF8SKuzGv/BnL+BZnv
-bDqSvyN8Wjk35KPNeKVW78ROxRuEdB5brryGk955hX50PRRoofW8GSmLJNKNYvIj
-VRkKrDKpz8gW1C2/xa9j5tQkGRFMDAptmk+yvtmDxfZz38UCggEBAOByrXLMTcwR
-bz4MYcSmEdLv2VA/bZ+y0kW0frUU5il2fyQseoFbunVbTDiXYf40uueMbOONZktM
-w04CXKRaTbnS/s6SGU5VW19jv+xzwrzpB2Shm08APwgFnSw40bKCpN4ZWQbOyFVq
-QIMXfA0+Go3zJz37MsSgY+mzhHp4WITobVFpdlhaLvrLPCB78uInZrFsvNN6NP+K
-OIbOoTA9u+BP73THHkpQdrRJaJWowpqejz8kzQ/Xu0Xe6AG1EGVp39phKpWH9TPF
-8xoxjbdIGPkzCzYO3hgz6PlnWVj8iyTxklnaUblqKkY2mOlMA00ujcdF3d3IHvaM
-Xolej+XeZ+8CggEBAKeZDdzaE4Oic8RtXN/xwxZ0gYj0cYhlkNgkeqCi7dL1IepY
-VQg0ypP1DwTADhjx2zTAOG7XgCWh/V+o0LaFv5sVclW5iuplhzHah9ZiAB+kaHCk
-IB6a5vohoc/MZqqs5oXv6LZ0ke6JRxSpSezPYYUIg5/5Hvs6GF7J1/IjPG4XmLS2
-23zto8l+jdUpEnxXjXK5zf1SWdtgF/kz9ealH9rurd/ri7kRdn9oz+oJb6f8r8ND
-GfQf1yDzr65KZXxVZt1l3llukemZR2/NZN/Y2bJL64QO6AmOrLmr/emMzHLOrH5J
-lCbEnBR1C14xFpTsIDRchoaMh6RCJC0Q/e0Rlv0CggEAAOIysJsBS2ZeK75cvCtz
-MoNjNZ+qTNClZ0TYotncNhmTUo8iRFQaHdAoMqjV5+xJOBQjcZni5zT8J9h2iOca
-GzsraaDFnLtVSsDXxpSGFbxNHSZNuDfmB6AOCFiI6sz83Sr4YMB7pWpvqpRzFpJC
-BIEKjIHqpz+CZS8hvGGw54UKuSFTJ/Hi8XXPXMlgIWfKTbSB4cs/XiorIsy5cbks
-fiuSY8FM6zn53afUU5KAgZ9SLQt2CzPsNtAz1Z3i3KNYEEIFquUIIBYNaPL8/dW4
-03JR/vp8AVhi+Ghhv6nu2kxhKR1k6Pf0Bqa8X16/PJSMVlZ+Extwk8Pls2C97Ee9
-3QKCAQEAgjcbHKBjd7AeyNpPSzNpv81Rry5qqOc+Cxx8LtOHBl1wc5VB5FPxfbuX
-MX2skvWPnokDoXcI1a1WQwdjaZUsSoqdeyPtw8pFWiNLJZkYImiP3zMCZXYUEkzk
-3EXQZryWEqBYBqxlEvTyjbBmnrAwOPOUKARFi1l9JKJ4QpdELXo9Yl+w2IQEQ5N9
-jrSY7LwS/cb25rhEc6oh/89aY83HPyABh4lC9bsciXki54YIeS+y9ijN8yCRxikr
-mVGfQ0Y/qcY9spAj05yr/vnlENBB5ohxwKKsemOnH93E2GFxc1dzmWCGvISjUduB
-I68TOg71OfCKgfeixNgcOvQoN+xngA==
+MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQChyHUf0MGh5CJ+
+c93HPhzbTHx3CoFRs1Q06G4IFKVksFVMGtAzKtzk3DaxJ0+s2clK679Z9emspBj4
+0cyfkmV9aIbvF+BB7LAThmjV1B/wGMnzijCzBjfQFO3UMzSo7iRpGwV7HwrZkG0P
+v04TIROF9mzcRFCy7nRhHyikNPS2WqlY4YXVQm7joceEjzAyQefCqNdB0LezIdQd
+51EyVxYXq06+W3LGs0IQunuYuckpQZyQ57GvfgzM6KYlKjK6qm/OFrjCrM86o5WV
+w8U0ZAF+5xhFNsIxgsfpqD2hixmbNn9VYwTkex6DRjABIZh0IVrCIAQrGZwx4AHN
+9uxs9carI1Xfx668sCcmXzu2YcTHZhejB+3kUI32RntPjmo3P+xLRVl4O31nWnyd
+/BxqDvIVY5bYSnwBcTOTVo70uyNOiEEcDBhgKT+W8d7hZlFIsbZfxS2urY0Sn82l
+21/G9KfB1DG3sr0AGXpsPrwPp7ioq9w7TSK6an3l62gjFIhKSPHwkZtvUgb3xLA1
+wmcQY3vp5mvINu6aPLwmh0k/vLI8JzXoluMOjaUG6qpp786X9or5tVNrLth9RNBA
+OfM61KCg9dwUMxY3HIMKHZcrrVH5NMWEC60TDqoILTIbIxQyLjXoJz4Ex7ew0sgA
+IPR9EAV5a3fSHPzohTC7G927unnrvwIDAQABAoICAB52pRtXD0cBMr+V6MJuPzfK
+GLu/picwud/2jlWGMbiafY1FlUO1Q//yOXg1O0sEfWNWreLuK9Ce27bqpnm7stGg
+/5uA5vDy9RrQGeh9t3/Z4xkxQcdMGfFcJ4ZoF/fhU8jY1jjfWQcrq2WmM7jlZww4
+ITp+wKVYwmBRYjE9aYD25GGAoddM2Z2SZoPfBIfKIi5k5ZeWiii4a30wA/mTLW1K
+jBrLFHs24O9OdhyFi0vx913PywUNGrLw8ewYnJHKqx/m5mZ97M2RZQbc5MLfO+rd
+8BOEYp+5DRTB4c0L6MfxxJta+F5fkpjMfBiSb2caqsDYD4DgIym/EQfsAYvo4b4m
+R42rfg5SEiLV16K3ePA2lEHWGmgzsY7PZzmJUGtytHd+NrHMBWloGp0Jke3LV30g
++3WnvXX+/MZ/dtH2/hy1qpZelZR32h1fchSnKqGUnSBcfMjP1YQY6FrTqNxnAxbx
+ufLve41IN0+rCScZ/bp9FEd63DfdAi+U+RKSYjF5promG9ao0u85Yw8iF0maTbEn
+oOS7759oGi6Y8udWuAXqmbo1JRw7ZIVKiIU09cR8/IgnGBgOO6/xSOrY+nUCzFvz
+gVYqOSWpqBilrZF70GUy8iRfPWUAen5Zm58UvyYmByn0xV/aUKyKKcxzfGeQ1JH/
+NCdITbwdLyVhqiKuw9l5AoIBAQDTiXYWOjyxkXQMlYczi/w8pRaCvYMNJGzM2qmP
+hn9ChIoi2STv4DuqYUmbW6irT/mtcaTA8EPwC10gpj0FWXtM9YYVhnoXl7rfEZUy
+oYT9DFRGx25cR6krqg+sxqV22He8Ld618jn6MISrQS7Zd3rLx9goQXeTkLfD7Zdz
+fwduSTMKBFp6zQdBlWf6PhO0vu0Cjhhb0Mr9pTYOYMmZhuIKHeuGU2kZT+Myxn0f
++mlkEBQ5bGr0h9Su+ROvU0vXMmr7SklKbLk1TZDPkduqfub40N63aapto3aVMjUg
+ff1urZh5/wiAgKzuLcucLapAWCkdhaoLa5mDyug/yRLs8vRpAoIBAQDDyczSH5CO
+deWarOTcREWeFc0Up4AD6EbVZBiMDuIMEtT2hMO3gLiF+/XvEptBO46zMp7LK1hY
+E7IP1f87OiH7rOtQTVtsVD5UWIYQaikvCG8OOtOM77zb/OyNYx7mp1Ne2ZuoPKgm
+pAhIhdFw9XYiEsdBTnI541htujhpnx+x8Yb8H7CpQ7WR29KPd2sytb0KqFWcEN49
+fYyC4DhI1Y86VzuU3T6SLdBqtq0FtA9QpXYvoRvfqoK0wMb/k7m7ptld65fIQ0On
+9pnJCEk63msWSVxPbJzwfQOgEeP9f+Blg8S65kn2kb7DvwD+SAfhtjItb5RLbJpC
+MD0eND8RtDnnAoIBAQCyn6SjaFHP7277IVilYlOAMjcr9zMuac+lvA7qLzxOwvSS
+MKJMHCDF4pjxIxjub/35Q7lHYps7m5zr8PQeDE1d0wWCL6fxPCKEMqi1tEZEF6Ei
+k0zRh4GGaXgLAUK/dFLHCETDhuMGLOoaYlRZNdbvNLWGaKG8bbt/KqV01ZNEwXLj
+xoFQqMizzKGcYcbqHT6tpadUAJ8oR9W5lmklxwwgVtuG9fANe7PyMEGAO0e7QwiQ
+5Mf77KbfiVvh9IhaEyzbPQNeYSiTpgfd/uBqu/X1rQoj/on3Qszjdx39beYPC29x
+tLVNLVrZVLpWCwl0g/1T/IZ2VkmvTCuJkRT2GMHhAoIBAQCXaOZG0TY/lZk8ptxO
+I1YbTQzOHkL3wpeUytXY6mGRqLac9ktNC/SnWRT2D9OU/PP8TPdUc27cnk6jxICf
+UvOY6D8KWOiMvBF/tP3oj9DNmJ4ZyRB0+6l4Dv740GDDSz9EKNEhp9b6Gvx06Vfx
+HUKAUzlYncvkTJbENLEPrYkbWYdkTzWVkNFHvVH2tQlnq/hH16ptCPZ1YzRYugGN
+AerD2VYwZ3DOJzP4ctEXigoV+f+OEe+2Zuyx0CuU1q9aGUwcP+efbbVSnXiMaSYI
+qpzyHUWP/pTXvjYhgfRoxI3Ks75eM12bm1aFlp60BwxhVz8yuAlc0t3wtdFuHEVx
+8YidAoIBAQCQYRslpvkKLynGY18m4oViMjaCvt27fepngAuuVFEZ9cJZeWY8GMcc
+IJeq9qTtlMuiWHnq8oGVCL6BnFX6BIMT0W1knCSRqHcwjQByZ51X2Bo60TktdPOD
+c6lILIdkYCFLs7fXv0xUZihyIIdYaxx3XpeNwgaqM+wFsbSclF3U4cdwm5U+ltOZ
+L/3w1rFlyH/+ZWIItBC8N9pHD4bayiavHT99E+35Vgtol5jqIhKsiGVgoj3tdDW1
++xBdyrg6JLXHFP/vobY5mvLLGdcwCXEd/b+jUK9Uhdbq2VC27XEllIwGpPK1SnNU
+7tLJO1z1/eDbntbQC4cvewqNRYhwlnWe
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem b/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem
index 7b4445b3609..a2b19bf835b 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/client3-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN8Bt8gv50J66lQ+
-l/NUW+lqW4DesmSLv1BnjDd5SSA8tfczt999/l1epAGeEN/Pl4dAxXP/cxpx+J+x
-F6SKNxQ0RP+PHQMiDzCUgBq4OKs09kDQ/uvycUZlQuWPtR610TWjZR5rVrNSwJQp
-3VGDdNyEbKj/yd6Yi5NC1iLuqPC20fw5/9BVTm1P2wWX7nv1AWs235s2yAG7pLNc
-gPiTfSmXyyT31YBjb9Onun7gv7exI/3K9mS+aWq6ci1xAXtykVCs551TOQmDAUxd
-a041YghEThO4MrZa6uSZqVwnoUcXTla+8biLYb3+9CnIjM5whAOTR+9rjpsuuXEU
-OsrX9Mgb1HTS+ksmrA+Eka7MdVi60Hoon09uNvcTM8CSKNgnTzcPCM6tJ4NHDiim
-JM5WA/eY8i3NNCTa1HUGEeIK51UOdjIFKsvzG0TCI2FM7jQLJK5S38tIdeZ98iQb
-guVGhoCvRotLEAwW1M2rSOu7bxAZU4QJ93IuUfkLn2BipOuyuR55Z/6Fz5Jij/1l
-K2/pKWhntUHTIpG+bBHDF++0LN0aB29uIwYRkoz9JUgnNz4FDVbLvJ+z5Ywr61t8
-AujZdfMZDpRYlzfWPGej8pm7/Eux5jgx/3jcLtqfqkfZLSuFjBKfkUU1eGsC80Ru
-pMJKIeppv541W6nQJlmJYKv7DCvrAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-Rggrols8hXGEcWeIEGn66kY9IVTzaTUf3oMfEbdf/2Q1QzHzmqp53yamHl5ioMgX
-o5UBVxthgh1VOxkvCxIzlKDJprzVFkfwwc7h9c0HGt3No/ERobHDT6YRaGukAL5g
-muIGBUseyBAOIfyqc5kbCRWfPrAOttAH4gd8XMBgO8XdfHAvyXBC8Ha55O6oriX9
-IAKL5+3nVJkBle+62OmROnstbcdKyK4UtOeki/6ptYVE0d9I+NfKjuk3eKtICW8Q
-Pn3IEcNEZoFG2UQ19ENWwYEZyMZJt0aunqnm7L4RYiZT5w4meeendzXSKLKR6+Ye
-ULt1sDRskgKoNRzmeCVzci05BG48jv/E7Az6aV/qhGiU2qIAPMdVXncWUhR3fj+E
-CL/uLifOvfC6SnKw/7qQmgjUvEe4Duvi670a5QuImpm/mAIN22cXPc+QquSdR5xy
-loz/o3JJQZemPAOM0CMIHZ+cGESxH30QCBNn5HfcOf5fRZVCss4Hl6JxHR2G4yN3
-RKEIUXR03qgSK91WHl3WvqwXgmIAiUuvPjo2i7kSuaUUHilZiXK1ngIqYfUTB5SQ
-O8pG0fx3fbhVDA3RQfXeJE6FA2AyLvqOcsseRzvcQjQm4MU7p+RVaY17rI6/EkS8
-ac3E7BPwnXqSAkPSEgoiezv/Z0Hkmrcu6fIsUuf4ETU=
+ZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKHIdR/QwaHkIn5z
+3cc+HNtMfHcKgVGzVDTobggUpWSwVUwa0DMq3OTcNrEnT6zZyUrrv1n16aykGPjR
+zJ+SZX1ohu8X4EHssBOGaNXUH/AYyfOKMLMGN9AU7dQzNKjuJGkbBXsfCtmQbQ+/
+ThMhE4X2bNxEULLudGEfKKQ09LZaqVjhhdVCbuOhx4SPMDJB58Ko10HQt7Mh1B3n
+UTJXFherTr5bcsazQhC6e5i5ySlBnJDnsa9+DMzopiUqMrqqb84WuMKszzqjlZXD
+xTRkAX7nGEU2wjGCx+moPaGLGZs2f1VjBOR7HoNGMAEhmHQhWsIgBCsZnDHgAc32
+7Gz1xqsjVd/HrrywJyZfO7ZhxMdmF6MH7eRQjfZGe0+Oajc/7EtFWXg7fWdafJ38
+HGoO8hVjlthKfAFxM5NWjvS7I06IQRwMGGApP5bx3uFmUUixtl/FLa6tjRKfzaXb
+X8b0p8HUMbeyvQAZemw+vA+nuKir3DtNIrpqfeXraCMUiEpI8fCRm29SBvfEsDXC
+ZxBje+nma8g27po8vCaHST+8sjwnNeiW4w6NpQbqqmnvzpf2ivm1U2su2H1E0EA5
+8zrUoKD13BQzFjccgwodlyutUfk0xYQLrRMOqggtMhsjFDIuNegnPgTHt7DSyAAg
+9H0QBXlrd9Ic/OiFMLsb3bu6eeu/AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
+f8vcJzjwqm2yUx1gYOt/BzfZ4+VNvP5CSIBxRAkT4judk4Wz07Pb1dQT351HcU8X
++pJ55HfIgUFyOSR1gKGJSV1HsREqYyaJV2KeBQM+klEeagYR+0Dt8R7NYTRtqUmV
+lyoW7eHlUsbvUa0jCiwOK/t7WDr9qH4ZUKxVYSpJNa8FO058SoUcCRFue5TnTxF8
+tHH+J+kzcagcS0Rk5CCFWCtNE8+0FdfUs8IUYaV8cw8PEqdfrfJ2f/Zj0I37rh9P
+pjuqe+GGPp7hv29YJ4bRd5TSe05vol2g+LYx2JNe1sr+NnGZVDVolsTg50cEwBo9
+gLW0ea/4Y+OoOAqFOdVM+RvfEbgpsT0LpHZAKXfiGi1PAMzZ0bJcOH8F77mV7OcR
+qNcshdM1LkMSojGvoVQrRP/Bz0CVjSpwBcmkGiehESkaxNNsUyQBla84v0GDvuL6
+cA6NDfl8iPz5W3kk+2fypgO7sw0FXQVKjq63gz4XAQsGP8JzF1cC4fDnoRRsHO5E
+UdWE98/AnVZ7mQ5bC11TAuDyzKGh1FNjrYFmsvTnMIWo3Ef5Tc5GXfYC+fVryfDf
+BAbw71FprzMMFoAIxiSCPzK6y/am7BdGM5IZN09V4BBMg8QwZiXtzXWH5JX5PKm2
+f15IkScIvUliS0RepLfI0CXcFuzpJKi7eHLqca0cli8=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem
index 6f8e5a3c6b1..53ee3185b2a 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-cert.pem
@@ -1,31 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFSTCCAzGgAwIBAgIUBfEMZ1Z/4weV13ryVA9qyNTPJF4wDQYJKoZIhvcNAQEL
+MIIFpTCCA42gAwIBAgIUf7oSjl262zqxycxCt9R08BG75GYwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwMjE4
-MDk0MzA2WhcNMzIwMjE2MDk0MzA2WjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTcwNTQyWhcNMzIwODA1MTcwNTQyWjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ8w
-DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC8
-jV8igQGgCvu/7BJDI5VQl43VGAFjH2Na/E9P4E5uwkSlJVED1WKvIlxRWhOaQOfC
-587nZVhQtHpdbCvBdKrHml4SVbTchs5SN2kZsHeqaQzcGnejnczE0SYo4xNyniSv
-GiQ1M8G3fiZNflEIPM/+Ob2oI3YnVWFGy0a5rQcHZWS45KuGILMP0aRHyzyh/31c
-K3i2xA7A3V2jBNuD4kHG8TLgfDeoCecTI0iU/LJnDOolX5XdpyeoJ6YyYOGg3F9e
-bRmbNlJN3Iky3Vzyc4jYG7y6f5DqfebYMW6hCvLpf9lN6/gPNOb2KjL3hvJ+hbj+
-b9EkVAzpw7mW1VHEy+WbtYMPoKy08JTc7zr1tv/vQGr3XExwlC9iixZXMaVt1kP1
-TEVHv2FiUOiZsVaqtoFpS/wBvKeQdkzNy+66pRpG9bLuOnL4hlz+rwHkdBmHGk+q
-cXdwglqIDqXKlCpIMSkFPH1364KLdJ2qBgWWoWCJjUmgbrA8/LU6DX+GBbEiw45T
-PQKP//RMkOrHOYRD33WTU0iKP61zn5+9RD5OLxEUOtCvL7AfB+jt4vYrMTT2U3Kl
-OckWxNx55bYLdLfGKtepGV2r5xzce0UMbWQrXQRuka3a/j5VJUTuUgcwgd6FoP4N
-4ObW2H1YEtE5M30xpa1kcqJ1RGEWagakISgn2Z3TywIDAQABoxMwETAPBgNVHREE
-CDAGhwQKBaxNMA0GCSqGSIb3DQEBCwUAA4ICAQCE2eJVcvsMmJu6xAfoE6/u6BrD
-opMicCtlC2qt0BgSIzzDQ/iWjnWKGM1C+pO+2G0WTczj7ugsxjPzhkyBpuEZaWt0
-9/tJTKIrgaRZvEe0ifsJxyqL5LJgfxK7TbDPcUBKr1v+TOxPVRq0FuG16x+yka4C
-rwxfBHU43FmtEFfgu13r515F3ggXcdlojkce8ZKtTAGEcN0MpbJ6XS90BHU0sy5A
-APTm0fR0vM3kg1nuBLbSGF5KfASdw13gb6QsDbll0IqK8LvXYiX5CaVfkAe/pFkO
-/2iIxYW74yC2gV+DcFdRPVfFxSKrdg0tDER35OYg1/vXRjV5BWr1EjE3qjrCcUZy
-rlF3fms7Arr20ka2nSa8avn4ALpyJZmKasoxNAAsxivingNVZkql48OqsJ3n0qGk
-LI6Yu+UM/pc78a3NHsdsCbnf8qvae4oJa1kyiochJu+gUOzHvs4Ydti9iTQn2Byo
-2A2LzyVPBmSOhzdQ7SwpvHA4A2ftao+dZoA/+o4rmBtbmgxjpBPyPJTN0ZfKlpKl
-Oyi57ov+cJmZctSUbP3M11gBva7aYu1Rd7/eXeCEl1FHhmKL/Ee+UrNZLiwspb2E
-Sa+pOHdJX8VgsIYXku2UKaGT2QFITxO7fnxghioxgsyCKrQ+m1gL9vgXj/gJu+48
-c+5CZ9SobLdMkVOtQQ==
+DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+
+6f15rjbEl5DanEWi3YsMIPNwQ08waUrqFz3aCKeGcRujKb7uaX/I5LWdh8x9I++E
+E2ccFlnJTd2dZKxjY9jd2pRXVHmVE7XLpl8qtlLtLjlJ889G3tbgwdLZqaClxJxH
+0KQHH5wUwweqlfbteXeYUAIfhDRmoOL2qhUPLYi7E5/vpMeEL+tMn6fswuk7JIR5
+64NLUVC1/VXtjDli0YiIhE025iWL7FukUAifJKa/kYEAPen71bZcpT3uxYnALClf
+rANg8uJ+DTDPeNjZbLjNTPRfqk4W7pwG8w5F6RhrMPwgqvBNrnne7OtCD2lzlFU/
+sQiBM8HA5gN2CJuDjl+F70KTY3nRkAxpmHvSl6RPTEx4egdcb69A85LmDjyV+S01
+8tJQgi8TEmXM+TadQo3Xz/6+MHBIr7MknRRs0l2wCCiNvkE5MxsT+Pv182wxGArF
+aIvCU4dZI6bI2WZbYclR41Ud5O6XhQKYu2AhS7zY1+nhAMAvqyD5OmIIjKWi3GHP
+vdSCljBQzs1tuHgTaKIeTTzFetnRDzyoRDbLbo/OhKEAybvIEqq5iXUmfz4RG+Am
+ZUdxBZ6muueAf44mVQBKx/OB1BIzObaKy5s2gP+c486WR15lqVcu6FkPf8tO15c2
+lfpDXE5IvRBeSgi4vVdL4ceJtrfMavd9pa3YmGk+zwIDAQABo28wbTArBgNVHREE
+JDAigiBpbnRlZ3JhdGlvbi10ZXN0cy5jbGlja2hvdXNlLmNvbTAdBgNVHQ4EFgQU
+eebevYkmCqTDsOG16U3lTCIvqNcwHwYDVR0jBBgwFoAUT/2qvvJBk3zEQJj4KzWm
+hB5HShMwDQYJKoZIhvcNAQELBQADggIBALVfgo+K+SHzNrerNVJI8U/50fi3WPsS
+rsorNxYHaapTJB7/Ngn8Nv05YI1Er4Npl9X/9LjA0uwxYmW6zPGGoSVqGTXJD50o
+2c2MVXrx3ZjkNLNw8OoIROU/JwFZRANYS9ECZVOYY2eHcci4S1D7izZP/7+8V+YV
+l49Do+ht1nkpeOadWXsQDPZO3bVbUvkvuYYeaHGzULKWS4sHbXmFizrL3V4XeuyR
+SAwAo1sRkYcJP5JUk8JCDW+5XFtk/X638RfZJ/9hGxW2gbX9T/Mgqsmi4TMajeNn
+VWkq7+WmU4v9TKZARA0240CIiwmW95KVMYe5rWEB3i9yo0c4kei9H113q0Pp/3Kd
+sNCZf14Wm8BhM8uUQTyOUyXQvDUx1JzJyZtXj3zGR86uqEGPPMJj4tWeP/FIcF3v
+hpH3s0md010BIjpEVoov6q1qPe32WQL9eGappsiEbJKFpJ4YYXwtSgOnUy6vt0kp
+TTuYQWBCUfdhKUmQHvJbFzA6OlIs4RRmWlUcFOFOcS79FzgcWS481LSyMNPNcQNQ
+PGmLtxxcoRADs9++BltF+Q8V4MbH5o+ZQt8314Vg9n1AWV6L2poLNY5CxXMd6tVu
+wDYHIe/VHyCBqsdh9u7XKpv27xfu4TdxDS1nNzyMm69FUlGvRC5IR2k+IEIKmQ2n
+nyRbOKxUBKl6
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf b/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf
index 83d9b03ccb7..49859873222 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-ext.cnf
@@ -1 +1 @@
-subjectAltName=IP:10.5.172.77
+subjectAltName=DNS:integration-tests.clickhouse.com
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-key.pem b/tests/integration/test_ssl_cert_authentication/certs/server-key.pem
index 065a2290749..9d4aa59a125 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC8jV8igQGgCvu/
-7BJDI5VQl43VGAFjH2Na/E9P4E5uwkSlJVED1WKvIlxRWhOaQOfC587nZVhQtHpd
-bCvBdKrHml4SVbTchs5SN2kZsHeqaQzcGnejnczE0SYo4xNyniSvGiQ1M8G3fiZN
-flEIPM/+Ob2oI3YnVWFGy0a5rQcHZWS45KuGILMP0aRHyzyh/31cK3i2xA7A3V2j
-BNuD4kHG8TLgfDeoCecTI0iU/LJnDOolX5XdpyeoJ6YyYOGg3F9ebRmbNlJN3Iky
-3Vzyc4jYG7y6f5DqfebYMW6hCvLpf9lN6/gPNOb2KjL3hvJ+hbj+b9EkVAzpw7mW
-1VHEy+WbtYMPoKy08JTc7zr1tv/vQGr3XExwlC9iixZXMaVt1kP1TEVHv2FiUOiZ
-sVaqtoFpS/wBvKeQdkzNy+66pRpG9bLuOnL4hlz+rwHkdBmHGk+qcXdwglqIDqXK
-lCpIMSkFPH1364KLdJ2qBgWWoWCJjUmgbrA8/LU6DX+GBbEiw45TPQKP//RMkOrH
-OYRD33WTU0iKP61zn5+9RD5OLxEUOtCvL7AfB+jt4vYrMTT2U3KlOckWxNx55bYL
-dLfGKtepGV2r5xzce0UMbWQrXQRuka3a/j5VJUTuUgcwgd6FoP4N4ObW2H1YEtE5
-M30xpa1kcqJ1RGEWagakISgn2Z3TywIDAQABAoICAQC11lTwLp/Fm7IL9fvquc9P
-CMmkv2DfGi80WO2YJ8ccM8gFyEYoP0rLgYSshAUxlvSr1+iG6grQ0izMGfzctcnZ
-c3rTjco9fthNG9kFCFVvh536SqAkr5MCIH3/onZn7DGOmNRgZoikkEkaJP66xgME
-tuS72W8iIcoNfw63FDIaJOONGCJ+2Nw3HkOjZVIVHRLlp5rkD5H218Vs6MtWlgY/
-eO9K5SC7sskhgL6HyGe40BCjeFpMh97L4Wj7XslZ3A0xQGAYervHES9TWX5A58EK
-QT2yUkIMktzklE+PicKYA08rQa1Z5Pf0YOAELSWBdS7iWi3FLjXB35sE5rbT5puH
-9hZXSDWLggbefuaUJyowDEZy2aHP5pvXKBDhEANRbU8VaDyHhlNLqVNquE5Cn4HO
-zPeH+KLFbbABUok7yYZmIC9Bfn+rXvNzTX6A13AdJI/HcKA5RBGtpAY/168Pt/Aq
-dzuqepu42rFAvS45RNevp72IIavx/QdAA1OTgKxh3c2Mf85pIXJ51aWWLnn+EZ5/
-EsE0crfwkuKJvjubNC4oOwMTFMIBI2WsjvaAw8pQw0Kb0ksExKd0wz9mKcqR/v0I
-K9oYsaHkx5je0NOZds385+zCoQHYaw1aKUd7ZLqr5G/Nf/2TEYpMWco4ETA8lzu3
-Ty/8XkNw8jd4p+7bUuz1mQKCAQEA4MNU7GWDPwUKNNSz335nGH2oBvSGbYiwLcRM
-D+x2+RTfOAFSSJ+Q5tQ+327ZkAB5dK2mxmDYKB+Ln1UBIneViUflkMyh4fuutIXI
-wYo+BL71r89MqhRvvMK9hWnCGtJTJedf2iQENJzVn4J76BvTPRYywBv9pofPOlj1
-MtwwMA4CZAmQpCUaF5NQr4nliYx+slkcKwlm+cOxeZGa8mkNgQdmCcTZkRz6qsiR
-vQDEDiS1+5lCJ6nWW4L2tOPejNN//hVlbPGMaA0oiu7I7w4aSxnTlLhDgJzJwmN8
-NFYl+u5AcPq9iRtBnzfPmd87S9bg10zcIiMKxw898sU24Pa0jQKCAQEA1sG5hO3c
-4API//k7NEWXsx5Ns2JE/AV1LtmBgqXkn1DAJ+b6V1nIUppTs0zspEWrae9KrsAk
-z47qIbPaTLHuptLrvEXk2LVfzcK32a7fXXDOB5KkBhzlJM1J3PTRQFR9lr7qX6vr
-EDc4p7p55IDEGnJdXa7x+z56QjpAZaHlzexQxvoWWoLBkDuoT389sdU7CbgTa4A+
-CR6D6qKd6H6tfmv5sPlvp+aje+ObacP9I4WyVjscWkzBHxS3n/fTLjY6OFv+o8PM
-TdytN4+HZnu4MDJlF3vx9P6CbnnVCaScXDxPGcoSJPcoEQqoyxuvUQLDUQkzWF14
-02EvXW0dbgiPtwKCAQA0EUwFD2ceHD7HClc4+QFNDR71rYPOsBGQKJ8uOSs+fHVR
-dgznwf9BWf3OqNFBqLp6KxgtcJXihZxEpt6Ca416pesqZh1CSpmoPC3LmAjR9KLZ
-vX4XEHDqG3roAx3yNLMKXtU3pYxL2+Eo+INXu8ptpkzPcCyMfX2mGKGEzLllCHnJ
-TuXxAJ9QwtG4OIuyF5fqHPaHicAPMCRW80If0fJM57fdn3p/QWVYVupcDGdel2aJ
-CHHo2lFMFcStFvShTwWhiLdcS4CpQhMYTETEDFJO/4aiNyV8D9Y1b/J/9U0LGlJX
-Wd66elPzXGx9StdjtD2V4rpENjXy8zb4nHMgHkapAoIBACvvtmTbxTSPka/M7a/k
-DQU4Te1FTZfCBhdvqG9yQTPW8Xk4aD82vyUnLbihJEj3d/pUWpMl/GH6eywp/59x
-R8IZpOD/67HqaY9PJw4CGPClA4HJHoWho7/DwDjUXXsrzgXpSUoJgi3vHkgyfn2h
-Wn2OqEtiX19niNvDzyj71mgq0Nvkjm42EiPQEL8y6QxY85spbc+wjQCQnayDWIsY
-X6ZdsNfkMFPJe+j8x+77ie6ai8HYlhRjX59cPbUcnrf1oDOnnpEincnQPCAB3VG6
-PhSeOtBzKy1UZJr1kgBHDTZRoF1GWi/14NybsazcHSIVzp/lofuSJAYa+/XBPSQl
-3EECggEBALSLZPdg13906LEyznYnjgq+nMh88usegvU9qsBAFExClLLfr6Ak77og
-boNoOwbaFn+xiz5M8BTJIPizJcm5GjYaqg58zotTtG51h6VgMri+fb/BUpVr7p7n
-aSq3kXDZlrwZnmooCT+KcGx++w2N2SYSyZX1TELt/dpfuWJvph+E37PkONEEiHPF
-ZtSA/f9lpfP5/nx1pLmv4ksKdXqpz3/kNqaf9zbhQLgOm/VoBHL4NVPYRylGpCJb
-R68/7yvHBd2EskZoJB53TlJmwu+fC6ee1UiG6aqTULfEsiGidi6jIt56Gz52ox66
-BHL/JsJ0Be5xM3V4x4PtihQ3Dw546FY=
+MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC+6f15rjbEl5Da
+nEWi3YsMIPNwQ08waUrqFz3aCKeGcRujKb7uaX/I5LWdh8x9I++EE2ccFlnJTd2d
+ZKxjY9jd2pRXVHmVE7XLpl8qtlLtLjlJ889G3tbgwdLZqaClxJxH0KQHH5wUwweq
+lfbteXeYUAIfhDRmoOL2qhUPLYi7E5/vpMeEL+tMn6fswuk7JIR564NLUVC1/VXt
+jDli0YiIhE025iWL7FukUAifJKa/kYEAPen71bZcpT3uxYnALClfrANg8uJ+DTDP
+eNjZbLjNTPRfqk4W7pwG8w5F6RhrMPwgqvBNrnne7OtCD2lzlFU/sQiBM8HA5gN2
+CJuDjl+F70KTY3nRkAxpmHvSl6RPTEx4egdcb69A85LmDjyV+S018tJQgi8TEmXM
++TadQo3Xz/6+MHBIr7MknRRs0l2wCCiNvkE5MxsT+Pv182wxGArFaIvCU4dZI6bI
+2WZbYclR41Ud5O6XhQKYu2AhS7zY1+nhAMAvqyD5OmIIjKWi3GHPvdSCljBQzs1t
+uHgTaKIeTTzFetnRDzyoRDbLbo/OhKEAybvIEqq5iXUmfz4RG+AmZUdxBZ6muueA
+f44mVQBKx/OB1BIzObaKy5s2gP+c486WR15lqVcu6FkPf8tO15c2lfpDXE5IvRBe
+Sgi4vVdL4ceJtrfMavd9pa3YmGk+zwIDAQABAoICAFAqklEHmiDYIi/iAg2/KLWp
+mn+QDA8gj6AXrVXCX5JBKaFMlMupCksR2r9w+CmuLtPPj/MH4aD5rO78CLVdhoG2
+WKcJJlq2oZaH4JtfXxgQWmcW1XmFdkZ/rSnQJFCnbBZt4orJN7GyKaR0f3E9mb4g
+DpwsWBKmSVfZmKk8bhdcSMMI9uyncI9G1W1CdUxr66MEhafZV+JrpCrxQGGh6cql
+f4TnhGmqkNrA7rXg3pI/p6Mx3HBuz7o8evKqCUtkX+U4Jl0N8JSMtmvQa4J1OG6g
++1a2fT786BC0/E/X7vSH579R+EEuXCeDZdBiB15MsbVigdc7JAd7roVgXOkTnkE1
+miQeGhP2J4b+OH8fTLS2KfZ9rW/uUFI3kO3duMv6+K14fIzXDZMGduW9f+Tf0gqf
+bj5A8Me93fddU5UHgLcJPwqbKXwJjvpnc4c0Ntl5op/2NieakvSJ9l0SnqzGcLx/
+Ufgiz4djaRX/xd1qepOHYkXT0egVec5kJvY5uKgdkWMH5ZlL5viv+7dZNBANAzpl
+3K6j5N/ay7ED5cifeUReuPeNw92w5Rvq7OVGWR6lEsexFf+J19fefPo43PQQFtLM
+W4T2G/Y0NHkkUsY71CMFN/Oom9wNLq2EGq0apljphf3pAVf5aGNSNwJkLBlmwJDu
+NBN2AZQDd99zJ5+LfkotAoIBAQDK2koIG46VTDmhLAOZFNm9wMBALjFExTwo7ds4
+J2GmAphAgjkaxq4KFePc9uzVBx3nkP/4QSWpq/IhJP1usFseSeAR4SCRx2ARvhvO
+T+QQ2TTWIfH+LfVM+Vkg38eXJrAF6+UT2EFkvFg0gO6bW6q/SSCxZvltLKn2GX9m
+ql3SeFq14r3q05D/sAetdJquAyY4mDZNUEh3rK9ueVNODXSw61GvCABEAJvrNVeD
+4iTOmL+51hQaNubuEyxvmmMVv6ougo1MwQmC2MdnwlW5DmUDM4oHjiEZ/1bumEMK
+HMUgAYHguwRug28YU4D7MMkKWnhCIa9tEeUKlCDi5eiqtoAzAoIBAQDw7vO61oAd
+Aw1lS5UBKEovZfM3aDZKhFsqkhbRBB+FoYtWJyEm6OTZL7oJOVPS/BZFzI/Iy7XG
+D+4aeTrK0iQsah1oim4VHp+A6jBOm8VuMJ1vJE/awXXqAkxPnoEaDPJI0DNyVJwx
+ah0wH2qAMVi4eXvBHaYemx+KaVxYiXp6veupwWS6ZIQYxKsXbudbs0u8tKEblCGm
+KFbeTN8lI2Dm0YwLsrYL4HU88AYYzW1xJAaeN7IV2okOdu8bxPZn33MrQT/Ag58V
+FI08yWqxtxQ+2Xf+rpT9KV8GzrCkZ23aSxT3MKjhx4zg3IGEwZYeFmglDgxj4Xeu
+WBanAMmddzr1AoIBABqRzPCS63ISsdmyciYy3PJFtOizJDDlxKN3xCbuwZOE83w/
+kks3isQ3ackfbpXYgMo768sQfWZj5ysANVGyN70X4Al3e1Sc0LCCPhIf1LeAO7Nw
+bsnkKyUR4+KybOoXXybnZvHaeXZAVS1LVfVzZEH5yhZybmkmWHyrikxgNDnFGdyI
+/mcrnupenCLUCw6PywnOpg4qXdOPAsttiMPIb2hc6i4K1j4R9lowem4DyN5mk3Y7
+3BYy6rx0NnXHuwK2QAwnfWp4Pk6tJjEo+yFqCUEKFyI2M4+8Kh7GQsGoUwmGKQTO
+eh4fiQWeql48XZjFkMrYrqmSlnV0QXp2sqrpjJECggEANomwjEOP3oFZX+ubABcR
+q+cFBi7F01pglKNbHNc1F3e45biXzYn8e5lNIFdkvSapGAW1KnvKWtoySLXWdCDb
+ZV5j580mHAvBiVn5s2GZcFb63DS5CsiuG1mH0qILkU0K7yaJ7sBuVtUxZDpITlpd
+Pezp8Y33k4gDvL4a1EPSgMRK+zM2zOaB7GVgYT6OinhslXvB2E9Qyp7pAwsdm/eF
+MNqQO/mpMckOYMvoZWbi9jB0ew4ads3wJmEPwRZ1vI+dL1ZmyvpAYXI0gmUJjM7n
+e06Y1gLI4QGjbBQPcjejaz2Bsm7GW81i+2eOvfFgPNFPo8upTFa2U7XG8ui/urBJ
+nQKCAQBq2XWZJFgN9GLRWy7Yw+n0s6W5vyD/c8O9VTuTn1DafOVb5KxH+egcxDcj
+0T39nyVm6XhchL96yu947bWgCVOiR2Yu5QQ6xw7em46VZdbTtwjKlW/xRYGJKW8v
+utcd9C3kR1r92oLbtuWcoBFcCW2MMhamU8H+Wg6Mj5v9+6FhWcomqHaiS1E9ZA4V
+qhPCheE6XZGlo6+ar9gIXJcGP2ktkStAWT+0O8stc8xvF5nS/y35ZJpIxrMOsNQS
+9+kxj8ouH6D49LYm2ZFtgV5Ink32zynAzFUm4FcYe0fwo6ADzS/PH5eSL1fX3iZP
+Hg4+vB3JZpIQ4jvvlZ+GdcG5eW61
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/server-req.pem b/tests/integration/test_ssl_cert_authentication/certs/server-req.pem
index be2f756cc7b..714ef19ecf9 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/server-req.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/server-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEmzCCAoMCAQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGc2Vy
-dmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvI1fIoEBoAr7v+wS
-QyOVUJeN1RgBYx9jWvxPT+BObsJEpSVRA9ViryJcUVoTmkDnwufO52VYULR6XWwr
-wXSqx5peElW03IbOUjdpGbB3qmkM3Bp3o53MxNEmKOMTcp4krxokNTPBt34mTX5R
-CDzP/jm9qCN2J1VhRstGua0HB2VkuOSrhiCzD9GkR8s8of99XCt4tsQOwN1dowTb
-g+JBxvEy4Hw3qAnnEyNIlPyyZwzqJV+V3acnqCemMmDhoNxfXm0ZmzZSTdyJMt1c
-8nOI2Bu8un+Q6n3m2DFuoQry6X/ZTev4DzTm9ioy94byfoW4/m/RJFQM6cO5ltVR
-xMvlm7WDD6CstPCU3O869bb/70Bq91xMcJQvYosWVzGlbdZD9UxFR79hYlDombFW
-qraBaUv8AbynkHZMzcvuuqUaRvWy7jpy+IZc/q8B5HQZhxpPqnF3cIJaiA6lypQq
-SDEpBTx9d+uCi3SdqgYFlqFgiY1JoG6wPPy1Og1/hgWxIsOOUz0Cj//0TJDqxzmE
-Q991k1NIij+tc5+fvUQ+Ti8RFDrQry+wHwfo7eL2KzE09lNypTnJFsTceeW2C3S3
-xirXqRldq+cc3HtFDG1kK10EbpGt2v4+VSVE7lIHMIHehaD+DeDm1th9WBLROTN9
-MaWtZHKidURhFmoGpCEoJ9md08sCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQAb
-FDegAoUBz9O4JR1u68IMnGkO5nINGAPQOqf9a2BxGujnSB7Lw6SHukjkUqqgnfQ0
-x/aWOI8JVAi/ptscojgMQUDsVNsij5v+jbJE+ZAobxnTmKP0wTc2ktpf4d8UMVc8
-gyM85jLHZ8caCcuy0D97W81vgIv33dNHWtP+sfbQhX9wJ2YQTahIC8NpuQfLAOUH
-EFxWil0mfN+9vRQ1C5naKtvrOPqyM0RPrWiudIJ5QjI4aSXxUCupxxnaQMoI0Y50
-MvVVT3VwWgP+hL4b+yEJFHRpE7BwCZijsLIXkXmVZoveHhiSMYen1HWIP1VMDEHP
-CUtG5UQcA78CBS8qg4nyFbDU4hWClAkAt96O8Y2epJYepIoYuBBSEfrgupESMLjS
-E9Hfq/H6Ac/Q3zWa320udvA+ysfS8pagkoiH9+TarrsDjhxLjg2h2bGcXKlrsP1R
-mRVZwfNOl3/ZNq5HBPb9Z5WXKvcsTCQAlnHJdaSmzdyArB0guwUHg8ZZNZqCdVgL
-TPsfE84yI/HlwRfuQILfGxq99p/UYFwnee5CoM/PPvaAT+9z/lykMWZA7osuBcK6
-zP8XneGmZOkmez5+YJgSC0xeaDxr2R52eQXlQEJGDbFDtQap/X+cJDGyqmGnbhSu
-6XkGy0l8mAkpcurMcy3wWf6+joskZAN4Joi4ZjKsQA==
+dmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvun9ea42xJeQ2pxF
+ot2LDCDzcENPMGlK6hc92ginhnEboym+7ml/yOS1nYfMfSPvhBNnHBZZyU3dnWSs
+Y2PY3dqUV1R5lRO1y6ZfKrZS7S45SfPPRt7W4MHS2amgpcScR9CkBx+cFMMHqpX2
+7Xl3mFACH4Q0ZqDi9qoVDy2IuxOf76THhC/rTJ+n7MLpOySEeeuDS1FQtf1V7Yw5
+YtGIiIRNNuYli+xbpFAInySmv5GBAD3p+9W2XKU97sWJwCwpX6wDYPLifg0wz3jY
+2Wy4zUz0X6pOFu6cBvMORekYazD8IKrwTa553uzrQg9pc5RVP7EIgTPBwOYDdgib
+g45fhe9Ck2N50ZAMaZh70pekT0xMeHoHXG+vQPOS5g48lfktNfLSUIIvExJlzPk2
+nUKN18/+vjBwSK+zJJ0UbNJdsAgojb5BOTMbE/j79fNsMRgKxWiLwlOHWSOmyNlm
+W2HJUeNVHeTul4UCmLtgIUu82Nfp4QDAL6sg+TpiCIylotxhz73UgpYwUM7Nbbh4
+E2iiHk08xXrZ0Q88qEQ2y26PzoShAMm7yBKquYl1Jn8+ERvgJmVHcQWeprrngH+O
+JlUASsfzgdQSMzm2isubNoD/nOPOlkdeZalXLuhZD3/LTteXNpX6Q1xOSL0QXkoI
+uL1XS+HHiba3zGr3faWt2JhpPs8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQAx
+Sq/dJHjSVa1g4clFjtdKciFsSnCm/vgzGInyxGL4zTyTf4QXQ0PhfHkiFFCMkFSP
+snxavti5HjSCJlUkhB/x4YpqFPQ+/9Uly8RCKKdlMTSiJ30IL/D4dWtmwA83UQAY
+ZI6b6dvjdhBNMDb5M9Qzv4+PmF/KMB3KlFTQtDZoAqAnWrtahsVJzsaawK4PPc/e
+4IINu2O/aAFnJt+ewwA1NDrkaSlD7Wgu+SAlQRPO+vAKS6Qbs69R/vDdVECJOTmB
+FJ9uQlXuhwsR6u5Pl0Df3Jh4K+EXw0nY4LEko3915HnKAQt0F4BTrHjW3Sk2WnMN
+AWtp+4D5epRvD5VpL+mwce0PLH6rUb4Ipe9zmApGQr2GAO3XjpfvusvUJPFcWe2b
+EfnBxq/Asw1ALqLrT/LKpZHRvNN2YpBLl8ZrzOsNwqVPMDTPUYWf17wLS+FiuCHD
+BTdMIoqZ0dmp1ZmENB8h5zM8W+XMlVQlg+LeTVqeEA5Jgr7zuMObQOar0K+MV00K
+Jqi2ba/v/zFtN31rH+wULfV8BPdtrVTbJMTrCJKLpAwKjsO7wFoFn0Qk7WNEmPmD
++TA65ilk0xfok/04pkh1gd/Kqzh1LIOpG0kmh410U3AJ2jsF3Sop+apH+r+Blota
+SsCHnBqnABNRs6gs5FA1pbD4t81pQl5xoXtCCuZbPA==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem b/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem
index ef95a73deba..03ebf989764 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/wrong-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIUL2Y/QpwqqHyi43PwPeA6ygdPYK4wDQYJKoZIhvcNAQEL
+MIIFjTCCA3WgAwIBAgIUUghXstot43OmqoS1M2rmdSRRX54wDQYJKoZIhvcNAQEL
 BQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
 GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xpZW50MB4XDTIy
-MDIxODA5NDMxMFoXDTMyMDIxNjA5NDMxMFowVjELMAkGA1UEBhMCUlUxEzARBgNV
+MDgwODE3MDU1MloXDTMyMDgwNTE3MDU1MlowVjELMAkGA1UEBhMCUlUxEzARBgNV
 BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
 ZDEPMA0GA1UEAwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAxO2PSeaiNFMRRiFXpnMw07u6EIdEc1Jx3cPvZjEUg/pdEmMYkrSxr2MeqRkl
-tWH8TcIIoiWDLIcM6IU0mF6a5ULu84hFb9b20qRG3wRNb5yO86HnoyzU99t98++a
-9iaY1QAt03k8wq4jRjU2k/eoVSoLT5uVP5KxiNzdS2BTHFSsxrt/xcwdgkfJouHN
-p+MYUekk6qaQy5fTqTpqdkgO2v/JoYCi0whBNj205d+WnS7xfeyVSJP1OJWHRZ7K
-Y+LU6hz6wHIng4s/ag7VdAk0PArWs50BmH5g2zJfvt7VeTQebaJWUtSEY05odOqt
-KZteUmmhxW/2M73wGVF3WAJCnaxypsjcmMZFCpMXpwyTFrqobvC3APl6SOP+Ev1M
-LxhhCIDuLFu46P55KKEKjUCsYigd1VsHjjvoajGcqlPlMsVHJc9VChsQDz6agzDP
-Fb/LyYbrDTTmsI57/s1jAZyemq2SEYPApJvcdZ/ucl741jI0671EZPlip9iUQgt3
-MHlc3t53/GtF2W6GF5Fogch7c+0c2BhMupAHAXwfLABvv5X8GDyjsNlwB6ea9jeC
-Hw+0rEotZzCXId3daFytGNm1jI216kXLSbvz6uz1wMGS6Hrhk87whgvQ58RMNs1K
-SGDFw1WFv+QZeTO7wqcn8Y/eqF7q9RBhOpPMJMX8Sx/UXuECAwEAAaNTMFEwHQYD
-VR0OBBYEFCI7Iy7tY0D4HPa9BZCZxYuJ51mZMB8GA1UdIwQYMBaAFCI7Iy7tY0D4
-HPa9BZCZxYuJ51mZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
-AIKYtBwTp3yvUGSXorV32dnU0Hp0MOie/itgx/la6b3h2bZSoCigKmcmvMaAaNzA
-pxeYSsf5wPnONpWfo9hsGrUDMT4ETnXdzA1dbidIrhJbGsY8CN217Qt3YZWNWkrz
-xLwxEwAovQZqnGDvtx+tRE8i6YJO6/kca+GB7liHFvUx8zaQ6gCwfloduG8rOAeq
-noeCpW/zqYQSQGK35ntQ8MTTRbi7jMOTCikvRlldS73ODQcAR7jywgBYf/i8ANtz
-NoWa4KbWuqKsQKMIGOi1fMLMaNlDSzJyw6UJ2GVCcL1NxkCZi0yudfAAxWlRis9G
-zLjm7YdNBiC6RVZudGhvzjlsLZpE9DgiwXqcDv3Y1dpstD5ikrNhlQo6THH1YeFy
-B8vjVGZZZu4B2JEo+QWH+zFGJosD66YoaKMVuwRPwoGDQoO0Pfbpq41A4KUhB3cf
-X49/rbInqwsN5MuGp4l4+T7k7Wm0Y1Qo4FXDVbFxHvvniyHUsZk9Llzf5wBLl84m
-xheUGgCHSflfXuuWi76yoADHCv+Eqi4/aLJmkUewKXJlm+XYs9bdBHUI+Y10KmhA
-hgcHXF56L+N4mLRwUuLxa5qwQIqNX32+piQoO9opxnVKKCptpATLE30TOMLEXBlp
-J+6b1e4BIasAAEGUhTgPj/SLL0u59Bv0K5SlSn7VZ0gI
+AgEAjQjHTorL16xTiJFAaxeC0GDP0uCIbT1olT8NmWOePURqg7HpVzBtvffxiug8
+l8fF5kr3mfs9A2XuY9Of/A8uDTm+vdSEjdTwkAox4355oCHDQo3F0GsfJwy5f0vP
+t1vKhMmvBHM7cN3aaPBnKJwM3Qd1XWxyEeCv2SDvaxhwMO9Mveal7WUGBKms35Rz
+PYEVejM9ccy7nZ8+/wLAx2ixgs5I5uo/RkJkCMVGlKk6BPRLFpiG5tdvrUmFYNdp
+yOV2iVEJ1McPKkViUfbVUII4UlvVrsgRNqsWn4ukD5jd7a7AzvfVQq6Mhe7SqDc2
+8c2aVLhoqxYpbKmcYYJGQAqlXgOObs6DEcyitXnK34RkltMgjrl1GyqqqS9hGkp4
+XBne+rw+mbH9jfBdQpi4Xp79l0NVQYahS2iX5HFYRBa4i8SCemMGpVpHrK4L+X8u
+qINiLlVXIH7FBTBgz5EjvMsgihdBbEKlFLqUJsPJhRPyBmIewZMGZnsO8PR8av+P
+jFp5iBFE1RtIcj4mg1QsjnYxA1QjUtPnqPeHqph7qxtIvjd/j+oXpcyal0xkGsh8
+G+sdYZXCktuocMDmm5ejJs5156znU2yHwN0/hdGJYGdKYWHjSVPT6sa9Q/blJ2IN
+/CHSf7ao6FPq4XuMynN5N7K5RbQ22oYuCmqcGpQxtwWRcA0CAwEAAaNTMFEwHQYD
+VR0OBBYEFFU4ee1zFXfU+/UiBHqDt7gbKn3aMB8GA1UdIwQYMBaAFFU4ee1zFXfU
++/UiBHqDt7gbKn3aMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AC3qz446kylKOhNkssTXnjmFrZJhZLD06ijE15rhIgHBP3FXk1RZYcWj0bvERZ2n
+zz0IO+Hy68M1jBV0R5YE8SyNVwEec5QiTYhoFoGsBFvlf6zz8oBhSQKtrvpvefdO
+8vu+BcvX5C/JcOPrG9y6feTEWa29O7007LM+GRJOe4i2x6xkHGyLWvCSAm9fvHRc
+gs6BcRIJLULwqlRaIHHNt8R4pwVaanJ2qQ2Fctgbx9OYkQzQK6hOjo0UUMvykEhW
+XW0DT3tYGb9keEG6lPHYcyOcbkans+zJmHxSqLiVPz7tm3pwDtd2OFCi869y60WS
+zzQNBhXCYkh782dF+pnOxV6hmdPaLqx3tD/WrT72z1qNK4FEgVIzSy5ULCp3WcgZ
+ARvMgCMV7CK+rDID2QHuwNmJIArTXX8JRrV/zkUgsdapGpF5zkQ8rNGRJcDKzBww
+CiVPOOthSbf+F9jLQ5nzmlFa6rJ7RxHuj1PVwKhxc8u9bPHAgZSt3uGH4QaFh5bw
+3aoGucu2yhnkv4aNK6w2nj04K9gYdLwRbJgTNqR1FRCEXzfaJF1szq0dhXQzlhf3
+kbP/Wh+RhDVqt2Eu90LbmbUl+DbIHiYdjc67XFNbppXNn8NpncZKSDH/xn4KvC7z
+ORsznqTC1pyQp4SuvaKYFCOWBzMZ60G5T8CTehP1KmKR
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem b/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem
index b2213cd2675..834f82fe80d 100644
--- a/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem
+++ b/tests/integration/test_ssl_cert_authentication/certs/wrong-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDE7Y9J5qI0UxFG
-IVemczDTu7oQh0RzUnHdw+9mMRSD+l0SYxiStLGvYx6pGSW1YfxNwgiiJYMshwzo
-hTSYXprlQu7ziEVv1vbSpEbfBE1vnI7zoeejLNT3233z75r2JpjVAC3TeTzCriNG
-NTaT96hVKgtPm5U/krGI3N1LYFMcVKzGu3/FzB2CR8mi4c2n4xhR6STqppDLl9Op
-Omp2SA7a/8mhgKLTCEE2PbTl35adLvF97JVIk/U4lYdFnspj4tTqHPrAcieDiz9q
-DtV0CTQ8CtaznQGYfmDbMl++3tV5NB5tolZS1IRjTmh06q0pm15SaaHFb/YzvfAZ
-UXdYAkKdrHKmyNyYxkUKkxenDJMWuqhu8LcA+XpI4/4S/UwvGGEIgO4sW7jo/nko
-oQqNQKxiKB3VWweOO+hqMZyqU+UyxUclz1UKGxAPPpqDMM8Vv8vJhusNNOawjnv+
-zWMBnJ6arZIRg8Ckm9x1n+5yXvjWMjTrvURk+WKn2JRCC3cweVze3nf8a0XZboYX
-kWiByHtz7RzYGEy6kAcBfB8sAG+/lfwYPKOw2XAHp5r2N4IfD7SsSi1nMJch3d1o
-XK0Y2bWMjbXqRctJu/Pq7PXAwZLoeuGTzvCGC9DnxEw2zUpIYMXDVYW/5Bl5M7vC
-pyfxj96oXur1EGE6k8wkxfxLH9Re4QIDAQABAoICAQCjj/CAX/f/X7MsPYtQa8J1
-Sinbio42/pYmrJPNnBw/FhZxrC7/wucGFlyj9IgWZCEr8Go9SsztkeoNwn2RxJoA
-q5xOV7PclX4CLIHUv/0VI8Kz5pi/NgBZMUwm7K8Xna041OI7ECqARCR2LsJ7GasN
-uVMVttK6r7uXQmLnNUUydb3ffmI8xjEIQVnfWI74z60mc2+/GcOP5jXeC+/a+DSm
-fudYpcAXaXbId24ls5SkTxYzEepYEtQNQFzPXXkah49yN8mpR+c74c805scxjmd9
-Kz9yhYiKwQTvaqKNpQVHmxte0gPC3lJrLPejjDtxIGOyLZw4oaqrBSpDzR9D0PTE
-C+BR6VlXpVCTcAoiweuoDIxNTiJ5IbIJme3iMWxsAIJ4n10rSFFl9Cmmqbphp/6/
-XInB0X7Zyr1kBrwf+DH6DJhje5NXgGKVR9oe9jjW5v8V2tg1RrkzNU8iKBSxpvcI
-x4mKhhRLYgoq/iNeYBVQrwJYktIbweVCQ5Spj7/20IrMkn3FAmMsZxGMZmLisJ9t
-B0vvUkUgWxuJTsPJ2j+ytpGT0E2xIDYCpbG2EopDc8WvHcVNhagBvLC6xIjIKm7N
-2zpBU2W3fPNXoToCAmaLDPYeRRpG6XaGFQAfvKUQRLBDGTfQ177qr34UBnmgvxDq
-J2gA9rQm3XziLMuSlJexAQKCAQEA+yz49Ah7FFq0QffsoRb0qOJbfcmMGTRkaafb
-ztto4EFSnjH2EwoSShu4DfqWw+ws1KxHlItNHHko5pVNpS4lj1OpnobW3QD7kEIV
-mYKa3KowYUcCq1Gzq2RNDZqsC2BSXwx1MG0VVKYOahnu5bvzQq2Ft8W7CWBnbTbY
-0Jxjs4KaOza+bH7Vfb5Yre0tlW7U5vI/YO8+YKxpxfOU9kVo8ZLQ/9r/YH8nnLa+
-Fd91+WjcUW8CTKU+Oz3lb/Vwcs6YOoAraq/wtOCqWURunBXkQtzOIn0bgBh3WEk1
-EQ+MVDHshlVVjv/rfnL571ZTT1amCJuEIwQRzLSvbso883srMQKCAQEAyLXaG3Pp
-LYiRKu7Bqr5PPuqdT72UFabPpfgd5EtcFOL0xUpfRya6HyFdM25FWI8haXeg4e8N
-0cIs3gMG+RRgm1xISJIZi92L0Cwj+kLFu2U5SkvAKMqZFh5q350FRi4Bp7ae4YrL
-aguWLZCxhznh4D5xQGM6c8ObRfUUEMT+dnLPcj4zn9KHhoUudXjLKjPNw5v6nkbw
-xtRdwANlHx/LX/d4+iwt2plDWmT+d2OLvqZcPyyghTMqV45L0p9XAXBsLnz4Zipx
-7VJ8iH3jL5oaQ6YAFY+cXIrWBN0q3UYbXdkaA2ve6voioeF3KQNRmU10k7GKNRWl
-pRNn62+rAR8isQKCAQAZnPVqFS9P3QwCqiCEMM4UJrkDs7jInTIcIBTnHDKuo5qk
-LR4VxPImgnsbWdFj+0J7EXJfMHFVlPlZwiHf1TvZSMPEOaXRdZcxl7uSIuJd3DEA
-ynf4NmWm9Zxx5bLjmhfsP1336TfCoQhZQ3m8DZV52C4Jlm1DQIRre6tSYpA8LvZB
-UYzLjYeBwhZS7hu24E1vm4ZhASSQQSSsHfGzx1IzSDBt1swx7+V/MpdhrZ7fJxVI
-bJSEcllNOzuZViL4Yh7d4FINGBHor/xPDA5ndkgHlXKjy7QxNM1+wEBcFATQVSL0
-c+E8qtY918Wq5VergH9/4zPvSivyfv5gwtjCT24RAoIBABP6HbJb0BqrHB/U0cvn
-00Vk3rGAIgwhpUtUrcz6PzkI+enlJCSV0zKkBH3I/Pf6jw3LTWUPgSWemQ6j6H7E
-K3VrMvqeKBLGw1K+Afq3yKyFP7WIYqDswV31Oxf0rgC1NY7220uBoAt3CcSRQUo/
-VZ8XN/h7p+a70mmdIhklMlqhxMoPLN48eybFfMFOe5JAw7szfDdiwjZYDti8vcTi
-SkDMBeuImCvI025c3QMPEmqwbkAPdg6r8Av06tEU8PkAspPR9ntcwCgp7KE9Pm6P
-fQu8qwd6WsrPOswTI2AQyUqHAFLU2sQyj13jbhPT87w5fF/y7NmpxOnwS4igfbnH
-2pECggEBALO0FiJClb0GSqMXYJ+nbtRObD4AynYNVMEqYdZu5DBb6vb4T7uumTD5
-I1fKOa5SSELngUj23p2G6sVBsDyDHotGJYJwDGejHOFnEpY+J0Das0pGS40FsFC7
-qABIUaMoLKcIR9Ofcm9uu2n+koNULV2aaXj7A4OYhRCQi2PqiEx1wimdrLfGqTXn
-O4rSf826ODch87vuPbfFPCaIFG28R3nByp/ZBH5QNiB3NBmc3A0tiHFnZW3cpOfW
-Jm/Vu0PcNVVw32SroS2FCroR7qSWsvt61UzJtliLUiFHoUAxrXXiAxcZW1D2Hmpq
-neUhT/t9hHdcMJgoxm2IITf6ip8nTnY=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCNCMdOisvXrFOI
+kUBrF4LQYM/S4IhtPWiVPw2ZY549RGqDselXMG299/GK6DyXx8XmSveZ+z0DZe5j
+05/8Dy4NOb691ISN1PCQCjHjfnmgIcNCjcXQax8nDLl/S8+3W8qEya8Ecztw3dpo
+8GconAzdB3VdbHIR4K/ZIO9rGHAw70y95qXtZQYEqazflHM9gRV6Mz1xzLudnz7/
+AsDHaLGCzkjm6j9GQmQIxUaUqToE9EsWmIbm12+tSYVg12nI5XaJUQnUxw8qRWJR
+9tVQgjhSW9WuyBE2qxafi6QPmN3trsDO99VCroyF7tKoNzbxzZpUuGirFilsqZxh
+gkZACqVeA45uzoMRzKK1ecrfhGSW0yCOuXUbKqqpL2EaSnhcGd76vD6Zsf2N8F1C
+mLhenv2XQ1VBhqFLaJfkcVhEFriLxIJ6YwalWkesrgv5fy6og2IuVVcgfsUFMGDP
+kSO8yyCKF0FsQqUUupQmw8mFE/IGYh7BkwZmew7w9Hxq/4+MWnmIEUTVG0hyPiaD
+VCyOdjEDVCNS0+eo94eqmHurG0i+N3+P6helzJqXTGQayHwb6x1hlcKS26hwwOab
+l6MmznXnrOdTbIfA3T+F0YlgZ0phYeNJU9Pqxr1D9uUnYg38IdJ/tqjoU+rhe4zK
+c3k3srlFtDbahi4KapwalDG3BZFwDQIDAQABAoICABhnSHVittreyqV63LarHsuH
+tO48Q98DHTGV83hzMFJRoEyhYErh6ltQp87tWG669pdeqXFPc8M+w/0qBSjMR5+q
+OkMGntkb23RRD0jZ/ZmjvfGqLmxd3MoY/Y/1Qj/r9iL78vjGJ6bj/ILj9jWkquUk
+AT7lIOfPBR6BAGx7kg4lmhXR7ywgquXrpioZuccOqvS2IQ+r6Vrgzzm49DqM9wo3
+P44VQlWZ701FNW1LyupIiyWhxtXyuTQ24IldPMSyT8x65USYHRunXdfo6ghAQBag
+JV1U6QWYnRWGSCEaxmv2LQ6i+5fKNC6IoJLS2wMEHIxETHguIYTX5GNK83TpYquc
+F2w0NcnO/xMPPFiNFwtX6N9/mexE7dDE+gDvUwWA0DodwHQFh9+IBphznr0OfrJ7
+G6I98tIJj5ecSsTnHyW6BzOxyoQ3KGXfwV8RnDoNtZXiK4boizGlrVrj3G5AzqAf
+z4dnIox/zP3kPyhw6670a1PuesQ3aTvR63UqLFOwtm1moZCh5lJmxog32s4mikdn
+cQiFFz83zd4hAMRsoJ7W5ABeZyM0V6DXd+lGO00bf3ex3cNFskLeSHLoArtiBt0n
+xtWfXU7/h4URFCyD3rJPUruSPT8DPcvu+PpxB4MEnZhvpC+xOXp5LM+jHcSsIgXQ
+Bp1wMpZtTN+tkJrtDGbRAoIBAQC/l9Ao+6I/NI1mO6AxMuwyFf4IVpSYH2j/wvrX
+v7No+i8egiS5joi3boNFrwCFuNDYm4tu9DQmqOHOYFiJXCemRkeyglgn0tSnnfGH
+jFQOlY4kX26lhI8A8EqCUiO3XYnEUsQOd2aJFDos1rr2UdIPFhmLIF7+6QNsFtsV
+9r6JcNIl+tMlhAZ1LiPYaKsy3GWPptK0Ul3IykBocIf42CNBrbbhMjWeOHNVUzmQ
+6EY5CEeGVEGOn8bkSq4mqtzDYVO9rFaX2ySsPtAwoelsxnxLRR+YFrVdIBS4zbJe
+zUHMD7g0lDl+gLCTcwsi5hFqUIE0xldRjzkqZgyE5Y6sdaG3AoIBAQC8cfZtIxEr
+4vVGl6ZqOsbqoXg1vNL99CQKK8KXBdi79ig4F0ItWgv/RfdZvLAQJ2fVDQcOQs7r
+NYINYNJQ2+ASvwDpcjI//M/lCTFY/kNBbUdAYIIrMlNPVoAnfGXCSpxOmw6iTNeW
+gvTHamvXR4hkI6XpxI60dmcBUxJExBsW9/Ua5oONZ37nYVL32/PZCba94nMpnJna
+6sq+YYWewla0YOZBKgegL/9S4kSt23UaGEfP6tC55puVBEmJZ3ZF57eiNHRWjK5S
+oLUSvoXghtNYD8kAE95DIMUfdZudnxcR7o0OZIXlXxdKuWELGj4rXLa52pTuXdUi
+4SaoFBIBtqxbAoIBACHtKxImxOs2ThedVVeA8exIkqw9UKDDZx9rEmoj6wwayT84
+wnINOE5rBlnPjGMhf/HrUTx7h8SUwS9/Rg5EwEykQ0vr4tpibf+ka0GaasQOXZY5
+Q+mRWJVM95SuIN72dE/MbCU3pXN+nnKUL5UwlebP/gPx3oB7GH0Kaw8vmzvRO5U4
+Hi2VfGNBoV1P44jlGCLg4ozFzQ+iKNeVna5F77BQp4KnFnGHA31HeHkdeFnfCnNR
+9i3gQyLnyoDUXrVGRcLfgpHvX0YU9V63PRNi7l2Rxu9yjfkIlkLHQd+hrxYIbpD4
+8llhRmNFyuIKJWlTCh4jRREPMIs+eNcLo0EMr28CggEAdbmER1325kHdFQK8VfTu
+O7owDPIvpbMVqLz5zbs7UQFQ0unEz+xHPmyJQChenVjgxvpihAg8mDhPTOhFu3oB
+G/TzLuPGfK8FeYIqr/v4LDGGp7Mi3rWL0i6p1QEj2SMfTwQTOlVjAYZCQSo8wLrR
+fC3BAq9mr1qgsvUgnpEck1bIasvDN12GrCni2TExv08QOMP1SfOpMlgn3JO0FCA4
+Zmt6rQ8CwJH7od31Jd/J4kl043FAgEKOw6NwBUT7YGSIFe9LFp7AcKIxPMqFfGT+
+Ny91VHUVDz6zpxmj4+51TSCIQouOEmM7e9UfyP3WBOTgym7BR8Ca3DVoHuya6zMh
+rQKCAQEAoy35YYbyHnb5CmVfCIBNk2ZrDERuT8NE6J7u2Y+1/yCmPJyLvA/JzYNm
+LifFf9x8+WMKMVaANq5ZitBMr4gMhFQe2KflfSC9rEzfhAoWVqNGjCs79+xNEv3Q
+eFv3ss/zU9AKbjepS6+wP6CuILqXVQ1lT/xMtJwc3+YQMyrIYHwUJ13IeGyCJRfY
+1/81JcB5pm9sjrgvRccjNV739A8ACm78mlj5DRxasKfTXkIlx/oJUe/EXRGfuZwY
+D2FxqP9LLa/gY9DzlUPYpWz3Y/KlbNO+nmakiAzHpPjwwca6FZug9xFW9Ua3SAwY
+aH0VTefFJqNq7ADzlJxogNFALN+F0A==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_ssl_cert_authentication/test.py b/tests/integration/test_ssl_cert_authentication/test.py
index 74bd08e9b35..0246b835fd5 100644
--- a/tests/integration/test_ssl_cert_authentication/test.py
+++ b/tests/integration/test_ssl_cert_authentication/test.py
@@ -1,18 +1,20 @@
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.ssl_context import WrapSSLContextWithSNI
 import urllib.request, urllib.parse
 import ssl
 import os.path
 
+# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
+# The client have to verify server certificate against that name. Client uses SNI
+SSL_HOST = "integration-tests.clickhouse.com"
 HTTPS_PORT = 8443
-NODE_IP = "10.5.172.77"  # It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
-NODE_IP_WITH_HTTPS_PORT = NODE_IP + ":" + str(HTTPS_PORT)
+# It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "node",
-    ipv4_address=NODE_IP,
     main_configs=[
         "configs/ssl_config.xml",
         "certs/server-key.pem",
@@ -34,7 +36,7 @@ def started_cluster():
 
 
 def get_ssl_context(cert_name):
-    context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    context = WrapSSLContextWithSNI(SSL_HOST, ssl.PROTOCOL_TLS_CLIENT)
     context.load_verify_locations(cafile=f"{SCRIPT_DIR}/certs/ca-cert.pem")
     if cert_name:
         context.load_cert_chain(
@@ -49,7 +51,9 @@ def get_ssl_context(cert_name):
 def execute_query_https(
     query, user, enable_ssl_auth=True, cert_name=None, password=None
 ):
-    url = f"https://{NODE_IP_WITH_HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    url = (
+        f"https://{instance.ip_address}:{HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    )
     request = urllib.request.Request(url)
     request.add_header("X-ClickHouse-User", user)
     if enable_ssl_auth:
diff --git a/tests/integration/test_storage_hdfs/configs/schema_cache.xml b/tests/integration/test_storage_hdfs/configs/schema_cache.xml
new file mode 100644
index 00000000000..37639649b5f
--- /dev/null
+++ b/tests/integration/test_storage_hdfs/configs/schema_cache.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <schema_inference_cache_max_elements_for_hdfs>2</schema_inference_cache_max_elements_for_hdfs>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 0490c0c1f0d..86fb5ab578c 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -1,13 +1,16 @@
 import os
 
 import pytest
+import time
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
 from pyhdfs import HdfsClient
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
-    "node1", main_configs=["configs/macro.xml"], with_hdfs=True
+    "node1",
+    main_configs=["configs/macro.xml", "configs/schema_cache.xml"],
+    with_hdfs=True,
 )
 
 
@@ -537,7 +540,7 @@ def test_schema_inference_with_globs(started_cluster):
     )
 
     result = node1.query(f"desc hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow')")
-    assert result.strip() == "c1\tNullable(Float64)"
+    assert result.strip() == "c1\tNullable(Int64)"
 
     result = node1.query(
         f"select * from hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow')"
@@ -550,7 +553,9 @@ def test_schema_inference_with_globs(started_cluster):
 
     filename = "data{1,3}.jsoncompacteachrow"
 
-    result = node1.query_and_get_error(f"desc hdfs('hdfs://hdfs1:9000/{filename}')")
+    result = node1.query_and_get_error(
+        f"desc hdfs('hdfs://hdfs1:9000/{filename}') settings schema_inference_use_cache_for_hdfs=0"
+    )
 
     assert "All attempts to extract table structure from files failed" in result
 
@@ -558,10 +563,8 @@ def test_schema_inference_with_globs(started_cluster):
         f"insert into table function hdfs('hdfs://hdfs1:9000/data0.jsoncompacteachrow', 'TSV', 'x String') select '[123;]'"
     )
 
-    url_filename = "data{0,1,2,3}.jsoncompacteachrow"
-
     result = node1.query_and_get_error(
-        f"desc hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow')"
+        f"desc hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow') settings schema_inference_use_cache_for_hdfs=0"
     )
 
     assert (
@@ -628,6 +631,158 @@ def test_virtual_columns_2(started_cluster):
     assert result.strip() == "kek"
 
 
+def get_profile_event_for_query(node, query, profile_event):
+    node.query("system flush logs")
+    query = query.replace("'", "\\'")
+    return int(
+        node.query(
+            f"select ProfileEvents['{profile_event}'] from system.query_log where query='{query}' and type = 'QueryFinish' order by event_time desc limit 1"
+        )
+    )
+
+
+def check_cache_misses(node1, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node1,
+            f"desc hdfs('hdfs://hdfs1:9000/{file}')",
+            "SchemaInferenceCacheMisses",
+        )
+        == amount
+    )
+
+
+def check_cache_hits(node1, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node1, f"desc hdfs('hdfs://hdfs1:9000/{file}')", "SchemaInferenceCacheHits"
+        )
+        == amount
+    )
+
+
+def check_cache_invalidations(node1, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node1,
+            f"desc hdfs('hdfs://hdfs1:9000/{file}')",
+            "SchemaInferenceCacheInvalidations",
+        )
+        == amount
+    )
+
+
+def check_cache_evictions(node1, file, amount=1):
+    assert (
+        get_profile_event_for_query(
+            node1,
+            f"desc hdfs('hdfs://hdfs1:9000/{file}')",
+            "SchemaInferenceCacheEvictions",
+        )
+        == amount
+    )
+
+
+def check_cache(node1, expected_files):
+    sources = node1.query("select source from system.schema_inference_cache")
+    assert sorted(map(lambda x: x.strip().split("/")[-1], sources.split())) == sorted(
+        expected_files
+    )
+
+
+def run_describe_query(node, file):
+    query = f"desc hdfs('hdfs://hdfs1:9000/{file}')"
+    node.query(query)
+
+
+def test_schema_inference_cache(started_cluster):
+    node1.query("system drop schema cache")
+    node1.query(
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_cache0.jsonl') select * from numbers(100) settings hdfs_truncate_on_insert=1"
+    )
+    time.sleep(1)
+
+    run_describe_query(node1, "test_cache0.jsonl")
+    check_cache(node1, ["test_cache0.jsonl"])
+    check_cache_misses(node1, "test_cache0.jsonl")
+
+    run_describe_query(node1, "test_cache0.jsonl")
+    check_cache_hits(node1, "test_cache0.jsonl")
+
+    node1.query(
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_cache0.jsonl') select * from numbers(100) settings hdfs_truncate_on_insert=1"
+    )
+    time.sleep(1)
+
+    run_describe_query(node1, "test_cache0.jsonl")
+    check_cache_invalidations(node1, "test_cache0.jsonl")
+
+    node1.query(
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_cache1.jsonl') select * from numbers(100) settings hdfs_truncate_on_insert=1"
+    )
+    time.sleep(1)
+
+    run_describe_query(node1, "test_cache1.jsonl")
+    check_cache(node1, ["test_cache0.jsonl", "test_cache1.jsonl"])
+    check_cache_misses(node1, "test_cache1.jsonl")
+
+    run_describe_query(node1, "test_cache1.jsonl")
+    check_cache_hits(node1, "test_cache1.jsonl")
+
+    node1.query(
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_cache2.jsonl') select * from numbers(100) settings hdfs_truncate_on_insert=1"
+    )
+    time.sleep(1)
+
+    run_describe_query(node1, "test_cache2.jsonl")
+    check_cache(node1, ["test_cache1.jsonl", "test_cache2.jsonl"])
+    check_cache_misses(node1, "test_cache2.jsonl")
+    check_cache_evictions(node1, "test_cache2.jsonl")
+
+    run_describe_query(node1, "test_cache2.jsonl")
+    check_cache_hits(node1, "test_cache2.jsonl")
+
+    run_describe_query(node1, "test_cache1.jsonl")
+    check_cache_hits(node1, "test_cache1.jsonl")
+
+    run_describe_query(node1, "test_cache0.jsonl")
+    check_cache(node1, ["test_cache0.jsonl", "test_cache1.jsonl"])
+    check_cache_misses(node1, "test_cache0.jsonl")
+    check_cache_evictions(node1, "test_cache0.jsonl")
+
+    run_describe_query(node1, "test_cache2.jsonl")
+    check_cache(node1, ["test_cache0.jsonl", "test_cache2.jsonl"])
+    check_cache_misses(node1, "test_cache2.jsonl")
+    check_cache_evictions(node1, "test_cache2.jsonl")
+
+    run_describe_query(node1, "test_cache2.jsonl")
+    check_cache_hits(node1, "test_cache2.jsonl")
+
+    run_describe_query(node1, "test_cache0.jsonl")
+    check_cache_hits(node1, "test_cache0.jsonl")
+
+    node1.query(
+        f"insert into function hdfs('hdfs://hdfs1:9000/test_cache3.jsonl') select * from numbers(100) settings hdfs_truncate_on_insert=1"
+    )
+    time.sleep(1)
+
+    files = "test_cache{0,1,2,3}.jsonl"
+    run_describe_query(node1, files)
+    check_cache_hits(node1, files)
+
+    node1.query(f"system drop schema cache for hdfs")
+    check_cache(node1, [])
+
+    run_describe_query(node1, files)
+    check_cache_misses(node1, files, 4)
+
+    node1.query("system drop schema cache")
+    check_cache(node1, [])
+
+    run_describe_query(node1, files)
+    check_cache_misses(node1, files, 4)
+
+
 if __name__ == "__main__":
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_nats/nats_certs.sh b/tests/integration/test_storage_nats/nats_certs.sh
new file mode 100755
index 00000000000..689221c39e4
--- /dev/null
+++ b/tests/integration/test_storage_nats/nats_certs.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -euxo pipefail
+
+mkdir -p "${NATS_CERT_DIR}/ca"
+mkdir -p "${NATS_CERT_DIR}/nats"
+openssl req -newkey rsa:4096 -x509 -days 365 -nodes -batch -keyout "${NATS_CERT_DIR}/ca/ca-key.pem" -out "${NATS_CERT_DIR}/ca/ca-cert.pem" -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=ca"
+openssl req -newkey rsa:4096 -nodes -batch -keyout "${NATS_CERT_DIR}/nats/server-key.pem" -out "${NATS_CERT_DIR}/nats/server-req.pem" -subj "/C=RU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=server"
+openssl x509 -req -days 365 -in "${NATS_CERT_DIR}/nats/server-req.pem" -CA "${NATS_CERT_DIR}/ca/ca-cert.pem" -CAkey "${NATS_CERT_DIR}/ca/ca-key.pem" -CAcreateserial -out "${NATS_CERT_DIR}/nats/server-cert.pem" -extfile <(
+cat <<-EOF
+subjectAltName = DNS:localhost, DNS:nats1
+EOF
+)
+rm -f "${NATS_CERT_DIR}/nats/server-req.pem"
diff --git a/tests/integration/test_storage_nats/test.py b/tests/integration/test_storage_nats/test.py
index a952f4b78a6..63dde8922a6 100644
--- a/tests/integration/test_storage_nats/test.py
+++ b/tests/integration/test_storage_nats/test.py
@@ -9,11 +9,10 @@ from random import randrange
 import math
 
 import asyncio
-import nats
 import pytest
 from google.protobuf.internal.encoder import _VarintBytes
 from helpers.client import QueryRuntimeException
-from helpers.cluster import ClickHouseCluster, check_nats_is_available
+from helpers.cluster import ClickHouseCluster, check_nats_is_available, nats_connect_ssl
 from helpers.test_tools import TSV
 
 from . import nats_pb2
@@ -35,11 +34,11 @@ instance = cluster.add_instance(
 # Helpers
 
 
-def wait_nats_to_start(nats_ip, timeout=180):
+def wait_nats_to_start(nats_port, ssl_ctx=None, timeout=180):
     start = time.time()
     while time.time() - start < timeout:
         try:
-            if asyncio.run(check_nats_is_available(nats_ip)):
+            if asyncio.run(check_nats_is_available(nats_port, ssl_ctx=ssl_ctx)):
                 logging.debug("NATS is available")
                 return
             time.sleep(0.5)
@@ -63,10 +62,10 @@ def kill_nats(nats_id):
     return p.returncode == 0
 
 
-def revive_nats(nats_id, nats_ip):
+def revive_nats(nats_id, nats_port):
     p = subprocess.Popen(("docker", "start", nats_id), stdout=subprocess.PIPE)
     p.communicate()
-    wait_nats_to_start(nats_ip)
+    wait_nats_to_start(nats_port)
 
 
 # Fixtures
@@ -96,8 +95,13 @@ def nats_setup_teardown():
 # Tests
 
 
-async def nats_produce_messages(ip, subject, messages=(), bytes=None):
-    nc = await nats.connect("{}:4444".format(ip), user="click", password="house")
+async def nats_produce_messages(cluster_inst, subject, messages=(), bytes=None):
+    nc = await nats_connect_ssl(
+        cluster_inst.nats_port,
+        user="click",
+        password="house",
+        ssl_ctx=cluster_inst.nats_ssl_context,
+    )
     logging.debug("NATS connection status: " + str(nc.is_connected))
 
     for message in messages:
@@ -136,7 +140,7 @@ def test_nats_select(nats_cluster):
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "select", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "select", messages))
 
     # The order of messages in select * from test.nats is not guaranteed, so sleep to collect everything in one select
     time.sleep(1)
@@ -186,13 +190,13 @@ def test_nats_json_without_delimiter(nats_cluster):
         messages += json.dumps({"key": i, "value": i}) + "\n"
 
     all_messages = [messages]
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "json", all_messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "json", all_messages))
 
     messages = ""
     for i in range(25, 50):
         messages += json.dumps({"key": i, "value": i}) + "\n"
     all_messages = [messages]
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "json", all_messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "json", all_messages))
 
     time.sleep(1)
 
@@ -229,7 +233,7 @@ def test_nats_csv_with_delimiter(nats_cluster):
     for i in range(50):
         messages.append("{i}, {i}".format(i=i))
 
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "csv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "csv", messages))
 
     time.sleep(1)
 
@@ -268,7 +272,7 @@ def test_nats_tsv_with_delimiter(nats_cluster):
     for i in range(50):
         messages.append("{i}\t{i}".format(i=i))
 
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "tsv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "tsv", messages))
 
     result = ""
     for _ in range(60):
@@ -299,7 +303,7 @@ def test_nats_macros(nats_cluster):
     message = ""
     for i in range(50):
         message += json.dumps({"key": i, "value": i}) + "\n"
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "macro", [message]))
+    asyncio.run(nats_produce_messages(nats_cluster, "macro", [message]))
 
     time.sleep(1)
 
@@ -344,7 +348,7 @@ def test_nats_materialized_view(nats_cluster):
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
 
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mv", messages))
 
     time_limit_sec = 60
     deadline = time.monotonic() + time_limit_sec
@@ -389,7 +393,7 @@ def test_nats_materialized_view_with_subquery(nats_cluster):
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mvsq", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mvsq", messages))
 
     time_limit_sec = 60
     deadline = time.monotonic() + time_limit_sec
@@ -434,7 +438,7 @@ def test_nats_many_materialized_views(nats_cluster):
     messages = []
     for i in range(50):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mmv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mmv", messages))
 
     time_limit_sec = 60
     deadline = time.monotonic() + time_limit_sec
@@ -485,7 +489,7 @@ def test_nats_protobuf(nats_cluster):
         msg.value = str(i)
         serialized_msg = msg.SerializeToString()
         data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "pb", bytes=data))
+    asyncio.run(nats_produce_messages(nats_cluster, "pb", bytes=data))
     data = b""
     for i in range(20, 21):
         msg = nats_pb2.ProtoKeyValue()
@@ -493,7 +497,7 @@ def test_nats_protobuf(nats_cluster):
         msg.value = str(i)
         serialized_msg = msg.SerializeToString()
         data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "pb", bytes=data))
+    asyncio.run(nats_produce_messages(nats_cluster, "pb", bytes=data))
     data = b""
     for i in range(21, 50):
         msg = nats_pb2.ProtoKeyValue()
@@ -501,7 +505,7 @@ def test_nats_protobuf(nats_cluster):
         msg.value = str(i)
         serialized_msg = msg.SerializeToString()
         data = data + _VarintBytes(len(serialized_msg)) + serialized_msg
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "pb", bytes=data))
+    asyncio.run(nats_produce_messages(nats_cluster, "pb", bytes=data))
 
     result = ""
     time_limit_sec = 60
@@ -542,7 +546,7 @@ def test_nats_big_message(nats_cluster):
         logging.debug("Table test.nats is not yet ready")
         time.sleep(0.5)
 
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "big", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "big", messages))
 
     while True:
         result = instance.query("SELECT count() FROM test.view")
@@ -600,7 +604,7 @@ def test_nats_mv_combo(nats_cluster):
         for _ in range(messages_num):
             messages.append(json.dumps({"key": i[0], "value": i[0]}))
             i[0] += 1
-        asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "combo", messages))
+        asyncio.run(nats_produce_messages(nats_cluster, "combo", messages))
 
     threads = []
     threads_num = 20
@@ -662,8 +666,11 @@ def test_nats_insert(nats_cluster):
     insert_messages = []
 
     async def sub_to_nats():
-        nc = await nats.connect(
-            "{}:4444".format(nats_cluster.nats_ip), user="click", password="house"
+        nc = await nats_connect_ssl(
+            nats_cluster.nats_port,
+            user="click",
+            password="house",
+            ssl_ctx=nats_cluster.nats_ssl_context,
         )
         sub = await nc.subscribe("insert")
         await sub.unsubscribe(50)
@@ -771,8 +778,11 @@ def test_nats_many_subjects_insert_right(nats_cluster):
     insert_messages = []
 
     async def sub_to_nats():
-        nc = await nats.connect(
-            "{}:4444".format(nats_cluster.nats_ip), user="click", password="house"
+        nc = await nats_connect_ssl(
+            nats_cluster.nats_port,
+            user="click",
+            password="house",
+            ssl_ctx=nats_cluster.nats_ssl_context,
         )
         sub = await nc.subscribe("right_insert1")
         await sub.unsubscribe(50)
@@ -1003,7 +1013,7 @@ def test_nats_virtual_column(nats_cluster):
         messages.append(json.dumps({"key": i, "value": i}))
         i += 1
 
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "virtuals", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "virtuals", messages))
 
     while True:
         result = instance.query("SELECT count() FROM test.view")
@@ -1067,7 +1077,7 @@ def test_nats_virtual_column_with_materialized_view(nats_cluster):
         messages.append(json.dumps({"key": i, "value": i}))
         i += 1
 
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "virtuals_mv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "virtuals_mv", messages))
 
     while True:
         result = instance.query("SELECT count() FROM test.view")
@@ -1147,9 +1157,7 @@ def test_nats_many_consumers_to_each_queue(nats_cluster):
         for _ in range(messages_num):
             messages.append(json.dumps({"key": i[0], "value": i[0]}))
             i[0] += 1
-        asyncio.run(
-            nats_produce_messages(nats_cluster.nats_ip, "many_consumers", messages)
-        )
+        asyncio.run(nats_produce_messages(nats_cluster, "many_consumers", messages))
 
     threads = []
     threads_num = 20
@@ -1243,7 +1251,7 @@ def test_nats_restore_failed_connection_without_losses_on_write(nats_cluster):
 
     kill_nats(nats_cluster.nats_docker_id)
     time.sleep(4)
-    revive_nats(nats_cluster.nats_docker_id, nats_cluster.nats_ip)
+    revive_nats(nats_cluster.nats_docker_id, nats_cluster.nats_port)
 
     while True:
         result = instance.query("SELECT count(DISTINCT key) FROM test.view")
@@ -1310,7 +1318,7 @@ def test_nats_no_connection_at_startup_2(nats_cluster):
     messages = []
     for i in range(messages_num):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "cs", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "cs", messages))
 
     for _ in range(20):
         result = instance.query("SELECT count() FROM test.view")
@@ -1353,9 +1361,7 @@ def test_nats_format_factory_settings(nats_cluster):
         """SELECT parseDateTimeBestEffort(CAST('2021-01-19T14:42:33.1829214Z', 'String'))"""
     )
 
-    asyncio.run(
-        nats_produce_messages(nats_cluster.nats_ip, "format_settings", [message])
-    )
+    asyncio.run(nats_produce_messages(nats_cluster, "format_settings", [message]))
 
     while True:
         result = instance.query("SELECT date FROM test.format_settings")
@@ -1372,9 +1378,7 @@ def test_nats_format_factory_settings(nats_cluster):
         """
     )
 
-    asyncio.run(
-        nats_produce_messages(nats_cluster.nats_ip, "format_settings", [message])
-    )
+    asyncio.run(nats_produce_messages(nats_cluster, "format_settings", [message]))
     while True:
         result = instance.query("SELECT date FROM test.view")
         if result == expected:
@@ -1424,13 +1428,13 @@ def test_nats_drop_mv(nats_cluster):
     messages = []
     for i in range(20):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mv", messages))
 
     instance.query("DROP VIEW test.consumer")
     messages = []
     for i in range(20, 40):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mv", messages))
 
     instance.query(
         """
@@ -1441,7 +1445,7 @@ def test_nats_drop_mv(nats_cluster):
     messages = []
     for i in range(40, 50):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mv", messages))
 
     while True:
         result = instance.query("SELECT * FROM test.view ORDER BY key")
@@ -1454,7 +1458,7 @@ def test_nats_drop_mv(nats_cluster):
     messages = []
     for i in range(50, 60):
         messages.append(json.dumps({"key": i, "value": i}))
-    asyncio.run(nats_produce_messages(nats_cluster.nats_ip, "mv", messages))
+    asyncio.run(nats_produce_messages(nats_cluster, "mv", messages))
 
     count = 0
     while True:
@@ -1477,7 +1481,7 @@ def test_nats_predefined_configuration(nats_cluster):
 
     asyncio.run(
         nats_produce_messages(
-            nats_cluster.nats_ip, "named", [json.dumps({"key": 1, "value": 2})]
+            nats_cluster, "named", [json.dumps({"key": 1, "value": 2})]
         )
     )
     while True:
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index 18b1e9d974b..f5d216a8b92 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -2590,9 +2590,17 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
                      rabbitmq_exchange_name = 'mv',
                      rabbitmq_format = 'JSONEachRow',
                      rabbitmq_queue_base = 'drop_mv';
+    """
+    )
+    instance.query(
+        """
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
+    """
+    )
+    instance.query(
+        """
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
             SELECT * FROM test.rabbitmq;
     """
@@ -2611,6 +2619,14 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
             exchange="mv", routing_key="", body=json.dumps({"key": i, "value": i})
         )
 
+    start = time.time()
+    while time.time() - start < 30:
+        res = instance.query("SELECT COUNT(*) FROM test.view")
+        if "20" == res:
+            break
+        else:
+            logging.debug(f"Number of rows in test.view: {res}")
+
     instance.query("DROP VIEW test.consumer")
     for i in range(20, 40):
         channel.basic_publish(
@@ -2643,7 +2659,8 @@ def test_rabbitmq_drop_mv(rabbitmq_cluster):
     connection.close()
 
     count = 0
-    while True:
+    start = time.time()
+    while time.time() - start < 30:
         count = int(instance.query("SELECT count() FROM test.rabbitmq"))
         if count:
             break
@@ -2685,7 +2702,7 @@ def test_rabbitmq_random_detach(rabbitmq_cluster):
         channel = connection.channel()
 
         messages = []
-        for i in range(messages_num):
+        for j in range(messages_num):
             messages.append(json.dumps({"key": i[0], "value": i[0]}))
             i[0] += 1
             mes_id = str(i)
diff --git a/tests/integration/test_storage_s3/configs/schema_cache.xml b/tests/integration/test_storage_s3/configs/schema_cache.xml
new file mode 100644
index 00000000000..78f7e4a3563
--- /dev/null
+++ b/tests/integration/test_storage_s3/configs/schema_cache.xml
@@ -0,0 +1,4 @@
+<clickhouse>
+    <schema_inference_cache_max_elements_for_s3>2</schema_inference_cache_max_elements_for_s3>
+    <schema_inference_cache_max_elements_for_url>2</schema_inference_cache_max_elements_for_url>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 5dd09ddd362..4e474fa29ea 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -9,7 +9,7 @@ import time
 
 import helpers.client
 import pytest
-from helpers.cluster import ClickHouseCluster, ClickHouseInstance, get_instances_dir
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance
 from helpers.network import PartitionManager
 from helpers.test_tools import exec_query_with_retry
 
@@ -17,11 +17,6 @@ MINIO_INTERNAL_PORT = 9001
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
-CONFIG_PATH = os.path.join(
-    SCRIPT_DIR, "./{}/dummy/configs/config.d/defaultS3.xml".format(get_instances_dir())
-)
-
-
 # Creates S3 bucket for tests and allows anonymous read-write access to it.
 def prepare_s3_bucket(started_cluster):
     # Allows read-write access for bucket without authorization.
@@ -103,7 +98,11 @@ def started_cluster():
         cluster.add_instance(
             "dummy",
             with_minio=True,
-            main_configs=["configs/defaultS3.xml", "configs/named_collections.xml"],
+            main_configs=[
+                "configs/defaultS3.xml",
+                "configs/named_collections.xml",
+                "configs/schema_cache.xml",
+            ],
         )
         cluster.add_instance(
             "s3_max_redirects",
@@ -724,17 +723,24 @@ def run_s3_mocks(started_cluster):
     logging.info("S3 mocks started")
 
 
-def replace_config(old, new):
-    config = open(CONFIG_PATH, "r")
+def replace_config(path, old, new):
+    config = open(path, "r")
     config_lines = config.readlines()
     config.close()
     config_lines = [line.replace(old, new) for line in config_lines]
-    config = open(CONFIG_PATH, "w")
+    config = open(path, "w")
     config.writelines(config_lines)
     config.close()
 
 
 def test_custom_auth_headers(started_cluster):
+    config_path = os.path.join(
+        SCRIPT_DIR,
+        "./{}/dummy/configs/config.d/defaultS3.xml".format(
+            started_cluster.instances_dir_name
+        ),
+    )
+
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
     filename = "test.csv"
     get_query = "select * from s3('http://resolver:8080/{bucket}/{file}', 'CSV', '{table_format}')".format(
@@ -758,6 +764,7 @@ def test_custom_auth_headers(started_cluster):
     assert run_query(instance, "SELECT * FROM test") == "1\t2\t3\n"
 
     replace_config(
+        config_path,
         "<header>Authorization: Bearer TOKEN",
         "<header>Authorization: Bearer INVALID_TOKEN",
     )
@@ -765,6 +772,7 @@ def test_custom_auth_headers(started_cluster):
     ret, err = instance.query_and_get_answer_with_error("SELECT * FROM test")
     assert ret == "" and err != ""
     replace_config(
+        config_path,
         "<header>Authorization: Bearer INVALID_TOKEN",
         "<header>Authorization: Bearer TOKEN",
     )
@@ -805,10 +813,7 @@ def test_infinite_redirect(started_cluster):
 
 @pytest.mark.parametrize(
     "extension,method",
-    [
-        pytest.param("bin", "gzip", id="bin"),
-        pytest.param("gz", "auto", id="gz"),
-    ],
+    [pytest.param("bin", "gzip", id="bin"), pytest.param("gz", "auto", id="gz")],
 )
 def test_storage_s3_get_gzip(started_cluster, extension, method):
     bucket = started_cluster.minio_bucket
@@ -1306,7 +1311,7 @@ def test_schema_inference_from_globs(started_cluster):
     result = instance.query(
         f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
     )
-    assert result.strip() == "c1\tNullable(Float64)"
+    assert result.strip() == "c1\tNullable(Int64)"
 
     result = instance.query(
         f"select * from url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
@@ -1316,7 +1321,7 @@ def test_schema_inference_from_globs(started_cluster):
     result = instance.query(
         f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow')"
     )
-    assert result.strip() == "c1\tNullable(Float64)"
+    assert result.strip() == "c1\tNullable(Int64)"
 
     result = instance.query(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow')"
@@ -1330,13 +1335,13 @@ def test_schema_inference_from_globs(started_cluster):
     url_filename = "test{1,3}.jsoncompacteachrow"
 
     result = instance.query_and_get_error(
-        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
+        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings schema_inference_use_cache_for_s3=0"
     )
 
     assert "All attempts to extract table structure from files failed" in result
 
     result = instance.query_and_get_error(
-        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
+        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings schema_inference_use_cache_for_url=0"
     )
 
     assert "All attempts to extract table structure from files failed" in result
@@ -1346,7 +1351,7 @@ def test_schema_inference_from_globs(started_cluster):
     )
 
     result = instance.query_and_get_error(
-        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow')"
+        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow') settings schema_inference_use_cache_for_s3=0"
     )
 
     assert (
@@ -1356,7 +1361,7 @@ def test_schema_inference_from_globs(started_cluster):
     url_filename = "test{0,1,2,3}.jsoncompacteachrow"
 
     result = instance.query_and_get_error(
-        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}')"
+        f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings schema_inference_use_cache_for_url=0"
     )
 
     assert (
@@ -1481,3 +1486,208 @@ def test_wrong_format_usage(started_cluster):
     )
 
     assert "Not a Parquet file" in result
+
+
+def check_profile_event_for_query(instance, query, profile_event, amount):
+    instance.query("system flush logs")
+    query = query.replace("'", "\\'")
+    attempt = 0
+    res = 0
+    while attempt < 10:
+        res = int(
+            instance.query(
+                f"select ProfileEvents['{profile_event}'] from system.query_log where query='{query}' and type = 'QueryFinish' order by event_time desc limit 1"
+            )
+        )
+        if res == amount:
+            break
+    assert res == amount
+
+
+def check_cache_misses(instance, file, storage_name, started_cluster, bucket, amount=1):
+    query = f"desc {storage_name}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file}')"
+    check_profile_event_for_query(instance, query, "SchemaInferenceCacheMisses", amount)
+
+
+def check_cache_hits(instance, file, storage_name, started_cluster, bucket, amount=1):
+    query = f"desc {storage_name}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file}')"
+    check_profile_event_for_query(instance, query, "SchemaInferenceCacheHits", amount)
+
+
+def check_cache_invalidations(
+    instance, file, storage_name, started_cluster, bucket, amount=1
+):
+    query = f"desc {storage_name}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file}')"
+    check_profile_event_for_query(
+        instance, query, "SchemaInferenceCacheInvalidations", amount
+    )
+
+
+def check_cache_evictions(
+    instance, file, storage_name, started_cluster, bucket, amount=1
+):
+    query = f"desc {storage_name}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file}')"
+    check_profile_event_for_query(
+        instance, query, "SchemaInferenceCacheEvictions", amount
+    )
+
+
+def run_describe_query(instance, file, storage_name, started_cluster, bucket):
+    query = f"desc {storage_name}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{file}')"
+    instance.query(query)
+
+
+def check_cache(instance, expected_files):
+    sources = instance.query("select source from system.schema_inference_cache")
+    assert sorted(map(lambda x: x.strip().split("/")[-1], sources.split())) == sorted(
+        expected_files
+    )
+
+
+def test_schema_inference_cache(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]
+
+    def test(storage_name):
+        instance.query("system drop schema cache")
+        instance.query(
+            f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache0.jsonl') select * from numbers(100) settings s3_truncate_on_insert=1"
+        )
+        time.sleep(1)
+
+        run_describe_query(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache(instance, ["test_cache0.jsonl"])
+        check_cache_misses(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_hits(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+
+        instance.query(
+            f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache0.jsonl') select * from numbers(100) settings s3_truncate_on_insert=1"
+        )
+        time.sleep(1)
+
+        run_describe_query(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_invalidations(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+
+        instance.query(
+            f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache1.jsonl') select * from numbers(100) settings s3_truncate_on_insert=1"
+        )
+        time.sleep(1)
+
+        run_describe_query(
+            instance, "test_cache1.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache(instance, ["test_cache0.jsonl", "test_cache1.jsonl"])
+        check_cache_misses(
+            instance, "test_cache1.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache1.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_hits(
+            instance, "test_cache1.jsonl", storage_name, started_cluster, bucket
+        )
+
+        instance.query(
+            f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache2.jsonl') select * from numbers(100) settings s3_truncate_on_insert=1"
+        )
+        time.sleep(1)
+
+        run_describe_query(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache(instance, ["test_cache1.jsonl", "test_cache2.jsonl"])
+        check_cache_misses(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_evictions(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_hits(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache1.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_hits(
+            instance, "test_cache1.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache(instance, ["test_cache0.jsonl", "test_cache1.jsonl"])
+        check_cache_misses(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_evictions(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache(instance, ["test_cache0.jsonl", "test_cache2.jsonl"])
+        check_cache_misses(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_evictions(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_hits(
+            instance, "test_cache2.jsonl", storage_name, started_cluster, bucket
+        )
+
+        run_describe_query(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+        check_cache_hits(
+            instance, "test_cache0.jsonl", storage_name, started_cluster, bucket
+        )
+
+        instance.query(
+            f"insert into function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_cache3.jsonl') select * from numbers(100) settings s3_truncate_on_insert=1"
+        )
+        time.sleep(1)
+
+        files = "test_cache{0,1,2,3}.jsonl"
+        run_describe_query(instance, files, storage_name, started_cluster, bucket)
+        check_cache_hits(instance, files, storage_name, started_cluster, bucket)
+
+        instance.query(f"system drop schema cache for {storage_name}")
+        check_cache(instance, [])
+
+        run_describe_query(instance, files, storage_name, started_cluster, bucket)
+        check_cache_misses(instance, files, storage_name, started_cluster, bucket, 4)
+
+        instance.query("system drop schema cache")
+        check_cache(instance, [])
+
+        run_describe_query(instance, files, storage_name, started_cluster, bucket)
+        check_cache_misses(instance, files, storage_name, started_cluster, bucket, 4)
+
+    test("s3")
+    test("url")
diff --git a/tests/integration/test_structured_logging_json/__init__.py b/tests/integration/test_structured_logging_json/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_structured_logging_json/configs/config_json.xml b/tests/integration/test_structured_logging_json/configs/config_json.xml
new file mode 100644
index 00000000000..c0bd4e86a01
--- /dev/null
+++ b/tests/integration/test_structured_logging_json/configs/config_json.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <logger>
+        <!-- Structured log formatting:
+        You can specify log format(for now, JSON only). In that case, the console log will be printed
+        in specified format like JSON.
+        For example, as below:
+        {"date_time":"1650918987.180175","thread_name":"#1","thread_id":"254545","level":"Trace","query_id":"","logger_name":"BaseDaemon","message":"Received signal 2","source_file":"../base/daemon/BaseDaemon.cpp; virtual void SignalListener::run()","source_line":"192"}
+        To enable JSON logging support, just uncomment <formatting> tag below.
+        -->
+        <formatting>json</formatting>
+    </logger>
+
+</clickhouse>
diff --git a/tests/integration/test_structured_logging_json/test.py b/tests/integration/test_structured_logging_json/test.py
new file mode 100644
index 00000000000..d56e9a41968
--- /dev/null
+++ b/tests/integration/test_structured_logging_json/test.py
@@ -0,0 +1,32 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+import json
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance("node", main_configs=["configs/config_json.xml"])
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def is_json(log_json):
+    try:
+        json.loads(log_json)
+    except ValueError as e:
+        return False
+    return True
+
+
+def test_structured_logging_json_format(start_cluster):
+    node.query("SELECT 1")
+
+    logs = node.grep_in_log("").split("\n")
+    length = min(10, len(logs))
+    for i in range(0, length):
+        assert is_json(logs[i])
diff --git a/tests/integration/test_tcp_handler_interserver_listen_host/__init__.py b/tests/integration/test_tcp_handler_interserver_listen_host/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_tcp_handler_interserver_listen_host/configs/config.d/interserver-listen-host.xml b/tests/integration/test_tcp_handler_interserver_listen_host/configs/config.d/interserver-listen-host.xml
new file mode 100644
index 00000000000..52d45e7c956
--- /dev/null
+++ b/tests/integration/test_tcp_handler_interserver_listen_host/configs/config.d/interserver-listen-host.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+	<interserver_listen_host replace="replace">10.0.0.10</interserver_listen_host>
+</clickhouse>
diff --git a/tests/integration/test_tcp_handler_interserver_listen_host/configs/config.d/no-interserver-listen-host.xml b/tests/integration/test_tcp_handler_interserver_listen_host/configs/config.d/no-interserver-listen-host.xml
new file mode 100644
index 00000000000..2e7e1a83aa1
--- /dev/null
+++ b/tests/integration/test_tcp_handler_interserver_listen_host/configs/config.d/no-interserver-listen-host.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <interserver_listen_host remove="remove"></interserver_listen_host>
+</clickhouse>
diff --git a/tests/integration/test_tcp_handler_interserver_listen_host/test_case.py b/tests/integration/test_tcp_handler_interserver_listen_host/test_case.py
new file mode 100644
index 00000000000..44df1c369cf
--- /dev/null
+++ b/tests/integration/test_tcp_handler_interserver_listen_host/test_case.py
@@ -0,0 +1,55 @@
+"""Test Interserver responses on configured IP."""
+from pathlib import Path
+import pytest
+from helpers.cluster import ClickHouseCluster
+import requests
+import socket
+import time
+
+cluster = ClickHouseCluster(__file__)
+
+INTERSERVER_LISTEN_HOST = "10.0.0.10"
+INTERSERVER_HTTP_PORT = 9009
+
+node_with_interserver_listen_host = cluster.add_instance(
+    "node_with_interserver_listen_host",
+    main_configs=["configs/config.d/interserver-listen-host.xml"],
+    ipv4_address=INTERSERVER_LISTEN_HOST,  # used to configure acc. interface in test container
+    ipv6_address="2001:3984:3989::1:1000",
+)
+
+node_without_interserver_listen_host = cluster.add_instance(
+    "node_without_interserver_listen_host",
+    main_configs=["configs/config.d/no-interserver-listen-host.xml"],
+    ipv6_address="2001:3984:3989::2:1000",
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_request_to_node_with_interserver_listen_host(start_cluster):
+    time.sleep(5)  # waiting for interserver listener to start
+    response_interserver = requests.get(
+        f"http://{INTERSERVER_LISTEN_HOST}:{INTERSERVER_HTTP_PORT}"
+    )
+    response_client = requests.get(
+        f"http://{node_without_interserver_listen_host.ip_address}:8123"
+    )
+    assert response_interserver.status_code == 200
+    assert "Ok." in response_interserver.text
+    assert response_client.status_code == 200
+
+
+def test_request_to_node_without_interserver_listen_host(start_cluster):
+    response = requests.get(
+        f"http://{node_without_interserver_listen_host.ip_address}:{INTERSERVER_HTTP_PORT}"
+    )
+    assert response.status_code == 200
diff --git a/tests/integration/test_timezone_config/test.py b/tests/integration/test_timezone_config/test.py
index e4a9f75abab..180026c5818 100644
--- a/tests/integration/test_timezone_config/test.py
+++ b/tests/integration/test_timezone_config/test.py
@@ -26,9 +26,9 @@ def test_overflow_toDate(start_cluster):
 
 
 def test_overflow_toDate32(start_cluster):
-    assert node.query("SELECT toDate32('2999-12-31','UTC')") == "2283-11-11\n"
+    assert node.query("SELECT toDate32('2999-12-31','UTC')") == "2299-12-31\n"
     assert node.query("SELECT toDate32('2021-12-21','UTC')") == "2021-12-21\n"
-    assert node.query("SELECT toDate32('1000-12-31','UTC')") == "1925-01-01\n"
+    assert node.query("SELECT toDate32('1000-12-31','UTC')") == "1900-01-01\n"
 
 
 def test_overflow_toDateTime(start_cluster):
diff --git a/tests/integration/test_tlsv1_3/certs/ca-cert.pem b/tests/integration/test_tlsv1_3/certs/ca-cert.pem
index 293e1c7f564..fdb29f6285d 100644
--- a/tests/integration/test_tlsv1_3/certs/ca-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/ca-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFhTCCA22gAwIBAgIUVRNcr0jCH3vSTxg8QYQH6CCtyF4wDQYJKoZIhvcNAQEL
+MIIFhTCCA22gAwIBAgIUcmiyTk1HAGkbnJRDCfJpdQZ4LHAwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwMjE4
-MDk0MzA2WhcNMzIwMjE2MDk0MzA2WjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTY1MDM1WhcNMzIwODA1MTY1MDM1WjBSMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQsw
-CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALwojNvu
-fXQYQ4tucqNOEDHf2sNgxwxqY6QdtJ+zNfVjsK4I3Vqo8TtzxfDYGolkYem/bYJM
-xQar9ehUm9ok/0kJgIo8vDXxxDJtvjz5Fd5oFWJLMxojLE9NSa0A4m18jGfbFNsF
-XoU0njiInyzNaU9d4bMpaweseCZdt9Y4LR93FkuhSU/v18lWQPob8SSIij059IZP
-sEUxpDOTxclAmG/Knd/6v3ecVFiQgexZM0gCtf7kcw41mxsAaP/mOexodIZDR70Y
-LYjL7R2ZGhpClfQc8SO5NSpfEqsfreDX7XoaCTsy7/rqr3Nfiby6sc//awG0Ww/f
-FRf2+2BU2xEwOVa3i5wU5raYY6eqFLK9q9c2IWPSqYzAmvhK2pqWQ/iaCU/Q89ow
-SbKudJTLK8Y6v9LW4Q8ZLZF+CzS5cI+QEfIYqTLFdInH1BLoxx7cymEv07CDkcTo
-2WtV8GdMph2P3U/9NoXQDonjCSj0lQUjgUdcrBPaIIVbIn6/5vfw8LQa8PoGDhIx
-AYQkqPR+LHxCqIMzdqKZ+OXD/HPhiigpxLhF7mVRLvvoyrOZVJbcu1qmgCcQw0IE
-fWzvWne+9cYC9lgt8+/k6d6B1uhYsIwwhgoj0dffFjc0sF6zfceGK+H1K2JCE0aY
-zT1HlvSoZdA7lEs5xbGJnkBHqlOvQ63ynXCzAgMBAAGjUzBRMB0GA1UdDgQWBBTn
-AtgFU20JF7kTZCKlY7/hi0kYRzAfBgNVHSMEGDAWgBTnAtgFU20JF7kTZCKlY7/h
-i0kYRzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCpiWgJ1XUw
-a8Bdeznsa57oy+5mqQZWpRVkzTQRHEGV850OGh7WQ6u9kVAHefaHH9hsVxyggton
-6/MDsu4KL5jqKmJaIAepPIOw6DTc2zs044I7W/rxRp+w1hL2TS+EahMrSPwdzCcl
-NNAM0dXocGylf6qwwMqiYAR1K3UIrlyq4QTr1oEPIqJBkDg1JDYrt4T2DroPjW20
-5hlCQ/tft5ddGL0EFEaKWwAcPFm7jAwJiz2eUqmT6PcmaZ24qPn5RXVkaBAkrSga
-1WgM8r3LGu2EKhdiDc5hRJKjS8RZyLvZNNzlL3+N42nGmGZkND5bV6u82OD+qn17
-LRZOt0Cr70HqszSYk/67ijjaa4n/fuuAqorV+yYB8accRXtoi00nxykT+H+yI1rD
-swvcrfDvhUgY5zmunWyQUYh0q/2Hj75GbLup3Cd0B4MrBwqyCqcEugM4OSf6aRMr
-e/vjeggTVPN08xE1LUkugalx0B0aoO6qFahJ2CmkAcYLLlS2N+F7TMuPavc0kVxD
-I3qA5G9zvNCliSLX2+kM+LzslI8+pP/A98bvh6nW4HtZkI0jq1ks7XR0GeOhCI8E
-0l/YuElxxgKhN4INKhhMoDKqPib4z8gbmkenR2CenQCpfLMIrhTXZgtw+gvEgpIE
-/QK97G8XPqga6zn471wrYJnuyJli+sP7aw==
+CQYDVQQDDAJjYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALACbyVD
+dVp8Wu9YSXYoGwXnvwPrl0IEeH5j9PN55QOY+4o5gB4edAvqwu0FF8B7tFQSOM8Y
+6F/alij+AyFiv99kuBx/nSLvcsQgKW0n9dX1n9GMNQFqXzmjvMZUVyGxrQRMqY9W
+oRwTG7N8hxqOSYXKiK/Cs+6EcDkxQS/1zZph8TWxZ2Qd4MVkWFdDFCHHe4Va+FF6
+Qu7BdfjjtFVmoPCCgfqGi7ZmtLaCi518kMzve+7OvzjvRz7qZ4wgOHcIqKYC0Ju6
+6+E0/VmYbXkkaUYAo2NIc4jczUrqZ1uQYhZbURB7LUJSzBo+atkeF+9G2Y0m6qEH
+a6pp7HRvU9UjFogqCPjSwqPo8ngh1j23FcmpaEN5OI+HKQEy5qV2LC3BnB+GgZ64
+BfFQ3MPR2/J5I5rokVumrSxykybOVWzDRSDCBJtIqJheFTdA6/bWkYe7kyX6+3Dl
+DvixQrH95IpBq/KNg7WfVvYzM9I+IK+VukbT3TMffRg1gscYzzjJVyVVXFkl9fXL
+fK4Mub5AInjnfckEvpAB7fYGeii9aSN/rQrsgZAUr/f+r/2gMjr3AaesClvxrLC9
+5hcq5Xz3JCHJt7W0s0xTUPfSpElGyBwdUcxZ3JUoPQQNUILQF2Fu0bIUX+fZTofm
+WcjW1L8/3BK1Os2kX9B99KY1atJSqaPcwGXFAgMBAAGjUzBRMB0GA1UdDgQWBBT2
+eErp2ltpqc2UbooSDg11dakobzAfBgNVHSMEGDAWgBT2eErp2ltpqc2UbooSDg11
+dakobzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAUIAReg8ZQ
+vMnWyWdm2DHo7iDfksB2LPDFWF9OzbQYBWrjePATBmfqmmcVrqlT1wJ3tS7nsBys
+TZohYVUnMz/HtXwH/3RWUWJgUSJgX61i+S4eoXHNaiLWb+xbBiIjsiRLy+fZ3MSa
+nLU5dF4rxlK7wksmYnK3+nM3ASzB2MnPE/A8pg/5m+BQ0Qflgf41usoydZdVxY3C
+nJTcayoOC9LmkgYq4jyfdoKF+p47QUxKd5II5oighuU/kVM/b2LdlaR2JIFN8SgH
+xmXlo40TYw1hcW/VN/HAmgJqjq5QCmFyUijt54n8kXwlzhfX44O6f9nkDENrr44G
+LDXMVHs0EgZsuGEs/y1qiBI5ruqfoHrL1P9yPy7pxQqRsrxuJM+6psSq/SPEhYWW
+s8TK/w9CwzhyexBVOMnBcQyImt+wB8xsYsaGf2oKhpflWggg6Q7QBX97pSaS3Qcd
+KFKAHTUyfa1DvEQkKmm9WyrealFMrnZ/o7BoYH8QqnwmgTuKDX3YTvWOyO3A4r8b
+fIJuHrz+zdzPaF1RdtYnaPwzRmuMggkFM6Yg0H8GAkW1zQP4+uM8CDJRKcJtFTvK
+eU4iMfU/eBtsEbyewmFU25uzTGCGzlpFgS4MyiEZ5t+LU7bycAhe6+SFdXVDxidN
+7q/OABYbuWK1mZ5McM+H7UQWUAi8PYVfrw==
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/ca-cert.srl b/tests/integration/test_tlsv1_3/certs/ca-cert.srl
index c02cd0a4526..a73f2eb97c7 100644
--- a/tests/integration/test_tlsv1_3/certs/ca-cert.srl
+++ b/tests/integration/test_tlsv1_3/certs/ca-cert.srl
@@ -1 +1 @@
-05F10C67567FE30795D77AF2540F6AC8D4CF2461
+05F10C67567FE30795D77AF2540F6AC8D4CF2465
diff --git a/tests/integration/test_tlsv1_3/certs/ca-key.pem b/tests/integration/test_tlsv1_3/certs/ca-key.pem
index e85dca8553e..c8d7e58d044 100644
--- a/tests/integration/test_tlsv1_3/certs/ca-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/ca-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQC8KIzb7n10GEOL
-bnKjThAx39rDYMcMamOkHbSfszX1Y7CuCN1aqPE7c8Xw2BqJZGHpv22CTMUGq/Xo
-VJvaJP9JCYCKPLw18cQybb48+RXeaBViSzMaIyxPTUmtAOJtfIxn2xTbBV6FNJ44
-iJ8szWlPXeGzKWsHrHgmXbfWOC0fdxZLoUlP79fJVkD6G/EkiIo9OfSGT7BFMaQz
-k8XJQJhvyp3f+r93nFRYkIHsWTNIArX+5HMONZsbAGj/5jnsaHSGQ0e9GC2Iy+0d
-mRoaQpX0HPEjuTUqXxKrH63g1+16Ggk7Mu/66q9zX4m8urHP/2sBtFsP3xUX9vtg
-VNsRMDlWt4ucFOa2mGOnqhSyvavXNiFj0qmMwJr4StqalkP4mglP0PPaMEmyrnSU
-yyvGOr/S1uEPGS2Rfgs0uXCPkBHyGKkyxXSJx9QS6Mce3MphL9Owg5HE6NlrVfBn
-TKYdj91P/TaF0A6J4wko9JUFI4FHXKwT2iCFWyJ+v+b38PC0GvD6Bg4SMQGEJKj0
-fix8QqiDM3aimfjlw/xz4YooKcS4Re5lUS776MqzmVSW3LtapoAnEMNCBH1s71p3
-vvXGAvZYLfPv5OnegdboWLCMMIYKI9HX3xY3NLBes33Hhivh9StiQhNGmM09R5b0
-qGXQO5RLOcWxiZ5AR6pTr0Ot8p1wswIDAQABAoICAQCO/c4Wccb7TFlAhD4wpumd
-zX5GDq0WXV+94CldWGdARnOFvwzhkhRJ1zDtWH3KPfQ/HJBPfqIY8OQfnPUYMhej
-3MnHxGJQKJyuqkHxumYJMFZX7cg3K9XHqne8NzjcddOKNa9Cx3DOkG9RjVpSRQSs
-IS+d5XMGUOa6WWyVKvn3uJvD/B1n12DJDHiy2jtHRVCxOPMAg1z1KMWdwMaFrEZs
-ZrHV/ow1jSN4btGd2SgkqJLA08IwYUKvoX8qQj9wzu0G/+hr5wzrsfZQEQMKQ+IL
-s1b6jAzAV6IrVBbjEZXSviiXyZ0gteuCJW/acpMg+/3JPNQbWrCAFt1wluwowto/
-JAFIvlh29hfE5c+HEMpQNa0tdj7jepBn/0YEbgwpayMikKiLZXEpgheWCGypAQWp
-Hm+N0Ym7HSGe82obxi8EjKRnNwFUtotWzUBKeo9aFwPZHLFlspljd+5ynDvKqXnk
-txYZj6K3TtMs30HAG6fqxSPyiZ5W+5yF7nt6qLODs6m4Os+lrk1GnoqC0/uLMzIU
-CRJKulrJOK4/Z2tPn9IAhcREbS4oROUeNqqo0Cfs3ssvkV7JTHF4IsKhCmElMmGa
-bevOI+pvdjfECShy0Jnbtni6ece/II4/edfUp9kWN45xZLpzDjfqCVD66JS9g6ZU
-i/EVll+d5zaI2TzzwZgHUQKCAQEA3d8siwXbq7x0cAB013+tvkvGMJ2EuS1TWdLk
-a2P6CAnlZMWvv2cPSd2WpimHjqKxrbn6VE79mOc2l9Y1NOUUWWZATrhN7V8xMapQ
-0YiYCHeaMERUAUKdzCgRN2/mRbZCBzpPBbWbb6NtKfRFJsD9zAe2JBwDVh9hvAL8
-YVBoczrEfj1ILnmtPhAJVI6s6rDsA4MgKjLs0Tt7Cc7rQxqNSpHEvwv1yLQmjp0N
-L5b1TEt7fqVJ9dirykJquBYEKf55Z1qZhQzmnbu9OPnzeqGDakl5F/UsXDB5Bokp
-ilcV+nFbh175Q+gTEhaSacGW8gzRw6j18PuciBjeWVEM5hhxOwKCAQEA2RnRMjv9
-46jQarJTFbIHg1SqrR87GSLnt6672M5TX9frzxMCuVDjKgdecstvLjm6X+/cPQKT
-Q3javJnJXT4cx//1J7RLO6ZBVSCZf3//XntdHdFVJf5ySQtK+MJyfxjpzP6KBPfb
-WPrva8p29ejbBdtsOT0M6gY5tPfadU2XEaf+BoyX9NUmu1U46Iqi+eCOjR+GVvhP
-pJzGgLeOsaRVCfc9I7XPoVu3AEx5Kt55yRYm4fyGPsAd+mRDbIXMXdL0k8CfWWDr
-8TT5rqKI+gFPFQCwToBW3DwHIGY+3RmoXFfQ0IJaKwOk4AB7m6HC3mv1crtjTFSM
-9p74oQzNX7UG6QKCAQBEs2cygRTdH5SaXbnQRKvC4emzggLn5/4IMUIjcqioNpA+
-XOwngzz7rU6JkxBzfTMxTQYTdwYVg3qnF2AQSeK8L+o3teADYVd1PnyZ9QbGkGpB
-CddNMJh17+4s0UxnR6E4Zbi0VuCTd/JEbGvBLT8pHzYqBjaOQ1dbBT2q0GAXVhoj
-0Mv6ABlBv2t0MF2gqjnaeI7MIkqsGxPlHJpChAU+EtbuJUDs7cOGo2DC3KaGAlVy
-CLJXGslO7rPm3oJZkn97HlWtGiqKquhTrSnUThDIJ4oEfhlHTocbG/ut53tZuiIS
-T7k1arYFAtJBRv17Y7bMNBQ7k12L0s9+rpck5GqjAoIBAQCVBPSkj6tZbpII+viu
-5rHjguVYyhwtx9jYK1eDnTR7kGGrlPgErjIPslkxYNSjHTsCCUnakv70jGtQlBs1
-JqJo4hesNkSB4D/uJ99VNk3a08D566uP1dUqsFa44/flp/ssG/gvKtbkf/KBwcrg
-RwK4RYJG09IefUF1J8BLToQIuZBTfIP9qaXZZskWTbtK28ndsqrq3a0FaBuVVOnc
-o9k/avcLoQuxTZwS12tAcs+TqOHtswGO5x5stg/V2Q2LxXbeSJTYq/+oZN2R8r0l
-JmrbFsruR4fXylh189jouWjoYdrSlPdBmVG99HbkQCfbtq0XIOsrBMpxqnMtUPVT
-4ZWpAoIBAQCrao4XHpRM3KsfPqdkg0vqFDBA+LzKlWu1fl8w5TGpFK8H1tv5kHNv
-h0XmeU5cXwiweri3KjQz7h+qVBHZeAvyrEoxJQdImax+5OUy7lysDs+SL02gLZb3
-Z7g+u4Buwx+cv4O7hwUEDDk/5X3NBFk7/iwztKUtM+Fl8jt9K3K24s87xXp9YevI
-UEawden9jVcuXQjEUrwz8cjoz/y25vK5pQ6k82PVImkMZK99/PmgmGyOl7hdRA3F
-ff0Kb8pRGmV/cWRKzHaC8QchW8jdU2EGxMkrFl1DvoVKLbyDf1glRncKP9iozHAR
-+s184IJCUvyMxH83uKKAiBGaDRC+Lbm7
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCwAm8lQ3VafFrv
+WEl2KBsF578D65dCBHh+Y/TzeeUDmPuKOYAeHnQL6sLtBRfAe7RUEjjPGOhf2pYo
+/gMhYr/fZLgcf50i73LEICltJ/XV9Z/RjDUBal85o7zGVFchsa0ETKmPVqEcExuz
+fIcajkmFyoivwrPuhHA5MUEv9c2aYfE1sWdkHeDFZFhXQxQhx3uFWvhRekLuwXX4
+47RVZqDwgoH6hou2ZrS2goudfJDM73vuzr8470c+6meMIDh3CKimAtCbuuvhNP1Z
+mG15JGlGAKNjSHOI3M1K6mdbkGIWW1EQey1CUswaPmrZHhfvRtmNJuqhB2uqaex0
+b1PVIxaIKgj40sKj6PJ4IdY9txXJqWhDeTiPhykBMualdiwtwZwfhoGeuAXxUNzD
+0dvyeSOa6JFbpq0scpMmzlVsw0UgwgSbSKiYXhU3QOv21pGHu5Ml+vtw5Q74sUKx
+/eSKQavyjYO1n1b2MzPSPiCvlbpG090zH30YNYLHGM84yVclVVxZJfX1y3yuDLm+
+QCJ4533JBL6QAe32BnoovWkjf60K7IGQFK/3/q/9oDI69wGnrApb8aywveYXKuV8
+9yQhybe1tLNMU1D30qRJRsgcHVHMWdyVKD0EDVCC0BdhbtGyFF/n2U6H5lnI1tS/
+P9wStTrNpF/QffSmNWrSUqmj3MBlxQIDAQABAoICAAnKYN9cRMNfRnmo2hFCAtrN
+vNDdgoDwGbnCGqaOgcA0+s0CDM/gFslw6h3gGiWhW/MPPmy6sHZghNjL5GWvhgfJ
+pPok2RtP4XzqYxOI1QJtUtIHsA0fmyNsKbyIhX5A0WR7VTU9duHGaFSQGT3Pa2SP
+UxIfzP14DXwI8tzVmfW7+/xmHV+yz8V7IvTbrNuCKqtM16JEoEOCrGrHU8kqV8p5
+H/zNDil7xhKe6WA9xRo5OhYbFwT2PmrQBCmFw05Pw33Ui0EWYTeaSHt64KAL9/Um
+ZPBJX+/dhGfl6RDtU591vekiSO63B1ZwYWYpZ+Bt+v0AjK2faYxFrxr89FdXR9H8
+kPCOgWRx0+aM3l+//nfcsd7csFMZzPpxbVm5DBI0+gyyTMXi42wQZjnjLGOUcqku
+ZmbHo982E6MeRUSwJvTnFib8ezRTrp6AE34pwDdfo8BKxK2hSbmU6F2DL6xnhj+J
+dDQo2YT9GyZGHoQjQXZouCI4eaPJwKCnQnFwhpfGfkJT4UFjrRb+LEKd5DxqQtMN
+/cPfVCtLK6XkhgllOqRiWaSzTcfPIWZrjD9hO9wfTsx7sDaxjNm4Z+7K0RQaLbyI
+PTLhMcEp6Jhu5xGaBPkgNa716GHhU08jB9qD+240VuBlJ2Pv3+LKRewQL4P0EjAP
+SkyD4qQxN0n0PT2pHqZxAoIBAQDOuF4mL+FLzDtNb8uolS4HDNWgfMvAtZCh/PSk
+YPPpHKDpMMEQ9oeFnveR7GJHe7qYWWiWsPa3cdnoa3pK3OjbsUeeL+yihdinu27j
+pDIgLFPioIrFD/Mlt6TeN6m8psQaU5u6BqGr6fNWFAjJYElmCq7hh2u9mo69uSLc
+muaT5Qwp6YLC4fyCn94w/7f/N0Lnbn9VrTvFfTDylvgU3jODiHrZploB/uDoSjmC
+b7kQ1KABDUWXADO63nWrNQKPQ1zigcNondzekl1AduGsfpuNeU6UzpyV3R/l3y4j
+T7R5mkP3rwvZX0GXxHlhUhAfRxxXr0CGw6M2Pd81YV8006R5AoIBAQDZ9947qEmI
+cbyMJTwQYhIgAYD6dngHwNgVDZB9HmNPMWTRY4g/2FOCrhmtpAUgrgv89nQPaanr
+YmJJo6gA+1U3CyrAVSazu+DibuhrQ31vFPHetCAG1MqVRdn/UwUFn708QZQvs/0g
+XcCfCBql5acug0YELOvRTsDO4M6damDg2oELquPRRQJHMgMFEartdIiD2hBip9ee
+Wr9AEG2wiY7VpFrKb3fuoee9BVRAD6RwPRZRjXMakhe8dH484VQoqgSf7qx1GdE1
+CzEN+LYQKC+gefIpKK/jOwjdTI/cc/fKzJxmgEOJiFVOZHuDNTSUL7l7bvO9huPB
+3ypF5JfGfECtAoIBAQCBZzZAj15oNXu1+NKzQFdkwGsGILjndIEKdi+qqqpk9a/g
+6c0h0kF5qs5tQV0wRErFTcrD8hkvMoznCkiujmUSCYK8imGGR2Udcp5yz/k03KrS
+Rg84Vsithq0lEhEl7/r4Q/hK1hXkaPoTm0z4ylaIEw3wTfZq5VKPf1JMaIcIc6xO
+nEdnuVF5b5wGbj1+/NfbyfbZ6ixtbvXyFgFMBuCWaRwGHTVg5G1j2/ruJQPjfkZ/
+AhDa+pxnURS1zORCTDfb7sElPxThGxxW21Rfx42WXSaMzl2FDrwGCNR39FAUgzYi
+2SgAtbl4yNv2yQkgm0IpvaIV+mez771HTCHuDsJ5AoIBAQCfX3R37GmvwXHaixMq
+63pTOqZC/EJxcNjOM/fU9FYqvnP4Ai3KePM+1uvhoc86AOi1EsLzzg+3E13IeEhM
+R3kcYSbmMJy2yIX7Kpr4awWZJhhf/RZ5yDdEBCoMXXiLjyv/lfezFYjclJBV98f8
+Szn9cXDNdscKaOnjmk6YnQKvBjVbAZ3IEwxCYFgC6dMwAoga2GQoro6is7mpLxn0
+/e+ZWK4l3HE1494cwHvEx2s1wgTCpolmATIn0onHG/68KOxuwEYK7VCh10gL7jG5
+CJkiXmfpHl3U6QJnRSbfS1AAUbF95QT819mAE0qYOlvyih62GP9RMgLwa6tuJWGw
+eIOVAoIBAH0rt3DhR2ZQdsX06iGGdJiPdTZ6hZm00KsA0ienkxumiJxU75fB7Szb
+l+GXBBIkTuBD2U++Ghf0bQSNjEPeMZBg1mV9icdOxp+mSIlQAs6/n267GIO7KB+p
+1BQdo3QAmopEwmUq2xu++jpKdVSj+vrAJGLbQQkSgkc9i4+S9yFNklL1UdZtr+pW
+16q5N3UjZbF3UHgwO3eZhsXlCmRaIVRViOJSL3SMvJn3sdO0hXJpHPmKeN/45no8
+7fVCInUEB48vfrZksBTaEdBVf1oXnQT4g0RrVA8cmpThBkL6oceWD7aCi6Ifndqc
+2kriXQ6h1JYB0rsaBtGL15+Rysiwxxc=
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client1-cert.pem b/tests/integration/test_tlsv1_3/certs/client1-cert.pem
index bd6eea62094..9abb92200e2 100644
--- a/tests/integration/test_tlsv1_3/certs/client1-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/client1-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCAxgCFAXxDGdWf+MHldd68lQPasjUzyRfMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFMDCCAxgCFHFM/AXAe5Er5evYx9dt/sRF35mCMA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDIxODA5NDMw
-OVoXDTMyMDIxNjA5NDMwOVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE2NTA0
+M1oXDTMyMDgwNTE2NTA0M1owVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UE
-AwwHY2xpZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMBU0fao
-RrITeF4kpN81p7qirX/Gc56+Cux6u7RF1O6WU9v+V5jLw8chQZ87z4QSrFiT1ZnT
-pwWYPwJ+pDk6AWEoiKuOaceOh0bjZCuxADHs+qQrye5D8GXvyFvWE2cT1pD5JNEZ
-DSl2YHqNs4uTGRP9BP817iRDcuvdxpanaWxfXGfehJRMiEVgKDs+RUpoW4aVNivI
-InrUWc4RXXkzaJKqhpCU3jAJBV4jSD5ZnA8PUfcoAj6z6T3I6phuDfRP5ldA3br8
-yg0hCB7Y5QrO5lRAgEoIuNnC+U6/AIwWPI36Rjiwg3EUwI/BIiL4AWjzkjSdr0mn
-zyHPRk4pcn01T0GTpQi6tfZZpumDD3LkPuEy9svMpJ8ntqDnAsIJVjbg1S60hHes
-yYHoQw1HxU0vrncxwcQkVaPLx0uGlioaLlvu83AVnWXbylZXsV/pLy6dE3H51GBF
-DX3Zj6nkuJitk8/hNp440/Lve7SaKFPo5NdH+8ACWGdFdz3zxgPuhBDoxEeqj4c1
-FQA1ABXx2akW3lQ5VxTAg5AYORvVhJTozosr+Kn3MlRdZjl94tnVByD8MGLLE0C4
-L/qXR/IlbkOCz5LHapdC5j62ZEBwiElmMO/tMGl4ORV9tdTBrRZ9DMmKek2E8Qwz
-y770PGkhp1cTzZt6UfZEympowmfjtiZfHIq1AgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggIBAHwRpqnpcD3EW588GSDZhZrVf3nS9M06ljQGtDUqNSI4XJp1cVT1sMaa4LjM
-cWgHtayFw+jbDLwioXHjMlV+8tERH+0x+qsADG349caDYT/OF13v/jyuboUZ9AqE
-KpfOQH7jCLU7rEbEl6kvT3F3xaHJg8mE7msyRFfguB2JrqZkKIj4HANxJUJo4PwB
-5bq9nE3AVNAgUeQEwfu0r5SjroNpcHfm7xWqMK2mDMCsy/DvI7n97Q7vZajcTT0x
-UXfgx+3CLEvLMpa2myE5OIMOeLzfZwxrxyNH7BdZsROnkGv1cX+9HZpYcue/UDxp
-P2OApbTuZKaTJOyMADc17s0seE0DTAHnHAWrJwVhf8wYKKtEs+i+Sw5LNSkh5fgS
-hTzGF93yClDYzWEqMSKhKPeimtpz4ZBNuGf471KbpVbUKJJvJmOxqoZ5S0kpFILL
-YMALf652uf5or5d0cDNvcJTwvMi6evchIV17d/jH+MxyJQs9VCkMpJxFbMrXb3YB
-b57K3Z25P6w3Qfj4zuKQFANari7Gs6qSiaUBiEhEdTQlGspkq+FLndtX818sbMk5
-LAK6JaUH0ywV2jn5XSW0irQLDXqb6Q0bSyw6pdpDjk0o4UW67JCE4kGagRDnfSqL
-ZODvO/dEtVLyAsjmOx8MkqLyseI7VESVd8eiJAyL0sifh+/E
+AwwHY2xpZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALZp/gCZ
+emjMl/7zMObbbSy0zzXR3DmQZg1dMOErlCfBh0HAHG3pOZlWaWyTd1/5X2DVdxFx
+OBhPHTvQpMwYiSN1Cykrl/VgtgoFZMwJcjzqlB950Wb0+cA1XlSIs8/7bpaPlMC1
+pcOvWgpl5lZ0xb6cXuMNbElRG86nUFxgzE8Tu/n6oKDoIuh+hHwrXRhOCP9E3euf
+Q65HeeWrBFeXTdhcIFPL9KOuUqy40BSHGQtVLIbgLAlob1sYqZsh6tfs0xuvQmOX
+bCa/5fYV1YoQUNCCBL//m8ibBztLsDQYzkEDVDoVk5tX7rGW8tuHTcnLg9DYBCxZ
+iOjvGuElsrexQ05721j1GDb0aZ68VbP+/RKceF2wRF2McUWIitbAalcEEhFh2Rc7
+miERTtxq3kvPbSdsaEFy0trVaDAHZytMpzNlBtUGHRkezLJjHzDAr3R6OXijcPZA
+yWgEMabc6Fse0kN/ZUU3pe6auIL6gCHpTjo12YN/swUOn4K20qAIhU+4lCw56GA1
+ZSbwc+E+n6FiWcxtikW8okYIEtDnSsyjX+wMpzgFHO6LEYFqCK19B/8gKQL3n0ac
+TQX589u/7EiOwEfRQi/ARnGAf7QIQC9cyusqt0QZ51LHcJo/W2hrUdoSTm6jOaUt
+Cyc+Kpb/93D9+AtEkdfbT2n18z04gLUn5da7AgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggIBAEaWqvYDJtgsJuvuteAbpjfwAnJTJTo2+YDWQMZThy7cajLpbc2gI7ArzJS8
+ir9IycgVBAv667gxTbYZAz45H4zdddGNSgWrQCKrIXdHMfkfAxPmYTjCRh1ofc1D
+ygKajjzxqQoa9IDYLvq50062rvTfEeSfSIIqxvCgGm8dPynanYQLAwOQd7R9eBwx
+DRlZhE9Zmt/Y4kWvPTYd4ttJ8eXD09vdlBMZiuBYLOIlGSx39tDFPN81d7SxxhCX
+9+lcLUWcHr/hZzI959GQm7OM99fyLnEu/07zWedoinGR6m+1ulWAi4fNf7yDhR68
+CVj60ajjkwCUrN6BS8z8gSDAxeLXkzlNYXgrjMc+Hq+eYcGcluyJmT6fQtBJgyaw
+78Gx3nVrBYALOHo5i+TwiBsCS7qROQEGnl8BxuZdvnFER7xovjvkPCaJRwnF9L8L
+NGbv6EfIVL2iww9bQ7gSwZmuM65oQN0gEPy7QNqwa5HZ6963Bf0Mbf+6EKuILSgp
+VkeRH977AcdbcWxMAcRbc7HvOKsaQ21NdNskNLvqfMfHTEvA9N53EMMigKkXi1wU
+hh/bTPWsP6+LB1YOYIzzFiCiyfBP26fXP7AQGcb1pgde5TAE1v2LEz3VOCZhyjpF
+e4vUHhxm5S6T3abo781UHF7zSMNHZZV36OEE5GS7tqu2nXdb
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/client1-key.pem b/tests/integration/test_tlsv1_3/certs/client1-key.pem
index 8bc1e656566..bca1ead9916 100644
--- a/tests/integration/test_tlsv1_3/certs/client1-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/client1-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDAVNH2qEayE3he
-JKTfNae6oq1/xnOevgrseru0RdTullPb/leYy8PHIUGfO8+EEqxYk9WZ06cFmD8C
-fqQ5OgFhKIirjmnHjodG42QrsQAx7PqkK8nuQ/Bl78hb1hNnE9aQ+STRGQ0pdmB6
-jbOLkxkT/QT/Ne4kQ3Lr3caWp2lsX1xn3oSUTIhFYCg7PkVKaFuGlTYryCJ61FnO
-EV15M2iSqoaQlN4wCQVeI0g+WZwPD1H3KAI+s+k9yOqYbg30T+ZXQN26/MoNIQge
-2OUKzuZUQIBKCLjZwvlOvwCMFjyN+kY4sINxFMCPwSIi+AFo85I0na9Jp88hz0ZO
-KXJ9NU9Bk6UIurX2Wabpgw9y5D7hMvbLzKSfJ7ag5wLCCVY24NUutIR3rMmB6EMN
-R8VNL653McHEJFWjy8dLhpYqGi5b7vNwFZ1l28pWV7Ff6S8unRNx+dRgRQ192Y+p
-5LiYrZPP4TaeONPy73u0mihT6OTXR/vAAlhnRXc988YD7oQQ6MRHqo+HNRUANQAV
-8dmpFt5UOVcUwIOQGDkb1YSU6M6LK/ip9zJUXWY5feLZ1Qcg/DBiyxNAuC/6l0fy
-JW5Dgs+Sx2qXQuY+tmRAcIhJZjDv7TBpeDkVfbXUwa0WfQzJinpNhPEMM8u+9Dxp
-IadXE82belH2RMpqaMJn47YmXxyKtQIDAQABAoICAAEBsKOg19XgwjWD7ZT5e+o/
-JbdQe5RuHDKGperYnres871oBF9ZWan2I5jIwFpJmrtP8sM+V1ZxKItDzGo8QnuW
-sbhsI2OW/GBDmmecIosgWWN4kzL7CgwOiDbq1OkqMmpJ04aAohAAfZrGmRT27R+s
-qFUJnDh2XeicHYj2UVfu29XzVTBNgj0StsMwnT45c5ktuL3b60pHSD0K3DlhKn/y
-AohJLyyDL5MBjkQ9RdLSWrR3ciOP332iSpAHq20G6ga04TQ0VH5jGN7IddJrqMry
-F3nLt+Pz4EgoOcGB8Ekx8SIk0ltKJ4PZF+uk7qT0+WPrG1rAVRYxNoX8M4wyNjr4
-TcAZsV2DnGdnp+2u0SSzMczeop5hPTJKxaLaPw1JOoIk5fqW94MbEHqGnEXEIN+D
-OWeUKWZ/B1YubavOeR+c3STZrh2SgmhKk6g5NMFlfnyvolPu47H8NOrewOhVG+TZ
-gsQoGxSyOXwZTQ/Jd6Yg9lek8nKJBc4Res7ia/x3H+gjjRoNFI+L2HQnWztx5YMZ
-H9M6hcpclZubO/w4iLq9OB2QUHn7aIT3lWRV/xS0Yh2zGCufasaMA1KSKC5zq0Fk
-gCzAkYDq/ymrJs3LQQ0wegKd1akL4z5fxmXTn2v2BGoEd52uuxhL0mM/9zzRxdR2
-IsOgAym+siLXMCHTDbdVAoIBAQDuMcea66WKidS+A9frCEsabYccKzrdMEhs6Mle
-orFieMC+3ZpzFIBkXPZ522I+M4nIdBKuRw9PnYTE5t30euOj60Oq905j2a+Ho4ki
-kW6dC+tNDF49Hqxn9e99xbvTUi97dREcERlHA+AnRektEciyD17bi88aUy9w83Mw
-G5Z+ej+9o40w8+TDopE2SIJhUAHR6LOAMq1v5y1lmTn0sbTuxZFLA0qWX9aGLi+T
-4RD0MzJAtKJDbr3yPTLHAXmaMSKHhWYYgWTH9iwEhGQAm5VJy3oNJUkM7ej7Yfs7
-aTDOk61egCKhEHdWavP68MqmNOPHgnq4/edmvQnhfKtI8SMnAoIBAQDOtWDi/OnU
-ZjZPnmJwwoPuXe6IjYg47bFRGv94xEpSesCAYdXNaNLPl0f/Ut9y3nXr+j+XqJWo
-UqtRGFu2i9lUK3cu90GLXEaLbYWGcgL8YnJu0senLxkqxPWcGxoKmbo3xMjqk/pF
-EVZ5e1qqVTlrB4q7QWmLKrS8YlcaTnChPeSBRFfryg/xvQ11Hxtq89SKkTH4ps16
-0KtiCxvfQHVASyRLIKLdyabPInB+yP3Fsn4BIx8jGtOQ/OCY01TXq9OyaRu2hJTk
-qsjOLnqf6huM2so3X0Tw8AdgNoF96JJvfhwiPI5CSo9UKjhuvus1Ip5ZFFNo4Ngy
-n3Zlgp1HxZzDAoIBAQC9ffqmo3sxqI8Hj3UxdIqS/rlyzm1o0+V6RwMT92gYx6nG
-7fLWRGQT8+TdcotIoqWlQ7oszTlABDdAkc3XlgANQre1hkLlqqM6y/3n8zzFUVsj
-E4jRJNrRZdTeAPV4mzRNCgfPhUbPuSSU+cgT48b+6L10+VeMQMtIF1T226uw+L5G
-tps3a3/9pxHQ1oRquESKYo6SmT5i/M2fuvNhWBJxtdjtjTPER4AZhRqykWV0cFo1
-Ib7I2Ivh74+6w9Ciux4WJCjhq+aqMYw5F72awitU5rw1QwlHcOldO0irrfZ3EQLm
-YBesfLYDmNh6NR9ydDcVXBcXnl593DvFF/IH+FYXAoIBAQCQZydLCzHy3oC8eEH+
-0fRGljooDO+IDYzcwwaLgF0HZ5eJWE97EuqKeP2kAWn2HjC07Hp2YSBDmZTyrxiK
-2wG1CjRVjAeu6oShrJ4mAQnS9JdKkldFlOJ4/WUza79yflgX05IkRcIFdAo8DY+W
-BLl66qbhD95CiU//dpew2fFWwx0ZrPvazar7zn1TP6rwuWvWbX5CXYyYaqP/dxE+
-khIXGyc8kI0WcWPlugJqn9CgxoO+GaIL7Ra1Z+MjACd6DyBxt3nTtKUrZZ+oYdHq
-Wypp6QJxUk2gH56XeRxXMBz0ZF4VEMa0ys98FY6c1yULVqbWRhvK3aBLJRkZ6vgj
-BorvAoIBAASy89mnP7d9jY7pSg/8znsUF8fQwKpRJZKS+8xgbzsZP+zT7CjxCbPL
-xcNK0fl6pRBv+gyIM013R7J1uvZJ3W6rspVxlXOvofvwYSuLOjwsZA26RM8s7Do5
-e62Bg7PUHbbaD+C8HzbJlyXeQ++oddWPbIkxJMwhP1Uvy3wA6c7E7w/UACZvv20J
-KriU33QmW/o0YpOX8xBVwgsCld+IfUIYm1S1mpU6k3oUfGIA5iyKx1XLTMhlaYUG
-dTdExwxQp73Jk585qWSpaiQ05OrgYyzZ8OHA2kRTPK+54HSwRfn6senf3TakZHBi
-zjy/DZmOU/a/EiR7MCGg+jS1x9GBxOE=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC2af4AmXpozJf+
+8zDm220stM810dw5kGYNXTDhK5QnwYdBwBxt6TmZVmlsk3df+V9g1XcRcTgYTx07
+0KTMGIkjdQspK5f1YLYKBWTMCXI86pQfedFm9PnANV5UiLPP+26Wj5TAtaXDr1oK
+ZeZWdMW+nF7jDWxJURvOp1BcYMxPE7v5+qCg6CLofoR8K10YTgj/RN3rn0OuR3nl
+qwRXl03YXCBTy/SjrlKsuNAUhxkLVSyG4CwJaG9bGKmbIerX7NMbr0Jjl2wmv+X2
+FdWKEFDQggS//5vImwc7S7A0GM5BA1Q6FZObV+6xlvLbh03Jy4PQ2AQsWYjo7xrh
+JbK3sUNOe9tY9Rg29GmevFWz/v0SnHhdsERdjHFFiIrWwGpXBBIRYdkXO5ohEU7c
+at5Lz20nbGhBctLa1WgwB2crTKczZQbVBh0ZHsyyYx8wwK90ejl4o3D2QMloBDGm
+3OhbHtJDf2VFN6XumriC+oAh6U46NdmDf7MFDp+CttKgCIVPuJQsOehgNWUm8HPh
+Pp+hYlnMbYpFvKJGCBLQ50rMo1/sDKc4BRzuixGBagitfQf/ICkC959GnE0F+fPb
+v+xIjsBH0UIvwEZxgH+0CEAvXMrrKrdEGedSx3CaP1toa1HaEk5uozmlLQsnPiqW
+//dw/fgLRJHX209p9fM9OIC1J+XWuwIDAQABAoICAEK4vz8x5Evb9ga7plnyzdqp
+4hcCBYcKscFWom/iNEVcbOBYaC2tvrM/H72mrOXufXwaaHx5SLbfjUZZOUYr/VF6
+WNQ8zU7kCoHc2jMli2MLvJVMxhLeLVIoUzIhdH/xLFCnARaB+rl6dLlT724VNVVU
+tgJf4QlqQP0URvkbMPAFvF6h1Uo1zrryt/wBEoK23GSeqHusXCGtpEElDigJwGAQ
+xoRQGFIci8IAsZ+okLkL9Qb6jTD9wal0+mizfcZwKgG419Q8yULdMzyRXPOspxq1
+TA58bNtyFTGTrEZKAntWP+MlDEIoZjcQCxHQSlwy9CqaMOCV+VWWS+MpmlbFYGQA
+2H/SkA/DXB9YUx2WZAepQC8m9CNRS2ZOsjW5lBkG39fsWcbJtX721gwwKbqXV1vv
+tmJ1hU8l26174lhG7RXK0YL1oYkFCUStn1gZjRXw9/WQ1rrkJMR1Hm25if/60GeS
+4vXSL7UC0uds/1EYMK2669YYdSztig9GFWmjrBgmhiQYXmGNpCshvB5bUlzyBZm1
+Lmw9wye0eFFHMM5YZ+LhcFTaT+vtFqfZ+VuMqpOiKvDnFj9YXuqNym4uY60LMVJN
+r2A6ZMryqtavL57Kf9qZ5Ka4Fy8CV5aDUIEE3+doVeDCD1quC5XSgl2T43RwzjWZ
+NEQsv3OHcECDUEuMwSO9AoIBAQDlxPYpmPW2DqNqC3XyaSRaZrbRQEeUW2GAKi2r
+KkKUxF7xYxOjjZfnylWmcZKOpzZqw6l372LYdj+9YuGKxrnBV0CoWcqlOt+U3JRV
+mSuXjN06w3ADfETpseIs98FZHQjPaoBdMKMHzX4GVUUJtup/V8c5Jk+rKMLoQBlZ
+y9K0o191Eoe1Q4Oc0HefUXfoNTMNSVBvP02ujT+UNMmZKlwI+tcL5JTIHVDbra7L
+5UXJLgK+QcOviucNUZgGMkMYWM6AScSzSC4uSX4ffxdsnaVK9KGbktAeeGIlwCAD
+YYx8BevFBzDue4T+WafDcbSv6xJjKwVNgePIsbEzKoAPXnUNAoIBAQDLPRCRkBe7
+2YIqMIGO/ihZyhiNJR04mN3VFELiR5jSVaDsUAavjng147uJex3fgvaCx4+1u0fP
+ziocnuQthVR11LFSYPgwuQOuUAxwwXxEv8VSeOj8xmZpTEIVowqtJYuPG7DwrR/u
+soBnG06thJzZSeiy0x0GIx2tRwrGQ8LXTvrSzzxr7dW7+Q9bETkJxN9RP3QIOm6B
+Mf5onrfDpJkX+lW+Hh/8dLi7fqyhrmgazTJHI9lYoKnHxjTJeZEcx3nW6gi1BDql
+BDCqVee23VTkVW0wtVQLXjrVwVGxaHgseXxWlC7+xpzL5SkHxB2PFhfnp+X8HoCu
+9YVs90I/NRjnAoIBAQC3QYZL2xFuKPKw638g3jb+WxnIfwoYC2ISRJG0CLqdyJko
+0SqisZXMaxYw8DhByp+eO3v4ilc96eIgfLMCaklRKPQK0cLMUc5s/hjYxJd+Af2Y
+lrPKM90KvrNzxg7RslSKiZjjupzs5jpzdqLfgqI4+puMuz+jdZkuf6E4e1YMeJjz
+2Nmf+r8H3UTrLqEB9RxIpoaek9CzPTjOTePUY3KQPvAxLhh0Gt2YuEfHm48zS50o
+fW9DnPd3KfKkToYw7vOUYkGd9B3RERCkskrOeFWTGNWkLU4MX1t4XGmsCKtxZ4+J
+z5h5PM7vxjYFrbS88jHyIifSj5xLP13jPyxwFZgpAoIBAHjN7EpJtwHOsQM439nK
+EtwEN4G2PN9GZh1gtLzhx+HGSigNDVxOt/94RSHcD46qvrJPwolIL9BCgF+QxpqU
+NPbxHRGVWBFF9/0l0a84IxCOWNDD0+FkYL1YObO4vQDcX08KK6tzjJaKfa5L2gFj
+4QN7XhjlScw7FUnI/4uH/YmThZ3G1uhkb3YS/eCopRm8bu1RZTv613Jt8AXpyds9
+vE43W73tFCAwlRnFmwFjtLexnqAQnAGFRkXb98aGPw43N6HabKCESgOKMQ8ejuPw
+PaSXbpbUQYecVCZ4iYGFUmFFOPYRkLmZ/ttndHMMTHGftUfaUecBjoXwpIV3l2YQ
+vqMCggEARWLKUkGYRd7nK6e0tA+4LWCmNNbs/NM6bdUFi9zZq2g5OniRLnhSP6p4
+U0FToj/Uo1I+O9Jrmkknl3yyRAf30h7fuarsKBiNwSXRPYFsJfHU9GeZkBybQ4Rx
+REbdYSJphb1tbaFhWf4Vd9i2op8dEwit1fxeYebdG6im/uuVtORPyHLOUuQSLd16
+pmdjy5BOPzG+yjUMSeGstsRzU02ojvHjzCofvdYPeFsm7+EYZxPZ2W2WwguJBq5s
+Nc9qPu9tGGy4PPb1ou4LrnMnh1qT3imXv0w62SxJ0uBwHTdUtbftmY8Wjkj2SCb4
++KcVWUpH4tsvh1cROnDKYP2jpXLhcw==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client1-req.pem b/tests/integration/test_tlsv1_3/certs/client1-req.pem
index b821609068b..1479336b3ff 100644
--- a/tests/integration/test_tlsv1_3/certs/client1-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/client1-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMBU0faoRrITeF4k
-pN81p7qirX/Gc56+Cux6u7RF1O6WU9v+V5jLw8chQZ87z4QSrFiT1ZnTpwWYPwJ+
-pDk6AWEoiKuOaceOh0bjZCuxADHs+qQrye5D8GXvyFvWE2cT1pD5JNEZDSl2YHqN
-s4uTGRP9BP817iRDcuvdxpanaWxfXGfehJRMiEVgKDs+RUpoW4aVNivIInrUWc4R
-XXkzaJKqhpCU3jAJBV4jSD5ZnA8PUfcoAj6z6T3I6phuDfRP5ldA3br8yg0hCB7Y
-5QrO5lRAgEoIuNnC+U6/AIwWPI36Rjiwg3EUwI/BIiL4AWjzkjSdr0mnzyHPRk4p
-cn01T0GTpQi6tfZZpumDD3LkPuEy9svMpJ8ntqDnAsIJVjbg1S60hHesyYHoQw1H
-xU0vrncxwcQkVaPLx0uGlioaLlvu83AVnWXbylZXsV/pLy6dE3H51GBFDX3Zj6nk
-uJitk8/hNp440/Lve7SaKFPo5NdH+8ACWGdFdz3zxgPuhBDoxEeqj4c1FQA1ABXx
-2akW3lQ5VxTAg5AYORvVhJTozosr+Kn3MlRdZjl94tnVByD8MGLLE0C4L/qXR/Il
-bkOCz5LHapdC5j62ZEBwiElmMO/tMGl4ORV9tdTBrRZ9DMmKek2E8Qwzy770PGkh
-p1cTzZt6UfZEympowmfjtiZfHIq1AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-fGx/D6rNeaVO/vSUGX5q1iJKd8Gnw+/8NRgbuvCDuDOSy8LyqnLmVntj8q9FHpJM
-SRH3LnylMVFZdybso2ZbhR1UDReGvHCtKICG3LLP1uWwy5nS3mkGBHFm9COyFP21
-kWOit1+106gEhg2f/NXh31HFmh+myepLjPEj5KxvnQhQfaQESsDYDZAs6/qT1mqp
-A7GixOXh7hIFBJ97cU7fKby0Wtv7GqKAYQkaf26ImoGijtMPIlzvwJboJWmOYzIH
-zrOHqspFkJD8YvYOwLIKdahViqXU7POL9uRn0vFyaXVcyXRq83Pz+bPSW9AFYsYG
-ukSZiJs1yCINZI/Mk1vlfaZWYPIbBkJZ0Ny0vw112dIEilWAkVdsmJyV95aBddQI
-Md64CYWZbV5P7/0QOX+v2ZQpWVnaV0m07K6VVuTL3bw6BQ9fcj7vaql6wl8jl/9l
-nEotaZiY1f1pUUko3XzXpZEFB1lGBHupuS/Plz8pfFefN/7sOZoWn1VhD9I1A8uh
-b2mg6hyQ7pe2NrHOTY1+L1xxxKKHt01kvDhws09qxRXtNsLrL8tl94i1ndLjHIwD
-/VRnVU04E/VoTKaEXuETLZwOZu8pLwdiejrWEAmtsbmmcKq/Bk42wa+Wrmge2Chs
-V8EOAtq91AjUcQeh7s2fV6yWweMGm1J6pdkNWckCsUs=
+ZW50MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALZp/gCZemjMl/7z
+MObbbSy0zzXR3DmQZg1dMOErlCfBh0HAHG3pOZlWaWyTd1/5X2DVdxFxOBhPHTvQ
+pMwYiSN1Cykrl/VgtgoFZMwJcjzqlB950Wb0+cA1XlSIs8/7bpaPlMC1pcOvWgpl
+5lZ0xb6cXuMNbElRG86nUFxgzE8Tu/n6oKDoIuh+hHwrXRhOCP9E3eufQ65HeeWr
+BFeXTdhcIFPL9KOuUqy40BSHGQtVLIbgLAlob1sYqZsh6tfs0xuvQmOXbCa/5fYV
+1YoQUNCCBL//m8ibBztLsDQYzkEDVDoVk5tX7rGW8tuHTcnLg9DYBCxZiOjvGuEl
+srexQ05721j1GDb0aZ68VbP+/RKceF2wRF2McUWIitbAalcEEhFh2Rc7miERTtxq
+3kvPbSdsaEFy0trVaDAHZytMpzNlBtUGHRkezLJjHzDAr3R6OXijcPZAyWgEMabc
+6Fse0kN/ZUU3pe6auIL6gCHpTjo12YN/swUOn4K20qAIhU+4lCw56GA1ZSbwc+E+
+n6FiWcxtikW8okYIEtDnSsyjX+wMpzgFHO6LEYFqCK19B/8gKQL3n0acTQX589u/
+7EiOwEfRQi/ARnGAf7QIQC9cyusqt0QZ51LHcJo/W2hrUdoSTm6jOaUtCyc+Kpb/
+93D9+AtEkdfbT2n18z04gLUn5da7AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
+B0NuE1+xhppR+2vZmuaFcNzk8d6M93cN3qGJ+SXERCuQparSLiAO11sZLSPOXrdS
+igVC8/BGOF87TitDcMaG/PeWHY60B/xkfkY4mRPxpfuY0U09JgG+r91+skrMXegr
+KyU+EvQbdGH1QkOiVSGklklKDiudZmSs1QS2noo3osdFUXaR6pzW+jcJU2CYHyKN
+C1O5UuT0iYIDL7tSkn/Afp2c7Xylug7iLBXxr8SPMquvj8nK2MK23IV3n4Dpc2L0
+8EZ279wpOnSz6Vh+Pkd4HiSISEXPBGbAqX2yCHGruLl23iVIqQpkSF6MlM/NoaGy
+wQ7S5zdP6gAnu/C9wuQ+kEBEnBJr+l5/zHzNSLH5GvnMM0IRQq605Ba+e/j3wq1J
+sBzO6jKvqvZgiFEoC//rLgsvtKZvfjztl0XRqw3iEcPp39EkwIimy2VjliaABqvi
+yOGWrbrpjkxDdCxr3VL5/b6yA+Mirz81O/3YciSn4JrXyzYXaD/ckvjojUvbN7i7
+QQwIa3kC82pMAlByp4c/5stvu3pDFNvcY3lQNTCQ996xdZFF8L56mxX07VEt1BfU
+5LPDVbYFxCrXzcNI0LSdyfTT8mXIdt3KASirfb+jQjnR+OgglU8zKvBy+hkIbjed
+7uDpCflPgU3tmrq5YSvPwJ6PEyQnn1hTRCRzY1dBWdI=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/client2-cert.pem b/tests/integration/test_tlsv1_3/certs/client2-cert.pem
index 886cc533fcc..dd251e0062e 100644
--- a/tests/integration/test_tlsv1_3/certs/client2-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/client2-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCAxgCFAXxDGdWf+MHldd68lQPasjUzyRgMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFMDCCAxgCFEowtN4Ah1Oe6NEvWni6S5u2KpsGMA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDIxODA5NDMw
-OVoXDTMyMDIxNjA5NDMwOVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE2NTA0
+M1oXDTMyMDgwNTE2NTA0M1owVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UE
-AwwHY2xpZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOGIanwq
-rZCqMT+ePwRkiQnD0gyVt5+kwkb8X+fdBJRF0kr70YfzMpKdZP4l4W6C0Jv/ysIH
-usrI5pQxcFAIe/7DLW0JPkMLKgXsOtPNZPIkc7WYkq3cbzB0ZTsK8O3IYhwn0dAY
-O49T//YqM3TLTFsG89B6uCEg7dQiP9hh6boic8M/WyAseOkJNfw+wYcTWhl1toKc
-dLbo8ehESUtVhCOPVT602zBUYFkleqKPeHJ/gzl3/mTnqfeUBljGI2aXwOl7r6rI
-D/or7wew2HZ81dTGDqB+yqUhBIVNseJPHOuKbke2E2qWVzAkRnX4b2ehsSaSknpC
-KGWyLibaQyR0/Gt8Duu1XIsZKeFjCw27yogSTQ6xTUhLDF1anQyoJX9btSQZsTbD
-3vtHbD1O07KSfiG0Z1p8LaR10RAFA7f3HLwwy6c9ExpGu5ED+co8aO5Xp5wysg8X
-fYZYx4CaY3moQPJPDS6eOpUXd/6h27Fm34h9VdSj2p6j9JYsmTeEgb0x+JjAQyRS
-+Koj/tbSbBqjbvO+FUaldRlHCHYCQTnjsSNBf7SxqE9lfgFitcgiHKSdD7QIfwNB
-EK1o7L8OugC/SQtHGe3ngUGuNmHI9w6ItGuVqoJYP3Hwa6ClGmYlTRLoAj8NkBib
-toxwGIspTlTzmmLXpqeZTPaA2K5eiq8O5DKvAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggIBALp4L1aky2jfgk18tney56sUL2Us2aHqyOz9LlowWFdNMtCKo0WKpZ1qXGfQ
-92QE+zc/MEdmv3V/H1MmSr7trTq1u7E5vVVI9Lq2lNbRLDQLi1+qd9E7Kdl6Oxw/
-Ecc8oxIbg86p83HhzPfJG64m3x6S6m2c4sNrHRAO/gxxJex6ZSFfQwYJZFlcvvBX
-CH70RBtBG/ggasVtwqBuuIRNJ2gAtiWG2RtyGlOjPiAg7nUQiYlXLHVOjvrKDvrI
-KTjzRdEUMqKtIrNUBHSbWZlxKZ2Ddavshg/0T0reAN/u5KTDxiGaQxlVEA7xfm+j
-etqjzTz7LnKuRsA+Z8UUYaV6mKYfKObDoUs/12IomRCUTQi1K8MP3fGmmk+4Xiyu
-+t15EqWJzhjuT2RjCAL47X6ksdOtonX9t29l6ykCvYpK1mlzG+EhqDyMIn62TNfx
-OFjWwhIFgyEUWtwkihIKtv3ZVtrJVO/j+HCUfq+6IpjYHdlpdb4OaHgBtpokOtM8
-PmTHJbP2bxmNIMAU1WTfV+e/JkdTKHJclC5DTGF48yRgdKSOTq0G1eJYh4DhlEIM
-vOw2rXeWR6VSkvA5vF7HANEptl1tkT3dsKR4BXkSIO16ldWBEHMM4UeXx85GGM0k
-TRON4FWBMi6PXX6mrmPXcUW7AyKG2JL9gNlxRgWHVK7xmZyp
+AwwHY2xpZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALwAuEwi
+zyn4Cf5xpsfxZmsrjYT0imjGx1+/Bax/xn6LESL7yiTYufzYXq2K/DP3w8rxHygX
+1z6u9rXyIPgDhmbq84sFEPafNporqnYsXc/uhFTZpCs+JgsHgmLP3j78KvNrFqG7
+Qj9GkiKQz4Wqrvgxd9ylCN/50Pa5JeW/44wa9Xx5yXr239DJXnPJ2en1HQllFIdK
+4j78E/wwy8ns56inzeovPfrC6dfw2xAjJU0ZeFwBVV9LZq2opg5+cZ/XoxORvCRL
+m+y9O7jc+TYkiPxy7qUDfouvC8Y1BiRrtsAWuR1myg9LD/TWBHhsme+sY2NTMxQ8
+OsDTfU1ajoAPrCH8q9z5ZuuyAWZM/Rg5J53ZKGkTAzJLWUueHOu4JyLakUtbz7D+
+Sy9JT9H7iIAeQru92hHb/VJJzxgTMNJ/myqLqSoD8siUkMdKHrZdLYCoS+YZWsNz
+dXVs0Is5fwcc3l0QPAgRExRqwMxMtWFjxtIMS0LDXGVq3LZjLokzqLMEbK1tmVBv
+Wp6UxppkbPBs89d9640xcfLFN2JOxJPrmid1Sg7zQyaV3sEYdv6Ef5iDznE6q1Uh
+JEHPMacZyu5WWcQaoT7JOWtt9UyZsO5lzCeTxxkmIIx53aiguseS5Bp/S3jSnemm
+QfRN31Zvmj/dr2Vdw+bAPWi3QyeVaSvjp6knAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggIBACu5bBsE1BLu/X/1Y7GaXvJT5mJV77iirTa2XIJZ5X0CeYEPgZrQMg6d1YCk
+phbMJ7xEUnfawm/yD0pjORlltO6PtyAiTr6ogkxCsjvT84f/BtXLXFWV9IxtoKVh
+49vVhzE1bNiY42jAVwa8NKQsIfg3kpTwp0ievfdOMlxk7QwPqbA9fajTvLZV208i
+Gum6FYvQHZqvcglUKsytaUxjBqptm5dk3Dw7LcstnhK/dQ6K8LbsAvqefA8MGwAI
+8I1YNVouQIUfW+34OyuLs6oe6v9e/7cVazoVHqSa4Gb3oDtLb2+FD6iXYJHZqVpw
+NXGwfWzhnYWSE3kT0bXEblzdDraya1pqKVN1NoMhH8seCFLgi+jRj8W6DkwmQ/Ee
+Foo0gvLVElVtISfz97bwIJr9G7nimL6BYq6bTu/VZeg1SVb32jjmiCj0x91rODkE
+uzhcSw/b/ORWbqiRhjUK7LnijWip3irB1HB11R0mv9iO2t4MInpNXJTNU0ZpW1W5
+UdPKd0zLJCFmO6w2S4El6S66RnQtaFeJyDYjwxqP1gDco2q/SyZEgh4YWgwMkZ/0
+/pArIE3zQ0zWuIpHW0DBlJRf/+hxhW+s25TpyFRGaaSJrvT3TIuWGnDLI3NN12xa
+ljq9U3QXiOwpVtWnC/2Rjtw8azPiEZTeE9fwOW0qkUQZD4ZS
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/client2-key.pem b/tests/integration/test_tlsv1_3/certs/client2-key.pem
index 462916c0670..19f3f639e75 100644
--- a/tests/integration/test_tlsv1_3/certs/client2-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/client2-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDhiGp8Kq2QqjE/
-nj8EZIkJw9IMlbefpMJG/F/n3QSURdJK+9GH8zKSnWT+JeFugtCb/8rCB7rKyOaU
-MXBQCHv+wy1tCT5DCyoF7DrTzWTyJHO1mJKt3G8wdGU7CvDtyGIcJ9HQGDuPU//2
-KjN0y0xbBvPQerghIO3UIj/YYem6InPDP1sgLHjpCTX8PsGHE1oZdbaCnHS26PHo
-RElLVYQjj1U+tNswVGBZJXqij3hyf4M5d/5k56n3lAZYxiNml8Dpe6+qyA/6K+8H
-sNh2fNXUxg6gfsqlIQSFTbHiTxzrim5HthNqllcwJEZ1+G9nobEmkpJ6Qihlsi4m
-2kMkdPxrfA7rtVyLGSnhYwsNu8qIEk0OsU1ISwxdWp0MqCV/W7UkGbE2w977R2w9
-TtOykn4htGdafC2kddEQBQO39xy8MMunPRMaRruRA/nKPGjuV6ecMrIPF32GWMeA
-mmN5qEDyTw0unjqVF3f+oduxZt+IfVXUo9qeo/SWLJk3hIG9MfiYwEMkUviqI/7W
-0mwao27zvhVGpXUZRwh2AkE547EjQX+0sahPZX4BYrXIIhyknQ+0CH8DQRCtaOy/
-DroAv0kLRxnt54FBrjZhyPcOiLRrlaqCWD9x8GugpRpmJU0S6AI/DZAYm7aMcBiL
-KU5U85pi16anmUz2gNiuXoqvDuQyrwIDAQABAoICAHZuu3RuuOxB41DEGdWFsczV
-7wS6zk1gKME8IGTS1GfEbpT/vd1FYaZKTtGDNOlieoehAGl5w6Zfb24ctBzjB7IV
-7lHWy8JLJ4sqrQ2ySzM43yZac5QnMKBiTxJ9QV2sn5CnfG9pekVe2Af9yz2m0Hbw
-pLIy72Q+NYXzYlGPwTwEgYPjTkgL8oZ1VssabWgwSl0aSng2DrhKhVXyHgcYZiaC
-S0J9mKi9dkb5/ndFHfwKZ++Syp1UZhXjvp15lvd181DoqavmGTXHQmNog5NdJLDy
-PJYdXu7t8sDJtwLfhpFOBXFU9MdBIZHfSr0CdAYYi710tMTM3wfgVIoEjcOkRzRx
-36O66ehHfcyNsK52Z+DZ6uR4c+MOG0kzTiHQhyxjiu+3nYMGw1XdyE+k+eZDMPd3
-vTaR7kYOQvVvdOVAUuFZG9mK2p0mpofb9cFxFD0vJUqTYXxSdKUNIexR4mWQJw/h
-rWOg/42GK4iLY2X6/CsDh6pTsM+HCzwmTGGkL54FvDsB2AhAhXPz/kGiBRTrh9/p
-QBxacSPoqN+kF3u2qZRPEmjuimiW2AaXARbTABNSBQJIEmWzWOVdgUBVetGoN/ML
-8mcYDmXhAc6F96eqPj0dX8cHfqYPguPhtzLj5V6XGym7hYQyOLBcE7tr2BcdjUfM
-V6OFHsPNmsYWZ9F6zCv5AoIBAQD3M6gziCA0G0cG05ef0C3D9OVGWpHqr0yiR3MO
-ZKsYbJJn4WOtWWvo8N5oqZBQ8VIoyGd1eiSIDuxXEWniFWjn57QN2nrDNTsEQPgk
-HzomgFzuDZ7V4JsjJ9F2nAG5i2HoEwKNHdzfni6mhwGaapd+4GlET0jlC71p+h0X
-CPsD6Jwabp6OUyT+xm8XW3mTWskBzKfq0OPbsdv8UB1dPt6jVrkjoe76TlTsWXWi
-U9p9/h6kI984R9T10J61c21dokuL/KlHqb6TIQY3RcCgm2bfucmuawIq6vs1PBrK
-VCvMX1BuTva9CYg/+hxm9Ky08jFWSCEEtzaORyN+4mmf4maFAoIBAQDpj1NoI7RP
-mYqG9vHyXSDUUNbchpLOFKIaeh2DGk0sFmLi/obglsxOKu8K3r/EobNt+vpDTBxI
-1EjPWdKuaXNYYjNjrVmPHdHPoHD8JmXzJDbZnXSylV9MVYSMNF+7BWUiPg3/QC7b
-1a+ljJH/KEWFb0xrIfNPxVzyq8dyFOxcmLfRVLYlEW+fRYeaZ3QApxGi/BoYK8KN
-vG8f/a8jpPwYCVa3JJ7/donEtsbxTkm66aacn8Vo2Y/tdo0nxyqC9PyBU+tV0u4w
-aYtEZ28kpC9QheRx8D7WzhvsFc/KsshiB6jddjOVR6VgiUFCo+b/5PqpyZVTVrcs
-tj8062A3KvyjAoIBAGRPn/eZS4gZcY8BmcuODKQx4j/UTNXw4KYRXE0A6LT2icqB
-mZMkcDeMVpQeCqPt6SsHd4QiVmSnuZvzQwYtLe69BUGB4MMJ/LLTMl5mFZC+Efe/
-qy6bABkZ9VOuJr0GJGqqHCTrc0+CvudwbWQd0O/5XH4NtkTLqMcyaU+Jo2KIp5/K
-N6kFcEO6fiX6RrFW665BP/p3XZ8u41fVorTN6EZb0LD26yTDWI64FpYSdN0fm4t7
-yv7ply9QwrZa6oxOaV2a345nASBvDDito2cI6IvstjyCy9RimiGWDEECOuup2deJ
-T3KSRanAcnoM23Bpvz+F8XAacJb3ox2//qCUnIkCggEBAJHl2XllTF6pEFLs8giv
-SjG26fFKE2yukPCvNb5O8MRIm68mxkSHjsqJoVeN/Act57MdI7ZkVgrcqTr15ljT
-QJ2GgomSoS54tzbXB51Ls0XmamkYJezkyGobxbf7g42Fej6guwenJV5oJtfobs8Q
-bhVDiF4oECDVrhFdYzKNhXT2ZWVbYIjZUnwQ5/t5Aorh0m+Ywgg1VcxKWLSIOR6w
-ElZFhyjStIvqlXcPokjc2cvr5wtR9vRfa7wv4U9m59R0i0OSk6DCKc6OL9QkNNaT
-xYasjR7rr6VpjSG2Il6BvhEWrdLh4qku30zlkKG7VzKk7Dyh0ykDM1u34NYC7tCn
-hrcCggEBAO+Rnkk5eYYqGk/64+Qy5qA7djvvZ8AgihwJL3+ZUDSOxh0W+Er4NB6n
-j0kI22N//D2j6hg93TNj9jI6lISfmY+TSikr/P+bQPGXl8wvekQxpjT5JhCYI93M
-LXnSULuy7J1ujkMGdxEvfOTjvmD0ejtnuaGd+jM7hx4QNBbJj4VdV+r5BQOJAlfY
-gk6n3RgAnu86szquWM6dObIz9BWtIcMVGlxA7yDmxjVDDHLwGpcwG+MTQRcHoeT6
-2+b7FtVN1NFLazfgPS3bxKs5jaUB+Ibm9BD8B7THviNikqRYqwoJMWpJgdWo/lOQ
-X0ueOR40kfa077G7jNfb03qOPUR1mFw=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC8ALhMIs8p+An+
+cabH8WZrK42E9IpoxsdfvwWsf8Z+ixEi+8ok2Ln82F6tivwz98PK8R8oF9c+rva1
+8iD4A4Zm6vOLBRD2nzaaK6p2LF3P7oRU2aQrPiYLB4Jiz94+/Crzaxahu0I/RpIi
+kM+Fqq74MXfcpQjf+dD2uSXlv+OMGvV8ecl69t/QyV5zydnp9R0JZRSHSuI+/BP8
+MMvJ7Oeop83qLz36wunX8NsQIyVNGXhcAVVfS2atqKYOfnGf16MTkbwkS5vsvTu4
+3Pk2JIj8cu6lA36LrwvGNQYka7bAFrkdZsoPSw/01gR4bJnvrGNjUzMUPDrA031N
+Wo6AD6wh/Kvc+WbrsgFmTP0YOSed2ShpEwMyS1lLnhzruCci2pFLW8+w/ksvSU/R
++4iAHkK7vdoR2/1SSc8YEzDSf5sqi6kqA/LIlJDHSh62XS2AqEvmGVrDc3V1bNCL
+OX8HHN5dEDwIERMUasDMTLVhY8bSDEtCw1xlaty2Yy6JM6izBGytbZlQb1qelMaa
+ZGzwbPPXfeuNMXHyxTdiTsST65ondUoO80Mmld7BGHb+hH+Yg85xOqtVISRBzzGn
+GcruVlnEGqE+yTlrbfVMmbDuZcwnk8cZJiCMed2ooLrHkuQaf0t40p3ppkH0Td9W
+b5o/3a9lXcPmwD1ot0MnlWkr46epJwIDAQABAoICAB8YvriNNhda4+BL5oqCQe7D
+yfPuH6oRXcSsYTZf/jJL3hObcpth+Rrlo9IbFU336KamooDXDK8yxokK2ewxZ7zv
+QPBuRUOIdezOAIiXxxP6f7X/N+SVMjq3Im3QtJIA046RgzFQ5Yt3ffrXWWlidZra
+UoP9t6LrJzwgHNt3QB6aY5+UD2urmRK9CXFSjR0MgkyIWnsUZlQvuD3fHl4x4Dw+
+i/9KktBpsWnv+Ml0XsT1dmSVgzcGJEo2L/K2yc7myUkWh824bzvwgwfiuRqntBGP
+EIKH5O8a5EeD2Wu9y1Z+Nl6yyVpP5VLvRtcFHk3isEqAu7KtpwmNEdfxJ3VEN7Qw
+UOacMrTo4b8sLVjPjCdyfQS7mgnzYaB3AcQBDFzhspRBdRqD9+VMq3+srhCbSKQD
+Jcw1CfmcR+tjKikJ7dasRCHAynNMMVv49mpAhlRku5AaLUv619TRaDi8KsBQ/nAo
+exmljnG5lAq8Q58mp0iuaZKMWH19i7RoLSNxblUc8PnQ8/VFrHKP4aWYpIHjmbD4
+OEsjNVsXg6YTbRiEdPwxqlRyutA6zv6aNFh0bNuWp/Ls6WDCHb0reQD1RG71oAFZ
+j4fi/iDvejwkrcwOpFV012hHWp5Mx04s/84snro4xCe92iYBsgqLTcmi0hce2SuC
+NuQsGYnOn90F3f5Foac5AoIBAQDBrzwYy1vKx/dJk3KhIACiHuyLer+q6d1RPS6W
+NnXwd4Ni1PBN25dmorEYyotmQNBdDC66RGWWH4QlLEY0oBumxmpAsVWfPiERnDPK
+Xv5X8AdY71p7KesOD3ssosk7GCBj/IGP8v6rfpPyr4waenqICWc0Rji0I0gUxNcN
+OWBv46VQRM/Zel+MR+CfMEmuGWxjfyqrVNZHP3LBEVA8shBXgCgqhGy/EgfAhV/Z
+wwg83ADIeZQxh1qbcIm4Tx504oPNKVNSj95dKTJH3Hh6OBBdcZkFexknOljM+NTp
+pAR4DZzAbFdav/cmr4dzLZqhcvKsELytp3ZIB3AhNMaNllTZAoIBAQD4fYOIRduJ
+8R/e1s+/K4Gl4QPyp/M5khEyC3qkfehrzM1oRMkAEx12kU0C/eCZAn+46WQvPPce
+SoeIiw0lmIG5SqCBR6hu3LcxZW4Ofy9stfPs7BDL9vTaN41Oua4nZFJuzy2BGHtb
+mOoZ4ardn4hdiHVO3cShQL46qj0780VzgaJD0khxh6ZPNzei35WaDsnyWE+QcR8h
+2mDcV0swGeJ+IgyLZoqRqrQYmnUs4lc9lBmK/uOQmzc5NqEFZWcwr6R9zBWE1t8g
+1hfpsXXTw7Ks4owiS0D+8dn3CESXHZxQ8BipTmvtQXTvupWu+YgBFVPo3nBtrdIn
+16cWLHsyly3/AoIBAQDAUbM33322/hYzLcDt8uwODuzMlscI/A0xpLHEoDE95D5G
+/a/bb4eHd1aoij4e+46qRfWEKXRBu+uoSa0whibO1EgfErc1VyjY5qSadvbQ9Nsm
+2QycLYRkQsUJDl8IWa2X+tvfxuZP/XEE0oEoraNLvyKGSo/1du8VCFuNmwKCN6Yn
+7RwCE7wafCiziOwwfrgcl+ITnDrlJkBZK0rj6d/GMtAvX6znkQy3gvgpL7rXS5FP
+f0HCaGd03ysxIwbYAy/ioP1GhurC0KxHpMjQeyjs0GakhZX1WL9iUFaB5MY3OzUB
+8NJQnzrXZAX4PTlExPHoHvpq6FTPsusJXfEmGDcJAoIBABqInIDypKyoGLUczvYk
+2SUzT86bbHdbR4bGfwQNhcHtDonxvlzJrb25ajXFkjQEdkrycQYyRljvsGU+I9s9
+26xDcbwcQLoFy3H02LmnjxLWowNLecetyRt8DxS28we1yK+YY82DJbj0LRsyY6Ji
+pJcIOS6As7xcQ3PUNdGu+l2JHCCN1bp5t6KBzOkRYtIefiXolCZiTea5gNpGX/r0
+6KB7VkeUXXuMdMqjw5tVV+d1ZvzWlsocKNttH+iJmWkzeCcOocWbhBvngIotrt07
+6lpXnosS6g/PF20vbtOMD+L8oEWD4DZnZOssS0txzbn/4wPcrLipdOVYO7k8arNO
+PVUCggEAIKZYttNqmZ9LpYjB9O346hg2OMPP/Cja63OjReq0rJ3A+38QUaLYr2cR
+7wVqWtkx32C5lak1Y3W0cf1rf/vdVRdDAVfG6ZUC0NslyJCYDHmx0dfo6jzNhafG
+TKDbGsAgRHJYMEhekK8ArEXYJ/oQ1H113NydQyJv4yjke11hqUaYpEaEn9BQzzdg
+baUDVD8z/y+VYtTYWmiPVF/2PKDV0zvb0FuiU86Q8D20BKKl0wdwuJUp0Carckwr
+VIoRepXpnsGZ9LJ913VOy5kA6pK6WVep6UkWQ3Foveiiy5tka8tx89OJ/lMD31EJ
+uW03sZ0aEPgsS6rSONPNishIM4Pdzg==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client2-req.pem b/tests/integration/test_tlsv1_3/certs/client2-req.pem
index 846f6db84dc..7c6fb44663b 100644
--- a/tests/integration/test_tlsv1_3/certs/client2-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/client2-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOGIanwqrZCqMT+e
-PwRkiQnD0gyVt5+kwkb8X+fdBJRF0kr70YfzMpKdZP4l4W6C0Jv/ysIHusrI5pQx
-cFAIe/7DLW0JPkMLKgXsOtPNZPIkc7WYkq3cbzB0ZTsK8O3IYhwn0dAYO49T//Yq
-M3TLTFsG89B6uCEg7dQiP9hh6boic8M/WyAseOkJNfw+wYcTWhl1toKcdLbo8ehE
-SUtVhCOPVT602zBUYFkleqKPeHJ/gzl3/mTnqfeUBljGI2aXwOl7r6rID/or7wew
-2HZ81dTGDqB+yqUhBIVNseJPHOuKbke2E2qWVzAkRnX4b2ehsSaSknpCKGWyLiba
-QyR0/Gt8Duu1XIsZKeFjCw27yogSTQ6xTUhLDF1anQyoJX9btSQZsTbD3vtHbD1O
-07KSfiG0Z1p8LaR10RAFA7f3HLwwy6c9ExpGu5ED+co8aO5Xp5wysg8XfYZYx4Ca
-Y3moQPJPDS6eOpUXd/6h27Fm34h9VdSj2p6j9JYsmTeEgb0x+JjAQyRS+Koj/tbS
-bBqjbvO+FUaldRlHCHYCQTnjsSNBf7SxqE9lfgFitcgiHKSdD7QIfwNBEK1o7L8O
-ugC/SQtHGe3ngUGuNmHI9w6ItGuVqoJYP3Hwa6ClGmYlTRLoAj8NkBibtoxwGIsp
-TlTzmmLXpqeZTPaA2K5eiq8O5DKvAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-3DJlf7AkZklzzswgm487f+y2bB7IYr55JwENASDxQEOdVcdgLC3IWu3hLiFwdqac
-0Sw2OHZuETwJiIX3fD+qUT6TgbsP21W7wEQ4jfKg/bsXFMbrvw/ILkOW2JLTH4Cc
-9ylCN+46dQ9heATkiF/Co+uASz9IoSDdtoycA3BuKGBZI8VGa56QmJOOsMM5NgxT
-RTh2r23tV4E8AGYj3HC+b1rzK1RTlsj/m5nM9Jv0/NqoV1cprS1ONr8CBhN0ttuA
-WLrG+DUZTMJYFabqTptlgejQFhiFp5HT5A+eXgZ8uEUX1I3q5jq1BEWtLdmJNZ45
-QViSJOokH/+1kfRSWiAH7pdBz4URLBcsDhAag4J7kV38t7fgdaIizY8R2Ss82iEP
-xqa4A0PA065wB44zng/VrPrHoH1YnGRugXEnrqgcipC0FxUl3oQjvwOSR/E7yFU0
-GIr1MpRcyrd0z4p16783qnMpE1Aa0msED2SBKIK13WcNY+CtDF/wO47ZNywl1hBo
-VkM+ohPpmonaVXNGdpdoZpeGjkBUbqkn+so4aYkX/WuZ6vY2vwdV0prD1vdAFfD2
-AeJx5ypu5aeKn6nK0eMy6W/VEJx6RLCiYVOCIcssgy31rmk4iLQJP2StYVK2mZKp
-5aSR4eTv1/XlMujq+ZqcuUqA1id9wP7908Xr0DzdNdA=
+ZW50MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALwAuEwizyn4Cf5x
+psfxZmsrjYT0imjGx1+/Bax/xn6LESL7yiTYufzYXq2K/DP3w8rxHygX1z6u9rXy
+IPgDhmbq84sFEPafNporqnYsXc/uhFTZpCs+JgsHgmLP3j78KvNrFqG7Qj9GkiKQ
+z4Wqrvgxd9ylCN/50Pa5JeW/44wa9Xx5yXr239DJXnPJ2en1HQllFIdK4j78E/ww
+y8ns56inzeovPfrC6dfw2xAjJU0ZeFwBVV9LZq2opg5+cZ/XoxORvCRLm+y9O7jc
++TYkiPxy7qUDfouvC8Y1BiRrtsAWuR1myg9LD/TWBHhsme+sY2NTMxQ8OsDTfU1a
+joAPrCH8q9z5ZuuyAWZM/Rg5J53ZKGkTAzJLWUueHOu4JyLakUtbz7D+Sy9JT9H7
+iIAeQru92hHb/VJJzxgTMNJ/myqLqSoD8siUkMdKHrZdLYCoS+YZWsNzdXVs0Is5
+fwcc3l0QPAgRExRqwMxMtWFjxtIMS0LDXGVq3LZjLokzqLMEbK1tmVBvWp6Uxppk
+bPBs89d9640xcfLFN2JOxJPrmid1Sg7zQyaV3sEYdv6Ef5iDznE6q1UhJEHPMacZ
+yu5WWcQaoT7JOWtt9UyZsO5lzCeTxxkmIIx53aiguseS5Bp/S3jSnemmQfRN31Zv
+mj/dr2Vdw+bAPWi3QyeVaSvjp6knAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
+VaWIh3v6C/k0FuuhpjUw4qtVmvjh5fO3mLxVxPAeNjS8tpgTBci0DkD3NvtSeM2k
+R4MoRv9LK7JUBj564OZB+Vj65DlAHxOsLaOshpszLAeZDWhcQlboWcub2mFl7oVR
+ST+1UYHMqcCAOUHnjqcrHcU8xIO+dPgzs5TljBpkozUEkKaRkAaItOwT252ApeTq
+xGI0LJvO+0ga77Pvk7DuWwcp+PMDbpm1NG4POCSvXJ69euCA6L1lAPYUC9omVEPK
+10bD7BjTH4GHasGoxRP8eqLeeomGKAh3u/WF6u52u0tNwB+8GJBqpzSLAoCkNA7I
+oaWC8ohUk79W0F8ZB8UYufKc/8r0+fJmHB7sIetD9Q8dX7CXguwe20sZkIuJSAWq
+sWWjirBgzLJsMjML3ClyN9sivvYdu8ssPZLQhoZ1pOjKcLFLVN7ZPOW/iLvIfbMC
+jAaLrBf+yMcEHERwQ9Ttbp998QbYoGAh6hA3YnpBndRoqWudBXAYXaREEYoQRWt8
+SQOoRRwZ1OmKVyf0UQbTwZQ1pXgrrT12MYsAczE43HkcotagAZeSgM6TQ0EAjGRX
+f69FwALVf0aimvz6zdaSlG0JCiB+tjIZccZ+S161guynxV/s3H32QXUj0wSW0UjN
+ZW/VoDugMJJ7zW1bekZR4LLy2BUjLdVgxsW2H5+7wrE=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/client3-cert.pem b/tests/integration/test_tlsv1_3/certs/client3-cert.pem
index ce9a472cb9a..5a569e19a0a 100644
--- a/tests/integration/test_tlsv1_3/certs/client3-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/client3-cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFMDCCAxgCFAXxDGdWf+MHldd68lQPasjUzyRhMA0GCSqGSIb3DQEBCwUAMFIx
+MIIFMDCCAxgCFCpubUDPOgZwZSDFE6D8wNY5I8yPMA0GCSqGSIb3DQEBCwUAMFIx
 CzAJBgNVBAYTAlJVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDIxODA5NDMw
-OVoXDTMyMDIxNjA5NDMwOVowVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxCzAJBgNVBAMMAmNhMB4XDTIyMDgwODE2NTA0
+M1oXDTMyMDgwNTE2NTA0M1owVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
 U3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UE
-AwwHY2xpZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN8Bt8gv
-50J66lQ+l/NUW+lqW4DesmSLv1BnjDd5SSA8tfczt999/l1epAGeEN/Pl4dAxXP/
-cxpx+J+xF6SKNxQ0RP+PHQMiDzCUgBq4OKs09kDQ/uvycUZlQuWPtR610TWjZR5r
-VrNSwJQp3VGDdNyEbKj/yd6Yi5NC1iLuqPC20fw5/9BVTm1P2wWX7nv1AWs235s2
-yAG7pLNcgPiTfSmXyyT31YBjb9Onun7gv7exI/3K9mS+aWq6ci1xAXtykVCs551T
-OQmDAUxda041YghEThO4MrZa6uSZqVwnoUcXTla+8biLYb3+9CnIjM5whAOTR+9r
-jpsuuXEUOsrX9Mgb1HTS+ksmrA+Eka7MdVi60Hoon09uNvcTM8CSKNgnTzcPCM6t
-J4NHDiimJM5WA/eY8i3NNCTa1HUGEeIK51UOdjIFKsvzG0TCI2FM7jQLJK5S38tI
-deZ98iQbguVGhoCvRotLEAwW1M2rSOu7bxAZU4QJ93IuUfkLn2BipOuyuR55Z/6F
-z5Jij/1lK2/pKWhntUHTIpG+bBHDF++0LN0aB29uIwYRkoz9JUgnNz4FDVbLvJ+z
-5Ywr61t8AujZdfMZDpRYlzfWPGej8pm7/Eux5jgx/3jcLtqfqkfZLSuFjBKfkUU1
-eGsC80RupMJKIeppv541W6nQJlmJYKv7DCvrAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggIBAD+YMVntBdeq7xJEL7xU4QEHzUGhDWodGMJfmswcxe7gf5Nztcq5YIug+akL
-ewg0wzgCA5YGz00J92sKDF16RmYyPfkxmrCYdNGwISjNJyEEcPEVkdAzwILjv2Lq
-0shFlSsf+Zp/M4XhHeirmzz/jJ9KHlzEYoCz1WOn+UGF12KgV2oQOamJSWOMCoMh
-81oy90V5IlCBqnYfZCYj7cbYLBd5jZMZ+7lsVnxttzPTg1gIoP6vrLT32Ubnzx9N
-IoAeiUg7az/fbnuOkJtu0cjz9aSdpjm2h2giyVAFJ8DkQ9C92tdr9DWZKn7rDO16
-TMdv0q8NFjRGhqdmqWUG6o2cUmQsJ/ZiIcHx5X1b7j7PYSS+ae9zi1tcpHAN6kCw
-WHguIf5I8MIZxE741ZMBokFSIqd6Bh1EP/TUx1+g2a/nH3ZaNd4/KKADxfUU2Y58
-UwdKeX9YpcRz+NNO+1h3NoE1a/i0dhwiBf4OzBiV0WpAjQHT95IlQxTxfHFp42IH
-GrbqIS3qK5DKlNFkBBk1beKxBGKmTH+Pw6fhjkuPYQzjmGo4xluivfeT8SiBT2iO
-uIGLd+sitIooom0KEjHuHS9cdZ5XEPIUDAFhmIt7Y5K8J2fs+xtYzhibg3n0Q6qh
-xTx7GzhTA1HSUE/467af5J3CSfpGAjZQZo/t2/A6tCumzk9F
+AwwHY2xpZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMC+nEH8
+lJVeI2yLZ4tyx0LuESsFlAqdXNENQOvzTOXm+TUZzj8nkdc8eHHhC5mfqyKiNN/O
+Th0J3Q/s7WCedqS7oTthWH7Ny2qAPFSuA40NgPTjKL8LVlukgTAeyg1AJMEexWJ5
+4cV1H+lJpJNnAMUNDn9yOZeX8h0b70Yn5oPifDDZ8pd6Q7jGT83FYxy3165dpHDk
+AcKJMf2OXfRX3cUnj1jL536CTy30SiQTdfxVeXNyzNofkRjSFhphKYQ1g6O7J1ts
+ECqDaGyiZZas2vwmZZ2Gy/eiduNmzEVkuSpjvPjA3Ntd7TY6hTPhBmDvWFJoibUr
+RLAIi+khPRbNaFs6unpuo8BkIepB3ACQAyMmJxCYee1UiOJ22/S2GalWxZFZl1ek
+wPbz1OmL8fkGsbuBK5ISlh7MIfiog1CjuA0JHWQ6dVcs7adxMmwZ4K0eFjUGP5Mq
+Z5JqiPnscYq2XYdFxqymxabDOxyXqLbKThcSKfoI0c2fuqxajxhQdt492CH25H3e
+SxCY8F3+K6OOpuCmqkCx1YxhNXN5mdvMMFskigE2Dk8w/UIllsZMlbq7EaW64lDx
+WAhGTUQ5KMzgXd62sng7rFt8ZRLjkqdszI6uJw2x53NyvpPd3HuhacfTwH/3DuLG
+KVysxl/BEUsm8DVT6e05vCop9x0HpCiDiSzlAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggIBAHpDpJfCeCpDF/jcDC8Si1S+2dsgZjm/2kdiGOk7n5opWrx3YdxFupSFqd7f
+bhBq0rYxO8ybjOMpCFh8VD0WmodSilLo66M50FxOG4kKwdX1PzYDBCv2no4XaQ6E
+ishAREZ77zxqB5y5TvyKABD4ttMA6exzujagLw+YKgI2PZZqLm0q3BE2M8CiXIug
+gkfNJ9dhOQ82BeWiMm68oCJMv2ade4DHTvRFd5w5dnyClUysSq9weqte5B11nFPb
+5muwa40GP1OZmYdgJM62GniRa0H270dV/Ix+AA+NUWBnh3mjR3phPZ0dn94GwFgS
+Zex0Rre1F/Dn04gP/+6GyJwhafqiB4r5aBN9DvOS6y+XVrc8zruXaXP77E8O/6m+
+xVlzXL2e1qT7VtMVE4y8BxjmrV3re7vKiI+kKH1j/U1u9th8/Rwgmrj6u5i/bcjx
+DLueFQXwyc+EXl+E04tCvBQcIeE8BwrW0CPikZ3ztvEsvdv+zKWG59aEsSGiu1jL
+WMJ6DpTGBZ0KrFoSi+zNPfsorVerq2cdOO3CqgfcB3VJ4oD4yCAzfVvxldhQbJZe
+YRfdgxP6oOPcJqiGaFKgq0Eao3TMm71zzzw4bWCgQkcFtuy9fILs0RS5HGwEYyxV
+yjxo0d9teoGXI+3wbQaKr3df/pcuK459NH7EjhSJAQDNzo2K
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/client3-key.pem b/tests/integration/test_tlsv1_3/certs/client3-key.pem
index b7464eb2866..6604b72f17e 100644
--- a/tests/integration/test_tlsv1_3/certs/client3-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/client3-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDfAbfIL+dCeupU
-PpfzVFvpaluA3rJki79QZ4w3eUkgPLX3M7ffff5dXqQBnhDfz5eHQMVz/3Macfif
-sRekijcUNET/jx0DIg8wlIAauDirNPZA0P7r8nFGZULlj7UetdE1o2Uea1azUsCU
-Kd1Rg3TchGyo/8nemIuTQtYi7qjwttH8Of/QVU5tT9sFl+579QFrNt+bNsgBu6Sz
-XID4k30pl8sk99WAY2/Tp7p+4L+3sSP9yvZkvmlqunItcQF7cpFQrOedUzkJgwFM
-XWtONWIIRE4TuDK2WurkmalcJ6FHF05WvvG4i2G9/vQpyIzOcIQDk0fva46bLrlx
-FDrK1/TIG9R00vpLJqwPhJGuzHVYutB6KJ9Pbjb3EzPAkijYJ083DwjOrSeDRw4o
-piTOVgP3mPItzTQk2tR1BhHiCudVDnYyBSrL8xtEwiNhTO40CySuUt/LSHXmffIk
-G4LlRoaAr0aLSxAMFtTNq0jru28QGVOECfdyLlH5C59gYqTrsrkeeWf+hc+SYo/9
-ZStv6SloZ7VB0yKRvmwRwxfvtCzdGgdvbiMGEZKM/SVIJzc+BQ1Wy7yfs+WMK+tb
-fALo2XXzGQ6UWJc31jxno/KZu/xLseY4Mf943C7an6pH2S0rhYwSn5FFNXhrAvNE
-bqTCSiHqab+eNVup0CZZiWCr+wwr6wIDAQABAoIB/0I0QFst3XnfA7H+4x1Z7e9d
-o8yeUFeJJUK5eub9Grh3TY4VzICM5vbRId9ZDalj95gvom7NZ15yd1zxNhOi9LcK
-zXERC4vikJ/bdix4hFpPXsvfP87MKtS7OyDriNmVIIbL+zkMpLCX4JQb2ZhZblgI
-+DkztrpejxEoxmmYcI8Ft1Ep5sfyi1XoXx1J/YLPOZyarcdme/oHut2EmMUzA/VV
-GvnemYOEAa7UHImOL1xZOlYd6wf9f04wC7Vx1v7PBFTu/9O04TnxqnEBStns/y11
-GbjA9k0ssI8tDxpMqZRxVtBp31jqCBpflhzRbPvca1SkZLavN6baODNZzhpqAkDX
-3R4lU5C7wu4jtzydUyEsCFNdtkGKlxpZRbRZk+keUC+HeCmXPED7p9egwF6Zi8VI
-oaXl1KvHZO2W5x/BV9I1taEPhmOuRR49KxkU4e+IjqaWYN1qsqYqCs/od22Rah72
-KT+thr0mdxC4lb+pvteafricUQuq/dSbEY/lva7PhPQRKVX/VxOaAxBnhA1LHVgZ
-imsW8W3eOQYJbxniTrz9EblWAg4dCcupsjMDUDUyACB/E6isDtYU1J2im6p4gbqw
-tXg3bRh7KruIHbPSJyrFm1uqe+v97TLhpwPHKCsxE4HiJgRzaQDRckLJQebqNp3Y
-e7kLLjg6uGsjAl6OwKECggEBAP5bLGVrmBmAz8RYPnG1MQWlsFg/eIhMFCqMjT3P
-swPUU2VJKC3TC3OwFLxlAr0lkXol+8L8aEvxGjHksleA+1z0lav43b1/2jKgLgI6
-Ym5BxMJa+sUJpI6K7CedJ6wf2ozbpVXazvNBZ3o2l0QbC/KpX886CZH9YJgn7N0M
-TfPe9er5zmETdHGTWtA0sDI8fZ8XndKmnWG9KTQCGur6gemF8SKuzGv/BnL+BZnv
-bDqSvyN8Wjk35KPNeKVW78ROxRuEdB5brryGk955hX50PRRoofW8GSmLJNKNYvIj
-VRkKrDKpz8gW1C2/xa9j5tQkGRFMDAptmk+yvtmDxfZz38UCggEBAOByrXLMTcwR
-bz4MYcSmEdLv2VA/bZ+y0kW0frUU5il2fyQseoFbunVbTDiXYf40uueMbOONZktM
-w04CXKRaTbnS/s6SGU5VW19jv+xzwrzpB2Shm08APwgFnSw40bKCpN4ZWQbOyFVq
-QIMXfA0+Go3zJz37MsSgY+mzhHp4WITobVFpdlhaLvrLPCB78uInZrFsvNN6NP+K
-OIbOoTA9u+BP73THHkpQdrRJaJWowpqejz8kzQ/Xu0Xe6AG1EGVp39phKpWH9TPF
-8xoxjbdIGPkzCzYO3hgz6PlnWVj8iyTxklnaUblqKkY2mOlMA00ujcdF3d3IHvaM
-Xolej+XeZ+8CggEBAKeZDdzaE4Oic8RtXN/xwxZ0gYj0cYhlkNgkeqCi7dL1IepY
-VQg0ypP1DwTADhjx2zTAOG7XgCWh/V+o0LaFv5sVclW5iuplhzHah9ZiAB+kaHCk
-IB6a5vohoc/MZqqs5oXv6LZ0ke6JRxSpSezPYYUIg5/5Hvs6GF7J1/IjPG4XmLS2
-23zto8l+jdUpEnxXjXK5zf1SWdtgF/kz9ealH9rurd/ri7kRdn9oz+oJb6f8r8ND
-GfQf1yDzr65KZXxVZt1l3llukemZR2/NZN/Y2bJL64QO6AmOrLmr/emMzHLOrH5J
-lCbEnBR1C14xFpTsIDRchoaMh6RCJC0Q/e0Rlv0CggEAAOIysJsBS2ZeK75cvCtz
-MoNjNZ+qTNClZ0TYotncNhmTUo8iRFQaHdAoMqjV5+xJOBQjcZni5zT8J9h2iOca
-GzsraaDFnLtVSsDXxpSGFbxNHSZNuDfmB6AOCFiI6sz83Sr4YMB7pWpvqpRzFpJC
-BIEKjIHqpz+CZS8hvGGw54UKuSFTJ/Hi8XXPXMlgIWfKTbSB4cs/XiorIsy5cbks
-fiuSY8FM6zn53afUU5KAgZ9SLQt2CzPsNtAz1Z3i3KNYEEIFquUIIBYNaPL8/dW4
-03JR/vp8AVhi+Ghhv6nu2kxhKR1k6Pf0Bqa8X16/PJSMVlZ+Extwk8Pls2C97Ee9
-3QKCAQEAgjcbHKBjd7AeyNpPSzNpv81Rry5qqOc+Cxx8LtOHBl1wc5VB5FPxfbuX
-MX2skvWPnokDoXcI1a1WQwdjaZUsSoqdeyPtw8pFWiNLJZkYImiP3zMCZXYUEkzk
-3EXQZryWEqBYBqxlEvTyjbBmnrAwOPOUKARFi1l9JKJ4QpdELXo9Yl+w2IQEQ5N9
-jrSY7LwS/cb25rhEc6oh/89aY83HPyABh4lC9bsciXki54YIeS+y9ijN8yCRxikr
-mVGfQ0Y/qcY9spAj05yr/vnlENBB5ohxwKKsemOnH93E2GFxc1dzmWCGvISjUduB
-I68TOg71OfCKgfeixNgcOvQoN+xngA==
+MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQDAvpxB/JSVXiNs
+i2eLcsdC7hErBZQKnVzRDUDr80zl5vk1Gc4/J5HXPHhx4QuZn6siojTfzk4dCd0P
+7O1gnnaku6E7YVh+zctqgDxUrgONDYD04yi/C1ZbpIEwHsoNQCTBHsVieeHFdR/p
+SaSTZwDFDQ5/cjmXl/IdG+9GJ+aD4nww2fKXekO4xk/NxWMct9euXaRw5AHCiTH9
+jl30V93FJ49Yy+d+gk8t9EokE3X8VXlzcszaH5EY0hYaYSmENYOjuydbbBAqg2hs
+omWWrNr8JmWdhsv3onbjZsxFZLkqY7z4wNzbXe02OoUz4QZg71hSaIm1K0SwCIvp
+IT0WzWhbOrp6bqPAZCHqQdwAkAMjJicQmHntVIjidtv0thmpVsWRWZdXpMD289Tp
+i/H5BrG7gSuSEpYezCH4qINQo7gNCR1kOnVXLO2ncTJsGeCtHhY1Bj+TKmeSaoj5
+7HGKtl2HRcaspsWmwzscl6i2yk4XEin6CNHNn7qsWo8YUHbePdgh9uR93ksQmPBd
+/iujjqbgpqpAsdWMYTVzeZnbzDBbJIoBNg5PMP1CJZbGTJW6uxGluuJQ8VgIRk1E
+OSjM4F3etrJ4O6xbfGUS45KnbMyOricNsedzcr6T3dx7oWnH08B/9w7ixilcrMZf
+wRFLJvA1U+ntObwqKfcdB6Qog4ks5QIDAQABAoICAANqrZbu3Qxry4l2TCrY6Uba
+tQOz+NyaTwWmrD6yhKuzpTnHgBQ3BZsQ55qvMFc0ESLPSMwp2lEh9mD8pHWYwYYo
+jFJi5qBy0fcMmGUw43+53E4bA8MlNo3v09lwRkknWK9ytfGJsxKewabPRyNUyVr0
+4Qup0PMKvsA82Ug/V1MBrg1oo6gDQxWQsGP3qordCG3/G3Xj2NMjvvbdcfVtpFEF
+I0Gh9bPUqAYqxTCwBqCnPDyrbY21TwtnV/x2OfftwexiWi+A8iVqyGxakZ3y6Pvc
+y2LYO5/jaaOc1CSrxSuG8pffRVr/JoAWV/ukMsp/m6t0TnKfdnt/X0mN7QkNMZsa
+dtkbqQUbvrPKQOWO2lGafSAAtZr/Fy6ahcyOsmXIX4Jeu3wmnRaatJqyICY1PzZC
+QFQcfp9upJmDnvKZ2KYl3PLJ/B+qCDh+8KsjIhcZBixkEGwIj9qE4WeuydNvSF29
+vm0KDzR5YGg0Llm2RFF4CstKJUHZfhmbXnDlqUNegVhisgSbokz99rUlAnc6dR1A
+0mvxQrsFwlYnO/RRZsIFRR/Iwp0zFguF+ja05QM253M6iyrcz2h7QS2wDu0QnhWy
+VTLsVjosGRKA6s+O4FwOg0js10n5G+HCLnzw1XA0VqmROxRgunnArmOLKrOLf7bX
+lb/dLKpsxStGI/wpwd+xAoIBAQDEFQM+9rDWHtDCMQ3tzf7MKpCJzo217FWiWbsF
+E2ie11uhMjSS4TJWXHilLEclXtXKEH52WLMYwgPbyWBXBcokcsf+u0f36meE9qTJ
+mB3kv5XXazmalrp3i8Mkq0Jrz9Br4mhCWS4GGeyrrXRqKgMDREqeR1rm9HRI1js+
+aPccQ5EBfDIr4O+jrSLQioE68njOlzPVPCTC2BrvhaSlgGBbNl2XXgFXeIyWN0uI
+6PBxQpECq3bE8fY2vNuV/g+5Fbb/flSCGFDXthTVwfS80xg1Qro8j9JEkD5Y/+8g
+xPxKmUshmSrtY71mFrSqAJUoKs6h3X5lcW1eE/3n78vzgM8VAoIBAQD7pINb8IqC
+wrFHi7LXHtcooYy1kPC8mIp4pCSJwXNlZcFRhStr8o9/12/N2dbQGTeyPRjT4jV9
+RSXyI+/LSqO80M8KVLeixqUyU3MuTF1l5qTcIGgb4LEBKe68bJpZsSGlImaNBpqn
+5C+ESpyH6KPfPfmwmqU9HCLr+bM8N6djh7MMyVnue2YlpGKE6/KxD4gyDUM/8TW1
+wOlag1/Ioh1EJNs6/9ym8paYTN+4HO2QV5Ae+ozVPi09MqjRv1e5dLVQNa5EQo//
+eNE2rWQk1kaEft18BBmgzHg2FaZEu7QsBsePaLFxkSBQ2Lckc/2DF/XAaBzfhgv5
+UK85beP5TNqRAoIBAQC4DG0mjZGA+h3DGR5U53VRmGZhI6M6bqIWqJj187jQ154n
+WSOl9oE0NMn9Z+lD95c+emrplOpOw9WxWHz4UfPicGavAIVV/Ay87nHQ09rDWt0/
+/WJtayuNiH9cDPBkmASvLy3jkSe1DGJs5nwOJm77gv9zP9DgVfZMY+Hp+8ZvHjCe
+rz+8lf75qEq0aj1Q4kVozN4XOcPbq9LknpHj0vMeypHgwZkKzJlRaoeY8+S0uuG4
+Gs95nxAXYv/N81I4zVwexyp1jnNbdopp9gtNrercG00KCYk5WBddnKWNIbkaIHc4
+CzgS6PrfN1LO+4sFz+ByaJ/6ghRBKQy7xwauAmrdAoIBAQDA+NKnIZoGVmj+dZmq
+sALNLL2ryr9h0RR3GWDPpuLoQhTyf83hlPwITFx3nnLF2GDGtWWhrpnYO7uyqW5N
+FirkM7hhsr+z+uNZ6XatbXA+IZYRHGTZ4/+45cAnDJ185IHpkazUvtjAoRLzPwg0
+jOmF24/rp1vJthbtoOma5w7dG4Xp60qkwEp/2USXrBzLPR7zSwpkMYQ/ofURLSe5
+wt/wjtbzspwyBlwH5QO2u7BN/WgO6ZIwQOMOSBf/6NzL4jzcip3dyLGGds7xQBxI
+x20CVAti+/3vOn2A9C8yDENJc9V7GwzgCyud8+LV+IDTE/+oEe76VmA+S2pj/upR
+FmeRAoIBAQCUBtlQ3cF6Br8l2AtDbtsNmrN+7Iey5gw7JSEvMdnTyYde6zJqh3vT
+GRssnqCqkh4KXe5rKgiwReiZY6C+YIlWq5JxREpoYq2GuNee+b1vfVSM5+B15bDi
+ADhW4JYwSvIHhqdbtWhS2gSpGafQLDhiroGAjeQDaT+gjWXQXnS4+pNjQkkTVK1C
+70Nothv2OzIP0H8V+Pehq4i3hg6qYxWLqpE+OWUorBSLiqIIWltolN89qaMWzSbv
+I6Zjlw5Bl0NDEQgScW6VjekXFhgEOlCq+sLj9KIScyKim//YAd+MQIAHOB5CJdCg
+Zj/uF02suGelqY7UyN8+yeXzg0rwXt+F
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/client3-req.pem b/tests/integration/test_tlsv1_3/certs/client3-req.pem
index 7b4445b3609..84eef937584 100644
--- a/tests/integration/test_tlsv1_3/certs/client3-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/client3-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEnDCCAoQCAQAwVzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEQMA4GA1UEAwwHY2xp
-ZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN8Bt8gv50J66lQ+
-l/NUW+lqW4DesmSLv1BnjDd5SSA8tfczt999/l1epAGeEN/Pl4dAxXP/cxpx+J+x
-F6SKNxQ0RP+PHQMiDzCUgBq4OKs09kDQ/uvycUZlQuWPtR610TWjZR5rVrNSwJQp
-3VGDdNyEbKj/yd6Yi5NC1iLuqPC20fw5/9BVTm1P2wWX7nv1AWs235s2yAG7pLNc
-gPiTfSmXyyT31YBjb9Onun7gv7exI/3K9mS+aWq6ci1xAXtykVCs551TOQmDAUxd
-a041YghEThO4MrZa6uSZqVwnoUcXTla+8biLYb3+9CnIjM5whAOTR+9rjpsuuXEU
-OsrX9Mgb1HTS+ksmrA+Eka7MdVi60Hoon09uNvcTM8CSKNgnTzcPCM6tJ4NHDiim
-JM5WA/eY8i3NNCTa1HUGEeIK51UOdjIFKsvzG0TCI2FM7jQLJK5S38tIdeZ98iQb
-guVGhoCvRotLEAwW1M2rSOu7bxAZU4QJ93IuUfkLn2BipOuyuR55Z/6Fz5Jij/1l
-K2/pKWhntUHTIpG+bBHDF++0LN0aB29uIwYRkoz9JUgnNz4FDVbLvJ+z5Ywr61t8
-AujZdfMZDpRYlzfWPGej8pm7/Eux5jgx/3jcLtqfqkfZLSuFjBKfkUU1eGsC80Ru
-pMJKIeppv541W6nQJlmJYKv7DCvrAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
-Rggrols8hXGEcWeIEGn66kY9IVTzaTUf3oMfEbdf/2Q1QzHzmqp53yamHl5ioMgX
-o5UBVxthgh1VOxkvCxIzlKDJprzVFkfwwc7h9c0HGt3No/ERobHDT6YRaGukAL5g
-muIGBUseyBAOIfyqc5kbCRWfPrAOttAH4gd8XMBgO8XdfHAvyXBC8Ha55O6oriX9
-IAKL5+3nVJkBle+62OmROnstbcdKyK4UtOeki/6ptYVE0d9I+NfKjuk3eKtICW8Q
-Pn3IEcNEZoFG2UQ19ENWwYEZyMZJt0aunqnm7L4RYiZT5w4meeendzXSKLKR6+Ye
-ULt1sDRskgKoNRzmeCVzci05BG48jv/E7Az6aV/qhGiU2qIAPMdVXncWUhR3fj+E
-CL/uLifOvfC6SnKw/7qQmgjUvEe4Duvi670a5QuImpm/mAIN22cXPc+QquSdR5xy
-loz/o3JJQZemPAOM0CMIHZ+cGESxH30QCBNn5HfcOf5fRZVCss4Hl6JxHR2G4yN3
-RKEIUXR03qgSK91WHl3WvqwXgmIAiUuvPjo2i7kSuaUUHilZiXK1ngIqYfUTB5SQ
-O8pG0fx3fbhVDA3RQfXeJE6FA2AyLvqOcsseRzvcQjQm4MU7p+RVaY17rI6/EkS8
-ac3E7BPwnXqSAkPSEgoiezv/Z0Hkmrcu6fIsUuf4ETU=
+ZW50MzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMC+nEH8lJVeI2yL
+Z4tyx0LuESsFlAqdXNENQOvzTOXm+TUZzj8nkdc8eHHhC5mfqyKiNN/OTh0J3Q/s
+7WCedqS7oTthWH7Ny2qAPFSuA40NgPTjKL8LVlukgTAeyg1AJMEexWJ54cV1H+lJ
+pJNnAMUNDn9yOZeX8h0b70Yn5oPifDDZ8pd6Q7jGT83FYxy3165dpHDkAcKJMf2O
+XfRX3cUnj1jL536CTy30SiQTdfxVeXNyzNofkRjSFhphKYQ1g6O7J1tsECqDaGyi
+ZZas2vwmZZ2Gy/eiduNmzEVkuSpjvPjA3Ntd7TY6hTPhBmDvWFJoibUrRLAIi+kh
+PRbNaFs6unpuo8BkIepB3ACQAyMmJxCYee1UiOJ22/S2GalWxZFZl1ekwPbz1OmL
+8fkGsbuBK5ISlh7MIfiog1CjuA0JHWQ6dVcs7adxMmwZ4K0eFjUGP5MqZ5JqiPns
+cYq2XYdFxqymxabDOxyXqLbKThcSKfoI0c2fuqxajxhQdt492CH25H3eSxCY8F3+
+K6OOpuCmqkCx1YxhNXN5mdvMMFskigE2Dk8w/UIllsZMlbq7EaW64lDxWAhGTUQ5
+KMzgXd62sng7rFt8ZRLjkqdszI6uJw2x53NyvpPd3HuhacfTwH/3DuLGKVysxl/B
+EUsm8DVT6e05vCop9x0HpCiDiSzlAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEA
+psgpcG38K5bmq20gDOEtW4S4Vm+VfB3WofI/ZPYPhm66TRnHHBNIVeQtYazRy8Ql
+2uhNcBajQB1szt3KgplBgAWmD/k8HFem+4cMx/zXcdH+vM2/gdRrSHZiLKSk8DMf
+G2q4WrSsoTSyytnSBBgDa/qTvYLi0vlOAxcYn6ouyJpn+Ezf5M8F+JRMIOVx1kzV
+eYRxtNkXRvugIEYvMs7QUq0KVEAXuY64JQCJSXim+HlGkDifDSbvP2Ao12xUa98a
+ranlE07P4TmUfAdDEZEICs7V2RDURuPcA1BBepgz2pzid//xD+n2xLnkBp2HpqTT
+UnWZQvKINbSNdSqCeyBYL2cfFCqUejBLDgJNAiLTYuiVfLbi5vBppqwbzZ67GPXN
+to7vfPLb7uWzCcqIG33Nwam9weEVbBmlpvHq8ybGG+AeUX19tT2Zl6haIvnOLutP
+2XEJTXURQLdRQBxWWTki8PwPYvg2fivneLQhcnU7EU1Ctzjmxsqy5Mbg86KlzL5G
+zuy04R/xL63E5nZPyEOFCQKXndBLmXfBk+r/TN1upsuZUk6rov2PPZtbfTyjLWuN
+RPoQeUDanvYfikXwrb2PSE0XhpJaUvQexfqgUO/GZoLErDU8QH0vsCtLm3rEX8dF
+i5RU4OGcN/SUUaAyAnJKD+U8JSHZvWsJ/yynAQ3TtzQ=
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/server-cert.pem b/tests/integration/test_tlsv1_3/certs/server-cert.pem
index 6f8e5a3c6b1..ccd0034b506 100644
--- a/tests/integration/test_tlsv1_3/certs/server-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/server-cert.pem
@@ -1,31 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFSTCCAzGgAwIBAgIUBfEMZ1Z/4weV13ryVA9qyNTPJF4wDQYJKoZIhvcNAQEL
+MIIFpTCCA42gAwIBAgIUDcCpGnB+Gon79PKWoVh3u3h/V6AwDQYJKoZIhvcNAQEL
 BQAwUjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwMjE4
-MDk0MzA2WhcNMzIwMjE2MDk0MzA2WjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDELMAkGA1UEAwwCY2EwHhcNMjIwODA4
+MTY1MDM4WhcNMzIwODA1MTY1MDM4WjBWMQswCQYDVQQGEwJSVTETMBEGA1UECAwK
 U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMQ8w
-DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC8
-jV8igQGgCvu/7BJDI5VQl43VGAFjH2Na/E9P4E5uwkSlJVED1WKvIlxRWhOaQOfC
-587nZVhQtHpdbCvBdKrHml4SVbTchs5SN2kZsHeqaQzcGnejnczE0SYo4xNyniSv
-GiQ1M8G3fiZNflEIPM/+Ob2oI3YnVWFGy0a5rQcHZWS45KuGILMP0aRHyzyh/31c
-K3i2xA7A3V2jBNuD4kHG8TLgfDeoCecTI0iU/LJnDOolX5XdpyeoJ6YyYOGg3F9e
-bRmbNlJN3Iky3Vzyc4jYG7y6f5DqfebYMW6hCvLpf9lN6/gPNOb2KjL3hvJ+hbj+
-b9EkVAzpw7mW1VHEy+WbtYMPoKy08JTc7zr1tv/vQGr3XExwlC9iixZXMaVt1kP1
-TEVHv2FiUOiZsVaqtoFpS/wBvKeQdkzNy+66pRpG9bLuOnL4hlz+rwHkdBmHGk+q
-cXdwglqIDqXKlCpIMSkFPH1364KLdJ2qBgWWoWCJjUmgbrA8/LU6DX+GBbEiw45T
-PQKP//RMkOrHOYRD33WTU0iKP61zn5+9RD5OLxEUOtCvL7AfB+jt4vYrMTT2U3Kl
-OckWxNx55bYLdLfGKtepGV2r5xzce0UMbWQrXQRuka3a/j5VJUTuUgcwgd6FoP4N
-4ObW2H1YEtE5M30xpa1kcqJ1RGEWagakISgn2Z3TywIDAQABoxMwETAPBgNVHREE
-CDAGhwQKBaxNMA0GCSqGSIb3DQEBCwUAA4ICAQCE2eJVcvsMmJu6xAfoE6/u6BrD
-opMicCtlC2qt0BgSIzzDQ/iWjnWKGM1C+pO+2G0WTczj7ugsxjPzhkyBpuEZaWt0
-9/tJTKIrgaRZvEe0ifsJxyqL5LJgfxK7TbDPcUBKr1v+TOxPVRq0FuG16x+yka4C
-rwxfBHU43FmtEFfgu13r515F3ggXcdlojkce8ZKtTAGEcN0MpbJ6XS90BHU0sy5A
-APTm0fR0vM3kg1nuBLbSGF5KfASdw13gb6QsDbll0IqK8LvXYiX5CaVfkAe/pFkO
-/2iIxYW74yC2gV+DcFdRPVfFxSKrdg0tDER35OYg1/vXRjV5BWr1EjE3qjrCcUZy
-rlF3fms7Arr20ka2nSa8avn4ALpyJZmKasoxNAAsxivingNVZkql48OqsJ3n0qGk
-LI6Yu+UM/pc78a3NHsdsCbnf8qvae4oJa1kyiochJu+gUOzHvs4Ydti9iTQn2Byo
-2A2LzyVPBmSOhzdQ7SwpvHA4A2ftao+dZoA/+o4rmBtbmgxjpBPyPJTN0ZfKlpKl
-Oyi57ov+cJmZctSUbP3M11gBva7aYu1Rd7/eXeCEl1FHhmKL/Ee+UrNZLiwspb2E
-Sa+pOHdJX8VgsIYXku2UKaGT2QFITxO7fnxghioxgsyCKrQ+m1gL9vgXj/gJu+48
-c+5CZ9SobLdMkVOtQQ==
+DQYDVQQDDAZzZXJ2ZXIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9
+IAOQsWh4Ursd2Dqdtme8e1Dwc/mpfZozKgZuCsc77CjMhaC+5d5JzTCNZzDVny4p
+GjWZFs2NL0DK42/8oS92BtQGj3Iu3x5B5JDt1jDW/i63zeQzazgTTpcC+BdK5mqc
+5jA83d/Na1gFQX0MZ7qDFA3yKv7cOhm3uEJJyied2fJ9PBBjDGUfhubQKAqmkAGy
+qcPRl0hXof6EbUYqnep2uVn9CNbGPjdVmCKhhBjw4fxxR4RMFelQOjRGgdAZt69Q
+TqHoW93F+kOWkI2XhpEfjrKlh9fzanToU3e71tsIvqkJEHSe3DAufhh5SpB11cIp
+L+e/nX83C1Lji3LLbR87XCWNK6ESP3xkat6X6hYcPH/BhaYjfZYgUBFFRWhNmkD4
++x0u/jL52x6PjFewXwaNijINp4/P5uoaZf2DgWPP0+/RoLdlv1XOuB6NBN80xYjs
+gWtJrOc66FTUqKyRhLWu66pVpDtgK8d1kew9Gb//82E7n733ZkUXMxiRGLeSVsI6
+fTE/cguObLQ/85pu4kfctoaId016MI/er9iLAsC0SQAE4zQiZ2/sHn5THxxbsvGj
+CWiHiyg8AM6V0JaoWxBakAqjBnGi5x67ucmjI36+od72lgbRPMiUinGvlW+a/gJY
+nZNdo0VZ5PECKaNs6UR8I03ozWZnIpN0zoS8Kcm6EQIDAQABo28wbTArBgNVHREE
+JDAigiBpbnRlZ3JhdGlvbi10ZXN0cy5jbGlja2hvdXNlLmNvbTAdBgNVHQ4EFgQU
+ol8EZWSEsbOPH+rRQN30/erjV38wHwYDVR0jBBgwFoAU9nhK6dpbaanNlG6KEg4N
+dXWpKG8wDQYJKoZIhvcNAQELBQADggIBACp/Cg7v0hU/fla/iuhta2x5kKLNjQI3
+USB/NlHOmanlBhrIzMGU7/mPqNY0Ymv6eU0nAMrdLq/P5awQL19QveEWackDo/k0
+bGjko7F4lZmEes7itT1UQgKmTizAcqiYQwa+v53eA906jL3JtQu+J/+z494nj0Ln
+wDjXbOBiLMTaXLmIa9gvmJQ7YdTaIwEnciaTcoPpr563XQ0Y2Uj1dxcmpeSndVd4
+KhXcxa5odzHCTJy2SxWlE3zWml4EsWkVigmLomCZfbT1lXDfyARs4LPQ5cEHsPar
+cUdMbiup/KWJCtFAapVTHtfJXZr9mBl3f6GT+kBH6ejwP3Gehzb4E5anZFrBU0jj
+fka3/wFLQbfXwAOOVrDmMHk6zg0OMPm+Es9tuTb6Pb/0vK/fwUebCpr7m/nDiQHQ
+oEMY6jcBS+YaICNE2cb01PDTvYzYTxefyGLIUJMPafv5Be8Mr0rYnQqZUH2WARYP
+o2kQzNWkP4lGTGGOJIAug9vy3zH8QkBMFR/2sP2QX5k+//6YIecnXMKLmp/iUJgU
+kiEJQ3ZfLRb58WtAvIgwZzRJhdNSzU1FWZ0x4uNuJQ7Fk8SKLVQPT+OyiyVr7JGZ
+/YqNVwtpMTd2qqcJQquemXYoUP24NpkDbeuFeNmY2onPXDf7+btmaj4p32h7Rv8Y
+3+IrL0IkpZDC
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/server-ext.cnf b/tests/integration/test_tlsv1_3/certs/server-ext.cnf
index 83d9b03ccb7..49859873222 100644
--- a/tests/integration/test_tlsv1_3/certs/server-ext.cnf
+++ b/tests/integration/test_tlsv1_3/certs/server-ext.cnf
@@ -1 +1 @@
-subjectAltName=IP:10.5.172.77
+subjectAltName=DNS:integration-tests.clickhouse.com
diff --git a/tests/integration/test_tlsv1_3/certs/server-key.pem b/tests/integration/test_tlsv1_3/certs/server-key.pem
index 065a2290749..8569cdc302f 100644
--- a/tests/integration/test_tlsv1_3/certs/server-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/server-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC8jV8igQGgCvu/
-7BJDI5VQl43VGAFjH2Na/E9P4E5uwkSlJVED1WKvIlxRWhOaQOfC587nZVhQtHpd
-bCvBdKrHml4SVbTchs5SN2kZsHeqaQzcGnejnczE0SYo4xNyniSvGiQ1M8G3fiZN
-flEIPM/+Ob2oI3YnVWFGy0a5rQcHZWS45KuGILMP0aRHyzyh/31cK3i2xA7A3V2j
-BNuD4kHG8TLgfDeoCecTI0iU/LJnDOolX5XdpyeoJ6YyYOGg3F9ebRmbNlJN3Iky
-3Vzyc4jYG7y6f5DqfebYMW6hCvLpf9lN6/gPNOb2KjL3hvJ+hbj+b9EkVAzpw7mW
-1VHEy+WbtYMPoKy08JTc7zr1tv/vQGr3XExwlC9iixZXMaVt1kP1TEVHv2FiUOiZ
-sVaqtoFpS/wBvKeQdkzNy+66pRpG9bLuOnL4hlz+rwHkdBmHGk+qcXdwglqIDqXK
-lCpIMSkFPH1364KLdJ2qBgWWoWCJjUmgbrA8/LU6DX+GBbEiw45TPQKP//RMkOrH
-OYRD33WTU0iKP61zn5+9RD5OLxEUOtCvL7AfB+jt4vYrMTT2U3KlOckWxNx55bYL
-dLfGKtepGV2r5xzce0UMbWQrXQRuka3a/j5VJUTuUgcwgd6FoP4N4ObW2H1YEtE5
-M30xpa1kcqJ1RGEWagakISgn2Z3TywIDAQABAoICAQC11lTwLp/Fm7IL9fvquc9P
-CMmkv2DfGi80WO2YJ8ccM8gFyEYoP0rLgYSshAUxlvSr1+iG6grQ0izMGfzctcnZ
-c3rTjco9fthNG9kFCFVvh536SqAkr5MCIH3/onZn7DGOmNRgZoikkEkaJP66xgME
-tuS72W8iIcoNfw63FDIaJOONGCJ+2Nw3HkOjZVIVHRLlp5rkD5H218Vs6MtWlgY/
-eO9K5SC7sskhgL6HyGe40BCjeFpMh97L4Wj7XslZ3A0xQGAYervHES9TWX5A58EK
-QT2yUkIMktzklE+PicKYA08rQa1Z5Pf0YOAELSWBdS7iWi3FLjXB35sE5rbT5puH
-9hZXSDWLggbefuaUJyowDEZy2aHP5pvXKBDhEANRbU8VaDyHhlNLqVNquE5Cn4HO
-zPeH+KLFbbABUok7yYZmIC9Bfn+rXvNzTX6A13AdJI/HcKA5RBGtpAY/168Pt/Aq
-dzuqepu42rFAvS45RNevp72IIavx/QdAA1OTgKxh3c2Mf85pIXJ51aWWLnn+EZ5/
-EsE0crfwkuKJvjubNC4oOwMTFMIBI2WsjvaAw8pQw0Kb0ksExKd0wz9mKcqR/v0I
-K9oYsaHkx5je0NOZds385+zCoQHYaw1aKUd7ZLqr5G/Nf/2TEYpMWco4ETA8lzu3
-Ty/8XkNw8jd4p+7bUuz1mQKCAQEA4MNU7GWDPwUKNNSz335nGH2oBvSGbYiwLcRM
-D+x2+RTfOAFSSJ+Q5tQ+327ZkAB5dK2mxmDYKB+Ln1UBIneViUflkMyh4fuutIXI
-wYo+BL71r89MqhRvvMK9hWnCGtJTJedf2iQENJzVn4J76BvTPRYywBv9pofPOlj1
-MtwwMA4CZAmQpCUaF5NQr4nliYx+slkcKwlm+cOxeZGa8mkNgQdmCcTZkRz6qsiR
-vQDEDiS1+5lCJ6nWW4L2tOPejNN//hVlbPGMaA0oiu7I7w4aSxnTlLhDgJzJwmN8
-NFYl+u5AcPq9iRtBnzfPmd87S9bg10zcIiMKxw898sU24Pa0jQKCAQEA1sG5hO3c
-4API//k7NEWXsx5Ns2JE/AV1LtmBgqXkn1DAJ+b6V1nIUppTs0zspEWrae9KrsAk
-z47qIbPaTLHuptLrvEXk2LVfzcK32a7fXXDOB5KkBhzlJM1J3PTRQFR9lr7qX6vr
-EDc4p7p55IDEGnJdXa7x+z56QjpAZaHlzexQxvoWWoLBkDuoT389sdU7CbgTa4A+
-CR6D6qKd6H6tfmv5sPlvp+aje+ObacP9I4WyVjscWkzBHxS3n/fTLjY6OFv+o8PM
-TdytN4+HZnu4MDJlF3vx9P6CbnnVCaScXDxPGcoSJPcoEQqoyxuvUQLDUQkzWF14
-02EvXW0dbgiPtwKCAQA0EUwFD2ceHD7HClc4+QFNDR71rYPOsBGQKJ8uOSs+fHVR
-dgznwf9BWf3OqNFBqLp6KxgtcJXihZxEpt6Ca416pesqZh1CSpmoPC3LmAjR9KLZ
-vX4XEHDqG3roAx3yNLMKXtU3pYxL2+Eo+INXu8ptpkzPcCyMfX2mGKGEzLllCHnJ
-TuXxAJ9QwtG4OIuyF5fqHPaHicAPMCRW80If0fJM57fdn3p/QWVYVupcDGdel2aJ
-CHHo2lFMFcStFvShTwWhiLdcS4CpQhMYTETEDFJO/4aiNyV8D9Y1b/J/9U0LGlJX
-Wd66elPzXGx9StdjtD2V4rpENjXy8zb4nHMgHkapAoIBACvvtmTbxTSPka/M7a/k
-DQU4Te1FTZfCBhdvqG9yQTPW8Xk4aD82vyUnLbihJEj3d/pUWpMl/GH6eywp/59x
-R8IZpOD/67HqaY9PJw4CGPClA4HJHoWho7/DwDjUXXsrzgXpSUoJgi3vHkgyfn2h
-Wn2OqEtiX19niNvDzyj71mgq0Nvkjm42EiPQEL8y6QxY85spbc+wjQCQnayDWIsY
-X6ZdsNfkMFPJe+j8x+77ie6ai8HYlhRjX59cPbUcnrf1oDOnnpEincnQPCAB3VG6
-PhSeOtBzKy1UZJr1kgBHDTZRoF1GWi/14NybsazcHSIVzp/lofuSJAYa+/XBPSQl
-3EECggEBALSLZPdg13906LEyznYnjgq+nMh88usegvU9qsBAFExClLLfr6Ak77og
-boNoOwbaFn+xiz5M8BTJIPizJcm5GjYaqg58zotTtG51h6VgMri+fb/BUpVr7p7n
-aSq3kXDZlrwZnmooCT+KcGx++w2N2SYSyZX1TELt/dpfuWJvph+E37PkONEEiHPF
-ZtSA/f9lpfP5/nx1pLmv4ksKdXqpz3/kNqaf9zbhQLgOm/VoBHL4NVPYRylGpCJb
-R68/7yvHBd2EskZoJB53TlJmwu+fC6ee1UiG6aqTULfEsiGidi6jIt56Gz52ox66
-BHL/JsJ0Be5xM3V4x4PtihQ3Dw546FY=
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC9IAOQsWh4Ursd
+2Dqdtme8e1Dwc/mpfZozKgZuCsc77CjMhaC+5d5JzTCNZzDVny4pGjWZFs2NL0DK
+42/8oS92BtQGj3Iu3x5B5JDt1jDW/i63zeQzazgTTpcC+BdK5mqc5jA83d/Na1gF
+QX0MZ7qDFA3yKv7cOhm3uEJJyied2fJ9PBBjDGUfhubQKAqmkAGyqcPRl0hXof6E
+bUYqnep2uVn9CNbGPjdVmCKhhBjw4fxxR4RMFelQOjRGgdAZt69QTqHoW93F+kOW
+kI2XhpEfjrKlh9fzanToU3e71tsIvqkJEHSe3DAufhh5SpB11cIpL+e/nX83C1Lj
+i3LLbR87XCWNK6ESP3xkat6X6hYcPH/BhaYjfZYgUBFFRWhNmkD4+x0u/jL52x6P
+jFewXwaNijINp4/P5uoaZf2DgWPP0+/RoLdlv1XOuB6NBN80xYjsgWtJrOc66FTU
+qKyRhLWu66pVpDtgK8d1kew9Gb//82E7n733ZkUXMxiRGLeSVsI6fTE/cguObLQ/
+85pu4kfctoaId016MI/er9iLAsC0SQAE4zQiZ2/sHn5THxxbsvGjCWiHiyg8AM6V
+0JaoWxBakAqjBnGi5x67ucmjI36+od72lgbRPMiUinGvlW+a/gJYnZNdo0VZ5PEC
+KaNs6UR8I03ozWZnIpN0zoS8Kcm6EQIDAQABAoICACFrvx2KcET1D7p0K9WTdoz8
++L5pLDkaqE1603SORItvDf2obpHVgrzlfPs7/Un+zXQ3fLm/KRdWPpur6e4JmN7B
+UaYQItQsGwd3afIRnANeGyjhgj5g5+GnjXGZoFoc0kHEPsl+xu4g1kblfgDbcr73
+pAhDt1J5FPLdpZ8vEWWoblzZqKasOdGCsBagQNOS1q35KJDI7GCKELVbrx7YVabh
+1chsj7GsLHCciCAlPRgSQ19MTVF5vMdv5a2BAqKMzncBUkTCuTPjaB67ED5y6gHa
+4HB2iz+pdBvbJilETGQk9y+SIB2zmPMaVt5WQiWEnwFSxSAcJ681OdJaofBXagFw
+X3sGhaSwYvxuaFYOHR05pdjgjV6cjz6/I5hUV4KKU26FcQR2idPfR2iJlhU3qOKg
+E5T9r1blIpgUaOWAP7ub7pexff2MarkuPe1wPNdGUea1Y5gHjL3fp7JCyfq05o9y
+0jpglopsdwZqO3Ta4aVjEcF785NSAe3xfHePuVPPvm35bWKW3NnRCh2ztnpFAL+p
+irt3dOdi2yC1RgG6b1RZ19791MLSo7t66yUwZXjBZsOxCNTv0BXmD+XV8PeMhkcI
+hogI2t2K0kvmwk0MkPpixQ+WcAt7lAAicd3xvWo0kStlbf46n5wzaDX+5CBPKfCW
+SuD2v8dytaJ0xIaQffJtAoIBAQDeJxD7fo3nCDxSlZkEueeaQM6iJaYgep6fZMrN
+7SkAJ3S3MW269rHW6ZS3TPFlFd32IvLsnxV3Dve0ne4AiqtwORGNz0W2BpXQ03gi
+K8pTEfbYLAWt69crqTIxnnoMjMifxLeHyFIeTL5yVFIk5gWPMxaXGdskP+1qCVD+
+bYOn5exFQZVS/hOMftAIT4qGg1wouX37HOeRaKVR/I622j3n/4HOV4szivAsXG5B
+2vwxQOpdvVXCyZ4dfG4kbAZNU+pcFEtAHbM9Cnr88KXSDzX+S2GqRU+n9rzJsINB
+lRZ5nSXG27KQnhziL4y+CE1+8WeX7YGMd6JJC10vY0vuFqsNAoIBAQDZ8LookkBl
+IH0lIKk1TE4Jjl1obEyJNwrTHzPTuNFTfgvyXWLf1dVj4u5l/xLTO4rpvNzGozG8
+jdM7X55/KFXZw9sIwEfQ2RqLIBhTH+qbScV+fW5sPVAh5bjbgShjPL9W7caAHw6J
+8OPCFn+XjZV3s3k1mcalArGxRA62B8aQnbNBtxCqP0ti5KfgGoWVw64+UJX3k1LL
+Tpoo5bHqXKwIxCXUD8xcdf0CUNeNAZkA878L9M3BePG9Jo5Dk7ajix8WsE7vc0nX
+hNUrY4NJWxaEm+baHQhNG16N2lu+yy8Ifug7sx3gZXKUw8J8cQaCCvrxK2Eqn6m2
+AIPWWTqVr/oVAoIBAAi9HKvn9IkMB+Nvww8uiO/GcNpsBLbuW+MFQf0LwTsiUjMK
+nLhoD+LWWWVEf5JsY8jU4x1vvJZsXk4akEwxKEFH3WropmNcqvQF/YnKkzDlWgJy
+6N5IkrRC+Zh+FWr89r9iK54JwUEz36H7syeEbN+PMOpMuBQa96neJ/N6N12Za8vl
+oowbNoWmT2SkTFyyOiPX+B6yqmFL7oTlHHAQ8bJ4mJCXXQBwDLaSBDxO8vC1DwMU
++ZSp/bBHPsXsAet0y5lHqxYglPZnvSLKDJvQwVz5diQOie2fhRmh+efQh4vNJLlH
+1yRdM+Gp4S1wgivmLx8I1rnB0v5wlf/RNiFtftkCggEBALjkWBo5UTY55NGNrt+P
+l5jV1XrUfe3e62kGzKIu5i9N/PalsU8yCvHNwPB5AFCB8Cyx1B8UrgpHy89QJJe9
+8W9okDcRYRvWQ4WKOfizWAZcBJd19CsRrRzE1hoqrcfa7nziBggF0QDHg4HSMnax
+X/+IHCmUBwlQis1Xbp+RYyynDT+P/ixgvCTu1VjzRycyNm2ZUlESBCiEy5Ysn86y
+xiQ9u9X3fSln07iWOvfeRh6fqxGKotAjOfp9bi34b/a4/SvzcVQFW7zibTJ9HxEp
+nKXt2WBrRvKbaJExkaoAmCs99ulG4O7RQe7hUOrfvGSwygm2Ap31jDXio/ZCBsic
+3a0CggEBAIDUZdg14l1eF8KyVvsmsGB2pv3GbrQ8WeDyEhhf+NoiLBwPer/pxxao
+bSBV6tUzNEZ3OyTO8ECGT0bFZMqcmy2uHWrCmDll83ngegPN45CFS+TwAcRWauJG
+x8vpslAJ8QDJdWtvYWU157YR54l1aSAlxKIXb6OyCWrsKBSEkmB/nvZ11c/uF7ar
+hIMgXGwFcNobEl+O4TJM0sUuquNlDCUGMhP+oLI/8smuTiTTk8Jt7WtfsotOpzVq
+JnaVEtb0zww8B2CWaniqyQlJidnkUhPlk5U6jEEaFCu3rOhLZUo7BRm2oRP54L2O
+vwcNFb1IX4q4LPiL669Qcm3rUHjkLd0=
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/certs/server-req.pem b/tests/integration/test_tlsv1_3/certs/server-req.pem
index be2f756cc7b..cd3dd397ed6 100644
--- a/tests/integration/test_tlsv1_3/certs/server-req.pem
+++ b/tests/integration/test_tlsv1_3/certs/server-req.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEmzCCAoMCAQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
 ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGc2Vy
-dmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvI1fIoEBoAr7v+wS
-QyOVUJeN1RgBYx9jWvxPT+BObsJEpSVRA9ViryJcUVoTmkDnwufO52VYULR6XWwr
-wXSqx5peElW03IbOUjdpGbB3qmkM3Bp3o53MxNEmKOMTcp4krxokNTPBt34mTX5R
-CDzP/jm9qCN2J1VhRstGua0HB2VkuOSrhiCzD9GkR8s8of99XCt4tsQOwN1dowTb
-g+JBxvEy4Hw3qAnnEyNIlPyyZwzqJV+V3acnqCemMmDhoNxfXm0ZmzZSTdyJMt1c
-8nOI2Bu8un+Q6n3m2DFuoQry6X/ZTev4DzTm9ioy94byfoW4/m/RJFQM6cO5ltVR
-xMvlm7WDD6CstPCU3O869bb/70Bq91xMcJQvYosWVzGlbdZD9UxFR79hYlDombFW
-qraBaUv8AbynkHZMzcvuuqUaRvWy7jpy+IZc/q8B5HQZhxpPqnF3cIJaiA6lypQq
-SDEpBTx9d+uCi3SdqgYFlqFgiY1JoG6wPPy1Og1/hgWxIsOOUz0Cj//0TJDqxzmE
-Q991k1NIij+tc5+fvUQ+Ti8RFDrQry+wHwfo7eL2KzE09lNypTnJFsTceeW2C3S3
-xirXqRldq+cc3HtFDG1kK10EbpGt2v4+VSVE7lIHMIHehaD+DeDm1th9WBLROTN9
-MaWtZHKidURhFmoGpCEoJ9md08sCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQAb
-FDegAoUBz9O4JR1u68IMnGkO5nINGAPQOqf9a2BxGujnSB7Lw6SHukjkUqqgnfQ0
-x/aWOI8JVAi/ptscojgMQUDsVNsij5v+jbJE+ZAobxnTmKP0wTc2ktpf4d8UMVc8
-gyM85jLHZ8caCcuy0D97W81vgIv33dNHWtP+sfbQhX9wJ2YQTahIC8NpuQfLAOUH
-EFxWil0mfN+9vRQ1C5naKtvrOPqyM0RPrWiudIJ5QjI4aSXxUCupxxnaQMoI0Y50
-MvVVT3VwWgP+hL4b+yEJFHRpE7BwCZijsLIXkXmVZoveHhiSMYen1HWIP1VMDEHP
-CUtG5UQcA78CBS8qg4nyFbDU4hWClAkAt96O8Y2epJYepIoYuBBSEfrgupESMLjS
-E9Hfq/H6Ac/Q3zWa320udvA+ysfS8pagkoiH9+TarrsDjhxLjg2h2bGcXKlrsP1R
-mRVZwfNOl3/ZNq5HBPb9Z5WXKvcsTCQAlnHJdaSmzdyArB0guwUHg8ZZNZqCdVgL
-TPsfE84yI/HlwRfuQILfGxq99p/UYFwnee5CoM/PPvaAT+9z/lykMWZA7osuBcK6
-zP8XneGmZOkmez5+YJgSC0xeaDxr2R52eQXlQEJGDbFDtQap/X+cJDGyqmGnbhSu
-6XkGy0l8mAkpcurMcy3wWf6+joskZAN4Joi4ZjKsQA==
+dmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvSADkLFoeFK7Hdg6
+nbZnvHtQ8HP5qX2aMyoGbgrHO+wozIWgvuXeSc0wjWcw1Z8uKRo1mRbNjS9AyuNv
+/KEvdgbUBo9yLt8eQeSQ7dYw1v4ut83kM2s4E06XAvgXSuZqnOYwPN3fzWtYBUF9
+DGe6gxQN8ir+3DoZt7hCSconndnyfTwQYwxlH4bm0CgKppABsqnD0ZdIV6H+hG1G
+Kp3qdrlZ/QjWxj43VZgioYQY8OH8cUeETBXpUDo0RoHQGbevUE6h6FvdxfpDlpCN
+l4aRH46ypYfX82p06FN3u9bbCL6pCRB0ntwwLn4YeUqQddXCKS/nv51/NwtS44ty
+y20fO1wljSuhEj98ZGrel+oWHDx/wYWmI32WIFARRUVoTZpA+PsdLv4y+dsej4xX
+sF8GjYoyDaePz+bqGmX9g4Fjz9Pv0aC3Zb9VzrgejQTfNMWI7IFrSaznOuhU1Kis
+kYS1ruuqVaQ7YCvHdZHsPRm///NhO5+992ZFFzMYkRi3klbCOn0xP3ILjmy0P/Oa
+buJH3LaGiHdNejCP3q/YiwLAtEkABOM0Imdv7B5+Ux8cW7Lxowloh4soPADOldCW
+qFsQWpAKowZxouceu7nJoyN+vqHe9pYG0TzIlIpxr5Vvmv4CWJ2TXaNFWeTxAimj
+bOlEfCNN6M1mZyKTdM6EvCnJuhECAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4ICAQB6
+RjhNzVgUkImO5vziE4YqSaFQafsjLyZjAb+HNxZGuXbBzA6sjD/1NiXAPenL4OXN
+3pJbUNLHQAfhzWz1FI7TuJ94rYaj0nyCGqwZvZCpeqQgi+9E+KE2Ll+ISEQE9WpG
+GMwDT9FxqNR2gfJwWfQk/fi5EuGkSf8IssoWQwALH4ZZ6JPlodOCiKjoS5UG0Srr
+DlL3RbYfBZ+fVkoIr+RR3jwHBWTcYk/GGMlCozywHct0ILfMgY/3vvW+r3mFmGYJ
+Lbh0CIuwhDmUbaccpebDKdrF97mfsGyZrLrkuRHqkJhsI7b+JvTm+wKsPxXLcrm+
+UHS7Mo0tM/atuzfrC4ENRRCyJB/2/pBREsOxJSa0L0lcfUO2N3Xskk3iiQuwSvwX
+yHENmSE+5u/GERk62eQqHGPmPtQ25kEg7RmL3N4jLKPpShg35khjS2BUxCOAu5Z5
+fgFoGlAnsTOTY9w7sRH3KRkSWQNrxP2W/cuYBhtxegO6rwu3/Ehcz0Pn2eOemE4c
+IiB0NQWizSZoirjVGgCyyWGhZFrL3qeAwPyovNIrV07YaQTmx157JL6zKoIS/WHW
+EzJKUWHZar8EmVMvw6KwBEycNSCXbJrjWXFxDCia7v7F2Um19ooGWVnBBKxPVYxV
+HKHAgzKJeuTDPaEnyOxIXDbBlDwHPAFHAhl5ZHPbaQ==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/integration/test_tlsv1_3/certs/wrong-cert.pem b/tests/integration/test_tlsv1_3/certs/wrong-cert.pem
index ef95a73deba..1ce85f9e811 100644
--- a/tests/integration/test_tlsv1_3/certs/wrong-cert.pem
+++ b/tests/integration/test_tlsv1_3/certs/wrong-cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIUL2Y/QpwqqHyi43PwPeA6ygdPYK4wDQYJKoZIhvcNAQEL
+MIIFjTCCA3WgAwIBAgIUQMyS62fmebIaM6Ha+55Zo397Z3IwDQYJKoZIhvcNAQEL
 BQAwVjELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
 GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEPMA0GA1UEAwwGY2xpZW50MB4XDTIy
-MDIxODA5NDMxMFoXDTMyMDIxNjA5NDMxMFowVjELMAkGA1UEBhMCUlUxEzARBgNV
+MDgwODE2NTA0M1oXDTMyMDgwNTE2NTA0M1owVjELMAkGA1UEBhMCUlUxEzARBgNV
 BAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
 ZDEPMA0GA1UEAwwGY2xpZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAxO2PSeaiNFMRRiFXpnMw07u6EIdEc1Jx3cPvZjEUg/pdEmMYkrSxr2MeqRkl
-tWH8TcIIoiWDLIcM6IU0mF6a5ULu84hFb9b20qRG3wRNb5yO86HnoyzU99t98++a
-9iaY1QAt03k8wq4jRjU2k/eoVSoLT5uVP5KxiNzdS2BTHFSsxrt/xcwdgkfJouHN
-p+MYUekk6qaQy5fTqTpqdkgO2v/JoYCi0whBNj205d+WnS7xfeyVSJP1OJWHRZ7K
-Y+LU6hz6wHIng4s/ag7VdAk0PArWs50BmH5g2zJfvt7VeTQebaJWUtSEY05odOqt
-KZteUmmhxW/2M73wGVF3WAJCnaxypsjcmMZFCpMXpwyTFrqobvC3APl6SOP+Ev1M
-LxhhCIDuLFu46P55KKEKjUCsYigd1VsHjjvoajGcqlPlMsVHJc9VChsQDz6agzDP
-Fb/LyYbrDTTmsI57/s1jAZyemq2SEYPApJvcdZ/ucl741jI0671EZPlip9iUQgt3
-MHlc3t53/GtF2W6GF5Fogch7c+0c2BhMupAHAXwfLABvv5X8GDyjsNlwB6ea9jeC
-Hw+0rEotZzCXId3daFytGNm1jI216kXLSbvz6uz1wMGS6Hrhk87whgvQ58RMNs1K
-SGDFw1WFv+QZeTO7wqcn8Y/eqF7q9RBhOpPMJMX8Sx/UXuECAwEAAaNTMFEwHQYD
-VR0OBBYEFCI7Iy7tY0D4HPa9BZCZxYuJ51mZMB8GA1UdIwQYMBaAFCI7Iy7tY0D4
-HPa9BZCZxYuJ51mZMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
-AIKYtBwTp3yvUGSXorV32dnU0Hp0MOie/itgx/la6b3h2bZSoCigKmcmvMaAaNzA
-pxeYSsf5wPnONpWfo9hsGrUDMT4ETnXdzA1dbidIrhJbGsY8CN217Qt3YZWNWkrz
-xLwxEwAovQZqnGDvtx+tRE8i6YJO6/kca+GB7liHFvUx8zaQ6gCwfloduG8rOAeq
-noeCpW/zqYQSQGK35ntQ8MTTRbi7jMOTCikvRlldS73ODQcAR7jywgBYf/i8ANtz
-NoWa4KbWuqKsQKMIGOi1fMLMaNlDSzJyw6UJ2GVCcL1NxkCZi0yudfAAxWlRis9G
-zLjm7YdNBiC6RVZudGhvzjlsLZpE9DgiwXqcDv3Y1dpstD5ikrNhlQo6THH1YeFy
-B8vjVGZZZu4B2JEo+QWH+zFGJosD66YoaKMVuwRPwoGDQoO0Pfbpq41A4KUhB3cf
-X49/rbInqwsN5MuGp4l4+T7k7Wm0Y1Qo4FXDVbFxHvvniyHUsZk9Llzf5wBLl84m
-xheUGgCHSflfXuuWi76yoADHCv+Eqi4/aLJmkUewKXJlm+XYs9bdBHUI+Y10KmhA
-hgcHXF56L+N4mLRwUuLxa5qwQIqNX32+piQoO9opxnVKKCptpATLE30TOMLEXBlp
-J+6b1e4BIasAAEGUhTgPj/SLL0u59Bv0K5SlSn7VZ0gI
+AgEAwvRBsjalbSOOJ/2iAubNYrr1SXG+BAGHvyXTGOjZ/Ge610+DiHbgFY5N2ZzR
+NSljLvEoqhcfelkEN8DWZ7ufYSeAQVIYrMn7ne8umj0YxMelJJBk5gmfHvFOMfQt
+CIjOBq5LgoFPrOQepIEU5TKkuNB12JxxCzzeXCxA35cbbijXI7CpgnMzLTdxRpCf
+Z+SvQF8m5BYSORDsUoym7fU3OdRWZTI7+FIzPLxFFMewu/3g87OXEIzy79SR8uhf
+6bk4EVBrIGgnd5temBrvoXSGgE2lpKov0Glb+/WvclatquDVDnbGFkoYD3z/JVQd
+XiQ4WNf4xUDZ9/c0k0iLKt65gZeplRBgMGomb/o6PprNIQRpHc7CoPIB2kbqN1lb
+KZEYjchmNlkyRboSk9kE82qShkgBrTnuSgrUcXLZ0OjRwjkX/BhfSKxkAY5uHoP6
+eQKSzdmRT4G+cHzC/uRoh5gGPsavCZM1KdEX/QqHwI6K3IdfVdQo8vCk4IpEeoI+
+q5D7ejeN7q53AeIJRX2y8DVn45Bcxq4qKU4FX8yfb+tg4de3a6FZXYHka5TSC3M7
+UZmcBx/ImJqnQny4OWXRsayH5cd+w7lPCXBL8qpgy7uOKGOrcOFWJLZ3idSsrloa
+Eoqf+VoRW/VHa2Iot2ncfoJ6iUmt8TqznuPNuwo+/N00U0kCAwEAAaNTMFEwHQYD
+VR0OBBYEFCwYOGhadek2wIHucRhOLn2oOo25MB8GA1UdIwQYMBaAFCwYOGhadek2
+wIHucRhOLn2oOo25MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ALNSQnbjLWby7TBDgGQD5xv+8/xi+5L05ONSJDy6Xm8j2gMAFGK8TnqvqpfBoqnn
+bcsAxvK+VVqh7MLaquRIdczBH0CFa/34Znv7I3k3EmELo8XB34pe/IOciZrgxje/
+sC7B3Kvih98xEjyuRNm0KDSEy7a+UdCoY/D6OenZSu/IOry8tCZmOUJupvSTmsfT
+Ld24QNkK1MjnuG1W6T1UZtsdItrp7T2x/w30SSucX3OOJCXCVnmV21Kn/MAdUsP+
+w+0oLbJEHPNqkTlFm8WGhhh/Yc5oYQN+vbaHE9y3swD7NSRRVKNeyJfDdecGsO3o
+df/JcUrQZ9JyJBhNAd4JWPvITChBrErTH5TrR+4jQ+E2QcEEfvYgqtjZ13XRnTNT
+sPCmszCuElkEcVujY53I3Ee6t6VFjtOHp8C/Rcb8CHzzd9ZQRljwYSIU0/KGOqI+
+WH+Ohp4B41PUkFGTJO9phgdIdf+pNYD6KvP0t0DsawuOsBkkPrcNbRx26hjjWTJx
+NEbv3TFKTLyhTIkzbO7oh/bs6IXTJQuj9slX63kDZnGujN9Cn/ESp+9m0JEdDmBz
+RiDtrrb2kgQ/w0udy3J94sb+PxHpGbSnXWjv5Wvqkpuvh52B25DU+wLnDTrZVGgd
+oM/gNhCNwqUi8raxBHZrJ7goXc3A4TGcduZwdH8/fElM
 -----END CERTIFICATE-----
diff --git a/tests/integration/test_tlsv1_3/certs/wrong-key.pem b/tests/integration/test_tlsv1_3/certs/wrong-key.pem
index b2213cd2675..0290e173304 100644
--- a/tests/integration/test_tlsv1_3/certs/wrong-key.pem
+++ b/tests/integration/test_tlsv1_3/certs/wrong-key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDE7Y9J5qI0UxFG
-IVemczDTu7oQh0RzUnHdw+9mMRSD+l0SYxiStLGvYx6pGSW1YfxNwgiiJYMshwzo
-hTSYXprlQu7ziEVv1vbSpEbfBE1vnI7zoeejLNT3233z75r2JpjVAC3TeTzCriNG
-NTaT96hVKgtPm5U/krGI3N1LYFMcVKzGu3/FzB2CR8mi4c2n4xhR6STqppDLl9Op
-Omp2SA7a/8mhgKLTCEE2PbTl35adLvF97JVIk/U4lYdFnspj4tTqHPrAcieDiz9q
-DtV0CTQ8CtaznQGYfmDbMl++3tV5NB5tolZS1IRjTmh06q0pm15SaaHFb/YzvfAZ
-UXdYAkKdrHKmyNyYxkUKkxenDJMWuqhu8LcA+XpI4/4S/UwvGGEIgO4sW7jo/nko
-oQqNQKxiKB3VWweOO+hqMZyqU+UyxUclz1UKGxAPPpqDMM8Vv8vJhusNNOawjnv+
-zWMBnJ6arZIRg8Ckm9x1n+5yXvjWMjTrvURk+WKn2JRCC3cweVze3nf8a0XZboYX
-kWiByHtz7RzYGEy6kAcBfB8sAG+/lfwYPKOw2XAHp5r2N4IfD7SsSi1nMJch3d1o
-XK0Y2bWMjbXqRctJu/Pq7PXAwZLoeuGTzvCGC9DnxEw2zUpIYMXDVYW/5Bl5M7vC
-pyfxj96oXur1EGE6k8wkxfxLH9Re4QIDAQABAoICAQCjj/CAX/f/X7MsPYtQa8J1
-Sinbio42/pYmrJPNnBw/FhZxrC7/wucGFlyj9IgWZCEr8Go9SsztkeoNwn2RxJoA
-q5xOV7PclX4CLIHUv/0VI8Kz5pi/NgBZMUwm7K8Xna041OI7ECqARCR2LsJ7GasN
-uVMVttK6r7uXQmLnNUUydb3ffmI8xjEIQVnfWI74z60mc2+/GcOP5jXeC+/a+DSm
-fudYpcAXaXbId24ls5SkTxYzEepYEtQNQFzPXXkah49yN8mpR+c74c805scxjmd9
-Kz9yhYiKwQTvaqKNpQVHmxte0gPC3lJrLPejjDtxIGOyLZw4oaqrBSpDzR9D0PTE
-C+BR6VlXpVCTcAoiweuoDIxNTiJ5IbIJme3iMWxsAIJ4n10rSFFl9Cmmqbphp/6/
-XInB0X7Zyr1kBrwf+DH6DJhje5NXgGKVR9oe9jjW5v8V2tg1RrkzNU8iKBSxpvcI
-x4mKhhRLYgoq/iNeYBVQrwJYktIbweVCQ5Spj7/20IrMkn3FAmMsZxGMZmLisJ9t
-B0vvUkUgWxuJTsPJ2j+ytpGT0E2xIDYCpbG2EopDc8WvHcVNhagBvLC6xIjIKm7N
-2zpBU2W3fPNXoToCAmaLDPYeRRpG6XaGFQAfvKUQRLBDGTfQ177qr34UBnmgvxDq
-J2gA9rQm3XziLMuSlJexAQKCAQEA+yz49Ah7FFq0QffsoRb0qOJbfcmMGTRkaafb
-ztto4EFSnjH2EwoSShu4DfqWw+ws1KxHlItNHHko5pVNpS4lj1OpnobW3QD7kEIV
-mYKa3KowYUcCq1Gzq2RNDZqsC2BSXwx1MG0VVKYOahnu5bvzQq2Ft8W7CWBnbTbY
-0Jxjs4KaOza+bH7Vfb5Yre0tlW7U5vI/YO8+YKxpxfOU9kVo8ZLQ/9r/YH8nnLa+
-Fd91+WjcUW8CTKU+Oz3lb/Vwcs6YOoAraq/wtOCqWURunBXkQtzOIn0bgBh3WEk1
-EQ+MVDHshlVVjv/rfnL571ZTT1amCJuEIwQRzLSvbso883srMQKCAQEAyLXaG3Pp
-LYiRKu7Bqr5PPuqdT72UFabPpfgd5EtcFOL0xUpfRya6HyFdM25FWI8haXeg4e8N
-0cIs3gMG+RRgm1xISJIZi92L0Cwj+kLFu2U5SkvAKMqZFh5q350FRi4Bp7ae4YrL
-aguWLZCxhznh4D5xQGM6c8ObRfUUEMT+dnLPcj4zn9KHhoUudXjLKjPNw5v6nkbw
-xtRdwANlHx/LX/d4+iwt2plDWmT+d2OLvqZcPyyghTMqV45L0p9XAXBsLnz4Zipx
-7VJ8iH3jL5oaQ6YAFY+cXIrWBN0q3UYbXdkaA2ve6voioeF3KQNRmU10k7GKNRWl
-pRNn62+rAR8isQKCAQAZnPVqFS9P3QwCqiCEMM4UJrkDs7jInTIcIBTnHDKuo5qk
-LR4VxPImgnsbWdFj+0J7EXJfMHFVlPlZwiHf1TvZSMPEOaXRdZcxl7uSIuJd3DEA
-ynf4NmWm9Zxx5bLjmhfsP1336TfCoQhZQ3m8DZV52C4Jlm1DQIRre6tSYpA8LvZB
-UYzLjYeBwhZS7hu24E1vm4ZhASSQQSSsHfGzx1IzSDBt1swx7+V/MpdhrZ7fJxVI
-bJSEcllNOzuZViL4Yh7d4FINGBHor/xPDA5ndkgHlXKjy7QxNM1+wEBcFATQVSL0
-c+E8qtY918Wq5VergH9/4zPvSivyfv5gwtjCT24RAoIBABP6HbJb0BqrHB/U0cvn
-00Vk3rGAIgwhpUtUrcz6PzkI+enlJCSV0zKkBH3I/Pf6jw3LTWUPgSWemQ6j6H7E
-K3VrMvqeKBLGw1K+Afq3yKyFP7WIYqDswV31Oxf0rgC1NY7220uBoAt3CcSRQUo/
-VZ8XN/h7p+a70mmdIhklMlqhxMoPLN48eybFfMFOe5JAw7szfDdiwjZYDti8vcTi
-SkDMBeuImCvI025c3QMPEmqwbkAPdg6r8Av06tEU8PkAspPR9ntcwCgp7KE9Pm6P
-fQu8qwd6WsrPOswTI2AQyUqHAFLU2sQyj13jbhPT87w5fF/y7NmpxOnwS4igfbnH
-2pECggEBALO0FiJClb0GSqMXYJ+nbtRObD4AynYNVMEqYdZu5DBb6vb4T7uumTD5
-I1fKOa5SSELngUj23p2G6sVBsDyDHotGJYJwDGejHOFnEpY+J0Das0pGS40FsFC7
-qABIUaMoLKcIR9Ofcm9uu2n+koNULV2aaXj7A4OYhRCQi2PqiEx1wimdrLfGqTXn
-O4rSf826ODch87vuPbfFPCaIFG28R3nByp/ZBH5QNiB3NBmc3A0tiHFnZW3cpOfW
-Jm/Vu0PcNVVw32SroS2FCroR7qSWsvt61UzJtliLUiFHoUAxrXXiAxcZW1D2Hmpq
-neUhT/t9hHdcMJgoxm2IITf6ip8nTnY=
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDC9EGyNqVtI44n
+/aIC5s1iuvVJcb4EAYe/JdMY6Nn8Z7rXT4OIduAVjk3ZnNE1KWMu8SiqFx96WQQ3
+wNZnu59hJ4BBUhisyfud7y6aPRjEx6UkkGTmCZ8e8U4x9C0IiM4GrkuCgU+s5B6k
+gRTlMqS40HXYnHELPN5cLEDflxtuKNcjsKmCczMtN3FGkJ9n5K9AXybkFhI5EOxS
+jKbt9Tc51FZlMjv4UjM8vEUUx7C7/eDzs5cQjPLv1JHy6F/puTgRUGsgaCd3m16Y
+Gu+hdIaATaWkqi/QaVv79a9yVq2q4NUOdsYWShgPfP8lVB1eJDhY1/jFQNn39zST
+SIsq3rmBl6mVEGAwaiZv+jo+ms0hBGkdzsKg8gHaRuo3WVspkRiNyGY2WTJFuhKT
+2QTzapKGSAGtOe5KCtRxctnQ6NHCORf8GF9IrGQBjm4eg/p5ApLN2ZFPgb5wfML+
+5GiHmAY+xq8JkzUp0Rf9CofAjorch19V1Cjy8KTgikR6gj6rkPt6N43urncB4glF
+fbLwNWfjkFzGriopTgVfzJ9v62Dh17droVldgeRrlNILcztRmZwHH8iYmqdCfLg5
+ZdGxrIflx37DuU8JcEvyqmDLu44oY6tw4VYktneJ1KyuWhoSip/5WhFb9UdrYii3
+adx+gnqJSa3xOrOe4827Cj783TRTSQIDAQABAoICAECDQaYurSljhaw4Iz+gjsCo
+K3lFWWLL+tbHNobcrx32WX7cgiNLazXW5G4plZVo/7hN923pvvHmuR2WA51KGiC1
+SJzVBPNQ16HYv2ws4aBkjIKAAdOZxX0gzwZ6zdgwJTVSwgwKrIoC5xz61iZOTvIV
+kZm/kyzr1I1d243h3CLlAuR9lmpjosDIwwRd4VIo+9Fqa1047IjTz9A1WRwPdFn/
+qSNNr0iqMuhbSOTqe9KJ3cHnYQsKCW5RwoZGXU7jiuk32mtb7AuJb5EYAMpF3Chj
+CXhnFPF7nAPRtmA4zLlqMzbZGQ3RMQsXCvuYTSuVAsxrk5f6sOZ8eHpwnBTwpSPn
+3SrmW5m4JAseRW7h8XEZbB+vahdfIIeT3j7y2O4lKRI9Gos0ZqUbkaAERuxG20i3
+i2sKifQ0L8m41mEUe5q6Wk+4l9vTANdiNFPcWwMfAL08cdImu3U1Oz5NCfKFmq4W
+5u64exq+EQpQw+zHasGtJ6iaHQMN2VyQUN4vacgjo7FA4SzRiDV80GC+WE8RxRhD
+Z4aIWFcntGDzN4YQEZ62isWgsL5UkT1RD2J3tyS3jm4lXTltRBm3R4CWyu4eKCKr
+3zdVRmr2zKssMJpD9F08A46gkfsMI1d4sy7UsSnBWDsFv67clGjbp1nD6xkzRg73
+wR6u0BE7rgPA2syV7ezNAoIBAQDNDO/xmTVKJhbQKzigziYnvwB3RhpVpJ3cf876
+lU6sKONMWiCXF6MDqpfKQsOTJT5E5aTGsQMSYPNHSvK9FFX+a9uvAOucsQWCa5Ae
+my5/D0iK5FvnY1mIcYTtGkvvv27FOqBbzVBNH3cpj117RFXzZhK/QUyauU5DA1ey
+umPEKXcJgtvE/EQh3IUoP72oyVnciAobLX1EPyH8UfGQ0lRIFrFc2HOTWCib5IwT
+WXJThh/8tPztQiT1/+BqEsb48svOFqQ6H9B0HYrldLWDhQ0oRTpyU2UY8/RulYZ5
+SD3a2935mIQ5zakU8wT7+yGcY4fr92vBEnTZs6VEkB4TJSBfAoIBAQDzZRjCxMLG
+OHmHKh/MyBzuSSQWY2imHaBGglBGybcUNbtKtTCaE9GJpbzh1QIaOIhrIKE41Osb
+lLMO0Dqx1CrMZWTy0qqa/nHmi+kOio9eOcC3WwLG2dJH1BKv09zr15KFoJZQ2JQC
+fe5EPdxZRMoTetc9fh4FaPCoVvrWgViy6XH66etM3A5BexP+groe7oYDfSxKqdvh
+aL5eCxFDXXkmRMgn4rNPRAJB8+OmpFTKCEjC1Or8E4YwyDzcrrjr9PFR88D2Tf5c
+wbMnOCX7nRtGWCVpCtnLvC2UVP4Fh/dKcykU9p9H8ZRPr6p7U7i7XfVK30zTuRRG
+el4fUYdGfo1XAoIBAQCzK1fKArZWuRt8ABg2IouidToB/oZqSTILBr6jpK0er4eV
+IreRbnzpajnB6T6dJ5DWgNbPKsLlX0OUCwA5iThu3G4T57j4rJGE2VoP9EbXjVI0
+0r8fW2dTWuXsi+rIbbxrqAOQ08ET8qeb8AKeACMeUBWXeoZmN/8TfSs3J7ifIiA6
+dlZ0NH2QHPFZLwEZJ/9WPKSgBMqNRKD8qdlrUu2EJBgMabHrkL/DIBvpmGHWa78t
+gDP1WLOVJGVCKnAj/Xtp88zCYSQzIdFJGAa3Ch5qDru4Q/h1qkzuB8d92Er8HtxC
+CSuYmoTgoky7pT9EOI/+9q34AZmK1HdXhppQ3kL/AoIBAG/ZpKBU1YFMEKUJuaVc
+zNbAK+JR+pRkBvSADC4LoqOZ8aDqVRRpSSCtVnidb6LnGeHJE+3PAuAg3IxRKrfv
+3V8itVpVb2tcxLEC2K4DBNFzTtmz7Dm/fb/eeFvuy5Zh8YaQ/qLWdGYUwvr/RpSL
+ZSXAjMtIerlXuUhS+GC8/irx1pxNBQHEGpUC33RVVPzD9jgCPOlu14nlnZ4QDfXc
+LcFlWGnj5yzk/viaAKLi38gcOHu4ZuhCfKdMTZPIg1iDrqZPkvxdaSftJ8w9JE9V
+qmQQO9ji0KWsq3GAAWA/VGgVNerZTuc74EEiZADav4jzK7clmOOvKN8eesR/rd+6
+Zm8CggEADw/+9MuRrnhJ3TbItH6M75pDgsyEw2dtYfLmQnx01lnm83mtm56txMRf
+YmOB/GhUNv3UGUDyld5Bm0rKNLFyy/d41+L1bG1Lr47ZFXkYlZSIZu0CnI25YY3F
+gON9H9YRjHxpJc92yD+7ksyx3PouwFfYy/i0PkC5a46IU8i8ATLkL2utgeuczkO5
+yLwzFOZPodCBny6Ur4p4IwQfI5/b6YHa9JNWCu0xmjlBekeUhwp7SRO8IhiVxGiL
+xXd13Vo/7pwoWF1oqNPh668ker922pybKe+v3GvY+NIwSdksLTzmgTEPsOoHFbDq
+uXiVfFt+/L5YANTAH2FQmaItMYcKAw==
 -----END PRIVATE KEY-----
diff --git a/tests/integration/test_tlsv1_3/test.py b/tests/integration/test_tlsv1_3/test.py
index 80c9c68eca7..e25216c67df 100644
--- a/tests/integration/test_tlsv1_3/test.py
+++ b/tests/integration/test_tlsv1_3/test.py
@@ -1,18 +1,20 @@
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.ssl_context import WrapSSLContextWithSNI
 import urllib.request, urllib.parse
 import ssl
 import os.path
 
+
+# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
+# The client has to verify server certificate against that name. Client uses SNI
+SSL_HOST = "integration-tests.clickhouse.com"
 HTTPS_PORT = 8443
-NODE_IP = "10.5.172.77"  # It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
-NODE_IP_WITH_HTTPS_PORT = NODE_IP + ":" + str(HTTPS_PORT)
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "node",
-    ipv4_address=NODE_IP,
     main_configs=[
         "configs/ssl_config.xml",
         "certs/server-key.pem",
@@ -35,7 +37,7 @@ def started_cluster():
 
 
 def get_ssl_context(cert_name):
-    context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    context = WrapSSLContextWithSNI(SSL_HOST, ssl.PROTOCOL_TLS_CLIENT)
     context.load_verify_locations(cafile=f"{SCRIPT_DIR}/certs/ca-cert.pem")
     if cert_name:
         context.load_cert_chain(
@@ -50,7 +52,9 @@ def get_ssl_context(cert_name):
 def execute_query_https(
     query, user, enable_ssl_auth=True, cert_name=None, password=None
 ):
-    url = f"https://{NODE_IP_WITH_HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    url = (
+        f"https://{instance.ip_address}:{HTTPS_PORT}/?query={urllib.parse.quote(query)}"
+    )
     request = urllib.request.Request(url)
     request.add_header("X-ClickHouse-User", user)
     if enable_ssl_auth:
diff --git a/tests/integration/test_user_ip_restrictions/test.py b/tests/integration/test_user_ip_restrictions/test.py
index e41febfa2f5..f38064e50d0 100644
--- a/tests/integration/test_user_ip_restrictions/test.py
+++ b/tests/integration/test_user_ip_restrictions/test.py
@@ -8,47 +8,56 @@ node_ipv4 = cluster.add_instance(
     "node_ipv4",
     main_configs=[],
     user_configs=["configs/users_ipv4.xml"],
-    ipv4_address="10.5.172.77",
+    ipv4_address="10.5.172.77",  # Never copy-paste this line
 )
 client_ipv4_ok = cluster.add_instance(
-    "client_ipv4_ok", main_configs=[], user_configs=[], ipv4_address="10.5.172.10"
+    "client_ipv4_ok",
+    main_configs=[],
+    user_configs=[],
+    ipv4_address="10.5.172.10",  # Never copy-paste this line
 )
 client_ipv4_ok_direct = cluster.add_instance(
-    "client_ipv4_ok_direct", main_configs=[], user_configs=[], ipv4_address="10.5.173.1"
+    "client_ipv4_ok_direct",
+    main_configs=[],
+    user_configs=[],
+    ipv4_address="10.5.173.1",  # Never copy-paste this line
 )
 client_ipv4_ok_full_mask = cluster.add_instance(
     "client_ipv4_ok_full_mask",
     main_configs=[],
     user_configs=[],
-    ipv4_address="10.5.175.77",
+    ipv4_address="10.5.175.77",  # Never copy-paste this line
 )
 client_ipv4_bad = cluster.add_instance(
-    "client_ipv4_bad", main_configs=[], user_configs=[], ipv4_address="10.5.173.10"
+    "client_ipv4_bad",
+    main_configs=[],
+    user_configs=[],
+    ipv4_address="10.5.173.10",  # Never copy-paste this line
 )
 
 node_ipv6 = cluster.add_instance(
     "node_ipv6",
     main_configs=["configs/config_ipv6.xml"],
     user_configs=["configs/users_ipv6.xml"],
-    ipv6_address="2001:3984:3989::1:1000",
+    ipv6_address="2001:3984:3989::1:1000",  # Never copy-paste this line
 )
 client_ipv6_ok = cluster.add_instance(
     "client_ipv6_ok",
     main_configs=[],
     user_configs=[],
-    ipv6_address="2001:3984:3989::5555",
+    ipv6_address="2001:3984:3989::5555",  # Never copy-paste this line
 )
 client_ipv6_ok_direct = cluster.add_instance(
     "client_ipv6_ok_direct",
     main_configs=[],
     user_configs=[],
-    ipv6_address="2001:3984:3989::1:1111",
+    ipv6_address="2001:3984:3989::1:1111",  # Never copy-paste this line
 )
 client_ipv6_bad = cluster.add_instance(
     "client_ipv6_bad",
     main_configs=[],
     user_configs=[],
-    ipv6_address="2001:3984:3989::1:1112",
+    ipv6_address="2001:3984:3989::1:1112",  # Never copy-paste this line
 )
 
 
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
index f82d3f4c348..60b29bd799a 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj
@@ -9,6 +9,7 @@
    [zookeeper :as zk])
   (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
 
+(def root-path "/counter")
 (defn r   [_ _] {:type :invoke, :f :read})
 (defn add [_ _] {:type :invoke, :f :add, :value (rand-int 5)})
 
@@ -20,17 +21,19 @@
             :conn (zk-connect node 9181 30000))
      :nodename node))
 
-  (setup! [this test])
+  (setup! [this test]
+    (exec-with-retries 30 (fn []
+      (zk-create-if-not-exists conn root-path ""))))
 
   (invoke! [this test op]
     (case (:f op)
       :read (exec-with-retries 30 (fn []
                                     (assoc op
                                            :type :ok
-                                           :value (count (zk-list conn "/")))))
+                                           :value (count (zk-list conn root-path)))))
       :add (try
              (do
-               (zk-multi-create-many-seq-nodes conn "/seq-" (:value op))
+               (zk-multi-create-many-seq-nodes conn (concat-path root-path "seq-") (:value op))
                (assoc op :type :ok))
              (catch Exception _ (assoc op :type :info, :error :connect-error)))))
 
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj
index 3aeaa328606..1c306a0ff04 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj
@@ -11,6 +11,7 @@
    [zookeeper :as zk])
   (:import (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
 
+(def root-path "/queue")
 (defn enqueue   [val _ _] {:type :invoke, :f :enqueue :value val})
 (defn dequeue [_ _] {:type :invoke, :f :dequeue})
 
@@ -22,18 +23,20 @@
             :conn (zk-connect node 9181 30000))
      :nodename node))
 
-  (setup! [this test])
+  (setup! [this test]
+    (exec-with-retries 30 (fn []
+      (zk-create-if-not-exists conn root-path ""))))
 
   (invoke! [this test op]
     (case (:f op)
       :enqueue (try
                  (do
-                   (zk-create-if-not-exists conn (str "/" (:value op)) "")
+                   (zk-create conn (concat-path root-path (:value op)) "")
                    (assoc op :type :ok))
                  (catch Exception _ (assoc op :type :info, :error :connect-error)))
       :dequeue
       (try
-        (let [result (zk-multi-delete-first-child conn "/")]
+        (let [result (zk-multi-delete-first-child conn root-path)]
           (if (not (nil? result))
             (assoc op :type :ok :value result)
             (assoc op :type :fail :value result)))
@@ -42,7 +45,7 @@
       ; drain via delete is to long, just list all nodes
       (exec-with-retries 30 (fn []
                               (zk-sync conn)
-                              (assoc op :type :ok :value (into #{} (map #(str %1) (zk-list conn "/"))))))))
+                              (assoc op :type :ok :value (into #{} (map #(str %1) (zk-list conn root-path))))))))
 
   (teardown! [_ test])
 
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
index f377d91f5fe..596458a8f3e 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
@@ -88,10 +88,14 @@
         new-set (conj current-set elem)]
     (zk-set conn path (pr-str new-set) (:version (:stat current-value)))))
 
-(defn zk-create-if-not-exists
+(defn zk-create
   [conn path data]
   (zk/create conn path :data (data/to-bytes (str data)) :persistent? true))
 
+(defn zk-create-if-not-exists
+  [conn path data]
+  (if-not (zk/exists conn path) (zk-create conn path data)))
+
 (defn zk-create-sequential
   [conn path-prefix data]
   (zk/create conn path-prefix :data (data/to-bytes (str data)) :persistent? true :sequential? true))
@@ -119,6 +123,10 @@
       (subs path 0 rslash_pos)
       "/")))
 
+(defn concat-path
+  [parent child]
+  (str parent (if (= parent "/") "" "/") child))
+
 (defn zk-multi-delete-first-child
   [conn path]
   (let [{children :children stat :stat} (zk-list-with-stat conn path)
@@ -128,7 +136,7 @@
       (try
         (do (.check txn path (:version stat))
             (.setData txn path (data/to-bytes "") -1) ; I'm just checking multitransactions
-            (.delete txn (str path first-child) -1)
+            (.delete txn (concat-path path first-child) -1)
             (.commit txn)
             first-child)
         (catch KeeperException$BadVersionException _ nil)
diff --git a/tests/performance/arrow_format.xml b/tests/performance/arrow_format.xml
new file mode 100644
index 00000000000..e501e38a18e
--- /dev/null
+++ b/tests/performance/arrow_format.xml
@@ -0,0 +1,10 @@
+<test>
+    <create_query>CREATE TABLE test (uint32 UInt32, n_uint32 Nullable(UInt32), lc LowCardinality(String)) ENGINE=File(Arrow) SETTINGS output_format_arrow_low_cardinality_as_dictionary=1</create_query>
+    <fill_query>insert into test select number, number, toString(number % 10000) from numbers(10000000)</fill_query>
+
+    <query>SELECT uint32 from test format Null</query>
+    <query>SELECT n_uint32 from test format Null</query>
+    <query>SELECT lc from test format Null</query>
+
+    <drop_query>DROP TABLE IF EXISTS test</drop_query>
+</test>
diff --git a/tests/performance/optimize_sorting_for_input_stream.xml b/tests/performance/optimize_sorting_for_input_stream.xml
new file mode 100644
index 00000000000..ca6d4d00d69
--- /dev/null
+++ b/tests/performance/optimize_sorting_for_input_stream.xml
@@ -0,0 +1,17 @@
+<test>
+    <!-- ORDER BY key is prefix of MergeTree sorting key -->
+    <query>SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID SETTINGS optimize_read_in_order=1 FORMAT Null</query>
+    <query>SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID SETTINGS optimize_read_in_order=0 FORMAT Null</query>
+
+    <!-- MergeTree sorting key is prefix of ORDER BY key -->
+    <query>SELECT CounterID, EventTime FROM hits_10m_single ORDER BY CounterID, EventTime SETTINGS optimize_read_in_order=1 format Null</query>
+    <query>SELECT CounterID, EventTime FROM hits_10m_single ORDER BY CounterID, EventTime SETTINGS optimize_read_in_order=0 format Null</query>
+
+    <!-- sorting step getting sort description from subquery -->
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single) ORDER BY CounterID SETTINGS optimize_read_in_order=1 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single) ORDER BY CounterID SETTINGS optimize_read_in_order=0 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID, EventDate) ORDER BY CounterID SETTINGS optimize_duplicate_order_by_and_distinct=1 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID, EventDate) ORDER BY CounterID SETTINGS optimize_duplicate_order_by_and_distinct=0 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID) ORDER BY CounterID, EventDate SETTINGS optimize_duplicate_order_by_and_distinct=1 FORMAT Null</query>
+    <query>SELECT * FROM (SELECT CounterID, EventDate FROM hits_10m_single ORDER BY CounterID) ORDER BY CounterID, EventDate SETTINGS optimize_duplicate_order_by_and_distinct=0 FORMAT Null</query>
+</test>
diff --git a/tests/performance/parallel_mv.xml b/tests/performance/parallel_mv.xml
index 0664602b848..5b856740a19 100644
--- a/tests/performance/parallel_mv.xml
+++ b/tests/performance/parallel_mv.xml
@@ -3,15 +3,21 @@
         <parallel_view_processing>1</parallel_view_processing>
     </settings>
 
-    <create_query>create table main_table (number UInt64) engine = MergeTree order by tuple();</create_query>
-    <create_query>create materialized view mv_1 engine = MergeTree order by tuple() as
-        select number, toString(number) from main_table where number % 13 != 0;</create_query>
-    <create_query>create materialized view mv_2 engine = MergeTree order by tuple() as
-        select number, toString(number) from main_table where number % 13 != 1;</create_query>
-    <create_query>create materialized view mv_3 engine = MergeTree order by tuple() as
-        select number, toString(number) from main_table where number % 13 != 3;</create_query>
-    <create_query>create materialized view mv_4 engine = MergeTree order by tuple() as
-        select number, toString(number) from main_table where number % 13 != 4;</create_query>
+    <create_query>create table main_table (number UInt64) engine = MergeTree order by tuple()</create_query>
+
+    <create_query>create table mt_1 (n UInt64, s String) engine = MergeTree order by tuple()</create_query>
+    <create_query>create table mt_2 (n UInt64, s String) engine = MergeTree order by tuple()</create_query>
+    <create_query>create table mt_3 (n UInt64, s String) engine = MergeTree order by tuple()</create_query>
+    <create_query>create table mt_4 (n UInt64, s String) engine = MergeTree order by tuple()</create_query>
+
+    <create_query>create materialized view mv_1 to mt_1 as
+        select number, toString(number) from main_table where number % 13 != 0</create_query>
+    <create_query>create materialized view mv_2 to mt_2 as
+        select number, toString(number) from main_table where number % 13 != 1</create_query>
+    <create_query>create materialized view mv_3 to mt_3 as
+        select number, toString(number) from main_table where number % 13 != 3</create_query>
+    <create_query>create materialized view mv_4 to mt_4 as
+        select number, toString(number) from main_table where number % 13 != 4</create_query>
 
     <fill_query>SYSTEM STOP MERGES main_table</fill_query>
     <fill_query>SYSTEM STOP MERGES mt_1</fill_query>
@@ -21,9 +27,15 @@
 
     <query>insert into main_table select number from numbers(10000000)</query>
 
-    <drop_query>drop table if exists main_table;</drop_query>
-    <drop_query>drop table if exists mv_1;</drop_query>
-    <drop_query>drop table if exists mv_2;</drop_query>
-    <drop_query>drop table if exists mv_3;</drop_query>
-    <drop_query>drop table if exists mv_4;</drop_query>
+    <drop_query>drop table if exists mv_1</drop_query>
+    <drop_query>drop table if exists mv_2</drop_query>
+    <drop_query>drop table if exists mv_3</drop_query>
+    <drop_query>drop table if exists mv_4</drop_query>
+
+    <drop_query>drop table if exists main_table</drop_query>
+
+    <drop_query>drop table if exists mt_1</drop_query>
+    <drop_query>drop table if exists mt_2</drop_query>
+    <drop_query>drop table if exists mt_3</drop_query>
+    <drop_query>drop table if exists mt_4</drop_query>
 </test>
diff --git a/tests/queries/0_stateless/00189_time_zones_long.reference b/tests/queries/0_stateless/00189_time_zones_long.reference
index e53ec7ca815..8717a662771 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.reference
+++ b/tests/queries/0_stateless/00189_time_zones_long.reference
@@ -137,7 +137,7 @@ toStartOfInterval
 2015-01-01
 2019-01-01
 2019-01-01
-2018-10-01
+2018-07-01
 2019-02-01
 2019-01-01
 2018-10-01
@@ -164,7 +164,7 @@ toStartOfInterval
 2015-01-01
 2019-01-01
 2019-01-01
-2018-10-01
+2018-07-01
 2019-02-01
 2019-01-01
 2018-10-01
diff --git a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
index 48336faf382..93fa1f440b1 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
@@ -1,5 +1,7 @@
 -- Tags: shard
 
+set enable_positional_arguments=0;
+
 select 40 as z from (select * from system.numbers limit 3) group by z;
 select 41 as z from remote('127.0.0.{2,3}', system.one) group by z;
 select count(), 42 AS z from remote('127.0.0.{2,3}', system.one) group by z;
diff --git a/tests/queries/0_stateless/00284_external_aggregation.reference b/tests/queries/0_stateless/00284_external_aggregation.reference
index 48e30e781e0..be0db217a97 100644
--- a/tests/queries/0_stateless/00284_external_aggregation.reference
+++ b/tests/queries/0_stateless/00284_external_aggregation.reference
@@ -1,2 +1,22 @@
 49999995000000	10000000
 499999500000	1000000	15
+100033	2
+100034	2
+100035	2
+100036	2
+100037	2
+100038	2
+100039	2
+10004	2
+100040	2
+100041	2
+100033	2
+100034	2
+100035	2
+100036	2
+100037	2
+100038	2
+100039	2
+10004	2
+100040	2
+100041	2
diff --git a/tests/queries/0_stateless/00284_external_aggregation.sql b/tests/queries/0_stateless/00284_external_aggregation.sql
index 057cb749521..a42dd91b6a5 100644
--- a/tests/queries/0_stateless/00284_external_aggregation.sql
+++ b/tests/queries/0_stateless/00284_external_aggregation.sql
@@ -7,3 +7,18 @@ SET group_by_two_level_threshold_bytes = 50000000;
 
 SELECT sum(k), sum(c) FROM (SELECT number AS k, count() AS c FROM (SELECT * FROM system.numbers LIMIT 10000000) GROUP BY k);
 SELECT sum(k), sum(c), max(u) FROM (SELECT number AS k, count() AS c, uniqArray(range(number % 16)) AS u FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k);
+
+SET group_by_two_level_threshold = 100000;
+SET max_bytes_before_external_group_by = '1Mi';
+
+-- method: key_string & key_string_two_level
+CREATE TABLE t_00284_str(s String) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO t_00284_str SELECT toString(number) FROM numbers_mt(1e6);
+INSERT INTO t_00284_str SELECT toString(number) FROM numbers_mt(1e6);
+SELECT s, count() FROM t_00284_str GROUP BY s ORDER BY s LIMIT 10 OFFSET 42;
+
+-- method: low_cardinality_key_string & low_cardinality_key_string_two_level
+CREATE TABLE t_00284_lc_str(s LowCardinality(String)) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO t_00284_lc_str SELECT toString(number) FROM numbers_mt(1e6);
+INSERT INTO t_00284_lc_str SELECT toString(number) FROM numbers_mt(1e6);
+SELECT s, count() FROM t_00284_lc_str GROUP BY s ORDER BY s LIMIT 10 OFFSET 42;
diff --git a/tests/queries/0_stateless/00413_distinct.reference b/tests/queries/0_stateless/00413_distinct.reference
index 577a73349f0..9bbda183b0a 100644
--- a/tests/queries/0_stateless/00413_distinct.reference
+++ b/tests/queries/0_stateless/00413_distinct.reference
@@ -1,8 +1,16 @@
+-- { echoOn }
+-- String field
+SELECT Name FROM (SELECT DISTINCT Name FROM distinct) ORDER BY Name;
 Bill
 John
 Mary
+-- Num field
+SELECT Num FROM (SELECT DISTINCT Num FROM distinct) ORDER BY Num;
 1
 3
 4
 5
 7
+-- all const columns
+SELECT DISTINCT 1 as a, 2 as b FROM distinct;
+1	2
diff --git a/tests/queries/0_stateless/00413_distinct.sql b/tests/queries/0_stateless/00413_distinct.sql
index 8c6cb6fead2..79577cb0bda 100644
--- a/tests/queries/0_stateless/00413_distinct.sql
+++ b/tests/queries/0_stateless/00413_distinct.sql
@@ -14,9 +14,13 @@ INSERT INTO distinct (Num, Name) VALUES (7, 'Bill');
 INSERT INTO distinct (Num, Name) VALUES (7, 'Mary');
 INSERT INTO distinct (Num, Name) VALUES (7, 'John');
 
+-- { echoOn }
 -- String field
 SELECT Name FROM (SELECT DISTINCT Name FROM distinct) ORDER BY Name;
 -- Num field
 SELECT Num FROM (SELECT DISTINCT Num FROM distinct) ORDER BY Num;
+-- all const columns
+SELECT DISTINCT 1 as a, 2 as b FROM distinct;
+-- { echoOff }
 
 DROP TABLE IF EXISTS distinct;
diff --git a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference
index 07c736f3bb0..c6db9cc1614 100644
--- a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference
+++ b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference
@@ -1,9 +1,9 @@
-< X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"10"}
-< X-ClickHouse-Progress: {"read_rows":"5","read_bytes":"40","written_rows":"0","written_bytes":"0","total_rows_to_read":"10"}
-< X-ClickHouse-Progress: {"read_rows":"10","read_bytes":"80","written_rows":"0","written_bytes":"0","total_rows_to_read":"10"}
+< X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"10","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"5","read_bytes":"40","written_rows":"0","written_bytes":"0","total_rows_to_read":"10","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"10","read_bytes":"80","written_rows":"0","written_bytes":"0","total_rows_to_read":"10","result_rows":"0","result_bytes":"0"}
 9
-< X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"10"}
-< X-ClickHouse-Progress: {"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"10"}
+< X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"10","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"10","result_rows":"0","result_bytes":"0"}
 0
 1
 2
@@ -24,4 +24,4 @@
 7
 8
 9
-< X-ClickHouse-Summary: {"read_rows":"10","read_bytes":"80","written_rows":"10","written_bytes":"40","total_rows_to_read":"0"}
+< X-ClickHouse-Summary: {"read_rows":"10","read_bytes":"80","written_rows":"10","written_bytes":"40","total_rows_to_read":"0","result_rows":"10","result_bytes":"40"}
diff --git a/tests/queries/0_stateless/00489_pk_subexpression.sql b/tests/queries/0_stateless/00489_pk_subexpression.sql
index 6f76a13609c..700581a9def 100644
--- a/tests/queries/0_stateless/00489_pk_subexpression.sql
+++ b/tests/queries/0_stateless/00489_pk_subexpression.sql
@@ -1,7 +1,20 @@
 DROP TABLE IF EXISTS pk;
 
 set allow_deprecated_syntax_for_merge_tree=1;
-CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree(d, (toStartOfMinute(x), y, z), 1);
+-- NOTE: here the timezone is pinned to UTC, to avoid issues with "partial
+-- timezones" (timezones that does not starts from 00:00), like
+-- Africa/Monrovia, for which toStartOfMinute(0) and toStartOfMinute(59) can
+-- give different values:
+--
+--     SELECT
+--         toDateTime(0, 'Africa/Monrovia') AS sec0,
+--         toDateTime(59, 'Africa/Monrovia') AS sec59
+--
+--     ┌────────────────sec0─┬───────────────sec59─┐
+--     │ 1969-12-31 23:15:30 │ 1969-12-31 23:16:29 │
+--     └─────────────────────┴─────────────────────┘
+--
+CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree(d, (toStartOfMinute(x, 'UTC'), y, z), 1);
 
 INSERT INTO pk (x, y, z) VALUES (1, 11, 1235), (2, 11, 4395), (3, 22, 3545), (4, 22, 6984), (5, 33, 4596), (61, 11, 4563), (62, 11, 4578), (63, 11, 3572), (64, 22, 5786), (65, 22, 5786), (66, 22, 2791), (67, 22, 2791), (121, 33, 2791), (122, 33, 2791), (123, 33, 1235), (124, 44, 4935), (125, 44, 4578), (126, 55, 5786), (127, 55, 2791), (128, 55, 1235);
 
diff --git a/tests/queries/0_stateless/00602_throw_if.reference b/tests/queries/0_stateless/00602_throw_if.reference
index ad5aaee89a8..de9ff2dd625 100644
--- a/tests/queries/0_stateless/00602_throw_if.reference
+++ b/tests/queries/0_stateless/00602_throw_if.reference
@@ -1,3 +1,13 @@
 1
 1
-1000000
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1000
diff --git a/tests/queries/0_stateless/00602_throw_if.sh b/tests/queries/0_stateless/00602_throw_if.sh
index 1e8850028c4..7d948fa6816 100755
--- a/tests/queries/0_stateless/00602_throw_if.sh
+++ b/tests/queries/0_stateless/00602_throw_if.sh
@@ -4,9 +4,43 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-default_exception_message="Value passed to 'throwIf' function is non zero"
-custom_exception_message="Number equals 1000000"
 
-${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000) FROM system.numbers" 2>&1 | grep -cF "$default_exception_message"
-${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -v '^(query: ' | grep -cF "$custom_exception_message"
-${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT sum(x = 0) FROM (SELECT throwIf(number = 1000000) AS x FROM numbers(1000000))" 2>&1
+default_exception_message="Value passed to 'throwIf' function is non-zero"
+custom_exception_message="Number equals 1000"
+
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000) FROM system.numbers" 2>&1 \
+    | grep -cF "$default_exception_message"
+
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000, '$custom_exception_message') FROM system.numbers" 2>&1 \
+    | grep -v '^(query: ' | grep -cF "$custom_exception_message"
+
+
+# Custom error code arguments are not enabled via configuration.
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000, '$custom_exception_message', 1) FROM system.numbers" 2>&1 \
+    | grep -v '^(query: ' | grep -c "Number of arguments for function throwIf doesn't match: passed 3, should be 1 or 2"
+
+# Custom error code argument enabled but using the wrong type.
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000, '$custom_exception_message', 1) FROM system.numbers SETTINGS allow_custom_error_code_in_throwif=true" 2>&1 \
+    | grep -v '^(query: ' | grep -c "Third argument of function throwIf must be Int8, Int16 or Int32 (passed: UInt8)"
+
+
+# Normal error code + some weird ones.
+# Internal error codes use the upper half of 32-bit int.
+custom_error_codes=(
+    "42"
+    "0"       # OK
+    "101"     # UNEXPECTED_PACKET_FROM_CLIENT (interpreted by client)
+    "102"     # UNEXPECTED_PACKET_FROM_SERVER (interpreted by client)
+    "1001"    # STD_EXCEPTION
+    "1002"    # UNKNOWN_EXCEPTION
+    "999999"  # Unused error code.
+    "-1")     # Also unused. Weird but we should allow throwing negative errors.
+
+for ec in "${custom_error_codes[@]}"
+do
+    ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000, '$custom_exception_message', toInt32($ec)) FROM system.numbers SETTINGS allow_custom_error_code_in_throwif=true" 2>&1 \
+        | grep -v '^(query: ' | grep -c "Code: $ec.*$custom_exception_message"
+done
+
+
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT sum(x = 0) FROM (SELECT throwIf(number = 1000) AS x FROM numbers(1000))" 2>&1
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.reference b/tests/queries/0_stateless/00700_decimal_arithm.reference
index a41ef5b0557..811946c87e0 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.reference
+++ b/tests/queries/0_stateless/00700_decimal_arithm.reference
@@ -35,3 +35,14 @@
 0	\N	\N
 0	\N	\N
 0	\N	\N
+-- { echoOn }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 0) SETTINGS decimal_check_overflow=1;
+1
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=0;
+-0.02084710076281539039012382229530463436
+SELECT toDecimal128(1, 37) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1;
+1
+SELECT toDecimal128(1, 19) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1;
+1
+SELECT toDecimal128(1, 20) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.sql b/tests/queries/0_stateless/00700_decimal_arithm.sql
index c305a850e5b..d24b593dac1 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.sql
+++ b/tests/queries/0_stateless/00700_decimal_arithm.sql
@@ -82,4 +82,14 @@ SELECT toDecimal32(0, 4) AS x, multiIf(x = 0, NULL, intDivOrZero(1, x)), multiIf
 SELECT toDecimal64(0, 8) AS x, multiIf(x = 0, NULL, intDivOrZero(1, x)), multiIf(x = 0, NULL, intDivOrZero(x, 0));
 SELECT toDecimal64(0, 18) AS x, multiIf(x = 0, NULL, intDivOrZero(1, x)), multiIf(x = 0, NULL, intDivOrZero(x, 0));
 
+-- { echoOn }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 0) SETTINGS decimal_check_overflow=1;
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
+SELECT toDecimal128(1, 38) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=0;
+SELECT toDecimal128(1, 37) / toDecimal128(1, 1) SETTINGS decimal_check_overflow=1;
+
+SELECT toDecimal128(1, 19) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1;
+SELECT toDecimal128(1, 20) / toDecimal128(1, 19) SETTINGS decimal_check_overflow=1; -- { serverError DECIMAL_OVERFLOW }
+-- { echoOff }
+
 DROP TABLE IF EXISTS decimal;
diff --git a/tests/queries/0_stateless/00705_aggregate_states_addition.sql b/tests/queries/0_stateless/00705_aggregate_states_addition.sql
index 661197d15ef..c5b11f9971d 100644
--- a/tests/queries/0_stateless/00705_aggregate_states_addition.sql
+++ b/tests/queries/0_stateless/00705_aggregate_states_addition.sql
@@ -10,11 +10,13 @@ SELECT sumMerge(x + y), sumMerge(x), sumMerge(y) FROM (SELECT sumState(a) as x,
 SELECT sumMerge(x) FROM (SELECT sumState(a) + countState(b) as x FROM add_aggregate); -- { serverError 421 }
 SELECT sumMerge(x) FROM (SELECT sumState(a) + sumState(toInt32(b)) as x FROM add_aggregate); -- { serverError 421 }
 
-SELECT minMerge(x) FROM (SELECT minState(a) + minState(b) as x FROM add_aggregate); 
+SELECT minMerge(x) FROM (SELECT minState(a) + minState(b) as x FROM add_aggregate);
 
 SELECT uniqMerge(x + y) FROM (SELECT uniqState(a) as x, uniqState(b) as y FROM add_aggregate);
 
 SELECT arraySort(groupArrayMerge(x + y)) FROM (SELECT groupArrayState(a) AS x, groupArrayState(b) as y FROM add_aggregate);
 SELECT arraySort(groupUniqArrayMerge(x + y)) FROM (SELECT groupUniqArrayState(a) AS x, groupUniqArrayState(b) as y FROM add_aggregate);
 
+SELECT uniqMerge(x + y) FROM (SELECT uniqState(65536, a) AS x, uniqState(b) AS y FROM add_aggregate); -- { serverError 421 }
+
 DROP TABLE IF EXISTS add_aggregate;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
index ba34cfad299..47e1d3fea0f 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
@@ -4,7 +4,20 @@ SET send_logs_level = 'fatal';
 SELECT '----00489----';
 DROP TABLE IF EXISTS pk;
 
-CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree() PARTITION BY d ORDER BY (toStartOfMinute(x), y, z) SETTINGS index_granularity_bytes=19, min_index_granularity_bytes=9, write_final_mark = 0; -- one row granule
+-- NOTE: here the timezone is pinned to UTC, to avoid issues with "partial
+-- timezones" (timezones that does not starts from 00:00), like
+-- Africa/Monrovia, for which toStartOfMinute(0) and toStartOfMinute(59) can
+-- give different values:
+--
+--     SELECT
+--         toDateTime(0, 'Africa/Monrovia') AS sec0,
+--         toDateTime(59, 'Africa/Monrovia') AS sec59
+--
+--     ┌────────────────sec0─┬───────────────sec59─┐
+--     │ 1969-12-31 23:15:30 │ 1969-12-31 23:16:29 │
+--     └─────────────────────┴─────────────────────┘
+--
+CREATE TABLE pk (d Date DEFAULT '2000-01-01', x DateTime, y UInt64, z UInt64) ENGINE = MergeTree() PARTITION BY d ORDER BY (toStartOfMinute(x, 'UTC'), y, z) SETTINGS index_granularity_bytes=19, min_index_granularity_bytes=9, write_final_mark = 0; -- one row granule
 
 INSERT INTO pk (x, y, z) VALUES (1, 11, 1235), (2, 11, 4395), (3, 22, 3545), (4, 22, 6984), (5, 33, 4596), (61, 11, 4563), (62, 11, 4578), (63, 11, 3572), (64, 22, 5786), (65, 22, 5786), (66, 22, 2791), (67, 22, 2791), (121, 33, 2791), (122, 33, 2791), (123, 33, 1235), (124, 44, 4935), (125, 44, 4578), (126, 55, 5786), (127, 55, 2791), (128, 55, 1235);
 
diff --git a/tests/queries/0_stateless/00955_complex_prepared_statements.reference b/tests/queries/0_stateless/00955_complex_prepared_statements.reference
index 701cc5f8781..257526768a0 100644
--- a/tests/queries/0_stateless/00955_complex_prepared_statements.reference
+++ b/tests/queries/0_stateless/00955_complex_prepared_statements.reference
@@ -4,3 +4,4 @@
 [[10],[10],[10]]
 [10,10,10]	[[10],[10],[10]]	(10,'Test')	(10,('dt',10))	2015-02-15
 Code: 457.
+Code: 457.
diff --git a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
deleted file mode 100755
index 0b6ac65e77c..00000000000
--- a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python3
-# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-#log=sys.stdout
-
-with client(name='client1>', log=log) as client1, client(name='client2>', log=log) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send('SET allow_experimental_live_view = 1')
-    client1.expect(prompt)
-    client2.send('SET allow_experimental_live_view = 1')
-    client2.expect(prompt)
-
-    client1.send('DROP TABLE IF EXISTS test.lv')
-    client1.expect(prompt)
-    client1.send('DROP TABLE IF EXISTS test.mt')
-    client1.expect(prompt)
-    client1.send('CREATE TABLE test.mt (a Int32) Engine=MergeTree order by tuple()')
-    client1.expect(prompt)
-    client1.send('CREATE LIVE VIEW test.lv WITH TIMEOUT 1 AS SELECT sum(a) FROM test.mt')
-    client1.expect(prompt)
-    client1.send('WATCH test.lv')
-    client1.expect('_version')
-    client1.expect(r'0.*1' + end_of_block)
-    client2.send('INSERT INTO test.mt VALUES (1),(2),(3)')
-    client2.expect(prompt)
-    client1.expect(r'6.*2' + end_of_block)
-    client2.send('INSERT INTO test.mt VALUES (4),(5),(6)')
-    client2.expect(prompt)
-    client1.expect(r'21.*3' + end_of_block)
-    # send Ctrl-C
-    client1.send('\x03', eol='')
-    match = client1.expect('(%s)|([#\$] )' % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)
-    client1.send('SELECT sleep(1)')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.lv')
-    client1.expect('Table test.lv doesn\'t exist')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.mt')
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
index 5ae423d90d1..5f48ead3147 100644
--- a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
+++ b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
@@ -1,4 +1,4 @@
 {"row":{"a":1}}
 {"row":{"a":2}}
 {"row":{"a":3}}
-{"progress":{"read_rows":"3","read_bytes":"36","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}
+{"progress":{"read_rows":"3","read_bytes":"36","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
diff --git a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
index 287a1ced92d..80ec35990d6 100644
--- a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
+++ b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
@@ -1,6 +1,6 @@
 {"row":{"sum(a)":"0","_version":"1"}}
-{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}
+{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
 {"row":{"sum(a)":"6","_version":"2"}}
-{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}
+{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
 {"row":{"sum(a)":"21","_version":"3"}}
-{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}
+{"progress":{"read_rows":"1","read_bytes":"16","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}
diff --git a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
index 8c5126bbaf3..febe439e63b 100755
--- a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
+++ b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
@@ -38,17 +38,17 @@ with client(name="client1>", log=log) as client1:
         log=log,
     ) as client2:
         client2.expect(
-            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}\n',
+            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}\n',
             escape=True,
         )
         client2.expect('{"row":{"version":"1"}', escape=True)
         client2.expect(
-            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}',
+            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}',
             escape=True,
         )
         # heartbeat is provided by progress message
         client2.expect(
-            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0"}}',
+            '{"progress":{"read_rows":"1","read_bytes":"8","written_rows":"0","written_bytes":"0","total_rows_to_read":"0","result_rows":"0","result_bytes":"0"}}',
             escape=True,
         )
 
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
deleted file mode 100755
index f545186d262..00000000000
--- a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
-
-import os
-import sys
-import signal
-
-CURDIR = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.join(CURDIR, 'helpers'))
-
-from client import client, prompt, end_of_block
-
-log = None
-# uncomment the line below for debugging
-#log=sys.stdout
-
-with client(name='client1>', log=log) as client1, client(name='client2>', log=log) as client2:
-    client1.expect(prompt)
-    client2.expect(prompt)
-
-    client1.send('SET allow_experimental_live_view = 1')
-    client1.expect(prompt)
-    client2.send('SET allow_experimental_live_view = 1')
-    client2.expect(prompt)
-
-    client1.send('DROP TABLE IF EXISTS test.lv')
-    client1.expect(prompt)
-    client1.send(' DROP TABLE IF EXISTS test.mt')
-    client1.expect(prompt)
-    client1.send('CREATE TABLE test.mt (a Int32, id Int32) Engine=Memory')
-    client1.expect(prompt)
-    client1.send('CREATE LIVE VIEW test.lv AS SELECT sum(a)/2 FROM (SELECT a, id FROM ( SELECT a, id FROM test.mt ORDER BY id DESC LIMIT 2 ) ORDER BY id DESC LIMIT 2)') 
-    client1.expect(prompt)
-    client1.send('WATCH test.lv')
-    client1.expect('_version')
-    client1.expect(r'0.*1' + end_of_block)
-    client2.send('INSERT INTO test.mt VALUES (1, 1),(2, 2),(3, 3)')
-    client1.expect(r'2\.5.*2' + end_of_block)
-    client2.expect(prompt)
-    client2.send('INSERT INTO test.mt VALUES (4, 4),(5, 5),(6, 6)')
-    client1.expect(r'5\.5.*3' + end_of_block)
-    client2.expect(prompt)
-    for v, i in enumerate(range(7,129)):
-       client2.send('INSERT INTO test.mt VALUES (%d, %d)' % (i, i))
-       client1.expect(r'%.1f.*%d' % (i-0.5, 4+v) + end_of_block)
-       client2.expect(prompt)
-    # send Ctrl-C
-    client1.send('\x03', eol='')
-    match = client1.expect('(%s)|([#\$] )' % prompt)
-    if match.groups()[1]:
-        client1.send(client1.command)
-        client1.expect(prompt)    
-    client1.send('DROP TABLE test.lv')
-    client1.expect(prompt)
-    client1.send('DROP TABLE test.mt')
-    client1.expect(prompt)
diff --git a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
deleted file mode 100755
index 92cc5b10e6b..00000000000
--- a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-. $CURDIR/../shell_config.sh
-
-python3 $CURDIR/00991_live_view_watch_event_live.python
diff --git a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
deleted file mode 100755
index abb1a94371d..00000000000
--- a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-. $CURDIR/../shell_config.sh
-
-python3 $CURDIR/00991_live_view_watch_http.python
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
deleted file mode 100755
index 97c6c92b999..00000000000
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-. $CURDIR/../shell_config.sh
-
-python3 $CURDIR/00991_temporary_live_view_watch_events_heartbeat.python
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
deleted file mode 100755
index 2e784223186..00000000000
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-. $CURDIR/../shell_config.sh
-
-python3 $CURDIR/00991_temporary_live_view_watch_live.python
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index d5d43d3c293..5ccef802c0c 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -58,7 +58,7 @@ function thread6()
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS alter_table_$REPLICA;
             CREATE TABLE alter_table_$REPLICA (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$REPLICA') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 0, cleanup_delay_period_random_add = 0;";
         sleep 0.$RANDOM;
-        done
+    done
 }
 
 
diff --git a/tests/queries/0_stateless/00995_exception_while_insert.sh b/tests/queries/0_stateless/00995_exception_while_insert.sh
index 28351078df3..e0cd264a2b7 100755
--- a/tests/queries/0_stateless/00995_exception_while_insert.sh
+++ b/tests/queries/0_stateless/00995_exception_while_insert.sh
@@ -10,6 +10,6 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS check;"
 
 $CLICKHOUSE_CLIENT --query="CREATE TABLE check (x UInt64, y UInt64 DEFAULT throwIf(x > 1500000)) ENGINE = Memory;"
 
-seq 1 2000000 | $CLICKHOUSE_CLIENT --query="INSERT INTO check(x) FORMAT TSV" 2>&1 | grep -q "Value passed to 'throwIf' function is non zero." && echo 'OK' || echo 'FAIL' ||:
+seq 1 2000000 | $CLICKHOUSE_CLIENT --query="INSERT INTO check(x) FORMAT TSV" 2>&1 | grep -q "Value passed to 'throwIf' function is non-zero." && echo 'OK' || echo 'FAIL' ||:
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE check;"
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index d62ff5618fc..53792bfb579 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -70,16 +70,16 @@ DateTime64(3, \'UTC\')	DateTime64(6, \'UTC\')	DateTime64(6, \'UTC\')
 1992-12-28 09:26:04.030	1971-07-29 06:20:38.230976	1980-03-26 15:49:55.428516
 2051-12-11 07:09:13.162	1982-01-12 00:25:45.754492	2010-05-17 07:01:28.452864
 Date32
-1934-01-06
-2039-08-16
-2103-11-03
-2064-08-14
-2187-08-21
-2099-04-08
-1947-06-22
-2012-01-19
-2170-07-09
-2263-01-17
+2120-04-24
+1908-10-02
+2105-09-04
+2129-03-23
+1921-04-05
+2020-04-14
+2251-12-25
+2266-03-27
+2161-02-18
+2172-07-24
 -
 Float32	Float64
 -1.3551149e32	1.2262973812461839e235
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
index 8984d35930a..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
@@ -1,7 +0,0 @@
-Instruction check fail. The CPU does not support SSSE3 instruction set.
-Instruction check fail. The CPU does not support SSE4.1 instruction set.
-Instruction check fail. The CPU does not support SSE4.2 instruction set.
-Instruction check fail. The CPU does not support POPCNT instruction set.
-<jemalloc>: MADV_DONTNEED does not work (memset will be used instead)
-<jemalloc>: (This is the expected behaviour if you are running under QEMU)
-1
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
index 9b6e1e05f2d..9fb239e87b2 100755
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
@@ -2,6 +2,18 @@
 # Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-fasttest, no-cpu-aarch64
 # Tag no-fasttest: avoid dependency on qemu -- invonvenient when running locally
 
+# More than a decade after AVX was released, AVX is still not supported by QEMU, even if "-cpu help" pretends to. As a result, we cannot use
+# QEMU to verify that a ClickHouse binary compiled for a SIMD level up to AVX runs on a system with a SIMD level up to AVX. The alternative
+# is to disassemble the binary and grep for unwanted instructions (e.g. AVX512) which is just too fragile ...
+#
+# https://gitlab.com/qemu-project/qemu/-/issues/164
+# https://www.mail-archive.com/qemu-devel@nongnu.org/msg713932.html
+# https://lore.kernel.org/all/CAObpvQmejWBh+RNz2vhk16-kcY_QveM_pSmM5ZeWqWv1d8AJzQ@mail.gmail.com/T/
+
+exit 0
+
+# keeping the original test because it is instructive and maybe QEMU will be fixed at some point ...
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.reference b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
new file mode 100755
index 00000000000..addf503e44a
--- /dev/null
+++ b/tests/queries/0_stateless/01111_create_drop_replicated_db_stress.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+# Tags: race, zookeeper, no-backward-compatibility-check
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+function create_db()
+{
+    while true; do
+        SHARD=$(($RANDOM % 2))
+        REPLICA=$(($RANDOM % 2))
+        SUFFIX=$(($RANDOM % 16))
+        # Multiple database replicas on one server are actually not supported (until we have namespaces).
+        # So CREATE TABLE queries will fail on all replicas except one. But it's still makes sense for a stress test.
+        $CLICKHOUSE_CLIENT --allow_experimental_database_replicated=1 --query \
+        "create database if not exists ${CLICKHOUSE_DATABASE}_repl_$SUFFIX engine=Replicated('/test/01111/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '$SHARD', '$REPLICA')" \
+         2>&1| grep -Fa "Exception: " | grep -Fv "REPLICA_IS_ALREADY_EXIST" | grep -Fiv "Will not try to start it up" | \
+         grep -Fv "Coordination::Exception" | grep -Fv "already contains some data and it does not look like Replicated database path"
+        sleep 0.$RANDOM
+    done
+}
+
+function drop_db()
+{
+    while true; do
+        database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [[ "$database" == "$CLICKHOUSE_DATABASE" ]]; then return; fi
+        if [ -z "$database" ]; then return; fi
+        $CLICKHOUSE_CLIENT -n --query \
+        "drop database if exists $database" 2>&1| grep -Fa "Exception: "
+        sleep 0.$RANDOM
+    done
+}
+
+function sync_db()
+{
+    while true; do
+        database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$database" ]; then return; fi
+        $CLICKHOUSE_CLIENT --receive_timeout=1 -q \
+        "system sync database replica $database" 2>&1| grep -Fa "Exception: " | grep -Fv TIMEOUT_EXCEEDED | grep -Fv "only with Replicated engine" | grep -Fv UNKNOWN_DATABASE
+        sleep 0.$RANDOM
+    done
+}
+
+function create_table()
+{
+    while true; do
+        database=$($CLICKHOUSE_CLIENT -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$database" ]; then return; fi
+        $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=0 -q \
+        "create table $database.rmt_$RANDOM (n int) engine=ReplicatedMergeTree order by tuple() -- suppress $CLICKHOUSE_TEST_ZOOKEEPER_PREFIX" \
+        2>&1| grep -Fa "Exception: " | grep -Fv "Macro 'uuid' and empty arguments" | grep -Fv "Cannot enqueue query" | grep -Fv "ZooKeeper session expired" | grep -Fv UNKNOWN_DATABASE
+        sleep 0.$RANDOM
+    done
+}
+
+function alter_table()
+{
+    while true; do
+        table=$($CLICKHOUSE_CLIENT -q "select database || '.' || name from system.tables where database like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$table" ]; then return; fi
+        $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=0 -q \
+        "alter table $table on cluster $database update n = n + (select max(n) from merge(REGEXP('${CLICKHOUSE_DATABASE}.*'), '.*')) where 1 settings allow_nondeterministic_mutations=1" \
+        2>&1| grep -Fa "Exception: " | grep -Fv "Cannot enqueue query" | grep -Fv "ZooKeeper session expired" | grep -Fv UNKNOWN_DATABASE | grep -Fv UNKNOWN_TABLE | grep -Fv TABLE_IS_READ_ONLY
+        sleep 0.$RANDOM
+    done
+}
+
+function insert()
+{
+    while true; do
+        table=$($CLICKHOUSE_CLIENT -q "select database || '.' || name from system.tables where database like '${CLICKHOUSE_DATABASE}%' order by rand() limit 1")
+        if [ -z "$table" ]; then return; fi
+        $CLICKHOUSE_CLIENT -q \
+        "insert into $table values ($RANDOM)" 2>&1| grep -Fa "Exception: " | grep -Fv UNKNOWN_DATABASE | grep -Fv UNKNOWN_TABLE | grep -Fv TABLE_IS_READ_ONLY
+    done
+}
+
+
+
+export -f create_db
+export -f drop_db
+export -f sync_db
+export -f create_table
+export -f alter_table
+export -f insert
+
+TIMEOUT=30
+
+timeout $TIMEOUT bash -c create_db &
+timeout $TIMEOUT bash -c sync_db &
+timeout $TIMEOUT bash -c create_table &
+timeout $TIMEOUT bash -c alter_table &
+timeout $TIMEOUT bash -c insert &
+
+sleep 1 # give other queries a head start
+timeout $TIMEOUT bash -c drop_db &
+
+wait
+
+readarray -t databases_arr < <(${CLICKHOUSE_CLIENT} -q "select name from system.databases where name like '${CLICKHOUSE_DATABASE}_%'")
+for db in "${databases_arr[@]}"
+do
+    $CLICKHOUSE_CLIENT -q "drop database if exists $db"
+done
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index 326f0c5e14b..612c3333160 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -16,12 +16,6 @@ flat: any left
 2	2	2	2
 3	3	3	3
 4	0		0
-flat: any left + any_join_distinct_right_table_keys
-0	0	0	0
-1	1	1	1
-2	2	2	2
-3	3	3	3
-4	0		0
 flat: semi left
 0	0	0	0
 1	1	1	1
@@ -37,11 +31,6 @@ flat: inner on
 1	1	1	1	1
 2	2	2	2	2
 3	3	3	3	3
-flat: inner or
-0	0	0	0	0
-1000	1	1	1	1
-2	2	2	2	2
-3000	3	3	3	3
 hashed: left on
 0	0	0	0	0
 1	1	1	1	1
@@ -75,6 +64,17 @@ hashed: inner on
 1	1	1	1	1
 2	2	2	2	2
 3	3	3	3	3
+flat: inner or
+0	0	0	0	0
+1000	1	1	1	1
+2	2	2	2	2
+3000	3	3	3	3
+flat: any left + any_join_distinct_right_table_keys
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
 complex_cache (smoke)
 0	\N	\N	\N	\N
 1	\N	\N	\N	\N
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index 5fbfe283fea..cde1385eaae 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -1,4 +1,4 @@
-SET send_logs_level = 'fatal';
+DROP TABLE IF EXISTS t1;
 
 DROP DICTIONARY IF EXISTS dict_flat;
 DROP DICTIONARY IF EXISTS dict_hashed;
@@ -27,14 +27,15 @@ LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 1));
 
 SET join_use_nulls = 0;
 
+SET join_algorithm = 'direct';
+
 SELECT 'flat: left on';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d ON s1.key = d.key ORDER BY s1.key;
 SELECT 'flat: left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: any left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
-SELECT 'flat: any left + any_join_distinct_right_table_keys'; -- falls back to regular join
-SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
+
 SELECT 'flat: semi left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 SEMI JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: anti left';
@@ -43,8 +44,6 @@ SELECT 'flat: inner';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 JOIN dict_flat d USING(key);
 SELECT 'flat: inner on';
 SELECT * FROM (SELECT number AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key ORDER BY k;
-SELECT 'flat: inner or'; -- it's not a join over dictionary, because it doen't suppoert multiple keys, but of falls back to regular join
-SELECT * FROM (SELECT if(number % 2 = 0, number, number * 1000) AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key OR k == 1000 * key ORDER BY key;
 
 SET join_use_nulls = 1;
 
@@ -63,6 +62,20 @@ SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 JOIN dict_hashed d USING
 SELECT 'hashed: inner on';
 SELECT * FROM (SELECT number AS k FROM numbers(100)) s1 JOIN dict_hashed d ON k = key ORDER BY k;
 
+SET join_use_nulls = 0;
+
+-- unsupported cases for dictionary join, falls back to regular join
+
+SET join_algorithm = 'default';
+
+SELECT 'flat: inner or';
+SELECT * FROM (SELECT if(number % 2 = 0, number, number * 1000) AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key OR k == 1000 * key ORDER BY key;
+
+SELECT 'flat: any left + any_join_distinct_right_table_keys';
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
+
+SET join_use_nulls = 1;
+
 SELECT 'complex_cache (smoke)';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_complex_cache d ON s1.key = d.key ORDER BY s1.key;
 
diff --git a/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
index 001e758284f..a53b60a5ad3 100644
--- a/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
+++ b/tests/queries/0_stateless/01119_optimize_trivial_insert_select.sql
@@ -1,6 +1,7 @@
 drop table if exists t;
 create table t(n int, a Int64, s String) engine = MergeTree() order by a;
 
+set enable_positional_arguments=0;
 set optimize_trivial_insert_select=1;
 
 -- due to aggregate functions, optimize_trivial_insert_select will not be applied
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
index 60b2c34be07..5d013400539 100644
--- a/tests/queries/0_stateless/01152_cross_replication.sql
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -8,6 +8,8 @@ DROP TABLE IF EXISTS demo_loan_01568_dist;
 CREATE DATABASE shard_0;
 CREATE DATABASE shard_1;
 
+CREATE TABLE demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat); -- { serverError 48 }
+SET distributed_ddl_entry_format_version = 2;
 CREATE TABLE demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat); -- { serverError 371 }
 SET distributed_ddl_output_mode='throw';
 CREATE TABLE shard_0.demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat);
diff --git a/tests/queries/0_stateless/01154_move_partition_long.sh b/tests/queries/0_stateless/01154_move_partition_long.sh
index 7cefac28e22..a8f12d6afbd 100755
--- a/tests/queries/0_stateless/01154_move_partition_long.sh
+++ b/tests/queries/0_stateless/01154_move_partition_long.sh
@@ -9,6 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./replication.lib
 . "$CURDIR"/replication.lib
 
+
 declare -A engines
 engines[0]="MergeTree"
 engines[1]="ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}/src', '{replica}_' || toString(randConstant()))"
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.reference b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
index 44451d82783..ee2b465b3d3 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.reference
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
@@ -38,3 +38,5 @@ Response	0	Error	/test/01158/default/rmt/blocks/all_6308706741995381342_24957917
 Response	0	Error	/test/01158/default/rmt/temp/abandonable_lock-	1	1	\N	0	3	ZRUNTIMEINCONSISTENCY	\N	\N		0	0	0	0
 Request	0	Get	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	0	\N	\N	\N		0	0	0	0
 Response	0	Get	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	0	ZOK	\N	\N		0	0	9	0
+duration_ms
+1
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.sql b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
index 61a36df68d8..501ab805a5a 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.sql
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
@@ -13,7 +13,7 @@ system flush logs;
 select 'log';
 select address, type, has_watch, op_num, path, is_ephemeral, is_sequential, version, requests_size, request_idx, error, watch_type,
        watch_state, path_created, stat_version, stat_cversion, stat_dataLength, stat_numChildren
-from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt/log%' and op_num not in (3, 4, 12)
+from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt/log%' and op_num not in (3, 4, 12, 500)
 order by xid, type, request_idx;
 
 select 'parts';
@@ -27,7 +27,11 @@ select 'blocks';
 select type, has_watch, op_num, path, is_ephemeral, is_sequential, version, requests_size, request_idx, error, watch_type,
        watch_state, path_created, stat_version, stat_cversion, stat_dataLength, stat_numChildren
 from system.zookeeper_log
-where (session_id, xid) in (select session_id, xid from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt/blocks%' and op_num not in (1, 12))
+where (session_id, xid) in (select session_id, xid from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt/blocks%' and op_num not in (1, 12, 500))
 order by xid, type, request_idx;
 
 drop table rmt;
+
+system flush logs;
+select 'duration_ms';
+select count()>0 from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt%' and duration_ms > 0;
diff --git a/tests/queries/0_stateless/01161_information_schema.sql b/tests/queries/0_stateless/01161_information_schema.sql
index b6b10efb001..ed77ef1c1c2 100644
--- a/tests/queries/0_stateless/01161_information_schema.sql
+++ b/tests/queries/0_stateless/01161_information_schema.sql
@@ -6,6 +6,7 @@ create view v (n Nullable(Int32), f Float64) as select n, f from t;
 create materialized view mv engine=Null as select * from system.one;
 create temporary table tmp (d Date, dt DateTime, dtms DateTime64(3));
 
+
 -- FIXME #28687
 select * from information_schema.schemata where schema_name ilike 'information_schema';
 -- SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
diff --git a/tests/queries/0_stateless/01172_transaction_counters.sql b/tests/queries/0_stateless/01172_transaction_counters.sql
index cc6212ae4c1..ee00029501a 100644
--- a/tests/queries/0_stateless/01172_transaction_counters.sql
+++ b/tests/queries/0_stateless/01172_transaction_counters.sql
@@ -1,5 +1,6 @@
 -- Tags: no-s3-storage, no-ordinary-database
 -- FIXME this test fails with S3 due to a bug in DiskCacheWrapper
+
 drop table if exists txn_counters;
 
 create table txn_counters (n Int64, creation_tid DEFAULT transactionID()) engine=MergeTree order by n;
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
index bedf9e9a091..4397810b68d 100644
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -27,19 +27,19 @@ localhost	9000	57	Code: 57. Error: Table default.never_throw already exists. (TA
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
 distributed_ddl_queue
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
-2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` Int32) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	1	1
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
 2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index e632841bd01..c18514d0ecc 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -38,7 +38,6 @@ LOG_COMMENT="${CLICKHOUSE_LOG_COMMENT}_$RAND_COMMENT"
 
 CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment ${CLICKHOUSE_LOG_COMMENT}/--log_comment ${LOG_COMMENT}}
 CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 "
-CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --distributed_ddl_entry_format_version=2 "
 
 CLIENT=${CLICKHOUSE_CLIENT_WITH_SETTINGS}
 CLIENT+=" --distributed_ddl_task_timeout=$TIMEOUT "
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index a41398a7514..49f4d8245a2 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -94,6 +94,7 @@ SYSTEM DROP UNCOMPRESSED CACHE	['SYSTEM DROP UNCOMPRESSED','DROP UNCOMPRESSED CA
 SYSTEM DROP MMAP CACHE	['SYSTEM DROP MMAP','DROP MMAP CACHE','DROP MMAP']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP COMPILED EXPRESSION CACHE	['SYSTEM DROP COMPILED EXPRESSION','DROP COMPILED EXPRESSION CACHE','DROP COMPILED EXPRESSIONS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP FILESYSTEM CACHE	['SYSTEM DROP FILESYSTEM CACHE','DROP FILESYSTEM CACHE']	GLOBAL	SYSTEM DROP CACHE
+SYSTEM DROP SCHEMA CACHE	['SYSTEM DROP SCHEMA CACHE','DROP SCHEMA CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP CACHE	['DROP CACHE']	\N	SYSTEM
 SYSTEM RELOAD CONFIG	['RELOAD CONFIG']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD SYMBOLS	['RELOAD SYMBOLS']	GLOBAL	SYSTEM RELOAD
diff --git a/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference b/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference
index a9ffd259af0..28006c1d168 100644
--- a/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference
+++ b/tests/queries/0_stateless/01277_fromUnixTimestamp64.reference
@@ -4,6 +4,6 @@ Asia/Makassar	1234567891011	2009-02-14 07:31:31.011	1970-01-15 14:56:07.891011	1
 non-const column
 1234567891011	2009-02-13 23:31:31.011	1970-01-15 06:56:07.891011	1970-01-01 00:20:34.567891011
 upper range bound
-9904447342	2283-11-10 19:22:22.123	2283-11-10 19:22:22.123456	1925-01-01 00:00:00.413905173
+10413688942	2299-12-30 19:22:22.123	2299-12-30 19:22:22.123456	1900-01-01 00:00:00.413905173
 lower range bound
--1420066799	1925-01-01 01:00:00.877	1925-01-01 01:00:00.876544	1925-01-01 01:00:00.876543211
+-2208985199	1900-01-01 01:00:00.877	1900-01-01 01:00:00.876544	1900-01-01 01:00:00.876543211
diff --git a/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql b/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql
index e76a4db7a27..846ffa094a5 100644
--- a/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql
+++ b/tests/queries/0_stateless/01277_fromUnixTimestamp64.sql
@@ -46,10 +46,10 @@ SELECT
 
 SELECT 'upper range bound';
 WITH
-    9904447342 AS timestamp,
-    CAST(9904447342123 AS Int64) AS milli,
-    CAST(9904447342123456 AS Int64) AS micro,
-    CAST(9904447342123456789 AS Int64) AS nano,
+    10413688942 AS timestamp,
+    CAST(10413688942123 AS Int64) AS milli,
+    CAST(10413688942123456 AS Int64) AS micro,
+    CAST(10413688942123456789 AS Int64) AS nano,
     'UTC' AS tz
 SELECT
     timestamp,
@@ -59,13 +59,13 @@ SELECT
 
 SELECT 'lower range bound';
 WITH
-    -1420066799 AS timestamp,
-    CAST(-1420066799123 AS Int64) AS milli,
-    CAST(-1420066799123456 AS Int64) AS micro,
-    CAST(-1420066799123456789 AS Int64) AS nano,
+    -2208985199 AS timestamp,
+    CAST(-2208985199123 AS Int64) AS milli,
+    CAST(-2208985199123456 AS Int64) AS micro,
+    CAST(-2208985199123456789 AS Int64) AS nano,
     'UTC' AS tz
 SELECT
     timestamp,
     fromUnixTimestamp64Milli(milli, tz),
     fromUnixTimestamp64Micro(micro, tz),
-    fromUnixTimestamp64Nano(nano, tz);
\ No newline at end of file
+    fromUnixTimestamp64Nano(nano, tz);
diff --git a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference
index 620777635fc..ac3ce287de5 100644
--- a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference
+++ b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference
@@ -1,2 +1,2 @@
 Hello, world
-1
+2
diff --git a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference
index ac3ce287de5..0c0ff9c8e3b 100644
--- a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference
+++ b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference
@@ -1,2 +1,2 @@
 Hello, world
-2
+4
diff --git a/tests/queries/0_stateless/01414_optimize_any_bug.sql b/tests/queries/0_stateless/01414_optimize_any_bug.sql
index 6f6f291c504..ec24a09fc11 100644
--- a/tests/queries/0_stateless/01414_optimize_any_bug.sql
+++ b/tests/queries/0_stateless/01414_optimize_any_bug.sql
@@ -8,6 +8,7 @@ CREATE TABLE test
 ENGINE = MergeTree()
 ORDER BY tuple();
 
+SET enable_positional_arguments=0;
 SET optimize_move_functions_out_of_any = 1;
 
 SELECT any(arrayFilter((c, d) -> (4 = d), `Source.C1`, `Source.C2`)[1]) AS x
diff --git a/tests/queries/0_stateless/01691_DateTime64_clamp.reference b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
index 6272103440c..75435aebd67 100644
--- a/tests/queries/0_stateless/01691_DateTime64_clamp.reference
+++ b/tests/queries/0_stateless/01691_DateTime64_clamp.reference
@@ -18,10 +18,10 @@ SELECT toDateTime64(toFloat32(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul')
 SELECT toDateTime64(toFloat64(bitShiftLeft(toUInt64(1),33)), 2, 'Asia/Istanbul') FORMAT Null;
 -- These are outsize of extended range and hence clamped
 SELECT toDateTime64(-1 * bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
-1925-01-01 02:00:00.00
+1900-01-01 01:56:56.00
 SELECT CAST(-1 * bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
-1925-01-01 02:00:00.000
+1900-01-01 01:56:56.000
 SELECT CAST(bitShiftLeft(toUInt64(1), 35) AS DateTime64(3, 'Asia/Istanbul'));
-2282-12-31 03:00:00.000
+2299-12-31 23:59:59.000
 SELECT toDateTime64(bitShiftLeft(toUInt64(1), 35), 2, 'Asia/Istanbul');
-2282-12-31 03:00:00.00
+2299-12-31 23:59:59.00
diff --git a/tests/queries/0_stateless/01699_timezoneOffset.reference b/tests/queries/0_stateless/01699_timezoneOffset.reference
index a1cc6391e6f..0719d529bdc 100644
--- a/tests/queries/0_stateless/01699_timezoneOffset.reference
+++ b/tests/queries/0_stateless/01699_timezoneOffset.reference
@@ -115,6 +115,7 @@ Moscow DST Years with perment DST from 2011-2014:
 2014-01-01 00:00:00	2014-10-26 00:00:00	299	2014_14400
 2014-10-27 00:00:00	2014-12-31 00:00:00	66	2014_10800
 Tehran DST Years:
+7	1977-06-01 00:00:00	16200
 8	1978-06-01 00:00:00	18000
 9	1979-06-01 00:00:00	16200
 10	1980-06-01 00:00:00	16200
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
index dcee18b33e0..e491dd9e091 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
@@ -12,5 +12,3 @@ blocks
 failed_parts
 last_part
 parallel
-shared
-shared
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
index f27bf42c7a5..ecea0a9f69f 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
@@ -1,4 +1,4 @@
 1940-10-09 21:13:17.6
-2283-11-11 23:46:43.6
-2283-11-11 23:46:40.1
-1925-01-01 00:00:00.9
+2284-06-04 23:46:43.6
+2299-12-31 23:40:00.1
+1900-01-01 00:00:00.9
diff --git a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
index b0dbd1dfc84..e84bb35b3a5 100644
--- a/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
+++ b/tests/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
@@ -1,4 +1,4 @@
 SELECT toString(toDateTime('-922337203.6854775808', 1, 'Asia/Istanbul'));
 SELECT toString(toDateTime('9922337203.6854775808', 1, 'Asia/Istanbul'));
-SELECT toDateTime64(CAST('10000000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
-SELECT toDateTime64(CAST('-10000000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
+SELECT toDateTime64(CAST('10500000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
+SELECT toDateTime64(CAST('-10500000000.1' AS Decimal64(1)), 1, 'Asia/Istanbul');
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection_constant_query.sql b/tests/queries/0_stateless/01710_minmax_count_projection_constant_query.sql
index 3b8356080b4..895cd957f0a 100644
--- a/tests/queries/0_stateless/01710_minmax_count_projection_constant_query.sql
+++ b/tests/queries/0_stateless/01710_minmax_count_projection_constant_query.sql
@@ -1,5 +1,3 @@
--- Tags: no-s3-storage
-
 drop table if exists t;
 create table t (n int) engine MergeTree order by n;
 insert into t values (1);
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection_distributed_query.reference b/tests/queries/0_stateless/01710_minmax_count_projection_distributed_query.reference
new file mode 100644
index 00000000000..5782593a455
--- /dev/null
+++ b/tests/queries/0_stateless/01710_minmax_count_projection_distributed_query.reference
@@ -0,0 +1 @@
+2	2	2
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection_distributed_query.sql b/tests/queries/0_stateless/01710_minmax_count_projection_distributed_query.sql
new file mode 100644
index 00000000000..723c820908f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_minmax_count_projection_distributed_query.sql
@@ -0,0 +1,5 @@
+drop table if exists t;
+create table t (n int, s String) engine MergeTree order by n;
+insert into t values (1, 'a');
+select count(), count(n), count(s) from cluster('test_cluster_two_shards', currentDatabase(), t);
+drop table t;
diff --git a/tests/queries/0_stateless/01710_order_by_projections_complete.reference b/tests/queries/0_stateless/01710_order_by_projections_complete.reference
new file mode 100644
index 00000000000..a51d1ce1f3b
--- /dev/null
+++ b/tests/queries/0_stateless/01710_order_by_projections_complete.reference
@@ -0,0 +1,13 @@
+-- { echoOn }
+select t from data_order_by_proj_comp where t > 0 order by t settings optimize_read_in_order=1;
+5
+5
+6
+select t from data_order_by_proj_comp where t > 0 order by t settings optimize_read_in_order=0;
+5
+5
+6
+select t from data_order_by_proj_comp where t > 0 order by t settings max_threads=1;
+5
+5
+6
diff --git a/tests/queries/0_stateless/01710_order_by_projections_complete.sql b/tests/queries/0_stateless/01710_order_by_projections_complete.sql
new file mode 100644
index 00000000000..86a553569a2
--- /dev/null
+++ b/tests/queries/0_stateless/01710_order_by_projections_complete.sql
@@ -0,0 +1,14 @@
+drop table if exists  data_order_by_proj_comp;
+create table data_order_by_proj_comp (t UInt64, projection tSort (select * order by t)) ENGINE MergeTree() order by t;
+
+system stop merges data_order_by_proj_comp;
+
+insert into data_order_by_proj_comp values (5);
+insert into data_order_by_proj_comp values (5);
+insert into data_order_by_proj_comp values (6);
+
+-- { echoOn }
+select t from data_order_by_proj_comp where t > 0 order by t settings optimize_read_in_order=1;
+select t from data_order_by_proj_comp where t > 0 order by t settings optimize_read_in_order=0;
+select t from data_order_by_proj_comp where t > 0 order by t settings max_threads=1;
+-- { echoOff }
diff --git a/tests/queries/0_stateless/01710_order_by_projections_incomplete.reference b/tests/queries/0_stateless/01710_order_by_projections_incomplete.reference
new file mode 100644
index 00000000000..4a90aad2d6f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_order_by_projections_incomplete.reference
@@ -0,0 +1,13 @@
+-- { echoOn }
+select t from data_order_by_proj_incomp where t > 0 order by t settings optimize_read_in_order=1;
+5
+5
+6
+select t from data_order_by_proj_incomp where t > 0 order by t settings optimize_read_in_order=0;
+5
+5
+6
+select t from data_order_by_proj_incomp where t > 0 order by t settings max_threads=1;
+5
+5
+6
diff --git a/tests/queries/0_stateless/01710_order_by_projections_incomplete.sql b/tests/queries/0_stateless/01710_order_by_projections_incomplete.sql
new file mode 100644
index 00000000000..17ae7128694
--- /dev/null
+++ b/tests/queries/0_stateless/01710_order_by_projections_incomplete.sql
@@ -0,0 +1,16 @@
+drop table if exists  data_order_by_proj_incomp;
+create table data_order_by_proj_incomp (t UInt64) ENGINE MergeTree() order by t;
+
+system stop merges data_order_by_proj_incomp;
+
+insert into data_order_by_proj_incomp values (5);
+insert into data_order_by_proj_incomp values (5);
+
+alter table data_order_by_proj_incomp add projection tSort (select * order by t);
+insert into data_order_by_proj_incomp values (6);
+
+-- { echoOn }
+select t from data_order_by_proj_incomp where t > 0 order by t settings optimize_read_in_order=1;
+select t from data_order_by_proj_incomp where t > 0 order by t settings optimize_read_in_order=0;
+select t from data_order_by_proj_incomp where t > 0 order by t settings max_threads=1;
+-- { echoOff }
diff --git a/tests/queries/0_stateless/01710_projection_additional_filters.reference b/tests/queries/0_stateless/01710_projection_additional_filters.reference
new file mode 100644
index 00000000000..06b63ea6c2f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_additional_filters.reference
@@ -0,0 +1 @@
+0	0	0
diff --git a/tests/queries/0_stateless/01710_projection_additional_filters.sql b/tests/queries/0_stateless/01710_projection_additional_filters.sql
new file mode 100644
index 00000000000..1633b48ba7e
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_additional_filters.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS t;
+
+CREATE TABLE t(a UInt32, b UInt32) ENGINE = MergeTree PARTITION BY a ORDER BY a;
+
+INSERT INTO t SELECT number % 10, number FROM numbers(10000);
+
+SELECT count(), min(a), max(a) FROM t SETTINGS additional_table_filters = {'t' : '0'};
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql b/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql
index 06f05e36237..31d32da0ed3 100644
--- a/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql
+++ b/tests/queries/0_stateless/01710_projection_aggregation_in_order.sql
@@ -31,6 +31,8 @@ SET allow_experimental_projection_optimization=1, optimize_aggregation_in_order=
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM normal WHERE ts > '2021-12-06 22:00:00' GROUP BY a ORDER BY v LIMIT 5;
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM normal WHERE ts > '2021-12-06 22:00:00' GROUP BY toStartOfHour(ts), a ORDER BY v LIMIT 5;
 
+DROP TABLE normal;
+
 DROP TABLE IF EXISTS agg;
 
 CREATE TABLE agg
@@ -60,3 +62,5 @@ SET allow_experimental_projection_optimization=1, optimize_aggregation_in_order=
 
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM agg WHERE ts > '2021-12-06 22:00:00' GROUP BY a ORDER BY v LIMIT 5;
 WITH toStartOfHour(ts) AS a SELECT sum(value) v FROM agg WHERE ts > '2021-12-06 22:00:00' GROUP BY toStartOfHour(ts), a ORDER BY v LIMIT 5;
+
+DROP TABLE agg;
diff --git a/tests/queries/0_stateless/01710_projection_external_aggregate.reference b/tests/queries/0_stateless/01710_projection_external_aggregate.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_external_aggregate.sql b/tests/queries/0_stateless/01710_projection_external_aggregate.sql
new file mode 100644
index 00000000000..8c9c1522af8
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_external_aggregate.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS agg;
+
+CREATE TABLE agg
+(
+    `key` UInt32,
+    `ts` DateTime,
+    `value` UInt32,
+    PROJECTION aaaa
+    (
+        SELECT
+            ts,
+            key,
+            sum(value)
+        GROUP BY ts, key
+    )
+)
+ENGINE = MergeTree
+ORDER BY (key, ts);
+
+SET max_bytes_before_external_group_by=1;
+
+INSERT INTO agg SELECT 1, toDateTime('2021-12-06 00:00:00') + number, number FROM numbers(100000);
+
+DROP TABLE agg;
diff --git a/tests/queries/0_stateless/01710_projection_row_policy.reference b/tests/queries/0_stateless/01710_projection_row_policy.reference
new file mode 100644
index 00000000000..06b63ea6c2f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_row_policy.reference
@@ -0,0 +1 @@
+0	0	0
diff --git a/tests/queries/0_stateless/01710_projection_row_policy.sql b/tests/queries/0_stateless/01710_projection_row_policy.sql
new file mode 100644
index 00000000000..a54cc50b9e9
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_row_policy.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS t;
+
+CREATE TABLE t(a UInt32, b UInt32) ENGINE = MergeTree PARTITION BY a ORDER BY a;
+
+INSERT INTO t SELECT number % 10, number FROM numbers(10000);
+
+CREATE ROW POLICY OR REPLACE rp ON t FOR SELECT USING 0 TO ALL;
+
+SELECT count(), min(a), max(a) FROM t;
+
+DROP ROW POLICY rp ON t;
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/01710_projections_order_by_complete.reference b/tests/queries/0_stateless/01710_projections_order_by_complete.reference
new file mode 100644
index 00000000000..f8d6ccd5f11
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_order_by_complete.reference
@@ -0,0 +1,13 @@
+-- { echoOn }
+select t from data_proj_order_by_comp where t > 0 order by t settings optimize_read_in_order=1;
+5
+5
+6
+select t from data_proj_order_by_comp where t > 0 order by t settings optimize_read_in_order=0;
+5
+5
+6
+select t from data_proj_order_by_comp where t > 0 order by t settings max_threads=1;
+5
+5
+6
diff --git a/tests/queries/0_stateless/01710_projections_order_by_complete.sql b/tests/queries/0_stateless/01710_projections_order_by_complete.sql
new file mode 100644
index 00000000000..d8126d32b43
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_order_by_complete.sql
@@ -0,0 +1,16 @@
+-- Test from https://github.com/ClickHouse/ClickHouse/issues/37673
+
+drop table if exists  data_proj_order_by_comp;
+create table data_proj_order_by_comp (t UInt64, projection tSort (select * order by t)) ENGINE MergeTree() order by tuple();
+
+system stop merges data_proj_order_by_comp;
+
+insert into data_proj_order_by_comp values (5);
+insert into data_proj_order_by_comp values (5);
+insert into data_proj_order_by_comp values (6);
+
+-- { echoOn }
+select t from data_proj_order_by_comp where t > 0 order by t settings optimize_read_in_order=1;
+select t from data_proj_order_by_comp where t > 0 order by t settings optimize_read_in_order=0;
+select t from data_proj_order_by_comp where t > 0 order by t settings max_threads=1;
+-- { echoOff }
diff --git a/tests/queries/0_stateless/01710_projections_order_by_incomplete.reference b/tests/queries/0_stateless/01710_projections_order_by_incomplete.reference
new file mode 100644
index 00000000000..368a11a5273
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_order_by_incomplete.reference
@@ -0,0 +1,13 @@
+-- { echoOn }
+select t from data_proj_order_by_incomp where t > 0 order by t settings optimize_read_in_order=1;
+5
+5
+6
+select t from data_proj_order_by_incomp where t > 0 order by t settings optimize_read_in_order=0;
+5
+5
+6
+select t from data_proj_order_by_incomp where t > 0 order by t settings max_threads=1;
+5
+5
+6
diff --git a/tests/queries/0_stateless/01710_projections_order_by_incomplete.sql b/tests/queries/0_stateless/01710_projections_order_by_incomplete.sql
new file mode 100644
index 00000000000..3ac5f22afa7
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_order_by_incomplete.sql
@@ -0,0 +1,16 @@
+drop table if exists  data_proj_order_by_incomp;
+create table data_proj_order_by_incomp (t UInt64) ENGINE MergeTree() order by tuple();
+
+system stop merges data_proj_order_by_incomp;
+
+insert into data_proj_order_by_incomp values (5);
+insert into data_proj_order_by_incomp values (5);
+
+alter table data_proj_order_by_incomp add projection tSort (select * order by t);
+insert into data_proj_order_by_incomp values (6);
+
+-- { echoOn }
+select t from data_proj_order_by_incomp where t > 0 order by t settings optimize_read_in_order=1;
+select t from data_proj_order_by_incomp where t > 0 order by t settings optimize_read_in_order=0;
+select t from data_proj_order_by_incomp where t > 0 order by t settings max_threads=1;
+-- { echoOff }
diff --git a/tests/queries/0_stateless/01716_array_difference_overflow.reference b/tests/queries/0_stateless/01716_array_difference_overflow.reference
index 5297534679e..a4e34800849 100644
--- a/tests/queries/0_stateless/01716_array_difference_overflow.reference
+++ b/tests/queries/0_stateless/01716_array_difference_overflow.reference
@@ -1 +1,5 @@
 [0,9223372036854710272]
+[0,-9]
+[0,-9]
+[0,-9]
+[0,-9]
diff --git a/tests/queries/0_stateless/01716_array_difference_overflow.sql b/tests/queries/0_stateless/01716_array_difference_overflow.sql
index 3d153725294..747e0ad757d 100644
--- a/tests/queries/0_stateless/01716_array_difference_overflow.sql
+++ b/tests/queries/0_stateless/01716_array_difference_overflow.sql
@@ -1,2 +1,8 @@
 -- Overflow is Ok and behaves as the CPU does it.
 SELECT arrayDifference([65536, -9223372036854775808]);
+
+-- Diff of unsigned int -> int
+SELECT arrayDifference( cast([10, 1], 'Array(UInt8)'));
+SELECT arrayDifference( cast([10, 1], 'Array(UInt16)'));
+SELECT arrayDifference( cast([10, 1], 'Array(UInt32)'));
+SELECT arrayDifference( cast([10, 1], 'Array(UInt64)'));
diff --git a/tests/queries/0_stateless/01798_having_push_down.sql b/tests/queries/0_stateless/01798_having_push_down.sql
index 28b97b7f065..b3a77c8f5b5 100644
--- a/tests/queries/0_stateless/01798_having_push_down.sql
+++ b/tests/queries/0_stateless/01798_having_push_down.sql
@@ -12,6 +12,7 @@ SELECT c0 + -1, sum(intDivOrZero(intDivOrZero(NULL, NULL), '2'), intDivOrZero(10
 
 SELECT sum(c0 + 257) FROM t_having GROUP BY c0 = -9223372036854775808, NULL, -2147483649, c0 HAVING c0 = -9223372036854775808 SETTINGS enable_optimize_predicate_expression = 0;
 
+SET enable_positional_arguments=0;
 SELECT c0 + -2, c0 + -9223372036854775807, c0 = NULL FROM t_having GROUP BY c0 = 0.9998999834060669, 1023, c0 HAVING c0 = 0.9998999834060669 SETTINGS enable_optimize_predicate_expression = 0;
 
 DROP TABLE t_having;
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.reference b/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
index 0a762ec3b77..28c4987125c 100644
--- a/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
+++ b/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
@@ -1,2 +1,2 @@
-2283-11-11 23:48:05.4775806
-2283-11-11 23:52:48.54775806
+2299-12-31 23:48:05.4775806
+2299-12-31 23:52:48.54775806
diff --git a/tests/queries/0_stateless/01825_type_json_schema_inference.reference b/tests/queries/0_stateless/01825_type_json_schema_inference.reference
index a2089ea3366..22dfdee96a7 100644
--- a/tests/queries/0_stateless/01825_type_json_schema_inference.reference
+++ b/tests/queries/0_stateless/01825_type_json_schema_inference.reference
@@ -3,6 +3,6 @@
 Tuple(k1 Nullable(Int8), k2 Tuple(k3 Nullable(String), k4 Nested(k5 Nullable(Int8), k6 Nullable(Int8))), some Nullable(Int8))
 {"id":"1","obj":"aaa","s":"foo"}
 {"id":"2","obj":"bbb","s":"bar"}
-{"map":{"k1":1,"k2":2},"obj":{"k1":1,"k2.k3":2},"map_type":"Map(String, Nullable(Float64))","obj_type":"Object(Nullable('json'))"}
-{"obj":{"k1":1,"k2":2},"map":{"k1":"1","k2":"2"}}
-Tuple(k1 Float64, k2 Float64)
+{"map":{"k1":"1","k2":"2"},"obj":{"k1":1,"k2.k3":2},"map_type":"Map(String, Nullable(Int64))","obj_type":"Object(Nullable('json'))"}
+{"obj":{"k1":"1","k2":"2"},"map":{"k1":"1","k2":"2"}}
+Tuple(k1 Int64, k2 Int64)
diff --git a/tests/queries/0_stateless/01825_type_json_sparse.reference b/tests/queries/0_stateless/01825_type_json_sparse.reference
new file mode 100644
index 00000000000..aaaa683d7d5
--- /dev/null
+++ b/tests/queries/0_stateless/01825_type_json_sparse.reference
@@ -0,0 +1,13 @@
+k1	Default	2
+k2.k3	Default	1
+=============
+k1	Default	1
+k2.k3	Sparse	1
+=============
+k1	Default	1
+k2.k3	Sparse	1
+=============
+k1	Default	1
+k2.k3	Sparse	1
+1	1	4
+2	400000	0
diff --git a/tests/queries/0_stateless/01825_type_json_sparse.sql b/tests/queries/0_stateless/01825_type_json_sparse.sql
new file mode 100644
index 00000000000..2e7520f3e7a
--- /dev/null
+++ b/tests/queries/0_stateless/01825_type_json_sparse.sql
@@ -0,0 +1,59 @@
+-- Tags: no-fasttest
+
+DROP TABLE IF EXISTS t_json_sparse;
+
+SET allow_experimental_object_type = 1;
+
+CREATE TABLE t_json_sparse (data JSON)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS ratio_of_defaults_for_sparse_serialization = 0.1,
+min_bytes_for_wide_part = 0;
+
+SYSTEM STOP MERGES t_json_sparse;
+
+INSERT INTO t_json_sparse VALUES ('{"k1": 1, "k2": {"k3": 4}}');
+INSERT INTO t_json_sparse SELECT '{"k1": 2}' FROM numbers(200000);
+
+SELECT subcolumns.names, subcolumns.serializations, count() FROM system.parts_columns
+ARRAY JOIN subcolumns
+WHERE database = currentDatabase()
+    AND table = 't_json_sparse' AND column = 'data' AND active
+GROUP BY subcolumns.names, subcolumns.serializations;
+
+SELECT '=============';
+
+SYSTEM START MERGES t_json_sparse;
+OPTIMIZE TABLE t_json_sparse FINAL;
+
+SELECT subcolumns.names, subcolumns.serializations, count() FROM system.parts_columns
+ARRAY JOIN subcolumns
+WHERE database = currentDatabase()
+    AND table = 't_json_sparse' AND column = 'data' AND active
+GROUP BY subcolumns.names, subcolumns.serializations;
+
+SELECT '=============';
+
+DETACH TABLE t_json_sparse;
+ATTACH TABLE t_json_sparse;
+
+SELECT subcolumns.names, subcolumns.serializations, count() FROM system.parts_columns
+ARRAY JOIN subcolumns
+WHERE database = currentDatabase()
+    AND table = 't_json_sparse' AND column = 'data' AND active
+GROUP BY subcolumns.names, subcolumns.serializations;
+
+INSERT INTO t_json_sparse SELECT '{"k1": 2}' FROM numbers(200000);
+
+SELECT '=============';
+
+OPTIMIZE TABLE t_json_sparse FINAL;
+
+SELECT subcolumns.names, subcolumns.serializations, count() FROM system.parts_columns
+ARRAY JOIN subcolumns
+WHERE database = currentDatabase()
+    AND table = 't_json_sparse' AND column = 'data' AND active
+GROUP BY subcolumns.names, subcolumns.serializations;
+
+SELECT data.k1, count(), sum(data.k2.k3) FROM t_json_sparse GROUP BY data.k1;
+
+DROP TABLE t_json_sparse;
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
index 5290ffc5dbe..91c37a277a1 100644
--- a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
@@ -1,2 +1,2 @@
-SleepFunctionCalls: 4 (increment)
-SleepFunctionMicroseconds: 400000 (increment)
+SleepFunctionCalls: 3 (increment)
+SleepFunctionMicroseconds: 300000 (increment)
diff --git a/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql b/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql
index 9a220ffd49f..bf8749fb046 100644
--- a/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql
+++ b/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql
@@ -28,3 +28,8 @@ WHERE number IN
     SELECT number
     FROM numbers(5)
 ) order by label, number;
+
+SELECT NULL FROM
+(SELECT [1048575, NULL] AS ax, 2147483648 AS c) t1 ARRAY JOIN ax
+INNER JOIN (SELECT NULL AS c) t2 USING (c);
+
diff --git a/tests/queries/0_stateless/01921_datatype_date32.reference b/tests/queries/0_stateless/01921_datatype_date32.reference
index 70eebc76c01..acb0cc4ca59 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.reference
+++ b/tests/queries/0_stateless/01921_datatype_date32.reference
@@ -1,19 +1,19 @@
-1925-01-01
-1925-01-01
-2282-12-31
-2283-11-11
+1900-01-01
+1900-01-01
+2299-12-15
+2299-12-31
 2021-06-22
 -------toYear---------
-1925
-1925
-2282
-2283
+1900
+1900
+2299
+2299
 2021
 -------toMonth---------
 1
 1
 12
-11
+12
 6
 -------toQuarter---------
 1
@@ -24,83 +24,83 @@
 -------toDayOfMonth---------
 1
 1
+15
 31
-11
 22
 -------toDayOfWeek---------
-4
-4
-7
+1
+1
+5
 7
 2
 -------toDayOfYear---------
 1
 1
-365
-315
+349
+364
 173
 -------toHour---------
 -------toMinute---------
 -------toSecond---------
 -------toStartOfDay---------
-2061-02-06 07:28:16
-2061-02-06 07:28:16
-2010-10-17 11:03:28
-2011-08-28 11:03:28
+2036-02-07 07:31:20
+2036-02-07 07:31:20
+2027-10-01 11:03:28
+2027-10-17 11:03:28
 2021-06-22 00:00:00
 -------toMonday---------
-2104-06-04
-2104-06-04
-2103-07-21
-2104-05-31
+2079-06-07
+2079-06-07
+2120-07-06
+2120-07-20
 2021-06-21
 -------toISOWeek---------
 1
 1
+50
 52
-45
 25
 -------toISOYear---------
-1925
-1925
-2282
-2283
+1900
+1900
+2299
+2299
 2021
 -------toWeek---------
 0
 0
+50
 53
-45
 25
 -------toYearWeek---------
-192452
-192452
-228253
-228345
+189953
+189953
+229950
+229953
 202125
 -------toStartOfWeek---------
-2104-06-03
-2104-06-03
-2103-07-27
-2104-06-06
+2079-06-06
+2079-06-06
+2120-07-05
+2120-07-26
 2021-06-20
 -------toStartOfMonth---------
-2104-06-07
-2104-06-07
-2103-06-27
-2104-05-27
+2079-06-07
+2079-06-07
+2120-06-26
+2120-06-26
 2021-06-01
 -------toStartOfQuarter---------
-2104-06-07
-2104-06-07
-2103-04-27
-2104-04-26
+2079-06-07
+2079-06-07
+2120-04-26
+2120-04-26
 2021-04-01
 -------toStartOfYear---------
-2104-06-07
-2104-06-07
-2102-07-28
-2103-07-28
+2079-06-07
+2079-06-07
+2119-07-28
+2119-07-28
 2021-01-01
 -------toStartOfSecond---------
 -------toStartOfMinute---------
@@ -109,183 +109,183 @@
 -------toStartOfFifteenMinutes---------
 -------toStartOfHour---------
 -------toStartOfISOYear---------
-2104-06-04
-2104-06-04
-2102-07-29
-2103-07-28
+2079-06-07
+2079-06-07
+2119-07-29
+2119-07-29
 2021-01-04
 -------toRelativeYearNum---------
-1925
-1925
-2282
-2283
+1900
+1900
+2299
+2299
 2021
 -------toRelativeQuarterNum---------
-7700
-7700
-9131
-9135
+7600
+7600
+9199
+9199
 8085
 -------toRelativeMonthNum---------
-23101
-23101
-27396
-27407
+22801
+22801
+27600
+27600
 24258
 -------toRelativeWeekNum---------
-63189
-63189
-16331
-63188
+61885
+61885
+17216
+17217
 2686
 -------toRelativeDayNum---------
-49100
-49100
-48784
-49099
+39969
+39969
+54977
+54993
 18800
 -------toRelativeHourNum---------
-4294572852
-4294572852
-2743677
-2751237
+4294353708
+4294353708
+2892309
+2892693
 451197
 -------toRelativeMinuteNum---------
-4271299336
-4271299336
-164620620
-165074220
+4258150699
+4258150699
+173538540
+173561580
 27071820
 -------toRelativeSecondNum---------
-2874889696
-2874889696
-1287302608
-1314518608
+2085971480
+2085971480
+1822377808
+1823760208
 1624309200
 -------toTime---------
 -------toYYYYMM---------
-192501
-192501
-228212
-228311
+190001
+190001
+229912
+229912
 202106
 -------toYYYYMMDD---------
-19250101
-19250101
-22821231
-22831111
+19000101
+19000101
+22991215
+22991231
 20210622
 -------toYYYYMMDDhhmmss---------
-19250101000000
-19250101000000
-22821231000000
-22831111000000
+19000101000000
+19000101000000
+22991215000000
+22991231000000
 20210622000000
 -------addSeconds---------
-1925-01-01 01:00:00.000
-1925-01-01 01:00:00.000
-2282-12-31 01:00:00.000
-2283-11-11 01:00:00.000
+1900-01-01 01:00:00.000
+1900-01-01 01:00:00.000
+2299-12-15 01:00:00.000
+2299-12-31 01:00:00.000
 2021-06-22 01:00:00.000
 -------addMinutes---------
-1925-01-01 01:00:00.000
-1925-01-01 01:00:00.000
-2282-12-31 01:00:00.000
-2283-11-11 01:00:00.000
+1900-01-01 01:00:00.000
+1900-01-01 01:00:00.000
+2299-12-15 01:00:00.000
+2299-12-31 01:00:00.000
 2021-06-22 01:00:00.000
 -------addHours---------
-1925-01-01 01:00:00.000
-1925-01-01 01:00:00.000
-2282-12-31 01:00:00.000
-2283-11-11 01:00:00.000
+1900-01-01 01:00:00.000
+1900-01-01 01:00:00.000
+2299-12-15 01:00:00.000
+2299-12-31 01:00:00.000
 2021-06-22 01:00:00.000
 -------addDays---------
-1925-01-08
-1925-01-08
-2283-01-07
-1925-01-07
+1900-01-08
+1900-01-08
+2299-12-22
+2299-12-31
 2021-06-29
 -------addWeeks---------
-1925-01-08
-1925-01-08
-2283-01-07
-1925-01-07
+1900-01-08
+1900-01-08
+2299-12-22
+2299-12-31
 2021-06-29
 -------addMonths---------
-1925-02-01
-1925-02-01
-2283-01-31
-2283-11-11
+1900-02-01
+1900-02-01
+2299-12-31
+2299-12-31
 2021-07-22
 -------addQuarters---------
-1925-04-01
-1925-04-01
-2283-03-31
-2283-11-11
+1900-04-01
+1900-04-01
+2299-12-31
+2299-12-31
 2021-09-22
 -------addYears---------
-1926-01-01
-1926-01-01
-2283-11-11
-2283-11-11
+1901-01-01
+1901-01-01
+2299-12-31
+2299-12-31
 2022-06-22
 -------subtractSeconds---------
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-2282-12-30 23:00:00.000
-2283-11-10 23:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+2299-12-14 23:00:00.000
+2299-12-30 23:00:00.000
 2021-06-21 23:00:00.000
 -------subtractMinutes---------
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-2282-12-30 23:00:00.000
-2283-11-10 23:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+2299-12-14 23:00:00.000
+2299-12-30 23:00:00.000
 2021-06-21 23:00:00.000
 -------subtractHours---------
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-2282-12-30 23:00:00.000
-2283-11-10 23:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+2299-12-14 23:00:00.000
+2299-12-30 23:00:00.000
 2021-06-21 23:00:00.000
 -------subtractDays---------
-2283-11-05
-2283-11-05
-2282-12-24
-2283-11-04
+2299-12-31
+2299-12-31
+2299-12-08
+2299-12-24
 2021-06-15
 -------subtractWeeks---------
-2283-11-05
-2283-11-05
-2282-12-24
-2283-11-04
+2299-12-31
+2299-12-31
+2299-12-08
+2299-12-24
 2021-06-15
 -------subtractMonths---------
-1925-01-01
-1925-01-01
-2282-11-30
-2283-10-11
+1900-01-01
+1900-01-01
+2299-11-15
+2299-11-30
 2021-05-22
 -------subtractQuarters---------
-1925-01-01
-1925-01-01
-2282-09-30
-2283-08-11
+1900-01-01
+1900-01-01
+2299-09-15
+2299-09-30
 2021-03-22
 -------subtractYears---------
-1925-01-01
-1925-01-01
-2281-12-31
-2282-11-11
+1900-01-01
+1900-01-01
+2298-12-15
+2298-12-31
 2020-06-22
 -------toDate32---------
-1925-01-01	2000-01-01
-1925-01-01	1925-01-01
-1925-01-01	\N
-1925-01-01
+1900-01-01	2000-01-01
+1900-01-01	1900-01-01
+1900-01-01	\N
+1900-01-01
 \N
-1925-01-01
+1900-01-01
 1969-12-31
 1970-01-01
 2149-06-06
 2149-06-07
-2283-11-11
+2299-12-31
diff --git a/tests/queries/0_stateless/01921_datatype_date32.sql b/tests/queries/0_stateless/01921_datatype_date32.sql
index ef6e3e5ee89..8b65f82825f 100644
--- a/tests/queries/0_stateless/01921_datatype_date32.sql
+++ b/tests/queries/0_stateless/01921_datatype_date32.sql
@@ -1,7 +1,7 @@
 drop table if exists t1;
 create table t1(x1 Date32) engine Memory;
 
-insert into t1 values ('1925-01-01'),('1924-01-01'),('2282-12-31'),('2283-12-31'),('2021-06-22');
+insert into t1 values ('1900-01-01'),('1899-01-01'),('2299-12-15'),('2300-12-31'),('2021-06-22');
 
 select x1 from t1;
 select '-------toYear---------';
@@ -113,20 +113,19 @@ select subtractQuarters(x1, 1) from t1;
 select '-------subtractYears---------';
 select subtractYears(x1, 1) from t1;
 select '-------toDate32---------';
-select toDate32('1925-01-01'), toDate32(toDate('2000-01-01'));
-select toDate32OrZero('1924-01-01'), toDate32OrNull('1924-01-01');
+select toDate32('1900-01-01'), toDate32(toDate('2000-01-01'));
+select toDate32OrZero('1899-01-01'), toDate32OrNull('1899-01-01');
 select toDate32OrZero(''), toDate32OrNull('');
 select (select toDate32OrZero(''));
 select (select toDate32OrNull(''));
 SELECT toString(T.d) dateStr
 FROM
     (
-    SELECT '1925-01-01'::Date32 d
+    SELECT '1900-01-01'::Date32 d
     UNION ALL SELECT '1969-12-31'::Date32
     UNION ALL SELECT '1970-01-01'::Date32
     UNION ALL SELECT '2149-06-06'::Date32
     UNION ALL SELECT '2149-06-07'::Date32
-    UNION ALL SELECT '2283-11-11'::Date32
+    UNION ALL SELECT '2299-12-31'::Date32
     ) AS T
 ORDER BY T.d
-
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.reference b/tests/queries/0_stateless/02006_test_positional_arguments.reference
index f86a1ab6c47..b62604c3a9e 100644
--- a/tests/queries/0_stateless/02006_test_positional_arguments.reference
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.reference
@@ -117,3 +117,7 @@ select b from (select 5 as a, 'Hello' as b group by a);
 Hello
 select b from (select 5 as a, 'Hello' as b order by 1);
 Hello
+create table tp2(first_col String, second_col Int32) engine = MergeTree() order by tuple();
+select count(*) from (select first_col, count(second_col) from tp2 group by 1);
+0
+select total from (select first_col, count(second_col) as total from tp2 group by 1);
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.sql b/tests/queries/0_stateless/02006_test_positional_arguments.sql
index 2a02cd03c93..eb2b9a2d480 100644
--- a/tests/queries/0_stateless/02006_test_positional_arguments.sql
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.sql
@@ -48,3 +48,7 @@ select substr('aaaaaaaaaaaaaa', 8) as a  group by substr('aaaaaaaaaaaaaa', 8);
 select b from (select 5 as a, 'Hello' as b order by a);
 select b from (select 5 as a, 'Hello' as b group by a);
 select b from (select 5 as a, 'Hello' as b order by 1);
+
+create table tp2(first_col String, second_col Int32) engine = MergeTree() order by tuple();
+select count(*) from (select first_col, count(second_col) from tp2 group by 1);
+select total from (select first_col, count(second_col) as total from tp2 group by 1);
diff --git a/tests/queries/0_stateless/02020_exponential_smoothing.reference b/tests/queries/0_stateless/02020_exponential_smoothing.reference
index bc6d0920705..95f5cb0c310 100644
--- a/tests/queries/0_stateless/02020_exponential_smoothing.reference
+++ b/tests/queries/0_stateless/02020_exponential_smoothing.reference
@@ -654,23 +654,23 @@ exponentialTimeDecayedAvg
 0	48	0.201	████████████████████
 0	49	0.196	███████████████████▌
 Check `exponentialTimeDecayed.*` supports sliding windows
-2	1	3.010050167084	2	3.030251507111	0.993333444442
-1	2	7.060905027605	4.080805360107	4.02030134086	1.756312382816
-0	3	12.091654548833	5.101006700134	5.000500014167	2.418089094006
-4	4	11.050650848754	5.050250835421	5.000500014167	2.209909172572
-5	5	9.970249502081	5	5.000500014167	1.993850509716
-1	6	20.07305726224	10.202013400268	5.000500014167	4.014210020072
-0	7	15.991544871125	10.100501670842	3.98029867414	4.017674596889
+2	1	2.950447180363	1.960397346614	2.970248507056	0.993333444442
+1	2	6.921089740404	4	3.940694040604	1.756312382816
+0	3	11.85222374685	5	4.901483479757	2.418089094006
+4	4	10.831833301125	4.950249168746	4.901483479757	2.209909172572
+5	5	9.772825334477	4.900993366534	4.901483479757	1.993850509716
+1	6	19.675584097659	10	4.901483479757	4.014210020072
+0	7	15.832426341049	10	3.940694040604	4.017674596889
 10	8	10.980198673307	10	2.970248507056	3.696727276261
 Check `exponentialTimeDecayedMax` works with negative values
-2	1	-1.010050167084
-1	2	-1
-10	3	-0.990049833749
-4	4	-0.980198673307
-5	5	-1.010050167084
-1	6	-1
-10	7	-0.990049833749
-10	8	-0.980198673307
-10	9	-9.801986733068
-9.81	10	-9.801986733068
+2	1	-0.990049833749
+1	2	-0.980198673307
+10	3	-0.970445533549
+4	4	-0.960789439152
+5	5	-0.990049833749
+1	6	-0.980198673307
+10	7	-0.970445533549
+10	8	-0.960789439152
+10	9	-9.607894391523
+9.81	10	-9.704455335485
 9.9	11	-9.712388869079
diff --git a/tests/queries/0_stateless/02117_show_create_table_system.reference b/tests/queries/0_stateless/02117_show_create_table_system.reference
index 6e9d9188962..9edc2aa0cb4 100644
--- a/tests/queries/0_stateless/02117_show_create_table_system.reference
+++ b/tests/queries/0_stateless/02117_show_create_table_system.reference
@@ -277,7 +277,7 @@ CREATE TABLE system.grants
 (
     `user_name` Nullable(String),
     `role_name` Nullable(String),
-    `access_type` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER TABLE' = 41, 'ALTER DATABASE' = 42, 'ALTER VIEW REFRESH' = 43, 'ALTER VIEW MODIFY QUERY' = 44, 'ALTER VIEW' = 45, 'ALTER' = 46, 'CREATE DATABASE' = 47, 'CREATE TABLE' = 48, 'CREATE VIEW' = 49, 'CREATE DICTIONARY' = 50, 'CREATE TEMPORARY TABLE' = 51, 'CREATE FUNCTION' = 52, 'CREATE' = 53, 'DROP DATABASE' = 54, 'DROP TABLE' = 55, 'DROP VIEW' = 56, 'DROP DICTIONARY' = 57, 'DROP FUNCTION' = 58, 'DROP' = 59, 'TRUNCATE' = 60, 'OPTIMIZE' = 61, 'BACKUP' = 62, 'KILL QUERY' = 63, 'KILL TRANSACTION' = 64, 'MOVE PARTITION BETWEEN SHARDS' = 65, 'CREATE USER' = 66, 'ALTER USER' = 67, 'DROP USER' = 68, 'CREATE ROLE' = 69, 'ALTER ROLE' = 70, 'DROP ROLE' = 71, 'ROLE ADMIN' = 72, 'CREATE ROW POLICY' = 73, 'ALTER ROW POLICY' = 74, 'DROP ROW POLICY' = 75, 'CREATE QUOTA' = 76, 'ALTER QUOTA' = 77, 'DROP QUOTA' = 78, 'CREATE SETTINGS PROFILE' = 79, 'ALTER SETTINGS PROFILE' = 80, 'DROP SETTINGS PROFILE' = 81, 'SHOW USERS' = 82, 'SHOW ROLES' = 83, 'SHOW ROW POLICIES' = 84, 'SHOW QUOTAS' = 85, 'SHOW SETTINGS PROFILES' = 86, 'SHOW ACCESS' = 87, 'ACCESS MANAGEMENT' = 88, 'SYSTEM SHUTDOWN' = 89, 'SYSTEM DROP DNS CACHE' = 90, 'SYSTEM DROP MARK CACHE' = 91, 'SYSTEM DROP UNCOMPRESSED CACHE' = 92, 'SYSTEM DROP MMAP CACHE' = 93, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 94, 'SYSTEM DROP FILESYSTEM CACHE' = 95, 'SYSTEM DROP CACHE' = 96, 'SYSTEM RELOAD CONFIG' = 97, 'SYSTEM RELOAD SYMBOLS' = 98, 'SYSTEM RELOAD DICTIONARY' = 99, 'SYSTEM RELOAD MODEL' = 100, 'SYSTEM RELOAD FUNCTION' = 101, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 102, 'SYSTEM RELOAD' = 103, 'SYSTEM RESTART DISK' = 104, 'SYSTEM MERGES' = 105, 'SYSTEM TTL MERGES' = 106, 'SYSTEM FETCHES' = 107, 'SYSTEM MOVES' = 108, 'SYSTEM DISTRIBUTED SENDS' = 109, 'SYSTEM REPLICATED SENDS' = 110, 'SYSTEM SENDS' = 111, 'SYSTEM REPLICATION QUEUES' = 112, 'SYSTEM DROP REPLICA' = 113, 'SYSTEM SYNC REPLICA' = 114, 'SYSTEM RESTART REPLICA' = 115, 'SYSTEM RESTORE REPLICA' = 116, 'SYSTEM SYNC DATABASE REPLICA' = 117, 'SYSTEM SYNC TRANSACTION LOG' = 118, 'SYSTEM FLUSH DISTRIBUTED' = 119, 'SYSTEM FLUSH LOGS' = 120, 'SYSTEM FLUSH' = 121, 'SYSTEM THREAD FUZZER' = 122, 'SYSTEM UNFREEZE' = 123, 'SYSTEM' = 124, 'dictGet' = 125, 'addressToLine' = 126, 'addressToLineWithInlines' = 127, 'addressToSymbol' = 128, 'demangle' = 129, 'INTROSPECTION' = 130, 'FILE' = 131, 'URL' = 132, 'REMOTE' = 133, 'MONGO' = 134, 'MEILISEARCH' = 135, 'MYSQL' = 136, 'POSTGRES' = 137, 'SQLITE' = 138, 'ODBC' = 139, 'JDBC' = 140, 'HDFS' = 141, 'S3' = 142, 'HIVE' = 143, 'SOURCES' = 144, 'CLUSTER' = 145, 'ALL' = 146, 'NONE' = 147),
+    `access_type` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER TABLE' = 41, 'ALTER DATABASE' = 42, 'ALTER VIEW REFRESH' = 43, 'ALTER VIEW MODIFY QUERY' = 44, 'ALTER VIEW' = 45, 'ALTER' = 46, 'CREATE DATABASE' = 47, 'CREATE TABLE' = 48, 'CREATE VIEW' = 49, 'CREATE DICTIONARY' = 50, 'CREATE TEMPORARY TABLE' = 51, 'CREATE FUNCTION' = 52, 'CREATE' = 53, 'DROP DATABASE' = 54, 'DROP TABLE' = 55, 'DROP VIEW' = 56, 'DROP DICTIONARY' = 57, 'DROP FUNCTION' = 58, 'DROP' = 59, 'TRUNCATE' = 60, 'OPTIMIZE' = 61, 'BACKUP' = 62, 'KILL QUERY' = 63, 'KILL TRANSACTION' = 64, 'MOVE PARTITION BETWEEN SHARDS' = 65, 'CREATE USER' = 66, 'ALTER USER' = 67, 'DROP USER' = 68, 'CREATE ROLE' = 69, 'ALTER ROLE' = 70, 'DROP ROLE' = 71, 'ROLE ADMIN' = 72, 'CREATE ROW POLICY' = 73, 'ALTER ROW POLICY' = 74, 'DROP ROW POLICY' = 75, 'CREATE QUOTA' = 76, 'ALTER QUOTA' = 77, 'DROP QUOTA' = 78, 'CREATE SETTINGS PROFILE' = 79, 'ALTER SETTINGS PROFILE' = 80, 'DROP SETTINGS PROFILE' = 81, 'SHOW USERS' = 82, 'SHOW ROLES' = 83, 'SHOW ROW POLICIES' = 84, 'SHOW QUOTAS' = 85, 'SHOW SETTINGS PROFILES' = 86, 'SHOW ACCESS' = 87, 'ACCESS MANAGEMENT' = 88, 'SYSTEM SHUTDOWN' = 89, 'SYSTEM DROP DNS CACHE' = 90, 'SYSTEM DROP MARK CACHE' = 91, 'SYSTEM DROP UNCOMPRESSED CACHE' = 92, 'SYSTEM DROP MMAP CACHE' = 93, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 94, 'SYSTEM DROP FILESYSTEM CACHE' = 95, 'SYSTEM DROP SCHEMA CACHE' = 96, 'SYSTEM DROP CACHE' = 97, 'SYSTEM RELOAD CONFIG' = 98, 'SYSTEM RELOAD SYMBOLS' = 99, 'SYSTEM RELOAD DICTIONARY' = 100, 'SYSTEM RELOAD MODEL' = 101, 'SYSTEM RELOAD FUNCTION' = 102, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 103, 'SYSTEM RELOAD' = 104, 'SYSTEM RESTART DISK' = 105, 'SYSTEM MERGES' = 106, 'SYSTEM TTL MERGES' = 107, 'SYSTEM FETCHES' = 108, 'SYSTEM MOVES' = 109, 'SYSTEM DISTRIBUTED SENDS' = 110, 'SYSTEM REPLICATED SENDS' = 111, 'SYSTEM SENDS' = 112, 'SYSTEM REPLICATION QUEUES' = 113, 'SYSTEM DROP REPLICA' = 114, 'SYSTEM SYNC REPLICA' = 115, 'SYSTEM RESTART REPLICA' = 116, 'SYSTEM RESTORE REPLICA' = 117, 'SYSTEM SYNC DATABASE REPLICA' = 118, 'SYSTEM SYNC TRANSACTION LOG' = 119, 'SYSTEM FLUSH DISTRIBUTED' = 120, 'SYSTEM FLUSH LOGS' = 121, 'SYSTEM FLUSH' = 122, 'SYSTEM THREAD FUZZER' = 123, 'SYSTEM UNFREEZE' = 124, 'SYSTEM' = 125, 'dictGet' = 126, 'addressToLine' = 127, 'addressToLineWithInlines' = 128, 'addressToSymbol' = 129, 'demangle' = 130, 'INTROSPECTION' = 131, 'FILE' = 132, 'URL' = 133, 'REMOTE' = 134, 'MONGO' = 135, 'MEILISEARCH' = 136, 'MYSQL' = 137, 'POSTGRES' = 138, 'SQLITE' = 139, 'ODBC' = 140, 'JDBC' = 141, 'HDFS' = 142, 'S3' = 143, 'HIVE' = 144, 'SOURCES' = 145, 'CLUSTER' = 146, 'ALL' = 147, 'NONE' = 148),
     `database` Nullable(String),
     `table` Nullable(String),
     `column` Nullable(String),
@@ -551,10 +551,10 @@ ENGINE = SystemPartsColumns
 COMMENT 'SYSTEM TABLE is built on the fly.'
 CREATE TABLE system.privileges
 (
-    `privilege` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER TABLE' = 41, 'ALTER DATABASE' = 42, 'ALTER VIEW REFRESH' = 43, 'ALTER VIEW MODIFY QUERY' = 44, 'ALTER VIEW' = 45, 'ALTER' = 46, 'CREATE DATABASE' = 47, 'CREATE TABLE' = 48, 'CREATE VIEW' = 49, 'CREATE DICTIONARY' = 50, 'CREATE TEMPORARY TABLE' = 51, 'CREATE FUNCTION' = 52, 'CREATE' = 53, 'DROP DATABASE' = 54, 'DROP TABLE' = 55, 'DROP VIEW' = 56, 'DROP DICTIONARY' = 57, 'DROP FUNCTION' = 58, 'DROP' = 59, 'TRUNCATE' = 60, 'OPTIMIZE' = 61, 'BACKUP' = 62, 'KILL QUERY' = 63, 'KILL TRANSACTION' = 64, 'MOVE PARTITION BETWEEN SHARDS' = 65, 'CREATE USER' = 66, 'ALTER USER' = 67, 'DROP USER' = 68, 'CREATE ROLE' = 69, 'ALTER ROLE' = 70, 'DROP ROLE' = 71, 'ROLE ADMIN' = 72, 'CREATE ROW POLICY' = 73, 'ALTER ROW POLICY' = 74, 'DROP ROW POLICY' = 75, 'CREATE QUOTA' = 76, 'ALTER QUOTA' = 77, 'DROP QUOTA' = 78, 'CREATE SETTINGS PROFILE' = 79, 'ALTER SETTINGS PROFILE' = 80, 'DROP SETTINGS PROFILE' = 81, 'SHOW USERS' = 82, 'SHOW ROLES' = 83, 'SHOW ROW POLICIES' = 84, 'SHOW QUOTAS' = 85, 'SHOW SETTINGS PROFILES' = 86, 'SHOW ACCESS' = 87, 'ACCESS MANAGEMENT' = 88, 'SYSTEM SHUTDOWN' = 89, 'SYSTEM DROP DNS CACHE' = 90, 'SYSTEM DROP MARK CACHE' = 91, 'SYSTEM DROP UNCOMPRESSED CACHE' = 92, 'SYSTEM DROP MMAP CACHE' = 93, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 94, 'SYSTEM DROP FILESYSTEM CACHE' = 95, 'SYSTEM DROP CACHE' = 96, 'SYSTEM RELOAD CONFIG' = 97, 'SYSTEM RELOAD SYMBOLS' = 98, 'SYSTEM RELOAD DICTIONARY' = 99, 'SYSTEM RELOAD MODEL' = 100, 'SYSTEM RELOAD FUNCTION' = 101, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 102, 'SYSTEM RELOAD' = 103, 'SYSTEM RESTART DISK' = 104, 'SYSTEM MERGES' = 105, 'SYSTEM TTL MERGES' = 106, 'SYSTEM FETCHES' = 107, 'SYSTEM MOVES' = 108, 'SYSTEM DISTRIBUTED SENDS' = 109, 'SYSTEM REPLICATED SENDS' = 110, 'SYSTEM SENDS' = 111, 'SYSTEM REPLICATION QUEUES' = 112, 'SYSTEM DROP REPLICA' = 113, 'SYSTEM SYNC REPLICA' = 114, 'SYSTEM RESTART REPLICA' = 115, 'SYSTEM RESTORE REPLICA' = 116, 'SYSTEM SYNC DATABASE REPLICA' = 117, 'SYSTEM SYNC TRANSACTION LOG' = 118, 'SYSTEM FLUSH DISTRIBUTED' = 119, 'SYSTEM FLUSH LOGS' = 120, 'SYSTEM FLUSH' = 121, 'SYSTEM THREAD FUZZER' = 122, 'SYSTEM UNFREEZE' = 123, 'SYSTEM' = 124, 'dictGet' = 125, 'addressToLine' = 126, 'addressToLineWithInlines' = 127, 'addressToSymbol' = 128, 'demangle' = 129, 'INTROSPECTION' = 130, 'FILE' = 131, 'URL' = 132, 'REMOTE' = 133, 'MONGO' = 134, 'MEILISEARCH' = 135, 'MYSQL' = 136, 'POSTGRES' = 137, 'SQLITE' = 138, 'ODBC' = 139, 'JDBC' = 140, 'HDFS' = 141, 'S3' = 142, 'HIVE' = 143, 'SOURCES' = 144, 'CLUSTER' = 145, 'ALL' = 146, 'NONE' = 147),
+    `privilege` Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER TABLE' = 41, 'ALTER DATABASE' = 42, 'ALTER VIEW REFRESH' = 43, 'ALTER VIEW MODIFY QUERY' = 44, 'ALTER VIEW' = 45, 'ALTER' = 46, 'CREATE DATABASE' = 47, 'CREATE TABLE' = 48, 'CREATE VIEW' = 49, 'CREATE DICTIONARY' = 50, 'CREATE TEMPORARY TABLE' = 51, 'CREATE FUNCTION' = 52, 'CREATE' = 53, 'DROP DATABASE' = 54, 'DROP TABLE' = 55, 'DROP VIEW' = 56, 'DROP DICTIONARY' = 57, 'DROP FUNCTION' = 58, 'DROP' = 59, 'TRUNCATE' = 60, 'OPTIMIZE' = 61, 'BACKUP' = 62, 'KILL QUERY' = 63, 'KILL TRANSACTION' = 64, 'MOVE PARTITION BETWEEN SHARDS' = 65, 'CREATE USER' = 66, 'ALTER USER' = 67, 'DROP USER' = 68, 'CREATE ROLE' = 69, 'ALTER ROLE' = 70, 'DROP ROLE' = 71, 'ROLE ADMIN' = 72, 'CREATE ROW POLICY' = 73, 'ALTER ROW POLICY' = 74, 'DROP ROW POLICY' = 75, 'CREATE QUOTA' = 76, 'ALTER QUOTA' = 77, 'DROP QUOTA' = 78, 'CREATE SETTINGS PROFILE' = 79, 'ALTER SETTINGS PROFILE' = 80, 'DROP SETTINGS PROFILE' = 81, 'SHOW USERS' = 82, 'SHOW ROLES' = 83, 'SHOW ROW POLICIES' = 84, 'SHOW QUOTAS' = 85, 'SHOW SETTINGS PROFILES' = 86, 'SHOW ACCESS' = 87, 'ACCESS MANAGEMENT' = 88, 'SYSTEM SHUTDOWN' = 89, 'SYSTEM DROP DNS CACHE' = 90, 'SYSTEM DROP MARK CACHE' = 91, 'SYSTEM DROP UNCOMPRESSED CACHE' = 92, 'SYSTEM DROP MMAP CACHE' = 93, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 94, 'SYSTEM DROP FILESYSTEM CACHE' = 95, 'SYSTEM DROP SCHEMA CACHE' = 96, 'SYSTEM DROP CACHE' = 97, 'SYSTEM RELOAD CONFIG' = 98, 'SYSTEM RELOAD SYMBOLS' = 99, 'SYSTEM RELOAD DICTIONARY' = 100, 'SYSTEM RELOAD MODEL' = 101, 'SYSTEM RELOAD FUNCTION' = 102, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 103, 'SYSTEM RELOAD' = 104, 'SYSTEM RESTART DISK' = 105, 'SYSTEM MERGES' = 106, 'SYSTEM TTL MERGES' = 107, 'SYSTEM FETCHES' = 108, 'SYSTEM MOVES' = 109, 'SYSTEM DISTRIBUTED SENDS' = 110, 'SYSTEM REPLICATED SENDS' = 111, 'SYSTEM SENDS' = 112, 'SYSTEM REPLICATION QUEUES' = 113, 'SYSTEM DROP REPLICA' = 114, 'SYSTEM SYNC REPLICA' = 115, 'SYSTEM RESTART REPLICA' = 116, 'SYSTEM RESTORE REPLICA' = 117, 'SYSTEM SYNC DATABASE REPLICA' = 118, 'SYSTEM SYNC TRANSACTION LOG' = 119, 'SYSTEM FLUSH DISTRIBUTED' = 120, 'SYSTEM FLUSH LOGS' = 121, 'SYSTEM FLUSH' = 122, 'SYSTEM THREAD FUZZER' = 123, 'SYSTEM UNFREEZE' = 124, 'SYSTEM' = 125, 'dictGet' = 126, 'addressToLine' = 127, 'addressToLineWithInlines' = 128, 'addressToSymbol' = 129, 'demangle' = 130, 'INTROSPECTION' = 131, 'FILE' = 132, 'URL' = 133, 'REMOTE' = 134, 'MONGO' = 135, 'MEILISEARCH' = 136, 'MYSQL' = 137, 'POSTGRES' = 138, 'SQLITE' = 139, 'ODBC' = 140, 'JDBC' = 141, 'HDFS' = 142, 'S3' = 143, 'HIVE' = 144, 'SOURCES' = 145, 'CLUSTER' = 146, 'ALL' = 147, 'NONE' = 148),
     `aliases` Array(String),
     `level` Nullable(Enum8('GLOBAL' = 0, 'DATABASE' = 1, 'TABLE' = 2, 'DICTIONARY' = 3, 'VIEW' = 4, 'COLUMN' = 5)),
-    `parent_group` Nullable(Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER TABLE' = 41, 'ALTER DATABASE' = 42, 'ALTER VIEW REFRESH' = 43, 'ALTER VIEW MODIFY QUERY' = 44, 'ALTER VIEW' = 45, 'ALTER' = 46, 'CREATE DATABASE' = 47, 'CREATE TABLE' = 48, 'CREATE VIEW' = 49, 'CREATE DICTIONARY' = 50, 'CREATE TEMPORARY TABLE' = 51, 'CREATE FUNCTION' = 52, 'CREATE' = 53, 'DROP DATABASE' = 54, 'DROP TABLE' = 55, 'DROP VIEW' = 56, 'DROP DICTIONARY' = 57, 'DROP FUNCTION' = 58, 'DROP' = 59, 'TRUNCATE' = 60, 'OPTIMIZE' = 61, 'BACKUP' = 62, 'KILL QUERY' = 63, 'KILL TRANSACTION' = 64, 'MOVE PARTITION BETWEEN SHARDS' = 65, 'CREATE USER' = 66, 'ALTER USER' = 67, 'DROP USER' = 68, 'CREATE ROLE' = 69, 'ALTER ROLE' = 70, 'DROP ROLE' = 71, 'ROLE ADMIN' = 72, 'CREATE ROW POLICY' = 73, 'ALTER ROW POLICY' = 74, 'DROP ROW POLICY' = 75, 'CREATE QUOTA' = 76, 'ALTER QUOTA' = 77, 'DROP QUOTA' = 78, 'CREATE SETTINGS PROFILE' = 79, 'ALTER SETTINGS PROFILE' = 80, 'DROP SETTINGS PROFILE' = 81, 'SHOW USERS' = 82, 'SHOW ROLES' = 83, 'SHOW ROW POLICIES' = 84, 'SHOW QUOTAS' = 85, 'SHOW SETTINGS PROFILES' = 86, 'SHOW ACCESS' = 87, 'ACCESS MANAGEMENT' = 88, 'SYSTEM SHUTDOWN' = 89, 'SYSTEM DROP DNS CACHE' = 90, 'SYSTEM DROP MARK CACHE' = 91, 'SYSTEM DROP UNCOMPRESSED CACHE' = 92, 'SYSTEM DROP MMAP CACHE' = 93, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 94, 'SYSTEM DROP FILESYSTEM CACHE' = 95, 'SYSTEM DROP CACHE' = 96, 'SYSTEM RELOAD CONFIG' = 97, 'SYSTEM RELOAD SYMBOLS' = 98, 'SYSTEM RELOAD DICTIONARY' = 99, 'SYSTEM RELOAD MODEL' = 100, 'SYSTEM RELOAD FUNCTION' = 101, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 102, 'SYSTEM RELOAD' = 103, 'SYSTEM RESTART DISK' = 104, 'SYSTEM MERGES' = 105, 'SYSTEM TTL MERGES' = 106, 'SYSTEM FETCHES' = 107, 'SYSTEM MOVES' = 108, 'SYSTEM DISTRIBUTED SENDS' = 109, 'SYSTEM REPLICATED SENDS' = 110, 'SYSTEM SENDS' = 111, 'SYSTEM REPLICATION QUEUES' = 112, 'SYSTEM DROP REPLICA' = 113, 'SYSTEM SYNC REPLICA' = 114, 'SYSTEM RESTART REPLICA' = 115, 'SYSTEM RESTORE REPLICA' = 116, 'SYSTEM SYNC DATABASE REPLICA' = 117, 'SYSTEM SYNC TRANSACTION LOG' = 118, 'SYSTEM FLUSH DISTRIBUTED' = 119, 'SYSTEM FLUSH LOGS' = 120, 'SYSTEM FLUSH' = 121, 'SYSTEM THREAD FUZZER' = 122, 'SYSTEM UNFREEZE' = 123, 'SYSTEM' = 124, 'dictGet' = 125, 'addressToLine' = 126, 'addressToLineWithInlines' = 127, 'addressToSymbol' = 128, 'demangle' = 129, 'INTROSPECTION' = 130, 'FILE' = 131, 'URL' = 132, 'REMOTE' = 133, 'MONGO' = 134, 'MEILISEARCH' = 135, 'MYSQL' = 136, 'POSTGRES' = 137, 'SQLITE' = 138, 'ODBC' = 139, 'JDBC' = 140, 'HDFS' = 141, 'S3' = 142, 'HIVE' = 143, 'SOURCES' = 144, 'CLUSTER' = 145, 'ALL' = 146, 'NONE' = 147))
+    `parent_group` Nullable(Enum16('SHOW DATABASES' = 0, 'SHOW TABLES' = 1, 'SHOW COLUMNS' = 2, 'SHOW DICTIONARIES' = 3, 'SHOW' = 4, 'SHOW CACHES' = 5, 'SELECT' = 6, 'INSERT' = 7, 'ALTER UPDATE' = 8, 'ALTER DELETE' = 9, 'ALTER ADD COLUMN' = 10, 'ALTER MODIFY COLUMN' = 11, 'ALTER DROP COLUMN' = 12, 'ALTER COMMENT COLUMN' = 13, 'ALTER CLEAR COLUMN' = 14, 'ALTER RENAME COLUMN' = 15, 'ALTER MATERIALIZE COLUMN' = 16, 'ALTER COLUMN' = 17, 'ALTER MODIFY COMMENT' = 18, 'ALTER ORDER BY' = 19, 'ALTER SAMPLE BY' = 20, 'ALTER ADD INDEX' = 21, 'ALTER DROP INDEX' = 22, 'ALTER MATERIALIZE INDEX' = 23, 'ALTER CLEAR INDEX' = 24, 'ALTER INDEX' = 25, 'ALTER ADD PROJECTION' = 26, 'ALTER DROP PROJECTION' = 27, 'ALTER MATERIALIZE PROJECTION' = 28, 'ALTER CLEAR PROJECTION' = 29, 'ALTER PROJECTION' = 30, 'ALTER ADD CONSTRAINT' = 31, 'ALTER DROP CONSTRAINT' = 32, 'ALTER CONSTRAINT' = 33, 'ALTER TTL' = 34, 'ALTER MATERIALIZE TTL' = 35, 'ALTER SETTINGS' = 36, 'ALTER MOVE PARTITION' = 37, 'ALTER FETCH PARTITION' = 38, 'ALTER FREEZE PARTITION' = 39, 'ALTER DATABASE SETTINGS' = 40, 'ALTER TABLE' = 41, 'ALTER DATABASE' = 42, 'ALTER VIEW REFRESH' = 43, 'ALTER VIEW MODIFY QUERY' = 44, 'ALTER VIEW' = 45, 'ALTER' = 46, 'CREATE DATABASE' = 47, 'CREATE TABLE' = 48, 'CREATE VIEW' = 49, 'CREATE DICTIONARY' = 50, 'CREATE TEMPORARY TABLE' = 51, 'CREATE FUNCTION' = 52, 'CREATE' = 53, 'DROP DATABASE' = 54, 'DROP TABLE' = 55, 'DROP VIEW' = 56, 'DROP DICTIONARY' = 57, 'DROP FUNCTION' = 58, 'DROP' = 59, 'TRUNCATE' = 60, 'OPTIMIZE' = 61, 'BACKUP' = 62, 'KILL QUERY' = 63, 'KILL TRANSACTION' = 64, 'MOVE PARTITION BETWEEN SHARDS' = 65, 'CREATE USER' = 66, 'ALTER USER' = 67, 'DROP USER' = 68, 'CREATE ROLE' = 69, 'ALTER ROLE' = 70, 'DROP ROLE' = 71, 'ROLE ADMIN' = 72, 'CREATE ROW POLICY' = 73, 'ALTER ROW POLICY' = 74, 'DROP ROW POLICY' = 75, 'CREATE QUOTA' = 76, 'ALTER QUOTA' = 77, 'DROP QUOTA' = 78, 'CREATE SETTINGS PROFILE' = 79, 'ALTER SETTINGS PROFILE' = 80, 'DROP SETTINGS PROFILE' = 81, 'SHOW USERS' = 82, 'SHOW ROLES' = 83, 'SHOW ROW POLICIES' = 84, 'SHOW QUOTAS' = 85, 'SHOW SETTINGS PROFILES' = 86, 'SHOW ACCESS' = 87, 'ACCESS MANAGEMENT' = 88, 'SYSTEM SHUTDOWN' = 89, 'SYSTEM DROP DNS CACHE' = 90, 'SYSTEM DROP MARK CACHE' = 91, 'SYSTEM DROP UNCOMPRESSED CACHE' = 92, 'SYSTEM DROP MMAP CACHE' = 93, 'SYSTEM DROP COMPILED EXPRESSION CACHE' = 94, 'SYSTEM DROP FILESYSTEM CACHE' = 95, 'SYSTEM DROP SCHEMA CACHE' = 96, 'SYSTEM DROP CACHE' = 97, 'SYSTEM RELOAD CONFIG' = 98, 'SYSTEM RELOAD SYMBOLS' = 99, 'SYSTEM RELOAD DICTIONARY' = 100, 'SYSTEM RELOAD MODEL' = 101, 'SYSTEM RELOAD FUNCTION' = 102, 'SYSTEM RELOAD EMBEDDED DICTIONARIES' = 103, 'SYSTEM RELOAD' = 104, 'SYSTEM RESTART DISK' = 105, 'SYSTEM MERGES' = 106, 'SYSTEM TTL MERGES' = 107, 'SYSTEM FETCHES' = 108, 'SYSTEM MOVES' = 109, 'SYSTEM DISTRIBUTED SENDS' = 110, 'SYSTEM REPLICATED SENDS' = 111, 'SYSTEM SENDS' = 112, 'SYSTEM REPLICATION QUEUES' = 113, 'SYSTEM DROP REPLICA' = 114, 'SYSTEM SYNC REPLICA' = 115, 'SYSTEM RESTART REPLICA' = 116, 'SYSTEM RESTORE REPLICA' = 117, 'SYSTEM SYNC DATABASE REPLICA' = 118, 'SYSTEM SYNC TRANSACTION LOG' = 119, 'SYSTEM FLUSH DISTRIBUTED' = 120, 'SYSTEM FLUSH LOGS' = 121, 'SYSTEM FLUSH' = 122, 'SYSTEM THREAD FUZZER' = 123, 'SYSTEM UNFREEZE' = 124, 'SYSTEM' = 125, 'dictGet' = 126, 'addressToLine' = 127, 'addressToLineWithInlines' = 128, 'addressToSymbol' = 129, 'demangle' = 130, 'INTROSPECTION' = 131, 'FILE' = 132, 'URL' = 133, 'REMOTE' = 134, 'MONGO' = 135, 'MEILISEARCH' = 136, 'MYSQL' = 137, 'POSTGRES' = 138, 'SQLITE' = 139, 'ODBC' = 140, 'JDBC' = 141, 'HDFS' = 142, 'S3' = 143, 'HIVE' = 144, 'SOURCES' = 145, 'CLUSTER' = 146, 'ALL' = 147, 'NONE' = 148))
 )
 ENGINE = SystemPrivileges
 COMMENT 'SYSTEM TABLE is built on the fly.'
diff --git a/tests/queries/0_stateless/02124_insert_deduplication_token_materialized_views.reference b/tests/queries/0_stateless/02124_insert_deduplication_token_materialized_views.reference
new file mode 100644
index 00000000000..e0cc8f0ce63
--- /dev/null
+++ b/tests/queries/0_stateless/02124_insert_deduplication_token_materialized_views.reference
@@ -0,0 +1,8 @@
+deduplicate_blocks_in_dependent_materialized_views=0, insert_deduplication_token = no, results inconsitent
+18	18	9	18
+deduplicate_blocks_in_dependent_materialized_views=1, insert_deduplication_token = no, results inconsitent
+18	9	9	9
+deduplicate_blocks_in_dependent_materialized_views=0, insert_deduplication_token = yes, results inconsitent
+18	18	9	18
+deduplicate_blocks_in_dependent_materialized_views=1, insert_deduplication_token = yes, results consitent
+18	18	18	18
diff --git a/tests/queries/0_stateless/02124_insert_deduplication_token_materialized_views.sql b/tests/queries/0_stateless/02124_insert_deduplication_token_materialized_views.sql
new file mode 100644
index 00000000000..88d3165d060
--- /dev/null
+++ b/tests/queries/0_stateless/02124_insert_deduplication_token_materialized_views.sql
@@ -0,0 +1,93 @@
+-- Tags: long
+
+select 'deduplicate_blocks_in_dependent_materialized_views=0, insert_deduplication_token = no, results inconsitent';
+
+drop table if exists test  sync;
+drop table if exists test_mv_a sync;
+drop table if exists test_mv_b sync;
+drop table if exists test_mv_c sync;
+
+set deduplicate_blocks_in_dependent_materialized_views=0;
+
+CREATE TABLE test (test String, A Int64, B Int64) ENGINE = ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1')
+ORDER BY tuple();
+
+CREATE MATERIALIZED VIEW test_mv_a Engine=ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1')
+order by tuple() AS SELECT test, A, count() c FROM test group by test, A;
+
+CREATE MATERIALIZED VIEW test_mv_b Engine=ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1')
+partition by A order by tuple() AS SELECT test, A, count() c FROM test group by test, A;
+
+CREATE MATERIALIZED VIEW test_mv_c Engine=ReplicatedMergeTree ('/clickhouse/tables/{database}/test_02124/{table}', '1')
+order by tuple() AS SELECT test, A, count() c FROM test group by test, A;
+
+SET max_partitions_per_insert_block = 1;
+INSERT INTO test SELECT 'case1', number%3, 1 FROM numbers(9); -- { serverError 252 }
+SET max_partitions_per_insert_block = 0;
+INSERT INTO test SELECT 'case1', number%3, 1 FROM numbers(9);
+INSERT INTO test SELECT 'case1', number%3, 2 FROM numbers(9);
+INSERT INTO test SELECT 'case1', number%3, 2 FROM numbers(9);
+
+select
+  (select count() from test where test='case1'),
+  (select sum(c) from test_mv_a where test='case1'),
+  (select sum(c) from test_mv_b where test='case1'),
+  (select sum(c) from test_mv_c where test='case1');
+
+
+select 'deduplicate_blocks_in_dependent_materialized_views=1, insert_deduplication_token = no, results inconsitent';
+
+set deduplicate_blocks_in_dependent_materialized_views=1;
+
+SET max_partitions_per_insert_block = 1;
+INSERT INTO test SELECT 'case2', number%3, 1 FROM numbers(9) ; -- { serverError 252 }
+SET max_partitions_per_insert_block = 0;
+INSERT INTO test SELECT 'case2', number%3, 1 FROM numbers(9);
+INSERT INTO test SELECT 'case2', number%3, 2 FROM numbers(9);
+INSERT INTO test SELECT 'case2', number%3, 2 FROM numbers(9);
+
+select
+  (select count() from test where test='case2'),
+  (select sum(c) from test_mv_a where test='case2'),
+  (select sum(c) from test_mv_b where test='case2'),
+  (select sum(c) from test_mv_c where test='case2');
+
+
+select 'deduplicate_blocks_in_dependent_materialized_views=0, insert_deduplication_token = yes, results inconsitent';
+
+set deduplicate_blocks_in_dependent_materialized_views=0;
+
+SET max_partitions_per_insert_block = 1;
+INSERT INTO test SELECT 'case3', number%3, 1 FROM numbers(9) SETTINGS insert_deduplication_token = 'case3test1'; -- { serverError 252 }
+SET max_partitions_per_insert_block = 0;
+INSERT INTO test SELECT 'case3', number%3, 1 FROM numbers(9) SETTINGS insert_deduplication_token = 'case3test1';
+INSERT INTO test SELECT 'case3', number%3, 2 FROM numbers(9) SETTINGS insert_deduplication_token = 'case3test2';
+INSERT INTO test SELECT 'case3', number%3, 2 FROM numbers(9) SETTINGS insert_deduplication_token = 'case3test2';
+
+select
+  (select count() from test where test='case3'),
+  (select sum(c) from test_mv_a where test='case3'),
+  (select sum(c) from test_mv_b where test='case3'),
+  (select sum(c) from test_mv_c where test='case3');
+
+select 'deduplicate_blocks_in_dependent_materialized_views=1, insert_deduplication_token = yes, results consitent';
+
+set deduplicate_blocks_in_dependent_materialized_views=1;
+
+SET max_partitions_per_insert_block = 1;
+INSERT INTO test SELECT 'case4', number%3, 1 FROM numbers(9) SETTINGS insert_deduplication_token = 'case4test1' ; -- { serverError 252 }
+SET max_partitions_per_insert_block = 0;
+INSERT INTO test SELECT 'case4', number%3, 1 FROM numbers(9) SETTINGS insert_deduplication_token = 'case4test1';
+INSERT INTO test SELECT 'case4', number%3, 2 FROM numbers(9) SETTINGS insert_deduplication_token = 'case4test2';
+INSERT INTO test SELECT 'case4', number%3, 2 FROM numbers(9) SETTINGS insert_deduplication_token = 'case4test2';
+
+select
+  (select count() from test where test='case4'),
+  (select sum(c) from test_mv_a where test='case4'),
+  (select sum(c) from test_mv_b where test='case4'),
+  (select sum(c) from test_mv_c where test='case4');
+
+drop table test sync;
+drop table test_mv_a sync;
+drop table test_mv_b sync;
+drop table test_mv_c sync;
diff --git a/tests/queries/0_stateless/02136_scalar_progress.reference b/tests/queries/0_stateless/02136_scalar_progress.reference
index 21f6d3e0043..e9204f2d02e 100644
--- a/tests/queries/0_stateless/02136_scalar_progress.reference
+++ b/tests/queries/0_stateless/02136_scalar_progress.reference
@@ -1,6 +1,6 @@
-< X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000"}
-< X-ClickHouse-Progress: {"read_rows":"65505","read_bytes":"524040","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000"}
-< X-ClickHouse-Progress: {"read_rows":"131010","read_bytes":"1048080","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000"}
-< X-ClickHouse-Progress: {"read_rows":"131011","read_bytes":"1048081","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000"}
-< X-ClickHouse-Progress: {"read_rows":"131011","read_bytes":"1048081","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000"}
-< X-ClickHouse-Summary: {"read_rows":"131011","read_bytes":"1048081","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000"}
+< X-ClickHouse-Progress: {"read_rows":"0","read_bytes":"0","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"65505","read_bytes":"524040","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"131010","read_bytes":"1048080","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"131011","read_bytes":"1048081","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"0","result_bytes":"0"}
+< X-ClickHouse-Progress: {"read_rows":"131011","read_bytes":"1048081","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"1","result_bytes":"80"}
+< X-ClickHouse-Summary: {"read_rows":"131011","read_bytes":"1048081","written_rows":"0","written_bytes":"0","total_rows_to_read":"100000","result_rows":"1","result_bytes":"80"}
diff --git a/tests/queries/0_stateless/02149_schema_inference.reference b/tests/queries/0_stateless/02149_schema_inference.reference
index 2d7dd5caca7..954e1813157 100644
--- a/tests/queries/0_stateless/02149_schema_inference.reference
+++ b/tests/queries/0_stateless/02149_schema_inference.reference
@@ -1,22 +1,22 @@
 TSV
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
 42	Some string	[1,2,3,4]	(1,2,3)
 42	abcd	[]	(4,5,6)
 TSVWithNames
-number	Nullable(Float64)					
+number	Nullable(Int64)					
 string	Nullable(String)					
-array	Array(Nullable(Float64))					
-tuple	Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64))					
+array	Array(Nullable(Int64))					
+tuple	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
 42	Some string	[1,2,3,4]	(1,2,3)
 42	abcd	[]	(4,5,6)
 CSV
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
 c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
-c4	Array(Nullable(Float64))					
+c4	Array(Nullable(Int64))					
 \N	Some string	[([1,2.3],'String'),([],NULL)]	[1,NULL,3]
 42	\N	[([1,2.3],'String'),([3],'abcd')]	[4,5,6]
 c1	Nullable(String)					
@@ -28,54 +28,54 @@ c2	Nullable(String)
 \N	[NULL, NULL]
 \N	[]
 CSVWithNames
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
 c	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
-d	Array(Nullable(Float64))					
+d	Array(Nullable(Int64))					
 \N	Some string	[([1,2.3],'String'),([],NULL)]	[1,NULL,3]
 42	\N	[([1,2.3],'String'),([3],'abcd')]	[4,5,6]
 JSONCompactEachRow
 c1	Nullable(Float64)					
-c2	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c3	Map(String, Nullable(Float64))					
+c2	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c3	Map(String, Nullable(Int64))					
 c4	Nullable(Bool)					
 42.42	[(1,'String'),(2,'abcd')]	{'key':42,'key2':24}	true
-c1	Nullable(Float64)					
-c2	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c3	Map(String, Nullable(Float64))					
+c1	Nullable(Int64)					
+c2	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c3	Map(String, Nullable(Int64))					
 c4	Nullable(Bool)					
 \N	[(1,'String'),(2,NULL)]	{'key':NULL,'key2':24}	\N
 32	[(2,'String 2'),(3,'hello')]	{'key3':4242,'key4':2424}	true
 JSONCompactEachRowWithNames
 a	Nullable(Float64)					
-b	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c	Map(String, Nullable(Float64))					
+b	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c	Map(String, Nullable(Int64))					
 d	Nullable(Bool)					
 42.42	[(1,'String'),(2,'abcd')]	{'key':42,'key2':24}	true
 JSONEachRow
 a	Nullable(Float64)					
-b	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c	Map(String, Nullable(Float64))					
+b	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c	Map(String, Nullable(Int64))					
 d	Nullable(Bool)					
 42.42	[(1,'String'),(2,'abcd')]	{'key':42,'key2':24}	true
-a	Nullable(Float64)					
-b	Array(Tuple(Nullable(Float64), Nullable(String)))					
-c	Map(String, Nullable(Float64))					
+a	Nullable(Int64)					
+b	Array(Tuple(Nullable(Int64), Nullable(String)))					
+c	Map(String, Nullable(Int64))					
 d	Nullable(Bool)					
 \N	[(1,'String'),(2,NULL)]	{'key':NULL,'key2':24}	\N
 32	[(2,'String 2'),(3,'hello')]	{'key3':4242,'key4':2424}	true
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	\N	[2]
 \N	\N	[]
 \N	\N	[]
 \N	\N	[3]
 TSKV
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	}	[2]
 \N	\N	[]
@@ -84,77 +84,77 @@ c	Array(Nullable(Float64))
 Values
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(String))					
-c5	Tuple(Array(Nullable(Float64)), Array(Tuple(Nullable(Float64), Nullable(String))))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(String))					
+c5	Tuple(Array(Nullable(Int64)), Array(Tuple(Nullable(Int64), Nullable(String))))					
 42.42	Some string	[1,2,3]	(1,'2')	([1,2],[(3,'4'),(5,'6')])
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(Float64))					
-c5	Tuple(Array(Nullable(Float64)), Array(Tuple(Nullable(Float64), Nullable(String))))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(Int64))					
+c5	Tuple(Array(Nullable(Int64)), Array(Tuple(Nullable(Int64), Nullable(String))))					
 42.42	\N	[1,NULL,3]	(1,NULL)	([1,2],[(3,'4'),(5,'6')])
 \N	Some string	[10]	(1,2)	([],[])
 Regexp
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
 c3	Nullable(String)					
 42	Some string 1	[([1, 2, 3], String 1), ([], String 1)]
 2	Some string 2	[([4, 5, 6], String 2), ([], String 2)]
 312	Some string 3	[([1, 2, 3], String 2), ([], String 2)]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42	Some string 1	[([1,2,3],'String 1'),([],'String 1')]
 3	Some string 2	[([3,5,1],'String 2'),([],'String 2')]
 244	Some string 3	[([],'String 3'),([],'String 3')]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42	Some string 1	[([1,2,3],'String 1'),([],'String 1')]
 2	Some string 2	[([],'String 2'),([],'String 2')]
 43	Some string 3	[([1,5,3],'String 3'),([],'String 3')]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 52	Some string 2	[([],'String 2'),([1],'String 2')]
 24	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 CustomSeparated
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 c1	Nullable(Float64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 Template
 column_1	Nullable(Float64)					
 column_2	Nullable(String)					
-column_3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+column_3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 column_1	Nullable(Float64)					
 column_2	Nullable(String)					
-column_3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+column_3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
 column_1	Nullable(Float64)					
 column_2	Nullable(String)					
-column_3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+column_3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 42.42	Some string 1	[([1,2,3],'String 1'),([1],'String 1')]
 42	Some string 2	[([],'String 2'),([],'String 2')]
 \N	Some string 3	[([1,2,3],'String 3'),([1],'String 3')]
diff --git a/tests/queries/0_stateless/02188_table_function_format.reference b/tests/queries/0_stateless/02188_table_function_format.reference
index 403a4044544..5d7febda187 100644
--- a/tests/queries/0_stateless/02188_table_function_format.reference
+++ b/tests/queries/0_stateless/02188_table_function_format.reference
@@ -39,9 +39,9 @@ World	123
 Hello	111
 World	123
 1	2	[1,2,3]	[['abc'],[],['d','e']]
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Array(Nullable(Float64))					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Array(Nullable(Int64))					
 c4	Array(Array(Nullable(String)))					
 Hello	111
 World	123
@@ -49,4 +49,4 @@ Hello	111
 Hello	131
 World	123
 a	Nullable(String)					
-b	Nullable(Float64)					
+b	Nullable(Int64)					
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.reference b/tests/queries/0_stateless/02210_processors_profile_log.reference
index 1a7dd64d657..181022d2421 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log.reference
+++ b/tests/queries/0_stateless/02210_processors_profile_log.reference
@@ -25,13 +25,17 @@ SELECT
         -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
         -- so they cannot starts to execute before sleep(1) will be executed.
         input_wait_elapsed_us>1e6)
-    elapsed
+    elapsed,
+    input_rows,
+    input_bytes,
+    output_rows,
+    output_bytes
 FROM system.processors_profile_log
 WHERE query_id = query_id_
 ORDER BY name;
-ExpressionTransform	1
-LazyOutputFormat	1
-LimitsCheckingTransform	1
-NullSource	1
-NullSource	1
-SourceFromSingleChunk	1
+ExpressionTransform	1	1	1	1	1
+LazyOutputFormat	1	1	1	0	0
+LimitsCheckingTransform	1	1	1	1	1
+NullSource	1	0	0	0	0
+NullSource	1	0	0	0	0
+SourceFromSingleChunk	1	0	0	1	1
diff --git a/tests/queries/0_stateless/02210_processors_profile_log.sql b/tests/queries/0_stateless/02210_processors_profile_log.sql
index 160f8009262..44e563ef57b 100644
--- a/tests/queries/0_stateless/02210_processors_profile_log.sql
+++ b/tests/queries/0_stateless/02210_processors_profile_log.sql
@@ -22,7 +22,11 @@ SELECT
         -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
         -- so they cannot starts to execute before sleep(1) will be executed.
         input_wait_elapsed_us>1e6)
-    elapsed
+    elapsed,
+    input_rows,
+    input_bytes,
+    output_rows,
+    output_bytes
 FROM system.processors_profile_log
 WHERE query_id = query_id_
 ORDER BY name;
diff --git a/tests/queries/0_stateless/02210_processors_profile_log_2.reference b/tests/queries/0_stateless/02210_processors_profile_log_2.reference
new file mode 100644
index 00000000000..5467c7ef2ba
--- /dev/null
+++ b/tests/queries/0_stateless/02210_processors_profile_log_2.reference
@@ -0,0 +1,11 @@
+499999500000
+AggregatingTransform	1000001	8000008	1	8
+ConvertingAggregatedToChunksTransform	0	0	1	8
+ExpressionTransform	1	8	1	8
+ExpressionTransform	1000000	8000000	1000000	8000000
+LazyOutputFormat	1	8	0	0
+LimitsCheckingTransform	1	8	1	8
+NullSource	0	0	0	0
+NumbersMt	0	0	1000000	8000000
+Resize	1	8	1	8
+Resize	1	8	1	8
diff --git a/tests/queries/0_stateless/02210_processors_profile_log_2.sh b/tests/queries/0_stateless/02210_processors_profile_log_2.sh
new file mode 100755
index 00000000000..93eabc2f0fe
--- /dev/null
+++ b/tests/queries/0_stateless/02210_processors_profile_log_2.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+QUERY_ID=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4()))))")
+
+
+${CLICKHOUSE_CLIENT} --query_id "${QUERY_ID}" <<EOF
+SELECT sum(number) FROM numbers_mt(1000000)
+SETTINGS max_threads = 4, log_processors_profiles=true, log_queries=1, log_queries_min_type='QUERY_FINISH';
+EOF
+
+${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
+
+${CLICKHOUSE_CLIENT} -q "select name, sum(input_rows), sum(input_bytes), sum(output_rows), sum(output_bytes) from system.processors_profile_log where query_id = '${QUERY_ID}' group by name, plan_step, plan_group order by name, sum(input_rows), sum(input_bytes), sum(output_rows), sum(output_bytes)"
diff --git a/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference b/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference
index 6920aa16198..4a4389f638e 100644
--- a/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference
+++ b/tests/queries/0_stateless/02211_shcema_inference_from_stdin.reference
@@ -1,4 +1,4 @@
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 0
 1
 2
@@ -9,7 +9,7 @@ x	Nullable(Float64)
 7
 8
 9
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 1	2	3
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
index bd0c9cee464..c53187a963c 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted.reference
@@ -60,15 +60,7 @@ quorum
 quorum
 replicas
 replicas
-shared
-shared
-shared
-shared
 table_shared_id
 table_shared_id
 temp
 temp
-zero_copy_hdfs
-zero_copy_hdfs
-zero_copy_s3
-zero_copy_s3
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
index f95d60dc07b..0ac6e838903 100644
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.reference
@@ -29,12 +29,8 @@ pinned_part_uuids
 queue
 quorum
 replicas
-shared
-shared
 table_shared_id
 temp
-zero_copy_hdfs
-zero_copy_s3
 -------------------------
 1
 alter_partition_version
@@ -67,9 +63,5 @@ pinned_part_uuids
 queue
 quorum
 replicas
-shared
-shared
 table_shared_id
 temp
-zero_copy_hdfs
-zero_copy_s3
diff --git a/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference b/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference
index f32b0eb8a92..effc3644b41 100644
--- a/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference
+++ b/tests/queries/0_stateless/02222_create_table_without_columns_metadata.reference
@@ -1,3 +1,3 @@
-CREATE TABLE default.test\n(\n    `x` Nullable(Float64),\n    `y` Nullable(String)\n)\nENGINE = File(\'JSONEachRow\', \'data.jsonl\')
+CREATE TABLE default.test\n(\n    `x` Nullable(Int64),\n    `y` Nullable(String)\n)\nENGINE = File(\'JSONEachRow\', \'data.jsonl\')
 OK
 OK
diff --git a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference
new file mode 100644
index 00000000000..a2c04163136
--- /dev/null
+++ b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.reference
@@ -0,0 +1,18 @@
+Using storage policy: s3_cache
+1	0	1
+0	1	0
+0
+0	1	0
+
+Using storage policy: local_cache
+1	0	1
+0	1	0
+0
+0	1	0
+
+Using storage policy: azure_cache
+1	0	1
+0	1	0
+0
+0	1	0
+
diff --git a/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
new file mode 100755
index 00000000000..1807fd6bc8e
--- /dev/null
+++ b/tests/queries/0_stateless/02226_filesystem_cache_profile_events.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-s3-storage, no-random-settings, no-cpu-aarch64, no-replicated-database
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TMP_PATH=${CLICKHOUSE_TEST_UNIQUE_NAME}
+QUERIES_FILE=02226_filesystem_cache_profile_events.sh
+TEST_FILE=$CUR_DIR/filesystem_cache_queries/$QUERIES_FILE
+
+for storagePolicy in 's3_cache' 'local_cache' 'azure_cache'; do
+    echo "Using storage policy: $storagePolicy"
+    cat $TEST_FILE | sed -e "s/_storagePolicy/${storagePolicy}/"  > $TMP_PATH
+    chmod +x $TMP_PATH
+    ./$TMP_PATH
+    rm $TMP_PATH
+    echo
+done
diff --git a/tests/queries/0_stateless/02226_s3_with_cache.reference b/tests/queries/0_stateless/02226_s3_with_cache.reference
deleted file mode 100644
index 596e6e5345a..00000000000
--- a/tests/queries/0_stateless/02226_s3_with_cache.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT 1, * FROM test LIMIT 10 FORMAT Null;	1	0	1
-SELECT 2, * FROM test LIMIT 10 FORMAT Null;	0	1	0
-0
-SELECT 3, * FROM test LIMIT 10 FORMAT Null;	0	1	0
diff --git a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
index c84b1ab0e55..3ff2dabfa43 100755
--- a/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
+++ b/tests/queries/0_stateless/02232_allow_only_replicated_engine.sh
@@ -11,8 +11,8 @@ ${CLICKHOUSE_CLIENT} -q "CREATE USER user_${CLICKHOUSE_DATABASE} settings databa
 ${CLICKHOUSE_CLIENT} -q "GRANT CREATE TABLE ON ${CLICKHOUSE_DATABASE}_db.* TO user_${CLICKHOUSE_DATABASE}"
 ${CLICKHOUSE_CLIENT} --allow_experimental_database_replicated=1 --query "CREATE DATABASE ${CLICKHOUSE_DATABASE}_db engine = Replicated('/clickhouse/databases/${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}_db', '{shard}', '{replica}')"
 ${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_memory (x UInt32) engine = Memory;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "set distributed_ddl_entry_format_version=2; CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -n --query "set distributed_ddl_entry_format_version=2; CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;"
-${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "set distributed_ddl_entry_format_version=2; CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt (x UInt32) engine = ReplicatedMergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;" 2>&1 | grep -o "Only tables with a Replicated engine"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_mt (x UInt32) engine = MergeTree order by x;"
+${CLICKHOUSE_CLIENT} --distributed_ddl_output_mode=none --user "user_${CLICKHOUSE_DATABASE}" -n --query "CREATE TABLE ${CLICKHOUSE_DATABASE}_db.tab_rmt (x UInt32) engine = ReplicatedMergeTree order by x;"
 ${CLICKHOUSE_CLIENT} --query "DROP DATABASE ${CLICKHOUSE_DATABASE}_db"
 ${CLICKHOUSE_CLIENT} -q "DROP USER user_${CLICKHOUSE_DATABASE}"
diff --git a/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh b/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh
index a8dce5cb516..322e7e73991 100755
--- a/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh
+++ b/tests/queries/0_stateless/02232_dist_insert_send_logs_level_hung.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: disabled
+# Tags: long, no-parallel
 # Tag: no-parallel - to heavy
 # Tag: long        - to heavy
 
@@ -33,11 +33,14 @@ $CLICKHOUSE_CLIENT "${client_opts[@]}" -nm -q "
     create materialized view mv_02232 to out_02232 as select * from in_02232;
 "
 
+# 600 is the default timeout of clickhouse-test, and 30 is just a safe padding,
+# to avoid hung query check triggering
+insert_timeout=$((600-30))
+# Increase timeouts to avoid timeout during trying to send Log packet to
+# the remote side, when the socket is full.
 insert_client_opts=(
-    # Increase timeouts to avoid timeout during trying to send Log packet to
-    # the remote side, when the socket is full.
-    --send_timeout 86400
-    --receive_timeout 86400
+    --send_timeout "$insert_timeout"
+    --receive_timeout "$insert_timeout"
 )
 # 250 seconds is enough to trigger the query hung (even in debug build)
 #
diff --git a/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference b/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference
new file mode 100644
index 00000000000..c67eecf8cf2
--- /dev/null
+++ b/tests/queries/0_stateless/02240_system_filesystem_cache_table.reference
@@ -0,0 +1,70 @@
+Using storage policy: s3_cache
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_on_write_operations=0;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	79	80
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_3', min_bytes_for_wide_part = 10485760;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+
+Using storage policy: local_cache
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_on_write_operations=0;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='local_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	79	80
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='local_cache_3', min_bytes_for_wide_part = 10485760;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+SELECT  * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
+0	745	746
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SELECT * FROM test FORMAT Null;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+
diff --git a/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh b/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh
new file mode 100755
index 00000000000..5f0412cd237
--- /dev/null
+++ b/tests/queries/0_stateless/02240_system_filesystem_cache_table.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: long, no-fasttest, no-parallel, no-s3-storage, no-random-settings
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TMP_PATH=${CLICKHOUSE_TEST_UNIQUE_NAME}
+QUERIES_FILE=02240_system_filesystem_cache_table.queries
+TEST_FILE=$CUR_DIR/filesystem_cache_queries/$QUERIES_FILE
+
+for storagePolicy in 's3_cache' 'local_cache'; do
+    echo "Using storage policy: $storagePolicy"
+    cat $TEST_FILE | sed -e "s/_storagePolicy/${storagePolicy}/" > $TMP_PATH
+    ${CLICKHOUSE_CLIENT} --queries-file $TMP_PATH
+    rm $TMP_PATH
+    echo
+done
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql b/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql
deleted file mode 100644
index 00a1f5cf5f4..00000000000
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- Tags: no-parallel, no-fasttest, no-s3-storage, no-random-settings
-
--- { echo }
-
-SYSTEM DROP FILESYSTEM CACHE;
-SET enable_filesystem_cache_on_write_operations=0;
-DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
-INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-
-SELECT  * FROM test FORMAT Null;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-SYSTEM DROP FILESYSTEM CACHE;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
-SELECT * FROM test FORMAT Null;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
-SYSTEM DROP FILESYSTEM CACHE;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
-
-DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_3', min_bytes_for_wide_part = 10485760;
-INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-
-SELECT  * FROM test FORMAT Null;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-SELECT  * FROM test FORMAT Null;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-SYSTEM DROP FILESYSTEM CACHE;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
-SELECT * FROM test FORMAT Null;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
-SYSTEM DROP FILESYSTEM CACHE;
-SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql b/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql
deleted file mode 100644
index d49096cb9b2..00000000000
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache_log.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Tags: no-parallel, no-fasttest, no-s3-storage, no-random-settings
-
--- { echo }
-
-SYSTEM DROP FILESYSTEM CACHE;
-SET enable_filesystem_cache_log=1;
-SET enable_filesystem_cache_on_write_operations=0;
-
-DROP TABLE IF EXISTS test;
-DROP TABLE IF EXISTS system.filesystem_cache_log;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
-INSERT INTO test SELECT number, toString(number) FROM numbers(100000);
-
-SELECT 2240, * FROM test FORMAT Null;
-SYSTEM FLUSH LOGS;
-SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_FS_AND_DOWNLOADED_TO_CACHE' AND query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2240%' AND current_database = currentDatabase() ORDER BY event_time desc LIMIT 1);
-
-SELECT 2241, * FROM test FORMAT Null;
-SYSTEM FLUSH LOGS;
-SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE read_type='READ_FROM_CACHE' AND query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2241%' AND current_database = currentDatabase() ORDER BY event_time desc LIMIT 1);
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.reference b/tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.reference
index 76c86a225b6..329ca122af1 100644
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.reference
+++ b/tests/queries/0_stateless/02240_system_remote_filesystem_query_cache.reference
@@ -9,7 +9,6 @@ CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SET
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 SELECT  * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-0	0	1
 0	79	80
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
diff --git a/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference b/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
index d0ced74f8f6..0f8ac77ff74 100644
--- a/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
+++ b/tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
@@ -1,6 +1,6 @@
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	}	[2]
 \N	\N	[]
diff --git a/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference
new file mode 100644
index 00000000000..5a1295db495
--- /dev/null
+++ b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.reference
@@ -0,0 +1,252 @@
+Using storage policy: s3_cache
+-- { echo }
+
+SET enable_filesystem_cache_on_write_operations=1;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+0
+SELECT count() FROM system.filesystem_cache;
+0
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+Row 1:
+──────
+file_segment_range_begin: 0
+file_segment_range_end:   745
+size:                     746
+state:                    DOWNLOADED
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+7
+SELECT count() FROM system.filesystem_cache;
+7
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
+0
+SELECT  * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
+2
+SELECT  * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
+2
+SELECT count() size FROM system.filesystem_cache;
+7
+SYSTEM DROP FILESYSTEM CACHE;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100, 200);
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+Row 1:
+──────
+file_segment_range_begin: 0
+file_segment_range_end:   1659
+size:                     1660
+state:                    DOWNLOADED
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+7
+SELECT count() FROM system.filesystem_cache;
+7
+SELECT count() FROM system.filesystem_cache;
+7
+INSERT INTO test SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=0;
+SELECT count() FROM system.filesystem_cache;
+7
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+INSERT INTO test SELECT number, toString(number) FROM numbers(300, 10000);
+SELECT count() FROM system.filesystem_cache;
+21
+SYSTEM START MERGES test;
+OPTIMIZE TABLE test FINAL;
+SELECT count() FROM system.filesystem_cache;
+31
+SET mutations_sync=2;
+ALTER TABLE test UPDATE value = 'kek' WHERE key = 100;
+SELECT count() FROM system.filesystem_cache;
+38
+INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
+SYSTEM FLUSH LOGS;
+SELECT
+    query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
+FROM
+    system.query_log
+WHERE
+    query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
+    AND type = 'QueryFinish'
+    AND current_database = currentDatabase()
+ORDER BY
+    query_start_time
+    DESC
+LIMIT 1;
+SELECT count() FROM test;
+5010500
+SELECT count() FROM test WHERE value LIKE '%010%';
+18816
+
+Using storage policy: local_cache
+-- { echo }
+
+SET enable_filesystem_cache_on_write_operations=1;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='local_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+0
+SELECT count() FROM system.filesystem_cache;
+0
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+Row 1:
+──────
+file_segment_range_begin: 0
+file_segment_range_end:   745
+size:                     746
+state:                    DOWNLOADED
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+7
+SELECT count() FROM system.filesystem_cache;
+7
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
+0
+SELECT  * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
+2
+SELECT  * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
+2
+SELECT count() size FROM system.filesystem_cache;
+7
+SYSTEM DROP FILESYSTEM CACHE;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100, 200);
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+FROM
+(
+    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+    FROM
+    (
+        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+        FROM system.remote_data_paths
+    ) AS data_paths
+    INNER JOIN
+        system.filesystem_cache AS caches
+    ON data_paths.cache_path = caches.cache_path
+)
+WHERE endsWith(local_path, 'data.bin')
+FORMAT Vertical;
+Row 1:
+──────
+file_segment_range_begin: 0
+file_segment_range_end:   1659
+size:                     1660
+state:                    DOWNLOADED
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+7
+SELECT count() FROM system.filesystem_cache;
+7
+SELECT count() FROM system.filesystem_cache;
+7
+INSERT INTO test SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=0;
+SELECT count() FROM system.filesystem_cache;
+7
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+INSERT INTO test SELECT number, toString(number) FROM numbers(300, 10000);
+SELECT count() FROM system.filesystem_cache;
+21
+SYSTEM START MERGES test;
+OPTIMIZE TABLE test FINAL;
+SELECT count() FROM system.filesystem_cache;
+31
+SET mutations_sync=2;
+ALTER TABLE test UPDATE value = 'kek' WHERE key = 100;
+SELECT count() FROM system.filesystem_cache;
+38
+INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
+SYSTEM FLUSH LOGS;
+SELECT
+    query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
+FROM
+    system.query_log
+WHERE
+    query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
+    AND type = 'QueryFinish'
+    AND current_database = currentDatabase()
+ORDER BY
+    query_start_time
+    DESC
+LIMIT 1;
+SELECT count() FROM test;
+5010500
+SELECT count() FROM test WHERE value LIKE '%010%';
+18816
+
diff --git a/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh
new file mode 100755
index 00000000000..baf1fdf7fed
--- /dev/null
+++ b/tests/queries/0_stateless/02241_filesystem_cache_on_write_operations.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: long, no-fasttest, no-parallel, no-s3-storage, no-random-settings, no-cpu-aarch64
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TMP_PATH=${CLICKHOUSE_TEST_UNIQUE_NAME}
+QUERIES_FILE=02241_filesystem_cache_on_write_operations.queries
+TEST_FILE=$CUR_DIR/filesystem_cache_queries/$QUERIES_FILE
+
+for storagePolicy in 's3_cache' 'local_cache'; do
+    echo "Using storage policy: $storagePolicy"
+    cat $TEST_FILE | sed -e "s/_storagePolicy/${storagePolicy}/"  > $TMP_PATH
+    ${CLICKHOUSE_CLIENT} --queries-file $TMP_PATH
+    rm $TMP_PATH
+    echo
+done
diff --git a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference b/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
deleted file mode 100644
index 3627978dfbc..00000000000
--- a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.reference
+++ /dev/null
@@ -1,124 +0,0 @@
--- { echo }
-
-SET enable_filesystem_cache_on_write_operations=1;
-DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
-SYSTEM STOP MERGES test;
-SYSTEM DROP FILESYSTEM CACHE;
-SELECT file_segment_range_begin, file_segment_range_end, size, state
-FROM
-(
-    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
-    FROM
-    (
-        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
-        FROM system.remote_data_paths
-    ) AS data_paths
-    INNER JOIN
-        system.filesystem_cache AS caches
-    ON data_paths.cache_path = caches.cache_path
-)
-WHERE endsWith(local_path, 'data.bin')
-FORMAT Vertical;
-SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
-0
-SELECT count() FROM system.filesystem_cache;
-0
-INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-SELECT file_segment_range_begin, file_segment_range_end, size, state
-FROM
-(
-    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
-    FROM
-    (
-        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
-        FROM system.remote_data_paths
-    ) AS data_paths
-    INNER JOIN
-        system.filesystem_cache AS caches
-    ON data_paths.cache_path = caches.cache_path
-)
-WHERE endsWith(local_path, 'data.bin')
-FORMAT Vertical;
-Row 1:
-──────
-file_segment_range_begin: 0
-file_segment_range_end:   745
-size:                     746
-state:                    DOWNLOADED
-SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
-7
-SELECT count() FROM system.filesystem_cache;
-7
-SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
-0
-SELECT  * FROM test FORMAT Null;
-SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
-2
-SELECT  * FROM test FORMAT Null;
-SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0;
-2
-SELECT count() size FROM system.filesystem_cache;
-7
-SYSTEM DROP FILESYSTEM CACHE;
-INSERT INTO test SELECT number, toString(number) FROM numbers(100, 200);
-SELECT file_segment_range_begin, file_segment_range_end, size, state
-FROM
-(
-    SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
-    FROM
-    (
-        SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
-        FROM system.remote_data_paths
-    ) AS data_paths
-    INNER JOIN
-        system.filesystem_cache AS caches
-    ON data_paths.cache_path = caches.cache_path
-)
-WHERE endsWith(local_path, 'data.bin')
-FORMAT Vertical;
-Row 1:
-──────
-file_segment_range_begin: 0
-file_segment_range_end:   1659
-size:                     1660
-state:                    DOWNLOADED
-SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
-7
-SELECT count() FROM system.filesystem_cache;
-7
-SELECT count() FROM system.filesystem_cache;
-7
-INSERT INTO test SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=0;
-SELECT count() FROM system.filesystem_cache;
-7
-INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-INSERT INTO test SELECT number, toString(number) FROM numbers(300, 10000);
-SELECT count() FROM system.filesystem_cache;
-21
-SYSTEM START MERGES test;
-OPTIMIZE TABLE test FINAL;
-SELECT count() FROM system.filesystem_cache;
-27
-SET mutations_sync=2;
-ALTER TABLE test UPDATE value = 'kek' WHERE key = 100;
-SELECT count() FROM system.filesystem_cache;
-28
-INSERT INTO test SELECT number, toString(number) FROM numbers(5000000);
-SYSTEM FLUSH LOGS;
-SELECT
-    query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
-FROM
-    system.query_log
-WHERE
-    query LIKE 'SELECT number, toString(number) FROM numbers(5000000)%'
-    AND type = 'QueryFinish'
-    AND current_database = currentDatabase()
-ORDER BY
-    query_start_time
-    DESC
-LIMIT 1;
-SELECT count() FROM test;
-5010500
-SELECT count() FROM test WHERE value LIKE '%010%';
-18816
diff --git a/tests/queries/0_stateless/02242_join_rocksdb.reference b/tests/queries/0_stateless/02242_join_rocksdb.reference
index b1f7307ff4f..5f2ac6c11b7 100644
--- a/tests/queries/0_stateless/02242_join_rocksdb.reference
+++ b/tests/queries/0_stateless/02242_join_rocksdb.reference
@@ -14,6 +14,18 @@
 7	[7,8]	val27
 8	[8,9]	val28
 9	[9,10]	val29
+-- left semi
+0
+2
+3
+6
+7
+8
+9
+-- left anti
+1
+4
+5
 -- join_use_nulls left
 0	0	Nullable(String)	val20
 1	\N	Nullable(String)	\N
diff --git a/tests/queries/0_stateless/02242_join_rocksdb.sql b/tests/queries/0_stateless/02242_join_rocksdb.sql
index 34b3d120eae..9d4cdb7af78 100644
--- a/tests/queries/0_stateless/02242_join_rocksdb.sql
+++ b/tests/queries/0_stateless/02242_join_rocksdb.sql
@@ -26,6 +26,12 @@ SELECT * FROM (SELECT k as key FROM t2) as t2 INNER JOIN rdb ON rdb.key == t2.ke
 SELECT '-- using';
 SELECT * FROM (SELECT k as key FROM t2) as t2 INNER JOIN rdb USING key ORDER BY key;
 
+SELECT '-- left semi';
+SELECT k FROM t2 LEFT SEMI JOIN rdb ON rdb.key == t2.k ORDER BY k;
+
+SELECT '-- left anti';
+SELECT k FROM t2 LEFT ANTI JOIN rdb ON rdb.key == t2.k ORDER BY k;
+
 SELECT '-- join_use_nulls left';
 SELECT k, key, toTypeName(value2), value2 FROM t2 LEFT JOIN rdb ON rdb.key == t2.k ORDER BY k SETTINGS join_use_nulls = 1;
 
@@ -59,6 +65,9 @@ SELECT * FROM t1 INNER JOIN rdb ON rdb.key + 1 == t1.k FORMAT Null SETTINGS join
 SELECT * FROM t1 INNER JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k; -- { serverError NOT_IMPLEMENTED }
 SELECT * FROM t1 INNER JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k FORMAT Null SETTINGS join_algorithm = 'direct,hash';
 
+SELECT * FROM t1 RIGHT SEMI JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k; -- { serverError NOT_IMPLEMENTED }
+SELECT * FROM t1 RIGHT ANTI JOIN (SELECT * FROM rdb) AS rdb ON rdb.key == t1.k; -- { serverError NOT_IMPLEMENTED }
+
 DROP TABLE IF EXISTS rdb;
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/02242_system_filesystem_cache_log_table.reference b/tests/queries/0_stateless/02242_system_filesystem_cache_log_table.reference
new file mode 100644
index 00000000000..5b37f1adb02
--- /dev/null
+++ b/tests/queries/0_stateless/02242_system_filesystem_cache_log_table.reference
@@ -0,0 +1,42 @@
+Using storage policy: s3_cache
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_log=1;
+SET enable_filesystem_cache_on_write_operations=0;
+DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS system.filesystem_cache_log;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100000);
+SELECT 2240, 's3_cache', * FROM test FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2240%s3_cache%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1);
+(0,519)	READ_FROM_FS_AND_DOWNLOADED_TO_CACHE
+(0,808110)	READ_FROM_FS_AND_DOWNLOADED_TO_CACHE
+SELECT 2241, 's3_cache', * FROM test FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2241%s3_cache%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1);
+(0,808110)	READ_FROM_CACHE
+
+Using storage policy: local_cache
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_log=1;
+SET enable_filesystem_cache_on_write_operations=0;
+DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS system.filesystem_cache_log;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='local_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100000);
+SELECT 2240, 'local_cache', * FROM test FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2240%local_cache%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1);
+(0,519)	READ_FROM_FS_AND_DOWNLOADED_TO_CACHE
+(0,808110)	READ_FROM_FS_AND_DOWNLOADED_TO_CACHE
+SELECT 2241, 'local_cache', * FROM test FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2241%local_cache%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1);
+(0,808110)	READ_FROM_CACHE
+
diff --git a/tests/queries/0_stateless/02242_system_filesystem_cache_log_table.sh b/tests/queries/0_stateless/02242_system_filesystem_cache_log_table.sh
new file mode 100755
index 00000000000..b5dbc5c9f78
--- /dev/null
+++ b/tests/queries/0_stateless/02242_system_filesystem_cache_log_table.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: long, no-fasttest, no-parallel, no-s3-storage, no-random-settings
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TMP_PATH=${CLICKHOUSE_TEST_UNIQUE_NAME}
+QUERIES_FILE=02242_system_filesystem_cache_log_table.queries
+TEST_FILE=$CUR_DIR/filesystem_cache_queries/$QUERIES_FILE
+
+for storagePolicy in 's3_cache' 'local_cache'; do
+    echo "Using storage policy: $storagePolicy"
+    cat $TEST_FILE | sed -e "s/_storagePolicy/${storagePolicy}/"  > $TMP_PATH
+    ${CLICKHOUSE_CLIENT} --queries-file $TMP_PATH
+    rm $TMP_PATH
+    echo
+done
diff --git a/tests/queries/0_stateless/02243_make_date32.reference b/tests/queries/0_stateless/02243_make_date32.reference
index ac4b10d371a..b986cd285f4 100644
--- a/tests/queries/0_stateless/02243_make_date32.reference
+++ b/tests/queries/0_stateless/02243_make_date32.reference
@@ -28,10 +28,9 @@ Nullable(Date32)
 1969-01-01
 1969-12-01
 1969-12-31
-2282-01-01
-2283-01-01
-2283-11-11
-1970-01-01
+2298-01-01
+2299-01-01
+2299-12-31
 1970-01-01
 1970-01-01
 1970-01-01
diff --git a/tests/queries/0_stateless/02243_make_date32.sql b/tests/queries/0_stateless/02243_make_date32.sql
index c01855546c5..2cf4ac6b358 100644
--- a/tests/queries/0_stateless/02243_make_date32.sql
+++ b/tests/queries/0_stateless/02243_make_date32.sql
@@ -39,14 +39,13 @@ select makeDate32(2150,1,1);
 select makeDate32(1969,1,1);
 select makeDate32(1969,12,1);
 select makeDate32(1969,12,31);
-select makeDate32(2282,1,1);
-select makeDate32(2283,1,1);
-select makeDate32(2283,11,11);
-select makeDate32(2283,11,12);
-select makeDate32(2284,1,1);
-select makeDate32(1924,1,1);
-select makeDate32(1924,12,1);
-select makeDate32(1924,12,31);
+select makeDate32(2298,1,1);
+select makeDate32(2299,1,1);
+select makeDate32(2299,12,31);
+select makeDate32(2300,1,1);
+select makeDate32(1899,1,1);
+select makeDate32(1899,12,1);
+select makeDate32(1899,12,31);
 select makeDate32(1970,0,0);
 select makeDate32(1970,0,1);
 select makeDate32(1970,1,0);
diff --git a/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference b/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference
index d237caf630f..7a124346b9f 100644
--- a/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference
+++ b/tests/queries/0_stateless/02244_column_names_in_shcmea_inference.reference
@@ -1,8 +1,8 @@
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
 x	Nullable(String)					
-y	Nullable(Float64)					
+y	Nullable(Int64)					
diff --git a/tests/queries/0_stateless/02244_hdfs_cluster.reference b/tests/queries/0_stateless/02244_hdfs_cluster.reference
index 4bf4799e904..32a9f24388c 100644
--- a/tests/queries/0_stateless/02244_hdfs_cluster.reference
+++ b/tests/queries/0_stateless/02244_hdfs_cluster.reference
@@ -22,24 +22,24 @@
 1	2	3
 4	5	6
 7	8	9
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt32					
 c2	UInt32					
 c3	UInt32					
 c1	UInt32					
 c2	UInt32					
 c3	UInt32					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt32					
 c2	UInt32					
 c3	UInt32					
diff --git a/tests/queries/0_stateless/02245_make_datetime64.reference b/tests/queries/0_stateless/02245_make_datetime64.reference
index eea768f1dc7..0ac672ae54d 100644
--- a/tests/queries/0_stateless/02245_make_datetime64.reference
+++ b/tests/queries/0_stateless/02245_make_datetime64.reference
@@ -8,9 +8,9 @@ DateTime64(3)
 DateTime64(6)
 DateTime64(7, \'CET\')
 DateTime64(7, \'UTC\')
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-2283-11-11 23:59:59.99999999
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+2299-12-31 23:59:59.99999999
 2262-04-11 23:47:16.854775807
 2262-04-11 23:47:16.85477581
 1991-08-24 21:04:00
@@ -23,10 +23,10 @@ DateTime64(7, \'UTC\')
 1991-08-24 21:04:00.0001234
 1991-08-24 21:04:00.00001234
 1991-08-24 21:04:00.000001234
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
 1984-01-02 01:00:00.000000000
 1984-01-01 01:10:00.000000000
 1984-01-01 00:01:10.000000000
@@ -37,22 +37,22 @@ DateTime64(7, \'UTC\')
 1983-03-02 02:03:04.000000005
 1984-03-02 02:03:04.000000005
 1983-03-03 02:03:04.000000005
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
 1984-01-01 02:03:04.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
-1925-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
+1900-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
@@ -61,9 +61,9 @@ DateTime64(7, \'UTC\')
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
 1984-01-01 00:00:00.000000000
-2283-11-11 23:59:59.999
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
-1925-01-01 00:00:00.000
+2299-12-31 23:59:59.999
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
+1900-01-01 00:00:00.000
diff --git a/tests/queries/0_stateless/02245_make_datetime64.sql b/tests/queries/0_stateless/02245_make_datetime64.sql
index 2e2d81fa363..054cbd8956d 100644
--- a/tests/queries/0_stateless/02245_make_datetime64.sql
+++ b/tests/queries/0_stateless/02245_make_datetime64.sql
@@ -10,10 +10,10 @@ select toTypeName(makeDateTime64(1991, 8, 24, 21, 4, 0, 1234, 6));
 select toTypeName(makeDateTime64(1991, 8, 24, 21, 4, 0, 1234, 7, 'CET'));
 select toTypeName(cast(makeDateTime64(1991, 8, 24, 21, 4, 0, 1234, 7, 'CET') as DateTime64(7, 'UTC')));
 
-select makeDateTime64(1925, 1, 1, 0, 0, 0, 0, 9, 'UTC');
-select makeDateTime64(1924, 12, 31, 23, 59, 59, 999999999, 9, 'UTC');
-select makeDateTime64(2283, 11, 11, 23, 59, 59, 99999999, 8, 'UTC');
-select makeDateTime64(2283, 11, 11, 23, 59, 59, 999999999, 9, 'UTC'); -- { serverError 407 }
+select makeDateTime64(1900, 1, 1, 0, 0, 0, 0, 9, 'UTC');
+select makeDateTime64(1899, 12, 31, 23, 59, 59, 999999999, 9, 'UTC');
+select makeDateTime64(2299, 12, 31, 23, 59, 59, 99999999, 8, 'UTC');
+select makeDateTime64(2299, 12, 31, 23, 59, 59, 999999999, 9, 'UTC'); -- { serverError 407 }
 select makeDateTime64(2262, 4, 11, 23, 47, 16, 854775807, 9, 'UTC');
 select makeDateTime64(2262, 4, 11, 23, 47, 16, 854775808, 9, 'UTC'); -- { serverError 407 }
 select makeDateTime64(2262, 4, 11, 23, 47, 16, 85477581, 8, 'UTC');
diff --git a/tests/queries/0_stateless/02245_s3_schema_desc.reference b/tests/queries/0_stateless/02245_s3_schema_desc.reference
index e039680d933..d840a365310 100644
--- a/tests/queries/0_stateless/02245_s3_schema_desc.reference
+++ b/tests/queries/0_stateless/02245_s3_schema_desc.reference
@@ -1,21 +1,21 @@
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt64					
 c2	UInt64					
 c3	UInt64					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt64					
 c2	UInt64					
 c3	UInt64					
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 c1	UInt64					
 c2	UInt64					
 c3	UInt64					
diff --git a/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference b/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
index c245f13fdbe..1c60e40942c 100644
--- a/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
+++ b/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
@@ -1,8 +1,8 @@
 TSV
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64))					
+c3	Array(Nullable(Int64))					
+c4	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
 42	Some string	[1,2,3,4]	(1,2,3)
 42	abcd	[]	(4,5,6)
 c1	Nullable(String)					
@@ -70,8 +70,8 @@ c1	Nullable(String)
 CSV
 c1	Nullable(String)					
 c2	Nullable(String)					
-c3	Array(Nullable(Float64))					
-c4	Array(Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64)))					
+c3	Array(Nullable(Int64))					
+c4	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
 42	Some string	[1,2,3,4]	[(1,2,3)]
 42\\	abcd	[]	[(4,5,6)]
 c1	Nullable(String)					
@@ -101,7 +101,7 @@ c1	Nullable(String)
 (1, 2, 3)
 c1	Nullable(String)					
 123.123
-c1	Array(Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64)))					
+c1	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
 [(1,2,3)]
-c1	Array(Tuple(Nullable(Float64), Nullable(Float64), Nullable(Float64)))					
+c1	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
 [(1,2,3)]
diff --git a/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference b/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
index 300846c17a0..c7774c8138b 100644
--- a/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
+++ b/tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
@@ -1,32 +1,32 @@
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	}	[2]
 \N	\N	[]
 \N	\N	[]
 \N	\N	[3]
-b	Nullable(Float64)					
-a	Nullable(Float64)					
-c	Nullable(Float64)					
-e	Nullable(Float64)					
+b	Nullable(Int64)					
+a	Nullable(Int64)					
+c	Nullable(Int64)					
+e	Nullable(Int64)					
 1	\N	\N	\N
 \N	2	3	\N
 \N	\N	\N	\N
 \N	\N	\N	3
 3	3	1	\N
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Nullable(Float64))					
+c	Array(Nullable(Int64))					
 1	s1	[]
 2	\N	[2]
 \N	\N	[]
 \N	\N	[]
 \N	\N	[3]
-b	Nullable(Float64)					
-a	Nullable(Float64)					
-c	Nullable(Float64)					
-e	Nullable(Float64)					
+b	Nullable(Int64)					
+a	Nullable(Int64)					
+c	Nullable(Int64)					
+e	Nullable(Int64)					
 1	\N	\N	\N
 \N	2	3	\N
 \N	\N	\N	\N
diff --git a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference
index a7609bdd86b..840e77cb122 100644
--- a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference
+++ b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.reference
@@ -7,6 +7,12 @@ x	Nullable(Float64)
 x	Nullable(Float64)					
 1
 0.42
+x	Array(Nullable(Float64))					
+[1,0]
+[0.42]
+x	Array(Array(Nullable(Int64)))					
+[[1,2,3],[1,0],[1,1,0]]
+[[1,2,3]]
 c1	Nullable(Bool)					
 true
 false
@@ -16,3 +22,9 @@ c1	Nullable(Float64)
 c1	Nullable(Float64)					
 1
 0.42
+c1	Array(Nullable(Float64))					
+[1,0]
+[0.42]
+c1	Array(Array(Nullable(Int64)))					
+[[1,2,3],[1,0],[1,1,0]]
+[[1,2,3]]
diff --git a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh
index 10f050ea6d1..1b689aaf577 100755
--- a/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh
+++ b/tests/queries/0_stateless/02247_read_bools_as_numbers_json.sh
@@ -27,6 +27,16 @@ echo -e '{"x" : true}
 $CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONEachRow')"
 $CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONEachRow')"
 
+echo -e '{"x" : [true, false]}
+{"x" : [0.42]}'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONEachRow')"
+
+echo -e '{"x" : [[1, 2, 3], [true, false], [1, true, false]]}
+{"x" : [[1, 2, 3]]}'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONEachRow')"
+
 
 echo -e '[true]
 [false]'  > $DATA_FILE
@@ -43,5 +53,14 @@ echo -e '[true]
 $CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONCompactEachRow')"
 $CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONCompactEachRow')"
 
+echo -e '[[true, false]]
+[[0.42]]'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONCompactEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONCompactEachRow')"
+
+echo -e '[[[1, 2, 3], [true, false], [1, true, false]]]
+[[[1, 2, 3]]]'  > $DATA_FILE
+$CLICKHOUSE_CLIENT -q "desc file('$FILE_NAME', 'JSONCompactEachRow')"
+$CLICKHOUSE_CLIENT -q "select * from file('$FILE_NAME', 'JSONCompactEachRow')"
 
 rm $DATA_FILE
diff --git a/tests/queries/0_stateless/02267_file_globs_schema_inference.sql b/tests/queries/0_stateless/02267_file_globs_schema_inference.sql
index 0bdb0d6a8ca..56b99d80286 100644
--- a/tests/queries/0_stateless/02267_file_globs_schema_inference.sql
+++ b/tests/queries/0_stateless/02267_file_globs_schema_inference.sql
@@ -7,4 +7,4 @@ select * from file('02267_data*.jsonl') order by x;
 insert into function file('02267_data1.jsonl', 'TSV') select 1 as x;
 insert into function file('02267_data1.jsonl', 'TSV') select [1,2,3] as x;
 
-select * from file('02267_data*.jsonl'); --{serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+select * from file('02267_data*.jsonl') settings schema_inference_use_cache_for_file=0; --{serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
diff --git a/tests/queries/0_stateless/02268_json_maps_and_objects.reference b/tests/queries/0_stateless/02268_json_maps_and_objects.reference
index cfdc6e7e55c..87fb8949e01 100644
--- a/tests/queries/0_stateless/02268_json_maps_and_objects.reference
+++ b/tests/queries/0_stateless/02268_json_maps_and_objects.reference
@@ -1,2 +1,5 @@
 x	Object(Nullable(\'json\'))					
 x	Object(Nullable(\'json\'))					
+x	Array(Object(Nullable(\'json\')))					
+x	Array(Object(Nullable(\'json\')))					
+x	Tuple(Map(String, Nullable(String)), Map(String, Array(Nullable(Int64))), Array(Nullable(Int64)))					
diff --git a/tests/queries/0_stateless/02268_json_maps_and_objects.sql b/tests/queries/0_stateless/02268_json_maps_and_objects.sql
index 83d8fbaac2d..8a9ede6876c 100644
--- a/tests/queries/0_stateless/02268_json_maps_and_objects.sql
+++ b/tests/queries/0_stateless/02268_json_maps_and_objects.sql
@@ -1,3 +1,6 @@
 -- Tags: no-fasttest
 desc format(JSONEachRow, '{"x" : {"a" : "Some string"}}, {"x" : {"b" : [1, 2, 3]}}, {"x" : {"c" : {"d" : 10}}}');
 desc format(JSONEachRow, '{"x" : {"a" : "Some string"}}, {"x" : {"b" : [1, 2, 3], "c" : {"42" : 42}}}');
+desc format(JSONEachRow, '{"x" : [{"a" : "Some string"}]}, {"x" : [{"b" : [1, 2, 3]}]}');
+desc format(JSONEachRow, '{"x" : [{"a" : "Some string"}, {"b" : [1, 2, 3]}]}');
+desc format(JSONEachRow, '{"x" : [{"a" : "Some string"}, {"b" : [1, 2, 3]}, [1, 2, 3]]}');
diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.reference b/tests/queries/0_stateless/02286_drop_filesystem_cache.reference
index 3b2b31c8744..b37f87afc28 100644
--- a/tests/queries/0_stateless/02286_drop_filesystem_cache.reference
+++ b/tests/queries/0_stateless/02286_drop_filesystem_cache.reference
@@ -1,8 +1,13 @@
+Using storage policy: s3_cache
 -- { echo }
 
 SET enable_filesystem_cache_on_write_operations=0;
 DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+CREATE TABLE test (key UInt32, value String)
+Engine=MergeTree()
+ORDER BY key
+SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES;
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT count() FROM system.filesystem_cache;
 0
@@ -19,13 +24,115 @@ SELECT count() FROM system.filesystem_cache;
 SYSTEM DROP FILESYSTEM CACHE './data'; -- { serverError 36 }
 SELECT count() FROM system.filesystem_cache;
 1
+SELECT * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+1
+SELECT count()
+FROM (
+    SELECT
+        arrayJoin(cache_paths) AS cache_path,
+        local_path,
+        remote_path
+    FROM
+        system.remote_data_paths
+    ) AS data_paths
+INNER JOIN system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path;
+1
+DROP TABLE test NO DELAY;
+SELECT count() FROM system.filesystem_cache;
+0
+SELECT cache_path FROM system.filesystem_cache;
+SELECT cache_path, local_path
+FROM (
+    SELECT
+        arrayJoin(cache_paths) AS cache_path,
+        local_path,
+        remote_path
+    FROM
+        system.remote_data_paths
+    ) AS data_paths
+INNER JOIN system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path;
 DROP TABLE IF EXISTS test2;
-CREATE TABLE test2 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_2', min_bytes_for_wide_part = 10485760;
+CREATE TABLE test2 (key UInt32, value String)
+Engine=MergeTree()
+ORDER BY key
+SETTINGS storage_policy='s3_cache_2', min_bytes_for_wide_part = 10485760;
 INSERT INTO test2 SELECT number, toString(number) FROM numbers(100);
 SELECT * FROM test2 FORMAT Null;
 SELECT count() FROM system.filesystem_cache;
-3
-SYSTEM DROP FILESYSTEM CACHE './s3_cache/';
+2
+SYSTEM DROP FILESYSTEM CACHE 's3_cache_2/';
+SELECT count() FROM system.filesystem_cache;
+0
+
+Using storage policy: local_cache
+-- { echo }
+
+SET enable_filesystem_cache_on_write_operations=0;
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String)
+Engine=MergeTree()
+ORDER BY key
+SETTINGS storage_policy='local_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT count() FROM system.filesystem_cache;
+0
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT * FROM test FORMAT Null;
 SELECT count() FROM system.filesystem_cache;
 2
-SYSTEM DROP FILESYSTEM CACHE ON CLUSTER;
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT count() FROM system.filesystem_cache;
+0
+SELECT * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+1
+SYSTEM DROP FILESYSTEM CACHE './data'; -- { serverError 36 }
+SELECT count() FROM system.filesystem_cache;
+1
+SELECT * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+1
+SELECT count()
+FROM (
+    SELECT
+        arrayJoin(cache_paths) AS cache_path,
+        local_path,
+        remote_path
+    FROM
+        system.remote_data_paths
+    ) AS data_paths
+INNER JOIN system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path;
+1
+DROP TABLE test NO DELAY;
+SELECT count() FROM system.filesystem_cache;
+0
+SELECT cache_path FROM system.filesystem_cache;
+SELECT cache_path, local_path
+FROM (
+    SELECT
+        arrayJoin(cache_paths) AS cache_path,
+        local_path,
+        remote_path
+    FROM
+        system.remote_data_paths
+    ) AS data_paths
+INNER JOIN system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path;
+DROP TABLE IF EXISTS test2;
+CREATE TABLE test2 (key UInt32, value String)
+Engine=MergeTree()
+ORDER BY key
+SETTINGS storage_policy='local_cache_2', min_bytes_for_wide_part = 10485760;
+INSERT INTO test2 SELECT number, toString(number) FROM numbers(100);
+SELECT * FROM test2 FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+2
+SYSTEM DROP FILESYSTEM CACHE 'local_cache_2/';
+SELECT count() FROM system.filesystem_cache;
+0
+
diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.sh b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
new file mode 100755
index 00000000000..30d04743b34
--- /dev/null
+++ b/tests/queries/0_stateless/02286_drop_filesystem_cache.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: long, no-fasttest, no-parallel, no-s3-storage, no-random-settings
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TMP_PATH=${CLICKHOUSE_TEST_UNIQUE_NAME}
+QUERIES_FILE=02286_drop_filesystem_cache.queries
+TEST_FILE=$CUR_DIR/filesystem_cache_queries/$QUERIES_FILE
+
+for storagePolicy in 's3_cache' 'local_cache'; do
+    echo "Using storage policy: $storagePolicy"
+    cat $TEST_FILE | sed -e "s/_storagePolicy/${storagePolicy}/"  > $TMP_PATH
+    ${CLICKHOUSE_CLIENT} --queries-file $TMP_PATH
+    rm $TMP_PATH
+    echo
+done
diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.sql b/tests/queries/0_stateless/02286_drop_filesystem_cache.sql
deleted file mode 100644
index c0ba0cb3051..00000000000
--- a/tests/queries/0_stateless/02286_drop_filesystem_cache.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- Tags: no-parallel, no-fasttest, no-s3-storage, no-random-settings
-
--- { echo }
-
-SET enable_filesystem_cache_on_write_operations=0;
-
-DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
-
-SYSTEM DROP FILESYSTEM CACHE;
-
-SELECT count() FROM system.filesystem_cache;
-INSERT INTO test SELECT number, toString(number) FROM numbers(100);
-
-SELECT * FROM test FORMAT Null;
-SELECT count() FROM system.filesystem_cache;
-
-SYSTEM DROP FILESYSTEM CACHE;
-SELECT count() FROM system.filesystem_cache;
-
-SELECT * FROM test FORMAT Null;
-SELECT count() FROM system.filesystem_cache;
-
-SYSTEM DROP FILESYSTEM CACHE './data'; -- { serverError 36 }
-SELECT count() FROM system.filesystem_cache;
-
-DROP TABLE IF EXISTS test2;
-CREATE TABLE test2 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_2', min_bytes_for_wide_part = 10485760;
-INSERT INTO test2 SELECT number, toString(number) FROM numbers(100);
-SELECT * FROM test2 FORMAT Null;
-SELECT count() FROM system.filesystem_cache;
-
-SYSTEM DROP FILESYSTEM CACHE './s3_cache/';
-SELECT count() FROM system.filesystem_cache;
-
-SYSTEM DROP FILESYSTEM CACHE ON CLUSTER;
diff --git a/tests/queries/0_stateless/02286_mysql_dump_input_format.reference b/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
index 25be4b727bc..a736358b9b7 100644
--- a/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
+++ b/tests/queries/0_stateless/02286_mysql_dump_input_format.reference
@@ -130,8 +130,8 @@ x	Nullable(Int32)
 x	Nullable(Int32)					
 1
 dump7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -139,8 +139,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -148,15 +148,15 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 1
 2
 3
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 1
 dump8
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -164,8 +164,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -174,8 +174,8 @@ c2	Nullable(Float64)
 5	\N
 6	7
 dump9
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -183,8 +183,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -193,8 +193,8 @@ c2	Nullable(Float64)
 5	\N
 6	7
 dump10
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -202,8 +202,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -212,8 +212,8 @@ c2	Nullable(Float64)
 5	\N
 6	7
 dump11
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -221,8 +221,8 @@ c2	Nullable(Float64)
 4	\N
 5	\N
 6	7
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -265,8 +265,8 @@ color	Nullable(String)
 price	Nullable(Int32)					
 apple	red	42
 dump14
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -274,8 +274,8 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -283,15 +283,15 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 1
 2
 3
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 1
 dump15
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -299,8 +299,8 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	\N
 2	\N
 3	\N
@@ -308,10 +308,10 @@ y	Nullable(Float64)
 4	\N
 5	\N
 6	7
-x	Nullable(Float64)					
+x	Nullable(Int64)					
 1
 2
 3
-x	Nullable(Float64)					
-y	Nullable(Float64)					
+x	Nullable(Int64)					
+y	Nullable(Int64)					
 1	2
diff --git a/tests/queries/0_stateless/02292_hash_array_tuples.reference b/tests/queries/0_stateless/02292_hash_array_tuples.reference
index 52d52b54a5c..0ec624dda01 100644
--- a/tests/queries/0_stateless/02292_hash_array_tuples.reference
+++ b/tests/queries/0_stateless/02292_hash_array_tuples.reference
@@ -1,5 +1,19 @@
+arrays
 14617701568871014978
 12913842429399915005
 8351543757058688770
 12732328028874882204
 12371801021764949421	Array(Tuple(UInt8, Array(Tuple(UInt8, Tuple(UInt8, UInt8, Array(Tuple(UInt8, UInt8)))))))
+14617701568871014978
+12913842429399915005
+8351543757058688770
+12732328028874882204
+maps
+14617701568871014978
+12913842429399915005
+8351543757058688770
+12732328028874882204
+14617701568871014978
+12913842429399915005
+8351543757058688770
+12732328028874882204
diff --git a/tests/queries/0_stateless/02292_hash_array_tuples.sql b/tests/queries/0_stateless/02292_hash_array_tuples.sql
index 31c409dc6ba..ea368f56fe6 100644
--- a/tests/queries/0_stateless/02292_hash_array_tuples.sql
+++ b/tests/queries/0_stateless/02292_hash_array_tuples.sql
@@ -1,6 +1,25 @@
+SELECT 'arrays';
+
 SELECT cityHash64([(1, 'a'), (2, 'b')]);
 SELECT cityHash64([(1, 'c'), (2, 'b')]);
 SELECT sipHash64([(1, 'a'), (2, 'b')]);
 SELECT murmurHash2_64([(1, 'a'), (2, 'b'), (3, 'c')]);
 
 SELECT cityHash64([(1, [(1, (3, 4, [(5, 6), (7, 8)]))]), (2, [])] AS c), toTypeName(c);
+
+SELECT cityHash64(materialize([(1, 'a'), (2, 'b')]));
+SELECT cityHash64(materialize([(1, 'c'), (2, 'b')]));
+SELECT sipHash64(materialize([(1, 'a'), (2, 'b')]));
+SELECT murmurHash2_64(materialize([(1, 'a'), (2, 'b'), (3, 'c')]));
+
+SELECT 'maps';
+
+SELECT cityHash64(map(1, 'a', 2, 'b'));
+SELECT cityHash64(map(1, 'c', 2, 'b'));
+SELECT sipHash64(map(1, 'a', 2, 'b'));
+SELECT murmurHash2_64(map(1, 'a', 2, 'b', 3, 'c'));
+
+SELECT cityHash64(materialize(map(1, 'a', 2, 'b')));
+SELECT cityHash64(materialize(map(1, 'c', 2, 'b')));
+SELECT sipHash64(materialize(map(1, 'a', 2, 'b')));
+SELECT murmurHash2_64(materialize(map(1, 'a', 2, 'b', 3, 'c')));
diff --git a/tests/queries/0_stateless/02293_formats_json_columns.reference b/tests/queries/0_stateless/02293_formats_json_columns.reference
index da8d080ac05..f59f02ad42b 100644
--- a/tests/queries/0_stateless/02293_formats_json_columns.reference
+++ b/tests/queries/0_stateless/02293_formats_json_columns.reference
@@ -4,9 +4,9 @@ JSONColumns
 	"b": ["String", "String", "String", "String", "String"],
 	"c": [[[[],"String"],[[],"gnirtS"]], [[[0],"String"],[[0],"gnirtS"]], [[[0,1],"String"],[[0,1],"gnirtS"]], [[[],"String"],[[0,1,2],"gnirtS"]], [[[0],"String"],[[],"gnirtS"]]]
 }
-a	Nullable(Float64)					
+a	Nullable(Int64)					
 b	Nullable(String)					
-c	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 0	String	[([],'String'),([],'gnirtS')]
 1	String	[([0],'String'),([0],'gnirtS')]
 2	String	[([0,1],'String'),([0,1],'gnirtS')]
@@ -18,9 +18,9 @@ JSONCompactColumns
 	["String", "String", "String", "String", "String"],
 	[[[[],"String"],[[],"gnirtS"]], [[[0],"String"],[[0],"gnirtS"]], [[[0,1],"String"],[[0,1],"gnirtS"]], [[[],"String"],[[0,1,2],"gnirtS"]], [[[0],"String"],[[],"gnirtS"]]]
 ]
-c1	Nullable(Float64)					
+c1	Nullable(Int64)					
 c2	Nullable(String)					
-c3	Array(Tuple(Array(Nullable(Float64)), Nullable(String)))					
+c3	Array(Tuple(Array(Nullable(Int64)), Nullable(String)))					
 0	String	[([],'String'),([],'gnirtS')]
 1	String	[([0],'String'),([0],'gnirtS')]
 2	String	[([0,1],'String'),([0,1],'gnirtS')]
@@ -74,9 +74,9 @@ JSONColumnsWithMetadata
 		"bytes_read": 20
 	}
 }
-b	Nullable(Float64)					
-a	Nullable(Float64)					
-c	Nullable(Float64)					
+b	Nullable(Int64)					
+a	Nullable(Int64)					
+c	Nullable(Int64)					
 d	Nullable(String)					
 1	3	\N	\N
 2	2	\N	\N
@@ -89,8 +89,8 @@ OK
 3	
 2	
 1	
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
 c3	Nullable(String)					
 1	1	\N
 2	2	\N
diff --git a/tests/queries/0_stateless/02293_hashid.reference b/tests/queries/0_stateless/02293_hashid.reference
index f36b1500288..dfc78349c05 100644
--- a/tests/queries/0_stateless/02293_hashid.reference
+++ b/tests/queries/0_stateless/02293_hashid.reference
@@ -8,5 +8,8 @@
 2	obmgndljgajpkeao
 3	dldokmpjpgjgeanb
 4	nkdlpgajngjnobme
-xkOpDGxQpVB
-jR
+YQrvD5XGvbx
+Bm3zaOq7zbp
+oV
+oV
+6b
diff --git a/tests/queries/0_stateless/02293_hashid.sql b/tests/queries/0_stateless/02293_hashid.sql
index 45aaefe7356..9938154f169 100644
--- a/tests/queries/0_stateless/02293_hashid.sql
+++ b/tests/queries/0_stateless/02293_hashid.sql
@@ -1,7 +1,16 @@
+-- Tags: no-backward-compatibility-check
 SET allow_experimental_hash_functions = 1;
 
 select number, hashid(number) from system.numbers limit 5;
 select number, hashid(number, 's3cr3t', 16, 'abcdefghijklmnop') from system.numbers limit 5;
 select hashid(1234567890123456, 's3cr3t');
+select hashid(1234567890123456, 's3cr3t2');
 
 SELECT  hashid(1, hashid(2));
+SELECT  hashid(1, 'k5');
+SELECT  hashid(1, 'k5_othersalt');
+
+-- https://github.com/ClickHouse/ClickHouse/issues/39672
+SELECT
+    JSONExtractRaw(257, NULL),
+    hashid(1024, if(rand() % 10, 'truetruetruetrue', NULL), 's3\0r3t'); -- {serverError 43}
diff --git a/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql b/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql
index 002bc1f37dd..5acfa2dc70a 100644
--- a/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql
+++ b/tests/queries/0_stateless/02293_part_log_has_merge_reason.sql
@@ -1,3 +1,5 @@
+-- Tags: disabled
+
 DROP TABLE IF EXISTS t_part_log_has_merge_type_table;
 
 CREATE TABLE t_part_log_has_merge_type_table
@@ -6,10 +8,10 @@ CREATE TABLE t_part_log_has_merge_type_table
     UserID UInt64,
     Comment String
 )
-ENGINE = MergeTree() 
+ENGINE = MergeTree()
 ORDER BY tuple()
 TTL event_time + INTERVAL 3 MONTH
-SETTINGS min_bytes_for_wide_part = 0, materialize_ttl_recalculate_only = true;
+SETTINGS min_bytes_for_wide_part = 0, materialize_ttl_recalculate_only = true, max_number_of_merges_with_ttl_in_pool = 100;
 
 INSERT INTO t_part_log_has_merge_type_table VALUES (now(), 1, 'username1');
 INSERT INTO t_part_log_has_merge_type_table VALUES (now() - INTERVAL 4 MONTH, 2, 'username2');
@@ -20,7 +22,7 @@ SYSTEM FLUSH LOGS;
 
 SELECT
     event_type,
-    merge_reason 
+    merge_reason
 FROM
     system.part_log
 WHERE
diff --git a/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.reference b/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.reference
index 0a83fa24d49..b983dc681ec 100644
--- a/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.reference
+++ b/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.reference
@@ -1,11 +1,11 @@
 -- { echoOn }
-select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1, optimize_aggregation_in_order=0, optimize_read_in_order=0;
+select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings optimize_aggregation_in_order=0, optimize_read_in_order=0;
 15	480
 14	450
 13	420
 12	390
 11	360
-select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1, optimize_aggregation_in_order=1, optimize_read_in_order=1;
+select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings optimize_aggregation_in_order=1, optimize_read_in_order=1;
 15	480
 14	450
 13	420
diff --git a/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.sql b/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.sql
index be050cc3080..53d6892415b 100644
--- a/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.sql
+++ b/tests/queries/0_stateless/02302_projections_GROUP_BY_ORDERY_BY_optimize_aggregation_in_order.sql
@@ -6,8 +6,8 @@ create table test_agg_proj_02302 (x Int32, y Int32, PROJECTION x_plus_y (select
 insert into test_agg_proj_02302 select intDiv(number, 2), -intDiv(number,3) - 1 from numbers(100);
 
 -- { echoOn }
-select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1, optimize_aggregation_in_order=0, optimize_read_in_order=0;
-select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1, optimize_aggregation_in_order=1, optimize_read_in_order=1;
+select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings optimize_aggregation_in_order=0, optimize_read_in_order=0;
+select x + y, sum(x - y) as s from test_agg_proj_02302 group by x + y order by s desc limit 5 settings optimize_aggregation_in_order=1, optimize_read_in_order=1;
 
 -- { echoOff }
 drop table test_agg_proj_02302;
diff --git a/tests/queries/0_stateless/02303_query_kind.reference b/tests/queries/0_stateless/02303_query_kind.reference
index b899b9f5b45..163f8b0ed5e 100644
--- a/tests/queries/0_stateless/02303_query_kind.reference
+++ b/tests/queries/0_stateless/02303_query_kind.reference
@@ -20,17 +20,17 @@ clickhouse-client --query_kind initial_query -q explain plan header=1 select toS
 Expression ((Projection + Before ORDER BY))
 Header: dummy String
   Aggregating
-  Header: dummy UInt8
+  Header: toString(dummy) String
     Expression (Before GROUP BY)
-    Header: dummy UInt8
+    Header: toString(dummy) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
 clickhouse-local --query_kind initial_query -q explain plan header=1 select toString(dummy) as dummy from system.one group by dummy
 Expression ((Projection + Before ORDER BY))
 Header: dummy String
   Aggregating
-  Header: dummy UInt8
+  Header: toString(dummy) String
     Expression (Before GROUP BY)
-    Header: dummy UInt8
+    Header: toString(dummy) String
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
diff --git a/tests/queries/0_stateless/02305_schema_inference_with_globs.reference b/tests/queries/0_stateless/02305_schema_inference_with_globs.reference
index 9df5d2a264c..defa2133823 100644
--- a/tests/queries/0_stateless/02305_schema_inference_with_globs.reference
+++ b/tests/queries/0_stateless/02305_schema_inference_with_globs.reference
@@ -1,5 +1,5 @@
 2
 4
 6
-x	Nullable(String)					
-x	Nullable(String)					
+x	Nullable(Int64)					
+x	Nullable(Int64)					
diff --git a/tests/queries/0_stateless/02313_filesystem_cache_seeks.reference b/tests/queries/0_stateless/02313_filesystem_cache_seeks.reference
new file mode 100644
index 00000000000..73871f55856
--- /dev/null
+++ b/tests/queries/0_stateless/02313_filesystem_cache_seeks.reference
@@ -0,0 +1,6 @@
+Using storage policy: s3_cache
+
+Using storage policy: local_cache
+
+Using storage policy: s3_cache_multi
+
diff --git a/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh b/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh
new file mode 100755
index 00000000000..7ed92cbf36d
--- /dev/null
+++ b/tests/queries/0_stateless/02313_filesystem_cache_seeks.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: long, no-fasttest, no-parallel, no-s3-storage, no-random-settings
+
+# set -x
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+TMP_PATH=${CLICKHOUSE_TEST_UNIQUE_NAME}
+QUERIES_FILE=02313_filesystem_cache_seeks.queries
+TEST_FILE=$CUR_DIR/filesystem_cache_queries/$QUERIES_FILE
+
+for storagePolicy in 's3_cache' 'local_cache' 's3_cache_multi'; do
+    echo "Using storage policy: $storagePolicy"
+    cat $TEST_FILE | sed -e "s/_storagePolicy/${storagePolicy}/"  > $TMP_PATH
+    ${CLICKHOUSE_CLIENT} --queries-file $TMP_PATH
+    rm $TMP_PATH
+    echo
+done
diff --git a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
index 7d8e0c662cd..4274f5769ee 100644
--- a/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
+++ b/tests/queries/0_stateless/02314_csv_tsv_skip_first_lines.reference
@@ -1,14 +1,14 @@
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 0	1	2
 1	2	3
 2	3	4
 3	4	5
 4	5	6
-c1	Nullable(Float64)					
-c2	Nullable(Float64)					
-c3	Nullable(Float64)					
+c1	Nullable(Int64)					
+c2	Nullable(Int64)					
+c3	Nullable(Int64)					
 0	1	2
 1	2	3
 2	3	4
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization.reference b/tests/queries/0_stateless/02317_distinct_in_order_optimization.reference
index a5ae3759d5d..d827dc33838 100644
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization.reference
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization.reference
@@ -77,4 +77,30 @@
 2	2
 1	1
 0	0
--- check that distinct in order has the same result as ordinary distinct
+-- distinct with constants columns
+-- { echoOn }
+select distinct 1 as x, 2 as y from distinct_in_order;
+1	2
+select distinct 1 as x, 2 as y from distinct_in_order order by x;
+1	2
+select distinct 1 as x, 2 as y from distinct_in_order order by x, y;
+1	2
+select a, x from (select distinct a, 1 as x from distinct_in_order order by x) order by a;
+0	1
+select distinct a, 1 as x, 2 as y from distinct_in_order order by a;
+0	1	2
+select a, b, x, y from(select distinct a, b, 1 as x, 2 as y from distinct_in_order order by a) order by a, b;
+0	0	1	2
+0	1	1	2
+0	2	1	2
+0	3	1	2
+0	4	1	2
+select distinct x, y from (select 1 as x, 2 as y from distinct_in_order order by x) order by y;
+1	2
+select distinct a, b, x, y from (select a, b, 1 as x, 2 as y from distinct_in_order order by a) order by a, b;
+0	0	1	2
+0	1	1	2
+0	2	1	2
+0	3	1	2
+0	4	1	2
+-- check that distinct in order returns the same result as ordinary distinct
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization.sql b/tests/queries/0_stateless/02317_distinct_in_order_optimization.sql
index f1de07e3db2..0fb3766edb4 100644
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization.sql
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization.sql
@@ -43,9 +43,21 @@ select distinct b,c from distinct_in_order order by c;
 select '-- distinct with non-key prefix and non-sorted column, order by non-sorted desc';
 select distinct b,c from distinct_in_order order by c desc;
 
+select '-- distinct with constants columns';
+-- { echoOn }
+select distinct 1 as x, 2 as y from distinct_in_order;
+select distinct 1 as x, 2 as y from distinct_in_order order by x;
+select distinct 1 as x, 2 as y from distinct_in_order order by x, y;
+select a, x from (select distinct a, 1 as x from distinct_in_order order by x) order by a;
+select distinct a, 1 as x, 2 as y from distinct_in_order order by a;
+select a, b, x, y from(select distinct a, b, 1 as x, 2 as y from distinct_in_order order by a) order by a, b;
+select distinct x, y from (select 1 as x, 2 as y from distinct_in_order order by x) order by y;
+select distinct a, b, x, y from (select a, b, 1 as x, 2 as y from distinct_in_order order by a) order by a, b;
+-- { echoOff }
+
 drop table if exists distinct_in_order sync;
 
-select '-- check that distinct in order has the same result as ordinary distinct';
+select '-- check that distinct in order returns the same result as ordinary distinct';
 drop table if exists distinct_cardinality_low sync;
 CREATE TABLE distinct_cardinality_low (low UInt64, medium UInt64, high UInt64) ENGINE MergeTree() ORDER BY (low, medium);
 INSERT INTO distinct_cardinality_low SELECT number % 1e1, number % 1e2, number % 1e3 FROM numbers_mt(1e4);
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
index 3e57d4de586..01e0c397dc7 100644
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
@@ -9,24 +9,27 @@ DistinctSortedChunkTransform
 -- distinct with primary key prefix -> pre-distinct optimization only
 DistinctTransform
 DistinctSortedChunkTransform
--- distinct with primary key prefix and order by on column in distinct -> pre-distinct and final distinct optimization
+-- distinct with primary key prefix and order by column in distinct -> pre-distinct and final distinct optimization
 DistinctSortedTransform
 DistinctSortedChunkTransform
--- distinct with primary key prefix and order by on the same columns -> pre-distinct and final distinct optimization
+-- distinct with primary key prefix and order by the same columns -> pre-distinct and final distinct optimization
 DistinctSortedStreamTransform
 DistinctSortedChunkTransform
 -- distinct with primary key prefix and order by column in distinct but non-primary key prefix -> pre-distinct and final distinct optimization
 DistinctSortedTransform
 DistinctSortedChunkTransform
--- distinct with primary key prefix and order by on column _not_ in distinct -> pre-distinct optimization only
+-- distinct with primary key prefix and order by column _not_ in distinct -> pre-distinct optimization only
 DistinctTransform
 DistinctSortedChunkTransform
 -- distinct with non-primary key prefix -> ordinary distinct
 DistinctTransform
 DistinctTransform
--- distinct with non-primary key prefix and order by on column in distinct -> final distinct optimization only
+-- distinct with non-primary key prefix and order by column in distinct -> final distinct optimization only
 DistinctSortedTransform
 DistinctTransform
--- distinct with non-primary key prefix and order by on column _not_ in distinct -> ordinary distinct
+-- distinct with non-primary key prefix and order by column _not_ in distinct -> ordinary distinct
+DistinctTransform
+DistinctTransform
+-- distinct with non-primary key prefix and order by _const_ column in distinct -> ordinary distinct
 DistinctTransform
 DistinctTransform
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
index 903f3bb9e11..fcffb974433 100755
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.sh
@@ -27,25 +27,28 @@ $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct *
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix -> pre-distinct optimization only'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by on column in distinct -> pre-distinct and final distinct optimization'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column in distinct -> pre-distinct and final distinct optimization'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by on the same columns -> pre-distinct and final distinct optimization'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by the same columns -> pre-distinct and final distinct optimization'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b from distinct_in_order_explain order by a, b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column in distinct but non-primary key prefix -> pre-distinct and final distinct optimization'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, b, c from distinct_in_order_explain order by c" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by on column _not_ in distinct -> pre-distinct optimization only'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with primary key prefix and order by column _not_ in distinct -> pre-distinct optimization only'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct a, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
 
 $CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix -> ordinary distinct'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by on column in distinct -> final distinct optimization only'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by column in distinct -> final distinct optimization only'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by b" | eval $FIND_DISTINCT
 
-$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by on column _not_ in distinct -> ordinary distinct'"
+$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by column _not_ in distinct -> ordinary distinct'"
 $CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, c from distinct_in_order_explain order by a" | eval $FIND_DISTINCT
 
+$CLICKHOUSE_CLIENT -q "select '-- distinct with non-primary key prefix and order by _const_ column in distinct -> ordinary distinct'"
+$CLICKHOUSE_CLIENT -nq "$ENABLE_OPTIMIZATION;explain pipeline select distinct b, 1 as x from distinct_in_order_explain order by x" | eval $FIND_DISTINCT
+
 $CLICKHOUSE_CLIENT -q "drop table if exists distinct_in_order_explain sync"
diff --git a/tests/queries/0_stateless/02319_timeslots_dt64.reference b/tests/queries/0_stateless/02319_timeslots_dt64.reference
new file mode 100644
index 00000000000..83041581fe6
--- /dev/null
+++ b/tests/queries/0_stateless/02319_timeslots_dt64.reference
@@ -0,0 +1,3 @@
+['2000-01-02 03:00:00.00','2000-01-02 03:30:00.00','2000-01-02 04:00:00.00','2000-01-02 04:30:00.00','2000-01-02 05:00:00.00','2000-01-02 05:30:00.00']
+['2000-01-02 02:54:45.100','2000-01-02 03:05:19.200','2000-01-02 03:15:53.300','2000-01-02 03:26:27.400','2000-01-02 03:37:01.500','2000-01-02 03:47:35.600','2000-01-02 03:58:09.700','2000-01-02 04:08:43.800','2000-01-02 04:19:17.900','2000-01-02 04:29:52.000','2000-01-02 04:40:26.100','2000-01-02 04:51:00.200','2000-01-02 05:01:34.300','2000-01-02 05:12:08.400','2000-01-02 05:22:42.500','2000-01-02 05:33:16.600','2000-01-02 05:43:50.700']
+['2000-01-02 03:04:00.0000','2000-01-02 03:04:30.0000','2000-01-02 03:05:00.0000','2000-01-02 03:05:30.0000','2000-01-02 03:06:00.0000','2000-01-02 03:06:30.0000','2000-01-02 03:07:00.0000','2000-01-02 03:07:30.0000','2000-01-02 03:08:00.0000','2000-01-02 03:08:30.0000','2000-01-02 03:09:00.0000','2000-01-02 03:09:30.0000','2000-01-02 03:10:00.0000','2000-01-02 03:10:30.0000','2000-01-02 03:11:00.0000','2000-01-02 03:11:30.0000','2000-01-02 03:12:00.0000','2000-01-02 03:12:30.0000','2000-01-02 03:13:00.0000','2000-01-02 03:13:30.0000','2000-01-02 03:14:00.0000']
diff --git a/tests/queries/0_stateless/02319_timeslots_dt64.sql b/tests/queries/0_stateless/02319_timeslots_dt64.sql
new file mode 100644
index 00000000000..3d8f8a22e5a
--- /dev/null
+++ b/tests/queries/0_stateless/02319_timeslots_dt64.sql
@@ -0,0 +1,9 @@
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.12', 2, 'UTC'), toDecimal64(10000, 0));
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.233', 3, 'UTC'), toDecimal64(10000.12, 2), toDecimal64(634.1, 1));
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.3456', 4, 'UTC'), toDecimal64(600, 0), toDecimal64(30, 0));
+
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.23', 2, 'UTC')); -- { serverError 42 }
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.345', 3, 'UTC'), toDecimal64(62.3, 1), toDecimal64(12.34, 2), 'one more'); -- { serverError 42 }
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.456', 3, 'UTC'), 'wrong argument'); -- { serverError 43 }
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.123', 3, 'UTC'), toDecimal64(600, 0), 'wrong argument'); -- { serverError 43 }
+SELECT timeSlots(toDateTime64('2000-01-02 03:04:05.1232', 4, 'UTC'), toDecimal64(600, 0), toDecimal64(0, 0)); -- { serverError 44 }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02325_dates_schema_inference.reference b/tests/queries/0_stateless/02325_dates_schema_inference.reference
new file mode 100644
index 00000000000..3ac4ad88f1c
--- /dev/null
+++ b/tests/queries/0_stateless/02325_dates_schema_inference.reference
@@ -0,0 +1,60 @@
+JSONEachRow
+x	Nullable(Date)					
+x	Nullable(DateTime64(9))					
+x	Nullable(DateTime64(9))					
+x	Array(Nullable(Date))					
+x	Array(Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Map(String, Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Array(Nullable(DateTime64(9)))					
+x	Nullable(DateTime64(9))					
+x	Array(Nullable(String))					
+x	Nullable(String)					
+x	Array(Nullable(String))					
+x	Map(String, Array(Array(Nullable(String))))					
+CSV
+c1	Nullable(Date)					
+c1	Nullable(DateTime64(9))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(Date))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(String))					
+c1	Nullable(String)					
+c1	Array(Nullable(String))					
+c1	Map(String, Array(Array(Nullable(String))))					
+TSV
+c1	Nullable(Date)					
+c1	Nullable(DateTime64(9))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(Date))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(String))					
+c1	Nullable(String)					
+c1	Array(Nullable(String))					
+c1	Map(String, Array(Array(Nullable(String))))					
+Values
+c1	Nullable(Date)					
+c1	Nullable(DateTime64(9))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(Date))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Map(String, Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Array(Nullable(DateTime64(9)))					
+c1	Nullable(DateTime64(9))					
+c1	Array(Nullable(String))					
+c1	Nullable(String)					
+c1	Array(Nullable(String))					
+c1	Map(String, Array(Array(Nullable(String))))					
diff --git a/tests/queries/0_stateless/02325_dates_schema_inference.sql b/tests/queries/0_stateless/02325_dates_schema_inference.sql
new file mode 100644
index 00000000000..3534a0eb48f
--- /dev/null
+++ b/tests/queries/0_stateless/02325_dates_schema_inference.sql
@@ -0,0 +1,70 @@
+-- Tags: no-fasttest
+
+set input_format_try_infer_dates=1;
+set input_format_try_infer_datetimes=1;
+
+select 'JSONEachRow';
+desc format(JSONEachRow, '{"x" : "2020-01-01"}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00.00000"}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00"}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01", "2020-01-02"]}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01", "2020-01-01 00:00:00"]}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "2020-01-01 00:00:00"]}');
+desc format(JSONEachRow, '{"x" : {"date1" : "2020-01-01 00:00:00", "date2" : "2020-01-01"}}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "2020-01-01"]}\n{"x" : ["2020-01-01"]}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00"]}\n{"x" : ["2020-01-01"]}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00"}\n{"x" : "2020-01-01"}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "Some string"]}');
+desc format(JSONEachRow, '{"x" : "2020-01-01 00:00:00"}\n{"x" : "Some string"}');
+desc format(JSONEachRow, '{"x" : ["2020-01-01 00:00:00", "2020-01-01"]}\n{"x" : ["2020-01-01", "Some string"]}');
+desc format(JSONEachRow, '{"x" : {"key1" : [["2020-01-01 00:00:00"]], "key2" : [["2020-01-01"]]}}\n{"x" : {"key1" : [["2020-01-01"]], "key2" : [["Some string"]]}}');
+
+select 'CSV';
+desc format(CSV, '"2020-01-01"');
+desc format(CSV, '"2020-01-01 00:00:00.00000"');
+desc format(CSV, '"2020-01-01 00:00:00"');
+desc format(CSV, '"[\'2020-01-01\', \'2020-01-02\']"');
+desc format(CSV, '"[\'2020-01-01\', \'2020-01-01 00:00:00\']"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'2020-01-01 00:00:00\']"');
+desc format(CSV, '"{\'date1\' : \'2020-01-01 00:00:00\', \'date2\' : \'2020-01-01\'}"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'2020-01-01\']"\n"[\'2020-01-01\']"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\']"\n"[\'2020-01-01\']"');
+desc format(CSV, '"2020-01-01 00:00:00"\n"2020-01-01"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'Some string\']"');
+desc format(CSV, '"2020-01-01 00:00:00"\n"Some string"');
+desc format(CSV, '"[\'2020-01-01 00:00:00\', \'2020-01-01\']"\n"[\'2020-01-01\', \'Some string\']"');
+desc format(CSV, '"{\'key1\' : [[\'2020-01-01 00:00:00\']], \'key2\' : [[\'2020-01-01\']]}"\n"{\'key1\' : [[\'2020-01-01\']], \'key2\' : [[\'Some string\']]}"');
+
+select 'TSV';
+desc format(TSV, '2020-01-01');
+desc format(TSV, '2020-01-01 00:00:00.00000');
+desc format(TSV, '2020-01-01 00:00:00');
+desc format(TSV, '[\'2020-01-01\', \'2020-01-02\']');
+desc format(TSV, '[\'2020-01-01\', \'2020-01-01 00:00:00\']');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'2020-01-01 00:00:00\']');
+desc format(TSV, '{\'date1\' : \'2020-01-01 00:00:00\', \'date2\' : \'2020-01-01\'}');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'2020-01-01\']\n[\'2020-01-01\']');
+desc format(TSV, '[\'2020-01-01 00:00:00\']\n[\'2020-01-01\']');
+desc format(TSV, '2020-01-01 00:00:00\n2020-01-01');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'Some string\']');
+desc format(TSV, '2020-01-01 00:00:00\nSome string');
+desc format(TSV, '[\'2020-01-01 00:00:00\', \'2020-01-01\']\n[\'2020-01-01\', \'Some string\']');
+desc format(TSV, '{\'key1\' : [[\'2020-01-01 00:00:00\']], \'key2\' : [[\'2020-01-01\']]}\n{\'key1\' : [[\'2020-01-01\']], \'key2\' : [[\'Some string\']]}');
+
+select 'Values';
+desc format(Values, '(\'2020-01-01\')');
+desc format(Values, '(\'2020-01-01 00:00:00.00000\')');
+desc format(Values, '(\'2020-01-01 00:00:00\')');
+desc format(Values, '([\'2020-01-01\', \'2020-01-02\'])');
+desc format(Values, '([\'2020-01-01\', \'2020-01-01 00:00:00\'])');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'2020-01-01 00:00:00\'])');
+desc format(Values, '({\'date1\' : \'2020-01-01 00:00:00\', \'date2\' : \'2020-01-01\'})');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'2020-01-01\'])\n([\'2020-01-01\'])');
+desc format(Values, '([\'2020-01-01 00:00:00\']), ([\'2020-01-01\'])');
+desc format(Values, '(\'2020-01-01 00:00:00\')\n(\'2020-01-01\')');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'Some string\'])');
+desc format(Values, '(\'2020-01-01 00:00:00\')\n(\'Some string\')');
+desc format(Values, '([\'2020-01-01 00:00:00\', \'2020-01-01\'])\n([\'2020-01-01\', \'Some string\'])');
+desc format(Values, '({\'key1\' : [[\'2020-01-01 00:00:00\']], \'key2\' : [[\'2020-01-01\']]})\n({\'key1\' : [[\'2020-01-01\']], \'key2\' : [[\'Some string\']]})');
+
+
diff --git a/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.reference b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.reference
new file mode 100644
index 00000000000..6da939d7839
--- /dev/null
+++ b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.reference
@@ -0,0 +1,17 @@
+x	Nullable(Int64)					
+x	Array(Nullable(Float64))					
+x	Map(String, Nullable(Int64))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Nullable(Int64)					
+x	Array(Nullable(Int64))					
+x	Map(String, Nullable(Int64))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Array(Nullable(String))					
+x	Map(String, Nullable(String))					
+x	Map(String, Array(Nullable(String)))					
+x	Nullable(String)					
+x	Array(Nullable(String))					
+x	Map(String, Nullable(String))					
+x	Map(String, Array(Nullable(String)))					
+x	Tuple(Nullable(Int64), Nullable(String))					
+x	Object(Nullable(\'json\'))					
diff --git a/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.sql b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.sql
new file mode 100644
index 00000000000..2012a53c09d
--- /dev/null
+++ b/tests/queries/0_stateless/02326_numbers_from_json_strings_schema_inference.sql
@@ -0,0 +1,21 @@
+-- Tags: no-fasttest
+
+set input_format_json_try_infer_numbers_from_strings=1;
+
+desc format(JSONEachRow, '{"x" : "123"}');
+desc format(JSONEachRow, '{"x" : ["123", 123, 12.3]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123", "k2" : 123}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"], "k2" : [123, 123]}}');
+desc format(JSONEachRow, '{"x" : "123"}\n{"x" : 123}');
+desc format(JSONEachRow, '{"x" : ["123", "456"]}\n{"x" : [123, 456]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123"}}\n{"x" : {"k2" : 123}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"]}}\n{"x": {"k2" : [123, 123]}}');
+desc format(JSONEachRow, '{"x" : ["123", "Some string"]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123", "k2" : "Some string"}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"], "k2" : ["Some string"]}}');
+desc format(JSONEachRow, '{"x" : "123"}\n{"x" : "Some string"}');
+desc format(JSONEachRow, '{"x" : ["123", "456"]}\n{"x" : ["Some string"]}');
+desc format(JSONEachRow, '{"x" : {"k1" : "123"}}\n{"x" : {"k2" : "Some string"}}');
+desc format(JSONEachRow, '{"x" : {"k1" : ["123", "123"]}}\n{"x": {"k2" : ["Some string"]}}');
+desc format(JSONEachRow, '{"x" : [123, "Some string"]}');
+desc format(JSONEachRow, '{"x" : {"a" : 123, "b" : "Some string"}}');
diff --git a/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.reference b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.reference
new file mode 100644
index 00000000000..a1cb9f8e5dc
--- /dev/null
+++ b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.reference
@@ -0,0 +1,36 @@
+JSONEachRow
+x	Nullable(Int64)					
+x	Array(Nullable(Int64))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Map(String, Array(Nullable(Int64)))					
+x	Nullable(Float64)					
+x	Nullable(Float64)					
+x	Array(Nullable(Float64))					
+x	Map(String, Array(Nullable(Float64)))					
+CSV
+c1	Nullable(Int64)					
+c1	Array(Nullable(Int64))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Nullable(Float64)					
+c1	Nullable(Float64)					
+c1	Array(Nullable(Float64))					
+c1	Map(String, Array(Nullable(Float64)))					
+TSV
+c1	Nullable(Int64)					
+c1	Array(Nullable(Int64))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Nullable(Float64)					
+c1	Nullable(Float64)					
+c1	Array(Nullable(Float64))					
+c1	Map(String, Array(Nullable(Float64)))					
+Values
+c1	Nullable(Int64)					
+c1	Array(Nullable(Int64))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Map(String, Array(Nullable(Int64)))					
+c1	Nullable(Float64)					
+c1	Nullable(Float64)					
+c1	Array(Nullable(Float64))					
+c1	Map(String, Array(Nullable(Float64)))					
diff --git a/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
new file mode 100644
index 00000000000..0ceed178865
--- /dev/null
+++ b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
@@ -0,0 +1,45 @@
+-- Tags: no-fasttest
+
+set input_format_try_infer_integers=1;
+
+select 'JSONEachRow';
+desc format(JSONEachRow, '{"x" : 123}');
+desc format(JSONEachRow, '{"x" : [123, 123]}');
+desc format(JSONEachRow, '{"x" : {"a" : [123, 123]}}');
+desc format(JSONEachRow, '{"x" : {"a" : [123, 123]}}\n{"x" : {"b" : [321, 321]}}');
+desc format(JSONEachRow, '{"x" : 123}\n{"x" : 123.123}');
+desc format(JSONEachRow, '{"x" : 123}\n{"x" : 1e2}');
+desc format(JSONEachRow, '{"x" : [123, 123]}\n{"x" : [321.321, 312]}');
+desc format(JSONEachRow, '{"x" : {"a" : [123, 123]}}\n{"x" : {"b" : [321.321, 123]}}');
+
+select 'CSV';
+desc format(CSV, '123');
+desc format(CSV, '"[123, 123]"');
+desc format(CSV, '"{\'a\' : [123, 123]}"');
+desc format(CSV, '"{\'a\' : [123, 123]}"\n"{\'b\' : [321, 321]}"');
+desc format(CSV, '123\n123.123');
+desc format(CSV, '122\n1e2');
+desc format(CSV, '"[123, 123]"\n"[321.321, 312]"');
+desc format(CSV, '"{\'a\' : [123, 123]}"\n"{\'b\' : [321.321, 123]}"');
+
+select 'TSV';
+desc format(TSV, '123');
+desc format(TSV, '[123, 123]');
+desc format(TSV, '{\'a\' : [123, 123]}');
+desc format(TSV, '{\'a\' : [123, 123]}\n{\'b\' : [321, 321]}');
+desc format(TSV, '123\n123.123');
+desc format(TSV, '122\n1e2');
+desc format(TSV, '[123, 123]\n[321.321, 312]');
+desc format(TSV, '{\'a\' : [123, 123]}\n{\'b\' : [321.321, 123]}');
+
+select 'Values';
+desc format(Values, '(123)');
+desc format(Values, '([123, 123])');
+desc format(Values, '({\'a\' : [123, 123]})');
+desc format(Values, '({\'a\' : [123, 123]}), ({\'b\' : [321, 321]})');
+desc format(Values, '(123), (123.123)');
+desc format(Values, '(122), (1e2)');
+desc format(Values, '([123, 123])\n([321.321, 312])');
+desc format(Values, '({\'a\' : [123, 123]}), ({\'b\' : [321.321, 123]})');
+
+
diff --git a/tests/queries/0_stateless/02344_describe_cache.reference b/tests/queries/0_stateless/02344_describe_cache.reference
index affee889537..25cf99dd775 100644
--- a/tests/queries/0_stateless/02344_describe_cache.reference
+++ b/tests/queries/0_stateless/02344_describe_cache.reference
@@ -1 +1 @@
-22548578304	1048576	104857600	1	0	0	0	./s3_cache/
+22548578304	1048576	104857600	1	0	0	0	s3_disk_cache/	0
diff --git a/tests/queries/0_stateless/02346_non_negative_derivative.reference b/tests/queries/0_stateless/02346_non_negative_derivative.reference
index 51fe2359bd0..b81af45962e 100644
--- a/tests/queries/0_stateless/02346_non_negative_derivative.reference
+++ b/tests/queries/0_stateless/02346_non_negative_derivative.reference
@@ -1,63 +1,63 @@
 1
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	0.20550000000000002
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	6.165000000000001e-10
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	8.22e-7
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	0.0010275000000000002
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	1.233
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	86.31
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	5918.400000000001
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	159796.80000000002
 1979-12-12 21:21:23.000	1.54	0
 1979-12-12 21:21:21.127	3.7	0
-2283-11-11 23:37:36.788	1.1	0
-2283-11-11 23:37:36.789	2.34	0
+2299-12-31 23:37:36.788	1.1	0
+2299-12-31 23:37:36.789	2.34	0
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	1242864
diff --git a/tests/queries/0_stateless/02352_grouby_shadows_arg.reference b/tests/queries/0_stateless/02352_grouby_shadows_arg.reference
new file mode 100644
index 00000000000..d67f6f6df02
--- /dev/null
+++ b/tests/queries/0_stateless/02352_grouby_shadows_arg.reference
@@ -0,0 +1,11 @@
+-- { echoOn }
+SELECT toString(dummy) as dummy FROM remote('127.{1,1}', 'system.one') GROUP BY dummy;
+0
+SELECT toString(dummy+1) as dummy FROM remote('127.{1,1}', 'system.one') GROUP BY dummy;
+1
+SELECT toString((toInt8(dummy)+2) * (toInt8(dummy)+2)) as dummy FROM remote('127.{1,1}', system.one) GROUP BY dummy;
+4
+SELECT round(number % 3) AS number FROM remote('127.{1,1}', numbers(20)) GROUP BY number ORDER BY number ASC;
+0
+1
+2
diff --git a/tests/queries/0_stateless/02352_grouby_shadows_arg.sql b/tests/queries/0_stateless/02352_grouby_shadows_arg.sql
new file mode 100644
index 00000000000..953da2382ef
--- /dev/null
+++ b/tests/queries/0_stateless/02352_grouby_shadows_arg.sql
@@ -0,0 +1,5 @@
+-- { echoOn }
+SELECT toString(dummy) as dummy FROM remote('127.{1,1}', 'system.one') GROUP BY dummy;
+SELECT toString(dummy+1) as dummy FROM remote('127.{1,1}', 'system.one') GROUP BY dummy;
+SELECT toString((toInt8(dummy)+2) * (toInt8(dummy)+2)) as dummy FROM remote('127.{1,1}', system.one) GROUP BY dummy;
+SELECT round(number % 3) AS number FROM remote('127.{1,1}', numbers(20)) GROUP BY number ORDER BY number ASC;
diff --git a/tests/queries/0_stateless/02352_rwlock.sh b/tests/queries/0_stateless/02352_rwlock.sh
index 8054be81781..56b7ab27410 100755
--- a/tests/queries/0_stateless/02352_rwlock.sh
+++ b/tests/queries/0_stateless/02352_rwlock.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+# Tag no-parallel -- to avoid running it in parallel, this will avoid possible issues due to high pressure
 
 # Test that ensures that WRITE lock failure notifies READ.
 # In other words to ensure that after WRITE lock failure (DROP),
@@ -13,31 +15,73 @@ function wait_query_by_id_started()
     local query_id=$1 && shift
     # wait for query to be started
     while [ "$($CLICKHOUSE_CLIENT "$@" -q "select count() from system.processes where query_id = '$query_id'")" -ne 1 ]; do
-        sleep 0.1
+        if [ "$(
+            $CLICKHOUSE_CLIENT -nm -q "
+                system flush logs;
+
+                select count() from system.query_log
+                where
+                    event_date >= yesterday() and
+                    current_database = '$CLICKHOUSE_DATABASE' and
+                    type = 'QueryFinish' and
+                    query_id = '$query_id'
+            "
+        )" -eq 1 ]; then
+            return 1
+        else
+            sleep 0.1
+        fi
     done
+
+    return 0
 }
 
 # to avoid removal via separate thread
 $CLICKHOUSE_CLIENT -q "CREATE DATABASE ${CLICKHOUSE_DATABASE}_ordinary Engine=Ordinary" --allow_deprecated_database_ordinary=1
-$CLICKHOUSE_CLIENT -q "CREATE TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 (key Int) Engine=Null()"
 
-query_id="insert-$(random_str 10)"
-# 20 seconds sleep
-$CLICKHOUSE_CLIENT --query_id "$query_id" -q "INSERT INTO ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SELECT sleepEachRow(1) FROM numbers(20) GROUP BY number" &
-wait_query_by_id_started "$query_id"
+# It is possible that the subsequent after INSERT query will be processed
+# only after INSERT finished, it is unlikely, but it happens few times in
+# debug build on CI, so if this will happen, then DROP query will be
+# finished instantly, and to avoid flakiness we will retry in this case
+while :; do
+    $CLICKHOUSE_CLIENT -nm -q "
+        DROP TABLE IF EXISTS ${CLICKHOUSE_DATABASE}_ordinary.data_02352;
+        CREATE TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 (key Int) Engine=Null();
+    "
 
-query_id="drop-$(random_str 10)"
-# 10 second wait
-$CLICKHOUSE_CLIENT --query_id "$query_id" -q "DROP TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SYNC" --lock_acquire_timeout 10 > >(grep -m1 -o 'WRITE locking attempt on ".*" has timed out') 2>&1 &
-wait_query_by_id_started "$query_id"
+    insert_query_id="insert-$(random_str 10)"
+    # 20 seconds sleep
+    $CLICKHOUSE_CLIENT --query_id "$insert_query_id" -q "INSERT INTO ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SELECT sleepEachRow(1) FROM numbers(20) GROUP BY number" &
+    if ! wait_query_by_id_started "$insert_query_id"; then
+        wait
+        continue
+    fi
 
-# NOTE: we need to run SELECT after DROP and
-# if the bug is there, then the query will wait 20 seconds (INSERT), instead of 10 (DROP) and will fail
-#
-# 11 seconds wait (DROP + 1 second lag)
-$CLICKHOUSE_CLIENT -q "SELECT * FROM ${CLICKHOUSE_DATABASE}_ordinary.data_02352" --lock_acquire_timeout 11
+    drop_query_id="drop-$(random_str 10)"
+    # 10 second wait
+    $CLICKHOUSE_CLIENT --query_id "$drop_query_id" -q "DROP TABLE ${CLICKHOUSE_DATABASE}_ordinary.data_02352 SYNC" --lock_acquire_timeout 10 > >(
+        grep -m1 -o 'WRITE locking attempt on ".*" has timed out'
+    ) 2>&1 &
+    if ! wait_query_by_id_started "$drop_query_id"; then
+        wait
+        continue
+    fi
+    # Check INSERT query again, and retry if it does not exist.
+    if ! wait_query_by_id_started "$insert_query_id"; then
+        wait
+        continue
+    fi
 
-# wait DROP and INSERT
-wait
+    # NOTE: we need to run SELECT after DROP and
+    # if the bug is there, then the query will wait 20 seconds (INSERT), instead of 10 (DROP) and will fail
+    #
+    # 11 seconds wait (DROP + 1 second lag)
+    $CLICKHOUSE_CLIENT -q "SELECT * FROM ${CLICKHOUSE_DATABASE}_ordinary.data_02352" --lock_acquire_timeout 11
+
+    # wait DROP and INSERT
+    wait
+
+    break
+done | uniq
 
 $CLICKHOUSE_CLIENT -q "DROP DATABASE ${CLICKHOUSE_DATABASE}_ordinary"
diff --git a/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.reference b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
new file mode 100644
index 00000000000..548660e36b1
--- /dev/null
+++ b/tests/queries/0_stateless/02354_distributed_with_external_aggregation_memory_usage.sql
@@ -0,0 +1,22 @@
+-- Tags: long, no-tsan, no-msan, no-asan, no-ubsan, no-debug, no-s3-storage
+
+create table t_2354_dist_with_external_aggr(a UInt64, b String, c FixedString(100)) engine = MergeTree order by tuple();
+
+insert into t_2354_dist_with_external_aggr select number, toString(number) as s, toFixedString(s, 100) from numbers_mt(5e7);
+
+set max_bytes_before_external_group_by = '2G',
+    max_threads = 16,
+    aggregation_memory_efficient_merge_threads = 16,
+    distributed_aggregation_memory_efficient = 1,
+    prefer_localhost_replica = 1,
+    group_by_two_level_threshold = 100000,
+    group_by_two_level_threshold_bytes = 1000000,
+    max_block_size = 65505;
+
+-- whole aggregation state of local aggregation uncompressed is 5.8G
+-- it is hard to provide an accurate estimation for memory usage, so 4G is just the actual value taken from the logs + delta
+select a, b, c, sum(a) as s
+from remote('127.0.0.{1,2}', currentDatabase(), t_2354_dist_with_external_aggr)
+group by a, b, c
+format Null
+settings max_memory_usage = '4Gi';
diff --git a/tests/queries/0_stateless/02357_file_default_value.reference b/tests/queries/0_stateless/02357_file_default_value.reference
new file mode 100644
index 00000000000..7c0c4634e42
--- /dev/null
+++ b/tests/queries/0_stateless/02357_file_default_value.reference
@@ -0,0 +1,2 @@
+default
+\N
diff --git a/tests/queries/0_stateless/02357_file_default_value.sql b/tests/queries/0_stateless/02357_file_default_value.sql
new file mode 100644
index 00000000000..008fc4edb1f
--- /dev/null
+++ b/tests/queries/0_stateless/02357_file_default_value.sql
@@ -0,0 +1,3 @@
+SELECT file('nonexistent.txt'); -- { serverError 107 }
+SELECT file('nonexistent.txt', 'default');
+SELECT file('nonexistent.txt', NULL);
diff --git a/tests/queries/0_stateless/02358_file_default_value.reference b/tests/queries/0_stateless/02358_file_default_value.reference
new file mode 100644
index 00000000000..5002c1e4391
--- /dev/null
+++ b/tests/queries/0_stateless/02358_file_default_value.reference
@@ -0,0 +1,20 @@
+text_0\n	text_0\n
+default	\N
+text_2\n	text_2\n
+default	\N
+default	\N
+text_5\n	text_5\n
+text_6\n	text_6\n
+text_7\n	text_7\n
+default	\N
+text_9\n	text_9\n
+default	\N
+default	\N
+text_5\n	text_5\n
+text_6\n	text_6\n
+text_7\n	text_7\n
+default	\N
+text_9\n	text_9\n
+default	\N
+default	\N
+default	\N
diff --git a/tests/queries/0_stateless/02358_file_default_value.sh b/tests/queries/0_stateless/02358_file_default_value.sh
new file mode 100755
index 00000000000..7d2cb75c4e4
--- /dev/null
+++ b/tests/queries/0_stateless/02358_file_default_value.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+WORKING_FOLDER_02357="${USER_FILES_PATH}/${CLICKHOUSE_DATABASE}"
+
+rm -rf "${WORKING_FOLDER_02357}"
+mkdir "${WORKING_FOLDER_02357}"
+
+for i in 0 2 5 6 7 9
+do
+    echo "text_${i}" > "${WORKING_FOLDER_02357}/file_${i}"
+done
+
+${CLICKHOUSE_CLIENT} --query "WITH '${WORKING_FOLDER_02357}/file_' || toString(number) AS path SELECT file(path, 'default'), file(path, NULL) from numbers(10);"
+${CLICKHOUSE_CLIENT} --query "WITH '${WORKING_FOLDER_02357}/file_' || toString(number) AS path SELECT file(path, 'default'), file(path, NULL) from numbers(3, 10);"
+
+rm -rf "${WORKING_FOLDER_02357}"
diff --git a/tests/queries/0_stateless/02360_clickhouse_local_config-option.reference b/tests/queries/0_stateless/02360_clickhouse_local_config-option.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02360_clickhouse_local_config-option.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02360_clickhouse_local_config-option.sh b/tests/queries/0_stateless/02360_clickhouse_local_config-option.sh
new file mode 100755
index 00000000000..df0bdf38b4d
--- /dev/null
+++ b/tests/queries/0_stateless/02360_clickhouse_local_config-option.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+set -e
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "<clickhouse>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <tcp_port>9000</tcp_port>
+
+    <path>./</path>
+
+    <mark_cache_size>0</mark_cache_size>
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+    </user_directories>
+</clickhouse>" > $CUR_DIR/config.xml
+
+echo        "<clickhouse>
+            <profiles>
+                <default></default>
+            </profiles>
+            <users>
+                <default>
+                    <password></password>
+                    <networks>
+                        <ip>::/0</ip>
+                    </networks>
+                    <profile>default</profile>
+                    <quota>default</quota>
+                </default>
+            </users>
+            <quotas>
+                <default></default>
+            </quotas>
+        </clickhouse>" > $CUR_DIR/users.xml
+
+local_opts=(
+    "--config-file=$CUR_DIR/config.xml"
+    "--send_logs_level=none")
+
+${CLICKHOUSE_LOCAL} "${local_opts[@]}" --query 'Select 1' |& grep -v -e 'Processing configuration file'
+
+rm -rf $CUR_DIR/users.xml
+rm -rf $CUR_DIR/config.xml
diff --git a/tests/queries/0_stateless/02360_send_logs_level_colors.sh b/tests/queries/0_stateless/02360_send_logs_level_colors.sh
index 4e5ce057702..0585e779815 100755
--- a/tests/queries/0_stateless/02360_send_logs_level_colors.sh
+++ b/tests/queries/0_stateless/02360_send_logs_level_colors.sh
@@ -13,7 +13,7 @@ function run()
     command=$1
     expect << EOF
 log_user 0
-set timeout 3
+set timeout 60
 match_max 100000
 
 spawn bash -c "$command"
diff --git a/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.reference b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.reference
new file mode 100644
index 00000000000..2b217a21694
--- /dev/null
+++ b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.reference
@@ -0,0 +1,2 @@
+25
+2018-01-02 02:00:00
diff --git a/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.sql b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.sql
new file mode 100644
index 00000000000..f7fa762b6b0
--- /dev/null
+++ b/tests/queries/0_stateless/02360_small_notation_h_for_hour_interval.sql
@@ -0,0 +1,2 @@
+SELECT dateDiff('h', toDateTime('2018-01-01 22:00:00'), toDateTime('2018-01-02 23:00:00'));
+SELECT  toDateTime('2018-01-01 22:00:00') + INTERVAL 4 h
diff --git a/tests/queries/0_stateless/02361_fsync_profile_events.reference b/tests/queries/0_stateless/02361_fsync_profile_events.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02361_fsync_profile_events.sh b/tests/queries/0_stateless/02361_fsync_profile_events.sh
new file mode 100755
index 00000000000..d54da9a49e5
--- /dev/null
+++ b/tests/queries/0_stateless/02361_fsync_profile_events.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# Tags: no-s3-storage
+# Tag no-s3-storage: s3 does not have fsync
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data_fsync_pe;
+
+    create table data_fsync_pe (key Int) engine=MergeTree()
+    order by key
+    settings
+        min_rows_for_wide_part=2,
+        fsync_after_insert=1,
+        fsync_part_directory=1;
+"
+
+ret=1
+# Retry in case of fsync/fdatasync was too fast
+# (FileSyncElapsedMicroseconds/DirectorySyncElapsedMicroseconds was 0)
+for i in {1..100}; do
+    query_id="insert-$i-$CLICKHOUSE_DATABASE"
+
+    $CLICKHOUSE_CLIENT --query_id "$query_id" -q "insert into data_fsync_pe values (1)"
+
+    read -r FileSync FileOpen DirectorySync FileSyncElapsedMicroseconds DirectorySyncElapsedMicroseconds <<<"$(
+    $CLICKHOUSE_CLIENT -nm --param_query_id "$query_id" -q "
+        system flush logs;
+
+        select
+            ProfileEvents['FileSync'],
+            ProfileEvents['FileOpen'],
+            ProfileEvents['DirectorySync'],
+            ProfileEvents['FileSyncElapsedMicroseconds']>0,
+            ProfileEvents['DirectorySyncElapsedMicroseconds']>0
+        from system.query_log
+        where
+            event_date >= yesterday() and
+            current_database = currentDatabase() and
+            query_id = {query_id:String} and
+            type = 'QueryFinish';
+    ")"
+
+    # Non retriable errors
+    if [[ $FileSync -ne 7 ]]; then
+        exit 2
+    fi
+    # Check that all files was synced
+    if [[ $FileSync -ne $FileOpen ]]; then
+        exit 3
+    fi
+    if [[ $DirectorySync -ne 2 ]]; then
+        exit 4
+    fi
+
+    # Retriable errors
+    if [[ $FileSyncElapsedMicroseconds -eq 0 ]]; then
+        continue
+    fi
+    if [[ $DirectorySyncElapsedMicroseconds -eq 0 ]]; then
+        continue
+    fi
+
+    # Everything is OK
+    ret=0
+    break
+done
+
+$CLICKHOUSE_CLIENT -q "drop table data_fsync_pe"
+
+exit $ret
diff --git a/tests/queries/0_stateless/02364_window_view_segfault.reference b/tests/queries/0_stateless/02364_window_view_segfault.reference
new file mode 100644
index 00000000000..9766475a418
--- /dev/null
+++ b/tests/queries/0_stateless/02364_window_view_segfault.reference
@@ -0,0 +1 @@
+ok
diff --git a/tests/queries/0_stateless/02364_window_view_segfault.sh b/tests/queries/0_stateless/02364_window_view_segfault.sh
new file mode 100755
index 00000000000..d03a1e5ae3e
--- /dev/null
+++ b/tests/queries/0_stateless/02364_window_view_segfault.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --multiquery --multiline --query """
+DROP TABLE IF EXISTS mt ON CLUSTER test_shard_localhost;
+DROP TABLE IF EXISTS wv ON CLUSTER test_shard_localhost;
+CREATE TABLE mt  ON CLUSTER test_shard_localhost (a Int32, timestamp DateTime) ENGINE=MergeTree ORDER BY tuple();
+CREATE WINDOW VIEW wv ON CLUSTER test_shard_localhost TO input_deduplicated INNER ENGINE Memory WATERMARK=INTERVAL '1' SECOND AS SELECT count(a), hopStart(wid) AS w_start, hopEnd(wid) AS w_end FROM mt GROUP BY hop(timestamp, INTERVAL '3' SECOND, INTERVAL '5' SECOND) AS wid;
+""" 2>&1 | grep -q -e "Code: 344" -e "Code: 60" && echo 'ok' || echo 'fail' ||:
diff --git a/tests/queries/0_stateless/02366_cancel_write_into_file.reference b/tests/queries/0_stateless/02366_cancel_write_into_file.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02366_cancel_write_into_file.sh b/tests/queries/0_stateless/02366_cancel_write_into_file.sh
new file mode 100755
index 00000000000..060fe1ec74b
--- /dev/null
+++ b/tests/queries/0_stateless/02366_cancel_write_into_file.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+for i in $(seq 1 10);
+do
+    $CLICKHOUSE_CLIENT --query_id="02366_$i" -q "insert into function file('02366_data_$i.jsonl') select range(number % 1000) from numbers(100000) settings output_format_parallel_formatting=1" 2> /dev/null &
+done
+
+sleep 2
+
+$CLICKHOUSE_CLIENT -q "kill query where startsWith(query_id, '02366_') sync" > /dev/null 2>&1
+
+for i in $(seq 1 10);
+do
+    $CLICKHOUSE_CLIENT --query_id="02366_$i" -q "insert into function file('02366_data_$i.jsonl') select range(number % 1000) from numbers(100000) settings output_format_parallel_formatting=0" 2> /dev/null &
+done
+
+sleep 2
+
+$CLICKHOUSE_CLIENT -q "kill query where startsWith(query_id, '02366_') sync" > /dev/null 2>&1
+
diff --git a/tests/queries/0_stateless/02366_decimal_agg_state_conversion.reference b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.reference
new file mode 100644
index 00000000000..88822fec8d0
--- /dev/null
+++ b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.reference
@@ -0,0 +1,3 @@
+1.100001
+0.000001
+19	0.1
diff --git a/tests/queries/0_stateless/02366_decimal_agg_state_conversion.sql b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.sql
new file mode 100644
index 00000000000..edcab325d91
--- /dev/null
+++ b/tests/queries/0_stateless/02366_decimal_agg_state_conversion.sql
@@ -0,0 +1,62 @@
+select sumMerge(y) from 
+(
+  select cast(x, 'AggregateFunction(sum, Decimal(50, 10))') y from 
+   (
+     select arrayReduce('sumState', [toDecimal256('0.000001', 10), toDecimal256('1.1', 10)]) x
+   )
+);
+
+select minMerge(y) from 
+(
+  select cast(x, 'AggregateFunction(min, Decimal(18, 10))') y from 
+   (
+     select arrayReduce('minState', [toDecimal64('0.000001', 10), toDecimal64('1.1', 10)]) x
+   )
+);
+
+
+drop table if exists consumer_02366;
+drop table if exists producer_02366;
+drop table if exists mv_02366;
+
+CREATE TABLE consumer_02366
+(
+    `id` UInt16,
+    `dec` AggregateFunction(argMin, Decimal(24, 10), UInt16)
+)
+ENGINE = AggregatingMergeTree
+PRIMARY KEY id
+ORDER BY id;
+
+CREATE TABLE producer_02366
+(
+    `id` UInt16,
+    `dec` String
+)
+ENGINE = MergeTree
+PRIMARY KEY id
+ORDER BY id;
+
+CREATE MATERIALIZED VIEW mv_02366 TO consumer_02366 AS
+SELECT
+    id,
+    argMinState(dec, id) AS dec
+FROM
+(
+    SELECT
+        id,
+        toDecimal128(dec, 10) AS dec
+    FROM producer_02366
+)
+GROUP BY id;
+
+INSERT INTO producer_02366 (*) VALUES (19, '.1');
+
+SELECT
+    id,
+    finalizeAggregation(dec)
+FROM consumer_02366;
+
+drop table consumer_02366;
+drop table producer_02366;
+drop table mv_02366;
diff --git a/tests/queries/0_stateless/02366_direct_dictionary_dict_has.reference b/tests/queries/0_stateless/02366_direct_dictionary_dict_has.reference
new file mode 100644
index 00000000000..2a74183e40e
--- /dev/null
+++ b/tests/queries/0_stateless/02366_direct_dictionary_dict_has.reference
@@ -0,0 +1,10 @@
+0	0	1
+1	0	1
+2	0	1
+3	1	0
+4	0	1
+5	1	0
+6	0	1
+7	2	0
+8	1	0
+9	0	1
diff --git a/tests/queries/0_stateless/02366_direct_dictionary_dict_has.sql b/tests/queries/0_stateless/02366_direct_dictionary_dict_has.sql
new file mode 100644
index 00000000000..9d6950051f0
--- /dev/null
+++ b/tests/queries/0_stateless/02366_direct_dictionary_dict_has.sql
@@ -0,0 +1,46 @@
+-- Tags: no-backward-compatibility-check
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+   id UInt64,
+   value String
+)
+ENGINE = Memory;
+
+DROP TABLE IF EXISTS test_lookup_table;
+CREATE TABLE test_lookup_table
+(
+   id UInt64,
+   lookup_key UInt64,
+)
+ENGINE = Memory;
+
+INSERT INTO test_table VALUES(0, 'value_0');
+
+INSERT INTO test_lookup_table VALUES(0, 0);
+INSERT INTO test_lookup_table VALUES(1, 0);
+INSERT INTO test_lookup_table VALUES(2, 0);
+INSERT INTO test_lookup_table VALUES(3, 1);
+INSERT INTO test_lookup_table VALUES(4, 0);
+INSERT INTO test_lookup_table VALUES(5, 1);
+INSERT INTO test_lookup_table VALUES(6, 0);
+INSERT INTO test_lookup_table VALUES(7, 2);
+INSERT INTO test_lookup_table VALUES(8, 1);
+INSERT INTO test_lookup_table VALUES(9, 0);
+
+DROP DICTIONARY IF EXISTS test_dictionary;
+CREATE DICTIONARY test_dictionary
+(
+   id UInt64,
+   value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'test_table'))
+LAYOUT(DIRECT());
+
+SELECT id, lookup_key, dictHas('test_dictionary', lookup_key) FROM test_lookup_table ORDER BY id ASC;
+
+DROP DICTIONARY test_dictionary;
+DROP TABLE test_table;
+DROP TABLE test_lookup_table;
diff --git a/tests/queries/0_stateless/02366_normalize_aggregate_function_types_and_states.reference b/tests/queries/0_stateless/02366_normalize_aggregate_function_types_and_states.reference
new file mode 100644
index 00000000000..c29c5f8acf4
--- /dev/null
+++ b/tests/queries/0_stateless/02366_normalize_aggregate_function_types_and_states.reference
@@ -0,0 +1,2 @@
+7
+1.5
diff --git a/tests/queries/0_stateless/02366_normalize_aggregate_function_types_and_states.sql b/tests/queries/0_stateless/02366_normalize_aggregate_function_types_and_states.sql
new file mode 100644
index 00000000000..3d2900a9b74
--- /dev/null
+++ b/tests/queries/0_stateless/02366_normalize_aggregate_function_types_and_states.sql
@@ -0,0 +1,3 @@
+SELECT countMerge(*) FROM (SELECT countState(0.5) AS a UNION ALL SELECT countState() UNION ALL SELECT countIfState(2, 1) UNION ALL SELECT countArrayState([1, 2]) UNION ALL SELECT countArrayIfState([1, 2], 1));
+
+SELECT quantileMerge(*) FROM (SELECT quantilesState(0.5)(1) AS a UNION ALL SELECT quantileStateIf(2, identity(1)));
diff --git a/tests/queries/0_stateless/02366_union_decimal_conversion.reference b/tests/queries/0_stateless/02366_union_decimal_conversion.reference
new file mode 100644
index 00000000000..bfde072a796
--- /dev/null
+++ b/tests/queries/0_stateless/02366_union_decimal_conversion.reference
@@ -0,0 +1 @@
+2	2
diff --git a/tests/queries/0_stateless/02366_union_decimal_conversion.sql b/tests/queries/0_stateless/02366_union_decimal_conversion.sql
new file mode 100644
index 00000000000..4451d07474b
--- /dev/null
+++ b/tests/queries/0_stateless/02366_union_decimal_conversion.sql
@@ -0,0 +1 @@
+select sum(a), sum(b) from cluster(test_cluster_two_shards, view(select cast(number as Decimal(7, 2)) a, 0 as b from numbers(2) union all select 0, cast(number as Decimal(7, 2)) as b from numbers(2)));
diff --git a/tests/queries/0_stateless/02367_join_pushdown_column_not_found.reference b/tests/queries/0_stateless/02367_join_pushdown_column_not_found.reference
new file mode 100644
index 00000000000..98fb6a68656
--- /dev/null
+++ b/tests/queries/0_stateless/02367_join_pushdown_column_not_found.reference
@@ -0,0 +1,4 @@
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02367_join_pushdown_column_not_found.sql.j2 b/tests/queries/0_stateless/02367_join_pushdown_column_not_found.sql.j2
new file mode 100644
index 00000000000..95f3c5be711
--- /dev/null
+++ b/tests/queries/0_stateless/02367_join_pushdown_column_not_found.sql.j2
@@ -0,0 +1,16 @@
+{% for join_algorithm in ['default', 'full_sorting_merge', 'hash', 'partial_merge'] -%}
+
+SET join_algorithm = '{{ join_algorithm }}';
+
+SELECT deleted
+FROM (
+    SELECT 1 AS deleted, 'k' AS a, 'v' AS b
+) AS q
+INNER JOIN (
+    SELECT 'k' AS a, 'v' AS c
+) AS s
+ON q.a = s.a
+WHERE deleted AND (b = c);
+
+{% endfor -%}
+
diff --git a/tests/queries/0_stateless/02368_cancel_write_into_hdfs.reference b/tests/queries/0_stateless/02368_cancel_write_into_hdfs.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh b/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh
new file mode 100755
index 00000000000..8262cd7eab5
--- /dev/null
+++ b/tests/queries/0_stateless/02368_cancel_write_into_hdfs.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-stress
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+for i in $(seq 1 10);
+do
+    $CLICKHOUSE_CLIENT --query_id="02368_$i" -q "insert into function hdfs('hdfs://localhost:12222/02368_data_$i.jsonl') select range(number % 1000) from numbers(100000) settings hdfs_truncate_on_insert=1, output_format_parallel_formatting=1" 2> /dev/null &
+done
+
+sleep 2
+
+$CLICKHOUSE_CLIENT -q "kill query where startsWith(query_id, '02368_') sync" > /dev/null 2>&1
+
+for i in $(seq 1 10);
+do
+    $CLICKHOUSE_CLIENT --query_id="02368_$i" -q "insert into function hdfs('hdfs://localhost:12222/02368_data_$i.jsonl') select range(number % 1000) from numbers(100000) settings hdfs_truncate_on_insert=1, output_format_parallel_formatting=0" 2> /dev/null &
+done
+
+sleep 2
+
+$CLICKHOUSE_CLIENT -q "kill query where startsWith(query_id, '02368_') sync" > /dev/null 2>&1
diff --git a/tests/queries/0_stateless/02371_select_projection_normal_agg.reference b/tests/queries/0_stateless/02371_select_projection_normal_agg.reference
new file mode 100644
index 00000000000..9972842f982
--- /dev/null
+++ b/tests/queries/0_stateless/02371_select_projection_normal_agg.reference
@@ -0,0 +1 @@
+1	1
diff --git a/tests/queries/0_stateless/02371_select_projection_normal_agg.sql b/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
new file mode 100644
index 00000000000..283aec0b122
--- /dev/null
+++ b/tests/queries/0_stateless/02371_select_projection_normal_agg.sql
@@ -0,0 +1,124 @@
+DROP TABLE IF EXISTS video_log;
+
+CREATE TABLE video_log
+(
+    `datetime` DateTime,
+    `user_id` UInt64,
+    `device_id` UInt64,
+    `domain` LowCardinality(String),
+    `bytes` UInt64,
+    `duration` UInt64
+)
+ENGINE = MergeTree
+PARTITION BY toDate(datetime)
+ORDER BY (user_id, device_id);
+
+DROP TABLE IF EXISTS rng;
+
+CREATE TABLE rng
+(
+    `user_id_raw` UInt64,
+    `device_id_raw` UInt64,
+    `domain_raw` UInt64,
+    `bytes_raw` UInt64,
+    `duration_raw` UInt64
+)
+ENGINE = GenerateRandom(1024);
+
+INSERT INTO video_log SELECT
+  toUnixTimestamp('2022-07-22 01:00:00')
+  + (rowNumberInAllBlocks() / 20000),
+  user_id_raw % 100000000 AS user_id,
+  device_id_raw % 200000000 AS device_id,
+  domain_raw % 100,
+  (bytes_raw % 1024) + 128,
+  (duration_raw % 300) + 100
+FROM rng
+LIMIT 1728000;
+
+INSERT INTO video_log SELECT
+  toUnixTimestamp('2022-07-22 01:00:00')
+  + (rowNumberInAllBlocks() / 20000),
+  user_id_raw % 100000000 AS user_id,
+  100 AS device_id,
+  domain_raw % 100,
+  (bytes_raw % 1024) + 128,
+  (duration_raw % 300) + 100
+FROM rng
+LIMIT 10;
+
+DROP TABLE IF EXISTS video_log_result;
+
+CREATE TABLE video_log_result
+(
+    `hour` DateTime,
+    `sum_bytes` UInt64,
+    `avg_duration` Float64
+)
+ENGINE = MergeTree
+PARTITION BY toDate(hour)
+ORDER BY sum_bytes;
+
+INSERT INTO video_log_result SELECT
+    toStartOfHour(datetime) AS hour,
+    sum(bytes),
+    avg(duration)
+FROM video_log
+WHERE (toDate(hour) = '2022-07-22') AND (device_id = '100') --(device_id = '100') Make sure it's not good and doesn't go into prewhere.
+GROUP BY hour;
+
+
+ALTER TABLE video_log ADD PROJECTION p_norm
+(
+    SELECT
+        datetime,
+        device_id,
+        bytes,
+        duration
+    ORDER BY device_id
+);
+
+ALTER TABLE video_log MATERIALIZE PROJECTION p_norm settings mutations_sync=1;
+
+ALTER TABLE video_log ADD PROJECTION p_agg
+(
+    SELECT
+        toStartOfHour(datetime) AS hour,
+        domain,
+        sum(bytes),
+        avg(duration)
+    GROUP BY
+        hour,
+        domain
+);
+
+ALTER TABLE video_log MATERIALIZE PROJECTION p_agg settings mutations_sync=1;
+
+SELECT
+    equals(sum_bytes1, sum_bytes2),
+    equals(avg_duration1, avg_duration2)
+FROM
+(
+    SELECT
+        toStartOfHour(datetime) AS hour,
+        sum(bytes) AS sum_bytes1,
+        avg(duration) AS avg_duration1
+    FROM video_log
+    WHERE (toDate(hour) = '2022-07-22') AND (device_id = '100') --(device_id = '100') Make sure it's not good and doesn't go into prewhere.
+    GROUP BY hour
+)
+LEFT JOIN
+(
+    SELECT
+        `hour`,
+        `sum_bytes` AS sum_bytes2,
+        `avg_duration` AS avg_duration2
+    FROM video_log_result
+)
+USING (hour) settings joined_subquery_requires_alias=0;
+
+DROP TABLE IF EXISTS video_log;
+
+DROP TABLE IF EXISTS rng;
+
+DROP TABLE IF EXISTS video_log_result;
diff --git a/tests/queries/0_stateless/02373_progress_contain_result.reference b/tests/queries/0_stateless/02373_progress_contain_result.reference
new file mode 100644
index 00000000000..1e7492e2829
--- /dev/null
+++ b/tests/queries/0_stateless/02373_progress_contain_result.reference
@@ -0,0 +1 @@
+< X-ClickHouse-Summary: {"read_rows":"100","read_bytes":"800","written_rows":"0","written_bytes":"0","total_rows_to_read":"100","result_rows":"100","result_bytes":"131"}
diff --git a/tests/queries/0_stateless/02373_progress_contain_result.sh b/tests/queries/0_stateless/02373_progress_contain_result.sh
new file mode 100755
index 00000000000..1b257b699f5
--- /dev/null
+++ b/tests/queries/0_stateless/02373_progress_contain_result.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo 'SELECT 1 FROM numbers(100)' |
+  ${CLICKHOUSE_CURL_COMMAND} -v "${CLICKHOUSE_URL}&wait_end_of_query=1&send_progress_in_http_headers=0" --data-binary @- 2>&1 |
+  grep 'X-ClickHouse-Summary'
diff --git a/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.reference b/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.reference
new file mode 100644
index 00000000000..d7efa9ef54c
--- /dev/null
+++ b/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.reference
@@ -0,0 +1,2 @@
+SELECT countIf(a = 1)
+FROM m
diff --git a/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql b/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql
new file mode 100644
index 00000000000..06e1e4bfd55
--- /dev/null
+++ b/tests/queries/0_stateless/02374_combine_multi_if_and_count_if_opt.sql
@@ -0,0 +1,9 @@
+drop table if exists m;
+
+create table m (a int) engine Log;
+
+insert into m values (1);
+
+explain syntax select sum(multiIf(a = 1, 1, 0)) from m;
+
+drop table m;
diff --git a/tests/queries/0_stateless/02374_in_tuple_index.reference b/tests/queries/0_stateless/02374_in_tuple_index.reference
new file mode 100644
index 00000000000..51993f072d5
--- /dev/null
+++ b/tests/queries/0_stateless/02374_in_tuple_index.reference
@@ -0,0 +1,2 @@
+2
+2
diff --git a/tests/queries/0_stateless/02374_in_tuple_index.sql b/tests/queries/0_stateless/02374_in_tuple_index.sql
new file mode 100644
index 00000000000..7f9b7b5470e
--- /dev/null
+++ b/tests/queries/0_stateless/02374_in_tuple_index.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS t_in_tuple_index;
+
+CREATE TABLE t_in_tuple_index
+(
+    `ID` String,
+    `USER_ID` String,
+    `PLATFORM` LowCardinality(String)
+)
+ENGINE = MergeTree()
+ORDER BY (PLATFORM, USER_ID, ID)
+SETTINGS index_granularity = 2048;
+
+INSERT INTO t_in_tuple_index VALUES ('1', 33, 'insta'), ('2', 33, 'insta');
+
+SELECT count()
+FROM t_in_tuple_index
+WHERE (PLATFORM, USER_ID) IN (('insta', '33'));
+
+SELECT count()
+FROM t_in_tuple_index
+WHERE (PLATFORM, USER_ID) IN (('insta', '33'), ('insta', '22'));
+
+DROP TABLE IF EXISTS t_in_tuple_index;
diff --git a/tests/queries/0_stateless/02375_double_escaping_json.reference b/tests/queries/0_stateless/02375_double_escaping_json.reference
new file mode 100644
index 00000000000..23dbe1a59df
--- /dev/null
+++ b/tests/queries/0_stateless/02375_double_escaping_json.reference
@@ -0,0 +1,18 @@
+{
+	"meta":
+	[
+		{
+			"name": "\"",
+			"type": "String"
+		}
+	],
+
+	"data":
+	[
+		{
+			"\"": "\\"
+		}
+	],
+
+	"rows": 1
+}
diff --git a/tests/queries/0_stateless/02375_double_escaping_json.sql b/tests/queries/0_stateless/02375_double_escaping_json.sql
new file mode 100644
index 00000000000..ecfb24fca2e
--- /dev/null
+++ b/tests/queries/0_stateless/02375_double_escaping_json.sql
@@ -0,0 +1 @@
+SELECT '\\' AS `"` FORMAT JSON SETTINGS output_format_write_statistics = 0;
diff --git a/tests/queries/0_stateless/02375_pretty_formats.reference b/tests/queries/0_stateless/02375_pretty_formats.reference
new file mode 100644
index 00000000000..51b18f7eb09
--- /dev/null
+++ b/tests/queries/0_stateless/02375_pretty_formats.reference
@@ -0,0 +1,118 @@
+Pretty
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+└───┴───┘
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyNoEscapes
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+└───┴───┘
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyMonoBlock
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+├───┼───┤
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyNoEscapesMonoBlock
+┏━━━┳━━━┓
+┃ x ┃ y ┃
+┡━━━╇━━━┩
+│ 0 │ 1 │
+├───┼───┤
+│ 1 │ 2 │
+├───┼───┤
+│ 2 │ 3 │
+├───┼───┤
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompact
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+└───┴───┘
+┌─x─┬─y─┐
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompactNoEscapes
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+└───┴───┘
+┌─x─┬─y─┐
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompactMonoBlock
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettyCompactNoEscapesMonoBlock
+┌─x─┬─y─┐
+│ 0 │ 1 │
+│ 1 │ 2 │
+│ 2 │ 3 │
+│ 3 │ 4 │
+└───┴───┘
+PrettySpace
+ x   y
+
+ 0   1 
+ 1   2 
+ x   y
+
+ 2   3 
+ 3   4 
+PrettySpaceNoEscapes
+ x   y
+
+ 0   1 
+ 1   2 
+ x   y
+
+ 2   3 
+ 3   4 
+PrettySpaceMonoBlock
+ x   y
+
+ 0   1 
+ 1   2 
+ 2   3 
+ 3   4 
+PrettySpaceNoEscapesMonoBlock
+ x   y
+
+ 0   1 
+ 1   2 
+ 2   3 
+ 3   4 
diff --git a/tests/queries/0_stateless/02375_pretty_formats.sql.j2 b/tests/queries/0_stateless/02375_pretty_formats.sql.j2
new file mode 100644
index 00000000000..cc61346d267
--- /dev/null
+++ b/tests/queries/0_stateless/02375_pretty_formats.sql.j2
@@ -0,0 +1,8 @@
+{% for format in ['Pretty', 'PrettyNoEscapes', 'PrettyMonoBlock', 'PrettyNoEscapesMonoBlock', 'PrettyCompact', 'PrettyCompactNoEscapes',
+                  'PrettyCompactMonoBlock', 'PrettyCompactNoEscapesMonoBlock', 'PrettySpace', 'PrettySpaceNoEscapes', 'PrettySpaceMonoBlock',
+                  'PrettySpaceNoEscapesMonoBlock'] -%}
+
+select '{{ format }}';
+select number as x, number + 1 as y from numbers(4) settings max_block_size=2 format {{ format }};
+
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02375_rocksdb_with_filters.reference b/tests/queries/0_stateless/02375_rocksdb_with_filters.reference
new file mode 100644
index 00000000000..2d6a0e0ad78
--- /dev/null
+++ b/tests/queries/0_stateless/02375_rocksdb_with_filters.reference
@@ -0,0 +1,8 @@
+1
+"rows_read":1,
+2
+"rows_read":2,
+1
+"rows_read":1,
+2
+"rows_read":2,
diff --git a/tests/queries/0_stateless/02375_rocksdb_with_filters.sh b/tests/queries/0_stateless/02375_rocksdb_with_filters.sh
new file mode 100755
index 00000000000..1f9922100cb
--- /dev/null
+++ b/tests/queries/0_stateless/02375_rocksdb_with_filters.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS rocksdb_with_filter;"
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE rocksdb_with_filter (key String, value String) ENGINE=EmbeddedRocksDB PRIMARY KEY key;"
+$CLICKHOUSE_CLIENT --query="INSERT INTO rocksdb_with_filter (*) SELECT n.number, n.number*10 FROM numbers(10000) n;"
+
+$CLICKHOUSE_CLIENT --query "SELECT count() FROM rocksdb_with_filter WHERE key = '5000'"
+$CLICKHOUSE_CLIENT --query "SELECT value FROM rocksdb_with_filter WHERE key = '5000' FORMAT JSON" | grep "rows_read" | tr -d "[:blank:]"
+
+$CLICKHOUSE_CLIENT --query "SELECT count() FROM rocksdb_with_filter WHERE key = '5000' OR key = '6000'"
+$CLICKHOUSE_CLIENT --query "SELECT value FROM rocksdb_with_filter WHERE key = '5000' OR key = '6000' FORMAT JSON" | grep "rows_read" | tr -d "[:blank:]"
+
+$CLICKHOUSE_CLIENT "--param_key=5000" --query "SELECT count() FROM rocksdb_with_filter WHERE key = {key:String}"
+$CLICKHOUSE_CLIENT "--param_key=5000" --query "SELECT value FROM rocksdb_with_filter WHERE key = {key:String} FORMAT JSON" | grep "rows_read" | tr -d "[:blank:]"
+
+$CLICKHOUSE_CLIENT --query "SELECT count() FROM rocksdb_with_filter WHERE key IN ('5000', '6000')"
+$CLICKHOUSE_CLIENT --query "SELECT value FROM rocksdb_with_filter WHERE key IN ('5000', '6000') FORMAT JSON" | grep "rows_read" | tr -d "[:blank:]"
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE rocksdb_with_filter;"
diff --git a/tests/queries/0_stateless/02375_scalar_lc_cte.reference b/tests/queries/0_stateless/02375_scalar_lc_cte.reference
new file mode 100644
index 00000000000..78981922613
--- /dev/null
+++ b/tests/queries/0_stateless/02375_scalar_lc_cte.reference
@@ -0,0 +1 @@
+a
diff --git a/tests/queries/0_stateless/02375_scalar_lc_cte.sql b/tests/queries/0_stateless/02375_scalar_lc_cte.sql
new file mode 100644
index 00000000000..80018333829
--- /dev/null
+++ b/tests/queries/0_stateless/02375_scalar_lc_cte.sql
@@ -0,0 +1 @@
+WITH ( SELECT toLowCardinality('a') ) AS bar SELECT bar
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02375_stack_trace_no_addresses.reference b/tests/queries/0_stateless/02375_stack_trace_no_addresses.reference
new file mode 100644
index 00000000000..0d66ea1aee9
--- /dev/null
+++ b/tests/queries/0_stateless/02375_stack_trace_no_addresses.reference
@@ -0,0 +1,2 @@
+0
+1
diff --git a/tests/queries/0_stateless/02375_stack_trace_no_addresses.sh b/tests/queries/0_stateless/02375_stack_trace_no_addresses.sh
new file mode 100755
index 00000000000..8faa698cf01
--- /dev/null
+++ b/tests/queries/0_stateless/02375_stack_trace_no_addresses.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+CONFIG="${CLICKHOUSE_TMP}/config.xml"
+
+echo "
+<clickhouse>
+    <show_addresses_in_stack_traces>false</show_addresses_in_stack_traces>
+    <profiles>
+        <default></default>
+    </profiles>
+    <users>
+        <default>
+            <password></password>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+    <quotas>
+        <default></default>
+    </quotas>
+</clickhouse>
+" > "${CONFIG}"
+
+${CLICKHOUSE_LOCAL} --query "SELECT throwIf(1)" --stacktrace --config-file "${CONFIG}" 2>&1 | grep -c -F '@ 0x'
+
+sed -i 's/<show_addresses_in_stack_traces>false/<show_addresses_in_stack_traces>true/' "${CONFIG}"
+
+${CLICKHOUSE_LOCAL} --query "SELECT throwIf(1)" --stacktrace --config-file "${CONFIG}" 2>&1 | grep -c -F '@ 0x' | grep -c -v '^0$'
+
+rm "${CONFIG}"
diff --git a/tests/queries/0_stateless/02375_system_schema_inference_cache.reference b/tests/queries/0_stateless/02375_system_schema_inference_cache.reference
new file mode 100644
index 00000000000..8653863981c
--- /dev/null
+++ b/tests/queries/0_stateless/02375_system_schema_inference_cache.reference
@@ -0,0 +1,12 @@
+storage	String					
+source	String					
+format	String					
+additional_format_info	String					
+registration_time	DateTime					
+schema	String					
+x	Nullable(Int64)					
+s	Nullable(String)					
+x	Nullable(Int64)					
+s	Nullable(String)					
+File	02374_data1.jsonl	JSONEachRow	x Nullable(Int64), s Nullable(String)
+File	02374_data2.jsonl	JSONEachRow	x Nullable(Int64), s Nullable(String)
diff --git a/tests/queries/0_stateless/02375_system_schema_inference_cache.sql b/tests/queries/0_stateless/02375_system_schema_inference_cache.sql
new file mode 100644
index 00000000000..a6df0606a89
--- /dev/null
+++ b/tests/queries/0_stateless/02375_system_schema_inference_cache.sql
@@ -0,0 +1,14 @@
+-- Tags: no-fasttest
+
+insert into function file('02374_data1.jsonl') select number as x, 'str' as s from numbers(10);
+insert into function file('02374_data2.jsonl') select number as x, 'str' as s from numbers(10);
+
+desc system.schema_inference_cache;
+system drop schema cache for file;
+
+desc file('02374_data1.jsonl');
+desc file('02374_data2.jsonl');
+
+select storage, splitByChar('/', source)[-1], format, schema from system.schema_inference_cache where storage='File';
+system drop schema cache for file;
+select storage, source, format, schema from system.schema_inference_cache where storage='File';
diff --git a/tests/queries/0_stateless/02376_arrow_dict_with_string.reference b/tests/queries/0_stateless/02376_arrow_dict_with_string.reference
new file mode 100644
index 00000000000..6f6ed89497c
--- /dev/null
+++ b/tests/queries/0_stateless/02376_arrow_dict_with_string.reference
@@ -0,0 +1,11 @@
+x	LowCardinality(Nullable(String))					
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/02376_arrow_dict_with_string.sql b/tests/queries/0_stateless/02376_arrow_dict_with_string.sql
new file mode 100644
index 00000000000..307498f7b92
--- /dev/null
+++ b/tests/queries/0_stateless/02376_arrow_dict_with_string.sql
@@ -0,0 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+insert into function file(02376_data.arrow) select toLowCardinality(toString(number)) as x from numbers(10) settings output_format_arrow_string_as_string=1, output_format_arrow_low_cardinality_as_dictionary=1, engine_file_truncate_on_insert=1;
+desc file (02376_data.arrow);
+select * from file(02376_data.arrow);
diff --git a/tests/queries/0_stateless/02377_executable_function_settings.reference b/tests/queries/0_stateless/02377_executable_function_settings.reference
new file mode 100644
index 00000000000..5eef5774e14
--- /dev/null
+++ b/tests/queries/0_stateless/02377_executable_function_settings.reference
@@ -0,0 +1,8 @@
+SELECT data
+FROM executable(\'\', \'JSON\', \'data String\')
+--------------------
+SELECT data
+FROM executable(\'\', \'JSON\', \'data String\', SETTINGS max_command_execution_time = 100)
+--------------------
+SELECT data
+FROM executable(\'\', \'JSON\', \'data String\', SETTINGS max_command_execution_time = 100, command_read_timeout = 1)
diff --git a/tests/queries/0_stateless/02377_executable_function_settings.sql b/tests/queries/0_stateless/02377_executable_function_settings.sql
new file mode 100644
index 00000000000..be60ad2d89b
--- /dev/null
+++ b/tests/queries/0_stateless/02377_executable_function_settings.sql
@@ -0,0 +1,5 @@
+EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String');
+SELECT '--------------------';
+EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String', SETTINGS max_command_execution_time=100);
+SELECT '--------------------';
+EXPLAIN SYNTAX SELECT * from executable('', 'JSON', 'data String', SETTINGS max_command_execution_time=100, command_read_timeout=1);
diff --git a/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.reference b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.reference
new file mode 100644
index 00000000000..f46cdb6e5e3
--- /dev/null
+++ b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.reference
@@ -0,0 +1,9 @@
+42	hello	2022-08-04 18:30:53	{'2b95a497-3a5d-49af-bf85-15763318cde7':[1.2,3.4]}
+UInt64	String	DateTime	Map(UUID, Array(Float32))
+42	[1,2,3]	{'abc':22,'def':33}	[[4,5,6],[7],[8,9]]	{10:[11,12],13:[14,15]}	{'ghj':{'klm':[16,17]},'nop':{'rst':[18]}}
+5
+42
+13
+13	str	2022-08-04 18:30:53	{'10':[11,12],'13':[14,15]}
+1
+1
diff --git a/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
new file mode 100755
index 00000000000..335af1bb6e6
--- /dev/null
+++ b/tests/queries/0_stateless/02377_extend_protocol_with_query_parameters.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+# shellcheck disable=SC2154
+
+unset CLICKHOUSE_LOG_COMMENT
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT \
+  --param_num="42" \
+  --param_str="hello" \
+  --param_date="2022-08-04 18:30:53" \
+  --param_map="{'2b95a497-3a5d-49af-bf85-15763318cde7': [1.2, 3.4]}" \
+  -q "select {num:UInt64}, {str:String}, {date:DateTime}, {map:Map(UUID, Array(Float32))}"
+
+
+$CLICKHOUSE_CLIENT \
+  --param_num="42" \
+  --param_str="hello" \
+  --param_date="2022-08-04 18:30:53" \
+  --param_map="{'2b95a497-3a5d-49af-bf85-15763318cde7': [1.2, 3.4]}" \
+  -q "select toTypeName({num:UInt64}), toTypeName({str:String}), toTypeName({date:DateTime}), toTypeName({map:Map(UUID, Array(Float32))})"
+
+
+table_name="t_02377_extend_protocol_with_query_parameters_$RANDOM$RANDOM"
+$CLICKHOUSE_CLIENT -n -q "
+  create table $table_name(
+    id Int64,
+    arr Array(UInt8),
+    map Map(String, UInt8),
+    mul_arr Array(Array(UInt8)),
+    map_arr Map(UInt8, Array(UInt8)),
+    map_map_arr Map(String, Map(String, Array(UInt8))))
+  engine = MergeTree
+  order by (id)"
+
+
+$CLICKHOUSE_CLIENT \
+  --param_id="42" \
+  --param_arr="[1, 2, 3]" \
+  --param_map="{'abc': 22, 'def': 33}" \
+  --param_mul_arr="[[4, 5, 6], [7], [8, 9]]" \
+  --param_map_arr="{10: [11, 12], 13: [14, 15]}" \
+  --param_map_map_arr="{'ghj': {'klm': [16, 17]}, 'nop': {'rst': [18]}}" \
+  -q "insert into $table_name values({id: Int64}, {arr: Array(UInt8)}, {map: Map(String, UInt8)}, {mul_arr: Array(Array(UInt8))}, {map_arr: Map(UInt8, Array(UInt8))}, {map_map_arr: Map(String, Map(String, Array(UInt8)))})"
+
+
+$CLICKHOUSE_CLIENT -q "select * from $table_name"
+
+
+$CLICKHOUSE_CLIENT \
+  --param_tbl="numbers" \
+  --param_db="system" \
+  --param_col="number" \
+  -q "select {col:Identifier} from {db:Identifier}.{tbl:Identifier} limit 1 offset 5"
+
+
+# it is possible to set parameter for the current session
+$CLICKHOUSE_CLIENT -n -q "set param_n = 42; select {n: UInt8}"
+# and it will not be visible to other sessions
+$CLICKHOUSE_CLIENT -n -q "select {n: UInt8} -- { serverError 456 }"
+
+
+# the same parameter could be set multiple times within one session (new value overrides the previous one)
+$CLICKHOUSE_CLIENT -n -q "set param_n = 12; set param_n = 13; select {n: UInt8}"
+
+
+# but multiple different parameters could be defined within each session
+$CLICKHOUSE_CLIENT -n -q "
+  set param_a = 13, param_b = 'str';
+  set param_c = '2022-08-04 18:30:53';
+  set param_d = '{\'10\': [11, 12], \'13\': [14, 15]}';
+  select {a: UInt32}, {b: String}, {c: DateTime}, {d: Map(String, Array(UInt8))}"
+
+# empty parameter name is not allowed
+$CLICKHOUSE_CLIENT --param_="" -q "select 1" 2>&1 | grep -c 'Code: 36'
+$CLICKHOUSE_CLIENT -q "set param_ = ''" 2>&1 | grep -c 'Code: 36'
diff --git a/tests/queries/0_stateless/02377_fix_file_virtual_column.reference b/tests/queries/0_stateless/02377_fix_file_virtual_column.reference
new file mode 100644
index 00000000000..c98e1059325
--- /dev/null
+++ b/tests/queries/0_stateless/02377_fix_file_virtual_column.reference
@@ -0,0 +1,3 @@
+1	s
+2	x
+3	y
diff --git a/tests/queries/0_stateless/02377_fix_file_virtual_column.sql b/tests/queries/0_stateless/02377_fix_file_virtual_column.sql
new file mode 100644
index 00000000000..5d79e7f12cd
--- /dev/null
+++ b/tests/queries/0_stateless/02377_fix_file_virtual_column.sql
@@ -0,0 +1,7 @@
+drop table if exists test_02377;
+create table test_02377 (n UInt32, s String) engine=File(CSVWithNames);
+insert into test_02377 values(1, 's') (2, 'x') (3, 'y');
+select * from test_02377 order by n;
+select *, _path, _file from test_02377 format Null;
+select _path, _file from test_02377 format Null;
+drop table test_02377;
diff --git a/tests/queries/0_stateless/02377_modify_column_from_lc.reference b/tests/queries/0_stateless/02377_modify_column_from_lc.reference
new file mode 100644
index 00000000000..556d825db42
--- /dev/null
+++ b/tests/queries/0_stateless/02377_modify_column_from_lc.reference
@@ -0,0 +1 @@
+2	1
diff --git a/tests/queries/0_stateless/02377_modify_column_from_lc.sql b/tests/queries/0_stateless/02377_modify_column_from_lc.sql
new file mode 100644
index 00000000000..a578e7cb03a
--- /dev/null
+++ b/tests/queries/0_stateless/02377_modify_column_from_lc.sql
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS t_modify_from_lc_1;
+DROP TABLE IF EXISTS t_modify_from_lc_2;
+
+SET allow_suspicious_low_cardinality_types = 1;
+
+CREATE TABLE t_modify_from_lc_1
+(
+    id UInt64,
+    a LowCardinality(UInt32) CODEC(NONE)
+)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+CREATE TABLE t_modify_from_lc_2
+(
+    id UInt64,
+    a LowCardinality(UInt32) CODEC(NONE)
+)
+ENGINE = MergeTree ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO t_modify_from_lc_1 SELECT number, number FROM numbers(100000);
+INSERT INTO t_modify_from_lc_2 SELECT number, number FROM numbers(100000);
+
+OPTIMIZE TABLE t_modify_from_lc_1 FINAL;
+OPTIMIZE TABLE t_modify_from_lc_2 FINAL;
+
+ALTER TABLE t_modify_from_lc_1 MODIFY COLUMN a UInt32;
+
+-- Check that dictionary of LowCardinality is actually
+-- dropped and total size on disk is reduced.
+WITH groupArray((table, bytes))::Map(String, UInt64) AS stats
+SELECT
+    length(stats), stats['t_modify_from_lc_1'] < stats['t_modify_from_lc_2']
+FROM
+(
+    SELECT table, sum(bytes_on_disk) AS bytes FROM system.parts
+    WHERE database = currentDatabase() AND table LIKE 't_modify_from_lc%' AND active
+    GROUP BY table
+);
+
+DROP TABLE IF EXISTS t_modify_from_lc_1;
+DROP TABLE IF EXISTS t_modify_from_lc_2;
diff --git a/tests/queries/0_stateless/02377_modify_column_from_nested.reference b/tests/queries/0_stateless/02377_modify_column_from_nested.reference
new file mode 100644
index 00000000000..0c66773ab43
--- /dev/null
+++ b/tests/queries/0_stateless/02377_modify_column_from_nested.reference
@@ -0,0 +1,6 @@
+1	[2]	['aa']	Array(String)
+2	[44,55]	['bb','cc']	Array(String)
+1	[2]	[\'aa\']	String
+2	[44,55]	[\'bb\',\'cc\']	String
+1	[2]	[\'aa\']	String
+2	[44,55]	[\'bb\',\'cc\']	String
diff --git a/tests/queries/0_stateless/02377_modify_column_from_nested.sql b/tests/queries/0_stateless/02377_modify_column_from_nested.sql
new file mode 100644
index 00000000000..8270cce6278
--- /dev/null
+++ b/tests/queries/0_stateless/02377_modify_column_from_nested.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS t_nested_modify;
+
+CREATE TABLE t_nested_modify (id UInt64, `n.a` Array(UInt32), `n.b` Array(String))
+ENGINE = MergeTree ORDER BY id
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO t_nested_modify VALUES (1, [2], ['aa']);
+INSERT INTO t_nested_modify VALUES (2, [44, 55], ['bb', 'cc']);
+
+SELECT id, `n.a`, `n.b`, toTypeName(`n.b`) FROM t_nested_modify ORDER BY id;
+
+ALTER TABLE t_nested_modify MODIFY COLUMN `n.b` String;
+
+SELECT id, `n.a`, `n.b`, toTypeName(`n.b`) FROM t_nested_modify ORDER BY id;
+
+DETACH TABLE t_nested_modify;
+ATTACH TABLE t_nested_modify;
+
+SELECT id, `n.a`, `n.b`, toTypeName(`n.b`) FROM t_nested_modify ORDER BY id;
+
+DROP TABLE t_nested_modify;
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.reference b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.reference
new file mode 100644
index 00000000000..766ba099c84
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.reference
@@ -0,0 +1,184 @@
+-- { echoOn }
+-- order by for MergeTree w/o sorting key
+SELECT a, b from optimize_sorting order by a, b;
+0	0
+18446744073709551615	18446744073709551615
+-- { echoOn }
+SELECT a from optimize_sorting order by a;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT c from optimize_sorting order by c;
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+-- queries with unary function in order by
+SELECT a from optimize_sorting order by -a;
+9
+8
+7
+6
+5
+4
+3
+2
+1
+0
+SELECT a from optimize_sorting order by toFloat64(a);
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+-- queries with non-unary function in order by
+SELECT a, a+1 from optimize_sorting order by a+1;
+0	1
+1	2
+2	3
+3	4
+4	5
+5	6
+6	7
+7	8
+8	9
+9	10
+SELECT a, a-1 from optimize_sorting order by a-1;
+0	-1
+1	0
+2	1
+3	2
+4	3
+5	4
+6	5
+7	6
+8	7
+9	8
+SELECT a, sipHash64(a,'a') from optimize_sorting order by sipHash64(a,'a');
+3	1173123105019859883
+8	1721650864755082841
+0	5764203013335897168
+9	7186398762098957933
+5	7941328890117047678
+1	11604135878754760071
+2	14554472274185621678
+6	15415898319530396106
+4	15793726040922926059
+7	18182906236422157798
+-- queries with aliases
+SELECT a as a from optimize_sorting order by a;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT a+1 as a from optimize_sorting order by a;
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+SELECT toFloat64(a) as a from optimize_sorting order by a;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT sipHash64(a) as a from optimize_sorting order by a;
+9140302661501632497
+9199082625845137542
+9224715256000962398
+13180436571133193200
+13251804803629934096
+13686418376000424449
+14247234200463187066
+14454559127837024772
+14848019510572519333
+16738165381834614119
+-- queries with filter
+SELECT a FROM optimize_sorting WHERE a > 0 ORDER BY a;
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT a > 0 FROM optimize_sorting WHERE a > 0;
+1
+1
+1
+1
+1
+1
+1
+1
+1
+SELECT a FROM (SELECT a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT a FROM (SELECT sipHash64(a) AS a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+9140302661501632497
+9199082625845137542
+9224715256000962398
+13180436571133193200
+13251804803629934096
+13686418376000424449
+14247234200463187066
+14454559127837024772
+14848019510572519333
+16738165381834614119
+-- queries with non-trivial action's chain in expression
+SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1;
+9140302661501632497	9140302661501632498
+9199082625845137542	9199082625845137543
+9224715256000962398	9224715256000962399
+13180436571133193200	13180436571133193201
+13251804803629934096	13251804803629934097
+13686418376000424449	13686418376000424450
+14247234200463187066	14247234200463187067
+14454559127837024772	14454559127837024773
+14848019510572519333	14848019510572519334
+16738165381834614119	16738165381834614120
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.sql b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.sql
new file mode 100644
index 00000000000..d3376188159
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties.sql
@@ -0,0 +1,40 @@
+set optimize_sorting_by_input_stream_properties=1;
+
+DROP TABLE IF EXISTS optimize_sorting;
+CREATE TABLE optimize_sorting (a UInt64, b UInt64) ENGINE MergeTree() ORDER BY tuple();
+INSERT INTO optimize_sorting VALUES(0, 0);
+INSERT INTO optimize_sorting VALUES(0xFFFFffffFFFFffff, 0xFFFFffffFFFFffff);
+-- { echoOn }
+-- order by for MergeTree w/o sorting key
+SELECT a, b from optimize_sorting order by a, b;
+-- { echoOff }
+
+DROP TABLE IF EXISTS optimize_sorting;
+CREATE TABLE optimize_sorting (a UInt64, b UInt64, c UInt64) ENGINE MergeTree() ORDER BY (a, b);
+INSERT INTO optimize_sorting SELECT number, number%5, number%2 from numbers(0, 5);
+INSERT INTO optimize_sorting SELECT number, number%5, number%2 from numbers(5, 5);
+
+-- { echoOn }
+SELECT a from optimize_sorting order by a;
+SELECT c from optimize_sorting order by c;
+-- queries with unary function in order by
+SELECT a from optimize_sorting order by -a;
+SELECT a from optimize_sorting order by toFloat64(a);
+-- queries with non-unary function in order by
+SELECT a, a+1 from optimize_sorting order by a+1;
+SELECT a, a-1 from optimize_sorting order by a-1;
+SELECT a, sipHash64(a,'a') from optimize_sorting order by sipHash64(a,'a');
+-- queries with aliases
+SELECT a as a from optimize_sorting order by a;
+SELECT a+1 as a from optimize_sorting order by a;
+SELECT toFloat64(a) as a from optimize_sorting order by a;
+SELECT sipHash64(a) as a from optimize_sorting order by a;
+-- queries with filter
+SELECT a FROM optimize_sorting WHERE a > 0 ORDER BY a;
+SELECT a > 0 FROM optimize_sorting WHERE a > 0;
+SELECT a FROM (SELECT a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+SELECT a FROM (SELECT sipHash64(a) AS a FROM optimize_sorting) WHERE a != 0 ORDER BY a;
+-- queries with non-trivial action's chain in expression
+SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1;
+-- { echoOff }
+DROP TABLE IF EXISTS optimize_sorting;
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
new file mode 100644
index 00000000000..c32f227006c
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.reference
@@ -0,0 +1,89 @@
+-- EXPLAIN PLAN sorting for MergeTree w/o sorting key
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a
+Sorting (Stream): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): a ASC
+Sorting (None)
+Sorting (None)
+-- disable optimization -> sorting order is NOT propagated from subquery -> full sort
+-- QUERY: set optimize_sorting_by_input_stream_properties=0;set max_threads=1;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a
+MergeSortingTransform
+LimitsCheckingTransform
+PartialSortingTransform
+-- enable optimization -> sorting order is propagated from subquery -> merge sort
+-- QUERY: set optimize_sorting_by_input_stream_properties=1;set max_threads=1;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a
+MergeSortingTransform
+-- enable optimization -> there is no sorting order to propagate from subquery -> full sort
+-- QUERY: set optimize_sorting_by_input_stream_properties=1;set max_threads=1;EXPLAIN PIPELINE SELECT c FROM (SELECT c FROM optimize_sorting) ORDER BY c
+MergeSortingTransform
+LimitsCheckingTransform
+PartialSortingTransform
+-- ExpressionStep preserves sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a
+Sorting (Stream): a ASC
+Sorting
+Sorting (Stream): a ASC
+Sorting (Port): a ASC
+Sorting (Port): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a+1
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- ExpressionStep breaks sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting ORDER BY a+1
+Sorting (Stream): plus(a, 1) ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (None)
+Sorting (Chunk): a ASC
+-- FilterStep preserves sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a+1 > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, a+1 FROM optimize_sorting WHERE a+1 > 0
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
+-- FilterStep breaks sort mode
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a > 0 FROM optimize_sorting WHERE a > 0
+Sorting (None)
+Sorting (None)
+Sorting (Chunk): a ASC
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting WHERE a+1 > 0
+Sorting (None)
+Sorting (None)
+Sorting (Chunk): a ASC
+-- aliases break sorting order
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a
+Sorting (Stream): a ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): a ASC
+Sorting (None)
+Sorting
+Sorting (Stream): a ASC
+Sorting (Port): a ASC
+Sorting (Port): a ASC
+-- aliases DONT break sorting order
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)
+Sorting (Stream): x ASC, y ASC
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): x ASC, y ASC
+Sorting (Chunk): a ASC, b ASC
+Sorting (Chunk): a ASC, b ASC
+-- actions chain breaks sorting order: input(column a)->sipHash64(column a)->alias(sipHash64(column a), a)->plus(alias a, 1)
+-- QUERY: set optimize_read_in_order=1;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (None)
+Sorting (Sorting for ORDER BY)
+Sorting (Stream): plus(a, 1) ASC
+Sorting (Chunk): a ASC
+Sorting (Chunk): a ASC
diff --git a/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
new file mode 100755
index 00000000000..cea76b7d6ea
--- /dev/null
+++ b/tests/queries/0_stateless/02377_optimize_sorting_by_input_stream_properties_explain.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+DISABLE_OPTIMIZATION="set optimize_sorting_by_input_stream_properties=0;set max_threads=1"
+ENABLE_OPTIMIZATION="set optimize_sorting_by_input_stream_properties=1;set max_threads=1"
+MAKE_OUTPUT_STABLE="set optimize_read_in_order=1"
+GREP_SORTING="grep 'PartialSortingTransform\|LimitsCheckingTransform\|MergeSortingTransform\|MergingSortedTransform'"
+GREP_SORTMODE="grep 'Sorting'"
+TRIM_LEADING_SPACES="sed -e 's/^[ \t]*//'"
+FIND_SORTING="$GREP_SORTING | $TRIM_LEADING_SPACES"
+FIND_SORTMODE="$GREP_SORTMODE | $TRIM_LEADING_SPACES"
+
+function explain_sorting {
+    echo "-- QUERY: "$1
+    $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTING
+}
+function explain_sortmode {
+    echo "-- QUERY: "$1
+    $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTMODE
+}
+
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
+$CLICKHOUSE_CLIENT -q "create table optimize_sorting (a UInt64, b UInt64, c UInt64) engine=MergeTree() order by tuple()"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting values (0, 0, 0) (1, 1, 1)"
+echo "-- EXPLAIN PLAN sorting for MergeTree w/o sorting key"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a"
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
+
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
+$CLICKHOUSE_CLIENT -q "create table optimize_sorting (a UInt64, b UInt64, c UInt64) engine=MergeTree() order by (a, b)"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting select number, number % 5, number % 2 from numbers(0,10)"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting select number, number % 5, number % 2 from numbers(10,10)"
+$CLICKHOUSE_CLIENT -q "insert into optimize_sorting SELECT number, number % 5, number % 2 from numbers(20,10)"
+
+echo "-- disable optimization -> sorting order is NOT propagated from subquery -> full sort"
+explain_sorting "$DISABLE_OPTIMIZATION;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a"
+
+echo "-- enable optimization -> sorting order is propagated from subquery -> merge sort"
+explain_sorting "$ENABLE_OPTIMIZATION;EXPLAIN PIPELINE SELECT a FROM (SELECT a FROM optimize_sorting) ORDER BY a"
+echo "-- enable optimization -> there is no sorting order to propagate from subquery -> full sort"
+explain_sorting "$ENABLE_OPTIMIZATION;EXPLAIN PIPELINE SELECT c FROM (SELECT c FROM optimize_sorting) ORDER BY c"
+
+echo "-- ExpressionStep preserves sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting ORDER BY a+1"
+
+echo "-- ExpressionStep breaks sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting ORDER BY a+1"
+
+echo "-- FilterStep preserves sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a > 0"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM optimize_sorting WHERE a+1 > 0"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, a+1 FROM optimize_sorting WHERE a+1 > 0"
+
+echo "-- FilterStep breaks sort mode"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a > 0 FROM optimize_sorting WHERE a > 0"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a+1 FROM optimize_sorting WHERE a+1 > 0"
+
+echo "-- aliases break sorting order"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a FROM (SELECT sipHash64(a) AS a FROM (SELECT a FROM optimize_sorting ORDER BY a)) ORDER BY a"
+
+# FIXME: we still do full sort here, - it's because, for most inner subqueury, sorting description contains original column names but header contains only aliases on those columns:
+#|     Header: x Int32                                                 │
+#│             y Int32                                                 │
+#│     Sort Mode: Chunk: a ASC, b ASC                                  │
+echo "-- aliases DONT break sorting order"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, b FROM (SELECT x AS a, y AS b FROM (SELECT a AS x, b AS y FROM optimize_sorting) ORDER BY x, y)"
+
+echo "-- actions chain breaks sorting order: input(column a)->sipHash64(column a)->alias(sipHash64(column a), a)->plus(alias a, 1)"
+explain_sortmode "$MAKE_OUTPUT_STABLE;EXPLAIN PLAN actions=1, header=1, sorting=1 SELECT a, z FROM (SELECT sipHash64(a) AS a, a + 1 AS z FROM (SELECT a FROM optimize_sorting ORDER BY a + 1)) ORDER BY a + 1"
+
+$CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting sync"
diff --git a/tests/queries/0_stateless/02377_quota_key.reference b/tests/queries/0_stateless/02377_quota_key.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02377_quota_key.sh b/tests/queries/0_stateless/02377_quota_key.sh
new file mode 100755
index 00000000000..8aa6797dc2c
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02377"
+${CLICKHOUSE_CLIENT} -q "drop quota if exists q_02377"
+${CLICKHOUSE_CLIENT} -q "CREATE USER u_02377 IDENTIFIED WITH plaintext_password BY 'password';"
+${CLICKHOUSE_CLIENT} -q "CREATE QUOTA q_02377 KEYED BY client_key FOR INTERVAL 1 month MAX queries = 100 TO u_02377;"
+
+${CLICKHOUSE_CLIENT} --user=u_02377 --password=password --quota_key=q_02377 --query="select 1"
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02377"
+${CLICKHOUSE_CLIENT} -q "drop quota if exists q_02377"
diff --git a/tests/queries/0_stateless/02377_quota_key_http.reference b/tests/queries/0_stateless/02377_quota_key_http.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key_http.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02377_quota_key_http.sh b/tests/queries/0_stateless/02377_quota_key_http.sh
new file mode 100755
index 00000000000..45e09e1fead
--- /dev/null
+++ b/tests/queries/0_stateless/02377_quota_key_http.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+curl -sS "${CLICKHOUSE_URL}" --data "DROP USER IF EXISTS u_02377"
+curl -sS "${CLICKHOUSE_URL}" --data "drop quota if exists q_02377"
+curl -sS "${CLICKHOUSE_URL}" --data "CREATE USER u_02377 IDENTIFIED WITH plaintext_password BY 'password'"
+curl -sS "${CLICKHOUSE_URL}" --data "CREATE QUOTA q_02377 KEYED BY client_key FOR INTERVAL 1 month MAX queries = 100 TO u_02377"
+
+curl -sS -G "${CLICKHOUSE_URL}&user=u_02377&password=password&quota_key=q_02377&query=SELECT%201"
+
+curl -sS "${CLICKHOUSE_URL}" --data "DROP USER IF EXISTS u_02377"
+curl -sS "${CLICKHOUSE_URL}" --data "drop quota if exists q_02377"
diff --git a/tests/queries/0_stateless/02380_insert_mv_race.reference b/tests/queries/0_stateless/02380_insert_mv_race.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02380_insert_mv_race.sh b/tests/queries/0_stateless/02380_insert_mv_race.sh
new file mode 100755
index 00000000000..725c7eacce6
--- /dev/null
+++ b/tests/queries/0_stateless/02380_insert_mv_race.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Tags: long, race
+
+# Regression test for INSERT into table with MV attached,
+# to avoid possible errors if some table will disappears,
+# in case of multiple streams was used (i.e. max_insert_threads>1)
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "ATTACH TABLE mv" |& {
+    # CANNOT_GET_CREATE_TABLE_QUERY -- ATTACH TABLE IF EXISTS
+    # TABLE_ALREADY_EXISTS          -- ATTACH TABLE IF NOT EXISTS
+    grep -F -m1 Exception | grep -v -e CANNOT_GET_CREATE_TABLE_QUERY -e TABLE_ALREADY_EXISTS
+}
+
+$CLICKHOUSE_CLIENT -nm -q "
+    DROP TABLE IF EXISTS null;
+    CREATE TABLE null (key Int) ENGINE = Null;
+    DROP TABLE IF EXISTS mv;
+    CREATE MATERIALIZED VIEW mv ENGINE = Null() AS SELECT * FROM null;
+"
+
+$CLICKHOUSE_CLIENT -q "INSERT INTO null SELECT * FROM numbers_mt(1000) settings max_threads=1000, max_insert_threads=1000, max_block_size=1" |& {
+    # To avoid handling stacktrace here, get only first line (-m1)
+    # this should be OK, since you cannot have multiple exceptions from the client anyway.
+    grep -m1 -F 'DB::Exception:' | grep -F -v -e 'UNKNOWN_TABLE'
+} &
+sleep 0.05
+$CLICKHOUSE_CLIENT -q "DETACH TABLE mv"
+
+# avoid leftovers on DROP DATABASE (force_remove_data_recursively_on_drop) for Ordinary database
+$CLICKHOUSE_CLIENT -q "ATTACH TABLE mv"
+
+wait
diff --git a/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.reference b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.reference
new file mode 100644
index 00000000000..a6c4a5b13a2
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.reference
@@ -0,0 +1,9 @@
+lc_nullable_string
+LowCardinality(Nullable(String))
+one
+\N
+three
+
+\N
+
+six
diff --git a/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.sh b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.sh
new file mode 100755
index 00000000000..2d854c956b2
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_of_nullable_string_to_lc.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# ## reading ArrowStream file from python
+# import pyarrow as pa
+# stream = pa.ipc.open_stream("test.arrows")
+# x = stream.read_all()
+# print(x)
+
+## writing ArrowStream file from python
+# import pyarrow as pa
+# data = [
+#     pa.array(["one", None, "three", "", None, "", "six"]).dictionary_encode(),
+# ]
+# batch = pa.record_batch(data, names=['id', 'lc_nullable', 'lc_int_nullable', 'bool_nullable'])
+# writer = pa.ipc.new_stream("test4.arrows", batch.schema)
+# writer.write_batch(batch)
+# writer.close()
+
+# cat data.arrow | gzip | base64
+
+cat <<EOF | base64 --decode | gunzip | $CLICKHOUSE_LOCAL --query='SELECT * FROM table FORMAT TSVWithNamesAndTypes' --input-format=ArrowStream
+H4sIAAAAAAAAA3VQQQ6CQAychRWIcjCGGA4ePHrwCT7Bgz8waoiSICaoiU/wGR49+Me1XboIJDYp
+3d2ZTjsYY8wLwBgcQ8QIMEBEJwqloal8iMNVUSaWmxIjQEjsMb3UvWrA2IZySalRx4SyOGzLe1Hs
+9kW2vd6qvDyC+iPL4m8MvseUob2z2NyiutGhFcxb5sP2JLJpbPvhaYstBK8d1PrOW0pMLcha3p0+
+h4//4eamUkctTPV02nqRpONfyux2qrLsmj8aX8+Or2nXl6/tzEWj2vWxEh9ha67X2w2yA8esh7k+
+13PueVAtzMPvH/HebPkLlbsntUACAAA=
+EOF
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02381_arrow_dict_to_lc.reference b/tests/queries/0_stateless/02381_arrow_dict_to_lc.reference
new file mode 100644
index 00000000000..7d35a0d4b77
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_to_lc.reference
@@ -0,0 +1,7 @@
+id	lc_nullable	lc_int_nullable	bool_nullable
+Nullable(Int64)	LowCardinality(Nullable(String))	LowCardinality(Nullable(Int64))	Nullable(UInt8)
+1	onee	1	1
+2	twoo	2	0
+3	three	3	1
+4	four	4	1
+5	five	5	1
diff --git a/tests/queries/0_stateless/02381_arrow_dict_to_lc.sh b/tests/queries/0_stateless/02381_arrow_dict_to_lc.sh
new file mode 100755
index 00000000000..9fb0272eeb0
--- /dev/null
+++ b/tests/queries/0_stateless/02381_arrow_dict_to_lc.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# ## reading ArrowStream file from python
+# import pyarrow as pa
+# stream = pa.ipc.open_stream("test.arrows")
+# x = stream.read_all()
+# print(x)
+
+## writing ArrowStream file from python
+# import pyarrow as pa
+#data = [
+#    pa.array([1, 2, 3, 4, 5]),
+#    pa.array(["onee", "twoo", "three", "four", "five"]).dictionary_encode(),
+#    pa.array([1, 2, 3, 4, 5]).dictionary_encode(),
+#    pa.array([True, False, True, True, True])
+#]
+# batch = pa.record_batch(data, names=['id', 'lc_nullable', 'lc_int_nullable', 'bool_nullable'])
+# writer = pa.ipc.new_stream("test4.arrows", batch.schema)
+# writer.write_batch(batch)
+# writer.close()
+
+# cat data.arrow | gzip | base64
+
+cat <<EOF | base64 --decode | gunzip | $CLICKHOUSE_LOCAL --query='SELECT * FROM table FORMAT TSVWithNamesAndTypes' --input-format=ArrowStream
+H4sIAAAAAAAAA5VTsU7DQAz1pZc2giBaFFAGkBgYMjIyMOQD+gHdCqWpiBQlqErhZzowMvIB/Ft4
+d+drrqGFYsny+fzO9rN1TdM0L4JoSEqOKKQ++RTgBBGSJEwEjLL6DOwn7B37IWIA9tX7a75TcgKd
+VVUxLVdF8TgrMvgpsGuD9yL4Y2jivDmFFk/TvKzbVwFFUAk1PQpqZaJzkVB153xONS4Gvk8DsBni
+veEmfFVTxW+cmsemplMv0NGAMV9ODUlmHkPdk8mvPM7vKXvp5Pag+ZyADaEDndP2iLTNh5onY0Oc
+zORDnZU8qWO3HDcbaeegdhUDKTky5nvfmU+P9kvcsedOTHTyWJG6D7PbEb+pyiyr36qqfl5m2aJa
+LRf5a8b83g/gl2z4nW32HJO7522e9zt4er/wTJzzLl62js1hZ2Z3aPGKTyxcPhfbfHpS9/2wp+/1
+jr6DA/pO9tzbPtJOPO3EJ5249d1/JOnnXP7rHzpHi/UYI/+4v2LbmH9I36C0faSwBAAA
+EOF
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02381_client_prints_server_side_time.reference b/tests/queries/0_stateless/02381_client_prints_server_side_time.reference
new file mode 100644
index 00000000000..7326d960397
--- /dev/null
+++ b/tests/queries/0_stateless/02381_client_prints_server_side_time.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/02381_client_prints_server_side_time.sh b/tests/queries/0_stateless/02381_client_prints_server_side_time.sh
new file mode 100755
index 00000000000..e6cd63da95d
--- /dev/null
+++ b/tests/queries/0_stateless/02381_client_prints_server_side_time.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-s3-storage
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# We will check that --time option of clickhouse-client will display server-side time, not client-side time.
+# For this purpose, we ask it to output some amount of data that is larger than the buffers in clickhouse-client
+# but smaller than the pipe buffer, and we slow down output of the query result with 'pv' command to get around one second of run time.
+# If everything is works as expected, at least sometimes this command should display time less than 100ms.
+while true
+do
+    $CLICKHOUSE_CLIENT --time --query 'SELECT 1 FROM numbers(1000000) FORMAT RowBinary' 2>"${CLICKHOUSE_TMP}/time" | pv --quiet --rate-limit 1M > /dev/null
+    grep -q -F '0.0' "${CLICKHOUSE_TMP}/time" && break
+done
+
+echo 'Ok'
diff --git a/tests/queries/0_stateless/02381_intersect_except_const_column.reference b/tests/queries/0_stateless/02381_intersect_except_const_column.reference
new file mode 100644
index 00000000000..290835b412e
--- /dev/null
+++ b/tests/queries/0_stateless/02381_intersect_except_const_column.reference
@@ -0,0 +1,61 @@
+fooooo
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
diff --git a/tests/queries/0_stateless/02381_intersect_except_const_column.sql b/tests/queries/0_stateless/02381_intersect_except_const_column.sql
new file mode 100644
index 00000000000..b10f913dd1e
--- /dev/null
+++ b/tests/queries/0_stateless/02381_intersect_except_const_column.sql
@@ -0,0 +1,13 @@
+-- Test: crash the server
+SELECT 'fooooo' INTERSECT SELECT 'fooooo';
+SELECT 'fooooo' EXCEPT SELECT 'fooooo';
+
+-- Test: intersect return incorrect result for const column
+SELECT 1 FROM numbers(10) INTERSECT SELECT 1 FROM numbers(10);
+SELECT toString(1) FROM numbers(10) INTERSECT SELECT toString(1) FROM numbers(10);
+SELECT '1' FROM numbers(10) INTERSECT SELECT '1' FROM numbers(10);
+
+-- Test: except return incorrect result for const column
+SELECT 2 FROM numbers(10) EXCEPT SELECT 1 FROM numbers(5);
+SELECT toString(2) FROM numbers(10) EXCEPT SELECT toString(1) FROM numbers(5);
+SELECT '2' FROM numbers(10) EXCEPT SELECT '1' FROM numbers(5);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
new file mode 100644
index 00000000000..d2f1b4efdd5
--- /dev/null
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.reference
@@ -0,0 +1,58 @@
+Expression
+Header: key String
+        value String
+  Join
+  Header: key String
+          value String
+    Expression
+    Header: key String
+      ReadFromStorage
+      Header: dummy UInt8
+    Expression
+    Header: s2.key String
+            value String
+      Union
+      Header: key String
+              value String
+        Expression
+        Header: key String
+                value String
+          ReadFromStorage
+          Header: dummy UInt8
+        Expression
+        Header: key String
+                value String
+          ReadFromStorage
+          Header: dummy UInt8
+Expression
+Header: key String
+        value String
+  Join
+  Header: key String
+          s2.key String
+          value String
+    Sorting
+    Header: key String
+      Expression
+      Header: key String
+        ReadFromStorage
+        Header: dummy UInt8
+    Sorting
+    Header: s2.key String
+            value String
+      Expression
+      Header: s2.key String
+              value String
+        Union
+        Header: key String
+                value String
+          Expression
+          Header: key String
+                  value String
+            ReadFromStorage
+            Header: dummy UInt8
+          Expression
+          Header: key String
+                  value String
+            ReadFromStorage
+            Header: dummy UInt8
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
new file mode 100644
index 00000000000..a418a06803f
--- /dev/null
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
@@ -0,0 +1,13 @@
+SET join_algorithm = 'hash';
+
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
+
+SET join_algorithm = 'full_sorting_merge';
+
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
diff --git a/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
new file mode 100644
index 00000000000..c9a13c97baf
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
@@ -0,0 +1,12 @@
+parseDateTime64BestEffortUS
+ s                                           a
+
+ 01-02-1930 12:00:00   1930-01-02 12:00:00.000 
+ 12.02.1930 12:00:00   1930-12-02 12:00:00.000 
+ 13/02/1930 12:00:00   1930-02-13 12:00:00.000 
+ 02/25/1930 12:00:00   1930-02-25 12:00:00.000 
+
+parseDateTime64BestEffortUSOrNull
+\N
+parseDateTime64BestEffortUSOrZero
+1970-01-01 00:00:00.000
diff --git a/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.sql b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.sql
new file mode 100644
index 00000000000..21dc7b1a990
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.sql
@@ -0,0 +1,22 @@
+SELECT 'parseDateTime64BestEffortUS';
+
+SELECT
+    s,
+    parseDateTime64BestEffortUS(s,3,'UTC') AS a
+FROM
+(
+    SELECT arrayJoin([
+'01-02-1930 12:00:00',
+'12.02.1930 12:00:00',
+'13/02/1930 12:00:00',
+'02/25/1930 12:00:00'
+]) AS s)
+FORMAT PrettySpaceNoEscapes;
+
+SELECT '';
+
+SELECT 'parseDateTime64BestEffortUSOrNull';
+SELECT parseDateTime64BestEffortUSOrNull('01/45/1925 16:00:00',3,'UTC');
+
+SELECT 'parseDateTime64BestEffortUSOrZero';
+SELECT parseDateTime64BestEffortUSOrZero('01/45/1925 16:00:00',3,'UTC');
diff --git a/tests/queries/0_stateless/02381_parse_array_of_tuples.reference b/tests/queries/0_stateless/02381_parse_array_of_tuples.reference
new file mode 100644
index 00000000000..fa7137d800d
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parse_array_of_tuples.reference
@@ -0,0 +1,3 @@
+1	[[]]
+2	[[(500,246)]]
+3	[[(500,10)]]
diff --git a/tests/queries/0_stateless/02381_parse_array_of_tuples.sql b/tests/queries/0_stateless/02381_parse_array_of_tuples.sql
new file mode 100644
index 00000000000..51db5a0fe9b
--- /dev/null
+++ b/tests/queries/0_stateless/02381_parse_array_of_tuples.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_parse_tuples;
+
+CREATE TABLE t_parse_tuples
+(
+    id UInt32,
+    arr Array(Array(Tuple(c1 Int32, c2 UInt8)))
+)
+ENGINE = Memory;
+
+INSERT INTO t_parse_tuples VALUES (1, [[]]), (2, [[(500, -10)]]), (3, [[(500, '10')]]);
+
+SELECT * FROM t_parse_tuples ORDER BY id;
+
+DROP TABLE IF EXISTS t_parse_tuples;
diff --git a/tests/queries/0_stateless/02381_setting_value_auto.reference b/tests/queries/0_stateless/02381_setting_value_auto.reference
new file mode 100644
index 00000000000..acc5025da5e
--- /dev/null
+++ b/tests/queries/0_stateless/02381_setting_value_auto.reference
@@ -0,0 +1,4 @@
+0	0	UInt64Auto
+auto	1	UInt64Auto
+0	1	UInt64Auto
+1	1	UInt64Auto
diff --git a/tests/queries/0_stateless/02381_setting_value_auto.sql b/tests/queries/0_stateless/02381_setting_value_auto.sql
new file mode 100644
index 00000000000..5b536a9d749
--- /dev/null
+++ b/tests/queries/0_stateless/02381_setting_value_auto.sql
@@ -0,0 +1,10 @@
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
+
+SET insert_quorum = 'auto';
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
+
+SET insert_quorum = 0;
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
+
+SET insert_quorum = 1;
+SELECT value, changed, type FROM system.settings WHERE name = 'insert_quorum';
diff --git a/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference b/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference
new file mode 100644
index 00000000000..d3d9ce25569
--- /dev/null
+++ b/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.reference
@@ -0,0 +1,76 @@
+-- { echo }
+
+SET enable_filesystem_cache_on_write_operations=0;
+SYSTEM DROP FILESYSTEM CACHE;
+DROP TABLE IF EXISTS nopers;
+CREATE TABLE nopers (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES nopers;
+INSERT INTO nopers SELECT number, toString(number) FROM numbers(10);
+SELECT * FROM nopers FORMAT Null;
+SELECT sum(size) FROM system.filesystem_cache;
+194
+SELECT substring(local_path, 58, 10) as file, substring(cache_path, 53, 20) as cache, size
+FROM
+(
+    SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+    FROM system.remote_data_paths
+) AS data_paths
+INNER JOIN
+    system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path
+ORDER BY file, cache, size;
+data.bin		114
+data.mrk3		80
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_small', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT * FROM test FORMAT Null;
+SELECT sum(size) FROM system.filesystem_cache;
+1020
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+4
+SELECT count() FROM system.filesystem_cache;
+4
+SELECT substring(local_path, 58, 10) as file, substring(cache_path, 53, 20) as cache, size
+FROM
+(
+    SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+    FROM system.remote_data_paths
+) AS data_paths
+INNER JOIN
+    system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path
+ORDER BY file, cache, size;
+data.bin		114
+data.bin	0	746
+data.mrk3		80
+data.mrk3	0_persistent	80
+DROP TABLE IF EXISTS test2;
+CREATE TABLE test2 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_small', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test2;
+INSERT INTO test2 SELECT number, toString(number) FROM numbers(100000);
+SELECT * FROM test2 FORMAT Null;
+SELECT sum(size) FROM system.filesystem_cache;
+794
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+4
+SELECT count() FROM system.filesystem_cache;
+4
+SELECT substring(local_path, 58, 10) as file, substring(cache_path, 53, 20) as cache, size
+FROM
+(
+    SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+    FROM system.remote_data_paths
+) AS data_paths
+INNER JOIN
+    system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path
+ORDER BY file, cache, size;
+data.bin		114
+data.mrk3		80
+data.mrk3	0_persistent	80
+data.mrk3	0_persistent	520
+DROP TABLE test;
+DROP TABLE test2;
+DROP TABLE nopers;
diff --git a/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.sql b/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.sql
new file mode 100644
index 00000000000..0492df2a19b
--- /dev/null
+++ b/tests/queries/0_stateless/02382_filesystem_cache_persistent_files.sql
@@ -0,0 +1,76 @@
+-- Tags: disabled
+
+-- { echo }
+
+SET enable_filesystem_cache_on_write_operations=0;
+
+SYSTEM DROP FILESYSTEM CACHE;
+
+DROP TABLE IF EXISTS nopers;
+CREATE TABLE nopers (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES nopers;
+
+INSERT INTO nopers SELECT number, toString(number) FROM numbers(10);
+SELECT * FROM nopers FORMAT Null;
+SELECT sum(size) FROM system.filesystem_cache;
+
+SELECT substring(local_path, 58, 10) as file, substring(cache_path, 53, 20) as cache, size
+FROM
+(
+    SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+    FROM system.remote_data_paths
+) AS data_paths
+INNER JOIN
+    system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path
+ORDER BY file, cache, size;
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_small', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+SELECT * FROM test FORMAT Null;
+
+SELECT sum(size) FROM system.filesystem_cache;
+
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+SELECT count() FROM system.filesystem_cache;
+
+SELECT substring(local_path, 58, 10) as file, substring(cache_path, 53, 20) as cache, size
+FROM
+(
+    SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+    FROM system.remote_data_paths
+) AS data_paths
+INNER JOIN
+    system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path
+ORDER BY file, cache, size;
+
+DROP TABLE IF EXISTS test2;
+CREATE TABLE test2 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_small', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test2;
+
+INSERT INTO test2 SELECT number, toString(number) FROM numbers(100000);
+SELECT * FROM test2 FORMAT Null;
+
+SELECT sum(size) FROM system.filesystem_cache;
+
+SELECT count() FROM (SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path FROM system.remote_data_paths ) AS data_paths INNER JOIN system.filesystem_cache AS caches ON data_paths.cache_path = caches.cache_path;
+SELECT count() FROM system.filesystem_cache;
+
+SELECT substring(local_path, 58, 10) as file, substring(cache_path, 53, 20) as cache, size
+FROM
+(
+    SELECT arrayJoin(cache_paths) AS cache_path, local_path, remote_path
+    FROM system.remote_data_paths
+) AS data_paths
+INNER JOIN
+    system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path
+ORDER BY file, cache, size;
+
+DROP TABLE test;
+DROP TABLE test2;
+DROP TABLE nopers;
diff --git a/tests/queries/0_stateless/02382_query_parameters_post.reference b/tests/queries/0_stateless/02382_query_parameters_post.reference
new file mode 100644
index 00000000000..7f8f011eb73
--- /dev/null
+++ b/tests/queries/0_stateless/02382_query_parameters_post.reference
@@ -0,0 +1 @@
+7
diff --git a/tests/queries/0_stateless/02382_query_parameters_post.sh b/tests/queries/0_stateless/02382_query_parameters_post.sh
new file mode 100755
index 00000000000..25db5043292
--- /dev/null
+++ b/tests/queries/0_stateless/02382_query_parameters_post.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CURL} -X POST -F 'query=select {p1:UInt8} + {p2:UInt8}' -F 'param_p1=3' -F 'param_p2=4' "${CLICKHOUSE_URL}"
diff --git a/tests/queries/0_stateless/02383_array_signed_const_positive_index.reference b/tests/queries/0_stateless/02383_array_signed_const_positive_index.reference
new file mode 100644
index 00000000000..0d236990b8b
--- /dev/null
+++ b/tests/queries/0_stateless/02383_array_signed_const_positive_index.reference
@@ -0,0 +1,58 @@
+-- { echo }
+
+SELECT materialize([[13]])[1::Int8];
+[13]
+SELECT materialize([['Hello']])[1::Int8];
+['Hello']
+SELECT materialize([13])[1::Int8];
+13
+SELECT materialize(['Hello'])[1::Int8];
+Hello
+SELECT materialize([[13], [14]])[2::Int8];
+[14]
+SELECT materialize([['Hello'], ['world']])[2::Int8];
+['world']
+SELECT materialize([13, 14])[2::Int8];
+14
+SELECT materialize(['Hello', 'world'])[2::Int8];
+world
+SELECT materialize([[13], [14]])[3::Int8];
+[]
+SELECT materialize([['Hello'], ['world']])[3::Int8];
+[]
+SELECT materialize([13, 14])[3::Int8];
+0
+SELECT materialize(['Hello', 'world'])[3::Int8];
+
+SELECT materialize([[13], [14]])[0::Int8];
+[]
+SELECT materialize([['Hello'], ['world']])[0::Int8];
+[]
+SELECT materialize([13, 14])[0::Int8];
+0
+SELECT materialize(['Hello', 'world'])[0::Int8];
+
+SELECT materialize([[13], [14]])[-1];
+[14]
+SELECT materialize([['Hello'], ['world']])[-1];
+['world']
+SELECT materialize([13, 14])[-1];
+14
+SELECT materialize(['Hello', 'world'])[-1];
+world
+SELECT materialize([[13], [14]])[-9223372036854775808];
+[]
+SELECT materialize([['Hello'], ['world']])[-9223372036854775808];
+[]
+SELECT materialize([13, 14])[-9223372036854775808];
+0
+SELECT materialize(['Hello', 'world'])[-9223372036854775808];
+
+SELECT materialize([[toNullable(13)], [14]])[-9223372036854775808];
+[]
+SELECT materialize([['Hello'], [toNullable('world')]])[-9223372036854775808];
+[]
+SELECT materialize([13, toNullable(14)])[-9223372036854775808];
+\N
+SELECT materialize(['Hello', toLowCardinality('world')])[-9223372036854775808];
+
diff --git a/tests/queries/0_stateless/02383_array_signed_const_positive_index.sql b/tests/queries/0_stateless/02383_array_signed_const_positive_index.sql
new file mode 100644
index 00000000000..4f92215f4c0
--- /dev/null
+++ b/tests/queries/0_stateless/02383_array_signed_const_positive_index.sql
@@ -0,0 +1,36 @@
+-- { echo }
+
+SELECT materialize([[13]])[1::Int8];
+SELECT materialize([['Hello']])[1::Int8];
+SELECT materialize([13])[1::Int8];
+SELECT materialize(['Hello'])[1::Int8];
+
+SELECT materialize([[13], [14]])[2::Int8];
+SELECT materialize([['Hello'], ['world']])[2::Int8];
+SELECT materialize([13, 14])[2::Int8];
+SELECT materialize(['Hello', 'world'])[2::Int8];
+
+SELECT materialize([[13], [14]])[3::Int8];
+SELECT materialize([['Hello'], ['world']])[3::Int8];
+SELECT materialize([13, 14])[3::Int8];
+SELECT materialize(['Hello', 'world'])[3::Int8];
+
+SELECT materialize([[13], [14]])[0::Int8];
+SELECT materialize([['Hello'], ['world']])[0::Int8];
+SELECT materialize([13, 14])[0::Int8];
+SELECT materialize(['Hello', 'world'])[0::Int8];
+
+SELECT materialize([[13], [14]])[-1];
+SELECT materialize([['Hello'], ['world']])[-1];
+SELECT materialize([13, 14])[-1];
+SELECT materialize(['Hello', 'world'])[-1];
+
+SELECT materialize([[13], [14]])[-9223372036854775808];
+SELECT materialize([['Hello'], ['world']])[-9223372036854775808];
+SELECT materialize([13, 14])[-9223372036854775808];
+SELECT materialize(['Hello', 'world'])[-9223372036854775808];
+
+SELECT materialize([[toNullable(13)], [14]])[-9223372036854775808];
+SELECT materialize([['Hello'], [toNullable('world')]])[-9223372036854775808];
+SELECT materialize([13, toNullable(14)])[-9223372036854775808];
+SELECT materialize(['Hello', toLowCardinality('world')])[-9223372036854775808];
diff --git a/tests/queries/0_stateless/02383_arrow_dict_special_cases.reference b/tests/queries/0_stateless/02383_arrow_dict_special_cases.reference
new file mode 100644
index 00000000000..61b28e429f3
--- /dev/null
+++ b/tests/queries/0_stateless/02383_arrow_dict_special_cases.reference
@@ -0,0 +1,32 @@
+dict	LowCardinality(Nullable(String))					
+one
+two
+three
+one
+two
+dict	LowCardinality(Nullable(String))					
+
+one
+two
+three
+
+one
+three
+dict	LowCardinality(Nullable(String))					
+one
+two
+
+three
+one
+two
+three
+lc	LowCardinality(Nullable(String))					
+OK
+dict	LowCardinality(Nullable(String))					
+one
+two
+
+three
+one
+\N
+three
diff --git a/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh b/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh
new file mode 100755
index 00000000000..86f95873f14
--- /dev/null
+++ b/tests/queries/0_stateless/02383_arrow_dict_special_cases.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+mkdir -p $USER_FILES_PATH/test_02383
+cp $CURDIR/data_arrow/dictionary*.arrow $USER_FILES_PATH/test_02383/
+cp $CURDIR/data_arrow/corrupted.arrow $USER_FILES_PATH/test_02383/
+cp $CURDIR/data_arrow/dict_with_nulls.arrow $USER_FILES_PATH/test_02383/
+
+$CLICKHOUSE_CLIENT -q "desc file('test_02383/dictionary1.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dictionary1.arrow')"
+$CLICKHOUSE_CLIENT -q "desc file('test_02383/dictionary2.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dictionary2.arrow')"
+$CLICKHOUSE_CLIENT -q "desc file('test_02383/dictionary3.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dictionary3.arrow')"
+
+$CLICKHOUSE_CLIENT -q "desc file('test_02383/corrupted.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('test_02383/corrupted.arrow')" 2>&1 | grep -F -q "INCORRECT_DATA" && echo OK || echo FAIL
+
+$CLICKHOUSE_CLIENT -q "desc file('test_02383/dict_with_nulls.arrow')"
+$CLICKHOUSE_CLIENT -q "select * from file('test_02383/dict_with_nulls.arrow')"
+
+
+rm -rf $USER_FILES_PATH/test_02383
diff --git a/tests/queries/0_stateless/02383_schema_inference_hints.reference b/tests/queries/0_stateless/02383_schema_inference_hints.reference
new file mode 100644
index 00000000000..cb555f04130
--- /dev/null
+++ b/tests/queries/0_stateless/02383_schema_inference_hints.reference
@@ -0,0 +1,16 @@
+x	UInt8					
+y	Nullable(String)					
+z	IPv4					
+x	UInt8					
+y	Nullable(String)					
+z	IPv4					
+x	Nullable(UInt32)					
+x	Array(UInt32)					
+x	Map(String, String)					
+c1	UInt8					
+c2	Nullable(String)					
+c3	IPv4					
+x	UInt8					
+y	Nullable(String)					
+z	IPv4					
+x	Nullable(UInt32)					
diff --git a/tests/queries/0_stateless/02383_schema_inference_hints.sql b/tests/queries/0_stateless/02383_schema_inference_hints.sql
new file mode 100644
index 00000000000..350faaedc9f
--- /dev/null
+++ b/tests/queries/0_stateless/02383_schema_inference_hints.sql
@@ -0,0 +1,10 @@
+-- Tags: no-fasttest
+desc format(JSONEachRow, '{"x" : 1, "y" : "String", "z" : "0.0.0.0" }') settings schema_inference_hints='x UInt8, z IPv4';
+desc format(JSONEachRow, '{"x" : 1, "y" : "String"}\n{"z" : "0.0.0.0", "y" : "String2"}\n{"x" : 2}') settings schema_inference_hints='x UInt8, z IPv4';
+desc format(JSONEachRow, '{"x" : null}') settings schema_inference_hints='x Nullable(UInt32)';
+desc format(JSONEachRow, '{"x" : []}') settings schema_inference_hints='x Array(UInt32)';
+desc format(JSONEachRow, '{"x" : {}}') settings schema_inference_hints='x Map(String, String)';
+
+desc format(CSV, '1,"String","0.0.0.0"') settings schema_inference_hints='c1 UInt8, c3 IPv4';
+desc format(CSV, '1,"String","0.0.0.0"') settings schema_inference_hints='x UInt8, z IPv4', column_names_for_schema_inference='x, y, z';
+desc format(CSV, '\\N') settings schema_inference_hints='x Nullable(UInt32)', column_names_for_schema_inference='x';
diff --git a/tests/queries/0_stateless/02384_decrypt_bad_arguments.reference b/tests/queries/0_stateless/02384_decrypt_bad_arguments.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02384_decrypt_bad_arguments.sql b/tests/queries/0_stateless/02384_decrypt_bad_arguments.sql
new file mode 100644
index 00000000000..d29768558c4
--- /dev/null
+++ b/tests/queries/0_stateless/02384_decrypt_bad_arguments.sql
@@ -0,0 +1,2 @@
+-- Tags: no-fasttest
+SELECT decrypt('aes-128-gcm', [1024, 65535, NULL, NULL, 9223372036854775807, 1048576, NULL], 'text', 'key', 'IV'); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/02384_nullable_low_cardinality_as_dict_in_arrow.reference b/tests/queries/0_stateless/02384_nullable_low_cardinality_as_dict_in_arrow.reference
new file mode 100644
index 00000000000..e88b6d60a6b
--- /dev/null
+++ b/tests/queries/0_stateless/02384_nullable_low_cardinality_as_dict_in_arrow.reference
@@ -0,0 +1,4 @@
+lc	LowCardinality(Nullable(String))					
+abc
+lc	LowCardinality(Nullable(String))					
+abc
diff --git a/tests/queries/0_stateless/02384_nullable_low_cardinality_as_dict_in_arrow.sql b/tests/queries/0_stateless/02384_nullable_low_cardinality_as_dict_in_arrow.sql
new file mode 100644
index 00000000000..975e7fb8826
--- /dev/null
+++ b/tests/queries/0_stateless/02384_nullable_low_cardinality_as_dict_in_arrow.sql
@@ -0,0 +1,8 @@
+-- Tags: no-fasttest
+
+insert into function file(02384_data.arrow) select toLowCardinality(toNullable('abc')) as lc settings output_format_arrow_low_cardinality_as_dictionary=1, output_format_arrow_string_as_string=0, engine_file_truncate_on_insert=1;
+desc file(02384_data.arrow);
+select * from file(02384_data.arrow);
+insert into function file(02384_data.arrow) select toLowCardinality(toNullable('abc')) as lc settings output_format_arrow_low_cardinality_as_dictionary=1, output_format_arrow_string_as_string=1, engine_file_truncate_on_insert=1;
+desc file(02384_data.arrow);
+select * from file(02384_data.arrow);
diff --git a/tests/queries/0_stateless/02385_profile_events_overflow.reference b/tests/queries/0_stateless/02385_profile_events_overflow.reference
new file mode 100644
index 00000000000..e8183f05f5d
--- /dev/null
+++ b/tests/queries/0_stateless/02385_profile_events_overflow.reference
@@ -0,0 +1,3 @@
+1
+1
+1
diff --git a/tests/queries/0_stateless/02385_profile_events_overflow.sql b/tests/queries/0_stateless/02385_profile_events_overflow.sql
new file mode 100644
index 00000000000..518efab6d48
--- /dev/null
+++ b/tests/queries/0_stateless/02385_profile_events_overflow.sql
@@ -0,0 +1,20 @@
+-- Tags: no-parallel
+SET system_events_show_zero_values = 1;
+
+CREATE TEMPORARY TABLE t (x UInt64);
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowBreak';
+SELECT count() FROM system.numbers FORMAT Null SETTINGS max_rows_to_read = 1, read_overflow_mode = 'break';
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowBreak';
+SELECT max(x) - min(x) FROM t;
+
+TRUNCATE TABLE t;
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowThrow';
+SELECT count() FROM system.numbers SETTINGS max_rows_to_read = 1, read_overflow_mode = 'throw'; -- { serverError 158 }
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowThrow';
+SELECT max(x) - min(x) FROM t;
+
+TRUNCATE TABLE t;
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowAny';
+SELECT number, count() FROM numbers(100000) GROUP BY number FORMAT Null SETTINGS max_rows_to_group_by = 1, group_by_overflow_mode = 'any';
+INSERT INTO t SELECT value FROM system.events WHERE event = 'OverflowAny';
+SELECT max(x) - min(x) FROM t;
diff --git a/tests/queries/0_stateless/02386_set_columns_order.reference b/tests/queries/0_stateless/02386_set_columns_order.reference
new file mode 100644
index 00000000000..6312b4b05a9
--- /dev/null
+++ b/tests/queries/0_stateless/02386_set_columns_order.reference
@@ -0,0 +1,2 @@
+3	Mary
+1
diff --git a/tests/queries/0_stateless/02386_set_columns_order.sql b/tests/queries/0_stateless/02386_set_columns_order.sql
new file mode 100644
index 00000000000..dab5ad30579
--- /dev/null
+++ b/tests/queries/0_stateless/02386_set_columns_order.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS userid_set;
+DROP TABLE IF EXISTS userid_test;
+DROP TABLE IF EXISTS userid_set2;
+
+CREATE TABLE userid_set(userid UInt64, name String) ENGINE = Set;
+INSERT INTO userid_set VALUES (1, 'Mary'),(2, 'Jane'),(3, 'Mary'),(4, 'Jack');
+
+CREATE TABLE userid_test (userid UInt64, name String) ENGINE = MergeTree() PARTITION BY (intDiv(userid, 500)) ORDER BY (userid) SETTINGS index_granularity = 8192;
+INSERT INTO userid_test VALUES (1, 'Jack'),(2, 'Mary'),(3, 'Mary'),(4, 'John'),(5, 'Mary');
+
+SELECT * FROM userid_test WHERE (userid, name) IN (userid_set);
+
+CREATE TABLE userid_set2(userid UInt64, name String, birthdate Date) ENGINE = Set;
+INSERT INTO userid_set2 values (1,'John', '1990-01-01');
+
+WITH  'John' AS name,  toDate('1990-01-01') AS birthdate
+SELECT * FROM numbers(10)
+WHERE (number, name, birthdate) IN (userid_set2);
+
+DROP TABLE userid_set;
+DROP TABLE userid_test;
+DROP TABLE userid_set2;
diff --git a/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference
new file mode 100644
index 00000000000..50c91c3fa0c
--- /dev/null
+++ b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference
@@ -0,0 +1,18 @@
+status before reload
+status after reload
+NOT_LOADED 0
+LOADED 0
+FAILED 1
+LOADING 0
+FAILED_AND_RELOADING 0
+LOADED_AND_RELOADING 0
+NOT_EXIST 0
+status after reload, table exists
+NOT_LOADED 0
+LOADED 1
+FAILED 0
+LOADING 0
+FAILED_AND_RELOADING 0
+LOADED_AND_RELOADING 0
+NOT_EXIST 0
+status after drop
diff --git a/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.sh b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.sh
new file mode 100755
index 00000000000..65025858e20
--- /dev/null
+++ b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Tags: no-ordinary-database
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+function get_dictionary_status()
+{
+    local name=$1 && shift
+    $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL_PROMETHEUS" | {
+        awk -F'[{}=," ]' -vname="$name" '/ClickHouseStatusInfo_DictionaryStatus{/ && $(NF-3) == name { print $4, $NF }'
+    }
+}
+
+$CLICKHOUSE_CLIENT -q "CREATE DICTIONARY dict (key Int, value String) PRIMARY KEY key SOURCE(CLICKHOUSE(TABLE data)) LAYOUT(HASHED()) LIFETIME(0)"
+uuid="$($CLICKHOUSE_CLIENT -q "SELECT uuid FROM system.dictionaries WHERE database = '$CLICKHOUSE_DATABASE' AND name = 'dict'")"
+
+echo 'status before reload'
+get_dictionary_status "$uuid"
+
+# source table does not exists
+# NOTE: when dictionary does not exist it produce BAD_ARGUMENTS error, so using UNKNOWN_TABLE is safe
+$CLICKHOUSE_CLIENT -n -q "SYSTEM RELOAD DICTIONARY dict -- { serverError UNKNOWN_TABLE }"
+echo 'status after reload'
+get_dictionary_status "$uuid"
+
+# create source
+$CLICKHOUSE_CLIENT -q "CREATE TABLE data (key Int, value String) Engine=Null"
+$CLICKHOUSE_CLIENT -q "SYSTEM RELOAD DICTIONARY dict"
+echo 'status after reload, table exists'
+get_dictionary_status "$uuid"
+
+# remove dictionary
+$CLICKHOUSE_CLIENT -q "DROP DICTIONARY dict"
+$CLICKHOUSE_CLIENT -q "DROP TABLE data"
+echo 'status after drop'
+get_dictionary_status "$uuid"
diff --git a/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.reference b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.reference
new file mode 100644
index 00000000000..c00653f2bb3
--- /dev/null
+++ b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.reference
@@ -0,0 +1,5 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+1	2	3	4
+5	6	7	8
+CREATE TABLE default.t_l5ydey\n(\n    `c_qv5rv` Int32,\n    `c_rutjs4` Int32,\n    `c_wmj` Int32,\n    `c_m3` String\n)\nENGINE = Distributed(\'test_shard_localhost\', \'default\', \'local_t_l5ydey\', rand())
diff --git a/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.sql b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.sql
new file mode 100644
index 00000000000..54e4ccf6762
--- /dev/null
+++ b/tests/queries/0_stateless/02400_create_table_on_cluster_normalization.sql
@@ -0,0 +1,27 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+drop table if exists local_t_l5ydey;
+
+create table local_t_l5ydey on cluster test_shard_localhost (
+    c_qv5rv INTEGER ,
+    c_rutjs4 INTEGER ,
+    c_wmj INTEGER ,
+    c_m3 TEXT NOT NULL,
+    primary key(c_qv5rv)
+) engine=ReplicatedMergeTree('/clickhouse/tables/test_' || currentDatabase() || '/{shard}/local_t_l5ydey', '{replica}');
+
+create table t_l5ydey on cluster test_shard_localhost as local_t_l5ydey
+    engine=Distributed('test_shard_localhost', currentDatabase(),'local_t_l5ydey', rand());
+
+insert into local_t_l5ydey values (1, 2, 3, '4');
+insert into t_l5ydey values (5, 6, 7, '8');
+system flush distributed t_l5ydey;
+
+select * from t_l5ydey order by c_qv5rv;
+show create t_l5ydey;
+
+-- Correct error code if creating database with the same path as table has
+set allow_experimental_database_replicated=1;
+create database local_t_l5ydey engine=Replicated('/clickhouse/tables/test_' || currentDatabase() || '/{shard}/local_t_l5ydey', '1', '1'); -- { serverError BAD_ARGUMENTS }
+
+drop table local_t_l5ydey;
diff --git a/tests/queries/0_stateless/02400_memory_accounting_on_error.reference b/tests/queries/0_stateless/02400_memory_accounting_on_error.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02400_memory_accounting_on_error.sql b/tests/queries/0_stateless/02400_memory_accounting_on_error.sql
new file mode 100644
index 00000000000..32046e854dd
--- /dev/null
+++ b/tests/queries/0_stateless/02400_memory_accounting_on_error.sql
@@ -0,0 +1,4 @@
+-- max_block_size to avoid randomization
+-- SELECT * FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536 SETTINGS max_memory_usage='1Gi', max_block_size=65505, log_queries=1; -- { serverError MEMORY_LIMIT_EXCEEDED }
+-- SYSTEM FLUSH LOGS;
+-- SELECT * FROM system.query_log WHERE event_date >= yesterday() AND current_database = currentDatabase() AND memory_usage > 100e6;
diff --git a/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.reference b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.reference
new file mode 100644
index 00000000000..57831ddd82e
--- /dev/null
+++ b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.reference
@@ -0,0 +1 @@
+10	45
diff --git a/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.sql b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.sql
new file mode 100644
index 00000000000..54579bca30b
--- /dev/null
+++ b/tests/queries/0_stateless/02401_merge_tree_old_tmp_dirs_cleanup.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS test_inserts;
+
+CREATE TABLE test_inserts (`key` Int, `part` Int) ENGINE = MergeTree PARTITION BY part ORDER BY key
+SETTINGS temporary_directories_lifetime = 0, merge_tree_clear_old_temporary_directories_interval_seconds = 0;
+
+INSERT INTO test_inserts SELECT sleep(1), number FROM numbers(10)
+SETTINGS max_insert_delayed_streams_for_parallel_write = 100, max_insert_block_size = 1, min_insert_block_size_rows = 1;
+
+SELECT count(), sum(part) FROM test_inserts;
+
+DROP TABLE test_inserts;
diff --git a/tests/queries/0_stateless/02402_capnp_format_segments_overflow.reference b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02402_capnp_format_segments_overflow.sh b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.sh
new file mode 100755
index 00000000000..244b94d9189
--- /dev/null
+++ b/tests/queries/0_stateless/02402_capnp_format_segments_overflow.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+mkdir -p $USER_FILES_PATH/test_02402
+cp $CURDIR/data_capnp/overflow.capnp $USER_FILES_PATH/test_02402/
+
+SCHEMADIR=$(clickhouse-client --query "select * from file('test_02402/overflow.capnp', 'CapnProto', 'val1 char') settings format_schema='nonexist:Message'" 2>&1 | grep Exception | grep -oP "file \K.*(?=/nonexist.capnp)")
+
+CLIENT_SCHEMADIR=$CURDIR/format_schemas
+SERVER_SCHEMADIR=test_02402
+
+mkdir -p $SCHEMADIR/$SERVER_SCHEMADIR
+cp -r $CLIENT_SCHEMADIR/02402_* $SCHEMADIR/$SERVER_SCHEMADIR/
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('test_02402/overflow.capnp', 'CapnProto') SETTINGS format_schema='$SERVER_SCHEMADIR/02402_overflow:CapnProto'" 2>&1 | grep -F -q "INCORRECT_DATA" && echo 'OK' || echo 'FAIL';
+
+rm -rf $USER_FILES_PATH/test_02402
+rm -rf ${SCHEMADIR:?}/${SERVER_SCHEMADIR:?}
diff --git a/tests/queries/0_stateless/02402_merge_engine_with_view.reference b/tests/queries/0_stateless/02402_merge_engine_with_view.reference
new file mode 100644
index 00000000000..4a869286f82
--- /dev/null
+++ b/tests/queries/0_stateless/02402_merge_engine_with_view.reference
@@ -0,0 +1,6 @@
+2
+2
+3
+3
+4
+4
diff --git a/tests/queries/0_stateless/02402_merge_engine_with_view.sql b/tests/queries/0_stateless/02402_merge_engine_with_view.sql
new file mode 100644
index 00000000000..613f76e24c9
--- /dev/null
+++ b/tests/queries/0_stateless/02402_merge_engine_with_view.sql
@@ -0,0 +1,10 @@
+
+CREATE TABLE m0 (id UInt64) ENGINE=MergeTree ORDER BY id SETTINGS index_granularity = 1;
+INSERT INTO m0 SELECT number FROM numbers(10);
+CREATE TABLE m1 (id UInt64, s String) ENGINE=MergeTree ORDER BY id SETTINGS index_granularity = 1;
+INSERT INTO m1 SELECT number, 'boo' FROM numbers(10);
+CREATE VIEW m1v AS SELECT id FROM m1;
+
+CREATE TABLE m2 (id UInt64) ENGINE=Merge(currentDatabase(),'m0|m1v');
+
+SELECT * FROM m2 WHERE id > 1 AND id < 5 ORDER BY id SETTINGS force_primary_key=1, max_bytes_to_read=64;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02403_arrow_large_string.reference b/tests/queries/0_stateless/02403_arrow_large_string.reference
new file mode 100644
index 00000000000..9a761064d68
--- /dev/null
+++ b/tests/queries/0_stateless/02403_arrow_large_string.reference
@@ -0,0 +1,5 @@
+a
+Nullable(String)
+00000
+00001
+00002
diff --git a/tests/queries/0_stateless/02403_arrow_large_string.sh b/tests/queries/0_stateless/02403_arrow_large_string.sh
new file mode 100755
index 00000000000..14f2b1f6e6a
--- /dev/null
+++ b/tests/queries/0_stateless/02403_arrow_large_string.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# ## generate arrow file with python
+# import pyarrow as pa
+# schema = pa.schema([ pa.field('a', pa.large_utf8()) ])
+# a = pa.array(["00000", "00001", "00002"])
+# with pa.OSFile('arraydata.arrow', 'wb') as sink:
+#    with pa.ipc.new_file(sink, schema=schema) as writer:
+#        batch = pa.record_batch([a], schema=schema)
+#        writer.write(batch)
+
+# cat arraydata.arrow | base64
+
+cat <<EOF | base64 --decode |  $CLICKHOUSE_LOCAL --query='SELECT * FROM table FORMAT TSVWithNamesAndTypes' --input-format=Arrow
+QVJST1cxAAD/////cAAAABAAAAAAAAoADAAGAAUACAAKAAAAAAEEAAwAAAAIAAgAAAAEAAgAAAAE
+AAAAAQAAABQAAAAQABQACAAGAAcADAAAABAAEAAAAAAAARQQAAAAGAAAAAQAAAAAAAAAAQAAAGEA
+AAAEAAQABAAAAAAAAAD/////mAAAABQAAAAAAAAADAAWAAYABQAIAAwADAAAAAADBAAYAAAAMAAA
+AAAAAAAAAAoAGAAMAAQACAAKAAAATAAAABAAAAADAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAA8AAAAAAAAAAAAAAAEAAAADAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAFAAAAAAAAAAoAAAAAAAAADwAAAAAAAAAwMDAwMDAwMDAxMDAwMDIA/////wAA
+AAAQAAAADAAUAAYACAAMABAADAAAAAAABAA4AAAAKAAAAAQAAAABAAAAgAAAAAAAAACgAAAAAAAA
+ADAAAAAAAAAAAAAAAAAAAAAIAAgAAAAEAAgAAAAEAAAAAQAAABQAAAAQABQACAAGAAcADAAAABAA
+EAAAAAAAARQQAAAAGAAAAAQAAAAAAAAAAQAAAGEAAAAEAAQABAAAAJgAAABBUlJPVzE=
+EOF
diff --git a/tests/queries/0_stateless/02403_big_http_chunk_size.python b/tests/queries/0_stateless/02403_big_http_chunk_size.python
new file mode 100644
index 00000000000..72aa4da0bac
--- /dev/null
+++ b/tests/queries/0_stateless/02403_big_http_chunk_size.python
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+from socket import socket, AF_INET, SOCK_STREAM
+import os
+
+
+EXCEPTION_CODE_HEADER = "X-ClickHouse-Exception-Code"
+TRANSFER_ENCODING_HEADER = "Transfer-Encoding"
+
+
+def main():
+    host = os.environ['CLICKHOUSE_HOST']
+    port = int(os.environ['CLICKHOUSE_PORT_HTTP'])
+
+    sock = socket(AF_INET, SOCK_STREAM)
+    sock.connect((host, port))
+    sock.settimeout(5)
+    s = "POST /play HTTP/1.1\r\n"
+    s += "Host: %s\r\n" % host
+    s += "Content-type: multipart/form-data\r\n"
+    s += "Transfer-encoding: chunked\r\n"
+    s += "\r\n"
+    s += "ffffffffffffffff"
+    s += "\r\n"
+    s += "X" * 100000
+    sock.sendall(s.encode())
+    data = sock.recv(10000).decode()
+    sock.close()
+
+    lines = data.splitlines()
+
+    print(lines.pop(0))
+
+    headers = {}
+    for x in lines:
+        x = x.strip()
+        if not x:
+            continue
+        tokens = x.split(":", 1)
+        if len(tokens) < 2:
+            continue
+        key, val = tokens
+        headers[key.strip()] = val.strip()
+
+    print("encoding type", headers[TRANSFER_ENCODING_HEADER])
+    print("error code", headers[EXCEPTION_CODE_HEADER])
+
+
+if __name__ == "__main__":
+    main()
+
diff --git a/tests/queries/0_stateless/02403_big_http_chunk_size.reference b/tests/queries/0_stateless/02403_big_http_chunk_size.reference
new file mode 100644
index 00000000000..d7970bd2eb1
--- /dev/null
+++ b/tests/queries/0_stateless/02403_big_http_chunk_size.reference
@@ -0,0 +1,3 @@
+HTTP/1.1 200 OK
+encoding type chunked
+error code 1000
diff --git a/tests/queries/0_stateless/02403_big_http_chunk_size.sh b/tests/queries/0_stateless/02403_big_http_chunk_size.sh
new file mode 100755
index 00000000000..4434861ea46
--- /dev/null
+++ b/tests/queries/0_stateless/02403_big_http_chunk_size.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# We should have correct env vars from shell_config.sh to run this test
+python3 "$CURDIR"/02403_big_http_chunk_size.python
diff --git a/tests/queries/0_stateless/02403_ttl_column_multiple_times.reference b/tests/queries/0_stateless/02403_ttl_column_multiple_times.reference
new file mode 100644
index 00000000000..5695a080619
--- /dev/null
+++ b/tests/queries/0_stateless/02403_ttl_column_multiple_times.reference
@@ -0,0 +1,3 @@
+2020-10-01	144
+2020-10-01	0
+2020-10-01	0
diff --git a/tests/queries/0_stateless/02403_ttl_column_multiple_times.sql b/tests/queries/0_stateless/02403_ttl_column_multiple_times.sql
new file mode 100644
index 00000000000..a1114eb15b1
--- /dev/null
+++ b/tests/queries/0_stateless/02403_ttl_column_multiple_times.sql
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS ttl_table;
+
+CREATE TABLE ttl_table
+(
+    EventDate Date,
+    Longitude Float64 TTL EventDate + toIntervalWeek(2)
+)
+ENGINE = MergeTree()
+ORDER BY EventDate
+SETTINGS vertical_merge_algorithm_min_rows_to_activate=1, vertical_merge_algorithm_min_columns_to_activate=1;
+
+SYSTEM STOP MERGES ttl_table;
+
+INSERT INTO ttl_table VALUES(toDate('2020-10-01'), 144);
+
+SELECT * FROM ttl_table;
+
+SYSTEM START MERGES ttl_table;
+
+OPTIMIZE TABLE ttl_table FINAL;
+
+SELECT * FROM ttl_table;
+
+OPTIMIZE TABLE ttl_table FINAL;
+
+SELECT * FROM ttl_table;
+
+DROP TABLE IF EXISTS ttl_table;
diff --git a/tests/queries/0_stateless/data_arrow/corrupted.arrow b/tests/queries/0_stateless/data_arrow/corrupted.arrow
new file mode 100644
index 00000000000..a31a6eb93dc
Binary files /dev/null and b/tests/queries/0_stateless/data_arrow/corrupted.arrow differ
diff --git a/tests/queries/0_stateless/data_arrow/dict_with_nulls.arrow b/tests/queries/0_stateless/data_arrow/dict_with_nulls.arrow
new file mode 100644
index 00000000000..546deaf97a8
Binary files /dev/null and b/tests/queries/0_stateless/data_arrow/dict_with_nulls.arrow differ
diff --git a/tests/queries/0_stateless/data_arrow/dictionary1.arrow b/tests/queries/0_stateless/data_arrow/dictionary1.arrow
new file mode 100644
index 00000000000..5fa1ed90729
Binary files /dev/null and b/tests/queries/0_stateless/data_arrow/dictionary1.arrow differ
diff --git a/tests/queries/0_stateless/data_arrow/dictionary2.arrow b/tests/queries/0_stateless/data_arrow/dictionary2.arrow
new file mode 100644
index 00000000000..1aed5591c9b
Binary files /dev/null and b/tests/queries/0_stateless/data_arrow/dictionary2.arrow differ
diff --git a/tests/queries/0_stateless/data_arrow/dictionary3.arrow b/tests/queries/0_stateless/data_arrow/dictionary3.arrow
new file mode 100644
index 00000000000..55444337999
Binary files /dev/null and b/tests/queries/0_stateless/data_arrow/dictionary3.arrow differ
diff --git a/tests/queries/0_stateless/data_capnp/overflow.capnp b/tests/queries/0_stateless/data_capnp/overflow.capnp
new file mode 100644
index 00000000000..8bf1eb8848c
Binary files /dev/null and b/tests/queries/0_stateless/data_capnp/overflow.capnp differ
diff --git a/tests/queries/0_stateless/data_minio/02366_data.jsonl b/tests/queries/0_stateless/data_minio/02366_data.jsonl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02226_s3_with_cache.sql b/tests/queries/0_stateless/filesystem_cache_queries/02226_filesystem_cache_profile_events.sh
old mode 100644
new mode 100755
similarity index 59%
rename from tests/queries/0_stateless/02226_s3_with_cache.sql
rename to tests/queries/0_stateless/filesystem_cache_queries/02226_filesystem_cache_profile_events.sh
index 3bd4b93155d..ab8511d85b3
--- a/tests/queries/0_stateless/02226_s3_with_cache.sql
+++ b/tests/queries/0_stateless/filesystem_cache_queries/02226_filesystem_cache_profile_events.sh
@@ -1,47 +1,60 @@
--- Tags: no-parallel, no-fasttest, long, no-random-settings
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-s3-storage, no-random-settings, no-cpu-aarch64, no-replicated-database
 
+clickhouse client --multiquery --multiline  --query """
 SET max_memory_usage='20G';
 SET enable_filesystem_cache_on_write_operations = 0;
 
 DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache';
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='_storagePolicy';
 INSERT INTO test SELECT * FROM generateRandom('key UInt32, value String') LIMIT 10000;
 
 SET remote_filesystem_read_method='threadpool';
+"""
 
-SELECT 1, * FROM test LIMIT 10 FORMAT Null;
+query="SELECT * FROM test LIMIT 10"
 
+query_id=$(clickhouse client --query "select queryID() from ($query) limit 1" 2>&1)
+
+clickhouse client --multiquery --multiline  --query """
 SYSTEM FLUSH LOGS;
-SELECT query,
-       ProfileEvents['CachedReadBufferReadFromSourceBytes'] > 0 as remote_fs_read,
+SELECT ProfileEvents['CachedReadBufferReadFromSourceBytes'] > 0 as remote_fs_read,
        ProfileEvents['CachedReadBufferReadFromCacheBytes'] > 0 as remote_fs_cache_read,
        ProfileEvents['CachedReadBufferCacheWriteBytes'] > 0 as remote_fs_read_and_download
 FROM system.query_log
-WHERE query LIKE 'SELECT 1, * FROM test LIMIT%'
+WHERE query_id='$query_id'
 AND type = 'QueryFinish'
 AND current_database = currentDatabase()
 ORDER BY query_start_time DESC
 LIMIT 1;
+"""
 
+clickhouse client --multiquery --multiline --query """
 set remote_filesystem_read_method = 'read';
 set local_filesystem_read_method = 'pread';
+"""
 
-SELECT 2, * FROM test LIMIT 10 FORMAT Null;
+query_id=$(clickhouse client --query "select queryID() from ($query) limit 1" 2>&1)
 
+clickhouse client --multiquery --multiline  --query """
 SYSTEM FLUSH LOGS;
-SELECT query,
-       ProfileEvents['CachedReadBufferReadFromSourceBytes'] > 0 as remote_fs_read,
+SELECT ProfileEvents['CachedReadBufferReadFromSourceBytes'] > 0 as remote_fs_read,
        ProfileEvents['CachedReadBufferReadFromCacheBytes'] > 0 as remote_fs_cache_read,
        ProfileEvents['CachedReadBufferCacheWriteBytes'] > 0 as remote_fs_read_and_download
 FROM system.query_log
-WHERE query LIKE 'SELECT 2, * FROM test LIMIT%'
+WHERE query_id='$query_id'
 AND type = 'QueryFinish'
 AND current_database = currentDatabase()
 ORDER BY query_start_time DESC
 LIMIT 1;
+"""
 
-SET remote_filesystem_read_method='threadpool';
 
+clickhouse client --multiquery --multiline --query """
+set remote_filesystem_read_method='threadpool';
+"""
+
+clickhouse client --multiquery --multiline  --query """
 SELECT * FROM test WHERE value LIKE '%abc%' ORDER BY value LIMIT 10 FORMAT Null;
 
 SET enable_filesystem_cache_on_write_operations = 1;
@@ -52,19 +65,21 @@ SELECT count() FROM test;
 SYSTEM DROP FILESYSTEM CACHE;
 
 INSERT INTO test SELECT * FROM generateRandom('key UInt32, value String') LIMIT 10000;
+"""
 
-SELECT 3, * FROM test LIMIT 10 FORMAT Null;
+query_id=$(clickhouse client --query "select queryID() from ($query) limit 1")
 
+clickhouse client --multiquery --multiline  --query """
 SYSTEM FLUSH LOGS;
-SELECT query,
-       ProfileEvents['CachedReadBufferReadFromSourceBytes'] > 0 as remote_fs_read,
+SELECT ProfileEvents['CachedReadBufferReadFromSourceBytes'] > 0 as remote_fs_read,
        ProfileEvents['CachedReadBufferReadFromCacheBytes'] > 0 as remote_fs_cache_read,
        ProfileEvents['CachedReadBufferCacheWriteBytes'] > 0 as remote_fs_read_and_download
 FROM system.query_log
-WHERE query LIKE 'SELECT 3, * FROM test LIMIT%'
+WHERE query_id='$query_id'
 AND type = 'QueryFinish'
 AND current_database = currentDatabase()
 ORDER BY query_start_time DESC
 LIMIT 1;
 
 DROP TABLE test;
+"""
diff --git a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference b/tests/queries/0_stateless/filesystem_cache_queries/02240_system_filesystem_cache_table.queries
similarity index 87%
rename from tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference
rename to tests/queries/0_stateless/filesystem_cache_queries/02240_system_filesystem_cache_table.queries
index cfe1ad411cb..ab73e97b96e 100644
--- a/tests/queries/0_stateless/02240_system_remote_filesystem_cache.reference
+++ b/tests/queries/0_stateless/filesystem_cache_queries/02240_system_filesystem_cache_table.queries
@@ -3,30 +3,28 @@
 SYSTEM DROP FILESYSTEM CACHE;
 SET enable_filesystem_cache_on_write_operations=0;
 DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='_storagePolicy', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+
 SELECT  * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-0	0	1
-0	79	80
-0	745	746
+
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
 SELECT * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
-0	745	746
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
+
 DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache_3', min_bytes_for_wide_part = 10485760;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='_storagePolicy_3', min_bytes_for_wide_part = 10485760;
 INSERT INTO test SELECT number, toString(number) FROM numbers(100);
 SELECT  * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-0	0	1
 SELECT  * FROM test FORMAT Null;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache ORDER BY file_segment_range_end, size;
-0	0	1
-0	745	746
+
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size FROM system.filesystem_cache;
 SELECT * FROM test FORMAT Null;
diff --git a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql b/tests/queries/0_stateless/filesystem_cache_queries/02241_filesystem_cache_on_write_operations.queries
similarity index 96%
rename from tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
rename to tests/queries/0_stateless/filesystem_cache_queries/02241_filesystem_cache_on_write_operations.queries
index 8b3f6a9c0b1..76aebfcaca3 100644
--- a/tests/queries/0_stateless/02241_remote_filesystem_cache_on_insert.sql
+++ b/tests/queries/0_stateless/filesystem_cache_queries/02241_filesystem_cache_on_write_operations.queries
@@ -1,11 +1,9 @@
--- Tags: no-parallel, no-fasttest, no-s3-storage
-
 -- { echo }
 
 SET enable_filesystem_cache_on_write_operations=1;
 
 DROP TABLE IF EXISTS test;
-CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='_storagePolicy', min_bytes_for_wide_part = 10485760;
 SYSTEM STOP MERGES test;
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT file_segment_range_begin, file_segment_range_end, size, state
diff --git a/tests/queries/0_stateless/filesystem_cache_queries/02242_system_filesystem_cache_log_table.queries b/tests/queries/0_stateless/filesystem_cache_queries/02242_system_filesystem_cache_log_table.queries
new file mode 100644
index 00000000000..b6b1291f83f
--- /dev/null
+++ b/tests/queries/0_stateless/filesystem_cache_queries/02242_system_filesystem_cache_log_table.queries
@@ -0,0 +1,19 @@
+-- { echo }
+
+SYSTEM DROP FILESYSTEM CACHE;
+SET enable_filesystem_cache_log=1;
+SET enable_filesystem_cache_on_write_operations=0;
+
+DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS system.filesystem_cache_log;
+CREATE TABLE test (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='_storagePolicy', min_bytes_for_wide_part = 10485760;
+SYSTEM STOP MERGES test;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100000);
+
+SELECT 2240, '_storagePolicy', * FROM test FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2240%_storagePolicy%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1);
+
+SELECT 2241, '_storagePolicy', * FROM test FORMAT Null;
+SYSTEM FLUSH LOGS;
+SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2241%_storagePolicy%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1);
diff --git a/tests/queries/0_stateless/filesystem_cache_queries/02286_drop_filesystem_cache.queries b/tests/queries/0_stateless/filesystem_cache_queries/02286_drop_filesystem_cache.queries
new file mode 100644
index 00000000000..96774db32ed
--- /dev/null
+++ b/tests/queries/0_stateless/filesystem_cache_queries/02286_drop_filesystem_cache.queries
@@ -0,0 +1,71 @@
+-- { echo }
+
+SET enable_filesystem_cache_on_write_operations=0;
+
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (key UInt32, value String)
+Engine=MergeTree()
+ORDER BY key
+SETTINGS storage_policy='_storagePolicy', min_bytes_for_wide_part = 10485760;
+
+SYSTEM STOP MERGES;
+SYSTEM DROP FILESYSTEM CACHE;
+
+SELECT count() FROM system.filesystem_cache;
+INSERT INTO test SELECT number, toString(number) FROM numbers(100);
+
+SELECT * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+
+SYSTEM DROP FILESYSTEM CACHE;
+SELECT count() FROM system.filesystem_cache;
+
+SELECT * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+
+SYSTEM DROP FILESYSTEM CACHE './data'; -- { serverError 36 }
+SELECT count() FROM system.filesystem_cache;
+
+SELECT * FROM test FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+SELECT count()
+FROM (
+    SELECT
+        arrayJoin(cache_paths) AS cache_path,
+        local_path,
+        remote_path
+    FROM
+        system.remote_data_paths
+    ) AS data_paths
+INNER JOIN system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path;
+
+DROP TABLE test NO DELAY;
+SELECT count() FROM system.filesystem_cache;
+SELECT cache_path FROM system.filesystem_cache;
+SELECT cache_path, local_path
+FROM (
+    SELECT
+        arrayJoin(cache_paths) AS cache_path,
+        local_path,
+        remote_path
+    FROM
+        system.remote_data_paths
+    ) AS data_paths
+INNER JOIN system.filesystem_cache AS caches
+ON data_paths.cache_path = caches.cache_path;
+
+DROP TABLE IF EXISTS test2;
+
+CREATE TABLE test2 (key UInt32, value String)
+Engine=MergeTree()
+ORDER BY key
+SETTINGS storage_policy='_storagePolicy_2', min_bytes_for_wide_part = 10485760;
+
+INSERT INTO test2 SELECT number, toString(number) FROM numbers(100);
+SELECT * FROM test2 FORMAT Null;
+SELECT count() FROM system.filesystem_cache;
+
+SYSTEM DROP FILESYSTEM CACHE '_storagePolicy_2/';
+SELECT count() FROM system.filesystem_cache;
diff --git a/tests/queries/0_stateless/filesystem_cache_queries/02313_filesystem_cache_seeks.queries b/tests/queries/0_stateless/filesystem_cache_queries/02313_filesystem_cache_seeks.queries
new file mode 100644
index 00000000000..389b9dfaa99
--- /dev/null
+++ b/tests/queries/0_stateless/filesystem_cache_queries/02313_filesystem_cache_seeks.queries
@@ -0,0 +1,23 @@
+SYSTEM DROP FILESYSTEM CACHE;
+
+DROP TABLE IF EXISTS test_02313;
+CREATE TABLE test_02313 (id Int32, val String)
+ENGINE = MergeTree()
+ORDER BY tuple()
+SETTINGS storage_policy = '_storagePolicy';
+
+INSERT INTO test_02313
+    SELECT * FROM
+        generateRandom('id Int32, val String')
+    LIMIT 100000
+SETTINGS enable_filesystem_cache_on_write_operations = 0;
+
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+SELECT * FROM test_02313 WHERE val LIKE concat('%', randomPrintableASCII(3), '%') FORMAT Null;
+
+DROP TABLE test_02313;
diff --git a/tests/queries/0_stateless/format_schemas/02402_overflow.capnp b/tests/queries/0_stateless/format_schemas/02402_overflow.capnp
new file mode 100644
index 00000000000..e9029aca475
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02402_overflow.capnp
@@ -0,0 +1,30 @@
+@0x803231eaa402b968;
+
+struct NestedNestedOne
+{
+    nestednestednumber @0 : UInt64;
+}
+struct NestedNestedTwo
+{
+    nestednestedtext @0 : Text;
+}
+struct NestedOne
+{
+    nestednestedone @0 : NestedNestedOne;
+    nestednestedtwo @1 : NestedNestedTwo;
+    nestednumber @2: UInt64;
+}
+struct NestedTwo
+{
+    nestednestedone @0 : NestedNestedOne;
+    nestednestedtwo @1 : NestedNestedTwo;
+    nestedtext @2 : Text;
+}
+struct CapnProto
+{
+    number @0 : UInt64;
+    string @1 : Text;
+    nestedone @2 : NestedOne;
+    nestedtwo @3 : NestedTwo;
+    nestedthree @4 : NestedNestedTwo;
+}
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
index fd32fa28ba0..8da21a3fdbe 100755
--- a/tests/queries/0_stateless/replication.lib
+++ b/tests/queries/0_stateless/replication.lib
@@ -25,13 +25,18 @@ function try_sync_replicas()
         done
     done
 
+    i=0
     for t in "${tables_arr[@]}"
     do
         # The size of log may be big, so increase timeout.
-        $CLICKHOUSE_CLIENT --receive_timeout 400 -q "SYSTEM SYNC REPLICA $t" || $CLICKHOUSE_CLIENT -q \
-            "select 'sync failed, queue:', * from system.replication_queue where database=currentDatabase() and table='$t' order by database, table, node_name" &
+        $CLICKHOUSE_CLIENT --receive_timeout 300 -q "SYSTEM SYNC REPLICA $t" || ($CLICKHOUSE_CLIENT -q \
+            "select 'sync failed, queue:', * from system.replication_queue where database=currentDatabase() and table='$t' order by database, table, node_name" && exit 1) &
+        pids[${i}]=$!
+        i=$((i + 1))
+    done
+    for pid in ${pids[*]}; do
+        wait $pid || (echo "Failed to sync some replicas" && exit 1)
     done
-    wait
     echo "Replication did not hang: synced all replicas of $table_name_prefix"
 }
 
@@ -73,7 +78,7 @@ function check_replication_consistency()
     # SYNC REPLICA is not enough if some MUTATE_PARTs are not assigned yet
     wait_for_all_mutations "$table_name_prefix%"
 
-    try_sync_replicas "$table_name_prefix"
+    try_sync_replicas "$table_name_prefix" || exit 1
 
     res=$($CLICKHOUSE_CLIENT -q \
     "SELECT
diff --git a/tests/queries/0_stateless/test_ugtxj2/tuples b/tests/queries/0_stateless/test_ugtxj2/tuples
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/1_stateful/00174_distinct_in_order.reference b/tests/queries/1_stateful/00174_distinct_in_order.reference
index f3389600167..c0b2aadc20e 100644
--- a/tests/queries/1_stateful/00174_distinct_in_order.reference
+++ b/tests/queries/1_stateful/00174_distinct_in_order.reference
@@ -1 +1,3 @@
 -- check that distinct with and w/o optimization produce the same result
+-- DISTINCT colums are the same as in ORDER BY
+-- DISTINCT colums has prefix in ORDER BY columns
diff --git a/tests/queries/1_stateful/00174_distinct_in_order.sql b/tests/queries/1_stateful/00174_distinct_in_order.sql
index 6d79990a0e0..08ab219c806 100644
--- a/tests/queries/1_stateful/00174_distinct_in_order.sql
+++ b/tests/queries/1_stateful/00174_distinct_in_order.sql
@@ -1,10 +1,24 @@
 select '-- check that distinct with and w/o optimization produce the same result';
+
 drop table if exists distinct_in_order sync;
 drop table if exists ordinary_distinct sync;
+
+select '-- DISTINCT colums are the same as in ORDER BY';
 create table distinct_in_order (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
 insert into distinct_in_order select distinct CounterID, EventDate from test.hits order by CounterID, EventDate settings optimize_distinct_in_order=1;
 create table ordinary_distinct (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
-insert into ordinary_distinct select distinct CounterID, EventDate from test.hits settings optimize_distinct_in_order=0;
+insert into ordinary_distinct select distinct CounterID, EventDate from test.hits order by CounterID, EventDate settings optimize_distinct_in_order=0;
 select distinct * from distinct_in_order except select * from ordinary_distinct;
+
+drop table if exists distinct_in_order sync;
+drop table if exists ordinary_distinct sync;
+
+select '-- DISTINCT colums has prefix in ORDER BY columns';
+create table distinct_in_order (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
+insert into distinct_in_order select distinct CounterID, EventDate from test.hits order by CounterID settings optimize_distinct_in_order=1;
+create table ordinary_distinct (CounterID UInt32, EventDate Date) engine=MergeTree() order by (CounterID, EventDate);
+insert into ordinary_distinct select distinct CounterID, EventDate from test.hits order by CounterID settings optimize_distinct_in_order=0;
+select distinct * from distinct_in_order except select * from ordinary_distinct;
+
 drop table if exists distinct_in_order sync;
 drop table if exists ordinary_distinct sync;
diff --git a/tests/queries/1_stateful/00175_counting_resources_in_subqueries.reference b/tests/queries/1_stateful/00175_counting_resources_in_subqueries.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/1_stateful/00175_counting_resources_in_subqueries.sql b/tests/queries/1_stateful/00175_counting_resources_in_subqueries.sql
new file mode 100644
index 00000000000..fe7837d7ff1
--- /dev/null
+++ b/tests/queries/1_stateful/00175_counting_resources_in_subqueries.sql
@@ -0,0 +1,20 @@
+-- the work for scalar subquery is properly accounted:
+SET max_rows_to_read = 1000000;
+SELECT 1 = (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
+
+-- the work for subquery in IN is properly accounted:
+SET max_rows_to_read = 1000000;
+SELECT 1 IN (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
+
+-- this query reads from the table twice:
+SET max_rows_to_read = 15000000;
+SELECT count() IN (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)) FROM test.hits WHERE NOT ignore(AdvEngineID); -- { serverError 158 }
+
+-- the resources are properly accounted even if the subquery is evaluated in advance to facilitate the index analysis.
+-- this query is using index and filter out the second reading pass.
+SET max_rows_to_read = 1000000;
+SELECT count() FROM test.hits WHERE CounterID > (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
+
+-- this query is using index but have to read all the data twice.
+SET max_rows_to_read = 10000000;
+SELECT count() FROM test.hits WHERE CounterID < (SELECT count() FROM test.hits WHERE NOT ignore(AdvEngineID)); -- { serverError 158 }
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index ab5d5ddc1b6..963ac384148 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -66,6 +66,8 @@ export CLICKHOUSE_PORT_TCP_WITH_PROXY=${CLICKHOUSE_PORT_TCP_WITH_PROXY:=$(${CLIC
 export CLICKHOUSE_PORT_TCP_WITH_PROXY=${CLICKHOUSE_PORT_TCP_WITH_PROXY:="9010"}
 export CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:=$(${CLICKHOUSE_EXTRACT_CONFIG} --key=http_port 2>/dev/null)}
 export CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:="8123"}
+export CLICKHOUSE_PORT_PROMTHEUS_PORT=${CLICKHOUSE_PORT_PROMTHEUS_PORT:=$(${CLICKHOUSE_EXTRACT_CONFIG} --key=prometheus.port 2>/dev/null)}
+export CLICKHOUSE_PORT_PROMTHEUS_PORT=${CLICKHOUSE_PORT_PROMTHEUS_PORT:="9988"}
 export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=https_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:="8443"}
 export CLICKHOUSE_PORT_HTTP_PROTO=${CLICKHOUSE_PORT_HTTP_PROTO:="http"}
@@ -98,6 +100,8 @@ then
   export CLICKHOUSE_URL_HTTPS="${CLICKHOUSE_URL_HTTPS}?${CLICKHOUSE_URL_PARAMS}"
 fi
 
+export CLICKHOUSE_URL_PROMETHEUS=${CLICKHOUSE_URL_PROMETHEUS:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_PROMTHEUS_PORT}/metrics"}
+
 export CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=interserver_http_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:="9009"}
 export CLICKHOUSE_URL_INTERSERVER=${CLICKHOUSE_URL_INTERSERVER:="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_INTERSERVER}/"}
diff --git a/utils/antlr/ClickHouseParser.g4 b/utils/antlr/ClickHouseParser.g4
index 24db6478aa0..13194a8c2d2 100644
--- a/utils/antlr/ClickHouseParser.g4
+++ b/utils/antlr/ClickHouseParser.g4
@@ -26,6 +26,20 @@ query
     | truncateStmt  // DDL
     | useStmt
     | watchStmt
+    | ctes? selectStmt
+    ;
+
+// CTE statement
+ctes
+    : WITH namedQuery (',' namedQuery)*
+    ;
+
+namedQuery
+    : name=identifier (columnAliases)? AS '(' query ')'
+    ;
+
+columnAliases
+    : '(' identifier (',' identifier)* ')'
     ;
 
 // ALTER statement
diff --git a/utils/changelog/changelog.py b/utils/changelog/changelog.py
index 9d1dabbabe1..305899fe7e8 100755
--- a/utils/changelog/changelog.py
+++ b/utils/changelog/changelog.py
@@ -6,20 +6,14 @@ import logging
 import os.path as p
 import os
 import re
-from datetime import date, datetime, timedelta
-from queue import Empty, Queue
+from datetime import date, timedelta
 from subprocess import CalledProcessError, DEVNULL
-from threading import Thread
-from time import sleep
 from typing import Dict, List, Optional, TextIO
 
 from fuzzywuzzy.fuzz import ratio  # type: ignore
-from github import Github
+from github_helper import GitHub, PullRequest, PullRequests, Repository
 from github.GithubException import RateLimitExceededException, UnknownObjectException
 from github.NamedUser import NamedUser
-from github.Issue import Issue
-from github.PullRequest import PullRequest
-from github.Repository import Repository
 from git_helper import is_shallow, git_runner as runner
 
 # This array gives the preferred category order, and is also used to
@@ -39,7 +33,7 @@ categories_preferred_order = (
 FROM_REF = ""
 TO_REF = ""
 SHA_IN_CHANGELOG = []  # type: List[str]
-GitHub = Github()
+gh = GitHub()
 CACHE_PATH = p.join(p.dirname(p.realpath(__file__)), "gh_cache")
 
 
@@ -49,7 +43,7 @@ class Description:
     ):
         self.number = number
         self.html_url = html_url
-        self.user = user
+        self.user = gh.get_user_cached(user._rawData["login"])  # type: ignore
         self.entry = entry
         self.category = category
 
@@ -78,7 +72,7 @@ class Description:
                 user_name = self.user.login
                 break
             except RateLimitExceededException:
-                sleep_on_rate_limit()
+                gh.sleep_on_rate_limit()
         return (
             f"* {entry} [#{self.number}]({self.html_url}) "
             f"([{user_name}]({self.user.html_url}))."
@@ -94,85 +88,34 @@ class Description:
         return self.number < other.number
 
 
-class Worker(Thread):
-    def __init__(self, request_queue: Queue, repo: Repository):
-        Thread.__init__(self)
-        self.queue = request_queue
-        self.repo = repo
-        self.response = []  # type: List[Description]
-
-    def run(self):
-        while not self.queue.empty():
-            try:
-                issue = self.queue.get()  # type: Issue
-            except Empty:
-                break  # possible race condition, just continue
-            api_pr = get_pull_cached(self.repo, issue.number, issue.updated_at)
-            in_changelog = False
-            merge_commit = api_pr.merge_commit_sha
-            try:
-                runner.run(f"git rev-parse '{merge_commit}'")
-            except CalledProcessError:
-                # It's possible that commit not in the repo, just continue
-                logging.info("PR %s does not belong to the repo", api_pr.number)
-                continue
-
-            in_changelog = merge_commit in SHA_IN_CHANGELOG
-            if in_changelog:
-                desc = generate_description(api_pr, self.repo)
-                if desc is not None:
-                    self.response.append(desc)
-
-            self.queue.task_done()
-
-
-def sleep_on_rate_limit(time: int = 20):
-    logging.warning("Faced rate limit, sleeping %s", time)
-    sleep(time)
-
-
-def get_pull_cached(
-    repo: Repository, number: int, updated_at: Optional[datetime] = None
-) -> PullRequest:
-    pr_cache_file = p.join(CACHE_PATH, f"{number}.pickle")
-    if updated_at is None:
-        updated_at = datetime.now() - timedelta(hours=-1)
-
-    if p.isfile(pr_cache_file):
-        cache_updated = datetime.fromtimestamp(p.getmtime(pr_cache_file))
-        if cache_updated > updated_at:
-            with open(pr_cache_file, "rb") as prfd:
-                return GitHub.load(prfd)  # type: ignore
-    while True:
-        try:
-            pr = repo.get_pull(number)
-            break
-        except RateLimitExceededException:
-            sleep_on_rate_limit()
-    with open(pr_cache_file, "wb") as prfd:
-        GitHub.dump(pr, prfd)  # type: ignore
-    return pr
-
-
-def get_descriptions(
-    repo: Repository, issues: List[Issue], jobs: int
-) -> Dict[str, List[Description]]:
-    workers = []  # type: List[Worker]
-    queue = Queue()  # type: Queue[Issue]
-    for issue in issues:
-        queue.put(issue)
-    for _ in range(jobs):
-        worker = Worker(queue, repo)
-        worker.start()
-        workers.append(worker)
-
+def get_descriptions(prs: PullRequests) -> Dict[str, List[Description]]:
     descriptions = {}  # type: Dict[str, List[Description]]
-    for worker in workers:
-        worker.join()
-        for desc in worker.response:
-            if desc.category not in descriptions:
-                descriptions[desc.category] = []
-            descriptions[desc.category].append(desc)
+    repos = {}  # type: Dict[str, Repository]
+    for pr in prs:
+        # See https://github.com/PyGithub/PyGithub/issues/2202,
+        # obj._rawData doesn't spend additional API requests
+        # We'll save some requests
+        # pylint: disable=protected-access
+        repo_name = pr._rawData["base"]["repo"]["full_name"]  # type: ignore
+        # pylint: enable=protected-access
+        if repo_name not in repos:
+            repos[repo_name] = pr.base.repo
+        in_changelog = False
+        merge_commit = pr.merge_commit_sha
+        try:
+            runner.run(f"git rev-parse '{merge_commit}'")
+        except CalledProcessError:
+            # It's possible that commit not in the repo, just continue
+            logging.info("PR %s does not belong to the repo", pr.number)
+            continue
+
+        in_changelog = merge_commit in SHA_IN_CHANGELOG
+        if in_changelog:
+            desc = generate_description(pr, repos[repo_name])
+            if desc is not None:
+                if desc.category not in descriptions:
+                    descriptions[desc.category] = []
+                descriptions[desc.category].append(desc)
 
     for descs in descriptions.values():
         descs.sort()
@@ -193,6 +136,11 @@ def parse_args() -> argparse.Namespace:
         default=0,
         help="set the script verbosity, could be used multiple",
     )
+    parser.add_argument(
+        "--debug-helpers",
+        action="store_true",
+        help="add debug logging for git_helper and github_helper",
+    )
     parser.add_argument(
         "--output",
         type=argparse.FileType("w"),
@@ -246,7 +194,7 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
         branch_parts = item.head.ref.split("/")
         if len(branch_parts) == 3:
             try:
-                item = get_pull_cached(repo, int(branch_parts[-1]))
+                item = gh.get_pull_cached(repo, int(branch_parts[-1]))
             except Exception as e:
                 logging.warning("unable to get backpoted PR, exception: %s", e)
         else:
@@ -337,9 +285,13 @@ def generate_description(item: PullRequest, repo: Repository) -> Optional[Descri
 
 def write_changelog(fd: TextIO, descriptions: Dict[str, List[Description]]):
     year = date.today().year
+    to_commit = runner(f"git rev-parse {TO_REF}^{{}}")[:11]
+    from_commit = runner(f"git rev-parse {FROM_REF}^{{}}")[:11]
     fd.write(
-        f"---\nsidebar_position: 1\nsidebar_label: {year}\n---\n\n# {year} Changelog\n\n"
-        f"### ClickHouse release {TO_REF} FIXME as compared to {FROM_REF}\n\n"
+        f"---\nsidebar_position: 1\nsidebar_label: {year}\n---\n\n"
+        f"# {year} Changelog\n\n"
+        f"### ClickHouse release {TO_REF} ({to_commit}) FIXME "
+        f"as compared to {FROM_REF} ({from_commit})\n\n"
     )
 
     seen_categories = []  # type: List[str]
@@ -391,12 +343,15 @@ def set_sha_in_changelog():
 
 
 def main():
-    log_levels = [logging.CRITICAL, logging.WARN, logging.INFO, logging.DEBUG]
+    log_levels = [logging.WARN, logging.INFO, logging.DEBUG]
     args = parse_args()
     logging.basicConfig(
         format="%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d]:\n%(message)s",
-        level=log_levels[min(args.verbose, 3)],
+        level=log_levels[min(args.verbose, 2)],
     )
+    if args.debug_helpers:
+        logging.getLogger("github_helper").setLevel(logging.DEBUG)
+        logging.getLogger("git_helper").setLevel(logging.DEBUG)
     # Create a cache directory
     if not p.isdir(CACHE_PATH):
         os.mkdir(CACHE_PATH, 0o700)
@@ -413,35 +368,29 @@ def main():
 
     logging.info("Using %s..%s as changelog interval", FROM_REF, TO_REF)
 
+    # use merge-base commit as a starting point, if used ref in another branch
+    base_commit = runner.run(f"git merge-base '{FROM_REF}^{{}}' '{TO_REF}^{{}}'")
     # Get starting and ending dates for gathering PRs
     # Add one day after and before to mitigate TZ possible issues
     # `tag^{}` format gives commit ref when we have annotated tags
     # format %cs gives a committer date, works better for cherry-picked commits
-    from_date = runner.run(f"git log -1 --format=format:%cs '{FROM_REF}^{{}}'")
-    from_date = (date.fromisoformat(from_date) - timedelta(1)).isoformat()
+    from_date = runner.run(f"git log -1 --format=format:%cs '{base_commit}'")
     to_date = runner.run(f"git log -1 --format=format:%cs '{TO_REF}^{{}}'")
-    to_date = (date.fromisoformat(to_date) + timedelta(1)).isoformat()
+    merged = (
+        date.fromisoformat(from_date) - timedelta(1),
+        date.fromisoformat(to_date) + timedelta(1),
+    )
 
     # Get all PRs for the given time frame
-    global GitHub
-    GitHub = Github(
+    global gh
+    gh = GitHub(
         args.gh_user_or_token, args.gh_password, per_page=100, pool_size=args.jobs
     )
-    query = f"type:pr repo:{args.repo} is:merged merged:{from_date}..{to_date}"
-    repo = GitHub.get_repo(args.repo)
-    api_prs = GitHub.search_issues(query=query, sort="created")
-    logging.info("Found %s PRs for the query: '%s'", api_prs.totalCount, query)
+    gh.cache_path = CACHE_PATH
+    query = f"type:pr repo:{args.repo} is:merged"
+    prs = gh.get_pulls_from_search(query=query, merged=merged, sort="created")
 
-    issues = []  # type: List[Issue]
-    while True:
-        try:
-            for issue in api_prs:
-                issues.append(issue)
-            break
-        except RateLimitExceededException:
-            sleep_on_rate_limit()
-
-    descriptions = get_descriptions(repo, issues, args.jobs)
+    descriptions = get_descriptions(prs)
 
     write_changelog(args.output, descriptions)
 
diff --git a/utils/changelog/github_helper.py b/utils/changelog/github_helper.py
new file mode 120000
index 00000000000..2d44dfe8000
--- /dev/null
+++ b/utils/changelog/github_helper.py
@@ -0,0 +1 @@
+../../tests/ci/github_helper.py
\ No newline at end of file
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index cc22b712c62..b6778fce0f0 100644
--- a/utils/check-style/aspell-ignore/en/aspell-dict.txt
+++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt
@@ -108,6 +108,11 @@ PrettyCompactNoEscapes
 PrettyNoEscapes
 PrettySpace
 PrettySpaceNoEscapes
+PrettyCompactNoEscapesMonoBlock
+PrettyMonoBlock
+PrettyNoEscapesMonoBlock
+PrettySpaceMonoBlock
+PrettySpaceNoEscapesMonoBlock
 Protobuf
 ProtobufSingle
 QTCreator
@@ -374,6 +379,11 @@ prettycompactnoescapes
 prettynoescapes
 prettyspace
 prettyspacenoescapes
+prettycompactnoescapesmonoblock
+prettymonoblock
+prettynoescapesmonoblock
+prettyspacemonoblock
+prettyspacenoescapesmonoblock
 prlimit
 prometheus
 proto
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index e540e0b126c..dac016003d5 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -346,3 +346,8 @@ fi
 
 # Forbid files that differ only by character case
 find $ROOT_PATH | sort -f | uniq -i -c | awk '{ if ($1 > 1) print }'
+
+# Forbid std::filesystem::is_symlink and std::filesystem::read_symlink, because it's easy to use them incorrectly
+find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' |
+    grep -vP $EXCLUDE_DIRS |
+    xargs grep -P '::(is|read)_symlink' | grep -v "STYLE_CHECK_ALLOW_STD_FS_SYMLINK" && echo "Use DB::FS::isSymlink and DB::FS::readSymlink instead"
diff --git a/utils/check-style/codespell-ignore-words.list b/utils/check-style/codespell-ignore-words.list
index 7aabaff17c5..062e8a1622b 100644
--- a/utils/check-style/codespell-ignore-words.list
+++ b/utils/check-style/codespell-ignore-words.list
@@ -11,3 +11,8 @@ offsett
 numer
 ue
 alse
+nodel
+ot
+te
+fo
+ba
diff --git a/utils/ci/README.md b/utils/ci/README.md
deleted file mode 100644
index a5245375237..00000000000
--- a/utils/ci/README.md
+++ /dev/null
@@ -1,143 +0,0 @@
-## Build and test ClickHouse on various platforms
-
-Quick and dirty scripts.
-
-Usage example:
-```
-./run-with-docker.sh ubuntu:bionic jobs/quick-build/run.sh
-```
-
-Another example, check build on ARM 64:
-```
-./prepare-docker-image-ubuntu.sh
-./run-with-docker.sh multiarch/ubuntu-core:arm64-bionic jobs/quick-build/run.sh
-```
-
-Another example, check build on FreeBSD:
-```
-./prepare-vagrant-image-freebsd.sh
-./run-with-vagrant.sh freebsd jobs/quick-build/run.sh
-```
-
-Look at `default_config` and `jobs/quick-build/run.sh`
-
-Various possible options. We are not going to automate testing all of them.
-
-#### CPU architectures:
-- x86_64;
-- AArch64;
-- PowerPC64LE.
-
-x86_64 is the main CPU architecture. We also have minimal support for AArch64 and PowerPC64LE.
-
-#### Operating systems:
-- Linux;
-- FreeBSD.
-
-We also target Mac OS X, but it's more difficult to test.
-Linux is the main. FreeBSD is also supported as production OS.
-Mac OS is intended only for development and have minimal support: client should work, server should just start.
-
-#### Linux distributions:
-For build:
-- Ubuntu Bionic;
-- Ubuntu Trusty.
-
-For run:
-- Ubuntu Hardy;
-- CentOS 5
-
-We should support almost any Linux to run ClickHouse. That's why we test also on old distributions.
-
-#### How to obtain sources:
-- use sources from local working copy;
-- clone sources from github;
-- download source tarball.
-
-#### Compilers:
-- gcc-7;
-- gcc-8;
-- clang-6;
-- clang-svn.
-
-#### Compiler installation:
-- from OS packages;
-- build from sources.
-
-#### C++ standard library implementation:
-- libc++;
-- libstdc++ with C++11 ABI;
-- libstdc++ with old ABI.
-
-When building with clang, libc++ is used. When building with gcc, we choose libstdc++ with C++11 ABI.
-
-#### Linkers:
-- ldd;
-- gold;
-
-When building with clang on x86_64, ldd is used. Otherwise we use gold.
-
-#### Build types:
-- RelWithDebInfo;
-- Debug;
-- ASan;
-- TSan.
-
-#### Build types, extra:
-- -g0 for quick build;
-- enable test coverage;
-- debug tcmalloc.
-
-#### What to build:
-- only `clickhouse` target;
-- all targets;
-- debian packages;
-
-We also have intent to build RPM and simple tgz packages.
-
-#### Where to get third-party libraries:
-- from contrib directory (submodules);
-- from OS packages.
-
-The only production option is to use libraries from contrib directory.
-Using libraries from OS packages is discouraged, but we also support this option.
-
-#### Linkage types:
-- static;
-- shared;
-
-Static linking is the only option for production usage.
-We also have support for shared linking, but it is intended only for developers.
-
-#### Make tools:
-- make;
-- ninja.
-
-#### Installation options:
-- run built `clickhouse` binary directly;
-- install from packages.
-
-#### How to obtain packages:
-- build them;
-- download from repository.
-
-#### Sanity checks:
-- check that clickhouse binary has no dependencies on unexpected shared libraries;
-- check that source code have no style violations.
-
-#### Tests:
-- Functional tests;
-- Integration tests;
-- Unit tests;
-- Simple sh/reference tests;
-- Performance tests (note that they require predictable computing power);
-- Tests for external dictionaries (should be moved to integration tests);
-- Jepsen like tests for quorum inserts (not yet available in opensource).
-
-#### Tests extra:
-- Run functional tests with Valgrind.
-
-#### Static analyzers:
-- CppCheck;
-- clang-tidy;
-- Coverity.
diff --git a/utils/ci/build-clang-from-sources.sh b/utils/ci/build-clang-from-sources.sh
deleted file mode 100755
index 59eb966ada9..00000000000
--- a/utils/ci/build-clang-from-sources.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh svn
-./install-os-packages.sh cmake
-
-mkdir "${WORKSPACE}/llvm"
-
-svn co "http://llvm.org/svn/llvm-project/llvm/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm"
-svn co "http://llvm.org/svn/llvm-project/cfe/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/clang"
-svn co "http://llvm.org/svn/llvm-project/lld/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/lld"
-svn co "http://llvm.org/svn/llvm-project/polly/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/polly"
-svn co "http://llvm.org/svn/llvm-project/clang-tools-extra/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/tools/clang/tools/extra"
-svn co "http://llvm.org/svn/llvm-project/compiler-rt/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/projects/compiler-rt"
-svn co "http://llvm.org/svn/llvm-project/libcxx/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/projects/libcxx"
-svn co "http://llvm.org/svn/llvm-project/libcxxabi/${CLANG_SOURCES_BRANCH}" "${WORKSPACE}/llvm/llvm/projects/libcxxabi"
-
-mkdir "${WORKSPACE}/llvm/build"
-cd "${WORKSPACE}/llvm/build"
-
-# NOTE You must build LLVM with the same ABI as ClickHouse.
-# For example, if you compile ClickHouse with libc++, you must add
-#  -DLLVM_ENABLE_LIBCXX=1
-# to the line below.
-
-cmake -DCMAKE_BUILD_TYPE:STRING=Release -DLLVM_ENABLE_LIBCXX=1 -DLLVM_ENABLE_RTTI=1 ../llvm
-
-make -j $THREADS
-$SUDO make install
-hash clang
-
-cd ../../..
-
-export CC=clang
-export CXX=clang++
diff --git a/utils/ci/build-debian-packages.sh b/utils/ci/build-debian-packages.sh
deleted file mode 100755
index 8726b675c4d..00000000000
--- a/utils/ci/build-debian-packages.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-./sources/release
diff --git a/utils/ci/build-gcc-from-sources.sh b/utils/ci/build-gcc-from-sources.sh
deleted file mode 100755
index 8886bb7afd7..00000000000
--- a/utils/ci/build-gcc-from-sources.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh curl
-
-if [[ "${GCC_SOURCES_VERSION}" == "latest" ]]; then
-    GCC_SOURCES_VERSION=$(curl -sSL https://ftpmirror.gnu.org/gcc/ | grep -oE 'gcc-[0-9]+(\.[0-9]+)+' | sort -Vr | head -n1)
-fi
-
-GCC_VERSION_SHORT=$(echo "$GCC_SOURCES_VERSION" | grep -oE '[0-9]' | head -n1)
-
-echo "Will download ${GCC_SOURCES_VERSION} (short version: $GCC_VERSION_SHORT)."
-
-THREADS=$(grep -c ^processor /proc/cpuinfo)
-
-mkdir "${WORKSPACE}/gcc"
-pushd "${WORKSPACE}/gcc"
-
-wget -nv https://ftpmirror.gnu.org/gcc/${GCC_SOURCES_VERSION}/${GCC_SOURCES_VERSION}.tar.xz
-tar xf ${GCC_SOURCES_VERSION}.tar.xz
-pushd ${GCC_SOURCES_VERSION}
-./contrib/download_prerequisites
-popd
-mkdir gcc-build
-pushd gcc-build
-../${GCC_SOURCES_VERSION}/configure --enable-languages=c,c++ --disable-multilib
-make -j $THREADS
-$SUDO make install
-
-popd
-popd
-
-$SUDO ln -sf /usr/local/bin/gcc /usr/local/bin/gcc-${GCC_VERSION_SHORT}
-$SUDO ln -sf /usr/local/bin/g++ /usr/local/bin/g++-${GCC_VERSION_SHORT}
-$SUDO ln -sf /usr/local/bin/gcc /usr/local/bin/cc
-$SUDO ln -sf /usr/local/bin/g++ /usr/local/bin/c++
-
-echo '/usr/local/lib64' | $SUDO tee /etc/ld.so.conf.d/10_local-lib64.conf
-$SUDO ldconfig
-
-hash gcc g++
-gcc --version
-
-export CC=gcc-${GCC_VERSION_SHORT}
-export CXX=g++-${GCC_VERSION_SHORT}
diff --git a/utils/ci/build-normal.sh b/utils/ci/build-normal.sh
deleted file mode 100755
index 328bd2c9f51..00000000000
--- a/utils/ci/build-normal.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-mkdir -p "${WORKSPACE}/build"
-pushd "${WORKSPACE}/build"
-
-cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_EMBEDDED_COMPILER=${ENABLE_EMBEDDED_COMPILER} $CMAKE_FLAGS ../sources
-
-[[ "$BUILD_TARGETS" != 'all' ]] && BUILD_TARGETS_STRING="--target $BUILD_TARGETS"
-
-cmake --build . $BUILD_TARGETS_STRING -- -j $THREADS
-
-popd
diff --git a/utils/ci/check-docker.sh b/utils/ci/check-docker.sh
deleted file mode 100755
index e4ffb11f643..00000000000
--- a/utils/ci/check-docker.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-command -v docker > /dev/null || die "You need to install Docker"
-docker ps > /dev/null || die "You need to have access to Docker: run '$SUDO usermod -aG docker $USER' and relogin"
diff --git a/utils/ci/check-syntax.sh b/utils/ci/check-syntax.sh
deleted file mode 100755
index df233965f9e..00000000000
--- a/utils/ci/check-syntax.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh jq
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-mkdir -p "${WORKSPACE}/build"
-pushd "${WORKSPACE}/build"
-
-cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_FLAGS ../sources
-
-make -j $THREADS re2_st # Generated headers
-
-jq --raw-output '.[] | .command' compile_commands.json | grep -v -P -- '-c .+/contrib/' | sed -r -e 's/-o\s+\S+/-fsyntax-only/' > syntax-commands
-xargs --arg-file=syntax-commands --max-procs=$THREADS --replace /bin/sh -c "{}"
-
-popd
diff --git a/utils/ci/check-tzdata-updates.sh b/utils/ci/check-tzdata-updates.sh
deleted file mode 100755
index 8686590f87c..00000000000
--- a/utils/ci/check-tzdata-updates.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-[[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
-
-latest_tzdb_version=$(curl -s https://data.iana.org/time-zones/data/version);
-tzdb_version_in_repo=$(cat "${WORKSPACE}/sources/contrib/cctz/testdata/version");
-
-if [ "$tzdb_version_in_repo" = "$latest_tzdb_version" ];
-then
-    echo "No update for TZDB needed";
-    exit 0;
-else
-    echo "TZDB update required! Version in repo is ${tzdb_version_in_repo}, latest version is ${latest_tzdb_version}";
-    exit 1
-fi;
diff --git a/utils/ci/create-sources-tarball.sh b/utils/ci/create-sources-tarball.sh
deleted file mode 100755
index bfbbf61e556..00000000000
--- a/utils/ci/create-sources-tarball.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-if [[ -d "${WORKSPACE}/sources" ]]; then
-    tar -c -z -f "${WORKSPACE}/sources.tar.gz" --directory "${WORKSPACE}/sources" .
-else
-    die "Run get-sources first"
-fi
diff --git a/utils/ci/default-config b/utils/ci/default-config
deleted file mode 100644
index b66121cc757..00000000000
--- a/utils/ci/default-config
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-if [[ -z "$INITIALIZED" ]]; then
-
-INITIALIZED=1
-
-SCRIPTPATH=$(pwd)
-WORKSPACE=${SCRIPTPATH}/workspace
-PROJECT_ROOT=$(cd $SCRIPTPATH/.. && pwd)
-
-# Almost all scripts take no arguments. Arguments should be in config.
-
-# get-sources
-SOURCES_METHOD=local                # clone, local, tarball
-SOURCES_CLONE_URL="https://github.com/ClickHouse/ClickHouse.git"
-SOURCES_BRANCH="master"
-SOURCES_COMMIT=HEAD                 # do checkout of this commit after clone
-
-# prepare-toolchain
-COMPILER=gcc                        # gcc, clang
-COMPILER_INSTALL_METHOD=packages    # packages, sources
-COMPILER_PACKAGE_VERSION=7          # or 6.0 for clang
-
-# install-compiler-from-sources
-CLANG_SOURCES_BRANCH=trunk          # or tags/RELEASE_600/final
-GCC_SOURCES_VERSION=latest          # or gcc-7.1.0
-
-# install-libraries
-ENABLE_EMBEDDED_COMPILER=1
-
-# build
-BUILD_METHOD=normal                 # normal, debian
-BUILD_TARGETS=clickhouse            # tagtet name, all; only for "normal"
-BUILD_TYPE=RelWithDebInfo           # RelWithDebInfo, Debug, ASan, TSan
-CMAKE_FLAGS=""
-
-# prepare-docker-image-ubuntu
-DOCKER_UBUNTU_VERSION=bionic
-DOCKER_UBUNTU_ARCH=arm64            # How the architecture is named in a tarball at https://partner-images.canonical.com/core/
-DOCKER_UBUNTU_QUEMU_ARCH=aarch64    # How the architecture is named in QEMU
-DOCKER_UBUNTU_TAG_ARCH=arm64        # How the architecture is named in Docker
-DOCKER_UBUNTU_QEMU_VER=v2.9.1
-DOCKER_UBUNTU_REPO=multiarch/ubuntu-core
-
-THREADS=$(grep -c ^processor /proc/cpuinfo || nproc || sysctl -a | grep -F 'hw.ncpu' | grep -oE '[0-9]+')
-
-# All scripts should return 0 in case of success, 1 in case of permanent error,
-#  2 in case of temporary error, any other code in case of permanent error.
-function die {
-    echo ${1:-Error}
-    exit ${2:1}
-}
-
-[[ $EUID -ne 0 ]] && SUDO=sudo
-
-./install-os-packages.sh prepare
-
-# Configuration parameters may be overridden with CONFIG environment variable pointing to config file.
-[[ -n "$CONFIG" ]] && source $CONFIG
-
-mkdir -p $WORKSPACE
-
-fi
diff --git a/utils/ci/docker-multiarch/LICENSE b/utils/ci/docker-multiarch/LICENSE
deleted file mode 100644
index 60d0ea8fa82..00000000000
--- a/utils/ci/docker-multiarch/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Multiarch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/utils/ci/docker-multiarch/README.md b/utils/ci/docker-multiarch/README.md
deleted file mode 100644
index 9cc30c2dca8..00000000000
--- a/utils/ci/docker-multiarch/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Source: https://github.com/multiarch/ubuntu-core
-Commit: 3972a7794b40a965615abd710759d3ed439c9a55
-
-# :earth_africa: ubuntu-core
-
-![](https://raw.githubusercontent.com/multiarch/dockerfile/master/logo.jpg)
-
-Multiarch Ubuntu images for Docker.
-
-Based on https://github.com/tianon/docker-brew-ubuntu-core/
-
-* `multiarch/ubuntu-core` on [Docker Hub](https://hub.docker.com/r/multiarch/ubuntu-core/)
-* [Available tags](https://hub.docker.com/r/multiarch/ubuntu-core/tags/)
-
-## Usage
-
-Once you need to configure binfmt-support on your Docker host.
-This works locally or remotely (i.e using boot2docker or swarm).
-
-```console
-# configure binfmt-support on the Docker host (works locally or remotely, i.e: using boot2docker)
-$ docker run --rm --privileged multiarch/qemu-user-static:register --reset
-```
-
-Then you can run an `armhf` image from your `x86_64` Docker host.
-
-```console
-$ docker run -it --rm multiarch/ubuntu-core:armhf-wily
-root@a0818570f614:/# uname -a
-Linux a0818570f614 4.1.13-boot2docker #1 SMP Fri Nov 20 19:05:50 UTC 2015 armv7l armv7l armv7l GNU/Linux
-root@a0818570f614:/# exit
-```
-
-Or an `x86_64` image from your `x86_64` Docker host, directly, without qemu emulation.
-
-```console
-$ docker run -it --rm multiarch/ubuntu-core:amd64-wily
-root@27fe384370c9:/# uname -a
-Linux 27fe384370c9 4.1.13-boot2docker #1 SMP Fri Nov 20 19:05:50 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux
-root@27fe384370c9:/#
-```
-
-It also works for `arm64`
-
-```console
-$ docker run -it --rm multiarch/ubuntu-core:arm64-wily
-root@723fb9f184fa:/# uname -a
-Linux 723fb9f184fa 4.1.13-boot2docker #1 SMP Fri Nov 20 19:05:50 UTC 2015 aarch64 aarch64 aarch64 GNU/Linux
-```
-
-## License
-
-MIT
diff --git a/utils/ci/docker-multiarch/update.sh b/utils/ci/docker-multiarch/update.sh
deleted file mode 100755
index 1348631bdcf..00000000000
--- a/utils/ci/docker-multiarch/update.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-# A POSIX variable
-OPTIND=1 # Reset in case getopts has been used previously in the shell.
-
-while getopts "a:v:q:u:d:t:" opt; do
-    case "$opt" in
-    a)  ARCH=$OPTARG
-        ;;
-    v)  VERSION=$OPTARG
-        ;;
-    q)  QEMU_ARCH=$OPTARG
-        ;;
-    u)  QEMU_VER=$OPTARG
-        ;;
-    d)  DOCKER_REPO=$OPTARG
-        ;;
-    t)  TAG_ARCH=$OPTARG
-        ;;
-    esac
-done
-
-thisTarBase="ubuntu-$VERSION-core-cloudimg-$ARCH"
-thisTar="$thisTarBase-root.tar.gz"
-baseUrl="https://partner-images.canonical.com/core/$VERSION"
-
-
-# install qemu-user-static
-if [ -n "${QEMU_ARCH}" ]; then
-    if [ ! -f x86_64_qemu-${QEMU_ARCH}-static.tar.gz ]; then
-        wget -nv -N https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VER}/x86_64_qemu-${QEMU_ARCH}-static.tar.gz
-    fi
-    tar -xvf x86_64_qemu-${QEMU_ARCH}-static.tar.gz -C $ROOTFS/usr/bin/
-fi
-
-
-# get the image
-if \
-    wget -nv --spider "$baseUrl/current" \
-    && wget -nv --spider "$baseUrl/current/$thisTar" \
-    ; then
-        baseUrl+='/current'
-fi
-wget -nv -N "$baseUrl/"{{MD5,SHA{1,256}}SUMS{,.gpg},"$thisTarBase.manifest",'unpacked/build-info.txt'} || true
-wget -nv -N "$baseUrl/$thisTar"
-
-# check checksum
-if [ -f SHA256SUMS ]; then
-    sha256sum="$(sha256sum "$thisTar" | cut -d' ' -f1)"
-    if ! grep -q "$sha256sum" SHA256SUMS; then
-        echo >&2 "error: '$thisTar' has invalid SHA256"
-        exit 1
-    fi
-fi
-
-cat > Dockerfile <<-EOF
-    FROM scratch
-    ADD $thisTar /
-    ENV ARCH=${ARCH} UBUNTU_SUITE=${VERSION} DOCKER_REPO=${DOCKER_REPO}
-EOF
-
-# add qemu-user-static binary
-if [ -n "${QEMU_ARCH}" ]; then
-    cat >> Dockerfile <<EOF
-
-# Add qemu-user-static binary for amd64 builders
-ADD x86_64_qemu-${QEMU_ARCH}-static.tar.gz /usr/bin
-EOF
-fi
-
-cat >> Dockerfile <<-EOF
-    # a few minor docker-specific tweaks
-    # see https://github.com/docker/docker/blob/master/contrib/mkimage/debootstrap
-    RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \\
-        && echo 'exit 101' >> /usr/sbin/policy-rc.d \\
-        && chmod +x /usr/sbin/policy-rc.d \\
-        && dpkg-divert --local --rename --add /sbin/initctl \\
-        && cp -a /usr/sbin/policy-rc.d /sbin/initctl \\
-        && sed -i 's/^exit.*/exit 0/' /sbin/initctl \\
-        && echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup \\
-        && echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' > /etc/apt/apt.conf.d/docker-clean \\
-        && echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' >> /etc/apt/apt.conf.d/docker-clean \\
-        && echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' >> /etc/apt/apt.conf.d/docker-clean \\
-        && echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/docker-no-languages \\
-        && echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > /etc/apt/apt.conf.d/docker-gzip-indexes
-
-    # enable the universe
-    RUN sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
-
-    # overwrite this with 'CMD []' in a dependent Dockerfile
-    CMD ["/bin/bash"]
-EOF
-
-docker build -t "${DOCKER_REPO}:${TAG_ARCH}-${VERSION}" .
-docker run --rm "${DOCKER_REPO}:${TAG_ARCH}-${VERSION}" /bin/bash -ec "echo Hello from Ubuntu!"
diff --git a/utils/ci/get-sources.sh b/utils/ci/get-sources.sh
deleted file mode 100755
index ee57b0ec27d..00000000000
--- a/utils/ci/get-sources.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-if [[ "$SOURCES_METHOD" == "clone" ]]; then
-    ./install-os-packages.sh git
-    SOURCES_DIR="${WORKSPACE}/sources"
-    mkdir -p "${SOURCES_DIR}"
-    git clone --recursive --branch "$SOURCES_BRANCH" "$SOURCES_CLONE_URL" "${SOURCES_DIR}"
-    pushd "${SOURCES_DIR}"
-    git checkout --recurse-submodules "$SOURCES_COMMIT"
-    popd
-elif [[ "$SOURCES_METHOD" == "local" ]]; then
-    ln -f -s "${PROJECT_ROOT}" "${WORKSPACE}/sources"
-else
-    die "Unknown SOURCES_METHOD"
-fi
diff --git a/utils/ci/install-compiler-from-packages.sh b/utils/ci/install-compiler-from-packages.sh
deleted file mode 100755
index 53909435a06..00000000000
--- a/utils/ci/install-compiler-from-packages.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-# TODO Install from PPA on older Ubuntu
-
-./install-os-packages.sh ${COMPILER}-${COMPILER_PACKAGE_VERSION}
-
-if [[ "$COMPILER" == "gcc" ]]; then
-    if command -v gcc-${COMPILER_PACKAGE_VERSION}; then export CC=gcc-${COMPILER_PACKAGE_VERSION} CXX=g++-${COMPILER_PACKAGE_VERSION};
-    elif command -v gcc${COMPILER_PACKAGE_VERSION}; then export CC=gcc${COMPILER_PACKAGE_VERSION} CXX=g++${COMPILER_PACKAGE_VERSION};
-    elif command -v gcc; then export CC=gcc CXX=g++;
-    fi
-elif [[ "$COMPILER" == "clang" ]]; then
-    if command -v clang-${COMPILER_PACKAGE_VERSION}; then export CC=clang-${COMPILER_PACKAGE_VERSION} CXX=clang++-${COMPILER_PACKAGE_VERSION};
-    elif command -v clang${COMPILER_PACKAGE_VERSION}; then export CC=clang${COMPILER_PACKAGE_VERSION} CXX=clang++${COMPILER_PACKAGE_VERSION};
-    elif command -v clang; then export CC=clang CXX=clang++;
-    fi
-else
-    die "Unknown compiler specified"
-fi
diff --git a/utils/ci/install-compiler-from-sources.sh b/utils/ci/install-compiler-from-sources.sh
deleted file mode 100755
index 235898ed300..00000000000
--- a/utils/ci/install-compiler-from-sources.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-if [[ "$COMPILER" == "gcc" ]]; then
-    . build-gcc-from-sources.sh
-elif [[ "$COMPILER" == "clang" ]]; then
-    . build-clang-from-sources.sh
-else
-    die "Unknown COMPILER"
-fi
diff --git a/utils/ci/install-libraries.sh b/utils/ci/install-libraries.sh
deleted file mode 100755
index 3c26e3b09b1..00000000000
--- a/utils/ci/install-libraries.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh libicu-dev
diff --git a/utils/ci/install-os-packages.sh b/utils/ci/install-os-packages.sh
deleted file mode 100755
index b4b0c74f30c..00000000000
--- a/utils/ci/install-os-packages.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-# Dispatches package installation on various OS and distributives
-
-WHAT=$1
-
-[[ $EUID -ne 0 ]] && SUDO=sudo
-
-command -v yum && PACKAGE_MANAGER=yum
-command -v pkg && PACKAGE_MANAGER=pkg
-command -v apt-get && PACKAGE_MANAGER=apt
-
-
-case $PACKAGE_MANAGER in
-    apt)
-        case $WHAT in
-            prepare)
-                $SUDO apt-get update
-                ;;
-            svn)
-                $SUDO apt-get install -y subversion
-                ;;
-            gcc*)
-                $SUDO apt-get install -y $WHAT ${WHAT/cc/++}
-                ;;
-            clang*)
-                $SUDO apt-get install -y $WHAT libc++-dev libc++abi-dev
-                [[ $(uname -m) == "x86_64" ]] && $SUDO apt-get install -y ${WHAT/clang/lld} || true
-                ;;
-            git)
-                $SUDO apt-get install -y git
-                ;;
-            cmake)
-                $SUDO apt-get install -y cmake3 || $SUDO apt-get install -y cmake
-                ;;
-            ninja)
-                $SUDO apt-get install -y ninja-build
-                ;;
-            curl)
-                $SUDO apt-get install -y curl
-                ;;
-            jq)
-                $SUDO apt-get install -y jq
-                ;;
-            libicu-dev)
-                $SUDO apt-get install -y libicu-dev
-                ;;
-            llvm-libs*)
-                $SUDO apt-get install -y ${WHAT/llvm-libs/liblld}-dev ${WHAT/llvm-libs/libclang}-dev
-                ;;
-            qemu-user-static)
-                $SUDO apt-get install -y qemu-user-static
-                ;;
-            vagrant-virtualbox)
-                $SUDO apt-get install -y vagrant virtualbox
-                ;;
-            *)
-                echo "Unknown package"; exit 1;
-                ;;
-        esac
-        ;;
-    yum)
-        case $WHAT in
-            prepare)
-                ;;
-            svn)
-                $SUDO yum install -y subversion
-                ;;
-            gcc*)
-                $SUDO yum install -y gcc gcc-c++ libstdc++-static
-                ;;
-            git)
-                $SUDO yum install -y git
-                ;;
-            cmake)
-                $SUDO yum install -y cmake
-                ;;
-            ninja)
-                $SUDO yum install -y ninja-build
-                ;;
-            curl)
-                $SUDO yum install -y curl
-                ;;
-            jq)
-                $SUDO yum install -y jq
-                ;;
-            libicu-dev)
-                $SUDO yum install -y libicu-devel
-                ;;
-            *)
-                echo "Unknown package"; exit 1;
-                ;;
-        esac
-        ;;
-    pkg)
-        case $WHAT in
-            prepare)
-                ;;
-            svn)
-                $SUDO pkg install -y subversion
-                ;;
-            gcc*)
-                $SUDO pkg install -y ${WHAT/-/}
-                ;;
-            clang*)
-                $SUDO pkg install -y clang-devel
-                ;;
-            git)
-                $SUDO pkg install -y git
-                ;;
-            cmake)
-                $SUDO pkg install -y cmake
-                ;;
-            ninja)
-                $SUDO pkg install -y ninja-build
-                ;;
-            curl)
-                $SUDO pkg install -y curl
-                ;;
-            jq)
-                $SUDO pkg install -y jq
-                ;;
-            libicu-dev)
-                $SUDO pkg install -y icu
-                ;;
-            *)
-                echo "Unknown package"; exit 1;
-                ;;
-        esac
-        ;;
-    *)
-        echo "Unknown distributive"; exit 1;
-        ;;
-esac
diff --git a/utils/ci/prepare-docker-image-ubuntu.sh b/utils/ci/prepare-docker-image-ubuntu.sh
deleted file mode 100755
index 2880d7fc1e6..00000000000
--- a/utils/ci/prepare-docker-image-ubuntu.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./check-docker.sh
-
-# http://fl47l1n3.net/2015/12/24/binfmt/
-./install-os-packages.sh qemu-user-static
-
-pushd docker-multiarch
-
-$SUDO ./update.sh \
- -a "$DOCKER_UBUNTU_ARCH" \
- -v "$DOCKER_UBUNTU_VERSION" \
- -q "$DOCKER_UBUNTU_QUEMU_ARCH" \
- -u "$DOCKER_UBUNTU_QEMU_VER" \
- -d "$DOCKER_UBUNTU_REPO" \
- -t "$DOCKER_UBUNTU_TAG_ARCH"
-
-docker run --rm --privileged multiarch/qemu-user-static:register
-
-popd
diff --git a/utils/ci/prepare-toolchain.sh b/utils/ci/prepare-toolchain.sh
deleted file mode 100755
index 5edb19cc430..00000000000
--- a/utils/ci/prepare-toolchain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh cmake
-./install-os-packages.sh ninja
-
-if [[ "$COMPILER_INSTALL_METHOD" == "packages" ]]; then
-    . install-compiler-from-packages.sh
-elif [[ "$COMPILER_INSTALL_METHOD" == "sources" ]]; then
-    . install-compiler-from-sources.sh
-else
-    die "Unknown COMPILER_INSTALL_METHOD"
-fi
diff --git a/utils/ci/prepare-vagrant-image-freebsd.sh b/utils/ci/prepare-vagrant-image-freebsd.sh
deleted file mode 100755
index 16c5e58c7c5..00000000000
--- a/utils/ci/prepare-vagrant-image-freebsd.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-source default-config
-
-./install-os-packages.sh vagrant-virtualbox
-
-pushd "vagrant-freebsd"
-vagrant up
-vagrant ssh-config > vagrant-ssh
-ssh -F vagrant-ssh default 'uname -a'
-popd
diff --git a/utils/ci/run-clickhouse-from-binaries.sh b/utils/ci/run-clickhouse-from-binaries.sh
deleted file mode 100755
index 5e9dc35869a..00000000000
--- a/utils/ci/run-clickhouse-from-binaries.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-# Usage example:
-# ./run-with-docker.sh centos:centos6 ./run-clickhouse-from-binaries.sh
-
-source default-config
-
-SERVER_BIN="${WORKSPACE}/build/src/Server/clickhouse"
-SERVER_CONF="${WORKSPACE}/sources/src/Server/config.xml"
-SERVER_DATADIR="${WORKSPACE}/clickhouse"
-
-[[ -x "$SERVER_BIN" ]] || die "Run build-normal.sh first"
-[[ -r "$SERVER_CONF" ]] || die "Run get-sources.sh first"
-
-mkdir -p "${SERVER_DATADIR}"
-
-$SERVER_BIN server --config-file "$SERVER_CONF" --pid-file="${WORKSPACE}/clickhouse.pid" -- --path "$SERVER_DATADIR"
diff --git a/utils/ci/run-with-docker.sh b/utils/ci/run-with-docker.sh
deleted file mode 100755
index 158961dd5da..00000000000
--- a/utils/ci/run-with-docker.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-mkdir -p /var/cache/ccache
-DOCKER_ENV+=" --mount=type=bind,source=/var/cache/ccache,destination=/ccache -e CCACHE_DIR=/ccache "
-
-PROJECT_ROOT="$(cd "$(dirname "$0")/.."; pwd -P)"
-[[ -n "$CONFIG" ]] && DOCKER_ENV="--env=CONFIG"
-docker run -t --network=host --mount=type=bind,source=${PROJECT_ROOT},destination=/ClickHouse --workdir=/ClickHouse/ci $DOCKER_ENV "$1" "$2"
diff --git a/utils/ci/run-with-vagrant.sh b/utils/ci/run-with-vagrant.sh
deleted file mode 100755
index 620d38071eb..00000000000
--- a/utils/ci/run-with-vagrant.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -e -x
-
-[[ -r "vagrant-${1}/vagrant-ssh" ]] || die "Run prepare-vagrant-image-... first."
-
-pushd vagrant-$1
-
-shopt -s extglob
-
-vagrant ssh -c "mkdir -p ClickHouse"
-scp -q -F vagrant-ssh -r ../../!(*build*) default:~/ClickHouse
-vagrant ssh -c "cd ClickHouse/ci; $2"
-
-popd
diff --git a/utils/compressor/decompress_perf.cpp b/utils/compressor/decompress_perf.cpp
index 20f974aab7f..e3210164d79 100644
--- a/utils/compressor/decompress_perf.cpp
+++ b/utils/compressor/decompress_perf.cpp
@@ -1,5 +1,5 @@
 #include <lz4.h>
-#include <string.h>
+#include <cstring>
 #include <optional>
 #include <base/types.h>
 
@@ -60,7 +60,7 @@ protected:
         compressed_in->readStrict(reinterpret_cast<char *>(&checksum), sizeof(checksum));
 
         own_compressed_buffer.resize(COMPRESSED_BLOCK_HEADER_SIZE);
-        compressed_in->readStrict(&own_compressed_buffer[0], COMPRESSED_BLOCK_HEADER_SIZE);
+        compressed_in->readStrict(own_compressed_buffer.data(), COMPRESSED_BLOCK_HEADER_SIZE);
 
         UInt8 method = own_compressed_buffer[0];    /// See CompressedWriteBuffer.h
 
@@ -90,7 +90,7 @@ protected:
         else
         {
             own_compressed_buffer.resize(size_compressed + (variant == LZ4_REFERENCE ? 0 : LZ4::ADDITIONAL_BYTES_AT_END_OF_BUFFER));
-            compressed_buffer = &own_compressed_buffer[0];
+            compressed_buffer = own_compressed_buffer.data();
             compressed_in->readStrict(compressed_buffer + COMPRESSED_BLOCK_HEADER_SIZE, size_compressed - COMPRESSED_BLOCK_HEADER_SIZE);
         }
 
@@ -143,7 +143,7 @@ private:
             return false;
 
         memory.resize(size_decompressed + LZ4::ADDITIONAL_BYTES_AT_END_OF_BUFFER);
-        working_buffer = Buffer(&memory[0], &memory[size_decompressed]);
+        working_buffer = Buffer(memory.data(), &memory[size_decompressed]);
 
         decompress(working_buffer.begin(), size_decompressed, size_compressed_without_checksum);
 
diff --git a/utils/db-generator/query_db_generator.cpp b/utils/db-generator/query_db_generator.cpp
index 18c9bdbca38..00785af89f7 100644
--- a/utils/db-generator/query_db_generator.cpp
+++ b/utils/db-generator/query_db_generator.cpp
@@ -1,6 +1,6 @@
 #include <map>
 #include <cstdlib>
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 #include <string>
 
@@ -59,8 +59,8 @@ std::string randomDate()
     int32_t month = rng() % 12 + 1;
     int32_t day = rng() % 12 + 1;
     char answer[13];
-    sprintf(answer, "'%04u-%02u-%02u'", year, month, day);
-    return std::string(answer);
+    size_t size = sprintf(answer, "'%04u-%02u-%02u'", year, month, day);
+    return std::string(answer, size);
 }
 
 std::string randomDatetime()
@@ -72,7 +72,7 @@ std::string randomDatetime()
     int32_t minutes = rng() % 60;
     int32_t seconds = rng() % 60;
     char answer[22];
-    sprintf(
+    size_t size = sprintf(
             answer,
             "'%04u-%02u-%02u %02u:%02u:%02u'",
             year,
@@ -81,7 +81,7 @@ std::string randomDatetime()
             hours,
             minutes,
             seconds);
-    return std::string(answer);
+    return std::string(answer, size);
 }
 TableAndColumn get_table_a_column(const std::string & c)
 {
diff --git a/utils/graphite-rollup/graphite-rollup-bench.cpp b/utils/graphite-rollup/graphite-rollup-bench.cpp
index 49a3d509be6..a46d214edbf 100644
--- a/utils/graphite-rollup/graphite-rollup-bench.cpp
+++ b/utils/graphite-rollup/graphite-rollup-bench.cpp
@@ -4,7 +4,6 @@
 #include <iomanip>
 #include <iostream>
 #include <stdexcept>
-#include <system_error>
 
 #include <boost/program_options.hpp>
 
@@ -15,50 +14,35 @@
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/Exception.h>
 #include <Interpreters/Context.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
 
 using namespace DB;
 
 static SharedContextHolder shared_context = Context::createShared();
 
-std::vector<std::string_view> loadMetrics(const std::string & metrics_file)
+auto loadMetrics(const std::string & metrics_file)
 {
-    std::vector<std::string_view> metrics;
+    std::vector<std::string> metrics;
+    ReadBufferFromFile in(metrics_file);
+    String line;
 
-    FILE * stream;
-    char * line = nullptr;
-    size_t len = 0;
-    ssize_t nread;
-
-    stream = fopen(metrics_file.c_str(), "r");
-    if (stream == nullptr)
+    while (!in.eof())
     {
-        throw std::runtime_error(strerror(errno));
-    }
-
-    while ((nread = getline(&line, &len, stream)) != -1) /// NOLINT
-    {
-        size_t l = strlen(line);
-        if (l > 0)
+        readEscapedStringUntilEOL(line, in);
+        if (!in.eof())
         {
-            if (line[l - 1] == '\n')
-            {
-                line[l - 1] = '\0';
-                l--;
-            }
-            if (l > 0)
-            {
-                metrics.emplace_back(std::string_view(strdup(line), l));
-            }
+            ++in.position();
+        }
+        if (!line.empty() && line.back() == '\n')
+        {
+            line.pop_back();
+        }
+        if (!line.empty())
+        {
+            metrics.emplace_back(line);
         }
     }
-    free(line);
-    if (ferror(stream))
-    {
-        fclose(stream);
-        throw std::runtime_error(strerror(errno));
-    }
-
-    fclose(stream);
 
     return metrics;
 }
@@ -80,7 +64,7 @@ void bench(const std::string & config_path, const std::string & metrics_file, si
     Graphite::Params params;
     setGraphitePatternsFromConfig(context, "graphite_rollup", params);
 
-    std::vector<std::string_view> metrics = loadMetrics(metrics_file);
+    auto metrics = loadMetrics(metrics_file);
 
     std::vector<double> durations(metrics.size());
     size_t j, i;
@@ -99,15 +83,14 @@ void bench(const std::string & config_path, const std::string & metrics_file, si
 
             if (j == 0 && verbose)
             {
-                std::cout << metrics[i].data() << ": rule with regexp '" << rule.second->regexp_str << "' found\n";
+                std::cout << metrics[i] << ": rule with regexp '" << rule.second->regexp_str << "' found\n";
             }
         }
     }
 
     for (i = 0; i < metrics.size(); i++)
     {
-        std::cout << metrics[i].data() << " " << durations[i] / n << " ns\n";
-        free(const_cast<void *>(static_cast<const void *>(metrics[i].data())));
+        std::cout << metrics[i] << " " << durations[i] / n << " ns\n";
     }
 }
 
diff --git a/utils/iotest/iotest.cpp b/utils/iotest/iotest.cpp
index f23ee6929fa..7a1f35ddd52 100644
--- a/utils/iotest/iotest.cpp
+++ b/utils/iotest/iotest.cpp
@@ -15,8 +15,7 @@
 #include <vector>
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
 
 
@@ -54,7 +53,7 @@ void thread(int fd, int mode, size_t min_offset, size_t max_offset, size_t block
     if ((mode & MODE_DIRECT))
         buf = direct_buf.data();
     else
-        buf = &simple_buf[0];
+        buf = simple_buf.data();
 
     pcg64 rng(randomSeed());
 
diff --git a/utils/iotest/iotest_aio.cpp b/utils/iotest/iotest_aio.cpp
index 05074bc85f4..c0cf002ce58 100644
--- a/utils/iotest/iotest_aio.cpp
+++ b/utils/iotest/iotest_aio.cpp
@@ -110,12 +110,12 @@ void thread(int fd, int mode, size_t min_offset, size_t max_offset, size_t block
         }
 
         /// Send queries.
-        if  (io_submit(ctx.ctx, query_cbs.size(), &query_cbs[0]) < 0)
+        if  (io_submit(ctx.ctx, query_cbs.size(), query_cbs.data()) < 0)
             throwFromErrno("io_submit failed", ErrorCodes::CANNOT_IO_SUBMIT);
 
         /// Receive answers. If we have something else to send, then receive at least one answer (after that send them), otherwise wait all answers.
-        memset(&events[0], 0, buffers_count * sizeof(events[0]));
-        int evs = io_getevents(ctx.ctx, (blocks_sent < count ? 1 : in_progress), buffers_count, &events[0], nullptr);
+        memset(events.data(), 0, buffers_count * sizeof(events[0]));
+        int evs = io_getevents(ctx.ctx, (blocks_sent < count ? 1 : in_progress), buffers_count, events.data(), nullptr);
         if (evs < 0)
             throwFromErrno("io_getevents failed", ErrorCodes::CANNOT_IO_GETEVENTS);
 
diff --git a/utils/iotest/iotest_nonblock.cpp b/utils/iotest/iotest_nonblock.cpp
index 430e951d36b..33fab4d04e6 100644
--- a/utils/iotest/iotest_nonblock.cpp
+++ b/utils/iotest/iotest_nonblock.cpp
@@ -13,8 +13,8 @@
 
 #include <fcntl.h>
 #include <poll.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <unistd.h>
 
 #if defined (OS_LINUX)
@@ -101,7 +101,7 @@ int mainImpl(int argc, char ** argv)
     size_t ops = 0;
     while (ops < count)
     {
-        if (poll(&polls[0], descriptors, -1) <= 0)
+        if (poll(polls.data(), descriptors, -1) <= 0)
             throwFromErrno("poll failed", ErrorCodes::SYSTEM_ERROR);
         for (size_t i = 0; i < descriptors; ++i)
         {
@@ -123,12 +123,12 @@ int mainImpl(int argc, char ** argv)
 
             if (mode == MODE_READ)
             {
-                if (static_cast<int>(block_size) != pread(fds[i], &buf[0], block_size, offset))
+                if (static_cast<int>(block_size) != pread(fds[i], buf.data(), block_size, offset))
                     throwFromErrno("Cannot read", ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR);
             }
             else
             {
-                if (static_cast<int>(block_size) != pwrite(fds[i], &buf[0], block_size, offset))
+                if (static_cast<int>(block_size) != pwrite(fds[i], buf.data(), block_size, offset))
                     throwFromErrno("Cannot write", ErrorCodes::CANNOT_WRITE_TO_FILE_DESCRIPTOR);
             }
         }
diff --git a/utils/keeper-bench/Runner.cpp b/utils/keeper-bench/Runner.cpp
index e89670c4ec3..b43ad62bc5b 100644
--- a/utils/keeper-bench/Runner.cpp
+++ b/utils/keeper-bench/Runner.cpp
@@ -167,6 +167,7 @@ void Runner::runBenchmark()
     }
     catch (...)
     {
+        shutdown = true;
         pool.wait();
         throw;
     }
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index b55dab8399b..0762c740ac1 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -62,7 +62,8 @@ int main(int argc, char *argv[])
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
     CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, argv[1], settings);
+    KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>();
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, argv[1], settings, keeper_context);
     state_machine->init();
     size_t last_commited_index = state_machine->last_commit_index();
 
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 777fd424321..f23e9efa897 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,8 +1,13 @@
+v22.8.1.2097-lts	2022-08-18
+v22.7.3.5-stable	2022-08-10
+v22.7.2.15-stable	2022-08-03
 v22.7.1.2484-stable	2022-07-21
+v22.6.5.22-stable	2022-08-09
 v22.6.4.35-stable	2022-07-25
 v22.6.3.35-stable	2022-07-06
 v22.6.2.12-stable	2022-06-29
 v22.6.1.1985-stable	2022-06-16
+v22.5.4.19-stable	2022-08-10
 v22.5.3.21-stable	2022-07-25
 v22.5.2.53-stable	2022-07-07
 v22.5.1.2079-stable	2022-05-19
@@ -11,6 +16,8 @@ v22.4.5.9-stable	2022-05-06
 v22.4.4.7-stable	2022-04-29
 v22.4.3.3-stable	2022-04-26
 v22.4.2.1-stable	2022-04-22
+v22.3.11.12-lts	2022-08-10
+v22.3.10.22-lts	2022-08-03
 v22.3.9.19-lts	2022-07-25
 v22.3.8.39-lts	2022-07-07
 v22.3.7.28-lts	2022-06-20
diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
index 679dc144f13..c0c97b1d711 100644
--- a/utils/self-extracting-executable/decompressor.cpp
+++ b/utils/self-extracting-executable/decompressor.cpp
@@ -12,6 +12,7 @@
 #include <cstdio>
 #include <cstring>
 #include <iostream>
+#include <filesystem>
 
 #if (defined(OS_DARWIN) || defined(OS_FREEBSD)) && defined(__GNUC__)
 #   include <machine/endian.h>
@@ -20,11 +21,16 @@
 #endif
 
 #if defined OS_DARWIN
+#   include <mach-o/dyld.h>
 #   include <libkern/OSByteOrder.h>
     // define 64 bit macros
 #   define le64toh(x) OSSwapLittleToHostInt64(x)
 #endif
 
+#if defined(OS_FREEBSD)
+#   include <sys/sysctl.h>
+#endif
+
 #include "types.h"
 
 /// decompress part
@@ -81,7 +87,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
         pid = fork();
         if (-1 == pid)
         {
-            perror(nullptr);
+            perror("fork");
             /// If fork failed just decompress data in main process.
             if (0 != doDecompress(input, output, in_pointer, out_pointer, size, decompressed_size, dctx))
             {
@@ -162,14 +168,14 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
 
 
 /// Read data about files and decomrpess them.
-int decompressFiles(int input_fd, char * path, char * name, bool & have_compressed_analoge)
+int decompressFiles(int input_fd, char * path, char * name, bool & have_compressed_analoge, char * decompressed_suffix, uint64_t * decompressed_umask)
 {
     /// Read data about output file.
     /// Compressed data will replace data in file
     struct stat info_in;
     if (0 != fstat(input_fd, &info_in))
     {
-        perror(nullptr);
+        perror("fstat");
         return 1;
     }
 
@@ -177,7 +183,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
     char * input = static_cast<char*>(mmap(nullptr, info_in.st_size, PROT_READ, MAP_PRIVATE, input_fd, 0));
     if (input == MAP_FAILED)
     {
-        perror(nullptr);
+        perror("mmap");
         return 1;
     }
 
@@ -201,9 +207,9 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
     struct statfs fs_info;
     if (0 != fstatfs(input_fd, &fs_info))
     {
-        perror(nullptr);
+        perror("fstatfs");
         if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
         return 1;
     }
     if (fs_info.f_blocks * info_in.st_blksize < decompressed_full_size)
@@ -221,7 +227,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
         files_pointer += sizeof(FileData);
 
         size_t file_name_len =
-            (strcmp(input + files_pointer, name) ? le64toh(file_info.name_length) : le64toh(file_info.name_length) + 13);
+            (strcmp(input + files_pointer, name) ? le64toh(file_info.name_length) : le64toh(file_info.name_length) + 13 + 7);
 
         size_t file_path_len = path ? strlen(path) + 1 + file_name_len : file_name_len;
 
@@ -236,7 +242,16 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
         files_pointer += le64toh(file_info.name_length);
         if (file_name_len != le64toh(file_info.name_length))
         {
-            strcat(file_name, ".decompressed");
+            strcat(file_name, ".decompressed.XXXXXX");
+            int fd = mkstemp(file_name);
+            if (fd == -1)
+            {
+                perror("mkstemp");
+                return 1;
+            }
+            close(fd);
+            strncpy(decompressed_suffix, file_name + strlen(file_name) - 6, 6);
+            *decompressed_umask = le64toh(file_info.umask);
             have_compressed_analoge = true;
         }
 
@@ -244,18 +259,18 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
 
         if (output_fd == -1)
         {
-            perror(nullptr);
+            perror("open");
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
         /// Prepare output file
         if (0 != ftruncate(output_fd, le64toh(file_info.uncompressed_size)))
         {
-            perror(nullptr);
+            perror("ftruncate");
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
@@ -268,9 +283,9 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
             );
         if (output == MAP_FAILED)
         {
-            perror(nullptr);
+            perror("mmap");
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
@@ -278,66 +293,70 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
         if (0 != decompress(input, output, le64toh(file_info.start), le64toh(file_info.end)))
         {
             if (0 != munmap(input, info_in.st_size))
-                perror(nullptr);
+                perror("munmap");
             if (0 != munmap(output, le64toh(file_info.uncompressed_size)))
-                perror(nullptr);
+                perror("munmap");
             return 1;
         }
 
         if (0 != fsync(output_fd))
-            perror(nullptr);
+            perror("fsync");
         if (0 != close(output_fd))
-            perror(nullptr);
+            perror("close");
     }
 
     if (0 != munmap(input, info_in.st_size))
-        perror(nullptr);
+        perror("munmap");
     return 0;
 }
 
-/// Copy particular part of command and update shift
-void fill(char * dest, char * source, size_t length, size_t& shift)
-{
-    memcpy(dest + shift, source, length);
-    shift += length;
-}
+#if defined(OS_DARWIN)
 
-/// Set command to `mv filename.decompressed filename && filename agrs...`
-void fillCommand(char command[], int argc, char * argv[], size_t length)
-{
-    memset(command, '\0', 3 + strlen(argv[0]) + 14 + strlen(argv[0]) + 4 + strlen(argv[0]) + length + argc);
-
-    /// position in command
-    size_t shift = 0;
-
-    /// Support variables to create command
-    char mv[] = "mv ";
-    char decompressed[] = ".decompressed ";
-    char add_command[] = " && ";
-    char space[] = " ";
-
-    fill(command, mv, 3, shift);
-    fill(command, argv[0], strlen(argv[0]), shift);
-    fill(command, decompressed, 14, shift);
-    fill(command, argv[0], strlen(argv[0]), shift);
-    fill(command, add_command, 4, shift);
-    fill(command, argv[0], strlen(argv[0]), shift);
-    fill(command, space, 1, shift);
-
-    /// forward all arguments
-    for (int i = 1; i < argc; ++i)
+    int read_exe_path(char *exe, size_t buf_sz)
     {
-        fill(command, argv[i], strlen(argv[i]), shift);
-        if (i != argc - 1)
-            fill(command, space, 1, shift);
+        uint32_t size = buf_sz;
+        char apple[size];
+        if (_NSGetExecutablePath(apple, &size) != 0)
+            return 1;
+        if (realpath(apple, exe) == nullptr)
+            return 1;
+        return 0;
     }
-}
 
-int main(int argc, char* argv[])
+#elif defined(OS_FREEBSD)
+
+    int read_exe_path(char *exe, size_t buf_sz)
+    {
+        int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+        size_t length = buf_sz;
+        int error = sysctl(name, 4, exe, &length, nullptr, 0);
+        if (error < 0 || length <= 1)
+            return 1;
+        return 0;
+    }
+
+#else
+
+    int read_exe_path(char *exe, size_t/* buf_sz*/)
+    {
+        if (realpath("/proc/self/exe", exe) == nullptr)
+            return 1;
+        return 0;
+    }
+
+#endif
+
+int main(int/* argc*/, char* argv[])
 {
-    char file_path[strlen(argv[0]) + 1];
-    memset(file_path, 0, sizeof(file_path));
-    strcpy(file_path, argv[0]);
+    char self[4096] = {0};
+    if (read_exe_path(self, 4096) == -1)
+    {
+        perror("read_exe_path");
+        return 1;
+    }
+
+    char file_path[strlen(self) + 1];
+    strcpy(file_path, self);
 
     char * path = nullptr;
     char * name = strrchr(file_path, '/');
@@ -350,62 +369,68 @@ int main(int argc, char* argv[])
     else
         name = file_path;
 
-    int input_fd = open(argv[0], O_RDONLY);
+    int input_fd = open(self, O_RDONLY);
     if (input_fd == -1)
     {
-        perror(nullptr);
+        perror("open");
         return 1;
     }
 
     bool have_compressed_analoge = false;
+    char decompressed_suffix[7] = {0};
+    uint64_t decompressed_umask = 0;
 
     /// Decompress all files
-    if (0 != decompressFiles(input_fd, path, name, have_compressed_analoge))
+    if (0 != decompressFiles(input_fd, path, name, have_compressed_analoge, decompressed_suffix, &decompressed_umask))
     {
         printf("Error happened during decompression.\n");
         if (0 != close(input_fd))
-            perror(nullptr);
+            perror("close");
         return 1;
     }
 
     if (0 != close(input_fd))
-        perror(nullptr);
+        perror("close");
 
-    /// According to documentation `mv` will rename file if it
-    /// doesn't move to other directory.
-    /// Sometimes `rename` doesn't exist by default and
-    /// `rename.ul` is set instead. It will lead to errors
-    /// that can be easily avoided with help of `mv`
-
-    if (!have_compressed_analoge)
+    if (unlink(self))
     {
-        printf("No target executable - decompression only was performed.\n");
-        /// remove file
-        execlp("rm", "rm", argv[0], NULL);
-        perror(nullptr);
+        perror("unlink");
         return 1;
     }
+
+    if (!have_compressed_analoge)
+        printf("No target executable - decompression only was performed.\n");
     else
     {
-        /// move decompressed file instead of this binary and apply command
-        char bash[] = "sh";
-        char executable[] = "-c";
+        const char * const decompressed_name_fmt = "%s.decompressed.%s";
+        int decompressed_name_len = snprintf(nullptr, 0, decompressed_name_fmt, self, decompressed_suffix);
+        char decompressed_name[decompressed_name_len + 1];
+        (void)snprintf(decompressed_name, decompressed_name_len + 1, decompressed_name_fmt, self, decompressed_suffix);
 
-        /// length of forwarded args
-        size_t length = 0;
-        for (int i = 1; i < argc; ++i)
-            length += strlen(argv[i]);
+        std::error_code ec;
+        std::filesystem::copy_file(static_cast<char *>(decompressed_name), static_cast<char *>(self), ec);
+        if (ec)
+        {
+            std::cerr << ec.message() << std::endl;
+            return 1;
+        }
 
-        /// mv filename.decompressed filename && filename agrs...
-        char command[3 + strlen(argv[0]) + 14 + strlen(argv[0]) + 4 + strlen(argv[0]) + length + argc];
-        fillCommand(command, argc, argv, length);
+        if (chmod(self, decompressed_umask))
+        {
+            perror("chmod");
+            return 1;
+        }
 
-        /// replace file and call executable
-        char * newargv[] = { bash, executable, command, nullptr };
-        execvp(bash, newargv);
+        if (unlink(decompressed_name))
+        {
+            perror("unlink");
+            return 1;
+        }
+
+        execv(self, argv);
 
         /// This part of code will be reached only if error happened
-        perror(nullptr);
+        perror("execv");
         return 1;
     }
 }
diff --git a/utils/self-extracting-executable/post_build.sh b/utils/self-extracting-executable/post_build.sh
index 397de0074ef..ca595dafabf 100755
--- a/utils/self-extracting-executable/post_build.sh
+++ b/utils/self-extracting-executable/post_build.sh
@@ -1,3 +1,7 @@
 padding="               "
-sz="$(stat -c %s 'decompressor')"
+if [[ $OSTYPE == 'darwin'* ]]; then
+    sz="$(stat -f %z 'decompressor')"
+else
+    sz="$(stat -c %s 'decompressor')"
+fi
 printf "%s%s" "${padding:${#sz}}" $sz
diff --git a/utils/tests-visualizer/index.html b/utils/tests-visualizer/index.html
index 15ee221aa8e..11b2d6504e4 100644
--- a/utils/tests-visualizer/index.html
+++ b/utils/tests-visualizer/index.html
@@ -62,7 +62,7 @@
 <pre id="info" class="hide"></pre>
 <h1 id="fail-message" class="hide">Data not load</h1>
 <div id="loading">
-    <img src="https://clickhouse.com/images/logo.svg">
+    <img src="https://presentations.clickhouse.com/images/logo.svg">
     <h1>Loading (~10 seconds, ~20 MB)</h1>
 </div>
 <canvas id="canvas"></canvas>
diff --git a/utils/trace-visualizer/js/d3-gantt.js b/utils/trace-visualizer/js/d3-gantt.js
index e3a51a33c21..45f7707aa61 100644
--- a/utils/trace-visualizer/js/d3-gantt.js
+++ b/utils/trace-visualizer/js/d3-gantt.js
@@ -307,7 +307,7 @@
         x = d3.scaleLinear()
             .domain([timeDomainStart, timeDomainEnd])
             .range([0, width])
-            //.clamp(true); // dosn't work with zoom/pan
+            //.clamp(true); // doesn't work with zoom/pan
         xZoomed = x;
         y = d3.scaleBand()
             .domain([...data.bands])
diff --git a/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js b/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js
index ad3a6c0d199..19e509309f2 100644
--- a/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js
+++ b/utils/trace-visualizer/js/d3-tip-0.8.0-alpha.1.js
@@ -26,7 +26,7 @@
     root.d3.tip = factory(d3, d3)
   }
 }(this, function(d3Collection, d3Selection) {
-  // Public - contructs a new tooltip
+  // Public - constructs a new tooltip
   //
   // Returns a tip
   return function() {
diff --git a/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp b/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp
index 5c694ee04ef..7736921a9c6 100644
--- a/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp
+++ b/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp
@@ -179,8 +179,8 @@ void setCurrentBlockNumber(zkutil::ZooKeeper & zk, const std::string & path, Int
             if (number != current_block_number)
             {
                 char suffix[11] = "";
-                sprintf(suffix, "%010lld", current_block_number);
-                std::string expected_path = block_prefix + suffix;
+                size_t size = sprintf(suffix, "%010lld", current_block_number);
+                std::string expected_path = block_prefix + std::string(suffix, size);
                 std::cerr << "\t" << path_created << ": Ephemeral node has been created with an unexpected path (expected something like "
                           << expected_path << ")." << std::endl;
                 return false;
diff --git a/utils/zookeeper-test/main.cpp b/utils/zookeeper-test/main.cpp
index 5d0b54aa74b..6ff7623a83e 100644
--- a/utils/zookeeper-test/main.cpp
+++ b/utils/zookeeper-test/main.cpp
@@ -238,9 +238,9 @@ std::string currentDateTime()
     tstruct = *localtime(&now);
     // Visit http://en.cppreference.com/w/cpp/chrono/c/strftime
     // for more information about date/time format
-    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tstruct);
+    size_t size = strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tstruct);
 
-    return buf;
+    return std::string(buf, size);
 }
 
 
@@ -282,11 +282,9 @@ void createConcurrent(zkutil::ZooKeeper & testzk, const std::string & zkhost, si
         asyncs.push_back(std::async(std::launch::async, callback));
     }
 
-    size_t i = 0;
     for (auto & async : asyncs)
     {
         async.wait();
-        i++;
     }
 }
 
diff --git a/website/404.html b/website/404.html
deleted file mode 100644
index 31aaf6646df..00000000000
--- a/website/404.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "templates/base.html" %}
-{% set no_footer = True %}
-
-{% block content %}
-<div class="container py-5">
-    <a href="/">
-        <img id="logo-icon" src="/images/logo.svg" />
-        <img id="logo-text" src="/images/clickhouse-black.svg" alt="ClickHouse" />
-    </a>
-    <h2 class="my-4">404 Not Found</h2>
-    <p class="lead">
-        <a href="/">&larr; {{ _('Return to home page') }}</a>
-    </p>
-</div>
-{% endblock %}
diff --git a/website/README.md b/website/README.md
index 0c9b13676b5..67937044ba0 100644
--- a/website/README.md
+++ b/website/README.md
@@ -1,28 +1 @@
-ClickHouse website is built alongside it's documentation via [docs/tools](https://github.com/ClickHouse/ClickHouse/tree/master/docs/tools), see [README.md there](https://github.com/ClickHouse/ClickHouse/tree/master/docs/tools/README.md).
-
-# How to quickly test the main page of the website
-
-```
-# If you have old OS distribution,
-# Run this from repository root:
-
-docker run -it --rm --network host --volume $(pwd):/workspace ubuntu:20.04 /bin/bash
-cd workspace/docs/tools
-apt update
-apt install sudo python pip git
-pip3 install -r requirements.txt
-git config --global --add safe.directory /workspace
-./build.py --livereload 8080
-```
-
-```
-cd ../docs/tools
-sudo apt install python3 pip
-pip3 install -r requirements.txt
-
-virtualenv build
-
-./build.py --livereload 8080
-
-# Open the web browser and go to http://localhost:8080/
-```
+# This is not a website
diff --git a/website/benchmark/benchmark.js b/website/benchmark/benchmark.js
deleted file mode 100644
index 09607b27263..00000000000
--- a/website/benchmark/benchmark.js
+++ /dev/null
@@ -1,464 +0,0 @@
-var data_sizes =
-    [
-        {id: "10000000", name: "10 mln."},
-        {id: "100000000", name: "100 mln."},
-        {id: "1000000000", name: "1 bn."}
-    ];
-
-
-var systems = [];
-var systems_full = [];
-var system_kinds = [];
-var systems_uniq = {};
-for (r in results) {
-    if (systems_uniq[results[r].system])
-        continue;
-    systems_uniq[results[r].system] = 1;
-    systems.push(results[r].system);
-    systems_full.push(results[r].system_full);
-    system_kinds.push(results[r].kind);
-}
-
-var runs = ["first (cold cache)", "second", "third"];
-var current_runs = ['1', '2'];
-
-try {
-    var state = JSON.parse(decodeURIComponent(window.location.hash.substring(1)));
-    current_data_size = state[0];
-    current_systems = state[1];
-    current_runs = state[2];
-} catch (e) {
-}
-
-if (!current_systems.length) {
-    current_systems = systems;
-}
-
-function update_hash() {
-    window.location.hash = JSON.stringify([current_data_size, current_systems, current_runs]);
-}
-
-
-function generate_selectors(elem) {
-    var html = '<div id="systems_selector" class="mb-3"><h2 class="h4">Compare</h2>';
-
-    var available_results = results;
-
-    if (current_data_size) {
-        available_results = results.filter(function (run) {
-            return run.data_size == current_data_size;
-        });
-    }
-    var available_systems_for_current_data_size = available_results.map(function (run) {
-        return run.system;
-    });
-
-    for (var i = 0; i < systems.length; i++) {
-        var selected = current_systems.indexOf(systems[i]) != -1;
-        var available = available_systems_for_current_data_size.indexOf(systems[i]) != -1;
-        var button_class = 'btn-outline-dark';
-        if (system_kinds[i] == 'cloud' || system_kinds[i] == 'vps') {
-            button_class = 'btn-light';
-        } else if (system_kinds[i] == 'desktop' || system_kinds[i] == 'laptop') {
-            button_class = 'btn-outline-secondary';
-        };
-
-        html += '<button type="button" class="btn btn-sm mr-1 mb-1 ' + button_class +
-            (selected && available ? ' active' : '') +
-            (available ? '' : ' disabled') + '"';
-        if (systems_full[i]) {
-            html += ' data-toggle="tooltip" data-placement="bottom" title="' + systems_full[i] + '"';
-        }
-        html += '>' + systems[i] + '</button>';
-    }
-
-    if (current_data_size) {
-        html += '</div><div id="data_size_selector"><h2 class="h4">Dataset&nbsp;size</h2>';
-
-        for (var i = 0; i < data_sizes.length; i++) {
-            html += '<button type="button" class="btn btn-sm btn-outline-dark mr-1 mb-1' + (data_sizes[i].id == current_data_size ? ' active' : '') + '" data-size-id="' + data_sizes[i].id + '">' + data_sizes[i].name + '</button>';
-        }
-    }
-
-    html += '</div><div id="runs_selector"><h2 class="h4">Run</h2>';
-
-    for (var i = 0; i < runs.length; i++) {
-        html += '<button type="button" class="btn btn-sm btn-outline-dark mr-1 mb-1' + (current_runs.indexOf(String(i)) != -1 ? ' active' : '') + '" data-run-id="' + i + '">' + runs[i] + '</button>';
-    }
-
-    html += '</div>';
-
-    elem.html(html);
-
-    $('button').focus(function() {
-       $('[data-toggle="tooltip"]').tooltip('hide');
-    });
-
-    $('#systems_selector button:not(.disabled)').click(function (event) {
-        event.preventDefault();
-        var target = $(event.target || event.srcElement);
-
-        if (target.hasClass("active") && current_systems.length == 1) {
-            return;
-        }
-
-        target.toggleClass("active");
-
-        current_systems = $.map($('#systems_selector button'), function (elem) {
-            return $(elem).hasClass("active") ? $(elem).html() : null
-        }).filter(function (x) {
-            return x;
-        });
-
-        update_hash();
-        generate_selectors(elem);
-        generate_comparison_table();
-        generate_diagram();
-    });
-
-    if (current_data_size) {
-        $('#data_size_selector button').click(function (event) {
-            event.preventDefault();
-            var target = $(event.target || event.srcElement);
-
-            current_data_size = target.attr("data-size-id");
-
-            update_hash();
-            generate_selectors(elem);
-            generate_comparison_table();
-            generate_diagram();
-        });
-    }
-
-    $('#runs_selector button').click(function (event) {
-        event.preventDefault();
-        var target = $(event.target || event.srcElement);
-
-        if (target.hasClass("active") && current_runs.length == 1) {
-            return;
-        }
-
-        target.toggleClass("active");
-
-        current_runs = $.map($('#runs_selector button'), function (elem) {
-            return $(elem).hasClass("active") ? $(elem).attr("data-run-id") : null
-        }).filter(function (x) {
-            return x;
-        });
-
-        update_hash();
-        generate_selectors(elem);
-        generate_comparison_table();
-        generate_diagram();
-    });
-}
-
-function format_number_cell(value, ratio) {
-    var html = "";
-
-    var redness = (ratio - 1) / ratio;
-    var blackness = ratio < 10 ? 0 : ((ratio - 10) / ratio / 2);
-
-    var color = !value ? "#FFF" :
-        ratio == 1 ?
-            ("rgba(0, 255, 0, 1)") :
-            ("rgba(" + ~~(255 * (1 - blackness)) + ", 0, 0, " + redness + ")");
-
-    html += "<td style='background-color: " + color + "'>";
-    html += value ?
-        (ratio == 1 ? "" : ("×" + ratio.toFixed(2))) + "&nbsp;<span style='color: #888;'>(" + value.toFixed(3) + "&nbsp;s.)</span>" :
-        "—";
-    html += "</td>";
-
-    return html;
-}
-
-/* Ratio of execution time to best execution time:
- * system index -> run index -> query index -> ratio.
- */
-var ratios = [];
-
-
-function generate_comparison_table() {
-    ratios = [];
-
-    var filtered_results = results;
-    if (current_data_size) {
-        filtered_results = filtered_results.filter(function (x) {
-            return x.data_size == current_data_size;
-        });
-    }
-    filtered_results = filtered_results.filter(function (x) {
-        return current_systems.indexOf(x.system) != -1;
-    });
-
-    var html = "";
-
-    html += "<table class='table table-bordered table-sm'>";
-    html += "<tr>";
-    html += "<th><input id='query_checkbox_toggler' type='checkbox' checked /></th>";
-    html += "<th>Query</th>";
-    for (var j = 0; j < filtered_results.length; j++) {
-        html += "<th colspan='" + current_runs.length + "'";
-        if (filtered_results[j].system_full) {
-            html += ' data-toggle="tooltip" title="' + filtered_results[j].system_full + '"';
-        }
-        html += " class='text-center'>" + filtered_results[j].system.replace(/ /g, '&nbsp;') +
-            (filtered_results[j].version ? " (" + filtered_results[j].version + ")" : "") + "</th>";
-    }
-    html += "</tr>";
-
-    for (var i = 0; i < queries.length; i++) {
-        html += "<tr>";
-        html += "<td><input id='query_checkbox" + i + "' type='checkbox' " +
-            ($('#query_checkbox' + i).length == 0 || $('#query_checkbox' + i).is(':checked') ? "checked" : "") + " /></td>";
-
-            html += "<td class='benchmark-query-cell-wrapper'><div class='benchmark-query-cell'>" + queries[i].query + "</div></td>";
-
-        // Max and min execution time per system, for each of three runs
-        var minimums = [0, 0, 0], maximums = [0, 0, 0];
-
-        for (var j = 0; j < filtered_results.length; j++) {
-            for (var current_run_idx = 0; current_run_idx < current_runs.length; current_run_idx++) {
-                var k = current_runs[current_run_idx];
-                var value = filtered_results[j].result[i][k];
-
-                if (value && (!minimums[k] || value < minimums[k])) {
-                    minimums[k] = value;
-
-                    // Ignore below 10ms
-                    if (minimums[k] < 0.01) {
-                        minimums[k] = 0.01;
-                    }
-                }
-
-                if (value > maximums[k]) {
-                    maximums[k] = value;
-                }
-            }
-        }
-
-        for (var j = 0; j < filtered_results.length; j++) {
-            if (!ratios[j]) {
-                ratios[j] = [];
-            }
-
-            for (var current_run_idx = 0; current_run_idx < current_runs.length; current_run_idx++) {
-                var k = current_runs[current_run_idx];
-                var value = filtered_results[j].result[i][k];
-
-                var ratio = value / minimums[k];
-
-                ratios[j][k] = ratios[j][k] || [];
-
-                if (ratio && ratio <= 1) {
-                    ratio = 1;
-                }
-
-                ratios[j][k].push(ratio);
-
-                html += format_number_cell(value, ratio);
-            }
-        }
-        html += "</tr>";
-    }
-
-    if (current_systems.length) {
-        html += "<tr>";
-        html += "<td rowspan='2'></td>";
-        html += "<td rowspan='2'>Geometric mean of ratios</td>";
-
-        for (var j = 0; j < filtered_results.length; j++) {
-            for (var k = 0; k < current_runs.length; k++) {
-                html += "<th id='totals" + j + "_" + current_runs[k] + "' class='number_cell text-center'></th>";
-            }
-        }
-
-        html += "</tr>";
-        html += "<tr>";
-
-        for (var j = 0; j < filtered_results.length; j++) {
-            html += "<th id='absolute_totals" + j + "' colspan='" + current_runs.length + "' class='number_cell text-center'></th>";
-        }
-
-        html += "</tr>";
-    }
-
-    html += "</table>";
-
-    $('#comparison_table').html(html);
-
-    for (var i = 0; i < queries.length; i++) {
-        $('#query_checkbox' + i).click(function () {
-            calculate_totals();
-            generate_diagram();
-        });
-    }
-    $('#query_checkbox_toggler').click(function () {
-        for (var i = 0; i < queries.length; i++) {
-            var item = $('#query_checkbox' + i);
-            item.prop("checked", !item.prop("checked"));
-        }
-    });
-
-    calculate_totals();
-}
-
-
-function calculate_totals() {
-    if (!current_systems.length) return;
-    var filtered_results = results;
-    if (current_data_size) {
-        filtered_results = filtered_results.filter(function (x) {
-            return x.data_size == current_data_size;
-        });
-    }
-
-    filtered_results = filtered_results.filter(function (x) {
-        return current_systems.indexOf(x.system) != -1;
-    });
-
-    var total_ratios = [];
-
-    for (var j = 0; j < filtered_results.length; j++) {
-        for (var current_run_idx = 0; current_run_idx < current_runs.length; current_run_idx++) {
-            var k = current_runs[current_run_idx];
-
-            var current_ratios = ratios[j][k].filter(
-                function (x, i) {
-                    return x && $("#query_checkbox" + i).is(':checked');
-                }
-            );
-
-            var ratio = Math.pow(
-                current_ratios.reduce(
-                    function (acc, cur) {
-                        return acc * cur;
-                    },
-                    1),
-                1 / current_ratios.length);
-
-            total_ratios[j] = total_ratios[j] || 1;
-            total_ratios[j] *= ratio;
-
-            $("#totals" + j + "_" + k).attr("data-ratio", ratio).html("x" + ratio.toFixed(2));
-        }
-    }
-
-    for (var j = 0; j < filtered_results.length; j++) {
-        var total_ratio = Math.pow(total_ratios[j], 1 / current_runs.length);
-        $("#absolute_totals" + j).attr("data-ratio", total_ratio).html("x" + total_ratio.toFixed(2));
-    }
-}
-
-
-function generate_diagram() {
-    var html = "";
-    var filtered_results = results;
-    if (current_data_size) {
-        filtered_results = filtered_results.filter(function (x) {
-            return x.data_size == current_data_size && current_systems.indexOf(x.system) != -1;
-        });
-    }
-    filtered_results = filtered_results.filter(function (x) {
-        return current_systems.indexOf(x.system) != -1;
-    });
-
-    var max_ratio = 1;
-    var min_ratio = 0;
-
-    var max_total_ratio = 1;
-    var min_total_ratio = 0;
-
-    for (var j = 0; j < filtered_results.length; j++) {
-        for (var current_run_idx = 0; current_run_idx < current_runs.length; current_run_idx++) {
-            var k = current_runs[current_run_idx];
-            var ratio = +$("#totals" + j + "_" + k).attr("data-ratio");
-
-            if (ratio > max_ratio) {
-                max_ratio = ratio;
-            }
-
-            if (!min_ratio || ratio < min_ratio) {
-                min_ratio = ratio;
-            }
-        }
-
-        var total_ratio = +$("#absolute_totals" + j).attr("data-ratio");
-
-        if (total_ratio > max_total_ratio) {
-            max_total_ratio = total_ratio;
-        }
-
-        if (!min_total_ratio || total_ratio < min_total_ratio) {
-            min_total_ratio = total_ratio;
-        }
-    }
-
-    html += "<table class='table table-borderless table-sm'>";
-    var table_rows = [];
-
-    for (var j = 0; j < filtered_results.length; j++) {
-        var total_ratio = +$("#absolute_totals" + j).attr("data-ratio");
-        var table_row = "";
-
-        table_row += "<tr>";
-        table_row += "<td class='text-right text-nowrap w-15 align-middle'";
-        if (filtered_results[j].system_full) {
-            table_row += ' data-toggle="tooltip" data-placement="right" title="' + filtered_results[j].system_full + '"';
-        }
-        table_row += ">" + filtered_results[j].system + "" +
-            (filtered_results[j].version ? "<br /><span class='text-muted'(" + filtered_results[j].version.replace(/ /g, '&nbsp;') + ")</span>" : "") + "</td>";
-
-        table_row += "<td class='w-75'>";
-
-        for (var current_run_idx = 0; current_run_idx < current_runs.length; current_run_idx++) {
-            var k = current_runs[current_run_idx];
-
-            var ratio = +$("#totals" + j + "_" + k).attr("data-ratio");
-            var percents = (ratio * 100 / max_ratio).toFixed(2);
-
-            if (!ratio) {
-                ratio = +$("#absolute_totals" + j).attr("data-ratio");
-                percents = (ratio * 100 / max_total_ratio).toFixed(2);
-            }
-
-
-            table_row += '<div class="progress bg-light ml-2 my-2" style="height:1rem;"><div class="progress-bar ';
-
-            var bg = 'bg-dark';
-            if (filtered_results[j].kind == 'cloud' || filtered_results[j].kind == 'vps') {
-                bg = 'bg-medium';
-            } else if (filtered_results[j].kind == 'desktop' || filtered_results[j].kind == 'laptop' || filtered_results[j].kind == 'phone') {
-                bg = 'bg-secondary';
-            }
-
-            table_row += bg + '" style="width: ' + percents + '%;">&nbsp;</div></div>';
-
-        }
-
-
-        table_row += "</td>";
-
-        table_row += "<td class='align-middle'><strong>" + (total_ratio / min_total_ratio).toFixed(2) + "</strong></td>";
-        table_row += "</tr>";
-        table_rows.push({ data: table_row, value: total_ratio / min_total_ratio });
-    }
-    table_rows.sort(function(a, b) { return a.value - b.value; });
-
-    for (var j = 0; j < table_rows.length; j++) {
-        html += table_rows[j].data;
-    }
-
-    html += "</table>";
-
-    $('#diagram').html(html);
-    $('[data-toggle="tooltip"]').tooltip({
-        trigger: 'hover',
-        delay: { "show": 300, "hide": 100 }
-    });
-}
-
-generate_selectors($('#selectors'));
-generate_comparison_table();
-generate_diagram();
diff --git a/website/benchmark/dbms/index.html b/website/benchmark/dbms/index.html
deleted file mode 100644
index 8fae6311a78..00000000000
--- a/website/benchmark/dbms/index.html
+++ /dev/null
@@ -1,955 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>ClickBench — a Benchmark For Analytical DBMS</title>
-
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link rel="icon" href="data:image/gif;base64,R0lGODlhIAAgAOMPAHMUEmkyHOcbF8UvJts/E3BeOih1YziiQmebLt2AFjeyQKqZKNWPjLybfPfcDP///yH5BAEKAA8ALAAAAAAgACAAAATg8MlJ6ws26z0EGcQmZgAhnN6oPg0wDA0zrGMTAADDxEJCZ4Gba8c4hX4Uw+XWeYGOyMdhgkuYrAToqIBQHBCIKQ6wcJhPyINarUBcyuYE+ndQeOsKuNlxmv3CdnZfew5yAlEPC12BhFhZiBJ2CI1GkBMHeoV9PpYPhIUDBqIFnZ8EBaKplqYMqaqIewl8A6iupFF7C1YCoaJqq4UOWQIBBmtTuIQmWWxekJQeYWuWcFYPfl+dLAELOxML2hIYDeEWt7flEufknTZB7+8NBeyINxjqDwU4QYg26BTu6KVTEQEAOw==">
-    <link href="https://fonts.googleapis.com/css2?family=Inter&display=swap" rel="stylesheet">
-
-    <style>
-        :root {
-            --color: black;
-            --title-color: black;
-            --background-color: white;
-
-            --link-color: #08F;
-            --link-hover-color: #F40;
-
-            --selector-text-color: black;
-            --selector-active-text-color: black;
-            --selector-background-color: #EEE;
-            --selector-active-background-color: #FFCB80;
-            --selector-hover-text-color: black;
-            --selector-hover-background-color: #FDB;
-
-            --summary-every-other-row-color: #F8F8F8;
-            --highlight-color: #EEE;
-            --bar-color: #FFCB80;
-
-            --tooltip-text-color: white;
-            --tooltip-background-color: black;
-
-            --nothing-selected-color: #CCC;
-            --shadow-color: grey;
-        }
-
-        [data-theme="dark"] {
-            --color: #CCC;
-            --title-color: white;
-            --background-color: #04293A;
-
-            --link-color: #8CF;
-            --link-hover-color: #FFF;
-
-            --selector-text-color: white;
-            --selector-background-color: #444;
-            --selector-active-text-color: white;
-            --selector-active-background-color: #088;
-            --selector-hover-text-color: black;
-            --selector-hover-background-color: white;
-
-            --summary-every-other-row-color: #042e41;
-            --highlight-color: #064663;
-            --bar-color: #088;
-
-            --tooltip-text-color: white;
-            --tooltip-background-color: #444;
-
-            --nothing-selected-color: #666;
-            --shadow-color: black;
-        }
-
-        html, body {
-            color: var(--color);
-            background-color: var(--background-color);
-            width: 100%;
-            height: 100%;
-            margin: 0;
-            overflow: auto;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: 'Inter', sans-serif;
-            padding: 1% 3% 0 3%;
-        }
-
-        h1 {
-            color: var(--title-color);
-        }
-
-        table {
-             border-spacing: 1px;
-        }
-
-        .stick-left {
-            position: sticky;
-            left: 0px;
-        }
-
-        .selectors-container {
-            padding: 2rem 0 2rem 0;
-            user-select: none;
-        }
-
-        .selectors-container th {
-            text-align: left;
-            vertical-align: top;
-            white-space: nowrap;
-            padding-top: 0.5rem;
-            padding-right: 1rem;
-        }
-
-        .selector {
-            display: inline-block;
-            margin-left: 0.1rem;
-            padding: 0.2rem 0.5rem 0.2rem 0.5rem;
-            background: var(--selector-background-color);
-            color: var(--selector-text-color);
-            border: 0.2rem solid var(--background-color);
-            border-radius: 0.5rem;
-        }
-
-        .selector-active {
-            color: var(--selector-active-text-color);
-            background: var(--selector-active-background-color);
-        }
-
-        a, a:visited {
-            text-decoration: none;
-            color: var(--link-color);
-            cursor: pointer;
-        }
-
-        a:hover {
-            color: var(--link-hover-color);
-        }
-
-        .selector:hover {
-            color: var(--selector-hover-text-color) !important;
-            background: var(--selector-background-color);
-        }
-
-        .selector-active:hover {
-            background: var(--selector-hover-background-color);
-        }
-
-        #summary tr:nth-child(odd) {
-            background: var(--summary-every-other-row-color);
-        }
-
-        .summary-name {
-            white-space: nowrap;
-            text-align: right;
-            padding-right: 1rem;
-        }
-
-        .summary-bar-cell {
-            width: 100%;
-        }
-
-        .summary-bar {
-            height: 1rem;
-            background: var(--bar-color);
-            border-radius: 0 0.2rem 0.2rem 0;
-        }
-
-        .summary-number {
-            font-family: monospace;
-            text-align: right;
-            padding-left: 1rem;
-            white-space: nowrap;
-        }
-
-        th {
-            padding-bottom: 0.5rem;
-        }
-
-        .th-entry-hilite {
-            background: var(--highlight-color);
-            font-weight: bold;
-        }
-
-        .summary-row:hover, .summary-row-hilite {
-            background: var(--highlight-color) !important;
-            font-weight: bold;
-        }
-
-        #details {
-            padding-bottom: 1rem;
-        }
-
-        #details th {
-            vertical-align: bottom;
-            white-space: pre;
-        }
-
-        #details td {
-            white-space: pre;
-            font-family: monospace;
-            text-align: right;
-            padding: 0.1rem 0.5rem 0.1rem 0.5rem;
-        }
-
-        .shadow:hover {
-            box-shadow: 0 0 1rem var(--shadow-color);
-            position: relative;
-        }
-
-        #nothing-selected {
-            display: none;
-            font-size: 32pt;
-            font-weight: bold;
-            color: var(--nothing-selected-color);
-        }
-
-        .note {
-            position: relative;
-            display: inline-block;
-        }
-
-        .tooltip {
-            position: absolute;
-            bottom: calc(100% + 0.5rem);
-            visibility: hidden;
-            background-color: var(--tooltip-background-color);
-            color: var(--tooltip-text-color);
-            box-shadow: 0 0 1rem var(--shadow-color);
-            padding: 0.5rem 0.75rem;
-            border-radius: 0.5rem;
-            z-index: 1;
-            text-align: left;
-            white-space: normal;
-        }
-
-        .tooltip-result {
-            left: calc(50% - 0.25rem);
-            width: 20rem;
-            margin-left: -10rem;
-        }
-
-        .tooltip-query {
-            left: 0;
-            width: 40rem;
-            margin-left: -3rem;
-        }
-
-        .note:hover .tooltip {
-            visibility: visible;
-        }
-
-        .tooltip::after {
-            content: " ";
-            position: absolute;
-            top: 100%;
-            border-width: 0.5rem;
-            border-style: solid;
-            border-color: var(--tooltip-background-color) transparent transparent transparent;
-        }
-
-        .tooltip-result::after {
-            left: 50%;
-            margin-left: -1rem;
-        }
-
-        .tooltip-query::after {
-            left: 3rem;
-            margin-left: 0.5rem;
-        }
-
-        .nowrap {
-            text-wrap: none;
-        }
-
-        .themes {
-            float: right;
-            font-size: 200%;
-            cursor: pointer;
-        }
-
-        #toggle-dark, #toggle-light {
-            padding-right: 0.5rem;
-            cursor: pointer;
-        }
-
-        #toggle-dark:hover, #toggle-light:hover {
-            display: inline-block;
-            transform: translate(1px, 1px);
-            filter: brightness(125%);
-        }
-    </style>
-    <script type="text/javascript">
-
-const queries = [
-"SELECT COUNT(*) FROM hits;",
-"SELECT COUNT(*) FROM hits WHERE AdvEngineID <> 0;",
-"SELECT SUM(AdvEngineID), COUNT(*), AVG(ResolutionWidth) FROM hits;",
-"SELECT AVG(UserID) FROM hits;",
-"SELECT COUNT(DISTINCT UserID) FROM hits;",
-"SELECT COUNT(DISTINCT SearchPhrase) FROM hits;",
-"SELECT MIN(EventDate), MAX(EventDate) FROM hits;",
-"SELECT AdvEngineID, COUNT(*) FROM hits WHERE AdvEngineID <> 0 GROUP BY AdvEngineID ORDER BY COUNT(*) DESC;",
-"SELECT RegionID, COUNT(DISTINCT UserID) AS u FROM hits GROUP BY RegionID ORDER BY u DESC LIMIT 10;",
-"SELECT RegionID, SUM(AdvEngineID), COUNT(*) AS c, AVG(ResolutionWidth), COUNT(DISTINCT UserID) FROM hits GROUP BY RegionID ORDER BY c DESC LIMIT 10;",
-"SELECT MobilePhoneModel, COUNT(DISTINCT UserID) AS u FROM hits WHERE MobilePhoneModel <> '' GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10;",
-"SELECT MobilePhone, MobilePhoneModel, COUNT(DISTINCT UserID) AS u FROM hits WHERE MobilePhoneModel <> '' GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10;",
-"SELECT SearchPhrase, COUNT(*) AS c FROM hits WHERE SearchPhrase <> '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;",
-"SELECT SearchPhrase, COUNT(DISTINCT UserID) AS u FROM hits WHERE SearchPhrase <> '' GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10;",
-"SELECT SearchEngineID, SearchPhrase, COUNT(*) AS c FROM hits WHERE SearchPhrase <> '' GROUP BY SearchEngineID, SearchPhrase ORDER BY c DESC LIMIT 10;",
-"SELECT UserID, COUNT(*) FROM hits GROUP BY UserID ORDER BY COUNT(*) DESC LIMIT 10;",
-"SELECT UserID, SearchPhrase, COUNT(*) FROM hits GROUP BY UserID, SearchPhrase ORDER BY COUNT(*) DESC LIMIT 10;",
-"SELECT UserID, SearchPhrase, COUNT(*) FROM hits GROUP BY UserID, SearchPhrase LIMIT 10;",
-"SELECT UserID, extract(minute FROM EventTime) AS m, SearchPhrase, COUNT(*) FROM hits GROUP BY UserID, m, SearchPhrase ORDER BY COUNT(*) DESC LIMIT 10;",
-"SELECT UserID FROM hits WHERE UserID = 435090932899640449;",
-"SELECT COUNT(*) FROM hits WHERE URL LIKE '%google%';",
-"SELECT SearchPhrase, MIN(URL), COUNT(*) AS c FROM hits WHERE URL LIKE '%google%' AND SearchPhrase <> '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;",
-"SELECT SearchPhrase, MIN(URL), MIN(Title), COUNT(*) AS c, COUNT(DISTINCT UserID) FROM hits WHERE Title LIKE '%Google%' AND URL NOT LIKE '%.google.%' AND SearchPhrase <> '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;",
-"SELECT * FROM hits WHERE URL LIKE '%google%' ORDER BY EventTime LIMIT 10;",
-"SELECT SearchPhrase FROM hits WHERE SearchPhrase <> '' ORDER BY EventTime LIMIT 10;",
-"SELECT SearchPhrase FROM hits WHERE SearchPhrase <> '' ORDER BY SearchPhrase LIMIT 10;",
-"SELECT SearchPhrase FROM hits WHERE SearchPhrase <> '' ORDER BY EventTime, SearchPhrase LIMIT 10;",
-"SELECT CounterID, AVG(length(URL)) AS l, COUNT(*) AS c FROM hits WHERE URL <> '' GROUP BY CounterID HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;",
-"SELECT REGEXP_REPLACE(Referer, '^https?://(?:www\\.)?([^/]+)/.*$', '\\1') AS k, AVG(length(Referer)) AS l, COUNT(*) AS c, MIN(Referer) FROM hits WHERE Referer <> '' GROUP BY k HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;",
-"SELECT SUM(ResolutionWidth), SUM(ResolutionWidth + 1), SUM(ResolutionWidth + 2), SUM(ResolutionWidth + 3), ..., SUM(ResolutionWidth + 89) FROM hits;",
-"SELECT SearchEngineID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits WHERE SearchPhrase <> '' GROUP BY SearchEngineID, ClientIP ORDER BY c DESC LIMIT 10;",
-"SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits WHERE SearchPhrase <> '' GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;",
-"SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;",
-"SELECT URL, COUNT(*) AS c FROM hits GROUP BY URL ORDER BY c DESC LIMIT 10;",
-"SELECT 1, URL, COUNT(*) AS c FROM hits GROUP BY 1, URL ORDER BY c DESC LIMIT 10;",
-"SELECT ClientIP, ClientIP - 1, ClientIP - 2, ClientIP - 3, COUNT(*) AS c FROM hits GROUP BY ClientIP, ClientIP - 1, ClientIP - 2, ClientIP - 3 ORDER BY c DESC LIMIT 10;",
-"SELECT URL, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND DontCountHits = 0 AND IsRefresh = 0 AND URL <> '' GROUP BY URL ORDER BY PageViews DESC LIMIT 10;",
-"SELECT Title, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND DontCountHits = 0 AND IsRefresh = 0 AND Title <> '' GROUP BY Title ORDER BY PageViews DESC LIMIT 10;",
-"SELECT URL, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND IsRefresh = 0 AND IsLink <> 0 AND IsDownload = 0 GROUP BY URL ORDER BY PageViews DESC LIMIT 10 OFFSET 1000;",
-"SELECT TraficSourceID, SearchEngineID, AdvEngineID, CASE WHEN (SearchEngineID = 0 AND AdvEngineID = 0) THEN Referer ELSE '' END AS Src, URL AS Dst, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND IsRefresh = 0 GROUP BY TraficSourceID, SearchEngineID, AdvEngineID, Src, Dst ORDER BY PageViews DESC LIMIT 10 OFFSET 1000;",
-"SELECT URLHash, EventDate, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND IsRefresh = 0 AND TraficSourceID IN (-1, 6) AND RefererHash = 3594120000172545465 GROUP BY URLHash, EventDate ORDER BY PageViews DESC LIMIT 10 OFFSET 100;",
-"SELECT WindowClientWidth, WindowClientHeight, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND IsRefresh = 0 AND DontCountHits = 0 AND URLHash = 2868770270353813622 GROUP BY WindowClientWidth, WindowClientHeight ORDER BY PageViews DESC LIMIT 10 OFFSET 10000;",
-"SELECT DATE_TRUNC('minute', EventTime) AS M, COUNT(*) AS PageViews FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-14' AND EventDate <= '2013-07-15' AND IsRefresh = 0 AND DontCountHits = 0 GROUP BY DATE_TRUNC('minute', EventTime) ORDER BY DATE_TRUNC('minute', EventTime) LIMIT 10 OFFSET 1000;",
-];
-
-const data = [
-{"system":"Athena (partitioned)","date":"2022-07-01","machine":"serverless","cluster_size":"serverless","comment":"","tags":["stateless","managed","Java","column-oriented"],"load_time":0,"data_size":13800000000,"result":[[2.777,3.275,2.925],[1.503,3.136,4.003],[4.544,3.833,3.64],[3.9,2.514,3.522],[3.46,2.186,3.244],[3.624,2.742,3.185],[2.21,1.984,3.123],[3.207,2.403,2.685],[2.936,2.014,3.869],[8.333,7.102,4.434],[7.401,4.697,3.155],[4.214,3.065,4.748],[6.207,4.213,2.576],[3.428,3.085,3.401],[2.92,3.3,3.278],[2.205,2.558,2.419],[4.641,3.888,2.155],[3.219,2.822,3.292],[3.23,3.579,4.31],[2.288,3.543,3.95],[3.032,2.859,2.807],[3.926,3.247,2.928],[4.477,4.048,4.392],[7.407,6.375,6.123],[2.611,2.872,2.827],[2.566,2.567,3.6],[3.673,3.733,2.925],[2.426,3.218,2.78],[5.125,3.778,4.25],[4.565,4.03,4.066],[3.628,3.219,2.953],[6.207,5.973,3.158],[4.339,5.601,4.234],[2.618,3.107,3.433],[4.661,2.79,2.846],[2.373,1.629,2.734],[2.721,2.15,1.962],[3.207,2.154,2.186],[2.453,2.477,3.217],[2.691,4.732,3.584],[2.589,2.613,3.231],[1.926,3.617,1.82],[1.506,2.404,2.343]],"source":"athena/results/partitioned.json"}
-,{"system":"Athena (single)","date":"2022-07-01","machine":"serverless","cluster_size":"serverless","comment":"","tags":["stateless","managed","Java","column-oriented"],"load_time":0,"data_size":13800000000,"result":[[2.268,1.327,2.137],[3.427,2.248,3.605],[3.254,2.548,2.316],[3.025,2.314,3.003],[2.264,2.876,4.213],[3.044,2.745,2.698],[2.732,2.199,2.659],[2.022,3.692,3.072],[2.746,2.477,2.785],[3.53,2.782,4.031],[2.709,2.047,2.853],[2.318,1.969,3.4],[2.635,1.935,2.707],[3.049,3.38,3.071],[3.661,2.387,2.476],[2.479,2.591,2.21],[3.093,3.698,4.351],[3.479,3.236,2.274],[4.36,2.97,3.457],[2.525,2.384,3.328],[3.34,3.174,3.409],[3.163,2.971,3.034],[2.999,3.539,2.906],[6.454,7.597,7.858],[2.754,1.951,2.645],[2.852,3.018,2.718],[2.513,2.678,2.417],[3.293,2.521,2.771],[4.392,3.863,3.981],[3.658,4.246,4.027],[3.028,3.87,2.337],[2.923,3.635,3.591],[3.142,4.105,3.15],[3.66,3.187,4.745],[2.652,2.695,2.742],[2.262,2.776,1.815],[1.881,2.212,2.053],[1.934,2.551,1.524],[2.069,2.26,1.805],[2.626,2.902,2.793],[1.791,2.082,2.481],[3.757,2.6,1.946],[2.608,1.994,3.967]],"source":"athena/results/single.json"}
-,{"system":"Aurora for MySQL","date":"2022-07-01","machine":"16acu","cluster_size":1,"comment":"Some queries cannot run due to ERROR 1114 (HY000) at line 1: The table '/rdsdbdata/tmp/#sqlaff_e5_0' is full","tags":["managed","C++","MySQL compatible","row-oriented"],"load_time":7687.318,"data_size":89614492631,"result":[[740.42,739.91,746.65],[828.2,835.67,832.87],[830.08,830.98,832.38],[829.88,832.83,830.87],[845.99,842.4,843.21],[869.51,870.69,869.75],[823.77,829.08,825.54],[827.74,832.87,829.25],[916.26,909.46,929.17],[946.49,939.27,932.32],[852.37,857.69,854.74],[857.99,864.05,825.14],[null,null,null],[863.37,860.2,865.62],[null,null,null],[891.84,895.28,893.68],[null,null,null],[null,null,null],[1420.12,1419.34,1445.08],[28.94,0.21,0.21],[917.64,917.56,916.92],[923.47,921.7,923.82],[919.95,918.37,920.17],[1002.19,1002.07,1001.2],[902.23,902.65,901.8],[901.17,900.02,898.3],[900.04,898.89,903.35],[901.78,902.71,901.28],[null,null,null],[1153.29,1154,1156.46],[862.57,863.35,859.69],[923.14,921.1,923.92],[1370.78,1401.72,1401.44],[1454.67,1455.55,1458.79],[1463.31,1466.75,1461.83],[941.03,944.07,937.23],[7.42,2.8,2.77],[2.57,2.52,2.59],[1.5,1.52,1.59],[3.62,3.57,3.61],[0.95,0.94,0.94],[0.9,0.92,0.91],[1.69,1.72,1.69]],"source":"aurora-mysql/results/16acu.json"}
-,{"system":"Aurora for PostgreSQL","date":"2022-07-01","machine":"16acu","cluster_size":1,"comment":"","tags":["managed","C","PostgreSQL compatible","row-oriented"],"load_time":2127,"data_size":52183852646,"result":[[12.8361,5.71812,5.8241],[61.2565,62.1402,63.7173],[68.0578,68.1218,67.609],[7.83207,5.90193,6.0461],[48.7194,48.0233,48.2198],[289.492,304.639,282.436],[6.30572,6.31857,6.21598],[53.644,53.8931,53.5307],[131.526,131.45,131.102],[137.724,136.921,137.758],[57.2079,56.2775,56.2152],[56.5349,56.2048,55.9569],[82.3897,82.8866,83.534],[97.0569,97.1392,96.4731],[85.6557,86.7783,86.2804],[49.4325,42.4309,42.5743],[111.537,114.59,111.807],[88.4322,89.3756,87.7899],[160.781,163.866,161.394],[1025.04,2.10165,2.10065],[106.741,56.2731,56.1535],[59.2681,59.5272,59.536],[58.6083,57.6054,57.3935],[54.8271,55.1397,56.3487],[54.718,52.469,53.271],[53.5387,53.1926,52.4008],[52.0042,51.9581,52.2453],[60.1317,59.9695,59.2187],[244.608,242.954,243.815],[91.8674,92.4165,91.5884],[63.7122,64.277,64.2783],[69.2596,68.9535,69.4508],[234.222,241.138,240.316],[488.169,462.257,460.466],[472.929,471.809,476.635],[103.664,116.131,103.467],[16.8124,3.34058,3.37782],[0.852414,0.832073,0.859857],[0.305464,0.31166,0.306694],[4.55625,4.54098,4.58501],[0.299746,0.297532,0.30334],[0.275732,0.279817,0.27766],[0.332107,0.324387,0.320099]],"source":"aurora-postgresql/results/16acu.json"}
-,{"system":"Citus","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","PostgreSQL compatible","column-oriented"],"load_time":1579,"data_size":18980918899,"result":[[7.58503,6.70447,6.52499],[6.33941,5.06063,5.00238],[11.7488,9.86417,9.93223],[12.6306,9.36305,9.17061],[40.6101,39.0803,38.1187],[117.654,113.912,113.441],[10.3404,8.08936,7.70732],[6.31542,4.72821,4.72989],[82.5425,77.2124,76.9219],[91.1776,83.4492,82.4727],[14.5474,10.0815,10.3873],[15.4899,11.2922,11.1877],[19.9794,15.5002,17.4492],[76.9216,72.5172,72.7915],[21.5446,17.5691,18.561],[56.9438,54.6387,53.5745],[75.0977,69.7842,70.0259],[31.3299,27.0267,26.3216],[129.417,122.956,121.182],[3.73386,2.14148,2.12737],[34.6021,27.9727,28.6878],[37.152,29.6193,29.2966],[52.2157,37.8589,37.6994],[181.955,149.08,148.471],[15.4687,11.3138,10.3856],[10.2779,8.46868,8.8324],[14.4687,10.4076,11.4263],[47.009,40.2969,39.6888],[749.946,742.979,744.461],[69.4383,67.5636,67.2128],[27.0317,21.4008,20.9524],[36.6675,25.6347,26.4408],[140.424,130.546,129.738],[106.959,92.033,90.1609],[110.98,94.4787,96.2656],[64.4474,60.1853,60.6816],[6.17549,6.25376,5.87004],[1.99153,1.81776,1.80596],[1.00141,0.800271,0.801975],[7.91778,7.70928,8.33299],[0.929845,0.642076,0.638478],[0.866536,0.683567,0.680218],[0.937823,0.784747,0.765929]],"source":"citus/results/c6a.4xlarge.json"}
-,{"system":"clickhouse-local (partitioned)","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","column-oriented","embedded","stateless","ClickHouse derivative"],"load_time":0,"data_size":14737666736,"result":[[0.85,0.102,0.114],[1.342,0.09,0.099],[2.547,0.179,0.189],[1.681,0.245,0.252],[2.704,1.68,1.648],[2.194,1.46,1.489],[0.832,0.113,0.102],[1.371,0.106,0.101],[2.24,0.79,0.825],[4.548,1.021,1.026],[3.094,0.552,0.552],[3.088,0.623,0.63],[2.017,1.17,1.165],[4.319,1.677,1.708],[2.157,1.496,1.5],[1.629,1.138,1.139],[5.026,3.267,3.241],[4.142,2.303,2.319],[8.295,5.569,5.629],[1.331,0.255,0.252],[10.712,3.668,3.786],[13.053,4.185,4.202],[24.17,7.935,8.008],[55.965,23.933,23.071],[4.417,0.947,0.974],[1.793,0.698,0.69],[4.376,0.955,0.956],[11.731,4.385,4.321],[11.403,8.549,8.288],[2.764,2.754,2.735],[5.096,1.262,1.273],[9.515,1.682,1.688],[10.325,6.745,6.608],[11.686,6.261,6.242],[11.769,6.301,6.364],[1.675,1.49,1.495],[14.937,3.631,3.604],[14.187,3.609,3.631],[14.842,3.769,3.741],[22.222,6.355,6.263],[7.212,0.836,0.838],[7.863,0.716,0.718],[5.12,0.587,0.574]],"source":"clickhouse-local/results/c6a.4xlarge.partitioned.json"}
-,{"system":"clickhouse-local (single)","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","column-oriented","embedded","stateless","ClickHouse derivative"],"load_time":0,"data_size":14779976446,"result":[[1.176,0.251,0.249],[1.037,0.134,0.111],[1.609,0.403,0.369],[1.616,0.372,0.37],[3.008,2.338,2.266],[9.061,7.537,7.535],[1.206,0.191,0.187],[0.882,0.144,0.135],[4.61,3.406,3.256],[6.712,4.479,4.469],[4.081,2.413,2.394],[3.894,2.719,2.691],[7.651,6.436,6.243],[10.765,8.043,7.894],[9.86,8.945,8.235],[7.159,5.815,5.814],[20.916,18.159,18.013],[20.952,17.862,17.85],[37.585,32.649,32.487],[1.767,0.401,0.393],[23.713,15.687,15.755],[28.7,19.241,19.198],[50.74,33.161,33.011],[152.485,117.417,118.178],[7.606,4.491,5.326],[4.331,4.214,3.587],[6.743,4.486,5.357],[22.91,15.043,15.183],[43.342,37.167,36.842],[11.807,4.49,4.546],[9.557,6.349,6.263],[13.964,8.493,8.464],[38.11,33.642,33.996],[41.266,35.08,27.073],[34.056,26.814,26.902],[8.855,7.548,7.475],[22.596,12.615,12.669],[23.217,13.956,13.831],[22.528,21.601,13.207],[37.89,23.115,22.955],[6.49,1.548,1.522],[6.413,1.474,1.416],[3.796,1.339,1.316]],"source":"clickhouse-local/results/c6a.4xlarge.single.json"}
-,{"system":"ClickHouse","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","column-oriented","ClickHouse derivative"],"load_time":475.529,"data_size":14345515782,"result":[[0.027,0.001,0.001],[0.035,0.015,0.021],[0.083,0.034,0.033],[0.171,0.044,0.045],[1.552,1.495,1.574],[1.27,1.075,1.063],[0.045,0.026,0.025],[0.032,0.016,0.015],[0.717,0.615,0.607],[0.843,0.821,0.747],[0.293,0.219,0.216],[0.312,0.226,0.235],[0.804,0.694,0.702],[1.476,1.047,1.029],[1.013,0.898,0.911],[1.043,0.964,1.453],[3.632,2.715,2.711],[1.867,1.75,1.714],[5.187,4.797,4.953],[0.112,0.068,0.041],[8.637,1.761,1.212],[9.902,0.902,0.869],[18.831,2.067,1.829],[41.903,4.476,3.486],[1.801,0.254,0.238],[0.627,0.214,0.207],[2.181,0.241,0.246],[8.868,0.748,0.733],[9.674,6.891,5.77],[2.62,2.355,2.368],[1.395,0.533,0.525],[4.454,0.73,0.712],[5.453,4.99,5.922],[9.955,3.968,4.096],[9.987,4.035,4.476],[1.695,1.236,1.241],[0.142,0.079,0.103],[0.066,0.033,0.04],[0.065,0.03,0.033],[0.246,0.207,0.192],[0.044,0.019,0.02],[0.03,0.023,0.012],[0.03,0.018,0.013]],"source":"clickhouse/results/c6a.4xlarge.json"}
-,{"system":"ClickHouse (zstd)","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","column-oriented","ClickHouse derivative"],"load_time":417.533,"data_size":9997826232,"result":[[0.004,0.002,0.001],[0.069,0.017,0.016],[0.073,0.051,0.048],[0.158,0.067,0.066],[1.603,1.545,1.709],[1.225,1.105,1.1],[0.033,0.026,0.024],[0.023,0.021,0.02],[0.71,0.621,0.614],[0.813,0.715,0.713],[0.292,0.231,0.245],[0.35,0.269,0.271],[0.785,0.692,0.704],[1.209,1.044,1.066],[1.034,0.908,0.897],[0.993,0.94,0.909],[2.818,2.595,2.611],[1.804,1.717,1.711],[4.846,4.692,4.714],[0.081,0.025,0.02],[5.511,1.388,1.385],[6.304,1.306,1.293],[11.938,2.406,2.4],[30.031,4.268,4.242],[0.964,0.337,0.335],[0.326,0.264,0.26],[0.997,0.338,0.338],[5.523,1.148,1.14],[7.319,5.744,5.796],[2.235,2.236,2.199],[0.86,0.66,0.664],[3.695,0.772,0.764],[5.044,4.82,4.821],[6.786,4.133,4.093],[6.769,4.11,4.17],[1.289,1.188,1.221],[0.093,0.069,0.075],[0.037,0.033,0.029],[0.047,0.033,0.03],[0.185,0.151,0.155],[0.027,0.021,0.017],[0.02,0.012,0.015],[0.017,0.013,0.013]],"source":"clickhouse/results/c6a.4xlarge.zstd.json"}
-,{"system":"ClickHouse","date":"2022-07-01","machine":"c6a.metal, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","column-oriented","ClickHouse derivative"],"load_time":136.869,"data_size":14571706777,"result":[[0.011,0.001,0.001],[0.04,0.015,0.013],[0.045,0.021,0.023],[0.09,0.023,0.023],[1.922,1.565,1.576],[0.961,0.737,0.739],[0.04,0.023,0.018],[0.032,0.028,0.028],[0.321,0.287,0.275],[0.632,0.284,0.287],[0.166,0.124,0.118],[0.235,0.1,0.102],[1.006,0.182,0.159],[1.637,0.216,0.213],[0.871,0.174,0.177],[0.258,0.148,0.148],[1.804,0.37,0.358],[1.235,0.275,0.278],[3.143,0.854,0.815],[0.071,0.024,0.016],[8.816,0.215,0.155],[10.239,0.203,0.173],[19.179,0.388,0.357],[43.152,0.824,0.823],[1.821,0.059,0.052],[0.992,0.045,0.051],[2.539,0.063,0.058],[9.258,0.3,0.278],[7.923,0.961,0.936],[0.445,0.431,0.428],[1.367,0.131,0.113],[4.819,0.205,0.175],[3.808,0.739,0.726],[8.935,0.607,0.6],[8.988,0.634,0.615],[0.242,0.22,0.226],[0.075,0.058,0.056],[0.038,0.028,0.026],[0.043,0.028,0.021],[0.172,0.127,0.119],[0.028,0.018,0.017],[0.027,0.019,0.014],[0.018,0.026,0.015]],"source":"clickhouse/results/c6a.metal.json"}
-,{"system":"CrateDB","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"For some queries it gives \"Data too large\".","tags":["Java","column-oriented"],"load_time":10687,"data_size":109636633416,"result":[[0.008162,0.005118,0.002553],[0.350014,0.39977,0.133775],[2.58426,2.47192,2.59779],[2.12939,0.532981,0.507246],[null,null,null],[null,null,null],[1.18488,1.06603,1.07219],[0.209264,0.073284,0.067912],[null,null,null],[null,null,null],[1.68892,1.2866,1.47428],[1.62976,1.43073,1.26904],[12.7517,13.0334,13.2685],[18.8587,null,18.6951],[11.2982,11.2108,11.577],[20.2964,20.4035,19.1076],[null,null,null],[null,null,null],[null,null,null],[0.202044,0.010009,0.005566],[9.22964,4.54606,0.774149],[1.41673,1.09885,0.789775],[12.3933,8.06911,1.69671],[1.45018,0.969528,0.979718],[0.357589,0.14887,0.153326],[0.189282,0.133963,0.130279],[0.153222,0.140756,0.139861],[27.5195,19.6862,20.1825],[72.7575,68.2,67.1238],[144.533,146.579,152.144],[8.76866,9.00563,8.46917],[17.6652,16.6755,16.0558],[null,null,null],[null,null,null],[null,null,null],[42.2967,44.9621,44.4386],[0.786911,0.4904,0.508416],[0.602075,0.226261,0.182399],[0.131407,0.058958,0.054518],[0.954736,1.1361,1.14233],[0.23764,0.139109,0.134472],[0.110253,0.057695,0.056073],[0.124285,0.150479,0.066226]],"source":"cratedb/results/c6a.4xlarge.json"}
-,{"system":"Databend","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Only 90% of data successfully loaded.","tags":["Rust","column-oriented","ClickHouse derivative"],"load_time":484,"data_size":43016643271,"result":[[0.010087,0.002961,0.003271],[0.127964,0.080012,0.075741],[0.162388,0.143967,0.144762],[0.252904,0.217471,0.217369],[34.281026,34.844158,34.526942],[25.290307,25.793068,25.620563],[0.112484,0.093867,0.090891],[0.086604,0.07796,0.076448],[20.723203,20.7483,20.354869],[20.81994,20.72446,20.696573],[1.964378,1.93559,1.893824],[1.846866,1.789111,1.763664],[4.468158,4.407959,4.438036],[19.947276,19.8859,19.853514],[5.478573,5.474461,5.460604],[5.509521,5.513413,5.363123],[15.430359,15.5406,15.461211],[14.905998,15.029721,15.019642],[31.069663,30.811763,30.737336],[0.281067,0.220021,0.217741],[8.89374,4.12692,4.131689],[10.38448,4.603694,4.571757],[19.980572,8.836322,8.892694],[59.786474,52.452881,39.941988],[2.804019,0.994794,0.958224],[0.765299,0.730434,0.723964],[2.784648,0.94665,0.936684],[8.905027,5.418438,5.386109],[12.187652,12.230066,12.164123],[3.35748,3.395991,3.319434],[4.309389,3.854977,3.772506],[9.958201,7.027432,6.888253],[50.200569,50.535126,50.283066],[24.469412,21.222713,21.010188],[26.115852,23.93507,24.835342],[7.511517,7.296179,7.324549],[2.156784,1.298258,1.278441],[2.155447,1.314499,1.331237],[2.007053,1.181676,1.155612],[null,null,null],[0.485363,0.420291,0.416819],[0.372131,0.322068,0.323578],[null,null,null]],"source":"databend/results/c6a.4xlarge.json"}
-,{"system":"Druid","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Druid is killed and restarted after every query. Otherwise some queries make Druid degraded and results are incorrect. For example after Q13 even SELECT 1 works for 7 seconds","tags":["Java","column-oriented"],"load_time":19620,"data_size":45188608472,"result":[[0.032365,0.016716,0.016921],[0.400766,0.275591,0.271057],[0.38235,0.152084,0.151652],[1.379492,0.137201,0.128902],[3.278731,2.527105,2.515128],[8.576382,6.54654,6.503001],[null,null,null],[0.563852,0.273795,0.275086],[11.509993,10.636571,10.597993],[13.357647,12.42121,12.337247],[1.636875,0.8213,0.900056],[1.692544,0.512066,0.440511],[2.453274,1.769806,1.807207],[8.503408,7.261406,7.334872],[61.056041,59.251083,59.500549],[8.62067,8.236657,8.22538],[164.840762,null,null],[24.165797,22.308466,null],[null,null,null],[null,null,null],[25.973369,25.597864,25.602509],[null,null,null],[null,null,null],[7.805347,6.629776,6.947366],[0.257845,0.020327,0.016976],[null,null,null],[null,null,null],[32.948154,31.04677,29.221959],[null,null,null],[7.230865,7.033713,6.972421],[20.54625,19.237428,19.258469],[54.065945,52.451318,52.466653],[null,null,null],[17.499267,null,null],[null,null,null],[60.478315,60.05494,60.458946],[1.698088,1.490317,1.461969],[1.409572,0.939003,0.907252],[0.866729,0.329539,0.287435],[null,null,null],[0.932473,0.420781,0.359095],[0.723142,0.3253,0.296865],[0.603483,0.150892,0.140716]],"source":"druid/results/c6a.4xlarge.json"}
-,{"system":"DuckDB","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Many queries triggered OOM","tags":["C","column-oriented","embedded"],"load_time":4217,"data_size":27241492480,"result":[[0.005694353996659629,0.003944558004150167,0.003837226002360694],[0.16991353100456763,0.03919722700084094,0.03835860399703961],[0.44898432699847035,0.04947217500011902,0.04852217998995911],[0.07586832098604646,0.07051395199960098,0.07007493599667214],[9.554053236002801,8.153356187991449,8.73448242500308],[7.66042533799191,6.931124911992811,7.103380946995458],[0.030703739990713075,0.027668555994750932,0.027583695002249442],[0.1778664360026596,0.03942437999648973,0.03882004099432379],[8.53439180701389,8.869582625004114,9.020313234999776],[10.40215514000738,11.125320470004226,8.941559945000336],[1.1747649609897053,1.04221136700653,1.004799570000614],[1.2380354650085792,1.1211603130068397,2.4278587239969056],[3.1751541379926493,0.9360461989999749,0.8868292279948946],[6.855684430003748,7.300301584007684,5.712960822012974],[3.70588762400439,1.0249276379909134,0.9473389159975341],[2.1037107890006155,1.6215517020027619,1.5671920729946578],[null,null,null],[null,null,null],[null,null,null],[0.0002772739971987903,0.00016792300448287278,0.0001574420020915568],[null,null,null],[null,null,null],[null,null,null],[null,null,null],[2.9310110910009826,0.19020285899750888,0.1736805049877148],[2.939304119994631,0.18754731099761557,0.18073286200524308],[2.8706370779982535,0.18822155400994234,0.17905898999015335],[null,null,null],[null,null,null],[0.884408778991201,0.714329167996766,0.7135983259940986],[5.3762675570033025,0.8803737630078103,0.8728962720051641],[7.249190265996731,2.9648747390019707,2.866687831003219],[null,null,null],[null,null,null],[null,null,null],[4.515183198003797,4.030519469000865,4.014251719010645],[0.11604027298744768,0.040539135996368714,0.04280066800129134],[0.0457908230018802,0.021069509006338194,0.019683108999743126],[0.0680370800109813,0.011889394998434,0.01056639499438461],[0.22029169600864407,0.08547276000899728,0.09095505000732373],[0.03759863799496088,0.008373684002435766,0.007633563989656977],[0.025631797994719818,0.008081699008471332,0.007858585988287814],[0.034359957004198804,0.025543516996549442,0.02533275399764534]],"source":"duckdb/results/c6a.4xlarge.json"}
-,{"system":"Greenplum","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","column-oriented","PostgreSQL compatible"],"load_time":1080,"data_size":42000000000,"result":[[2.20009,1.45883,1.13573],[1.28661,1.07897,1.01856],[2.2582,2.42193,2.59693],[1.89371,1.9246,1.73866],[9.54471,9.71956,10.0357],[4.55957,4.10112,4.70458],[1.65167,1.89767,1.97051],[1.02537,0.999323,1.00524],[7.89792,7.75718,8.01219],[11.3779,11.6003,11.2552],[2.11955,2.05003,1.9553],[2.01997,1.97932,1.98284],[2.88666,2.92828,2.96822],[4.06272,4.01771,4.03011],[3.46303,3.24779,3.06475],[8.43717,8.18641,7.99202],[9.02176,8.91572,8.92748],[8.66982,8.39332,8.62497],[15.1321,14.9502,15.2344],[1.00877,0.934589,0.975342],[11.0582,3.25807,3.17687],[12.2634,3.5188,3.93705],[24.1522,4.86328,4.88764],[67.1517,20.4,20.261],[2.5799,1.66114,1.90432],[1.72831,1.89536,1.2515],[2.44154,1.46595,1.88238],[11.1175,6.09551,6.02292],[83.041,82.9784,82.8678],[82.5441,82.5427,83.9836],[3.0962,3.22225,3.19431],[5.77576,4.05973,4.00366],[43.6826,40.4375,40.1076],[18.0978,13.2741,12.8894],[17.3187,13.5411,13.5927],[9.72405,9.90029,10.0177],[0.294344,0.169606,0.173804],[0.162524,0.117489,0.115532],[0.145205,0.098342,0.097275],[0.334809,0.275365,0.265053],[0.154522,0.107654,0.10529],[0.158957,0.117284,0.119068],[0.193756,0.144787,0.145485]],"source":"greenplum/results/c6a.4xlarge.json"}
-,{"system":"HeavyAI","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Previous names: OmniSci, mapD. Many queries cannot run due to errors and limitations.","tags":["C++","column-oriented"],"load_time":572.633,"data_size":50887437386,"result":[[6.525,0.022,0.029],[0.301,0.042,0.04],[0.287,0.095,0.093],[2.572,0.039,0.04],[null,null,null],[null,null,null],[7.327,0.093,0.097],[0.244,0.043,0.038],[null,null,null],[null,null,null],[null,null,null],[null,null,null],[2.939,0.295,0.294],[null,null,null],[null,null,null],[null,null,null],[null,null,null],[4.716,3.91,3.955],[null,null,null],[0.154,0.083,0.106],[14.426,0.07,0.071],[null,null,null],[null,null,null],[null,null,null],[2.276,0.258,0.272],[null,null,null],[null,null,null],[null,null,null],[null,null,null],[1.832,1.64,1.602],[null,null,null],[null,null,null],[null,null,null],[14.811,0.494,0.497],[null,null,null],[null,null,null],[1.941,0.255,0.255],[5.457,0.172,0.283],[0.476,0.269,0.256],[14.239,0.179,0.178],[3.992,0.112,0.112],[1.031,0.116,0.116],[1.365,0.089,0.088]],"source":"heavyai/results/c6a.4xlarge.json"}
-,{"system":"Infobright","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Only 90% of data successfully loaded. Some queries run for days.","tags":["C++","column-oriented","MySQL compatible"],"load_time":2317,"data_size":13760341294,"result":[[0.01,0,0],[2.39,2.4,2.44],[0,0,0],[7.21,6.04,6.91],[16.09,16.86,15.69],[48.8,42.37,48.63],[0,0,0],[3.48,2.42,2.42],[23.56,24.78,22.21],[32.87,31.71,34.48],[14.8,14.83,14.11],[16.7,16.53,17.37],[1752.91,1999.88,1961.4],[1193.43,1167,1220.47],[2184.81,2316.12,2224.14],[32.58,30.69,31.58],[300.17,16221.33,16168.44],[122.4,120.49,124.67],[78927.44,79250.44,78504.89],[3.38,1.22,1.21],[289.73,302.3,285.83],[415.82,389.23,403.28],[573.82,590.81,575.06],[300.13,293.96,285.64],[41.42,37.48,39.64],[75.2,75.37,72.07],[39.22,41.52,40.11],[449.56,445.03,448.68],[null,null,null],[450.87,488.3,453.83],[58.69,59.29,58.07],[84.47,78.92,79.38],[517.97,520.29,504.96],[182468.89,182468.89,182468.89],[182468.89,182468.89,182468.89],[68.43,66.93,67.68],[8.3,3.62,3.61],[1.04,0.62,0.62],[0.22,0.18,0.18],[567.78,566.52,563.02],[0.29,0.14,0.11],[0.17,0.08,0.08],[1.37,1.34,1.32]],"source":"infobright/results/c6a.4xlarge.json"}
-,{"system":"MariaDB ColumnStore","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Previous name: InfiniDB.","tags":["C++","column-oriented","MySQL compatible"],"load_time":2507.8,"data_size":19712857022,"result":[[0.151,0.158,0.148],[0.1,0.101,0.106],[1.221,1.233,1.226],[0.739,0.736,0.741],[2.025,2.046,2.004],[3.725,4.801,3.755],[0.871,0.749,0.736],[0.118,0.108,0.103],[2.108,2.029,2.029],[4.225,4.271,4.288],[1.711,1.402,1.407],[1.526,1.435,1.42],[5.339,4.172,3.61],[4.692,4.729,4.96],[4.013,3.86,3.918],[3.236,2.68,2.629],[null,null,null],[null,null,null],[null,null,null],[0.137,0.109,0.147],[12.331,6.069,8.619],[2.162,2.178,2.192],[16.849,30.463,26.639],[92,90.208,92.814],[3.042,1.763,1.791],[1.779,1.772,1.749],[1.793,1.821,1.888],[13.036,10.747,9.59],[null,null,null],[78.224,79.141,77.806],[2.837,2.654,2.675],[5.833,4.552,3.678],[null,null,null],[null,null,null],[null,null,null],[3.626,3.546,3.709],[1.719,1.787,1.876],[1.345,0.906,0.91],[0.117,0.091,0.093],[1.217,1.133,1.133],[0.114,0.063,0.062],[0.1,0.062,0.061],[null,null,null]],"source":"mariadb-columnstore/results/c6a.4xlarge.json"}
-,{"system":"MonetDB","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","column-oriented"],"load_time":939,"data_size":49696606499,"result":[[0.000218,0.000157,0.000155],[0.101903,0.019908,0.018439],[0.282431,0.035987,0.034938],[2.868,0.029387,0.029207],[4.675,4.515,4.511],[6.584,4.269,4.65],[0.528827,0.063135,0.065742],[0.506863,0.020966,0.021687],[8.343,4.457,4.408],[7.224,6.548,7.576],[0.267003,0.233353,0.230444],[0.347206,0.28358,0.266085],[5.389,3.099,3.074],[7.653,7.759,8.596],[3.276,3.326,3.292],[5.31,3.465,3.578],[9.341,9.143,9.536],[9.584,9.604,9.419],[19.539,19.783,19.611],[0.004509,0.000702,0.000643],[20.801,1.57,1.603],[2.752,0.418221,0.395884],[14.717,0.800894,0.395477],[14.429,1.804,1.869],[1.386,0.159602,0.156426],[0.189736,0.167664,0.168781],[0.164681,0.176666,0.17126],[3.005,3.113,3.882],[null,null,null],[2.751,2.846,2.676],[7.937,2.579,2.447],[5.12,3.492,3.467],[22.862,22.567,23.211],[33.437,18.889,19.043],[18.898,19.583,19.047],[14.774,12.984,13.803],[3.865,0.322143,0.323117],[0.192149,0.177791,0.175984],[0.194173,0.159398,0.165201],[0.680778,0.592252,0.560738],[0.106465,0.10638,0.102692],[0.154871,0.153752,0.155782],[0.11459,0.09639,0.095594]],"source":"monetdb/results/c6a.4xlarge.json"}
-,{"system":"MySQL (MyISAM)","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","row-oriented","MySQL compatible"],"load_time":2512,"data_size":121588958061,"result":[[0,0,0],[283.32,276.83,274.52],[276.93,278.29,283.27],[28.83,23.63,21.55],[46.41,40.81,40.93],[467.04,467.39,469.08],[31.02,25.89,24.2],[277.89,275.3,277.3],[329.34,325.8,325.35],[342.86,338.43,336.95],[282.03,279.87,281.22],[277.74,282.68,282],[335.66,334.83,336.44],[305.24,310.39,307.3],[337.41,338.52,342.94],[308.66,307.34,306.27],[738.38,748.44,740.75],[738.75,734.01,738.25],[867.01,872.92,868.84],[25.65,20.61,18.46],[312.39,313.67,306.66],[301.66,305.12,308.01],[298.12,298.44,312.4],[311.34,309.9,311.85],[281.87,278.5,275],[277.46,277.46,277.46],[280.75,278.04,281.76],[263.9,417.39,406.88],[707.21,711.96,705],[668.1,668.33,665.96],[330.31,333.36,331.94],[506.57,506.18,500.53],[2604.49,2681.96,2703.12],[830.65,832.88,831.14],[831.98,830.46,833.41],[608.49,608.51,613.68],[4.56,4.13,4.16],[3.8,3.8,3.7],[1.65,1.45,1.46],[6.33,5.14,6.15],[1.6,1.41,1.41],[1.56,1.42,1.39],[7.04,1.17,1.13]],"source":"mysql-myisam/results/c6a.4xlarge.json"}
-,{"system":"MySQL","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C++","row-oriented","MySQL compatible"],"load_time":9472,"data_size":171953585825,"result":[[339.77,339.88,339.77],[364.91,371.86,367.55],[366.2,368.91,389.66],[364.39,377.53,571.45],[377.69,390.02,384.86],[569.48,576.51,574.68],[367.4,368.23,370.41],[371.29,384.02,613.22],[478.85,683.22,495.68],[489.9,635.96,662.43],[386.07,396.49,640.15],[389.13,412.55,444.12],[447.97,455.54,448.06],[423.22,845.44,813.6],[452.48,460.07,453.98],[577.54,623.21,586.49],[852.07,856.36,862.66],[838.09,848.92,851.12],[1006.37,1011.16,1023.17],[369.76,375.61,415.28],[412.45,419.9,456.62],[411.65,432.88,482.2],[412.73,420.73,429.5],[551.16,577.62,545.45],[382.89,394.76,386.37],[380.9,391.4,385.05],[385.3,394.67,460.32],[388.95,394.7,387.21],[800.33,807.9,807.11],[706.03,745.27,718.9],[450.9,489.59,530.97],[625.5,651.93,647.32],[2721.13,2792.12,2819.26],[945.9,954.94,957.54],[945.42,953.78,965.16],[684.36,716.29,708.75],[10.01,3.79,3.77],[7.48,3.32,3.27],[5.09,0.98,0.96],[8.7,4.77,4.68],[4.82,0.76,0.74],[4.46,0.77,0.75],[7.04,1.17,1.13]],"source":"mysql/results/c6a.4xlarge.json"}
-,{"system":"Pinot","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"It successfully loaded only 94465149 out of 99997497 records. Some queries returned NullPointerException. The loading process is painful - splitting to 100 pieces required. It does not correctly report errors on data loading, the results may be incorrect.","tags":["Java","column-oriented"],"load_time":2032,"data_size":null,"result":[[0.002,0.001,0.001],[0.186,0.186,0.185],[0.251,0.276,0.258],[0.475,0.281,0.238],[3.907,3.655,3.633],[30.471,14.687,14.93],[null,null,null],[0.135,0.134,0.148],[3.039,2.902,2.938],[3.159,3.212,3.225],[4.217,4.197,4.384],[4.145,4.124,4.121],[2.989,3.145,3.18],[6.402,6.886,6.374],[3.245,3.35,3.129],[5.112,5.027,5.141],[5.509,5.279,5.257],[0.865,0.856,0.829],[null,null,null],[0.017,0.015,0.015],[54.348,19.562,19.128],[null,null,null],[76.596,74.719,14.228],[7.441,5.77,5.87],[0.376,0.327,0.286],[7.689,0.395,1.281],[3.434,0.499,0.5],[27.679,2.378,2.393],[null,null,null],[2.221,2.227,2.167],[4.941,4.639,4.565],[5.641,5.37,5.007],[5.295,5.006,5.357],[5.28,5.21,5.105],[6.231,6.238,6.385],[5.918,5.933,5.934],[0.26,0.202,0.21],[0.364,0.072,0.069],[0.042,0.034,0.035],[1.483,0.686,0.651],[0.113,0.071,0.079],[0.042,0.051,0.037],[null,null,null]],"source":"pinot/results/c6a.4xlarge.json"}
-,{"system":"PostgreSQL","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","row-oriented","PostgreSQL compatible"],"load_time":2342,"data_size":77797067741,"result":[[439.753,309.785,282.017],[317.874,254.238,254.941],[262.883,263.072,263.09],[32.421,5.31,5.06],[57.134,42.648,42.334],[358.423,356.315,358.342],[31.524,5.35,4.994],[263.145,263.193,263.165],[323.659,322.858,321.918],[327.395,326.17,326.231],[265.983,265.681,265.912],[269.984,265.336,265.379],[284.096,284.56,282.234],[277.25,279.455,280.035],[285.66,286.2,283.611],[66.605,32.023,38.282],[312.452,304.431,305.391],[289.209,290.449,287.578],[331.706,327.485,334.428],[24.646,2.543,2.263],[267.561,267.496,267.524],[267.729,267.69,268.184],[263.074,263.12,267.04],[267.602,267.488,267.494],[263.141,263.859,263.137],[262.923,263.102,263.113],[262.885,263.088,263.114],[267.864,269.127,268.204],[303.376,306.925,308.664],[263.221,263.119,263.148],[270.814,270.575,270.294],[278.342,275.925,276.224],[584.599,576.932,591.502],[462.576,446.962,439.779],[429.93,417.696,416.704],[296.875,297.283,295.14],[3.461,0.842,0.794],[2.179,0.564,0.558],[2.258,0.566,0.416],[2.805,1.311,1.317],[2.936,0.82,0.615],[2.197,0.736,0.535],[1.983,0.32,0.312]],"source":"postgresql/results/c6a.4xlarge.json"}
-,{"system":"QuestDB","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Many queries cannot run. It also crashes and hangs.","tags":["Java","time-series"],"load_time":1667.5,"data_size":126680518680,"result":[[0.0155878,0.000283657,0.000328587],[0.586734,0.0486348,0.0485346],[6.41881,5.57954,6.25638],[6.8554,3.11997,3.11813],[47.8723,54.5425,53.1198],[null,null,null],[5.63439,3.70619,3.92043],[0.699764,0.130462,0.126272],[55.7179,62.8433,62.0045],[null,59.6416,64.7753],[63.7134,null,39.8928],[46.759,46.8544,null],[16.7181,10.9064,10.0735],[79.9885,null,52.5617],[16.1015,12.1835,13.1469],[17.0225,11.7342,10.6194],[24.1167,15.6749,16.8193],[23.0848,15.3149,17.375],[42.0965,26.2421,25.7593],[0.0356335,0.027459,0.0289404],[70.7679,71.5825,71.4573],[null,null,null],[null,null,null],[77.0625,13.2257,12.7578],[11.0775,2.90421,2.33398],[3.31611,3.38837,3.35419],[3.13233,5.2785,3.07075],[null,null,null],[null,null,null],[186.032,185.627,180.963],[26.7279,16.4799,18.8758],[63.8785,32.1097,32.1561],[64.4635,31.4538,35.654],[118.897,null,119.015],[null,null,null],[19.6853,17.4427,16.7998],[1.50985,0.877967,0.885536],[0.805639,0.577352,0.534731],[0.509284,0.448942,0.467679],[1.37609,0.966942,0.912858],[0.567887,0.394619,0.438952],[0.508977,0.441015,0.40528],[null,null,null]],"source":"questdb/results/c6a.4xlarge.json"}
-,{"system":"Redshift","date":"2022-07-01","machine":"ra3.xplus","cluster_size":4,"comment":"One query did not run due to overflow check and another due to missing regexp function.","tags":["managed","column-oriented"],"load_time":2136,"data_size":30794579968,"result":[[0.081437,0.022376,0.022491],[2.54868,0.024112,0.024072],[2.62053,0.049948,0.049768],[null,null,null],[0.62714,0.447655,0.43262],[1.14153,1.09479,1.09441],[0.153399,0.053941,0.048224],[3.76153,0.032235,0.030949],[4.43439,0.746808,0.723719],[6.13424,2.20458,2.20031],[4.35338,0.220122,0.228684],[5.15139,0.231856,0.230993],[5.00006,1.10841,1.12871],[5.80125,1.86531,1.90209],[5.16246,1.21239,1.14848],[0.579428,0.535859,0.546178],[6.05764,2.17455,2.18286],[5.86612,2.52634,2.48672],[7.80075,3.35512,3.41153],[2.54112,0.036378,0.035944],[6.47189,2.26909,2.2673],[6.95344,2.61929,2.65637],[12.9508,6.85457,6.99],[25.3022,11.8857,11.8493],[4.37592,0.452737,0.452867],[4.17199,0.469457,0.476302],[6.24746,0.470935,0.482502],[6.00065,2.08332,2.08059],[null,null,null],[22.2567,18.5376,18.3441],[5.37492,0.868068,0.849486],[7.29067,1.06155,1.11209],[7.7832,4.07132,4.00384],[8.95385,5.15488,5.21863],[9.2232,5.32052,5.73207],[4.99205,0.664347,0.618918],[6.82279,1.89738,1.89398],[7.09077,2.19008,2.26612],[5.29731,0.19626,0.204603],[6.07138,0.276315,0.267161],[4.03108,0.054134,0.058568],[4.35647,0.061157,0.053367],[5.23605,0.037217,0.036335]],"source":"redshift/results/4x.ra3.xplus.json"}
-,{"system":"Redshift","date":"2022-07-01","machine":"serverless","cluster_size":"serverless","comment":"One query did not run due to overflow check and another due to missing regexp function.","tags":["managed","column-oriented"],"load_time":1933,"data_size":30300000000,"result":[[0.436955,0.390225,0.387823],[2.74529,0.280571,0.198074],[7.24569,0.295612,0.386568],[null,null,null],[3.98825,0.488446,0.325645],[4.24601,0.538891,0.690124],[7.25492,0.288505,0.207515],[5.99594,0.212732,0.281278],[6.17534,0.681868,0.586073],[6.37779,1.37865,1.31614],[6.41405,0.549735,0.421345],[6.64688,0.445678,0.477323],[4.2294,0.361772,0.520471],[4.73701,0.788258,0.743465],[4.49038,0.670446,0.52727],[6.19886,0.663381,0.583588],[5.9867,0.679607,0.672772],[2.76661,0.567555,0.51494],[6.20219,0.816422,0.760568],[2.51526,0.053,0.025066],[2.96003,0.282737,0.226979],[6.79648,0.57495,0.400798],[6.37854,0.92746,1.05793],[25.8462,0.902664,0.905365],[5.00521,0.247895,0.308836],[6.38373,0.308781,0.244082],[4.25427,0.229966,0.247201],[5.98382,0.398218,0.455249],[null,null,null],[6.52367,1.35877,1.30562],[7.36935,0.536226,0.582304],[7.05948,0.621982,0.639653],[4.62901,0.954522,0.908651],[4.95273,1.03062,1.10289],[4.71404,1.06378,1.04157],[4.8201,0.499996,0.575546],[5.32757,0.566517,0.562058],[5.37681,0.626458,0.658628],[5.23137,0.470622,0.540079],[6.09326,0.561312,0.574978],[4.86561,0.595546,0.534209],[4.34256,0.433804,0.414541],[4.19814,0.288269,0.415328]],"source":"redshift-serverless/results/serverless.json"}
-,{"system":"SingleStore","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"Previous name: MemSQL. Some queries did not run due to memory limits","tags":["MySQL compatible","column-oriented"],"load_time":690,"data_size":29836263469,"result":[[0.09,0,0],[0.23,0.04,0.01],[0.47,0.15,0.15],[0.63,0.09,0.08],[1.65,1.23,1.2],[7.96,2.79,2.63],[0.1,0,0],[0.17,0.02,0.02],[1.9,1.4,1.39],[4.79,3.52,3.48],[0.94,0.22,0.23],[0.89,0.24,0.23],[5.82,2.26,2.25],[6.97,4.62,4.66],[3.05,2.28,2.31],[3.92,2.7,2.28],[5.83,4.48,4.42],[4.76,4.13,4.12],[14.03,null,null],[0.57,0.05,0.04],[18.18,1.74,1.94],[20.85,2.17,0.98],[31.98,3.12,1.22],[78.96,3.35,108.85],[2.82,0.39,0.32],[1.83,0.44,0.35],[2.81,0.33,0.32],[18.33,2.57,1.15],[null,null,null],[3.56,2.4,2.4],[3.83,1.11,1.11],[7.35,1.73,1.7],[null,null,null],[null,null,null],[null,null,null],[2.53,1.92,1.84],[0.92,0.23,0.19],[0.84,0.15,0.08],[0.7,0.05,0.05],[3.12,0.38,0.36],[0.29,0.03,0.03],[0.22,0.06,0.02],[0.27,0.11,0.12]],"source":"singlestore/results/c6a.4xlarge.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"2XL","cluster_size":32,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.177,0.052,0.09],[0.903,0.324,0.782],[0.458,2.909,0.275],[0.881,0.316,0.166],[0.404,0.257,0.256],[0.481,0.325,0.339],[0.056,0.062,0.06],[0.183,0.324,0.28],[0.444,0.314,0.32],[0.408,0.426,0.417],[0.345,0.241,0.253],[0.406,0.245,0.235],[0.521,1.259,0.326],[0.466,0.493,0.526],[0.447,0.349,0.362],[0.327,0.322,0.302],[0.462,0.508,0.461],[0.489,0.481,0.455],[0.731,0.659,0.674],[0.151,0.156,0.16],[0.832,0.339,0.312],[0.289,0.292,0.34],[0.591,0.484,0.419],[2.661,0.716,0.696],[0.19,0.199,0.377],[0.181,0.182,0.194],[0.22,0.209,0.195],[0.368,0.33,0.347],[0.677,0.645,0.646],[0.877,0.886,0.871],[0.415,0.282,0.301],[1.265,0.404,0.55],[0.786,0.75,0.757],[0.905,0.835,0.841],[0.864,0.865,0.823],[0.352,0.36,0.364],[0.201,0.186,0.2],[0.143,0.137,0.276],[0.29,0.132,0.146],[0.31,0.301,0.304],[0.212,0.197,0.17],[0.223,0.174,0.177],[0.172,0.172,0.172]],"source":"snowflake/results/2xl.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"3XL","cluster_size":64,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.165,0.061,0.049],[1.356,1.252,1.502],[1.287,0.47,0.325],[0.627,0.331,0.181],[0.265,0.265,0.483],[0.887,0.45,0.298],[0.054,0.066,0.062],[0.182,0.222,0.194],[0.408,0.438,0.319],[0.434,0.462,0.411],[1.357,0.247,0.412],[0.343,0.25,0.517],[0.273,0.289,0.6],[0.404,0.405,0.392],[0.379,0.304,0.455],[0.275,0.271,0.264],[0.418,0.386,0.388],[0.417,0.434,0.567],[0.753,0.759,0.506],[0.291,0.307,0.4],[0.954,0.423,0.28],[0.568,0.562,0.248],[0.568,0.477,0.496],[1.458,0.492,0.514],[0.179,0.3,0.184],[0.165,0.169,0.176],[0.197,0.186,0.19],[0.289,0.547,0.397],[0.513,0.544,0.632],[0.766,0.754,0.775],[0.389,0.374,0.383],[0.484,0.297,0.286],[0.505,0.505,0.734],[0.656,0.598,0.621],[0.634,0.646,0.609],[0.309,0.298,0.37],[0.192,0.219,0.212],[0.84,0.174,0.139],[0.172,0.163,0.151],[0.323,0.296,0.347],[0.2,0.154,0.144],[0.191,0.121,0.125],[0.137,0.233,0.148]],"source":"snowflake/results/3xl.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"4XL","cluster_size":128,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.164,0.061,0.078],[2.471,2.436,1.927],[1.656,0.222,0.639],[0.336,1.244,0.206],[0.435,0.414,0.373],[0.52,0.495,0.326],[0.052,0.051,0.057],[0.244,0.515,0.358],[0.473,0.477,0.659],[0.706,0.523,0.499],[0.619,0.361,0.303],[0.463,0.367,0.29],[0.385,0.319,0.376],[0.661,0.436,0.452],[0.446,0.317,0.336],[0.504,0.283,0.395],[0.478,1.395,0.35],[0.555,1.041,0.993],[0.565,0.558,1.473],[0.31,0.684,0.278],[0.637,1.202,0.249],[0.467,0.294,0.436],[0.671,0.478,0.611],[6.262,0.449,0.425],[0.476,0.213,0.184],[0.552,0.241,0.201],[0.458,0.415,0.402],[0.339,0.357,0.322],[0.732,0.549,0.483],[0.914,0.757,0.743],[0.718,0.31,0.606],[0.605,0.363,0.425],[0.468,0.86,0.784],[0.868,1.787,0.713],[0.807,0.691,0.544],[0.485,0.338,0.672],[0.263,0.221,0.23],[0.147,0.145,0.139],[0.135,0.239,0.136],[0.322,0.378,0.348],[0.236,0.138,0.132],[0.193,0.124,0.139],[0.146,0.145,0.139]],"source":"snowflake/results/4xl.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"L","cluster_size":8,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.067,0.054,0.051],[1.158,1.409,0.19],[1.47,0.566,0.715],[0.892,0.534,0.264],[0.474,0.499,0.489],[0.95,0.65,0.699],[0.069,0.055,0.11],[0.317,0.307,0.321],[0.949,0.593,0.654],[0.713,1.099,0.86],[0.622,0.37,0.404],[0.457,0.369,0.414],[0.61,0.566,0.653],[0.97,1.006,0.976],[1.517,0.636,0.603],[0.532,0.541,0.533],[1.018,1.001,1.022],[0.942,0.996,0.94],[2.246,1.596,1.56],[0.181,0.184,0.2],[1.135,0.788,0.609],[0.669,0.528,0.524],[1.164,0.827,0.882],[3.545,2.214,2.107],[0.559,0.431,0.426],[0.34,0.296,0.383],[0.695,0.314,0.368],[0.628,0.658,0.637],[1.511,1.385,1,440],[1.39,1.418,1.322],[1.107,0.687,0.537],[1.026,0.737,0.659],[1.712,1.681,1.728],[2.141,2.13,2.225],[2.163,2.157,2.11],[0.65,0.619,0.627],[0.204,0.195,0.225],[0.159,0.152,0.156],[0.146,0.136,0.15],[0.359,0.29,0.364],[0.196,0.129,0.227],[0.201,0.128,0.143],[0.176,0.129,0.146]],"source":"snowflake/results/l.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"M","cluster_size":4,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.054,0.062,0.064],[0.698,0.563,0.407],[0.586,0.412,0.266],[1.386,0.363,0.301],[0.814,0.825,0.984],[1.303,1.024,1.048],[0.069,0.066,0.062],[0.334,0.254,0.27],[1.043,0.952,0.993],[1.21,1.209,1.171],[0.667,0.483,0.456],[0.543,0.495,0.5],[1.005,0.889,0.888],[1.644,1.646,1.652],[1.054,1.044,0.966],[0.893,0.874,0.907],[1.737,1.779,1.837],[1.518,1.539,1.526],[3.082,2.818,2.842],[0.309,0.286,0.256],[1.594,1.017,0.993],[0.781,0.853,0.735],[1.461,1.226,1.08],[5.308,2.974,2.642],[0.511,0.625,0.467],[0.405,0.382,0.439],[0.601,0.535,0.471],[0.947,1.624,1.192],[2.631,2.486,2.49],[1.938,1.96,1.954],[1.93,0.83,0.835],[1.359,1.14,1.062],[3.599,3.623,3.621],[3.619,3.741,3.663],[3.725,3.614,3.786],[1.149,1.126,1.055],[0.202,0.207,0.196],[0.152,0.139,0.145],[0.149,0.144,0.148],[0.383,0.287,0.294],[0.203,0.137,0.119],[0.2,0.312,0.137],[0.149,0.13,0.214]],"source":"snowflake/results/m.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"S","cluster_size":2,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.186,0.06,0.062],[0.98,0.574,0.311],[0.977,0.554,0.426],[0.686,0.573,0.404],[1.386,1.384,1.349],[1.871,1.697,1.704],[0.052,0.059,0.227],[0.309,0.536,0.508],[1.768,1.631,1.635],[2.039,2.219,1.908],[0.807,0.647,0.587],[0.763,0.69,0.631],[1.403,1.586,1.404],[2.593,2.584,2.554],[1.67,1.538,1.653],[1.659,1.509,1.514],[2.875,2.99,2.998],[2.605,2.549,2.598],[6.12,5.894,5.766],[0.32,0.431,0.416],[2.406,1.703,1.609],[1.189,1.186,1.163],[2.104,1.441,1.37],[7.144,5.174,4.139],[0.839,0.659,0.641],[0.527,0.518,0.509],[0.633,0.621,0.695],[1.491,1.509,1.514],[4.848,4.485,4.571],[3.067,3.106,3.098],[1.521,1.224,1.236],[1.839,1.69,1.497],[5.692,5.751,6.087],[6.733,6.755,6.712],[6.722,6.709,6.676],[1.704,1.686,1.676],[0.203,0.231,0.218],[0.151,0.134,0.214],[0.14,0.156,0.163],[0.317,0.328,0.319],[0.166,0.133,0.141],[0.166,0.12,0.14],[0.12,0.119,0.126]],"source":"snowflake/results/s.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"XL","cluster_size":16,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.071,0.053,0.057],[0.998,0.61,0.24],[0.42,1.138,1.051],[0.653,0.264,0.178],[0.352,0.312,0.349],[1.126,0.431,0.42],[0.067,0.057,0.054],[0.225,0.217,0.2],[0.617,0.366,0.371],[1.006,0.541,0.498],[0.463,0.425,0.293],[0.431,0.36,0.339],[0.392,0.371,0.386],[0.588,0.581,0.59],[0.634,0.414,0.4],[0.368,0.41,0.388],[0.594,0.639,0.663],[0.616,0.581,0.569],[1.092,0.933,0.901],[0.493,0.213,0.16],[0.886,0.48,0.442],[0.448,0.337,0.399],[0.84,0.572,0.505],[2.251,1.23,0.959],[0.295,0.253,0.241],[0.214,0.239,0.278],[0.261,0.232,0.314],[0.422,0.429,0.403],[0.892,0.934,0.883],[1.041,1.017,1.009],[0.715,0.442,0.363],[0.845,0.413,0.461],[1.101,1.085,1.102],[1.294,1.272,1.339],[1.839,1.327,1.241],[0.439,0.399,0.393],[0.199,0.211,0.19],[0.157,0.143,0.14],[0.145,0.157,0.141],[0.331,0.291,0.333],[0.173,0.214,0.138],[0.189,0.15,0.159],[0.135,0.149,0.138]],"source":"snowflake/results/xl.json"}
-,{"system":"Snowflake","date":"2022-07-01","machine":"XS","cluster_size":1,"comment":"","tags":["managed","column-oriented"],"load_time":2524,"data_size":12300000000,"result":[[0.169,0.055,0.056],[1.184,0.582,0.386],[1.35,0.56,0.568],[1.27,0.554,0.538],[2.516,2.564,2.506],[2.935,2.649,2.67],[0.052,0.05,0.064],[0.383,0.387,0.397],[3.249,2.993,3.014],[3.589,3.627,3.887],[1.243,0.986,0.966],[1.325,1.08,1.073],[2.038,2.046,2.035],[3.738,3.626,3.718],[2.318,2.159,2.176],[2.733,2.637,2.668],[5.607,5.683,5.667],[3.978,3.923,3.879],[10.085,9.871,9.844],[0.45,0.375,0.469],[5.474,3.103,3.06],[2.012,1.982,1.971],[3.365,2.471,2.501],[11.96,10.619,9.518],[1.074,1.059,1.026],[0.856,0.846,0.879],[1.1,1.085,1.083],[3.057,3.228,3.117],[9.406,9.019,9.158],[6.196,6.243,6.911],[2.906,2.343,2.017],[2.954,2.666,2.565],[9.459,9.565,9.557],[9.555,9.529,9.368],[9.409,9.185,9.294],[2.796,2.88,2.685],[0.299,0.249,0.262],[0.156,0.145,0.18],[0.147,0.146,0.16],[0.371,0.357,0.356],[0.166,0.133,0.155],[0.218,0.14,0.135],[0.14,0.152,0.158]],"source":"snowflake/results/xs.json"}
-,{"system":"SQLite","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","embedded","row-oriented"],"load_time":2608,"data_size":75776589824,"result":[[752.739,2.003,1.2],[304.302,291.521,286.965],[293.964,287.619,287.219],[758.302,5.879,5.65],[836.393,48.593,48.452],[362.605,344.884,356.245],[763.993,11.602,10.795],[296.348,286.879,287.557],[365.816,360.339,354.126],[374.403,365.196,362.261],[302.989,293.888,298.432],[303.64,291.729,295.347],[316.824,298.18,301.006],[320.665,301.15,305.227],[313.593,301.021,301.626],[794.881,47,47.225],[355.346,344.615,342.442],[316.499,305.971,305.007],[398.177,380.383,385.571],[751.82,5.082,4.913],[295.522,286.573,287.368],[298.58,287.182,288.303],[296.474,288.747,288.638],[296.579,287.127,287.361],[304.709,286.865,287.56],[300.391,290.633,288.587],[294.605,286.91,287.799],[305.986,312.111,305.626],[null,null,null],[411.225,397.614,394.253],[307.711,295.181,300.266],[312.472,299.079,298.19],[386.674,378.347,376.963],[409.742,409.554,420.273],[468.73,453.709,458.149],[366.015,347.446,346.728],[2.911,0.781,0.757],[1.599,0.609,0.587],[1.288,0.256,0.238],[2.469,1.582,1.52],[1.274,0.303,0.283],[1.322,0.317,0.314],[1.498,0.602,0.613]],"source":"sqlite/results/c6a.4xlarge.json"}
-,{"system":"TimescaleDB (compression)","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","PostgreSQL compatible","column-oriented","time-series"],"load_time":4605,"data_size":20333747165,"result":[[2.28686,1.63642,1.64263],[32.6848,1.63476,1.40052],[60.8633,3.70484,3.59342],[36.4029,2.87091,2.80739],[110.391,38.9688,38.0549],[147.379,66.2513,65.6379],[33.0294,2.92031,2.84375],[33.0221,1.2984,1.19227],[115.694,47.4651,47.0125],[156.347,51.577,51.2694],[68.3301,4.75521,4.68007],[77.4356,5.55128,5.56577],[49.7741,11.2911,11.3265],[81.1014,14.9111,14.9541],[82.9569,14.6156,14.6331],[62.0338,26.399,26.3351],[103.259,36.4122,36.6076],[92.8828,26.2395,25.8991],[144.281,63.5102,63.7661],[7.00679,0.573073,0.536283],[75.0203,7.86344,7.90495],[81.2825,9.15868,9.01775],[104.084,13.9528,13.8435],[132.531,81.522,82.1561],[80.6965,3.28231,3.16574],[39.7693,2.51443,2.43849],[80.4245,3.26941,3.13916],[104.015,13.7044,13.5313],[307.26,253.127,252.147],[42.8549,22.4187,22.0325],[137.601,14.9592,14.6804],[136.767,22.8007,22.131],[263.005,168.551,163.355],[156.919,92.6308,91.702],[160.842,96.0512,97.1773],[62.8357,28.0336,28.7397],[1.75869,0.561604,0.541215],[0.46607,0.191863,0.19021],[0.303671,0.137579,0.136615],[2.32031,1.49223,1.52369],[0.563764,0.14192,0.138234],[0.372428,0.122989,0.123709],[0.448574,0.159092,0.154687]],"source":"timescaledb-compressed/results/c6a.4xlarge.json"}
-,{"system":"TimescaleDB","date":"2022-07-01","machine":"c6a.4xlarge, 500gb gp2","cluster_size":1,"comment":"","tags":["C","PostgreSQL compatible","row-oriented","time-series"],"load_time":1620,"data_size":72882392030,"result":[[437.7,215.793,176.42],[327.026,259.568,244.578],[262.978,263.09,263.083],[262.807,263.046,266.847],[337.497,334.964,330.852],[355.689,356.801,362.894],[262.762,263.012,262.968],[263.055,263.016,263.028],[319.928,319.388,320.704],[323.584,322.224,322.488],[265.979,265.465,265.375],[266.019,265.543,265.462],[277.018,276.3,276.595],[280.352,279.251,279.572],[279.915,279.896,279.674],[296.377,298.506,297.659],[314.448,314.605,312.57],[302.668,302.672,303.039],[325.81,324.061,324.376],[262.447,262.698,262.704],[267.581,267.467,267.482],[268.085,267.466,267.696],[263.391,263.097,263.126],[38.291,0.435,0.335],[0.127,0.005,0.005],[263.138,263.1,263.092],[0.889,0.341,0.339],[267.586,267.498,267.491],[289.086,290.012,290.093],[263.22,263.071,263.109],[274.78,273.995,273.998],[282.217,281.39,281.47],[429.273,426.588,439.431],[448.808,418.724,418.207],[455.196,422.75,423.142],[299.263,296.937,297.261],[18.693,1.552,1.481],[18.125,0.945,0.937],[18.528,1.062,0.902],[18.268,1.779,1.77],[19.615,1.965,1.966],[18.97,1.435,1.43],[18.33,1.153,0.952]],"source":"timescaledb/results/c6a.4xlarge.json"}
-]; // end of data
-
-const additional_data_size_points = [
-{"fake": true, "system": "hits.tsv", "data_size": 74807831229},
-{"fake": true, "system": "hits.csv", "data_size": 81136059858},
-{"fake": true, "system": "hits.json", "data_size": 232733025002},
-{"fake": true, "system": "hits.parquet", "data_size": 14779976446},
-{"fake": true, "system": "hits.tsv.gz", "data_size": 16298506510},
-{"fake": true, "system": "hits.csv.gz", "data_size": 16608960810},
-{"fake": true, "system": "hits.json.gz", "data_size": 23728268670}
-];
-    </script>
-</head>
-<body>
-
-<div class="header stick-left">
-    <span class="nowrap themes"><span id="toggle-dark">🌚</span><span id="toggle-light">🌞</span></span>
-    <h1>ClickBench — a Benchmark For Analytical DBMS</h1>
-    <a href="https://github.com/ClickHouse/ClickBench/">Methodology</a> | <a href="https://github.com/ClickHouse/ClickBench/">Reproduce and Validate the Results</a> | <a href="https://github.com/ClickHouse/ClickBench/">Add a System</a> | <a href="https://github.com/ClickHouse/ClickBench/">Report Mistake</a> | <a href="https://clickhouse.com/benchmark/hardware/">Hardware Benchmark</a>
-</div>
-
-<table class="selectors-container stick-left">
-    <tr>
-        <th>System: </th>
-        <td id="selectors_system">
-            <a id="select-all-systems" class="selector selector-active">All</a>
-        </td>
-    </tr>
-    <tr>
-        <th>Type: </th>
-        <td id="selectors_type">
-            <a id="select-all-types" class="selector selector-active">All</a>
-        </td>
-    </tr>
-    <tr>
-        <th>Machine: </th>
-        <td id="selectors_machine">
-            <a id="select-all-machines" class="selector selector-active">All</a>
-        </td>
-    </tr>
-    <tr>
-        <th>Cluster size: </th>
-        <td id="selectors_cluster_size">
-            <a id="select-all-cluster-sizes" class="selector selector-active">All</a>
-        </td>
-    </tr>
-    <tr>
-        <th>Metric: </th>
-        <td id="selectors_run">
-            <a class="selector" id="selector-metric-cold">Cold Run</a>
-            <a class="selector" id="selector-metric-hot">Hot Run</a>
-            <a class="selector" id="selector-metric-load">Load Time</a>
-            <a class="selector" id="selector-metric-size">Storage Size</a>
-        </td>
-    </tr>
-</table>
-
-<table class="stick-left comparison">
-    <thead>
-        <tr>
-            <th class="summary-name">
-                System &amp; Machine
-            </th>
-            <th colspan="2">
-                Relative <span id="time-or-size">time</span> (lower is better)
-            </th>
-        </tr>
-    </thead>
-    <tbody id="summary">
-    </tbody>
-</table>
-
-<div id="nothing-selected" class="stick-left">Nothing selected</div>
-
-<div class="stick-left comparison">
-    <h2>Detailed Comparison</h2>
-</div>
-
-<table id="details">
-    <thead>
-        <tr id="details_head">
-        </tr>
-    </thead>
-    <tbody id="details_body">
-    </tbody>
-</table>
-
-<script type="text/javascript">
-
-const constant_time_add = 0.01;
-const missing_result_penalty = 2;
-const missing_result_time = 300;
-
-let selectors = {
-    "system": {},
-    "type": {},
-    "machine": {},
-    "cluster_size": {},
-    "metric": "hot",
-    "queries": [],
-};
-
-let theme = 'light';
-
-function setTheme(new_theme) {
-    theme = new_theme;
-    document.documentElement.setAttribute('data-theme', theme);
-    window.localStorage.setItem('theme', theme);
-    render();
-}
-
-document.getElementById('toggle-light').addEventListener('click', e => setTheme('light'));
-document.getElementById('toggle-dark').addEventListener('click', e => setTheme('dark'));
-
-let new_theme = window.localStorage.getItem('theme');
-if (new_theme && new_theme != theme) {
-    setTheme(new_theme);
-}
-
-/// Generate selectors
-
-let systems = document.getElementById('selectors_system');
-let types = document.getElementById('selectors_type');
-let machines = document.getElementById('selectors_machine');
-let cluster_sizes = document.getElementById('selectors_cluster_size');
-
-let unique_systems = [... new Set(data.map(elem => elem.system))];
-
-function toggle(e, elem, selectors_map) {
-    selectors_map[elem] = !selectors_map[elem];
-    e.target.className = selectors_map[elem] ? 'selector selector-active' : 'selector';
-    render();
-    updateHistory();
-}
-
-function toggleAll(e, selectors_map) {
-    const new_value = Object.keys(selectors_map).filter(k => selectors_map[k]).length * 2 < Object.keys(selectors_map).length;
-    [...e.target.parentElement.querySelectorAll('a')].map(
-        elem => { elem.className = new_value ? 'selector selector-active' : 'selector' });
-
-    Object.keys(selectors_map).map(k => { selectors_map[k] = new_value });
-    render();
-    updateHistory();
-}
-
-unique_systems.map(elem => {
-    let selector = document.createElement('a');
-    selector.className = 'selector selector-active';
-    selector.appendChild(document.createTextNode(elem));
-    systems.appendChild(selector);
-    if (!(elem in selectors.system)) { selectors.system[elem] = true; }
-    selector.addEventListener('click', e => toggle(e, elem, selectors.system));
-
-    /// Highlighting summary rows and table columns on hovering over the system selector.
-    selector.addEventListener('mouseover', e => {
-        [...document.querySelectorAll('.summary-row')].map(row => {
-            row.className = row.dataset.system == elem ? 'summary-row summary-row-hilite' : 'summary-row' });
-        [...document.querySelectorAll('.th-entry')].map(th => {
-            th.className = th.dataset.system == elem ? 'th-entry th-entry-hilite' : 'th-entry' });
-    });
-    selector.addEventListener('mouseout', e => {
-        [...document.querySelectorAll('.summary-row')].map(row => { row.className = 'summary-row' });
-        [...document.querySelectorAll('.th-entry')].map(row => { row.className = 'th-entry' });
-    });
-});
-
-[... new Set(data.map(elem => elem.tags).flat())].map(elem => {
-    let selector = document.createElement('a');
-    selector.className = 'selector selector-active';
-    selector.appendChild(document.createTextNode(elem));
-    types.appendChild(selector);
-    if (!(elem in selectors.type)) { selectors.type[elem] = true; }
-    selector.addEventListener('click', e => toggle(e, elem, selectors.type));
-});
-
-[... new Set(data.map(elem => elem.machine))].map(elem => {
-    let selector = document.createElement('a');
-    selector.className = 'selector selector-active';
-    selector.appendChild(document.createTextNode(elem));
-    machines.appendChild(selector);
-    if (!(elem in selectors.machine)) { selectors.machine[elem] = true; }
-    selector.addEventListener('click', e => toggle(e, elem, selectors.machine));
-});
-
-[... new Set(data.map(elem => elem.cluster_size))].sort(
-    (a, b) => ((typeof(b) === 'number') - (typeof(a) === 'number')) || (a - b)).map(elem => {
-    let selector = document.createElement('a');
-    selector.className = 'selector selector-active';
-    selector.appendChild(document.createTextNode(elem));
-    cluster_sizes.appendChild(selector);
-    if (!(elem in selectors.cluster_size)) { selectors.cluster_size[elem] = true; }
-    selector.addEventListener('click', e => toggle(e, elem, selectors.cluster_size));
-});
-
-document.getElementById('select-all-systems').addEventListener('click', e => toggleAll(e, selectors.system));
-document.getElementById('select-all-types').addEventListener('click', e => toggleAll(e, selectors.type));
-document.getElementById('select-all-machines').addEventListener('click', e => toggleAll(e, selectors.machine));
-document.getElementById('select-all-cluster-sizes').addEventListener('click', e => toggleAll(e, selectors.cluster_size));
-
-[...document.getElementById('selectors_run').querySelectorAll('a')].map(elem => elem.addEventListener('click', e => {
-    [...e.target.parentElement.querySelectorAll('a')].map(elem => { elem.className = elem == e.target ? 'selector selector-active' : 'selector' });
-}));
-
-document.getElementById('selector-metric-cold').addEventListener('click', e => { selectors.metric = 'cold'; render(); updateHistory(); });
-document.getElementById('selector-metric-hot').addEventListener('click', e => { selectors.metric = 'hot'; render(); updateHistory(); });
-document.getElementById('selector-metric-load').addEventListener('click', e => { selectors.metric = 'load'; render(); updateHistory(); });
-document.getElementById('selector-metric-size').addEventListener('click', e => { selectors.metric = 'size'; render(); updateHistory(); });
-
-selectors.queries = [...data[0].result.keys()].map(k => true);
-
-function updateSelectors() {
-    [...systems.childNodes].map(elem => { elem.className = selectors.system[elem.innerText] ? 'selector selector-active' : 'selector' });
-    [...types.childNodes].map(elem => { elem.className = selectors.type[elem.innerText] ? 'selector selector-active' : 'selector' });
-    [...machines.childNodes].map(elem => { elem.className = selectors.machine[elem.innerText] ? 'selector selector-active' : 'selector' });
-    [...cluster_sizes.childNodes].map(elem => { elem.className = selectors.cluster_size[elem.innerText] ? 'selector selector-active' : 'selector' });
-
-    [...document.getElementById('selectors_run').querySelectorAll('a')].map(elem => {
-        elem.className = elem.id == 'selector-metric-' + selectors.metric ? 'selector selector-active' : 'selector' });
-
-    [...document.querySelectorAll('.query-checkbox')].map((elem, i) => { elem.checked = selectors.queries[i] });
-}
-
-function clearElement(elem)
-{
-    while (elem.firstChild) {
-        elem.removeChild(elem.lastChild);
-    }
-}
-
-function selectRun(timings) {
-    return selectors.metric == 'cold' ? timings[0] : (timings[1] !== null && timings[2] !== null ? Math.min(timings[1], timings[2]) : null)
-}
-
-function addNote(text) {
-    let note = document.createElement('sup');
-    note.className = 'note';
-    note.appendChild(document.createTextNode('†'));
-
-    let tooltip = document.createElement('span');
-    tooltip.className = 'tooltip tooltip-result';
-    tooltip.appendChild(document.createTextNode(text));
-
-    note.appendChild(tooltip);
-    return note;
-}
-
-function renderSummary(filtered_data) {
-    let table = document.getElementById('summary');
-    clearElement(table);
-
-    /// Generate summary
-
-    /// The algorithm: for each of the queries,
-    /// - if there is a result - take query duration, add 10 ms, and divide it to the corresponding value from the baseline,
-    /// - if there is no result - take the worse query duration across all query runs for this system and multiply by 2.
-    /// Take geometric mean across the queries.
-
-    let summary = {};
-
-    const num_queries = filtered_data[0].result.length;
-
-    const baseline_data = [...filtered_data[0].result.keys()].map(query_num =>
-        [...Array(3).keys()].map(run_num =>
-            Math.min(...filtered_data.filter(elem => !elem.fake).map(elem => elem.result[query_num][run_num]).filter(x => x))));
-
-    const min_load_time = Math.min(...filtered_data.map(elem => elem.load_time).filter(x => x));
-    const min_data_size = Math.min(...filtered_data.map(elem => elem.data_size).filter(x => x));
-
-    let summaries;
-    if (selectors.metric == 'load') {
-        summaries = filtered_data.map(elem => elem.load_time / min_load_time);
-        document.getElementById('time-or-size').innerText = 'time';
-    } else if (selectors.metric == 'size') {
-        summaries = filtered_data.map(elem => elem.data_size / min_data_size);
-        document.getElementById('time-or-size').innerText = 'size';
-    } else {
-        summaries = filtered_data.map(elem => {
-            const fallback_timing = missing_result_penalty * Math.max(missing_result_time, ...elem.result.map(timings => selectRun(timings)));
-
-            let accumulator = 0;
-            let used_queries = 0;
-
-            const no_queries_selected = selectors.queries.filter(x => x).length == 0;
-
-            for (let i = 0; i < num_queries; ++i) {
-                if (no_queries_selected || selectors.queries[i]) {
-                    const curr_timing = selectRun(elem.result[i]) ?? fallback_timing;
-                    const baseline_timing = selectRun(baseline_data[i]);
-                    const ratio = (constant_time_add + curr_timing) / (constant_time_add + baseline_timing);
-                    accumulator += Math.log(ratio);
-                    ++used_queries;
-                }
-            }
-
-            return Math.exp(accumulator / used_queries);
-        });
-        document.getElementById('time-or-size').innerText = 'time';
-    }
-
-    const sorted_indices = [...summaries.keys()].sort((a, b) => summaries[a] - summaries[b]);
-    const max_ratio = summaries[sorted_indices[sorted_indices.length - 1]];
-
-    sorted_indices.map(idx => {
-        const elem = filtered_data[idx];
-
-        if (selectors.metric == 'size' && elem.data_size === null) { return; }
-
-        let tr = document.createElement('tr');
-        tr.className = 'summary-row';
-
-        tr.dataset.system = elem.system;
-
-        let td_name = document.createElement('td');
-        td_name.className = 'summary-name';
-
-        if (!elem.fake) {
-            let link = document.createElement('a');
-            link.appendChild(document.createTextNode(`${elem.system} (${elem.machine})`));
-            link.href = "https://github.com/ClickHouse/ClickBench/blob/main/" + elem.source;
-            td_name.appendChild(link);
-        } else {
-            td_name.appendChild(document.createTextNode(elem.system));
-        }
-
-        if (elem.comment) { td_name.appendChild(addNote(elem.comment)); }
-        td_name.appendChild(document.createTextNode(': '));
-
-        const ratio = summaries[idx];
-        const percentage = summaries[idx] / max_ratio * 100;
-
-        let td_number = document.createElement('td');
-        td_number.className = 'summary-number';
-
-        const text = selectors.metric == 'load' ? (elem.load_time ? `${Math.round(elem.load_time)}s (×${ratio.toFixed(2)})` : 'stateless')
-            :  selectors.metric == 'size' ? `${(elem.data_size / 1024 / 1024 / 1024).toFixed(2)} GiB (×${ratio.toFixed(2)})`
-            : `×${ratio.toFixed(2)}`;
-
-        td_number.appendChild(document.createTextNode(text));
-
-        let td_bar = document.createElement('td');
-        td_bar.className = 'summary-bar-cell';
-
-        let bar = document.createElement('div');
-
-        bar.className = `summary-bar`;
-        bar.style.width = `${percentage}%`;
-
-        td_bar.appendChild(bar);
-
-        tr.appendChild(td_name);
-        tr.appendChild(td_bar);
-        tr.appendChild(td_number);
-        table.appendChild(tr);
-    });
-
-    return [sorted_indices, baseline_data];
-}
-
-function colorize(elem, ratio) {
-    let [r, g, b] = [0, 0, 0];
-
-    /// ratio less than 1 - green
-    /// ratio from 1 to 2 - green to yellow
-    /// ratio from 2 to 10 - yellow to red
-    /// ratio from 10 to 1000 to infinity - red to brown to black
-
-    /// Note: we are using RGB space without proper gamma correction. Read more: https://www.handprint.com/HP/WCL/color1.html
-
-    if (ratio !== null) {
-        if (ratio < 1) {
-            r = 232;
-            g = 255;
-            b = 232;
-        } else if (ratio <= 1) {
-            g = 255;
-        } else if (ratio <= 2) {
-            g = 255;
-            r = (ratio - 1) * 255;
-        } else if (ratio <= 10) {
-            g = (10 - ratio) / 8 * 255;
-            r = 255;
-        } else {
-            r = (1 - ((ratio - 10) / ((ratio - 10) + 1000))) * 255;
-        }
-    }
-
-    if (document.documentElement.getAttribute('data-theme') == 'dark') {
-        r /= 1.5;
-        g /= 1.5;
-        b /= 1.5;
-    }
-
-    elem.style.backgroundColor = `rgb(${r}, ${g}, ${b})`;
-    if (ratio === null || ratio > 10) {
-        /// This will look better on dark backgrounds
-        elem.style.color = 'white';
-    } else {
-        elem.style.color = 'black';
-    }
-
-    /// The best result is highlighted
-    if (ratio == 1) {
-        elem.style.fontWeight = 'bold';
-    }
-}
-
-function render() {
-    let details_head = document.getElementById('details_head');
-    let details_body = document.getElementById('details_body');
-
-    clearElement(details_head);
-    clearElement(details_body);
-
-    let filtered_data = data.filter(elem =>
-        selectors.system[elem.system] &&
-        selectors.machine[elem.machine] &&
-        selectors.cluster_size[elem.cluster_size] &&
-        elem.tags.filter(type => selectors.type[type]).length > 0);
-
-    let nothing_selected_elem = document.getElementById('nothing-selected');
-    if (filtered_data.length == 0) {
-        nothing_selected_elem.style.display = 'block';
-        [...document.querySelectorAll('.comparison')].map(e => e.style.display = 'none');
-        return;
-    }
-    nothing_selected_elem.style.display = 'none';
-    [...document.querySelectorAll('.comparison')].map(e => e.style.display = 'block');
-
-    if (selectors.metric == 'size') {
-        filtered_data = [...filtered_data, ...additional_data_size_points];
-    }
-
-    let [sorted_indices, baseline_data] = renderSummary(filtered_data);
-    sorted_indices = sorted_indices.filter(idx => !filtered_data[idx].fake);
-
-    /// Generate details
-
-    /// Global checkbox
-    {
-        let th_checkbox = document.createElement('th');
-        let checkbox = document.createElement('input');
-        checkbox.type = 'checkbox';
-        checkbox.checked = true;
-        checkbox.addEventListener('change', e => {
-            [...document.querySelectorAll('.query-checkbox')].map(elem => { elem.checked = e.target.checked });
-            selectors.queries.map((_, i) => { selectors.queries[i] = e.target.checked });
-            renderSummary(filtered_data);
-            updateHistory();
-        });
-        th_checkbox.appendChild(checkbox);
-        details_head.appendChild(th_checkbox);
-        details_head.appendChild(document.createElement('th'));
-    }
-
-    /// Table header
-    sorted_indices.map(idx => {
-        const elem = filtered_data[idx];
-        let th = document.createElement('th');
-        th.appendChild(document.createTextNode(`${elem.system}\n(${elem.machine})`));
-        th.className = 'th-entry';
-        th.dataset.system = elem.system;
-        details_head.appendChild(th);
-    });
-
-    /// Load times
-    {
-        let tr = document.createElement('tr');
-        tr.className = 'shadow';
-
-        let td_title = document.createElement('td');
-        td_title.colSpan = 2;
-        td_title.appendChild(document.createTextNode('Load time: '));
-        tr.appendChild(td_title);
-
-        sorted_indices.map(idx => {
-            const curr_timing = filtered_data[idx].load_time;
-            const baseline_timing = Math.min(...filtered_data.map(elem => elem.load_time).filter(x => x));
-            const ratio = curr_timing / baseline_timing;
-
-            let td = document.createElement('td');
-            td.appendChild(document.createTextNode(curr_timing ? `${Math.round(curr_timing)}s (×${ratio.toFixed(2)})` : '0'));
-
-            colorize(td, ratio);
-            tr.appendChild(td);
-        });
-
-        details_body.appendChild(tr);
-    }
-
-    /// Data sizes
-    {
-        let tr = document.createElement('tr');
-        tr.className = 'shadow';
-
-        let td_title = document.createElement('td');
-        td_title.colSpan = 2;
-        td_title.appendChild(document.createTextNode('Data size: '));
-        tr.appendChild(td_title);
-
-        sorted_indices.map(idx => {
-            const curr_size = filtered_data[idx].data_size;
-            const baseline_size = Math.min(...filtered_data.map(elem => elem.data_size).filter(x => x));
-            const ratio = curr_size !== null ? curr_size / baseline_size : null;
-
-            let td = document.createElement('td');
-            td.appendChild(document.createTextNode(curr_size !== null ? `${(curr_size / 1024 / 1024 / 1024).toFixed(2)} GiB (×${ratio.toFixed(2)})` : '☠'));
-
-            colorize(td, ratio);
-            tr.appendChild(td);
-        });
-
-        details_body.appendChild(tr);
-    }
-
-    /// Query runtimes
-    const num_queries = filtered_data[0].result.length;
-
-    for (let query_num = 0; query_num < num_queries; ++query_num) {
-        let tr = document.createElement('tr');
-        tr.className = 'shadow';
-
-        let td_checkbox = document.createElement('td');
-        let checkbox = document.createElement('input');
-        checkbox.type = 'checkbox';
-        checkbox.className = 'query-checkbox';
-        checkbox.checked = selectors.queries[query_num];
-        checkbox.addEventListener('change', e => {
-            selectors.queries[query_num] = e.target.checked;
-            renderSummary(filtered_data);
-            updateHistory();
-        });
-        td_checkbox.appendChild(checkbox);
-        tr.appendChild(td_checkbox);
-
-        let td_query_num = document.createElement('td');
-        td_query_num.className = 'note';
-        td_query_num.appendChild(document.createTextNode(`Q${query_num}. `));
-
-        let tooltip = document.createElement('span');
-        tooltip.className = 'tooltip tooltip-query';
-        tooltip.appendChild(document.createTextNode(`Query ${query_num}: ${queries[query_num]}`));
-        td_query_num.appendChild(tooltip);
-
-        tr.appendChild(td_query_num);
-
-        sorted_indices.map(idx => {
-            const curr_timing = selectRun(filtered_data[idx].result[query_num]);
-            const baseline_timing = selectRun(baseline_data[query_num]);
-            const ratio = curr_timing !== null ? (constant_time_add + curr_timing) / (constant_time_add + baseline_timing) : null;
-
-            let td = document.createElement('td');
-            td.appendChild(document.createTextNode(curr_timing !== null ? `${curr_timing.toFixed(2)}s (×${ratio.toFixed(2)})` : '☠'));
-
-            colorize(td, ratio);
-            tr.appendChild(td);
-        });
-
-        details_body.appendChild(tr);
-    }
-}
-
-function updateHistory() {
-    history.pushState(selectors, '',
-        window.location.pathname + (window.location.search || '') + '#' + btoa(JSON.stringify(selectors)));
-}
-
-window.onpopstate = function(event) {
-    if (!event.state) { return; }
-    selectors = event.state;
-    render();
-    updateSelectors();
-};
-
-if (window.location.hash) {
-    try {
-        selectors = JSON.parse(atob(window.location.hash.substring(1)));
-    } catch {}
-}
-
-render();
-updateSelectors();
-
-</script>
-</body>
-</html>
diff --git a/website/benchmark/hardware/index.html b/website/benchmark/hardware/index.html
deleted file mode 100644
index 1dcb7d84cfd..00000000000
--- a/website/benchmark/hardware/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-{% extends 'templates/base.html' %}
-
-{% set title = 'Performance comparison of ClickHouse on various hardware' %}
-{% set extra_js = [
-    'queries.js?' + rev_short,
-    'results.js?' + rev_short,
-    '../benchmark.js?' + rev_short]
-%}
-{% set url = 'https://clickhouse.com/benchmark/hardware/' %}
-{% set no_footer = True %}
-
-{% block content %}
-<div class="container-fluid py-3">
-
-<div class="row mb-3">
-    <div class="col d-flex align-items-center">
-        <a href="/" title="Main page" class="float-left mr-3">
-            <img src="/docs/images/logo.svg" alt="ClickHouse" />
-        </a>
-        <h1 class="h2 mb-0">{{ title }}</h1>
-    </div>
-</div>
-
-<div class="row mb-3">
-    <div id="selectors" class="col"></div>
-</div>
-
-<div class="row mb-3">
-    <div class="col">
-        <h2 class="h4 my-3">Relative query processing time <span class="text-muted">(lower is better)</span></h2>
-        <div id="diagram"></div>
-    </div>
-</div>
-
-<div class="row mb-3">
-    <div class="col">
-        <h2 class="h4 my-3">Full results</h2>
-        <div id="comparison_table"></div>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
-        <h2 class="h4 my-3">Comments</h2>
-        <p>Submit your own results: <a href="https://clickhouse.com/docs/en/operations/performance-test/">https://clickhouse.com/docs/en/operations/performance-test/</a></p>
-        <p>
-Results for Lenovo B580 Laptop are from <b>Ragıp Ünal</b>. 16GB RAM 1600 GHz, 240GB SSD, Intel(R) Core(TM) i5-3210M CPU @ 2.50GHz (2 Core / 4 HT)<br/>
-Results for Time4vps.eu are from <b>Ragıp Ünal</b>.<br/>
-Results for Dell PowerEdge R640, R641 (in Hetzner) are from <b>Dmirty Titov</b>.<br/>
-Results for Dell PowerEdge R730 are from <b>Amos Bird</b>.<br/>
-Results for Dell R530 are from <b>Yuriy Zolkin</b>.<br/>
-Results for Xeon 2176G are from <b>Sergey Golod</b>.<br/>
-Results for Azure DS3v2 are from <b>Boris Granveaud</b>.<br/>
-Results for AWS are from <b>Wolf Kreuzerkrieg</b>.<br/>
-Results for Huawei Taishan are from <b>Peng Gao</b> in sina.com.<br/>
-Results for Huawei Taishan (2) are from <b>Kurmaev Roman</b> at Huawei.<br/>
-Results for Selectel and AMD EPYC 7402P are from <b>Andrey Dudin</b>.<br/>
-Results for ProLiant are from <b>Denis Ustinov</b>.<br/>
-Results for AMD EPYC 7502P 128GiB are from <b>Kostiantyn Velychkovskyi</b>.<br/>
-Results for AMD EPYC 7502P 512GiB are from <b>Sergey Zakharov</b>.<br/>
-Results for Pinebook Pro are from <b>Aleksey R. @kITerE</b>.<br/>
-Results for AMD Ryzen are from <b>Alexey Milovidov</b>. Firefox was running in background.<br/>
-Results for Azure E32s are from <b>Piotr Maśko</b>.<br/>
-Results for MacBook Pro are from <b>Denis Glazachev</b>. MacOS Catalina Version 10.15.4 (19E266). For "drop caches", the "Free Up RAM" in CleanMyMac is used.<br/>
-Results for AMD EPYC 7702 are from <b>Peng Gao</b> in sina.com.<br/>
-Results for Intel NUC are from <b>Alexander Zaitsev</b>, Altinity.<br/>
-Xeon Gold 6230 server is using 4 x SAMSUNG datacenter class SSD in RAID-10.<br/>
-Results for Yandex Managed ClickHouse for "cold cache" are biased and should not be compared, because cache was not flushed for every next query.<br/>
-Results for AWS Lightsail is from <b>Vamsi Krishna B.</b><br/>
-Results for Dell XPS laptop and Google Pixel phone is from <b>Alexander Kuzmenkov</b>.<br/>
-Results for Android phones for "cold cache" are done without cache flushing, so they are not "cold" and cannot be compared.<br/>
-Results for Digital Ocean are from <b>Zimin Aleksey</b>.<br/>
-Results for 2x EPYC 7642 w/ 512 GB RAM (192 Cores) + 12X 1TB SSD (RAID6) are from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
-Results for Raspberry Pi and Digital Ocean CPU-optimized are from <b>Fritz Wijaya</b>.<br/>
-Results for Digitalocean (Storage-intesinve VMs) + (CPU/GP) are from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
-Results for 2x AMD EPYC 7F72 3.2 Ghz (Total 96 Cores, IBM Cloud's Bare Metal Service) from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
-Results for 2x AMD EPYC 7742 (128 physical cores, 1 TB DDR4-3200 RAM) from <b>Yedige Davletgaliyev</b> and <b>Nikita Zhavoronkov</b> of blockchair.com.<br/>
-Results for ASUS A15 (Ryzen laptop) are from <b>Kimmo Linna</b>.<br/>
-Results for MacBook Air M1 are from <b>Denis Glazachev</b>.<br/>
-Results for Xeon Gold 6140 are from <b>Shiv Iyer</b> (ChistaDATA Labs).<br/>
-Comparison of EBS and EFS is from <b>Ramazan Polat</b>.<br/>
-Results for Hetzner and Scaleway are from <b>Anthony Najjar Simon</b> (Panelbear).<br/>
-Results for GCP are from <b>Vy Nguyen Tan</b>.<br/>
-Results for ThinkPad P15 are from <b>Mikhail Shiryaev</b>.<br/>
-Results for RockPi4 are from <b>Kirill Zholnay</b>.<br/>
-Results for Xeon 6266C are from <b>David in Shanghai</b>.<br/>
-Results for SSDNodes and Cavium are from <b>Lorenzo QXIP</b>.<br/>
-Results for AMD EPYC 7662 64-Core Processor are from <b>Evgeniy Kuts</b>.<br/>
-Results for scaleway GP1-S 8x x86 64bit 32GB ram 300gb NVMe are from <b>Dag Vilmar Tveit</b>.<br/>
-Results for scaleway GP1-M 16x x86 64bit 64GB ram 600gb NVMe are from <b>Dag Vilmar Tveit</b>.<br/>
-Results for Intel(R) Core(TM) i5-4440 CPU @ 3.10GHz are from <b>Peter, Chun-Sheng, Li</b>.<br/>
-Results for MacBook Pro M1 are from <b>Filatenkov Arthur</b>.<br/>
-Results for AWS instance type im4gn.4xlarge are from <b>Ananth Gundabattula</b> (Darwinium).<br/>
-Results for AWS instance type im4gn.8xlarge are from <b>Ananth Gundabattula</b> (Darwinium).<br/>
-Results for AWS instance type im4gn.16xlarge are from <b>Ananth Gundabattula</b> (Darwinium).<br/>
-Results for AWS instance type i3.2xlarge are from <b>Ananth Gundabattula</b> (Darwinium).<br/>
-Results for 2x EPYC 7702 on ZFS mirror NVME are from <b>Alibek A</b>.<br/>
-Results for Intel 11th Gen Core i9-11900KF are from <b>Tim Xian</b>.<br/>
-Results for AWS instance type m5a.4xlarge are from <b>Daniel Chimeno</b>.<br/>
-Results for Huawei Taishan 920 are from <b>Yu ZiChange</b> at EioTek.<br/>
-Results for Macbook Pro Intel Core i7 (2014) are from <b>Vladislav</b>.<br/>
-Results for Hetzner EX62-NVME are from <b>Talles Airan</b>.<br/>
-Results for AMD Ryzen 9 5950X are from <b>Stefan</b>.<br/>
-Results for ScaleFlux CSD 3000 are from <b>Cliicy Luo</b> of ScaleFlux.<br/>
-Results for Equinix metal n3.xlarge.x84 are from <b>Dave Cottlehuber</b>.
-Results for Dell PowerEdge R740xd are from <b>Yu ZiChange</b> at EioTek.<br/>
-</p>
-    </div>
-</div>
-{% endblock %}
diff --git a/website/benchmark/hardware/queries.js b/website/benchmark/hardware/queries.js
deleted file mode 100644
index 3e80f71f9cc..00000000000
--- a/website/benchmark/hardware/queries.js
+++ /dev/null
@@ -1,179 +0,0 @@
-var current_data_size = 0;
-
-var current_systems = [];
-
-var queries =
-    [
-        {
-            "query": "SELECT count() FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT count() FROM hits WHERE AdvEngineID != 0",
-            "comment": "",
-        },
-        {
-            "query": "SELECT sum(AdvEngineID), count(), avg(ResolutionWidth) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT sum(UserID) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT uniq(UserID) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT uniq(SearchPhrase) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT min(EventDate), max(EventDate) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT AdvEngineID, count() FROM hits WHERE AdvEngineID != 0 GROUP BY AdvEngineID ORDER BY count() DESC",
-            "comment": "",
-        },
-        {
-            "query": "SELECT RegionID, uniq(UserID) AS u FROM hits GROUP BY RegionID ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT RegionID, sum(AdvEngineID), count() AS c, avg(ResolutionWidth), uniq(UserID) FROM hits GROUP BY RegionID ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT MobilePhoneModel, uniq(UserID) AS u FROM hits WHERE MobilePhoneModel != '' GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT MobilePhone, MobilePhoneModel, uniq(UserID) AS u FROM hits WHERE MobilePhoneModel != '' GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, count() AS c FROM hits WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, uniq(UserID) AS u FROM hits WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchEngineID, SearchPhrase, count() AS c FROM hits WHERE SearchPhrase != '' GROUP BY SearchEngineID, SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, count() FROM hits GROUP BY UserID ORDER BY count() DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, SearchPhrase, count() FROM hits GROUP BY UserID, SearchPhrase ORDER BY count() DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, SearchPhrase, count() FROM hits GROUP BY UserID, SearchPhrase LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, toMinute(EventTime) AS m, SearchPhrase, count() FROM hits GROUP BY UserID, m, SearchPhrase ORDER BY count() DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID FROM hits WHERE UserID = 12345678901234567890",
-            "comment": "",
-        },
-        {
-            "query": "SELECT count() FROM hits WHERE URL LIKE '%metrika%'",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, any(URL), count() AS c FROM hits WHERE URL LIKE '%metrika%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, any(URL), any(Title), count() AS c, uniq(UserID) FROM hits WHERE Title LIKE '%Яндекс%' AND URL NOT LIKE '%.yandex.%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT * FROM hits WHERE URL LIKE '%metrika%' ORDER BY EventTime LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase FROM hits WHERE SearchPhrase != '' ORDER BY EventTime LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase FROM hits WHERE SearchPhrase != '' ORDER BY SearchPhrase LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase FROM hits WHERE SearchPhrase != '' ORDER BY EventTime, SearchPhrase LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT CounterID, avg(length(URL)) AS l, count() AS c FROM hits WHERE URL != '' GROUP BY CounterID HAVING c > 100000 ORDER BY l DESC LIMIT 25",
-            "comment": "",
-        },
-        {
-            "query": "SELECT domainWithoutWWW(Referer) AS key, avg(length(Referer)) AS l, count() AS c, any(Referer) FROM hits WHERE Referer != '' GROUP BY key HAVING c > 100000 ORDER BY l DESC LIMIT 25",
-            "comment": "",
-        },
-        {
-            "query": "SELECT sum(ResolutionWidth), sum(ResolutionWidth + 1), sum(ResolutionWidth + 2), sum(ResolutionWidth + 3), sum(ResolutionWidth + 4), sum(ResolutionWidth + 5), sum(ResolutionWidth + 6), sum(ResolutionWidth + 7), sum(ResolutionWidth + 8), sum(ResolutionWidth + 9), sum(ResolutionWidth + 10), sum(ResolutionWidth + 11), sum(ResolutionWidth + 12), sum(ResolutionWidth + 13), sum(ResolutionWidth + 14), sum(ResolutionWidth + 15), sum(ResolutionWidth + 16), sum(ResolutionWidth + 17), sum(ResolutionWidth + 18), sum(ResolutionWidth + 19), sum(ResolutionWidth + 20), sum(ResolutionWidth + 21), sum(ResolutionWidth + 22), sum(ResolutionWidth + 23), sum(ResolutionWidth + 24), sum(ResolutionWidth + 25), sum(ResolutionWidth + 26), sum(ResolutionWidth + 27), sum(ResolutionWidth + 28), sum(ResolutionWidth + 29), sum(ResolutionWidth + 30), sum(ResolutionWidth + 31), sum(ResolutionWidth + 32), sum(ResolutionWidth + 33), sum(ResolutionWidth + 34), sum(ResolutionWidth + 35), sum(ResolutionWidth + 36), sum(ResolutionWidth + 37), sum(ResolutionWidth + 38), sum(ResolutionWidth + 39), sum(ResolutionWidth + 40), sum(ResolutionWidth + 41), sum(ResolutionWidth + 42), sum(ResolutionWidth + 43), sum(ResolutionWidth + 44), sum(ResolutionWidth + 45), sum(ResolutionWidth + 46), sum(ResolutionWidth + 47), sum(ResolutionWidth + 48), sum(ResolutionWidth + 49), sum(ResolutionWidth + 50), sum(ResolutionWidth + 51), sum(ResolutionWidth + 52), sum(ResolutionWidth + 53), sum(ResolutionWidth + 54), sum(ResolutionWidth + 55), sum(ResolutionWidth + 56), sum(ResolutionWidth + 57), sum(ResolutionWidth + 58), sum(ResolutionWidth + 59), sum(ResolutionWidth + 60), sum(ResolutionWidth + 61), sum(ResolutionWidth + 62), sum(ResolutionWidth + 63), sum(ResolutionWidth + 64), sum(ResolutionWidth + 65), sum(ResolutionWidth + 66), sum(ResolutionWidth + 67), sum(ResolutionWidth + 68), sum(ResolutionWidth + 69), sum(ResolutionWidth + 70), sum(ResolutionWidth + 71), sum(ResolutionWidth + 72), sum(ResolutionWidth + 73), sum(ResolutionWidth + 74), sum(ResolutionWidth + 75), sum(ResolutionWidth + 76), sum(ResolutionWidth + 77), sum(ResolutionWidth + 78), sum(ResolutionWidth + 79), sum(ResolutionWidth + 80), sum(ResolutionWidth + 81), sum(ResolutionWidth + 82), sum(ResolutionWidth + 83), sum(ResolutionWidth + 84), sum(ResolutionWidth + 85), sum(ResolutionWidth + 86), sum(ResolutionWidth + 87), sum(ResolutionWidth + 88), sum(ResolutionWidth + 89) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchEngineID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM hits WHERE SearchPhrase != '' GROUP BY SearchEngineID, ClientIP ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT WatchID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM hits WHERE SearchPhrase != '' GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT WatchID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM hits GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT URL, count() AS c FROM hits GROUP BY URL ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT 1, URL, count() AS c FROM hits GROUP BY 1, URL ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT ClientIP AS x, x - 1, x - 2, x - 3, count() AS c FROM hits GROUP BY x, x - 1, x - 2, x - 3 ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    URL,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT DontCountHits    AND NOT Refresh    AND notEmpty(URL) GROUP BY URL ORDER BY PageViews DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    Title,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT DontCountHits    AND NOT Refresh    AND notEmpty(Title) GROUP BY Title ORDER BY PageViews DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    URL,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh    AND IsLink    AND NOT IsDownload GROUP BY URL ORDER BY PageViews DESC LIMIT 1000",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    TraficSourceID,    SearchEngineID,    AdvEngineID,    ((SearchEngineID = 0 AND AdvEngineID = 0) ? Referer : '') AS Src,    URL AS Dst,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh GROUP BY    TraficSourceID,    SearchEngineID,    AdvEngineID,    Src,    Dst ORDER BY PageViews DESC LIMIT 1000",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    URLHash,    EventDate,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh    AND TraficSourceID IN (-1, 6)    AND RefererHash = halfMD5('http://yandex.ru/') GROUP BY    URLHash,    EventDate ORDER BY PageViews DESC LIMIT 100",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    WindowClientWidth,    WindowClientHeight,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh    AND NOT DontCountHits    AND URLHash = halfMD5('http://yandex.ru/') GROUP BY    WindowClientWidth,    WindowClientHeight ORDER BY PageViews DESC LIMIT 10000;",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    toStartOfMinute(EventTime) AS Minute,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-02')    AND NOT Refresh    AND NOT DontCountHits GROUP BY    Minute ORDER BY Minute;",
-            "comment": "",
-        }
-    ];
diff --git a/website/benchmark/hardware/results/amd_epyc_7402p.json b/website/benchmark/hardware/results/amd_epyc_7402p.json
deleted file mode 100644
index a1dcf5cf267..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7402p.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-    {
-        "system":       "AMD EPYC 7402P SSD",
-        "system_full":      "AMD EPYC 7402P 2.8 GHz, 128 GB DDR4, SSD RAID1 2×1920 GB SSD (INTEL SSDSC2KB019T7)",
-        "time":         "2020-01-26 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.014, 0.002, 0.002],
-            [0.031, 0.014, 0.010],
-            [0.077, 0.015, 0.015],
-            [0.255, 0.020, 0.019],
-            [0.286, 0.075, 0.073],
-            [0.452, 0.136, 0.135],
-            [0.025, 0.012, 0.012],
-            [0.021, 0.011, 0.011],
-            [0.431, 0.188, 0.188],
-            [0.491, 0.213, 0.214],
-            [0.308, 0.099, 0.097],
-            [0.319, 0.102, 0.098],
-            [0.491, 0.247, 0.248],
-            [0.786, 0.323, 0.316],
-            [0.574, 0.291, 0.291],
-            [0.414, 0.266, 0.267],
-            [1.097, 0.847, 0.835],
-            [0.748, 0.507, 0.505],
-            [1.977, 1.467, 1.488],
-            [0.264, 0.018, 0.029],
-            [2.937, 0.281, 0.254],
-            [3.288, 0.301, 0.283],
-            [6.502, 0.698, 0.687],
-            [7.260, 0.358, 0.351],
-            [0.796, 0.096, 0.095],
-            [0.399, 0.084, 0.083],
-            [0.873, 0.099, 0.101],
-            [3.215, 0.318, 0.300],
-            [2.680, 0.394, 0.391],
-            [1.099, 1.058, 1.055],
-            [0.802, 0.250, 0.251],
-            [1.823, 0.340, 0.341],
-            [2.750, 2.168, 2.157],
-            [3.638, 1.301, 1.267],
-            [3.583, 1.289, 1.288],
-            [0.455, 0.392, 0.393],
-            [0.279, 0.170, 0.159],
-            [0.089, 0.068, 0.066],
-            [0.135, 0.063, 0.061],
-            [0.479, 0.329, 0.341],
-            [0.059, 0.021, 0.020],
-            [0.042, 0.018, 0.020],
-            [0.011, 0.006, 0.006]
-        ]
-    },
-    {
-        "system":       "AMD EPYC 7402P HDD",
-        "system_full":       "AMD EPYC 7402P 2.8 GHz, 128 GB DDR4, HDD RAID1 2×8000 GB HDD (TOSHIBA MG06ACA800E)",
-        "time":         "2020-01-26 00:00:00",
-        "kind": "server",
-        "result":
-        [
-            [0.149, 0.002, 0.002],
-            [0.263, 0.012, 0.011],
-            [0.631, 0.017, 0.016],
-            [1.829, 0.023, 0.020],
-            [2.073, 0.078, 0.076],
-            [2.981, 0.176, 0.138],
-            [0.204, 0.022, 0.012],
-            [0.195, 0.011, 0.011],
-            [2.652, 0.195, 0.193],
-            [2.949, 0.226, 0.218],
-            [2.124, 0.101, 0.099],
-            [2.369, 0.106, 0.102],
-            [2.978, 0.254, 0.248],
-            [4.546, 0.328, 0.321],
-            [3.391, 0.298, 0.297],
-            [2.211, 0.269, 0.268],
-            [4.889, 0.850, 0.842],
-            [4.627, 0.514, 0.505],
-            [8.805, 1.506, 1.432],
-            [1.979, 0.034, 0.044],
-            [18.744, 0.315, 0.248],
-            [22.946, 0.301, 0.276],
-            [41.584, 0.703, 0.692],
-            [42.963, 0.392, 0.335],
-            [5.992, 0.130, 0.096],
-            [3.050, 0.096, 0.085],
-            [6.390, 0.115, 0.101],
-            [20.038, 0.319, 0.296],
-            [17.610, 0.408, 0.396],
-            [1.187, 1.056, 1.055],
-            [5.134, 0.254, 0.249],
-            [10.690, 0.348, 0.341],
-            [9.296, 2.190, 2.149],
-            [20.999, 1.258, 1.258],
-            [22.020, 1.256, 1.254],
-            [1.715, 0.400, 0.390],
-            [0.403, 0.169, 0.164],
-            [0.147, 0.069, 0.069],
-            [0.137, 0.063, 0.062],
-            [0.568, 0.344, 0.359],
-            [0.152, 0.027, 0.021],
-            [0.076, 0.018, 0.017],
-            [0.021, 0.006, 0.006]
-        ]
-    },
-    {
-        "system":       "AMD EPYC 7502P nVME",
-        "system_full":       "AMD EPYC 7502P / 128G DDR4 / 2NVME SAMSUNG MZQLB960HAJR",
-        "time":         "2020-03-05 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.012, 0.019, 0.009],
-            [0.042, 0.026, 0.038],
-            [0.026, 0.032, 0.017],
-            [0.058, 0.025, 0.027],
-            [0.095, 0.080, 0.087],
-            [0.143, 0.125, 0.124],
-            [0.018, 0.010, 0.016],
-            [0.013, 0.012, 0.013],
-            [0.201, 0.182, 0.182],
-            [0.228, 0.204, 0.204],
-            [0.093, 0.078, 0.077],
-            [0.100, 0.080, 0.081],
-            [0.241, 0.222, 0.218],
-            [0.291, 0.265, 0.270],
-            [0.268, 0.254, 0.256],
-            [0.255, 0.241, 0.242],
-            [0.623, 0.593, 0.599],
-            [0.373, 0.343, 0.339],
-            [1.354, 1.318, 1.311],
-            [0.054, 0.020, 0.022],
-            [0.495, 0.247, 0.242],
-            [0.520, 0.258, 0.248],
-            [0.957, 0.646, 0.652],
-            [null, null, null],
-            [0.149, 0.105, 0.099],
-            [0.091, 0.070, 0.069],
-            [0.150, 0.096, 0.094],
-            [0.499, 0.315, 0.309],
-            [0.437, 0.354, 0.357],
-            [1.002, 0.996, 0.991],
-            [0.234, 0.205, 0.207],
-            [0.380, 0.305, 0.305],
-            [1.733, 1.651, 1.655],
-            [1.230, 1.134, 1.132],
-            [1.217, 1.130, 1.114],
-            [0.396, 0.385, 0.383],
-            [0.156, 0.148, 0.160],
-            [0.065, 0.062, 0.063],
-            [0.057, 0.052, 0.052],
-            [0.368, 0.342, 0.336],
-            [0.030, 0.025, 0.027],
-            [0.022, 0.017, 0.019],
-            [0.005, 0.004, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_epyc_7502p.json b/website/benchmark/hardware/results/amd_epyc_7502p.json
deleted file mode 100644
index 0f82bd7dfc8..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7502p.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AMD EPYC 7502P",
-        "system_full":       "AMD EPYC 7502P 32-Core Processor with HT (64 thread) / 512 Gb RAM / mdadm RAID1 SAMSUNG MZQLB3T8HALS-00007 + LVM",
-        "time":         "2020-04-16 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.007, 0.002, 0.002],
-            [0.022, 0.011, 0.011],
-            [0.028, 0.017, 0.017],
-            [0.050, 0.022, 0.022],
-            [0.098, 0.079, 0.078],
-            [0.149, 0.125, 0.126],
-            [0.020, 0.014, 0.014],
-            [0.015, 0.013, 0.013],
-            [0.169, 0.148, 0.148],
-            [0.237, 0.171, 0.168],
-            [0.103, 0.084, 0.082],
-            [0.099, 0.085, 0.084],
-            [0.262, 0.221, 0.221],
-            [0.312, 0.281, 0.282],
-            [0.274, 0.259, 0.255],
-            [0.255, 0.237, 0.237],
-            [0.616, 0.592, 0.589],
-            [0.398, 0.364, 0.359],
-            [1.358, 1.301, 1.292],
-            [0.056, 0.025, 0.022],
-            [0.485, 0.265, 0.263],
-            [0.510, 0.271, 0.255],
-            [0.938, 0.693, 0.674],
-            [1.262, 0.396, 0.367],
-            [0.144, 0.082, 0.081],
-            [0.088, 0.066, 0.065],
-            [0.141, 0.084, 0.082],
-            [0.488, 0.329, 0.325],
-            [0.441, 0.376, 0.374],
-            [1.054, 1.049, 1.068],
-            [0.222, 0.190, 0.189],
-            [0.386, 0.321, 0.319],
-            [1.703, 1.625, 1.660],
-            [1.272, 1.202, 1.207],
-            [1.276, 1.185, 1.204],
-            [0.398, 0.382, 0.382],
-            [0.171, 0.160, 0.160],
-            [0.071, 0.058, 0.059],
-            [0.059, 0.055, 0.053],
-            [0.364, 0.341, 0.354],
-            [0.028, 0.022, 0.027],
-            [0.027, 0.020, 0.018],
-            [0.010, 0.008, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_epyc_7551.json b/website/benchmark/hardware/results/amd_epyc_7551.json
deleted file mode 100644
index 9ae945a0d32..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7551.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Dell PowerEdge R6415",
-        "system_full":  "Dell PowerEdge R6415 DX180 AMD EPYC™ 7551P 32-Core Naples (Zen), 128 GB RAM, 2x SSD 960 GB RAID-1",
-        "cpu_vendor":   "AMD",
-        "time":         "2020-01-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.007, 0.002, 0.001],
-            [0.030, 0.016, 0.014],
-            [0.042, 0.026, 0.026],
-            [0.078, 0.043, 0.042],
-            [0.143, 0.120, 0.117],
-            [0.239, 0.198, 0.198],
-            [0.022, 0.014, 0.014],
-            [0.016, 0.013, 0.015],
-            [0.388, 0.380, 0.384],
-            [0.476, 0.429, 0.411],
-            [0.201, 0.192, 0.191],
-            [0.204, 0.207, 0.192],
-            [0.676, 0.654, 0.637],
-            [0.890, 0.932, 0.940],
-            [0.730, 0.789, 0.738],
-            [0.658, 0.641, 0.678],
-            [1.556, 1.430, 1.529],
-            [0.819, 1.096, 0.906],
-            [3.569, 3.626, 3.508],
-            [0.083, 0.047, 0.077],
-            [0.812, 1.010, 0.601],
-            [1.097, 0.847, 0.864],
-            [2.654, 3.146, 3.169],
-            [1.595, 0.922, 0.877],
-            [0.259, 0.227, 0.236],
-            [0.206, 0.187, 0.181],
-            [0.245, 0.235, 0.232],
-            [0.974, 1.018, 1.012],
-            [1.280, 1.398, 1.243],
-            [2.171, 2.270, 2.284],
-            [0.594, 0.592, 0.602],
-            [0.976, 0.946, 0.966],
-            [4.543, 4.471, 4.364],
-            [3.844, 4.052, 3.858],
-            [3.932, 3.961, 3.982],
-            [1.128, 1.117, 1.146],
-            [0.233, 0.216, 0.221],
-            [0.088, 0.082, 0.085],
-            [0.075, 0.070, 0.070],
-            [0.465, 0.445, 0.435],
-            [0.036, 0.026, 0.031],
-            [0.028, 0.024, 0.021],
-            [0.010, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_epyc_7642.json b/website/benchmark/hardware/results/amd_epyc_7642.json
deleted file mode 100644
index b60146d515f..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7642.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "AMD EPYC 7642",
-        "system_full":  "2x AMD EPYC 7642 / 512 GB RAM / 12x 1TB SSD (RAID 6)",
-        "time":         "2020-09-21 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.003, 0.003, 0.002],
-            [0.039, 0.041, 0.024],
-            [0.052, 0.029, 0.029],
-            [0.087, 0.031, 0.032],
-            [0.152, 0.106, 0.105],
-            [0.204, 0.128, 0.128],
-            [0.049, 0.028, 0.027],
-            [0.031, 0.024, 0.027],
-            [0.190, 0.130, 0.125],
-            [0.210, 0.142, 0.138],
-            [0.142, 0.091, 0.087],
-            [0.143, 0.101, 0.097],
-            [0.318, 0.170, 0.163],
-            [0.303, 0.193, 0.191],
-            [0.240, 0.175, 0.166],
-            [0.200, 0.166, 0.161],
-            [0.466, 0.364, 0.345],
-            [0.298, 0.244, 0.231],
-            [1.288, 0.901, 0.859],
-            [0.087, 0.031, 0.025],
-            [0.663, 0.201, 0.191],
-            [0.661, 0.213, 0.154],
-            [1.118, 0.599, 0.593],
-            [1.708, 0.392, 0.318],
-            [0.202, 0.065, 0.066],
-            [0.135, 0.061, 0.057],
-            [0.203, 0.066, 0.067],
-            [0.630, 0.296, 0.290],
-            [0.578, 0.281, 0.262],
-            [0.662, 0.670, 0.639],
-            [0.241, 0.153, 0.150],
-            [0.424, 0.235, 0.231],
-            [1.505, 1.090, 1.090],
-            [1.038, 0.818, 0.799],
-            [1.064, 0.856, 0.809],
-            [0.332, 0.297, 0.275],
-            [0.200, 0.169, 0.168],
-            [0.083, 0.070, 0.071],
-            [0.090, 0.059, 0.063],
-            [0.416, 0.419, 0.398],
-            [0.048, 0.032, 0.032],
-            [0.036, 0.027, 0.025],
-            [0.007, 0.007, 0.007]
-        ]
-    }
-]
-
-
diff --git a/website/benchmark/hardware/results/amd_epyc_7662.json b/website/benchmark/hardware/results/amd_epyc_7662.json
deleted file mode 100644
index 436c0099992..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7662.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AMD EPYC 7662",
-        "system_full":  "AMD EPYC 7662 64-Core Processor",
-        "time":         "2022-01-26 11:28:55",
-        "kind":         "server",
-        "result":
-        [
-            [0.001, 0.001, 0.001],
-            [0.037, 0.019, 0.020],
-            [0.082, 0.034, 0.026],
-            [0.298, 0.045, 0.038],
-            [0.424, 0.188, 0.178],
-            [0.594, 0.229, 0.227],
-            [0.037, 0.028, 0.032],
-            [0.060, 0.028, 0.027],
-            [0.496, 0.185, 0.192],
-            [0.611, 0.210, 0.214],
-            [0.400, 0.148, 0.137],
-            [0.424, 0.155, 0.144],
-            [0.639, 0.256, 0.239],
-            [0.944, 0.404, 0.309],
-            [0.699, 0.326, 0.288],
-            [0.461, 0.221, 0.216],
-            [1.176, 0.539, 0.561],
-            [1.070, 0.410, 0.426],
-            [2.080, 0.950, 0.866],
-            [0.351, 0.066, 0.130],
-            [3.248, 0.461, 0.313],
-            [3.612, 0.261, 0.231],
-            [6.720, 0.682, 0.671],
-            [6.300, 0.517, 0.488],
-            [0.982, 0.136, 0.125],
-            [0.531, 0.112, 0.109],
-            [1.006, 0.133, 0.118],
-            [3.184, 0.324, 0.310],
-            [2.799, 0.327, 0.308],
-            [0.569, 0.492, 0.493],
-            [0.900, 0.212, 0.221],
-            [1.925, 0.353, 0.326],
-            [2.489, 1.173, 1.248],
-            [3.626, 0.990, 0.897],
-            [3.743, 0.935, 0.915],
-            [0.419, 0.311, 0.339],
-            [0.278, 0.244, 0.236],
-            [0.111, 0.099, 0.098],
-            [0.139, 0.086, 0.084],
-            [0.664, 0.520, 0.552],
-            [0.072, 0.028, 0.036],
-            [0.050, 0.031, 0.022],
-            [0.005, 0.005, 0.011]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_epyc_7702.json b/website/benchmark/hardware/results/amd_epyc_7702.json
deleted file mode 100644
index cd92fbfd1dc..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7702.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AMD EPYC 7702",
-        "system_full":  "AMD EPYC 7702, 256 cores, 512 GiB, NVMe SSD",
-        "time":         "2020-04-09 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.006, 0.002, 0.002],
-            [0.252, 0.072, 0.057],
-            [0.113, 0.066, 0.057],
-            [0.197, 0.055, 0.065],
-            [0.311, 0.199, 0.217],
-            [0.360, 0.200, 0.183],
-            [0.119, 0.050, 0.045],
-            [0.066, 0.061, 0.057],
-            [0.320, 0.150, 0.144],
-            [0.346, 0.170, 0.162],
-            [0.226, 0.117, 0.115],
-            [0.265, 0.112, 0.118],
-            [0.402, 0.249, 0.250],
-            [0.561, 0.327, 0.332],
-            [0.397, 0.267, 0.257],
-            [0.323, 0.221, 0.233],
-            [0.710, 0.527, 0.517],
-            [0.667, 0.437, 0.443],
-            [1.269, 0.936, 0.957],
-            [0.189, 0.043, 0.043],
-            [1.673, 0.206, 0.169],
-            [1.937, 0.214, 0.184],
-            [3.527, 0.755, 0.737],
-            [3.197, 0.551, 0.523],
-            [0.519, 0.076, 0.086],
-            [0.268, 0.060, 0.080],
-            [0.522, 0.075, 0.079],
-            [1.693, 0.345, 0.351],
-            [1.466, 0.330, 0.318],
-            [1.078, 0.974, 1.019],
-            [0.501, 0.196, 0.200],
-            [1.032, 0.266, 0.271],
-            [1.621, 1.156, 1.169],
-            [2.089, 0.998, 0.972],
-            [2.106, 0.974, 0.959],
-            [0.366, 0.305, 0.305],
-            [0.190, 0.187, 0.183],
-            [0.071, 0.066, 0.075],
-            [0.072, 0.068, 0.062],
-            [0.415, 0.353, 0.457],
-            [0.034, 0.032, 0.028],
-            [0.031, 0.027, 0.032],
-            [0.024, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_epyc_7702_zfs.json b/website/benchmark/hardware/results/amd_epyc_7702_zfs.json
deleted file mode 100644
index 9e7c15f579f..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7702_zfs.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "2x EPYC 7702 on ZFS mirror NVME",
-        "system_full":  "2x EPYC 7702 on ZFS mirror NVME, AMD EPYC 7702 64-Core Processor",
-        "time":         "2022-01-14 21:07:13",
-        "kind":         "server",
-        "result":
-        [
-            [0.001, 0.002, 0.001],
-            [0.033, 0.021, 0.022],
-            [0.026, 0.022, 0.024],
-            [0.032, 0.024, 0.027],
-            [0.114, 0.115, 0.116],
-            [0.156, 0.150, 0.156],
-            [0.035, 0.023, 0.022],
-            [0.035, 0.023, 0.023],
-            [0.134, 0.148, 0.133],
-            [0.165, 0.150, 0.156],
-            [0.132, 0.087, 0.083],
-            [0.103, 0.124, 0.094],
-            [0.273, 0.221, 0.229],
-            [0.305, 0.263, 0.267],
-            [0.273, 0.267, 0.239],
-            [0.210, 0.228, 0.241],
-            [0.641, 0.518, 0.498],
-            [0.413, 0.423, 0.485],
-            [1.044, 0.991, 0.999],
-            [0.091, 0.144, 0.071],
-            [0.203, 0.190, 0.203],
-            [0.199, 0.210, 0.189],
-            [0.662, 0.753, 0.705],
-            [0.636, 0.461, 0.445],
-            [0.093, 0.079, 0.082],
-            [0.066, 0.070, 0.072],
-            [0.086, 0.080, 0.091],
-            [0.293, 0.280, 0.298],
-            [0.301, 0.258, 0.268],
-            [0.624, 0.611, 0.613],
-            [0.170, 0.168, 0.170],
-            [0.317, 0.269, 0.273],
-            [1.801, 1.071, 1.183],
-            [1.049, 1.080, 0.957],
-            [0.904, 0.892, 0.898],
-            [0.293, 0.288, 0.291],
-            [0.176, 0.173, 0.176],
-            [0.068, 0.068, 0.070],
-            [0.060, 0.060, 0.061],
-            [0.412, 0.388, 0.382],
-            [0.021, 0.019, 0.019],
-            [0.019, 0.022, 0.015],
-            [0.004, 0.010, 0.009]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_epyc_7742.json b/website/benchmark/hardware/results/amd_epyc_7742.json
deleted file mode 100644
index 61b76d9e37b..00000000000
--- a/website/benchmark/hardware/results/amd_epyc_7742.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AMD EPYC 7742",
-        "system_full":  "AMD EPYC 7742, 256 cores, 1 TiB Samsung 16x64GB DDR4-3200 ECC, 2 * Samsung PM1725b 12.8TB (RAID 0)",
-        "time":         "2021-02-23 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.001, 0.001, 0.001],
-[0.075, 0.080, 0.015],
-[0.030, 0.029, 0.025],
-[0.052, 0.027, 0.028],
-[0.141, 0.104, 0.105],
-[0.180, 0.127, 0.129],
-[0.023, 0.018, 0.017],
-[0.018, 0.016, 0.016],
-[0.135, 0.097, 0.096],
-[0.146, 0.109, 0.108],
-[0.106, 0.070, 0.069],
-[0.105, 0.068, 0.070],
-[0.180, 0.137, 0.136],
-[0.216, 0.171, 0.175],
-[0.193, 0.160, 0.156],
-[0.148, 0.123, 0.132],
-[0.364, 0.317, 0.317],
-[0.276, 0.245, 0.240],
-[0.636, 0.562, 0.615],
-[0.070, 0.018, 0.015],
-[0.576, 0.131, 0.125],
-[0.595, 0.124, 0.121],
-[0.861, 0.596, 0.610],
-[1.172, 0.262, 0.276],
-[0.152, 0.054, 0.050],
-[0.114, 0.046, 0.046],
-[0.149, 0.052, 0.051],
-[0.536, 0.288, 0.306],
-[0.587, 0.207, 0.217],
-[0.436, 0.419, 0.406],
-[0.178, 0.110, 0.113],
-[0.337, 0.165, 0.162],
-[1.072, 0.855, 0.882],
-[0.908, 0.600, 0.612],
-[0.904, 0.604, 0.629],
-[0.223, 0.207, 0.216],
-[0.151, 0.143, 0.172],
-[0.063, 0.061, 0.060],
-[0.059, 0.053, 0.054],
-[0.321, 0.318, 0.321],
-[0.026, 0.021, 0.020],
-[0.018, 0.015, 0.016],
-[0.005, 0.005, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_ryzen_9_3950x.json b/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
deleted file mode 100644
index caa5a443e54..00000000000
--- a/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-    {
-        "system":       "AMD Ryzen 9 (2020)",
-        "system_full":       "AMD Ryzen 9 3950X 16-Core Processor, 64 GiB RAM, Intel Optane 900P 280 GB",
-        "time":         "2020-03-14 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-            [0.002, 0.001, 0.001],
-            [0.018, 0.013, 0.012],
-            [0.041, 0.027, 0.026],
-            [0.091, 0.040, 0.041],
-            [0.115, 0.075, 0.074],
-            [0.201, 0.157, 0.153],
-            [0.017, 0.015, 0.014],
-            [0.013, 0.013, 0.013],
-            [0.363, 0.321, 0.313],
-            [0.441, 0.390, 0.389],
-            [0.189, 0.164, 0.162],
-            [0.201, 0.172, 0.178],
-            [0.879, 0.809, 0.802],
-            [1.081, 1.030, 1.027],
-            [0.875, 0.832, 0.837],
-            [1.042, 1.013, 1.019],
-            [2.604, 2.544, 2.529],
-            [1.435, 1.396, 1.414],
-            [4.208, 4.148, 4.132],
-            [0.094, 0.052, 0.037],
-            [0.965, 0.451, 0.450],
-            [1.141, 0.762, 0.763],
-            [2.813, 2.378, 2.383],
-            [2.127, 0.749, 0.733],
-            [0.301, 0.228, 0.228],
-            [0.218, 0.180, 0.174],
-            [0.301, 0.228, 0.227],
-            [1.241, 0.965, 0.958],
-            [1.469, 1.271, 1.274],
-            [3.782, 3.780, 3.762],
-            [0.738, 0.656, 0.655],
-            [1.147, 1.015, 1.009],
-            [7.114, 6.989, 7.074],
-            [4.277, 4.085, 4.069],
-            [4.256, 4.032, 4.073],
-            [1.811, 1.787, 1.785],
-            [0.138, 0.128, 0.129],
-            [0.057, 0.051, 0.053],
-            [0.058, 0.051, 0.047],
-            [0.283, 0.284, 0.278],
-            [0.023, 0.024, 0.027],
-            [0.024, 0.015, 0.021],
-            [0.007, 0.013, 0.006]
-        ]
-    },
-    {
-        "system":       "AMD Ryzen 9 (2021)",
-        "system_full":       "AMD Ryzen 9 3950X 16-Core Processor, 64 GiB RAM, Samsung evo 970 plus 1TB",
-        "time":         "2021-03-08 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.013, 0.011, 0.010],
-[0.030, 0.023, 0.023],
-[0.071, 0.033, 0.031],
-[0.090, 0.068, 0.066],
-[0.165, 0.137, 0.137],
-[0.015, 0.014, 0.015],
-[0.013, 0.012, 0.012],
-[0.317, 0.268, 0.261],
-[0.337, 0.303, 0.301],
-[0.108, 0.089, 0.091],
-[0.127, 0.110, 0.114],
-[0.714, 0.690, 0.643],
-[0.888, 0.835, 0.809],
-[0.748, 0.727, 0.704],
-[0.666, 0.653, 0.652],
-[1.868, 1.821, 1.826],
-[1.007, 0.958, 0.957],
-[4.466, 4.371, 4.377],
-[0.074, 0.027, 0.027],
-[0.748, 0.326, 0.307],
-[0.844, 0.427, 0.408],
-[2.040, 1.545, 1.552],
-[1.392, 0.609, 0.560],
-[0.237, 0.155, 0.142],
-[0.140, 0.112, 0.114],
-[0.233, 0.151, 0.146],
-[0.790, 0.567, 0.545],
-[0.981, 0.751, 0.752],
-[3.532, 3.522, 3.516],
-[0.505, 0.478, 0.456],
-[1.078, 0.959, 0.959],
-[5.653, 5.600, 5.570],
-[3.572, 3.399, 3.405],
-[3.619, 3.445, 3.429],
-[1.176, 1.174, 1.165],
-[0.140, 0.127, 0.124],
-[0.054, 0.052, 0.052],
-[0.052, 0.049, 0.048],
-[0.275, 0.265, 0.265],
-[0.025, 0.024, 0.025],
-[0.020, 0.021, 0.019],
-[0.006, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/amd_ryzen_9_5950x.json b/website/benchmark/hardware/results/amd_ryzen_9_5950x.json
deleted file mode 100644
index 0f7f4194960..00000000000
--- a/website/benchmark/hardware/results/amd_ryzen_9_5950x.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AMD Ryzen 9 (2022)",
-        "system_full":  " AMD Ryzen 9 5950X 16-Core Processor, 125Gi RAM",
-        "time":         "2022-05-03 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-            [0.001, 0.001, 0.010],
-            [0.008, 0.006, 0.006],
-            [0.017, 0.014, 0.014],
-            [0.039, 0.022, 0.028],
-            [0.074, 0.064, 0.074],
-            [0.150, 0.128, 0.133],
-            [0.001, 0.001, 0.001],
-            [0.006, 0.007, 0.006],
-            [0.215, 0.195, 0.197],
-            [0.247, 0.221, 0.221],
-            [0.100, 0.089, 0.098],
-            [0.112, 0.111, 0.111],
-            [0.467, 0.445, 0.444],
-            [0.588, 0.563, 0.554],
-            [0.521, 0.482, 0.485],
-            [0.503, 0.616, 0.619],
-            [1.465, 1.636, 1.630],
-            [0.907, 0.881, 0.893],
-            [3.401, 2.832, 2.822],
-            [0.040, 0.025, 0.022],
-            [0.465, 0.322, 0.309],
-            [0.501, 0.356, 0.358],
-            [1.207, 0.944, 0.938],
-            [0.869, 0.415, 0.401],
-            [0.143, 0.101, 0.099],
-            [0.101, 0.090, 0.090],
-            [0.139, 0.096, 0.096],
-            [0.467, 0.332, 0.317],
-            [0.558, 0.468, 0.464],
-            [2.288, 2.128, 2.058],
-            [0.322, 0.285, 0.283],
-            [0.768, 0.545, 0.537],
-            [4.126, 4.078, 4.155],
-            [2.730, 2.511, 2.510],
-            [2.658, 2.536, 2.566],
-            [0.877, 0.732, 0.747],
-            [0.096, 0.085, 0.082],
-            [0.038, 0.035, 0.036],
-            [0.038, 0.034, 0.034],
-            [0.228, 0.218, 0.219],
-            [0.014, 0.014, 0.016],
-            [0.016, 0.013, 0.010],
-            [0.003, 0.006, 0.003]
-        ]
-    }
-]
\ No newline at end of file
diff --git a/website/benchmark/hardware/results/amd_ryzen_threadripper.json b/website/benchmark/hardware/results/amd_ryzen_threadripper.json
deleted file mode 100644
index d6d239fda14..00000000000
--- a/website/benchmark/hardware/results/amd_ryzen_threadripper.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AMD Ryzen Threadripper PRO 3995WX 64-Cores",
-        "system_full":  "AMD Ryzen Threadripper PRO 3995WX 64-Cores, 256 GB RAM (8-channel)",
-        "time":         "2022-07-11 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-[0.003, 0.015, 0.002],
-[0.259, 0.140, 0.041],
-[0.072, 0.047, 0.050],
-[0.046, 0.038, 0.020],
-[0.107, 0.092, 0.088],
-[0.137, 0.122, 0.117],
-[0.004, 0.002, 0.001],
-[0.054, 0.050, 0.067],
-[0.155, 0.132, 0.122],
-[0.180, 0.129, 0.134],
-[0.103, 0.083, 0.089],
-[0.105, 0.088, 0.081],
-[0.212, 0.189, 0.177],
-[0.244, 0.220, 0.221],
-[0.212, 0.183, 0.177],
-[0.169, 0.198, 0.192],
-[0.492, 0.533, 0.537],
-[0.354, 0.365, 0.349],
-[1.097, 1.108, 1.075],
-[0.105, 0.057, 0.051],
-[0.465, 0.246, 0.196],
-[0.486, 0.273, 0.178],
-[0.867, 0.755, 0.704],
-[0.743, 0.290, 0.233],
-[0.137, 0.059, 0.057],
-[0.079, 0.050, 0.058],
-[0.134, 0.067, 0.061],
-[0.436, 0.254, 0.244],
-[0.392, 0.255, 0.252],
-[0.832, 0.834, 0.827],
-[0.163, 0.115, 0.115],
-[0.318, 0.214, 0.217],
-[1.596, 1.535, 1.526],
-[1.192, 1.201, 1.028],
-[1.075, 0.983, 0.979],
-[0.319, 0.365, 0.365],
-[0.070, 0.062, 0.065],
-[0.045, 0.026, 0.026],
-[0.036, 0.030, 0.033],
-[0.165, 0.135, 0.140],
-[0.032, 0.023, 0.014],
-[0.016, 0.010, 0.019],
-[0.011, 0.005, 0.008]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/asus_a15.json b/website/benchmark/hardware/results/asus_a15.json
deleted file mode 100644
index 983dbde8681..00000000000
--- a/website/benchmark/hardware/results/asus_a15.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Asus A15",
-        "system_full":  "Asus A15 (16 × AMD Ryzen 7 4800H, 16 GiB RAM)",
-        "time":         "2021-03-23 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-[0.004, 0.003, 0.003],
-[0.019, 0.013, 0.012],
-[0.053, 0.041, 0.037],
-[0.106, 0.057, 0.056],
-[0.158, 0.115, 0.110],
-[0.324, 0.266, 0.262],
-[0.027, 0.024, 0.026],
-[0.017, 0.016, 0.017],
-[0.644, 0.589, 0.582],
-[0.733, 0.679, 0.679],
-[0.233, 0.201, 0.197],
-[0.276, 0.235, 0.236],
-[1.025, 0.962, 0.962],
-[1.342, 1.270, 1.264],
-[1.170, 1.129, 1.124],
-[1.375, 1.346, 1.351],
-[3.271, 3.210, 3.242],
-[1.960, 1.898, 1.907],
-[5.997, 5.965, 5.983],
-[0.106, 0.065, 0.055],
-[1.264, 0.990, 0.989],
-[1.555, 1.241, 1.239],
-[3.798, 3.307, 3.280],
-[1.949, 1.022, 0.995],
-[0.393, 0.292, 0.292],
-[0.307, 0.254, 0.255],
-[0.378, 0.297, 0.290],
-[1.632, 1.399, 1.386],
-[2.111, 1.909, 1.900],
-[3.349, 3.352, 3.357],
-[0.892, 0.824, 0.816],
-[1.505, 1.392, 1.378],
-[9.105, 8.951, 8.914],
-[5.195, 4.975, 4.919],
-[5.150, 5.021, 4.955],
-[1.756, 1.743, 1.749],
-[0.161, 0.154, 0.158],
-[0.108, 0.058, 0.055],
-[0.101, 0.102, 0.052],
-[0.365, 0.309, 0.334],
-[0.050, 0.023, 0.023],
-[0.037, 0.019, 0.015],
-[0.023, 0.013, 0.018]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_a1_4xlarge.json b/website/benchmark/hardware/results/aws_a1_4xlarge.json
deleted file mode 100644
index 7367732efa6..00000000000
--- a/website/benchmark/hardware/results/aws_a1_4xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS a1.4xlarge",
-        "system_full":       "AWS a1.4xlarge (Graviton) 16 vCPU, 2.3 GHz, 32 GiB RAM, EBS",
-        "time":         "2020-02-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.012, 0.003, 0.003],
-            [0.073, 0.031, 0.031],
-            [0.098, 0.053, 0.053],
-            [0.209, 0.139, 0.141],
-            [0.251, 0.200, 0.202],
-            [0.662, 0.439, 0.436],
-            [0.062, 0.041, 0.041],
-            [0.040, 0.033, 0.032],
-            [3.379, 0.720, 0.722],
-            [0.934, 0.847, 0.845],
-            [0.436, 0.379, 0.377],
-            [0.500, 0.417, 0.430],
-            [1.536, 1.381, 1.373],
-            [1.956, 1.832, 1.855],
-            [1.527, 1.458, 1.466],
-            [1.613, 1.576, 1.581],
-            [3.644, 3.490, 3.530],
-            [2.143, 1.982, 1.965],
-            [7.808, 7.617, 7.764],
-            [0.390, 0.179, 0.168],
-            [8.797, 2.308, 2.257],
-            [10.138, 2.533, 2.517],
-            [19.626, 5.738, 5.707],
-            [20.183, 2.195, 2.156],
-            [1.841, 0.577, 0.578],
-            [0.535, 0.479, 0.476],
-            [1.830, 0.578, 0.577],
-            [8.786, 2.521, 2.524],
-            [7.364, 2.941, 2.926],
-            [3.373, 3.186, 3.203],
-            [1.641, 1.213, 1.209],
-            [4.890, 1.964, 1.913],
-            [10.442, 10.410, 10.427],
-            [11.183, 7.431, 7.402],
-            [11.175, 7.460, 7.487],
-            [2.317, 2.232, 2.221],
-            [0.473, 0.406, 0.418],
-            [0.201, 0.187, 0.183],
-            [0.193, 0.144, 0.160],
-            [0.901, 0.811, 0.836],
-            [0.090, 0.046, 0.041],
-            [0.053, 0.032, 0.033],
-            [0.015, 0.012, 0.012]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c5a_24xlarge.json b/website/benchmark/hardware/results/aws_c5a_24xlarge.json
deleted file mode 100644
index a2c4c8945ef..00000000000
--- a/website/benchmark/hardware/results/aws_c5a_24xlarge.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-    {
-        "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_c5metal_100.json b/website/benchmark/hardware/results/aws_c5metal_100.json
deleted file mode 100644
index 4bb0a1f1f52..00000000000
--- a/website/benchmark/hardware/results/aws_c5metal_100.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c5.metal 100GB",
-        "system_full":  "AWS c5.metal 96vCPU 192GiB 100GB SSD",
-        "time":         "2020-01-17 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.013, 0.003, 0.002],
-            [0.056, 0.019, 0.018],
-            [0.107, 0.028, 0.028],
-            [0.812, 0.033, 0.033],
-            [1.609, 0.094, 0.092],
-            [2.326, 0.132, 0.132],
-            [0.038, 0.022, 0.024],
-            [0.024, 0.018, 0.018],
-            [1.550, 0.173, 0.169],
-            [2.113, 0.192, 0.184],
-            [1.236, 0.097, 0.093],
-            [1.507, 0.101, 0.100],
-            [2.331, 0.251, 0.240],
-            [3.702, 0.310, 0.296],
-            [2.155, 0.296, 0.280],
-            [1.051, 0.317, 0.332],
-            [3.714, 0.737, 0.710],
-            [3.429, 0.469, 0.451],
-            [6.934, 1.432, 1.397],
-            [0.687, 0.050, 0.038],
-            [18.873, 0.327, 0.258],
-            [20.783, 0.331, 0.310],
-            [38.997, 0.780, 0.754],
-            [39.683, 0.437, 0.387],
-            [4.477, 0.104, 0.094],
-            [2.286, 0.096, 0.094],
-            [5.133, 0.101, 0.095],
-            [18.727, 0.323, 0.311],
-            [15.252, 0.461, 0.445],
-            [0.892, 0.835, 0.843],
-            [3.458, 0.238, 0.230],
-            [9.557, 0.351, 0.340],
-            [7.828, 2.075, 2.031],
-            [18.546, 1.063, 1.000],
-            [18.519, 1.187, 1.136],
-            [0.517, 0.425, 0.427],
-            [0.269, 0.175, 0.177],
-            [0.109, 0.083, 0.081],
-            [0.112, 0.075, 0.076],
-            [0.551, 0.379, 0.351],
-            [0.085, 0.047, 0.047],
-            [0.072, 0.038, 0.034],
-            [0.021, 0.022, 0.008]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c5metal_300.json b/website/benchmark/hardware/results/aws_c5metal_300.json
deleted file mode 100644
index 87435f6fb45..00000000000
--- a/website/benchmark/hardware/results/aws_c5metal_300.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c5.metal 300GB",
-        "system_full":  "AWS c5.metal 96vCPU 192GiB 300GB SSD",
-        "time":         "2020-09-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.012, 0.002, 0.002],
-[0.066, 0.018, 0.018],
-[0.066, 0.028, 0.027],
-[0.186, 0.033, 0.031],
-[0.362, 0.095, 0.093],
-[1.092, 0.141, 0.142],
-[0.035, 0.020, 0.021],
-[0.023, 0.018, 0.018],
-[0.303, 0.176, 0.181],
-[0.817, 0.198, 0.198],
-[0.322, 0.091, 0.092],
-[0.600, 0.098, 0.098],
-[1.059, 0.265, 0.253],
-[1.542, 0.318, 0.310],
-[0.682, 0.286, 0.283],
-[0.372, 0.320, 0.295],
-[1.610, 0.832, 0.750],
-[1.301, 0.492, 0.458],
-[3.446, 1.361, 1.330],
-[0.189, 0.050, 0.035],
-[9.246, 0.338, 0.265],
-[10.163, 0.277, 0.249],
-[19.616, 0.663, 0.639],
-[20.068, 0.418, 0.367],
-[1.812, 0.097, 0.093],
-[0.976, 0.090, 0.083],
-[2.458, 0.097, 0.095],
-[9.397, 0.344, 0.323],
-[7.320, 0.415, 0.413],
-[0.780, 0.753, 0.748],
-[1.328, 0.226, 0.223],
-[4.643, 0.339, 0.329],
-[4.136, 2.049, 2.021],
-[9.213, 1.080, 0.923],
-[9.192, 1.019, 0.959],
-[0.410, 0.360, 0.378],
-[0.244, 0.155, 0.163],
-[0.102, 0.077, 0.071],
-[0.045, 0.055, 0.049],
-[0.459, 0.318, 0.316],
-[0.069, 0.033, 0.026],
-[0.035, 0.027, 0.020],
-[0.019, 0.009, 0.010]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c6a_metal.json b/website/benchmark/hardware/results/aws_c6a_metal.json
deleted file mode 100644
index adaf3cce48d..00000000000
--- a/website/benchmark/hardware/results/aws_c6a_metal.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c6a.metal",
-        "system_full":  "AWS c6a.metal 192 vCPU (96 cores) 384GiB RAM, 200 GB EBS",
-        "time":         "2022-06-25 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.031, 0.044, 0.001],
-[0.050, 0.013, 0.012],
-[0.061, 0.017, 0.017],
-[0.117, 0.019, 0.021],
-[0.280, 0.099, 0.121],
-[0.802, 0.113, 0.225],
-[0.020, 0.001, 0.001],
-[0.024, 0.014, 0.013],
-[0.243, 0.116, 0.115],
-[0.886, 0.133, 0.129],
-[0.325, 0.102, 0.107],
-[0.369, 0.093, 0.098],
-[0.883, 0.186, 0.178],
-[1.532, 0.220, 0.221],
-[0.727, 0.208, 0.196],
-[0.215, 0.181, 0.184],
-[1.676, 0.419, 0.413],
-[1.324, 0.306, 0.300],
-[3.088, 0.880, 0.765],
-[0.119, 0.038, 0.026],
-[8.946, 0.218, 0.135],
-[9.994, 0.162, 0.134],
-[19.043, 0.603, 0.616],
-[14.138, 0.257, 0.222],
-[1.821, 0.061, 0.048],
-[0.856, 0.044, 0.046],
-[2.364, 0.064, 0.050],
-[9.074, 0.303, 0.291],
-[7.130, 0.315, 0.307],
-[0.430, 0.400, 0.412],
-[1.321, 0.119, 0.114],
-[4.649, 0.207, 0.183],
-[3.786, 0.861, 0.848],
-[8.971, 0.681, 0.652],
-[8.974, 0.661, 0.645],
-[0.251, 0.230, 0.223],
-[0.112, 0.066, 0.073],
-[0.053, 0.029, 0.031],
-[0.069, 0.031, 0.028],
-[0.230, 0.168, 0.171],
-[0.044, 0.018, 0.020],
-[0.035, 0.015, 0.020],
-[0.021, 0.008, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c6g_16xlarge.json b/website/benchmark/hardware/results/aws_c6g_16xlarge.json
deleted file mode 100644
index 364b40f657a..00000000000
--- a/website/benchmark/hardware/results/aws_c6g_16xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c6g.16xlarge (Graviton 2)",
-        "system_full":  "AWS c6g.16xlarge (Graviton 2) 64 vCPU, 128 GiB RAM, EBS",
-        "time":         "2022-05-24 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.051, 0.024, 0.026],
-[0.037, 0.021, 0.028],
-[0.102, 0.065, 0.061],
-[0.243, 0.080, 0.080],
-[0.976, 0.138, 0.138],
-[0.003, 0.002, 0.002],
-[0.044, 0.040, 0.039],
-[0.204, 0.145, 0.146],
-[0.799, 0.165, 0.165],
-[0.306, 0.095, 0.095],
-[0.523, 0.101, 0.096],
-[0.973, 0.226, 0.224],
-[1.520, 0.282, 0.277],
-[0.645, 0.239, 0.236],
-[0.260, 0.312, 0.280],
-[1.535, 0.660, 0.629],
-[1.426, 0.470, 0.427],
-[3.456, 1.372, 1.138],
-[0.147, 0.119, 0.079],
-[9.101, 0.406, 0.358],
-[10.117, 0.330, 0.323],
-[19.495, 0.756, 0.748],
-[16.173, 1.500, 1.532],
-[1.832, 0.105, 0.094],
-[0.836, 0.092, 0.090],
-[2.363, 0.108, 0.099],
-[9.269, 0.367, 0.363],
-[7.317, 0.422, 0.414],
-[0.918, 1.020, 1.058],
-[1.347, 0.210, 0.209],
-[4.535, 0.343, 0.335],
-[4.288, 2.411, 2.501],
-[9.310, 1.240, 1.172],
-[9.301, 1.209, 1.205],
-[0.446, 0.428, 0.421],
-[0.245, 0.207, 0.202],
-[0.107, 0.091, 0.098],
-[0.112, 0.095, 0.101],
-[0.546, 0.485, 0.444],
-[0.061, 0.049, 0.037],
-[0.041, 0.035, 0.033],
-[0.006, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c6g_2xlarge.json b/website/benchmark/hardware/results/aws_c6g_2xlarge.json
deleted file mode 100644
index e970e73b919..00000000000
--- a/website/benchmark/hardware/results/aws_c6g_2xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c6g.2xlarge (Graviton 2)",
-        "system_full":  "AWS c6g.2xlarge (Graviton 2) 8 vCPU, 16 GiB RAM, EBS",
-        "time":         "2021-11-21 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-[0.002, 0.001, 0.001],
-[0.035, 0.022, 0.022],
-[0.084, 0.045, 0.045],
-[0.745, 0.056, 0.056],
-[1.397, 0.126, 0.125],
-[2.237, 0.498, 0.499],
-[0.063, 0.052, 0.052],
-[0.025, 0.023, 0.023],
-[1.295, 0.544, 0.542],
-[1.655, 0.656, 0.655],
-[0.769, 0.317, 0.316],
-[1.043, 0.362, 0.360],
-[1.938, 0.861, 0.854],
-[3.563, 1.131, 1.104],
-[2.152, 1.036, 1.014],
-[0.967, 0.917, 0.900],
-[4.259, 2.678, 2.724],
-[3.342, 1.741, 1.704],
-[8.303, 4.812, 4.794],
-[0.680, 0.079, 0.074],
-[18.753, 1.239, 1.224],
-[20.694, 1.362, 1.333],
-[38.987, 2.967, 2.937],
-[31.357, 1.420, 1.404],
-[4.471, 0.421, 0.413],
-[1.633, 0.360, 0.358],
-[4.554, 0.423, 0.417],
-[18.076, 1.133, 1.118],
-[15.164, 1.762, 1.747],
-[0.678, 0.656, 0.651],
-[3.504, 0.829, 0.817],
-[9.359, 1.104, 1.088],
-[8.794, 5.886, 5.848],
-[19.039, 4.025, 4.007],
-[19.061, 4.015, 4.053],
-[1.289, 1.194, 1.194],
-[0.287, 0.217, 0.208],
-[0.113, 0.094, 0.092],
-[0.111, 0.084, 0.086],
-[0.539, 0.447, 0.439],
-[0.072, 0.033, 0.025],
-[0.042, 0.019, 0.039],
-[0.005, 0.011, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c6i_32xlarge.json b/website/benchmark/hardware/results/aws_c6i_32xlarge.json
deleted file mode 100644
index 5ff4bb5bfa8..00000000000
--- a/website/benchmark/hardware/results/aws_c6i_32xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "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/aws_c6metal.json b/website/benchmark/hardware/results/aws_c6metal.json
deleted file mode 100644
index 83e75506ad9..00000000000
--- a/website/benchmark/hardware/results/aws_c6metal.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c6.metal (Graviton 2)",
-        "system_full":  "AWS c6.metal (Graviton 2) 64 CPU 128GiB 2x1.7TB local SSD md-RAID-0",
-        "time":         "2020-09-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.004, 0.003, 0.001],
-[0.085, 0.030, 0.032],
-[0.029, 0.028, 0.026],
-[0.047, 0.068, 0.070],
-[0.090, 0.075, 0.079],
-[0.140, 0.126, 0.124],
-[0.018, 0.013, 0.012],
-[0.032, 0.021, 0.032],
-[0.154, 0.139, 0.138],
-[0.204, 0.155, 0.156],
-[0.101, 0.091, 0.090],
-[0.104, 0.104, 0.100],
-[0.223, 0.203, 0.203],
-[0.273, 0.255, 0.253],
-[0.232, 0.212, 0.213],
-[0.230, 0.223, 0.223],
-[0.506, 0.484, 0.483],
-[0.334, 0.330, 0.316],
-[1.139, 1.085, 1.088],
-[0.065, 0.077, 0.054],
-[0.484, 0.315, 0.315],
-[0.545, 0.295, 0.291],
-[0.980, 0.661, 1.476],
-[1.415, 1.101, 0.675],
-[0.150, 0.086, 0.085],
-[0.094, 0.077, 0.078],
-[0.150, 0.087, 0.086],
-[0.478, 0.348, 0.346],
-[0.424, 0.403, 0.399],
-[1.435, 1.388, 1.417],
-[0.215, 0.178, 0.178],
-[0.378, 0.294, 0.289],
-[1.669, 1.590, 1.596],
-[1.105, 1.007, 1.010],
-[1.074, 1.041, 1.014],
-[0.339, 0.323, 0.323],
-[0.210, 0.199, 0.204],
-[0.096, 0.091, 0.092],
-[0.084, 0.080, 0.079],
-[0.425, 0.405, 0.423],
-[0.034, 0.025, 0.022],
-[0.022, 0.019, 0.018],
-[0.007, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_c7g_16xlarge.json b/website/benchmark/hardware/results/aws_c7g_16xlarge.json
deleted file mode 100644
index 91230ecceee..00000000000
--- a/website/benchmark/hardware/results/aws_c7g_16xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS c7g.16xlarge (Graviton 3)",
-        "system_full":  "AWS c7g.16xlarge (Graviton 3) 64 vCPU, 128 GiB RAM, EBS",
-        "time":         "2022-05-24 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.031, 0.022, 0.023],
-[0.066, 0.025, 0.025],
-[0.240, 0.061, 0.059],
-[0.328, 0.073, 0.076],
-[0.955, 0.101, 0.098],
-[0.002, 0.002, 0.002],
-[0.035, 0.030, 0.030],
-[0.499, 0.113, 0.115],
-[0.704, 0.127, 0.127],
-[0.452, 0.070, 0.070],
-[0.613, 0.074, 0.072],
-[1.060, 0.147, 0.144],
-[1.749, 0.190, 0.187],
-[0.933, 0.176, 0.175],
-[0.408, 0.206, 0.188],
-[1.714, 0.476, 0.464],
-[1.391, 0.349, 0.307],
-[3.271, 0.876, 0.719],
-[0.375, 0.079, 0.071],
-[9.094, 0.270, 0.293],
-[10.251, 0.236, 0.222],
-[19.763, 0.783, 0.839],
-[16.380, 1.164, 1.192],
-[1.861, 0.112, 0.114],
-[0.863, 0.062, 0.060],
-[2.499, 0.103, 0.113],
-[9.448, 0.257, 0.245],
-[7.546, 0.288, 0.285],
-[0.822, 0.837, 0.837],
-[1.352, 0.151, 0.142],
-[4.743, 0.224, 0.214],
-[3.807, 1.236, 1.366],
-[10.096, 0.805, 0.780],
-[9.191, 0.830, 0.792],
-[0.320, 0.304, 0.294],
-[0.209, 0.143, 0.175],
-[0.099, 0.066, 0.068],
-[0.141, 0.073, 0.064],
-[0.499, 0.386, 0.372],
-[0.061, 0.030, 0.032],
-[0.035, 0.030, 0.028],
-[0.016, 0.016, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_i3_8xlarge.json b/website/benchmark/hardware/results/aws_i3_8xlarge.json
deleted file mode 100644
index f95ca13b454..00000000000
--- a/website/benchmark/hardware/results/aws_i3_8xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS i3.8xlarge",
-        "system_full":      "AWS i3.8xlarge 32vCPU 244GiB 4x1900 NVMe SSD",
-        "time":         "2020-01-15 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.009, 0.002, 0.002],
-            [0.053, 0.040, 0.021],
-            [0.043, 0.028, 0.027],
-            [0.109, 0.036, 0.035],
-            [0.147, 0.108, 0.100],
-            [0.296, 0.239, 0.239],
-            [0.017, 0.013, 0.015],
-            [0.013, 0.010, 0.011],
-            [0.524, 0.460, 0.445],
-            [0.589, 0.519, 0.510],
-            [0.186, 0.142, 0.140],
-            [0.210, 0.167, 0.164],
-            [0.659, 0.584, 0.529],
-            [0.781, 0.679, 0.665],
-            [0.709, 0.630, 0.613],
-            [0.642, 0.590, 0.588],
-            [1.723, 1.564, 1.557],
-            [1.027, 0.925, 0.909],
-            [3.618, 3.432, 3.411],
-            [0.123, 0.037, 0.049],
-            [1.318, 0.587, 0.570],
-            [1.368, 0.655, 0.646],
-            [2.847, 1.518, 1.495],
-            [2.431, 0.812, 0.764],
-            [0.366, 0.213, 0.193],
-            [0.237, 0.167, 0.158],
-            [0.374, 0.204, 0.211],
-            [1.310, 0.590, 0.597],
-            [1.260, 0.877, 0.870],
-            [1.966, 1.952, 1.967],
-            [0.692, 0.571, 0.566],
-            [1.080, 0.823, 0.827],
-            [5.017, 4.816, 4.843],
-            [3.072, 2.661, 2.726],
-            [3.006, 2.711, 2.688],
-            [1.071, 0.999, 1.024],
-            [0.231, 0.221, 0.221],
-            [0.094, 0.090, 0.086],
-            [0.093, 0.085, 0.075],
-            [0.488, 0.432, 0.451],
-            [0.046, 0.029, 0.030],
-            [0.030, 0.023, 0.022],
-            [0.012, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_i3en_24xlarge.json b/website/benchmark/hardware/results/aws_i3en_24xlarge.json
deleted file mode 100644
index e4e063fa3e2..00000000000
--- a/website/benchmark/hardware/results/aws_i3en_24xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS i3en.24xlarge",
-        "system_full":      "AWS i3en.24xlarge 96vCPU 768GiB 8x7500 NVMe SSD",
-        "time":         "2020-01-15 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.010, 0.002, 0.002],
-            [0.067, 0.009, 0.009],
-            [0.040, 0.014, 0.013],
-            [0.120, 0.017, 0.017],
-            [0.159, 0.076, 0.077],
-            [0.240, 0.116, 0.119],
-            [0.020, 0.010, 0.009],
-            [0.015, 0.010, 0.009],
-            [0.279, 0.195, 0.197],
-            [0.299, 0.230, 0.258],
-            [0.199, 0.088, 0.111],
-            [0.185, 0.094, 0.094],
-            [0.327, 0.212, 0.206],
-            [0.439, 0.271, 0.267],
-            [0.370, 0.281, 0.280],
-            [0.367, 0.306, 0.312],
-            [1.092, 0.931, 1.022],
-            [0.533, 0.599, 0.413],
-            [1.629, 1.921, 1.572],
-            [0.130, 0.031, 0.026],
-            [1.451, 0.264, 0.269],
-            [1.714, 0.273, 0.261],
-            [3.668, 0.636, 0.669],
-            [3.837, 0.472, 0.402],
-            [0.378, 0.107, 0.079],
-            [0.199, 0.070, 0.088],
-            [0.381, 0.104, 0.086],
-            [1.426, 0.284, 0.272],
-            [1.246, 0.363, 0.360],
-            [0.737, 0.708, 0.741],
-            [0.426, 0.246, 0.284],
-            [0.877, 0.420, 0.384],
-            [2.698, 2.390, 2.375],
-            [1.918, 1.223, 1.122],
-            [1.909, 1.234, 1.217],
-            [0.486, 0.482, 0.473],
-            [0.235, 0.187, 0.200],
-            [0.083, 0.069, 0.072],
-            [0.111, 0.063, 0.062],
-            [0.473, 0.433, 0.406],
-            [0.050, 0.028, 0.027],
-            [0.038, 0.022, 0.021],
-            [0.012, 0.006, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_lightsail_4vcpu.json b/website/benchmark/hardware/results/aws_lightsail_4vcpu.json
deleted file mode 100644
index ab55813b8e8..00000000000
--- a/website/benchmark/hardware/results/aws_lightsail_4vcpu.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS Lightsail 4vCPU",
-        "system_full":  "AWS Lightsail E5-2686 v4 @ 2.30GHz, 16 GiB RAM",
-        "time":         "2020-07-02 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.002, 0.001, 0.001],
-            [0.046, 0.026, 0.025],
-            [0.156, 0.077, 0.078],
-            [0.746, 0.098, 0.095],
-            [1.383, 0.233, 0.218],
-            [2.161, 0.646, 0.626],
-            [0.041, 0.037, 0.038],
-            [0.032, 0.029, 0.026],
-            [1.494, 1.190, 1.159],
-            [1.843, 1.354, 1.357],
-            [0.841, 0.375, 0.375],
-            [1.254, 0.446, 0.448],
-            [2.235, 1.792, 1.746],
-            [4.175, 2.354, 2.315],
-            [2.602, 2.075, 2.042],
-            [2.258, 2.085, 2.058],
-            [6.402, 5.909, 5.895],
-            [4.178, 3.618, 3.670],
-            [12.978, 12.037, 11.764],
-            [0.754, 0.107, 0.102],
-            [19.615, 1.888, 1.868],
-            [21.740, 2.208, 2.171],
-            [41.009, 5.277, 5.245],
-            [38.068, 2.475, 2.435],
-            [4.739, 0.693, 0.680],
-            [1.766, 0.549, 0.542],
-            [4.730, 0.684, 0.672],
-            [19.010, 1.849, 1.811],
-            [15.999, 3.086, 3.099],
-            [3.655, 3.609, 3.593],
-            [3.967, 1.768, 1.836],
-            [10.566, 3.036, 2.963],
-            [20.065, 19.091, null],
-            [21.474, 8.597, 8.501],
-            [21.484, 8.563, 8.533],
-            [3.850, 3.487, 3.477],
-            [0.408, 0.240, 0.239],
-            [0.125, 0.087, 0.084],
-            [0.132, 0.073, 0.073],
-            [0.685, 0.471, 0.480],
-            [0.089, 0.028, 0.025],
-            [0.044, 0.027, 0.018],
-            [0.007, 0.007, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_m5a_4xlarge.json b/website/benchmark/hardware/results/aws_m5a_4xlarge.json
deleted file mode 100644
index 48d7168eec5..00000000000
--- a/website/benchmark/hardware/results/aws_m5a_4xlarge.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "AWS m5a.4xlarge",
-        "system_full":  "AWS m5a.4xlarge 16 vCPU, 512 GiB RAM, EBS GP3",
-        "time":         "2020-08-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.002, 0.002, 0.002],
-            [0.028, 0.017, 0.016],
-            [0.074, 0.040, 0.042],
-            [0.758, 0.061, 0.062],
-            [1.380, 0.151, 0.147],
-            [2.204, 0.394, 0.385],
-            [0.002, 0.002, 0.002],
-            [0.019, 0.018, 0.018],
-            [1.385, 0.751, 0.740],
-            [1.754, 0.873, 0.870],
-            [0.817, 0.222, 0.218],
-            [1.219, 0.268, 0.263],
-            [2.303, 1.092, 1.057],
-            [3.892, 1.431, 1.420],
-            [2.388, 1.199, 1.188],
-            [1.439, 1.329, 1.339],
-            [5.108, 3.816, 3.799],
-            [3.549, 2.273, 2.271],
-            [9.976, 7.023, 7.043],
-            [0.706, 0.068, 0.066],
-            [19.187, 1.101, 1.076],
-            [21.210, 1.315, 1.276],
-            [39.984, 3.065, 3.043],
-            [32.102, 1.328, 1.295],
-            [4.599, 0.341, 0.343],
-            [1.762, 0.294, 0.287],
-            [4.786, 0.345, 0.338],
-            [18.596, 1.190, 1.175],
-            [15.549, 1.973, 1.931],
-            [3.643, 3.628, 3.625],
-            [3.658, 0.781, 0.777],
-            [9.786, 1.383, 1.381],
-            [11.912, 10.221, 10.227],
-            [20.664, 5.942, 5.954],
-            [20.707, 6.092, 5.920],
-            [1.847, 1.758, 1.756],
-            [0.292, 0.221, 0.216],
-            [0.109, 0.086, 0.085],
-            [0.118, 0.084, 0.074],
-            [0.542, 0.452, 0.445],
-            [0.060, 0.026, 0.025],
-            [0.031, 0.019, 0.020],
-            [0.007, 0.005, 0.007]
-        ]
-    }
-]
-
diff --git a/website/benchmark/hardware/results/aws_m5a_8xlarge.json b/website/benchmark/hardware/results/aws_m5a_8xlarge.json
deleted file mode 100644
index 8a231be0ede..00000000000
--- a/website/benchmark/hardware/results/aws_m5a_8xlarge.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "AWS m5a.8xlarge",
-        "system_full":  "AWS m5a.8xlarge 32 vCPU, 128 GiB RAM, EBS",
-        "time":         "2020-08-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.015, 0.001, 0.001],
-            [0.038, 0.015, 0.015],
-            [0.072, 0.033, 0.033],
-            [0.198, 0.052, 0.051],
-            [0.338, 0.166, 0.120],
-            [1.036, 0.252, 0.264],
-            [0.034, 0.020, 0.020],
-            [0.020, 0.015, 0.015],
-            [0.521, 0.414, 0.391],
-            [0.563, 0.496, 0.497],
-            [0.242, 0.143, 0.143],
-            [0.261, 0.168, 0.168],
-            [1.067, 0.574, 0.567],
-            [1.537, 0.772, 0.759],
-            [0.802, 0.736, 0.752],
-            [0.904, 0.797, 0.742],
-            [2.229, 1.795, 1.867],
-            [1.314, 0.987, 0.962],
-            [5.216, 4.149, 5.540],
-            [0.208, 0.057, 0.036],
-            [9.238, 0.660, 0.609],
-            [10.105, 0.685, 0.668],
-            [19.544, 1.851, 1.766],
-            [19.690, 0.943, 0.817],
-            [1.834, 0.228, 0.217],
-            [0.757, 0.177, 0.176],
-            [2.331, 0.224, 0.214],
-            [9.174, 0.728, 0.688],
-            [7.330, 1.130, 1.108],
-            [1.834, 1.810, 1.818],
-            [1.429, 0.547, 0.550],
-            [4.518, 0.879, 0.895],
-            [6.157, 5.540, 5.547],
-            [9.846, 3.033, 3.044],
-            [9.847, 3.061, 3.016],
-            [1.157, 1.086, 1.117],
-            [0.238, 0.169, 0.175],
-            [0.094, 0.072, 0.072],
-            [0.041, 0.037, 0.041],
-            [0.453, 0.364, 0.345],
-            [0.054, 0.015, 0.019],
-            [0.024, 0.010, 0.010],
-            [0.012, 0.006, 0.007]
-        ]
-    }
-]
-
diff --git a/website/benchmark/hardware/results/aws_m5ad_24xlarge.json b/website/benchmark/hardware/results/aws_m5ad_24xlarge.json
deleted file mode 100644
index e4e60ef91e1..00000000000
--- a/website/benchmark/hardware/results/aws_m5ad_24xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS m5ad.24xlarge",
-        "system_full":       "AWS m5ad.24xlarge 96vCPU 384GiB 4x900 NVMe SSD, AMD EPYC 7000 series 2.5 GHz",
-        "time":         "2020-01-17 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.013, 0.002, 0.002],
-            [0.055, 0.020, 0.025],
-            [0.054, 0.027, 0.026],
-            [0.154, 0.035, 0.035],
-            [0.221, 0.117, 0.118],
-            [0.325, 0.171, 0.166],
-            [0.042, 0.021, 0.017],
-            [0.025, 0.017, 0.018],
-            [0.353, 0.253, 0.253],
-            [0.477, 0.610, 0.720],
-            [0.257, 0.154, 0.139],
-            [0.251, 0.130, 0.114],
-            [0.513, 0.293, 0.286],
-            [0.618, 0.360, 0.350],
-            [0.468, 0.336, 0.329],
-            [0.390, 0.333, 0.411],
-            [1.112, 0.936, 1.497],
-            [2.434, 1.350, 0.886],
-            [2.590, 2.069, 2.331],
-            [0.160, 0.048, 0.036],
-            [1.638, 0.334, 0.312],
-            [1.841, 0.423, 0.373],
-            [3.673, 1.122, 1.078],
-            [3.808, 0.912, 0.494],
-            [0.480, 0.112, 0.120],
-            [0.248, 0.107, 0.099],
-            [0.470, 0.118, 0.114],
-            [1.648, 0.544, 0.469],
-            [1.418, 0.583, 0.624],
-            [0.966, 1.231, 0.999],
-            [0.539, 0.311, 0.370],
-            [1.159, 0.712, 0.716],
-            [3.755, 2.772, 2.973],
-            [2.748, 2.033, 2.242],
-            [2.842, 2.150, 2.019],
-            [0.784, 0.616, 0.641],
-            [0.304, 0.273, 0.235],
-            [0.106, 0.086, 0.093],
-            [0.117, 0.073, 0.075],
-            [0.604, 0.453, 0.502],
-            [0.050, 0.036, 0.034],
-            [0.043, 0.023, 0.027],
-            [0.013, 0.008, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_m5d_24xlarge.json b/website/benchmark/hardware/results/aws_m5d_24xlarge.json
deleted file mode 100644
index fdb0b3b6875..00000000000
--- a/website/benchmark/hardware/results/aws_m5d_24xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS m5d.24xlarge",
-        "system_full":      "AWS m5d.24xlarge 96vCPU 384GiB 4x900 NVMe SSD",
-        "time":         "2020-01-15 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.012, 0.002, 0.002],
-            [0.061, 0.017, 0.008],
-            [0.043, 0.014, 0.014],
-            [0.160, 0.017, 0.016],
-            [0.193, 0.074, 0.075],
-            [0.300, 0.120, 0.118],
-            [0.023, 0.009, 0.009],
-            [0.015, 0.009, 0.009],
-            [0.321, 0.206, 0.203],
-            [0.351, 0.238, 0.244],
-            [0.205, 0.113, 0.112],
-            [0.211, 0.106, 0.091],
-            [0.394, 0.213, 0.211],
-            [0.519, 0.270, 0.259],
-            [0.439, 0.292, 0.286],
-            [0.394, 0.301, 0.296],
-            [1.195, 0.829, 0.806],
-            [0.561, 0.743, 0.418],
-            [1.841, 1.660, 1.650],
-            [0.163, 0.041, 0.026],
-            [1.632, 0.251, 0.269],
-            [1.885, 0.265, 0.265],
-            [3.425, 0.644, 0.620],
-            [3.839, 0.431, 0.367],
-            [0.486, 0.092, 0.086],
-            [0.256, 0.081, 0.091],
-            [0.493, 0.107, 0.106],
-            [1.646, 0.275, 0.255],
-            [1.445, 0.332, 0.332],
-            [0.768, 0.702, 0.721],
-            [0.509, 0.280, 0.268],
-            [1.071, 0.382, 0.374],
-            [2.800, 2.452, 2.389],
-            [2.159, 1.134, 1.181],
-            [2.153, 1.145, 1.200],
-            [0.516, 0.457, 0.493],
-            [0.256, 0.182, 0.188],
-            [0.091, 0.073, 0.070],
-            [0.121, 0.063, 0.064],
-            [0.506, 0.399, 0.421],
-            [0.055, 0.030, 0.027],
-            [0.041, 0.019, 0.023],
-            [0.016, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/aws_m6g_16xlarge.json b/website/benchmark/hardware/results/aws_m6g_16xlarge.json
deleted file mode 100644
index a0d15a0d384..00000000000
--- a/website/benchmark/hardware/results/aws_m6g_16xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS m6g.16xlarge (Graviton 2)",
-        "system_full":  "AWS m6g.16xlarge (Graviton 2) 64 vCPU, 256 GiB RAM, EBS",
-        "time":         "2020-02-13 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-            [0.012, 0.003, 0.003],
-            [0.047, 0.028, 0.028],
-            [0.102, 0.025, 0.025],
-            [0.847, 0.061, 0.062],
-            [1.487, 0.078, 0.079],
-            [2.404, 0.149, 0.149],
-            [0.032, 0.016, 0.016],
-            [0.035, 0.030, 0.030],
-            [1.597, 0.146, 0.142],
-            [2.192, 0.162, 0.163],
-            [1.307, 0.102, 0.102],
-            [1.524, 0.102, 0.101],
-            [2.387, 0.217, 0.216],
-            [3.773, 0.267, 0.266],
-            [2.206, 0.231, 0.224],
-            [1.163, 0.227, 0.225],
-            [3.870, 0.517, 0.513],
-            [3.416, 0.348, 0.340],
-            [6.786, 1.266, 1.231],
-            [0.673, 0.058, 0.096],
-            [18.821, 0.346, 0.313],
-            [20.684, 0.319, 0.312],
-            [38.918, 0.684, 0.653],
-            [39.697, 0.990, 1.000],
-            [4.472, 0.107, 0.096],
-            [2.260, 0.092, 0.089],
-            [5.153, 0.106, 0.103],
-            [18.709, 0.341, 0.334],
-            [15.166, 0.398, 0.399],
-            [0.849, 1.224, 1.272],
-            [3.447, 0.209, 0.205],
-            [9.573, 0.327, 0.315],
-            [7.621, 1.857, 1.841],
-            [18.441, 1.167, 1.070],
-            [18.453, 1.208, 1.072],
-            [0.430, 0.329, 0.334],
-            [0.258, 0.215, 0.222],
-            [0.122, 0.101, 0.100],
-            [0.120, 0.081, 0.084],
-            [0.553, 0.449, 0.448],
-            [0.059, 0.026, 0.030],
-            [0.035, 0.031, 0.019],
-            [0.010, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/azure_ds3v2.json b/website/benchmark/hardware/results/azure_ds3v2.json
deleted file mode 100644
index 718279dbac1..00000000000
--- a/website/benchmark/hardware/results/azure_ds3v2.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-    {
-        "system":       "Azure DS3v2 Standard SSD",
-        "system_full":  "Azure DS3v2 4vcpu 14GB RAM 1TB Standard SSD",
-        "time":         "2020-01-15 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.709, 0.004, 0.004],
-            [1.052, 0.028, 0.025],
-            [2.075, 0.077, 0.080],
-            [2.700, 0.104, 0.101],
-            [2.858, 0.267, 0.259],
-            [4.058, 0.737, 0.718],
-            [0.597, 0.038, 0.049],
-            [0.598, 0.025, 0.024],
-            [3.786, 1.324, 1.313],
-            [3.982, 1.579, 1.562],
-            [2.995, 0.395, 0.395],
-            [3.279, 0.467, 0.470],
-            [4.301, 1.674, 1.690],
-            [6.499, 2.126, 2.132],
-            [4.774, 1.886, 1.927],
-            [3.484, 1.872, 1.818],
-            [7.813, 4.801, 5.006],
-            [6.032, 3.162, 3.106],
-            [13.991, 10.573, 10.665],
-            [2.750, 0.118, 0.101],
-            [25.608, 1.978, 1.960],
-            [29.117, 2.297, 2.303],
-            [53.220, 5.367, 5.325],
-            [51.767, 2.669, 2.465],
-            [7.509, 0.890, 0.865],
-            [3.827, 0.666, 0.653],
-            [7.574, 0.918, 0.899],
-            [25.753, 1.904, 1.898],
-            [21.624, 3.269, 3.192],
-            [5.454, 4.966, 4.975],
-            [6.569, 1.870, 1.912],
-            [14.536, 2.844, 2.863],
-            [18.908, 16.591, 16.820],
-            [27.527, 7.790, 7.738],
-            [27.556, 7.694, 7.695],
-            [4.168, 3.568, 3.426],
-            [1.185, 0.307, 0.252],
-            [0.483, 0.096, 0.093],
-            [0.519, 0.086, 0.088],
-            [1.274, 0.525, 0.496],
-            [1.048, 0.033, 0.034],
-            [0.379, 0.027, 0.036],
-            [0.599, 0.010, 0.009]
-        ]
-    },
-    {
-        "system":       "Azure DS3v2 Premium SSD",
-        "system_full":       "Azure DS3v2 4vcpu 14GB RAM 1TB Premium SSD",
-        "time":         "2020-01-15 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.047, 0.004, 0.003],
-            [0.078, 0.023, 0.023],
-            [0.312, 0.077, 0.077],
-            [1.202, 0.105, 0.103],
-            [1.216, 0.260, 0.264],
-            [1.896, 0.751, 0.726],
-            [0.122, 0.041, 0.038],
-            [0.095, 0.028, 0.025],
-            [1.848, 1.304, 1.375],
-            [2.104, 1.534, 1.535],
-            [1.298, 0.394, 0.397],
-            [1.363, 0.469, 0.479],
-            [2.296, 1.728, 1.650],
-            [3.540, 2.320, 2.177],
-            [2.542, 1.863, 1.847],
-            [2.047, 1.861, 1.873],
-            [5.203, 4.830, 4.882],
-            [3.466, 3.131, 3.197],
-            [10.795, 10.396, 10.516],
-            [1.244, 0.111, 0.105],
-            [13.163, 2.019, 1.932],
-            [14.969, 2.346, 2.340],
-            [27.664, 5.259, 5.309],
-            [26.819, 2.589, 2.464],
-            [3.795, 0.902, 0.866],
-            [1.867, 0.665, 0.672],
-            [3.822, 0.919, 0.903],
-            [13.173, 1.916, 1.886],
-            [11.168, 3.253, 3.214],
-            [5.126, 5.290, 4.982],
-            [3.465, 1.866, 1.875],
-            [7.902, 3.009, 2.803],
-            [17.132, 17.154, 17.387],
-            [15.132, 7.755, 7.678],
-            [15.054, 7.779, 8.068],
-            [3.598, 3.590, 3.501],
-            [0.483, 0.279, 0.263],
-            [0.183, 0.094, 0.095],
-            [0.174, 0.084, 0.096],
-            [0.693, 0.480, 0.503],
-            [0.237, 0.038, 0.031],
-            [0.108, 0.029, 0.028],
-            [0.096, 0.010, 0.009]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/azure_e32s.json b/website/benchmark/hardware/results/azure_e32s.json
deleted file mode 100644
index 5053f6028ad..00000000000
--- a/website/benchmark/hardware/results/azure_e32s.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Azure E32s v3",
-        "system_full":       "Azure E32s v3 32 256 GiB 512 GiB",
-        "time":         "2020-03-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.003, 0.002, 0.003],
-            [0.114, 0.014, 0.013],
-            [0.230, 0.031, 0.029],
-            [0.893, 0.043, 0.042],
-            [0.915, 0.123, 0.143],
-            [1.475, 0.263, 0.264],
-            [0.055, 0.016, 0.017],
-            [0.056, 0.013, 0.013],
-            [1.467, 0.523, 0.523],
-            [1.661, 0.614, 0.608],
-            [0.999, 0.169, 0.176],
-            [1.058, 0.188, 0.190],
-            [1.839, 0.658, 0.697],
-            [2.753, 0.892, 0.881],
-            [2.034, 0.895, 0.895],
-            [1.425, 0.860, 0.879],
-            [3.401, 2.070, 2.091],
-            [2.573, 1.183, 1.208],
-            [6.376, 4.374, 4.442],
-            [0.922, 0.044, 0.043],
-            [10.137, 0.653, 0.691],
-            [11.589, 0.711, 0.805],
-            [21.234, 1.841, 1.827],
-            [22.035, 0.973, 0.940],
-            [2.983, 0.238, 0.237],
-            [1.493, 0.201, 0.186],
-            [3.016, 0.262, 0.259],
-            [10.139, 0.696, 0.676],
-            [8.723, 1.017, 1.008],
-            [1.561, 1.439, 1.563],
-            [2.688, 0.713, 0.728],
-            [5.942, 1.075, 1.063],
-            [7.803, 5.871, 5.826],
-            [11.131, 2.860, 2.798],
-            [11.089, 2.898, 2.847],
-            [1.550, 1.276, 1.256],
-            [0.851, 0.303, 0.280],
-            [0.376, 0.100, 0.108],
-            [0.571, 0.084, 0.082],
-            [1.654, 0.560, 0.533],
-            [0.356, 0.029, 0.027],
-            [0.232, 0.022, 0.024],
-            [0.032, 0.009, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/cavium_4core.json b/website/benchmark/hardware/results/cavium_4core.json
deleted file mode 100644
index a7cb96b2cd3..00000000000
--- a/website/benchmark/hardware/results/cavium_4core.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Cavium ARM64 CPU (4 Core, 1.5 GHz, NVMe SSD)",
-        "system_full":  "Cavium ARM64 CPU (4 Corem 1.5 GHz, NVMe SSD), 16 GiB",
-        "time":         "2021-12-27 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.004, 0.004, 0.004],
-[0.196, 0.178, 0.180],
-[0.495, 0.437, 0.426],
-[0.715, 0.499, 0.499],
-[0.992, 0.798, 0.795],
-[3.958, 3.750, 3.751],
-[0.288, 0.274, 0.273],
-[0.236, 0.231, 0.239],
-[3.129, 2.936, 2.918],
-[4.221, 3.924, 3.934],
-[2.395, 2.285, 2.226],
-[2.832, 2.703, 2.644],
-[6.510, 6.301, 6.262],
-[7.933, 7.669, 7.704],
-[7.397, 7.122, 7.146],
-[4.692, 4.537, 4.540],
-[15.194, 14.835, 15.051],
-[10.446, 10.036, 10.072],
-[26.472, 25.655, 25.809],
-[0.879, 0.669, 0.694],
-[14.614, 13.755, 13.726],
-[16.876, 15.675, 15.703],
-[34.715, 33.204, 33.250],
-[18.850, 15.387, 15.332],
-[4.455, 4.025, 4.016],
-[3.667, 3.415, 3.457],
-[4.507, 4.057, 4.049],
-[14.344, 13.394, 13.390],
-[17.519, 17.052, 17.067],
-[8.606, 8.611, 8.545],
-[6.936, 6.491, 6.496],
-[10.020, 9.260, 9.233],
-[39.793, 39.631, 39.553],
-[30.310, 29.604, 29.572],
-[30.485, 29.557, 29.649],
-[8.539, 8.337, 8.342],
-[0.931, 0.912, 0.912],
-[0.523, 0.516, 0.507],
-[0.460, 0.448, 0.450],
-[1.880, 1.817, 1.884],
-[0.141, 0.119, 0.117],
-[0.116, 0.095, 0.092],
-[0.021, 0.017, 0.014]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/core_i5_3210M_lenovo_b580.json b/website/benchmark/hardware/results/core_i5_3210M_lenovo_b580.json
deleted file mode 100644
index a6259138138..00000000000
--- a/website/benchmark/hardware/results/core_i5_3210M_lenovo_b580.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Lenovo B580",
-        "system_full":      "Lenovo B580 Laptop (i5-3210M)",
-        "time":         "2020-01-11 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-            [0.035, 0.003, 0.005],
-            [0.093, 0.064, 0.060],
-            [0.265, 0.170, 0.167],
-            [0.880, 0.251, 0.266],
-            [0.954, 0.593, 0.561],
-            [2.140, 1.506, 1.525],
-            [0.148, 0.096, 0.105],
-            [0.064, 0.048, 0.044],
-            [2.727, 2.330, 2.280],
-            [3.386, 3.210, 2.951],
-            [1.218, 0.787, 0.749],
-            [1.293, 0.915, 0.904],
-            [3.713, 3.224, 3.190],
-            [4.943, 4.338, 4.310],
-            [4.503, 3.999, 3.918],
-            [4.001, 3.686, 4.144],
-            [10.714, 10.011, 10.035],
-            [7.456, 6.556, 6.675],
-            [20.201, 19.238, 19.135],
-            [0.888, 0.217, 0.209],
-            [9.685, 4.144, 4.023],
-            [11.201, 4.648, 4.636],
-            [21.037, 10.712, 10.571],
-            [18.186, 4.743, 4.743],
-            [2.844, 1.379, 1.358],
-            [1.623, 1.138, 1.130],
-            [2.861, 1.394, 1.417],
-            [9.691, 4.191, 4.129],
-            [10.285, 7.381, 7.379],
-            [6.879, 6.871, 6.829],
-            [4.131, 3.336, 3.240],
-            [7.157, 4.666, 4.616],
-            [29.371, 36.392, 29.946],
-            [17.929, 14.223, 14.127],
-            [17.058, 13.998, 14.055],
-            [5.667, 5.460, 5.408],
-            [0.325, 0.230, 0.217],
-            [0.115, 0.101, 0.094],
-            [0.148, 0.093, 0.084],
-            [0.585, 0.464, 0.459],
-            [0.078, 0.042, 0.035],
-            [0.057, 0.038, 0.032],
-            [0.024, 0.011, 0.010]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/core_i5_9600K_asus_z390.json b/website/benchmark/hardware/results/core_i5_9600K_asus_z390.json
deleted file mode 100644
index cf36dd37d04..00000000000
--- a/website/benchmark/hardware/results/core_i5_9600K_asus_z390.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "ASUS Z390-Plus Server",
-        "system_full":  "ASUS Z390-Plus Server with Intel I5-9600K and DDR4 16GB",
-        "time":         "2021-11-05 03:00:00",
-        "kind":         "server",
-        "result":
-        [
-           [0.001, 0.001, 0.001],
-           [0.021, 0.008, 0.008],
-           [0.104, 0.029, 0.029],
-           [0.404, 0.047, 0.045],
-           [0.409, 0.103, 0.102],
-           [0.647, 0.313, 0.312],
-           [0.024, 0.018, 0.020],
-           [0.034, 0.009, 0.009],
-           [0.710, 0.618, 0.612],
-           [0.826, 0.700, 0.700],
-           [0.439, 0.195, 0.195],
-           [0.461, 0.233, 0.231],
-           [1.148, 1.073, 1.065],
-           [1.508, 1.366, 1.373],
-           [1.167, 1.085, 1.080],
-           [1.237, 1.207, 1.203],
-           [3.149, 3.082, 3.079],
-           [1.808, 1.726, 1.737],
-           [6.510, 6.457, 6.477],
-           [0.412, 0.057, 0.057],
-           [4.543, 1.149, 1.133],
-           [5.162, 1.291, 1.299],
-           [9.613, 3.176, 3.177],
-           [7.753, 1.212, 1.179],
-           [1.306, 0.318, 0.315],
-           [0.635, 0.277, 0.280],
-           [1.303, 0.319, 0.319],
-           [4.542, 1.299, 1.287],
-           [3.893, 1.934, 1.925],
-           [3.651, 3.642, 3.645],
-           [1.252, 0.815, 0.813],
-           [2.869, 1.534, 1.543],
-           [8.087, 7.939, 8.006],
-           [6.254, 5.169, 5.208],
-           [6.390, 5.248, 5.248],
-           [2.077, 2.040, 2.051],
-           [0.136, 0.127, 0.119],
-           [0.059, 0.051, 0.048],
-           [0.061, 0.045, 0.044],
-           [0.261, 0.248, 0.240],
-           [0.046, 0.015, 0.014],
-           [0.035, 0.019, 0.014],
-           [0.020, 0.003, 0.002]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/core_i7_11800h_lenovo_p15.json b/website/benchmark/hardware/results/core_i7_11800h_lenovo_p15.json
deleted file mode 100644
index f42be93e1e3..00000000000
--- a/website/benchmark/hardware/results/core_i7_11800h_lenovo_p15.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "ThinkPad P15",
-        "system_full":  "Lenovo ThinkPad P15, i7-11800H @ 2.30GHz, 16 cores, 32 GiB RAM, NVMe",
-        "time":         "2021-11-19 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-[0.001, 0.001, 0.001],
-[0.013, 0.008, 0.007],
-[0.036, 0.025, 0.024],
-[0.098, 0.046, 0.040],
-[0.139, 0.102, 0.100],
-[0.368, 0.279, 0.278],
-[0.018, 0.015, 0.017],
-[0.025, 0.008, 0.009],
-[0.586, 0.527, 0.533],
-[0.690, 0.579, 0.554],
-[0.224, 0.171, 0.162],
-[0.244, 0.201, 0.191],
-[0.996, 0.854, 0.871],
-[1.339, 1.199, 1.159],
-[1.116, 1.073, 1.045],
-[1.177, 1.060, 1.084],
-[3.307, 3.236, 3.182],
-[1.958, 1.789, 1.835],
-[6.079, 5.883, 5.895],
-[0.109, 0.051, 0.048],
-[1.429, 0.898, 0.819],
-[1.626, 1.023, 0.937],
-[3.390, 2.296, 2.381],
-[2.249, 0.997, 0.992],
-[0.422, 0.260, 0.299],
-[0.285, 0.230, 0.213],
-[0.419, 0.256, 0.268],
-[1.411, 0.777, 0.830],
-[1.828, 1.305, 1.283],
-[3.556, 3.725, 3.603],
-[0.805, 0.643, 0.650],
-[1.369, 1.049, 1.033],
-[7.665, 7.623, 7.601],
-[5.305, 4.513, 4.691],
-[5.370, 4.686, 4.874],
-[1.756, 1.492, 1.579],
-[0.143, 0.132, 0.131],
-[0.058, 0.057, 0.056],
-[0.068, 0.048, 0.051],
-[0.339, 0.298, 0.304],
-[0.032, 0.022, 0.023],
-[0.018, 0.011, 0.015],
-[0.010, 0.002, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/core_i7_6770hq_intel_nuc.json b/website/benchmark/hardware/results/core_i7_6770hq_intel_nuc.json
deleted file mode 100644
index 40fcdbf1482..00000000000
--- a/website/benchmark/hardware/results/core_i7_6770hq_intel_nuc.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Intel NUC",
-        "system_full":  "Intel NUC, 4 cores (Intel i7-6770HQ), 32 GiB RAM, 1 TB NVMe SSD",
-        "time":         "2020-04-15 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-            [0.003, 0.002, 0.001],
-            [0.025, 0.016, 0.018],
-            [0.084, 0.058, 0.057],
-            [0.158, 0.092, 0.085],
-            [0.273, 0.211, 0.190],
-            [0.671, 0.555, 0.539],
-            [0.031, 0.033, 0.033],
-            [0.026, 0.019, 0.017],
-            [1.183, 1.110, 1.090],
-            [1.330, 1.246, 1.254],
-            [0.352, 0.297, 0.296],
-            [0.441, 0.375, 0.352],
-            [1.611, 1.491, 1.439],
-            [2.130, 2.022, 1.976],
-            [1.903, 1.795, 1.819],
-            [1.927, 1.851, 1.861],
-            [5.282, 5.155, 5.172],
-            [3.246, 3.313, 3.189],
-            [12.059, 11.378, 10.562],
-            [0.146, 0.092, 0.090],
-            [2.103, 1.496, 1.477],
-            [2.447, 1.777, 1.734],
-            [5.123, 3.999, 3.955],
-            [3.733, 1.808, 1.775],
-            [0.685, 0.530, 0.523],
-            [0.525, 0.446, 0.438],
-            [0.755, 0.545, 0.547],
-            [2.052, 1.416, 1.403],
-            [2.976, 2.441, 2.423],
-            [2.197, 2.189, 2.164],
-            [1.748, 1.596, 1.607],
-            [2.773, 2.481, 2.466],
-            [18.903, 19.166, 16.563],
-            [7.457, 7.116, 6.943],
-            [7.311, 6.957, 6.958],
-            [3.036, 3.005, 2.991],
-            [0.247, 0.186, 0.162],
-            [0.100, 0.063, 0.065],
-            [0.098, 0.061, 0.056],
-            [0.434, 0.344, 0.331],
-            [0.040, 0.025, 0.025],
-            [0.049, 0.026, 0.026],
-            [0.022, 0.008, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/core_i7_8550u_lenovo_x1.json b/website/benchmark/hardware/results/core_i7_8550u_lenovo_x1.json
deleted file mode 100644
index 239d88a95b0..00000000000
--- a/website/benchmark/hardware/results/core_i7_8550u_lenovo_x1.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Lenovo Thinkpad X1 Carbon",
-        "system_full":      "Lenovo Thinkpad X1 Carbon 6th Gen i7-8550U CPU @ 1.80GHz 4 threads, 16 GiB",
-        "time":         "2020-01-18 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-            [0.006, 0.002, 0.002],
-            [0.031, 0.019, 0.020],
-            [0.082, 0.078, 0.080],
-            [0.157, 0.093, 0.092],
-            [0.274, 0.214, 0.206],
-            [0.601, 0.513, 0.513],
-            [0.038, 0.045, 0.041],
-            [0.023, 0.018, 0.018],
-            [1.394, 1.378, 1.323],
-            [1.567, 1.496, 1.483],
-            [0.406, 0.328, 0.327],
-            [0.468, 0.414, 0.397],
-            [1.846, 1.753, 1.737],
-            [2.492, 2.423, 2.404],
-            [2.136, 2.064, 2.078],
-            [2.038, 1.971, 1.971],
-            [5.794, 5.679, 5.708],
-            [3.430, 3.498, 3.356],
-            [11.946, 11.738, 11.700],
-            [0.158, 0.105, 0.091],
-            [2.151, 1.551, 1.593],
-            [2.581, 1.990, 1.985],
-            [6.101, 5.390, 5.320],
-            [3.528, 2.341, 2.322],
-            [0.772, 0.699, 0.701],
-            [0.606, 0.583, 0.587],
-            [0.877, 0.723, 0.728],
-            [2.398, 1.916, 1.924],
-            [3.634, 3.272, 3.247],
-            [4.102, 4.082, 4.078],
-            [1.885, 1.784, 1.741],
-            [2.994, 2.691, 2.707],
-            [19.060, 18.852, 18.929],
-            [8.745, 8.476, 8.553],
-            [8.685, 8.406, 8.946],
-            [3.416, 3.426, 3.397],
-            [0.238, 0.234, 0.210],
-            [0.080, 0.071, 0.072],
-            [0.078, 0.066, 0.066],
-            [0.470, 0.407, 0.396],
-            [0.034, 0.030, 0.029],
-            [0.025, 0.021, 0.021],
-            [0.010, 0.007, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/dell_r530.json b/website/benchmark/hardware/results/dell_r530.json
deleted file mode 100644
index 6637be26022..00000000000
--- a/website/benchmark/hardware/results/dell_r530.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Dell R530",
-        "system_full":  "Dell R530, 128GB DDR4, 2x480 GB SATA SSD, Perc H730 RAID-1",
-        "time":         "2020-01-14 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.027, 0.002, 0.002],
-            [0.147, 0.017, 0.016],
-            [0.328, 0.034, 0.033],
-            [1.059, 0.050, 0.044],
-            [1.334, 0.123, 0.118],
-            [2.579, 0.239, 0.264],
-            [0.057, 0.020, 0.019],
-            [0.036, 0.019, 0.018],
-            [2.079, 0.648, 0.569],
-            [2.012, 0.631, 0.634],
-            [1.454, 0.158, 0.160],
-            [1.502, 0.178, 0.185],
-            [3.095, 0.722, 0.661],
-            [3.675, 0.816, 0.809],
-            [2.900, 0.903, 0.810],
-            [2.005, 0.861, 0.842],
-            [4.103, 1.983, 2.004],
-            [2.948, 1.200, 1.160],
-            [7.687, 4.411, 4.239],
-            [1.087, 0.054, 0.062],
-            [14.186, 0.651, 0.757],
-            [16.497, 0.739, 0.676],
-            [23.165, 1.703, 1.700],
-            [22.803, 0.898, 0.919],
-            [4.247, 0.317, 0.267],
-            [2.519, 0.214, 0.246],
-            [4.115, 0.316, 0.274],
-            [13.759, 0.805, 0.827],
-            [16.473, 1.215, 1.062],
-            [2.034, 1.870, 2.016],
-            [3.152, 0.677, 0.697],
-            [6.630, 1.216, 1.019],
-            [9.651, 6.131, 6.017],
-            [23.506, 3.416, 3.294],
-            [23.271, 3.547, 3.411],
-            [1.763, 1.344, 1.308],
-            [0.317, 0.215, 0.227],
-            [0.122, 0.090, 0.087],
-            [0.168, 0.074, 0.090],
-            [0.565, 0.419, 0.450],
-            [0.079, 0.037, 0.030],
-            [0.059, 0.032, 0.032],
-            [0.025, 0.015, 0.010]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/dell_r740.json b/website/benchmark/hardware/results/dell_r740.json
deleted file mode 100644
index 21242e5400a..00000000000
--- a/website/benchmark/hardware/results/dell_r740.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Dell PowerEdge R740xd",
-        "system_full":  "Dell PowerEdge R740xd, 256GB, 2 * Intel(R) Xeon(R) Silver 4214R CPU @ 2.40GHz, 48 vCPU",
-        "time":         "2022-06-18 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.004, 0.003, 0.070],
-            [0.086, 0.019, 0.021],
-            [0.220, 0.038, 0.037],
-            [0.596, 0.051, 0.050],
-            [0.189, 0.149, 0.148],
-            [0.991, 0.233, 0.230],
-            [0.004, 0.004, 0.004],
-            [0.022, 0.018, 0.017],
-            [0.519, 0.315, 0.305],
-            [0.469, 0.341, 0.337],
-            [0.252, 0.158, 0.166],
-            [0.252, 0.201, 0.184],
-            [0.532, 0.500, 0.479],
-            [0.642, 0.613, 0.596],
-            [0.635, 0.506, 0.508],
-            [0.579, 0.556, 0.560],
-            [1.587, 1.532, 1.518],
-            [0.813, 0.752, 0.737],
-            [3.990, 3.826, 3.737],
-            [0.114, 0.073, 0.054],
-            [4.866, 0.513, 0.514],
-            [3.822, 0.580, 0.569],
-            [7.784, 1.550, 1.535],
-            [17.171, 1.168, 0.834],
-            [0.511, 0.184, 0.185],
-            [0.190, 0.181, 0.169],
-            [0.214, 0.182, 0.183],
-            [4.611, 0.620, 0.616],
-            [4.234, 0.793, 0.779],
-            [1.823, 1.767, 1.737],
-            [0.813, 0.412, 0.371],
-            [2.306, 0.772, 0.737],
-            [3.995, 4.061, 4.041],
-            [5.142, 2.523, 2.562],
-            [4.803, 2.595, 2.482],
-            [1.172, 0.982, 0.990],
-            [0.454, 0.248, 0.275],
-            [0.200, 0.145, 0.153],
-            [0.232, 0.135, 0.134],
-            [0.621, 0.548, 0.478],
-            [0.130, 0.088, 0.047],
-            [0.112, 0.044, 0.049],
-            [0.048, 0.023, 0.011]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/dell_xps.json b/website/benchmark/hardware/results/dell_xps.json
deleted file mode 100644
index 5c51d5c5c4c..00000000000
--- a/website/benchmark/hardware/results/dell_xps.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system": "Dell XPS 15",
-        "system_full": "Dell XPS 15, 6 cores, 32 GB RAM",
-        "cpu_vendor": "Intel",
-        "cpu_model": "i7-8750H CPU @ 2.20GHz",
-        "time": "2020-07-15 00:00:00",
-        "kind": "laptop",
-        "result":
-        [
-            [0.004, 0.004, 0.002],
-            [0.039, 0.019, 0.021],
-            [0.097, 0.058, 0.055],
-            [0.164, 0.103, 0.105],
-            [0.335, 0.291, 0.283],
-            [0.537, 0.496, 0.500],
-            [0.042, 0.033, 0.032],
-            [0.026, 0.030, 0.024],
-            [0.728, 0.642, 0.634],
-            [0.855, 0.844, 0.794],
-            [0.375, 0.344, 0.332],
-            [0.396, 0.329, 0.318],
-            [1.169, 1.094, 1.077],
-            [1.480, 1.374, 1.365],
-            [1.185, 1.082, 1.079],
-            [1.267, 1.279, 1.248],
-            [3.061, 2.842, 2.849],
-            [2.167, 2.293, 2.571],
-            [7.328, 7.258, 5.765],
-            [0.223, 0.114, 0.105],
-            [1.981, 2.030, 1.545],
-            [2.193, 1.687, 1.687],
-            [4.669, 4.379, 4.936],
-            [4.293, 1.761, 1.873],
-            [0.581, 0.432, 0.414],
-            [0.431, 0.385, 0.380],
-            [0.586, 0.422, 0.423],
-            [2.083, 1.784, 1.764],
-            [2.486, 2.272, 2.284],
-            [3.622, 3.644, 3.656],
-            [1.054, 0.899, 0.883],
-            [1.667, 1.376, 1.400],
-            [8.512, 9.455, 9.136],
-            [5.712, 5.536, 5.505],
-            [5.688, 5.485, 5.475],
-            [1.882, 1.933, 2.043],
-            [0.272, 0.157, 0.158],
-            [0.070, 0.086, 0.075],
-            [0.091, 0.069, 0.068],
-            [0.399, 0.349, 0.343],
-            [0.045, 0.027, 0.025],
-            [0.030, 0.021, 0.017],
-            [0.010, 0.007, 0.011]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/do_storage_optimized.json b/website/benchmark/hardware/results/do_storage_optimized.json
deleted file mode 100644
index 6c6cee5423b..00000000000
--- a/website/benchmark/hardware/results/do_storage_optimized.json
+++ /dev/null
@@ -1,380 +0,0 @@
-[
-    {
-        "system":       "DigitalOcean Storage-opt 8",
-        "system_full":  "DigitalOcean 8 CPUs, 64 GB RAM, 1.17 TB NVM SSD, Storage Intensive, Frankfurt, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.003, 0.002, 0.002],
-[0.020, 0.014, 0.014],
-[0.060, 0.048, 0.049],
-[0.089, 0.064, 0.062],
-[0.194, 0.177, 0.178],
-[0.521, 0.502, 0.497],
-[0.031, 0.026, 0.026],
-[0.020, 0.018, 0.018],
-[0.782, 0.738, 0.730],
-[0.874, 0.830, 0.834],
-[0.288, 0.265, 0.261],
-[0.340, 0.316, 0.316],
-[1.144, 1.016, 1.000],
-[1.423, 1.359, 1.348],
-[1.296, 1.234, 1.217],
-[1.458, 1.393, 1.392],
-[3.573, 3.374, 3.335],
-[2.143, 2.065, 2.083],
-[6.179, 6.153, 6.110],
-[0.101, 0.069, 0.069],
-[1.611, 1.383, 1.362],
-[1.659, 1.409, 1.388],
-[3.642, 3.124, 3.104],
-[2.399, 1.690, 1.652],
-[0.501, 0.434, 0.412],
-[0.382, 0.345, 0.346],
-[0.490, 0.425, 0.420],
-[1.401, 1.192, 1.165],
-[2.132, 1.956, 1.979],
-[1.777, 1.775, 1.770],
-[1.134, 1.033, 1.043],
-[1.611, 1.475, 1.451],
-[9.319, 8.830, 8.826],
-[5.214, 5.071, 4.960],
-[5.464, 5.079, 5.113],
-[1.862, 1.810, 1.800],
-[0.223, 0.173, 0.167],
-[0.074, 0.058, 0.060],
-[0.039, 0.037, 0.038],
-[0.430, 0.354, 0.355],
-[0.034, 0.015, 0.013],
-[0.016, 0.010, 0.011],
-[0.006, 0.006, 0.006]
-        ]
-    },
-    {
-        "system":       "DigitalOcean Storage-opt 16",
-        "system_full":  "DigitalOcean 16 CPUs, 128 GB RAM, 2.34 TB NVM SSD, Storage Intensive, Frankfurt, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.017, 0.010, 0.010],
-[0.039, 0.029, 0.027],
-[0.055, 0.039, 0.038],
-[0.125, 0.107, 0.112],
-[0.302, 0.281, 0.271],
-[0.021, 0.016, 0.016],
-[0.012, 0.011, 0.011],
-[0.418, 0.398, 0.397],
-[0.473, 0.446, 0.442],
-[0.172, 0.153, 0.155],
-[0.202, 0.184, 0.185],
-[0.605, 0.543, 0.538],
-[0.753, 0.693, 0.682],
-[0.687, 0.645, 0.635],
-[0.708, 0.701, 0.693],
-[1.703, 1.642, 1.655],
-[1.037, 0.994, 0.997],
-[3.563, 3.314, 3.364],
-[0.085, 0.047, 0.039],
-[0.857, 0.745, 0.742],
-[0.900, 0.770, 0.752],
-[1.931, 1.679, 1.672],
-[1.537, 0.937, 0.914],
-[0.272, 0.230, 0.219],
-[0.212, 0.192, 0.187],
-[0.271, 0.237, 0.225],
-[0.782, 0.659, 0.661],
-[1.169, 1.063, 1.068],
-[1.193, 1.182, 1.180],
-[0.625, 0.590, 0.572],
-[0.936, 0.822, 0.800],
-[4.796, 4.587, 4.589],
-[3.061, 2.715, 2.700],
-[2.819, 2.709, 2.708],
-[1.078, 1.048, 1.064],
-[0.210, 0.163, 0.150],
-[0.073, 0.057, 0.058],
-[0.037, 0.036, 0.035],
-[0.387, 0.357, 0.324],
-[0.030, 0.015, 0.017],
-[0.014, 0.010, 0.015],
-[0.012, 0.006, 0.005]
-        ]
-    },
-    {
-        "system":       "DigitalOcean Storage-opt 24",
-        "system_full":  "DigitalOcean, 24 CPUs, 192 GB RAM, 3.52 TB NVM SSD, Storage Intensive, Frankfurt, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.001],
-[0.017, 0.009, 0.009],
-[0.033, 0.022, 0.022],
-[0.046, 0.029, 0.028],
-[0.114, 0.101, 0.113],
-[0.228, 0.215, 0.209],
-[0.018, 0.013, 0.013],
-[0.012, 0.010, 0.010],
-[0.316, 0.294, 0.294],
-[0.350, 0.328, 0.330],
-[0.142, 0.129, 0.124],
-[0.157, 0.141, 0.138],
-[0.452, 0.401, 0.403],
-[0.550, 0.508, 0.503],
-[0.883, 0.455, 0.451],
-[0.539, 0.535, 0.533],
-[1.278, 1.206, 1.207],
-[0.771, 0.746, 0.736],
-[2.776, 2.543, 2.571],
-[0.084, 0.065, 0.029],
-[0.666, 0.539, 0.586],
-[0.703, 0.559, 0.566],
-[1.404, 1.232, 1.222],
-[1.243, 0.695, 0.701],
-[0.215, 0.173, 0.164],
-[0.162, 0.143, 0.140],
-[0.207, 0.169, 0.169],
-[0.606, 0.506, 0.505],
-[0.849, 0.788, 0.774],
-[1.085, 1.074, 1.072],
-[0.426, 0.392, 0.394],
-[0.718, 0.616, 0.600],
-[3.579, 3.372, 3.428],
-[2.161, 2.006, 1.980],
-[2.491, 2.026, 1.991],
-[0.839, 0.818, 0.817],
-[0.220, 0.154, 0.163],
-[0.074, 0.058, 0.063],
-[0.037, 0.038, 0.038],
-[0.391, 0.353, 0.329],
-[0.034, 0.012, 0.014],
-[0.014, 0.012, 0.011],
-[0.005, 0.005, 0.005]
-        ]
-    },
-    {
-        "system":       "DigitalOcean Storage-opt 32",
-        "system_full":  "DigitalOcean, 32 CPUs, 256 GB RAM, 4.56 TB NVM SSD, Storage Intensive, Frankfurt, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.001],
-[0.016, 0.011, 0.010],
-[0.029, 0.020, 0.019],
-[0.044, 0.025, 0.025],
-[0.103, 0.094, 0.091],
-[0.202, 0.181, 0.182],
-[0.021, 0.014, 0.012],
-[0.012, 0.010, 0.010],
-[0.259, 0.240, 0.237],
-[0.291, 0.268, 0.267],
-[0.128, 0.114, 0.113],
-[0.137, 0.121, 0.120],
-[0.351, 0.315, 0.315],
-[0.435, 0.403, 0.401],
-[0.389, 0.377, 0.370],
-[0.473, 0.459, 0.450],
-[1.076, 1.019, 1.034],
-[0.673, 0.632, 0.653],
-[1.804, 1.773, 1.779],
-[0.055, 0.048, 0.030],
-[0.555, 0.472, 0.462],
-[0.575, 0.465, 0.478],
-[1.245, 1.087, 1.073],
-[1.206, 0.561, 0.572],
-[0.178, 0.137, 0.137],
-[0.133, 0.116, 0.116],
-[0.168, 0.139, 0.133],
-[0.533, 0.434, 0.440],
-[0.727, 0.676, 0.668],
-[1.037, 1.029, 1.029],
-[0.343, 0.308, 0.308],
-[0.503, 0.448, 0.449],
-[3.128, 2.888, 2.937],
-[1.772, 1.605, 1.586],
-[1.653, 1.591, 1.606],
-[0.754, 0.718, 0.703],
-[0.198, 0.156, 0.143],
-[0.074, 0.056, 0.057],
-[0.040, 0.040, 0.035],
-[0.395, 0.333, 0.320],
-[0.031, 0.017, 0.014],
-[0.013, 0.011, 0.017],
-[0.008, 0.009, 0.006]
-        ]
-    },
-    {
-        "system":       "DigitalOcean Memory-opt 32",
-        "system_full":  "DigitalOcean, 32 CPUs, 256 GB RAM, 4.8 TB SSD, Memory Intensive, Frankfurt, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.003, 0.002, 0.002],
-[0.016, 0.009, 0.009],
-[0.030, 0.019, 0.019],
-[0.045, 0.026, 0.025],
-[0.103, 0.091, 0.090],
-[0.200, 0.180, 0.175],
-[0.017, 0.012, 0.012],
-[0.012, 0.011, 0.010],
-[0.264, 0.237, 0.234],
-[0.291, 0.270, 0.259],
-[0.124, 0.111, 0.111],
-[0.136, 0.118, 0.117],
-[0.352, 0.316, 0.303],
-[0.439, 0.394, 0.392],
-[0.391, 0.370, 0.372],
-[0.466, 0.450, 0.449],
-[1.075, 1.014, 1.008],
-[0.654, 0.628, 0.619],
-[1.810, 1.801, 1.787],
-[0.053, 0.032, 0.030],
-[0.550, 0.443, 0.461],
-[0.553, 0.461, 0.465],
-[1.237, 1.064, 1.065],
-[1.163, 0.589, 0.548],
-[0.178, 0.132, 0.135],
-[0.131, 0.114, 0.112],
-[0.164, 0.133, 0.132],
-[0.530, 0.442, 0.433],
-[0.720, 0.664, 0.659],
-[1.032, 1.024, 1.023],
-[0.346, 0.311, 0.314],
-[0.502, 0.439, 0.438],
-[3.146, 2.869, 2.891],
-[1.757, 1.615, 1.589],
-[1.642, 1.571, 1.580],
-[0.743, 0.711, 0.722],
-[0.208, 0.151, 0.140],
-[0.077, 0.057, 0.056],
-[0.037, 0.037, 0.040],
-[0.378, 0.310, 0.315],
-[0.031, 0.014, 0.017],
-[0.019, 0.010, 0.010],
-[0.005, 0.005, 0.005]
-        ]
-    },
-    {
-        "system":       "DigitalOcean CPU-opt, 32",
-        "system_full":  "DigitalOcean, 32 CPUs, 64 GB RAM, 3.52 TB SSD, CPU Intensive, Frankfurt, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.001],
-[0.016, 0.009, 0.009],
-[0.026, 0.018, 0.018],
-[0.040, 0.025, 0.024],
-[0.097, 0.083, 0.088],
-[0.190, 0.167, 0.171],
-[0.020, 0.011, 0.011],
-[0.011, 0.009, 0.009],
-[0.253, 0.228, 0.231],
-[0.277, 0.257, 0.258],
-[0.117, 0.104, 0.107],
-[0.127, 0.111, 0.111],
-[0.346, 0.313, 0.310],
-[0.435, 0.396, 0.392],
-[0.391, 0.366, 0.361],
-[0.469, 0.458, 0.455],
-[1.070, 1.026, 1.033],
-[0.649, 0.626, 0.627],
-[1.859, 1.808, 1.803],
-[0.065, 0.032, 0.025],
-[0.513, 0.402, 0.420],
-[0.525, 0.418, 0.417],
-[1.167, 1.004, 0.988],
-[1.118, 0.531, 0.538],
-[0.171, 0.126, 0.122],
-[0.124, 0.108, 0.105],
-[0.158, 0.126, 0.124],
-[0.501, 0.407, 0.409],
-[0.691, 0.624, 0.619],
-[1.106, 1.095, 1.094],
-[0.337, 0.301, 0.302],
-[0.504, 0.447, 0.453],
-[3.187, 2.934, 2.963],
-[1.771, 1.583, 1.570],
-[1.661, 1.584, 1.573],
-[0.748, 0.733, 0.736],
-[0.198, 0.152, 0.145],
-[0.072, 0.055, 0.053],
-[0.039, 0.035, 0.035],
-[0.395, 0.332, 0.322],
-[0.032, 0.012, 0.012],
-[0.019, 0.014, 0.009],
-[0.005, 0.005, 0.005]
-        ]
-    },
-    {
-        "system":       "DigitalOcean General 40",
-        "system_full":  "DigitalOcean, 40 CPUs, 64 GB RAM, 1 TB SSD, General Purpose, San Francisco, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-12-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.003, 0.001, 0.001],
-[0.019, 0.009, 0.009],
-[0.045, 0.017, 0.017],
-[0.103, 0.022, 0.021],
-[0.131, 0.086, 0.088],
-[0.210, 0.167, 0.163],
-[0.018, 0.011, 0.011],
-[0.014, 0.010, 0.010],
-[0.246, 0.204, 0.204],
-[0.297, 0.231, 0.238],
-[0.138, 0.103, 0.102],
-[0.148, 0.106, 0.107],
-[0.352, 0.313, 0.309],
-[0.453, 0.394, 0.392],
-[0.392, 0.349, 0.349],
-[0.452, 0.429, 0.429],
-[1.060, 0.972, 0.966],
-[0.668, 0.591, 0.606],
-[1.721, 1.645, 1.640],
-[0.102, 0.039, 0.024],
-[0.973, 0.386, 0.381],
-[1.105, 0.405, 0.388],
-[1.996, 0.986, 0.969],
-[2.381, 0.475, 0.463],
-[0.294, 0.112, 0.111],
-[0.167, 0.096, 0.099],
-[0.296, 0.114, 0.114],
-[0.961, 0.432, 0.424],
-[0.840, 0.611, 0.610],
-[1.100, 1.090, 1.088],
-[0.374, 0.292, 0.283],
-[0.691, 0.432, 0.429],
-[3.111, 2.863, 2.922],
-[1.857, 1.579, 1.553],
-[1.762, 1.548, 1.542],
-[0.573, 0.552, 0.542],
-[0.221, 0.140, 0.144],
-[0.079, 0.059, 0.058],
-[0.038, 0.034, 0.035],
-[0.405, 0.342, 0.354],
-[0.039, 0.018, 0.013],
-[0.015, 0.010, 0.010],
-[0.005, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/do_xeon_6140_4.json b/website/benchmark/hardware/results/do_xeon_6140_4.json
deleted file mode 100644
index 284d2b5bacc..00000000000
--- a/website/benchmark/hardware/results/do_xeon_6140_4.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "DigitalOcean CPU-opt 4",
-        "system_full":  "DigitalOcean CPU-Optimized 4CPU/8GB RAM Intel(R) Xeon(R) Gold 6140",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2020-11-14 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.001, 0.002, 0.002],
-[0.039, 0.046, 0.025],
-[0.116, 0.087, 0.086],
-[0.250, 0.120, 0.109],
-[0.391, 0.313, 0.321],
-[1.035, 0.946, 0.960],
-[0.058, 0.047, 0.047],
-[0.030, 0.026, 0.026],
-[1.498, 1.368, 1.371],
-[1.708, 1.568, 1.568],
-[0.568, 0.480, 0.478],
-[0.652, 0.568, 0.566],
-[2.200, 1.968, 1.924],
-[2.739, 2.561, 2.531],
-[2.358, 2.208, 2.206],
-[2.544, 2.407, 2.405],
-[6.307, 5.914, 5.927],
-[3.838, 3.608, 3.589],
-[null, null, null],
-[0.251, 0.121, 0.120],
-[3.337, 2.447, 2.441],
-[3.785, 2.669, 2.602],
-[8.053, 6.082, 6.054],
-[6.301, 2.976, 2.931],
-[1.109, 0.816, 0.811],
-[0.791, 0.693, 0.681],
-[1.111, 0.821, 0.817],
-[3.162, 2.162, 2.090],
-[4.601, 3.854, 3.825],
-[3.590, 3.560, 3.582],
-[2.114, 1.847, 1.823],
-[3.559, 2.851, 2.797],
-[null, null, null],
-[null, null, null],
-[null, null, null],
-[3.620, 3.446, 3.397],
-[0.231, 0.196, 0.182],
-[0.079, 0.066, 0.066],
-[0.095, 0.059, 0.069],
-[0.447, 0.382, 0.386],
-[0.050, 0.034, 0.021],
-[0.042, 0.016, 0.015],
-[0.006, 0.008, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/efs_vs_ebs.json b/website/benchmark/hardware/results/efs_vs_ebs.json
deleted file mode 100644
index 8cbc89f58da..00000000000
--- a/website/benchmark/hardware/results/efs_vs_ebs.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "system":       "t3.xlarge, EBS",
-        "system_full":  "t3.xlarge, EBS 1 TiB gp2, 3000 IOPS",
-        "time":         "2021-11-08 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.001,0.002,0.001],
-[0.053,0.04,0.038],
-[0.254,0.136,0.121],
-[0.524,0.194,0.174],
-[0.71,0.375,0.376],
-[1.575,1.27,1.225],
-[0.088,0.076,0.075],
-[0.082,0.031,0.032],
-[2.326,1.976,1.973],
-[2.751,2.244,2.183],
-[0.953,0.704,0.669],
-[1.284,0.831,0.771],
-[3.409,2.972,3.072],
-[4.786,4.218,4.286],
-[4.686,4.061,4.058],
-[3.539,3.287,3.191],
-[12.088,11.476,11.371],
-[8.679,7.746,7.719],
-[24.023,22.915,22.783],
-[0.777,0.489,0.238],
-[8.885,4.196,4.088],
-[10.116,4.387,4.215],
-[19.825,9.816,9.468],
-[15.399,4.741,4.668],
-[2.502,1.261,1.121],
-[1.358,0.972,0.982],
-[1.865,1.136,1.132],
-[8.788,3.68,3.472],
-[9.6,5.466,5.405],
-[4.733,4.742,4.798],
-[3.531,2.568,2.431],
-[5.217,3.306,3.327],
-[21.862,21.028,20.748],
-[19.793,15.297,15.241],
-[19.678,15.219,15.316],
-[5.943,5.372,5.428],
-[0.284,0.256,0.213],
-[0.102,0.085,0.1],
-[0.115,0.095,0.079],
-[0.602,0.549,0.722],
-[0.063,0.023,0.023],
-[0.064,0.02,0.02],
-[0.008,0.005,0.004]
-        ]
-    },
-
-    {
-        "system":       "t3.xlarge, EFS",
-        "system_full":  "t3.xlarge, EFS 1 TiB gp, prov. at 1000 MiB/s",
-        "time":         "2021-11-08 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-[0.001,0.001,0.001],
-[0.074,0.036,0.043],
-[0.482,0.13,0.142],
-[1.623,0.205,0.209],
-[1.823,0.425,0.361],
-[3.075,1.274,1.237],
-[0.11,0.076,0.076],
-[0.152,0.039,0.037],
-[3.837,1.944,1.959],
-[4.251,2.517,2.168],
-[2.232,0.835,0.711],
-[2.263,0.936,0.802],
-[4.947,3.078,3.026],
-[7.207,4.084,4.07],
-[6.074,4.452,3.919],
-[5.349,3.191,3.12],
-[14.559,11.097,11.063],
-[11.058,8.01,7.762],
-[28.227,22.692,22.459],
-[1.688,0.35,0.259],
-[16.214,4.229,4.039],
-[18.284,4.339,4.233],
-[31.926,9.819,9.475],
-[30.797,5.062,5.247],
-[4.744,1.308,1.122],
-[2.785,1.022,0.957],
-[4.473,1.235,1.135],
-[15.194,3.561,3.443],
-[15.267,5.481,5.387],
-[5.145,4.8,4.686],
-[5.523,2.581,2.531],
-[9.329,3.263,3.452],
-[25.753,20.411,20.543],
-[26.907,14.767,14.783],
-[26.541,15.051,14.838],
-[6.637,5.235,5.491],
-[0.493,0.237,0.217],
-[0.171,0.095,0.094],
-[0.298,0.091,0.085],
-[0.901,0.555,0.547],
-[0.171,0.042,0.035],
-[0.12,0.035,0.033],
-[0.032,0.014,0.015]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/equinix_metal_n3_xlarge.json b/website/benchmark/hardware/results/equinix_metal_n3_xlarge.json
deleted file mode 100644
index c9fdb07c31c..00000000000
--- a/website/benchmark/hardware/results/equinix_metal_n3_xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Equinix metal n3.xlarge.x84",
-        "system_full":      "Equinix metal n3.xlarge.x84 503 Gib local NVMe ",
-        "time":         "2022-07-12 10:25:52",
-        "kind":         "server",
-        "result":
-        [
-            [0.010, 0.029, 0.003],
-            [0.387, 0.245, 0.198],
-            [0.089, 0.044, 0.049],
-            [0.128, 0.084, 0.070],
-            [0.210, 0.161, 0.173],
-            [0.321, 0.216, 0.272],
-            [0.011, 0.004, 0.004],
-            [0.109, 0.074, 0.064],
-            [0.353, 0.284, 0.287],
-            [0.437, 0.310, 0.302],
-            [0.194, 0.311, 0.280],
-            [0.194, 0.180, 0.148],
-            [0.351, 0.276, 0.263],
-            [0.381, 0.326, 0.313],
-            [0.353, 0.270, 0.271],
-            [0.324, 0.300, 0.306],
-            [0.839, 0.782, 0.786],
-            [0.608, 0.521, 0.548],
-            [1.387, 1.317, 1.339],
-            [0.090, 0.081, 0.087],
-            [0.623, 0.474, 0.428],
-            [0.581, 0.404, 0.395],
-            [1.137, 0.879, 0.878],
-            [0.794, 0.565, 0.577],
-            [0.211, 0.119, 0.116],
-            [0.162, 0.107, 0.100],
-            [0.230, 0.135, 0.132],
-            [0.606, 0.411, 0.406],
-            [0.724, 0.499, 0.491],
-            [0.638, 0.595, 0.609],
-            [0.289, 0.209, 0.222],
-            [0.469, 0.274, 0.313],
-            [2.042, 1.748, 1.697],
-            [1.484, 1.332, 1.262],
-            [1.347, 1.230, 1.175],
-            [0.516, 0.470, 0.471],
-            [0.142, 0.090, 0.099],
-            [0.078, 0.056, 0.045],
-            [0.084, 0.041, 0.057],
-            [0.248, 0.190, 0.218],
-            [0.057, 0.063, 0.048],
-            [0.059, 0.047, 0.026],
-            [0.018, 0.017, 0.009]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/gcp_c2.json b/website/benchmark/hardware/results/gcp_c2.json
deleted file mode 100644
index d9e6e1e4c90..00000000000
--- a/website/benchmark/hardware/results/gcp_c2.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "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
deleted file mode 100644
index e99bdc41b82..00000000000
--- a/website/benchmark/hardware/results/gcp_n2.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "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/gcp_n2d.json b/website/benchmark/hardware/results/gcp_n2d.json
deleted file mode 100644
index 068eba114eb..00000000000
--- a/website/benchmark/hardware/results/gcp_n2d.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-    {
-        "system":       "GCP n2d-16-highmem",
-        "system_full":  "GCP compute n2d-16-highmem, AMD EPYC 7B12, 16vCPU, 128 GiB RAM",
-        "time":         "2021-11-18 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-[0.002, 0.001, 0.001],
-[0.017, 0.013, 0.012],
-[0.046, 0.032, 0.031],
-[0.062, 0.048, 0.046],
-[0.122, 0.112, 0.103],
-[0.365, 0.313, 0.312],
-[0.026, 0.029, 0.024],
-[0.028, 0.014, 0.014],
-[0.516, 0.473, 0.477],
-[0.591, 0.545, 0.542],
-[0.210, 0.178, 0.183],
-[0.224, 0.208, 0.205],
-[0.682, 0.629, 0.609],
-[0.862, 0.804, 0.812],
-[0.854, 0.769, 0.778],
-[0.769, 0.771, 0.768],
-[2.147, 2.171, 2.166],
-[1.439, 1.380, 1.355],
-[4.099, 3.974, 4.048],
-[0.118, 0.053, 0.048],
-[0.873, 0.785, 0.786],
-[1.022, 0.908, 0.891],
-[2.278, 2.079, 2.042],
-[1.714, 0.962, 0.950],
-[0.400, 0.287, 0.267],
-[0.336, 0.248, 0.228],
-[0.379, 0.273, 0.268],
-[0.889, 0.816, 0.802],
-[1.474, 1.391, 1.455],
-[1.358, 1.355, 1.342],
-[0.723, 0.628, 0.613],
-[0.914, 0.756, 0.741],
-[3.916, 3.967, 3.962],
-[3.194, 2.998, 3.016],
-[3.097, 3.050, 3.073],
-[1.099, 1.111, 1.087],
-[0.184, 0.168, 0.175],
-[0.072, 0.066, 0.065],
-[0.067, 0.063, 0.055],
-[0.373, 0.374, 0.376],
-[0.032, 0.027, 0.020],
-[0.021, 0.015, 0.015],
-[0.006, 0.008, 0.006]
-        ]
-    },
-    {
-        "system":       "GCP n2d-standard-8",
-        "system_full":  "GCP n2d-standard-8, AMD EPYC 7B12, 8vCPU, 64 GiB RAM",
-        "time":         "2021-11-23 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.054, 0.019, 0.023],
-[0.109, 0.053, 0.061],
-[0.282, 0.102, 0.098],
-[0.261, 0.183, 0.185],
-[0.812, 0.697, 0.699],
-[0.058, 0.034, 0.036],
-[0.048, 0.023, 0.020],
-[1.164, 1.191, 1.206],
-[1.332, 1.223, 1.354],
-[0.378, 0.388, 0.314],
-[0.448, 0.464, 0.376],
-[1.593, 1.719, 1.699],
-[2.137, 1.940, 2.271],
-[1.957, 2.048, 1.895],
-[1.797, 1.711, 1.998],
-[6.016, 5.934, 5.659],
-[3.573, 3.571, 3.396],
-[11.690, 11.552, 11.673],
-[0.251, 0.124, 0.125],
-[3.106, 2.289, 2.330],
-[3.490, 2.253, 2.563],
-[6.666, 4.699, 5.062],
-[8.078, 2.300, 2.726],
-[0.883, 0.639, 0.604],
-[0.513, 0.534, 0.507],
-[0.879, 0.626, 0.625],
-[3.068, 1.940, 1.656],
-[3.389, 3.633, 3.075],
-[2.576, 2.445, 2.623],
-[1.431, 1.464, 1.441],
-[2.365, 2.076, 2.067],
-[10.904, 11.111, 13.093],
-[8.407, 7.915, 8.475],
-[8.005, 8.124, 9.201],
-[2.701, 3.199, 3.036],
-[0.244, 0.239, 0.204],
-[0.118, 0.092, 0.089],
-[0.103, 0.093, 0.060],
-[0.539, 0.457, 0.445],
-[0.048, 0.022, 0.022],
-[0.038, 0.067, 0.016],
-[0.011, 0.004, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/gp1_s_16x.json b/website/benchmark/hardware/results/gp1_s_16x.json
deleted file mode 100644
index 1353fc87d00..00000000000
--- a/website/benchmark/hardware/results/gp1_s_16x.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "scaleway GP1-S 8x x86",
-        "system_full":  "scaleway GP1-M 16x x86 64bit 64GB ram 600gb NVMe",
-        "time":         "2022-02-16 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.005,	0.005,	0.036],
-            [0.039,	0.026,	0.026],
-            [0.092,	0.046,	0.046],
-            [0.172,	0.056,	0.055],
-            [0.166,	0.126,	0.123],
-            [0.364,	0.272,	0.265],
-            [0.005,	0.006,	0.005],
-            [0.028,	0.027,	0.029],
-            [0.581,	0.49,	0.486],
-            [0.69,	0.549,	0.553],
-            [0.248,	0.178,	0.175],
-            [0.266,	0.208,	0.208],
-            [1.584,	1.017,	0.868],
-            [1.717,	1.113,	1.145],
-            [1.144,	1.084,	1.048],
-            [0.991,	0.92,	0.895],
-            [4.121,	2.639,	2.621],
-            [1.447,	1.348,	1.354],
-            [6.802,	6.466,	6.433],
-            [0.142,	0.057,	0.052],
-            [1.252,	0.743,	0.715],
-            [1.389,	0.823,	0.791],
-            [3.143,	2.225,	2.159],
-            [1.795,	0.871,	0.837],
-            [0.361,	0.236,	0.229],
-            [0.264,	0.211,	0.214],
-            [0.37,	0.24,	0.225],
-            [1.449,	0.967,	0.876],
-            [1.605,	1.206,	1.16 ],
-            [3.412,	3.388,	3.397],
-            [0.783,	0.628,	0.65 ],
-            [1.419,	1.134,	1.112],
-            [6.983,	6.843,	6.852],
-            [5.466,	5.082,	4.955],
-            [5.632,	4.972,	5.22 ],
-            [1.639,	1.604,	1.571],
-            [0.285,	0.298,	0.269],
-            [0.115,	0.115,	0.101],
-            [0.098,	0.1,    0.092],
-            [0.563,	0.562,	0.512],
-            [0.058,	0.039,	0.042],
-            [0.039,	0.039,	0.025],
-            [0.029,	0.012,	0.012]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/gp1_s_8x.json b/website/benchmark/hardware/results/gp1_s_8x.json
deleted file mode 100644
index 2bc008af54c..00000000000
--- a/website/benchmark/hardware/results/gp1_s_8x.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "scaleway GP1-S 8x x86",
-        "system_full":  "scaleway GP1-S 8x x86 64bit 32GB ram 300gb NVMe",
-        "time":         "2022-02-16 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.026, 0.004, 0.004],
-            [0.038, 0.026, 0.026],
-            [0.071, 0.058, 0.059],
-            [0.118, 0.072, 0.069],
-            [0.190, 0.151, 0.155],
-            [0.465, 0.438, 0.401],
-            [0.002, 0.004, 0.004],
-            [0.028, 0.029, 0.026],
-            [0.751, 0.672, 0.676],
-            [0.897, 0.845, 0.798],
-            [0.291, 0.234, 0.254],
-            [0.371, 0.297, 0.296],
-            [1.208, 1.041, 1.005],
-            [1.445, 1.400, 1.414],
-            [1.406, 1.317, 1.342],
-            [1.414, 1.242, 1.244],
-            [4.179, 3.849, 3.878],
-            [2.320, 2.275, 2.201],
-            [7.499, 7.424, 7.196],
-            [0.135, 0.077, 0.068],
-            [1.465, 1.075, 1.063],
-            [1.700, 1.221, 1.198],
-            [3.731, 2.959, 2.905],
-            [2.283, 1.401, 1.342],
-            [0.474, 0.377, 0.367],
-            [0.371, 0.314, 0.337],
-            [0.483, 0.357, 0.356],
-            [1.565, 1.194, 1.181],
-            [2.226, 1.815, 1.746],
-            [2.990, 2.971, 2.947],
-            [1.003, 0.815, 0.842],
-            [1.386, 1.127, 1.108],
-            [8.174, 7.690, 7.735],
-            [6.171, 5.802, 5.933],
-            [6.201, 5.774, 5.972],
-            [1.758, 1.642, 1.639],
-            [0.288, 0.273, 0.253],
-            [0.121, 0.125, 0.107],
-            [0.096, 0.082, 0.088],
-            [0.490, 0.461, 0.476],
-            [0.041, 0.037, 0.035],
-            [0.035, 0.031, 0.025],
-            [0.008, 0.011, 0.015]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/hetzner_epyc.json b/website/benchmark/hardware/results/hetzner_epyc.json
deleted file mode 100644
index 4ced699a56d..00000000000
--- a/website/benchmark/hardware/results/hetzner_epyc.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-    {
-        "system":       "Hetzner CCX22",
-        "system_full":  "Hetzner CCX22 (AMD EPYC 7003, 4 cores, 16 GiB RAM, NVMe)",
-        "time":         "2021-11-17 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.001, 0.001, 0.001],
-[0.036, 0.023, 0.039],
-[0.130, 0.102, 0.092],
-[0.304, 0.148, 0.141],
-[0.431, 0.298, 0.291],
-[1.492, 1.359, 1.357],
-[0.088, 0.087, 0.091],
-[0.058, 0.039, 0.042],
-[1.612, 1.477, 1.473],
-[2.017, 1.805, 1.809],
-[1.044, 0.925, 0.926],
-[1.167, 1.050, 1.048],
-[2.621, 2.447, 2.447],
-[3.426, 3.176, 3.193],
-[3.545, 3.475, 3.431],
-[2.958, 2.805, 2.816],
-[8.547, 8.320, 8.321],
-[6.395, 5.992, 6.081],
-[16.542, 16.407, 16.057],
-[0.404, 0.166, 0.156],
-[4.338, 3.419, 3.373],
-[5.042, 4.102, 4.052],
-[10.231, 8.420, 8.304],
-[6.121, 3.904, 3.804],
-[1.582, 1.297, 1.279],
-[1.316, 1.183, 1.171],
-[1.565, 1.305, 1.296],
-[4.098, 3.290, 3.246],
-[5.999, 5.242, 5.205],
-[2.247, 2.198, 2.183],
-[2.581, 2.336, 2.242],
-[3.269, 2.806, 2.744],
-[14.252, 14.052, 13.956],
-[11.730, 10.638, 10.632],
-[11.418, 10.659, 10.572],
-[4.170, 4.086, 4.092],
-[0.208, 0.173, 0.159],
-[0.082, 0.075, 0.069],
-[0.082, 0.062, 0.065],
-[0.413, 0.392, 0.375],
-[0.046, 0.021, 0.029],
-[0.032, 0.016, 0.017],
-[0.005, 0.004, 0.007]
-        ]
-    },
-    {
-        "system":       "Hetzner CCX32",
-        "system_full":  "Hetzner CCX32 (AMD EPYC 7003, 8 cores, 32 GiB RAM, NVMe)",
-        "time":         "2021-11-17 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.001, 0.001, 0.001],
-[0.021, 0.018, 0.017],
-[0.078, 0.057, 0.063],
-[0.178, 0.083, 0.076],
-[0.229, 0.191, 0.182],
-[1.141, 1.063, 0.977],
-[0.071, 0.051, 0.068],
-[0.056, 0.022, 0.035],
-[1.043, 1.288, 1.272],
-[1.757, 1.003, 0.996],
-[0.554, 0.492, 0.555],
-[0.931, 0.698, 0.582],
-[1.471, 1.364, 1.310],
-[2.284, 2.040, 1.720],
-[1.852, 1.749, 1.710],
-[1.551, 1.496, 1.482],
-[4.852, 4.310, 4.964],
-[3.384, 3.353, 3.015],
-[10.150, 9.422, 10.005],
-[0.230, 0.091, 0.089],
-[3.525, 1.731, 1.721],
-[2.939, 2.325, 2.077],
-[7.716, 5.046, 4.394],
-[3.927, 2.023, 1.951],
-[0.848, 0.732, 0.874],
-[1.005, 0.627, 0.606],
-[0.968, 0.725, 0.687],
-[2.771, 2.453, 1.815],
-[3.536, 3.283, 3.020],
-[1.661, 1.690, 1.761],
-[1.511, 1.213, 1.205],
-[2.002, 1.715, 1.518],
-[8.160, 8.943, 8.982],
-[6.999, 5.827, 6.024],
-[7.777, 6.634, 6.338],
-[2.391, 2.285, 2.284],
-[0.221, 0.182, 0.196],
-[0.114, 0.072, 0.069],
-[0.096, 0.063, 0.065],
-[0.423, 0.382, 0.405],
-[0.077, 0.022, 0.024],
-[0.030, 0.022, 0.018],
-[0.011, 0.004, 0.008]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/hetzner_ex62.json b/website/benchmark/hardware/results/hetzner_ex62.json
deleted file mode 100644
index 2a23b3749ff..00000000000
--- a/website/benchmark/hardware/results/hetzner_ex62.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Hetzner EX62",
-        "system_full":  "Hetzner EX62 (Intel(R) Core(TM) i9-9900K CPU @ 3.60GHz, 128 RAM DDR4 2666, NVMe)",
-        "time":         "2022-04-28 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.006, 0.001, 0.015],
-            [0.012, 0.033, 0.018],
-            [0.038, 0.030, 0.033],
-            [0.065, 0.044, 0.044],
-            [0.133, 0.117, 0.109],
-            [0.330, 0.281, 0.296],
-            [0.002, 0.001, 0.001],
-            [0.010, 0.011, 0.011],
-            [0.596, 0.564, 0.552],
-            [0.676, 0.629, 0.629],
-            [0.175, 0.154, 0.148],
-            [0.214, 0.190, 0.182],
-            [0.932, 0.891, 0.882],
-            [1.191, 1.131, 1.122],
-            [0.996, 0.877, 0.874],
-            [1.144, 1.062, 1.075],
-            [2.787, 2.687, 2.691],
-            [1.502, 1.455, 1.457],
-            [4.826, 4.703, 4.727],
-            [0.071, 0.050, 0.047],
-            [1.179, 0.934, 0.922],
-            [1.242, 1.021, 0.989],
-            [2.876, 2.389, 2.411],
-            [1.629, 1.050, 1.034],
-            [0.314, 0.254, 0.253],
-            [0.250, 0.231, 0.226],
-            [0.328, 0.269, 0.249],
-            [1.219, 0.975, 0.993],
-            [1.686, 1.517, 1.485],
-            [3.458, 3.455, 3.443],
-            [0.771, 0.654, 0.677],
-            [1.208, 1.067, 1.053],
-            [6.915, 6.738, 6.770],
-            [4.771, 4.656, 4.669],
-            [4.851, 4.701, 4.671],
-            [1.451, 1.341, 1.345],
-            [0.153, 0.126, 0.120],
-            [0.053, 0.056, 0.047],
-            [0.054, 0.046, 0.043],
-            [0.276, 0.250, 0.258],
-            [0.021, 0.018, 0.019],
-            [0.018, 0.015, 0.015],
-            [0.004, 0.003, 0.003]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/huawei_taishan_2280_3.json b/website/benchmark/hardware/results/huawei_taishan_2280_3.json
deleted file mode 100644
index c31b055dbee..00000000000
--- a/website/benchmark/hardware/results/huawei_taishan_2280_3.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Huawei TaiShan (2)",
-        "system_full":  "Huawei TaiShan 2280 (AArch64) 2280 (2x64 cores, SSD)",
-        "time":         "2020-11-03 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.001, 0.003, 0.002],
-            [0.009, 0.024, 0.032],
-            [0.023, 0.051, 0.027],
-            [0.035, 0.063, 0.027],
-            [0.103, 0.145, 0.096],
-            [0.121, 0.191, 0.109],
-            [0.009, 0.026, 0.023],
-            [0.014, 0.025, 0.022],
-            [0.209, 0.157, 0.119],
-            [0.254, 0.182, 0.132],
-            [0.153, 0.101, 0.078],
-            [0.151, 0.099, 0.097],
-            [0.289, 0.238, 0.137],
-            [0.342, 0.255, 0.164],
-            [0.302, 0.216, 0.142],
-            [0.291, 0.202, 0.163],
-            [1.269, 0.483, 0.309],
-            [0.457, 0.313, 0.229],
-            [1.376, 0.942, 0.597],
-            [0.073, 0.055, 0.023],
-            [0.555, 0.321, 0.193],
-            [0.913, 0.308, 0.191],
-            [1.713, 0.668, 0.421],
-            [0.894, 0.837, 0.387],
-            [0.238, 0.091, 0.061],
-            [0.153, 0.081, 0.055],
-            [0.174, 0.091, 0.059],
-            [0.933, 0.361, 0.233],
-            [0.793, 0.366, 0.237],
-            [0.682, 0.551, 0.549],
-            [0.321, 0.213, 0.154],
-            [0.593, 0.293, 0.173],
-            [4.436, 1.481, 1.003],
-            [1.544, 0.997, 0.774],
-            [1.981, 1.006, 0.841],
-            [0.539, 0.339, 0.247],
-            [0.194, 0.186, 0.141],
-            [0.075, 0.072, 0.066],
-            [0.072, 0.087, 0.053],
-            [0.393, 0.398, 0.356],
-            [0.032, 0.042, 0.031],
-            [0.023, 0.023, 0.022],
-            [0.005, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/huawei_taishan_2280_v2.json b/website/benchmark/hardware/results/huawei_taishan_2280_v2.json
deleted file mode 100644
index b4a1a6ccfff..00000000000
--- a/website/benchmark/hardware/results/huawei_taishan_2280_v2.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Huawei TaiShan",
-        "system_full":      "Huawei TaiShan 2280 v2 (AArch64) 64 core (2-die), one physical HDD",
-        "time":         "2020-01-15 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.356, 0.002, 0.002],
-            [0.333, 0.018, 0.017],
-            [0.608, 0.021, 0.021],
-            [1.885, 0.032, 0.032],
-            [0.598, 0.099, 0.097],
-            [2.884, 0.165, 0.167],
-            [0.356, 0.016, 0.014],
-            [0.349, 0.015, 0.015],
-            [0.981, 0.283, 0.296],
-            [0.783, 0.326, 0.328],
-            [0.580, 0.135, 0.136],
-            [0.511, 0.142, 0.142],
-            [1.060, 0.434, 0.438],
-            [1.069, 0.569, 0.566],
-            [1.116, 0.479, 0.479],
-            [0.825, 0.478, 0.486],
-            [1.899, 1.574, 1.590],
-            [1.260, 0.874, 0.849],
-            [5.456, 2.869, 2.903],
-            [0.418, 0.037, 0.034],
-            [19.336, 0.478, 0.494],
-            [22.442, 0.595, 0.595],
-            [45.958, 8.735, 1.363],
-            [41.321, 0.675, 0.706],
-            [6.074, 0.167, 0.159],
-            [0.925, 0.133, 0.133],
-            [1.151, 0.153, 0.152],
-            [19.627, 0.607, 0.622],
-            [16.496, 0.792, 0.787],
-            [1.770, 2.045, 1.242],
-            [4.827, 0.471, 0.466],
-            [7.695, 0.701, 0.647],
-            [5.246, 4.741, 4.676],
-            [20.496, 2.676, 2.628],
-            [20.338, 2.559, 2.557],
-            [1.696, 0.701, 0.724],
-            [0.665, 0.294, 0.302],
-            [0.402, 0.140, 0.137],
-            [0.366, 0.082, 0.086],
-            [0.867, 0.575, 0.552],
-            [0.334, 0.025, 0.025],
-            [0.333, 0.023, 0.022],
-            [0.340, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/huawei_taishan_920.json b/website/benchmark/hardware/results/huawei_taishan_920.json
deleted file mode 100644
index 61a37d338d5..00000000000
--- a/website/benchmark/hardware/results/huawei_taishan_920.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Huawei TaiShan",
-        "system_full":      "Huawei TaiShan Kunpeng 920, 96 vCPU, 256GB RAM",
-        "time":         "2022-06-18 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.018, 0.001, 0.002],
-            [0.106, 0.019, 0.019],
-            [0.835, 0.027, 0.026],
-            [3.314, 0.031, 0.030],
-            [1.034, 0.130, 0.131],
-            [3.221, 0.166, 0.166],
-            [0.002, 0.002, 0.002],
-            [0.061, 0.023, 0.022],
-            [3.989, 0.191, 0.189],
-            [3.233, 0.215, 0.213],
-            [2.774, 0.112, 0.106],
-            [1.999, 0.111, 0.109],
-            [3.377, 0.259, 0.262],
-            [5.308, 0.324, 0.326],
-            [3.505, 0.267, 0.272],
-            [2.382, 0.316, 0.311],
-            [5.633, 0.648, 0.656],
-            [5.505, 0.446, 0.449],
-            [8.911, 1.509, 1.487],
-            [2.116, 0.042, 0.032],
-            [21.597, 0.308, 0.287],
-            [28.341, 0.347, 0.354],
-            [53.912, 0.907, 0.901],
-            [52.521, 1.923, 0.904],
-            [7.845, 0.100, 0.100],
-            [3.213, 0.082, 0.083],
-            [6.985, 0.102, 0.099],
-            [21.502, 0.404, 0.406],
-            [20.771, 0.505, 0.498],
-            [0.739, 0.666, 0.664],
-            [6.025, 0.228, 0.224],
-            [12.865, 0.410, 0.408],
-            [10.248, 2.236, 2.222],
-            [21.545, 1.226, 1.232],
-            [26.602, 1.218, 1.247],
-            [1.696, 0.435, 0.431],
-            [0.353, 0.232, 0.227],
-            [0.193, 0.103, 0.100],
-            [0.305, 0.086, 0.087],
-            [0.640, 0.476, 0.483],
-            [0.190, 0.028, 0.030],
-            [0.137, 0.023, 0.024],
-            [0.064, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/i3_2xlarge.json b/website/benchmark/hardware/results/i3_2xlarge.json
deleted file mode 100644
index e716b99e8a2..00000000000
--- a/website/benchmark/hardware/results/i3_2xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS i3.2xlarge",
-        "system_full":  "AWS i3.2xlarge Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz",
-        "time":         "2022-01-02 03:16:35",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.002, 0.002, 0.002],
-            [0.040, 0.023, 0.027],
-            [0.153, 0.084, 0.090],
-            [0.682, 0.113, 0.120],
-            [1.218, 0.227, 0.225],
-            [1.972, 0.708, 0.700],
-            [0.066, 0.052, 0.052],
-            [0.086, 0.037, 0.030],
-            [1.609, 1.123, 1.119],
-            [1.784, 1.231, 1.241],
-            [0.782, 0.444, 0.392],
-            [0.929, 0.504, 0.476],
-            [2.273, 1.649, 1.633],
-            [4.022, 2.181, 2.214],
-            [2.459, 2.022, 1.925],
-            [2.015, 1.621, 1.677],           
-            [6.344, 5.439, 5.625],
-            [4.450, 3.724, 3.678],
-            [12.221, 10.922, 10.933],
-            [0.674, 0.139, 0.132],
-            [18.758, 2.164, 2.152],
-            [20.902, 2.440, 2.367],
-            [39.396, 5.476, 5.427],
-            [31.640, 2.759, 2.755],
-            [4.498, 0.647, 0.646],
-            [1.709, 0.627, 0.540],
-            [4.488, 0.665, 0.656],
-            [18.286, 2.023, 2.013],
-            [15.375, 2.896, 2.959],
-            [2.962, 2.899, 2.974],
-            [3.663, 1.299, 1.304],
-            [9.731, 1.922, 1.915],
-            [11.575, 10.394, 10.514],
-            [20.617, 8.121, 8.097],
-            [20.558, 8.088, 8.049],
-            [3.059, 2.780, 2.678],
-            [0.322, 0.244, 0.217],
-            [0.122, 0.082, 0.092],
-            [0.146, 0.073, 0.072],
-            [0.652, 0.473, 0.502],
-            [0.097, 0.025, 0.034],
-            [0.052, 0.025, 0.019],
-            [0.007, 0.004, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/ibm_cloud_baremetal.json b/website/benchmark/hardware/results/ibm_cloud_baremetal.json
deleted file mode 100644
index 46d319c6c7b..00000000000
--- a/website/benchmark/hardware/results/ibm_cloud_baremetal.json
+++ /dev/null
@@ -1,210 +0,0 @@
-[
-    {
-        "system":       "2x AMD EPYC 3.2 GHz, Micron 5100 MAX 960 GB",
-        "system_full":  "2x AMD EPYC 7F72 3.2 Ghz - Total 96 Cores - IBM Cloud's Bare Metal Service - 512 GB RAM - Micron 5100 MAX 960 GB SSD",
-        "time":         "2021-01-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.027, 0.013, 0.012],
-[0.116, 0.017, 0.016],
-[0.509, 0.020, 0.018],
-[0.535, 0.071, 0.069],
-[0.155, 0.111, 0.108],
-[0.028, 0.016, 0.015],
-[0.016, 0.013, 0.013],
-[0.700, 0.124, 0.123],
-[0.832, 0.144, 0.149],
-[0.567, 0.074, 0.075],
-[0.571, 0.078, 0.076],
-[0.241, 0.176, 0.171],
-[0.728, 0.223, 0.223],
-[0.333, 0.227, 0.221],
-[0.634, 0.235, 0.241],
-[0.983, 0.577, 0.566],
-[0.692, 0.340, 0.319],
-[2.222, 1.081, 1.117],
-[0.500, 0.034, 0.033],
-[5.333, 0.263, 0.193],
-[5.484, 0.221, 0.200],
-[9.963, 0.623, 0.614],
-[11.277, 0.331, 0.299],
-[0.940, 0.075, 0.070],
-[0.124, 0.060, 0.056],
-[0.942, 0.072, 0.066],
-[5.445, 0.307, 0.269],
-[4.305, 0.313, 0.301],
-[0.613, 0.558, 0.573],
-[0.732, 0.190, 0.186],
-[2.433, 0.301, 0.293],
-[3.473, 1.907, 1.782],
-[6.202, 1.048, 0.976],
-[6.193, 1.013, 0.991],
-[0.499, 0.304, 0.300],
-[0.192, 0.134, 0.129],
-[0.072, 0.054, 0.055],
-[0.030, 0.029, 0.029],
-[0.295, 0.263, 0.300],
-[0.052, 0.017, 0.022],
-[0.021, 0.016, 0.011],
-[0.006, 0.005, 0.008]
-        ]
-    },
-    {
-        "system":       "2x AMD EPYC 3.2 GHz, Intel P4610 NVM SSD",
-        "system_full":  "2x AMD EPYC 7F72 3.2 Ghz - Total 96 Cores - IBM Cloud's Bare Metal Service - 512 GB RAM - 1.8 TB Intel P4610 NVM SSD",
-        "time":         "2021-01-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.002, 0.001, 0.001],
-[0.023, 0.013, 0.013],
-[0.036, 0.018, 0.018],
-[0.078, 0.021, 0.021],
-[0.113, 0.070, 0.070],
-[0.171, 0.106, 0.103],
-[0.026, 0.017, 0.017],
-[0.016, 0.015, 0.015],
-[0.174, 0.119, 0.120],
-[0.190, 0.135, 0.142],
-[0.128, 0.075, 0.087],
-[0.132, 0.078, 0.077],
-[0.254, 0.172, 0.169],
-[0.303, 0.215, 0.210],
-[0.275, 0.221, 0.218],
-[0.251, 0.223, 0.220],
-[0.787, 0.550, 0.536],
-[0.373, 0.298, 0.307],
-[1.149, 1.050, 1.061],
-[0.081, 0.025, 0.019],
-[0.820, 0.193, 0.163],
-[0.923, 0.204, 0.179],
-[1.723, 0.639, 0.625],
-[2.089, 0.300, 0.282],
-[0.239, 0.068, 0.064],
-[0.126, 0.063, 0.055],
-[0.237, 0.073, 0.063],
-[0.829, 0.267, 0.254],
-[0.721, 0.284, 0.270],
-[0.463, 0.450, 0.453],
-[0.281, 0.177, 0.172],
-[0.573, 0.276, 0.272],
-[2.388, 1.731, 1.699],
-[1.254, 0.927, 0.992],
-[1.280, 0.975, 0.963],
-[0.315, 0.285, 0.285],
-[0.188, 0.126, 0.136],
-[0.070, 0.049, 0.051],
-[0.031, 0.029, 0.030],
-[0.326, 0.304, 0.337],
-[0.034, 0.021, 0.015],
-[0.017, 0.025, 0.020],
-[0.010, 0.005, 0.005]
-        ]
-    },
-    {
-        "system":       "2x AMD EPYC 7642, 7.2 TB NVM",
-        "system_full":  "2x AMD EPYC 7642 - 512 GB RAM - 7.2 TB NVM",
-        "time":         "2021-01-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.003, 0.002, 0.002],
-[0.056, 0.057, 0.041],
-[0.081, 0.051, 0.059],
-[0.080, 0.039, 0.034],
-[0.149, 0.109, 0.105],
-[0.192, 0.124, 0.125],
-[0.031, 0.026, 0.027],
-[0.029, 0.022, 0.025],
-[0.181, 0.122, 0.126],
-[0.206, 0.136, 0.136],
-[0.133, 0.079, 0.081],
-[0.140, 0.079, 0.080],
-[0.207, 0.150, 0.148],
-[0.281, 0.182, 0.180],
-[0.228, 0.150, 0.149],
-[0.183, 0.151, 0.151],
-[0.431, 0.348, 0.349],
-[0.316, 0.237, 0.244],
-[1.091, 0.794, 0.787],
-[0.081, 0.037, 0.024],
-[0.833, 0.183, 0.152],
-[0.950, 0.203, 0.164],
-[1.735, 0.503, 0.491],
-[1.656, 0.290, 0.270],
-[0.251, 0.063, 0.057],
-[0.134, 0.050, 0.056],
-[0.250, 0.061, 0.063],
-[0.844, 0.244, 0.238],
-[0.735, 0.224, 0.225],
-[0.532, 0.505, 0.512],
-[0.259, 0.128, 0.134],
-[0.523, 0.215, 0.199],
-[1.380, 1.031, 1.029],
-[1.122, 0.665, 0.638],
-[1.115, 0.651, 0.646],
-[0.261, 0.222, 0.227],
-[0.151, 0.147, 0.134],
-[0.063, 0.060, 0.063],
-[0.035, 0.038, 0.035],
-[0.372, 0.310, 0.351],
-[0.031, 0.025, 0.026],
-[0.019, 0.016, 0.016],
-[0.008, 0.007, 0.012]
-        ]
-    },
-    {
-        "system":       "2x AMD EPYC 3.2 GHz, 4x1.8 TB Intel P4610 NVM SSD",
-        "system_full":  "2x AMD EPYC 7F72 3.2 Ghz - Total 96 Cores - IBM Cloud's Bare Metal Service - 512 GB RAM - RAID 0 4X 1.8 TB Intel P4610 NVM SSD",
-        "time":         "2021-01-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.002, 0.002, 0.001],
-[0.052, 0.037, 0.043],
-[0.045, 0.047, 0.034],
-[0.074, 0.024, 0.025],
-[0.102, 0.073, 0.065],
-[0.135, 0.106, 0.101],
-[0.021, 0.017, 0.017],
-[0.020, 0.014, 0.014],
-[0.140, 0.115, 0.116],
-[0.156, 0.132, 0.131],
-[0.113, 0.074, 0.071],
-[0.106, 0.075, 0.080],
-[0.221, 0.194, 0.192],
-[0.270, 0.247, 0.240],
-[0.253, 0.236, 0.237],
-[0.265, 0.247, 0.246],
-[0.748, 0.576, 0.583],
-[0.349, 0.318, 0.335],
-[1.101, 1.096, 1.103],
-[0.083, 0.024, 0.025],
-[0.613, 0.209, 0.225],
-[0.606, 0.208, 0.191],
-[0.803, 0.666, 0.648],
-[0.647, 0.324, 0.304],
-[0.137, 0.069, 0.068],
-[0.118, 0.055, 0.052],
-[0.138, 0.064, 0.064],
-[0.597, 0.270, 0.258],
-[0.560, 0.302, 0.293],
-[0.607, 0.629, 0.620],
-[0.212, 0.176, 0.181],
-[0.393, 0.290, 0.281],
-[2.137, 1.832, 1.779],
-[1.125, 0.990, 1.007],
-[1.193, 1.016, 0.985],
-[0.309, 0.294, 0.327],
-[0.149, 0.135, 0.150],
-[0.058, 0.057, 0.055],
-[0.037, 0.037, 0.029],
-[0.346, 0.315, 0.323],
-[0.020, 0.024, 0.021],
-[0.020, 0.019, 0.015],
-[0.009, 0.009, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/im4gn_16xlarge.json b/website/benchmark/hardware/results/im4gn_16xlarge.json
deleted file mode 100644
index 6db4f08021f..00000000000
--- a/website/benchmark/hardware/results/im4gn_16xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS im4gn.16xlarge",
-        "system_full":  "AWS im4gn.16xlarge Neoverse-N1 4x7,500 NVMe SSD",
-        "time":         "2022-01-04 01:04:37",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.002, 0.001, 0.001],
-            [0.046, 0.017, 0.021],
-            [0.044, 0.021, 0.022],
-            [0.850, 0.064, 0.066],
-            [1.423, 0.076, 0.075],
-            [2.368, 0.141, 0.139],
-            [0.022, 0.013, 0.013],
-            [0.037, 0.038, 0.036],
-            [1.434, 0.138, 0.138],
-            [2.173, 0.159, 0.158],
-            [1.253, 0.089, 0.091],
-            [1.481, 0.102, 0.093],
-            [2.377, 0.211, 0.206],
-            [3.850, 0.272, 0.253],
-            [2.180, 0.276, 0.239],
-            [1.030, 0.242, 0.228],
-            [3.966, 0.564, 0.526],
-            [3.549, 0.404, 0.377],
-            [6.940, 1.389, 1.267],
-            [0.741, 0.225, 0.126],
-            [19.135, 0.398, 0.371],
-            [21.322, 0.330, 0.322],
-            [40.018, 0.727, 0.697],
-            [33.059, 1.592, 1.565],
-            [4.599, 0.098, 0.092],
-            [2.270, 0.089, 0.088],
-            [5.238, 0.098, 0.095],
-            [19.201, 0.358, 0.349],
-            [15.661, 0.430, 0.412],
-            [0.896, 0.876, 0.863],
-            [3.579, 0.223, 0.200],
-            [9.826, 0.344, 0.314],
-            [7.844, 2.085, 2.183],
-            [19.018, 1.143, 1.036],
-            [19.009, 1.203, 1.046],
-            [0.531, 0.325, 0.331],
-            [0.262, 0.221, 0.218],
-            [0.137, 0.101, 0.090],
-            [0.116, 0.099, 0.079],
-            [0.531, 0.468, 0.468],
-            [0.070, 0.025, 0.043],
-            [0.034, 0.020, 0.020],
-            [0.007, 0.004, 0.018]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/im4gn_4xlarge.json b/website/benchmark/hardware/results/im4gn_4xlarge.json
deleted file mode 100644
index c3024c8dff2..00000000000
--- a/website/benchmark/hardware/results/im4gn_4xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS im4gn.4xlarge",
-        "system_full":  "AWS im4gn.4xlarge Neoverse-N1 1x7,500 NVMe SSD",
-        "time":         "2022-01-02 06:59:48",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.002, 0.002, 0.002],
-            [0.023, 0.013, 0.013],
-            [0.061, 0.026, 0.025],
-            [0.841, 0.033, 0.032],
-            [1.530, 0.086, 0.084],
-            [2.362, 0.291, 0.292],
-            [0.038, 0.029, 0.028],
-            [0.016, 0.015, 0.014],
-            [1.341, 0.302, 0.301],
-            [1.845, 0.376, 0.360],
-            [0.888, 0.184, 0.181],
-            [1.343, 0.215, 0.210],
-            [2.185, 0.469, 0.459],
-            [3.662, 0.603, 0.580],
-            [2.150, 0.587, 0.561],
-            [0.875, 0.458, 0.449],
-            [4.079, 1.425, 1.343],
-            [3.451, 0.927, 0.859],
-            [7.646, 2.890, 2.877],
-            [0.710, 0.107, 0.042],
-            [19.321, 0.696, 0.677],
-            [21.321, 0.740, 0.726],
-            [40.051, 1.625, 1.598],
-            [32.154, 0.842, 0.819],
-            [4.681, 0.240, 0.221],
-            [1.976, 0.197, 0.195],
-            [5.062, 0.241, 0.223],
-            [18.972, 0.643, 0.628],
-            [15.676, 0.978, 0.957],
-            [0.524, 0.505, 0.518],
-            [3.589, 0.460, 0.461],
-            [9.647, 0.674, 0.642],
-            [8.330, 3.414, 3.354],
-            [19.314, 2.296, 2.286],
-            [19.278, 2.311, 2.273],
-            [0.799, 0.753, 0.717],
-            [0.288, 0.222, 0.222],
-            [0.118, 0.101, 0.099],
-            [0.126, 0.085, 0.084],
-            [0.542, 0.480, 0.446],
-            [0.065, 0.025, 0.031],
-            [0.046, 0.021, 0.020],
-            [0.006, 0.010, 0.017]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/im4gn_8xlarge.json b/website/benchmark/hardware/results/im4gn_8xlarge.json
deleted file mode 100644
index 117812b0162..00000000000
--- a/website/benchmark/hardware/results/im4gn_8xlarge.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "AWS im4gn.8xlarge",
-        "system_full":  "AWS im4gn.8xlarge Neoverse-N1 2x7,500 NVMe SSD",
-        "time":         "2022-01-03 22:23:27",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.002, 0.001, 0.001],
-            [0.034, 0.010, 0.010],
-            [0.044, 0.016, 0.016],
-            [0.862, 0.020, 0.020],
-            [1.500, 0.069, 0.071],
-            [2.454, 0.174, 0.172],
-            [0.025, 0.017, 0.017],
-            [0.023, 0.023, 0.023],
-            [1.329, 0.182, 0.181],
-            [2.167, 0.216, 0.212],
-            [1.159, 0.125, 0.119],
-            [1.483, 0.127, 0.122],
-            [2.313, 0.268, 0.260],
-            [3.788, 0.361, 0.329],
-            [2.043, 0.343, 0.308],
-            [0.872, 0.321, 0.309],
-            [3.921, 0.879, 0.840],
-            [3.460, 0.587, 0.543],
-            [7.272, 1.517, 1.447],
-            [0.707, 0.078, 0.064],
-            [19.314, 0.425, 0.385],
-            [21.332, 0.414, 0.405],
-            [40.030, 0.945, 0.921],
-            [32.867, 0.513, 0.477],
-            [4.640, 0.130, 0.124],
-            [2.227, 0.115, 0.107],
-            [5.223, 0.134, 0.126],
-            [19.179, 0.371, 0.367],
-            [15.658, 0.557, 0.545],
-            [0.541, 0.558, 0.552],
-            [3.548, 0.273, 0.250],
-            [9.772, 0.384, 0.357],
-            [7.896, 2.431, 2.661],
-            [19.149, 1.389, 1.268],
-            [19.103, 1.342, 1.282],
-            [0.583, 0.530, 0.541],
-            [0.238, 0.233, 0.243],
-            [0.114, 0.098, 0.102],
-            [0.124, 0.092, 0.089],
-            [0.552, 0.471, 0.481],
-            [0.053, 0.025, 0.025],
-            [0.047, 0.057, 0.020],
-            [0.022, 0.032, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/intel_core_i5_4440.json b/website/benchmark/hardware/results/intel_core_i5_4440.json
deleted file mode 100644
index b70b9e08fd4..00000000000
--- a/website/benchmark/hardware/results/intel_core_i5_4440.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Intel(R) Core(TM) i5-4440 CPU @ 3.10GHz",
-        "system_full":  "Intel(R) Core(TM) i5-4440 CPU @ 3.10GHz",
-        "time":         "2022-01-06 08:48:45",
-        "kind":         "server",
-        "result":
-        [
-            [0.002, 0.001, 0.001],
-            [0.136, 0.021, 0.020],
-            [1.102, 0.061, 0.055],
-            [2.669, 0.089, 0.084],
-            [2.646, 0.198, 0.192],
-            [4.018, 0.606, 0.600],
-            [0.115, 0.034, 0.044],
-            [0.210, 0.018, 0.018],
-            [4.655, 1.002, 1.004],
-            [6.715, 1.139, 1.150],
-            [3.235, 0.351, 0.352],
-            [3.850, 0.410, 0.408],
-            [4.446, 1.579, 1.570],
-            [7.112, 2.031, 2.061],
-            [5.658, 1.812, 1.804],
-            [3.528, 1.600, 1.599],
-            [9.216, 5.029, 5.031],
-            [7.023, 2.968, 3.362],
-            [17.412, 9.705, 9.695],
-            [2.717, 0.110, 0.100],
-            [28.586, 1.907, 1.870],
-            [34.064, 2.178, 2.172],
-            [67.172, 5.105, 5.101],
-            [79.885, 2.579, 2.540],
-            [9.176, 0.572, 0.560],
-            [4.050, 0.496, 0.492],
-            [8.918, 0.575, 0.568],
-            [28.731, 2.089, 2.058],
-            [24.174, 2.956, 3.043],
-            [5.103, 5.010, 5.007],
-            [10.075, 1.188, 1.197],
-            [18.485, 1.966, 1.954],
-            [19.455, 10.855, 10.917],
-            [31.320, 7.848, 7.831],
-            [30.794, 7.871, 7.877],
-            [3.360, 2.777, 2.778],
-            [0.371, 0.166, 0.180],
-            [0.259, 0.064, 0.083],
-            [0.275, 0.060, 0.058],
-            [1.024, 0.380, 0.378],
-            [0.198, 0.025, 0.025],
-            [0.162, 0.023, 0.015],
-            [0.059, 0.006, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/intel_core_i9_11900kf.json b/website/benchmark/hardware/results/intel_core_i9_11900kf.json
deleted file mode 100644
index b94ce7c8f0e..00000000000
--- a/website/benchmark/hardware/results/intel_core_i9_11900kf.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Intel(R) 11th Gen Core i9-11900KF",
-        "system_full":  "Intel(R) 11th Gen Core i9-11900KF, 64 GB RAM, 1 TB SSD",
-        "time":         "2022-03-27 04:04:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.001, 0.001, 0.001],
-            [0.010, 0.007, 0.006],
-            [0.030, 0.022, 0.020],
-            [0.100, 0.033, 0.035],
-            [0.114, 0.079, 0.074],
-            [0.241, 0.209, 0.225],
-            [0.002, 0.001, 0.001],
-            [0.008, 0.007, 0.007],
-            [0.565, 0.519, 0.511],
-            [0.629, 0.590, 0.599],
-            [0.159, 0.130, 0.134],
-            [0.190, 0.149, 0.150],
-            [0.976, 0.927, 0.915],
-            [1.273, 1.208, 1.199],
-            [1.086, 1.044, 1.041],
-            [1.229, 1.196, 1.200],
-            [3.206, 3.491, 3.213],
-            [1.841, 1.774, 1.809],
-            [5.919, 5.897, 5.799],
-            [0.104, 0.039, 0.037],
-            [1.176, 0.639, 0.694],
-            [1.407, 0.814, 0.825],
-            [2.984, 2.391, 2.121],
-            [2.100, 0.770, 0.716],
-            [0.342, 0.220, 0.211],
-            [0.222, 0.211, 0.189],
-            [0.346, 0.222, 0.224],
-            [1.272, 0.832, 0.822],
-            [1.507, 1.306, 1.282],
-            [3.619, 3.573, 3.597],
-            [0.761, 0.695, 0.703],
-            [1.375, 1.217, 1.229],
-            [8.576, 9.686, 9.070],
-            [5.634, 5.699, 5.801],
-            [6.090, 5.789, 5.797],
-            [1.996, 2.057, 1.946],
-            [0.119, 0.105, 0.112],
-            [0.049, 0.040, 0.040],
-            [0.048, 0.038, 0.038],
-            [0.261, 0.237, 0.231],
-            [0.029, 0.013, 0.014],
-            [0.017, 0.013, 0.011],
-            [0.003, 0.002, 0.003]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/intel_xeon_scaleflux_csd3000.json b/website/benchmark/hardware/results/intel_xeon_scaleflux_csd3000.json
deleted file mode 100644
index 929f0cc9a86..00000000000
--- a/website/benchmark/hardware/results/intel_xeon_scaleflux_csd3000.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Intel(R) Xeon Silver 4314 with ScaleFlux CSD3000",
-        "system_full":  "Intel(R) Xeon(R) Silver 4314 CPU @ 2.40GHz, 376 GB RAM, ScaleFlux CSD300 3.5 TB",
-        "time":         "2022-07-08 03:58:35",
-        "kind":         "server",
-        "result":
-        [
-            [0.002, 0.021, 0.002],
-            [0.074, 0.032, 0.013],
-            [0.021, 0.016, 0.016],
-            [0.044, 0.023, 0.022],
-            [0.086, 0.078, 0.076],
-            [0.162, 0.150, 0.142],
-            [0.003, 0.001, 0.001],
-            [0.020, 0.018, 0.018],
-            [0.202, 0.200, 0.189],
-            [0.246, 0.215, 0.222],
-            [0.204, 0.086, 0.081],
-            [0.098, 0.086, 0.088],
-            [0.250, 0.230, 0.226],
-            [0.306, 0.280, 0.285],
-            [0.267, 0.250, 0.256],
-            [0.267, 0.245, 0.253],
-            [0.747, 0.681, 0.679],
-            [0.506, 0.438, 0.439],
-            [1.186, 1.241, 1.146],
-            [0.052, 0.027, 0.022],
-            [0.510, 0.384, 0.370],
-            [0.517, 0.363, 0.352],
-            [1.000, 0.916, 0.896],
-            [0.723, 0.487, 0.536],
-            [0.120, 0.101, 0.101],
-            [0.096, 0.076, 0.079],
-            [0.122, 0.095, 0.100],
-            [0.517, 0.371, 0.371],
-            [0.573, 0.448, 0.444],
-            [0.620, 0.621, 0.635],
-            [0.214, 0.195, 0.189],
-            [0.357, 0.273, 0.280],
-            [1.600, 1.483, 1.631],
-            [1.145, 1.154, 1.085],
-            [1.156, 1.082, 1.098],
-            [0.486, 0.458, 0.486],
-            [0.086, 0.080, 0.086],
-            [0.039, 0.037, 0.041],
-            [0.037, 0.035, 0.036],
-            [0.181, 0.163, 0.167],
-            [0.019, 0.018, 0.015],
-            [0.024, 0.018, 0.015],
-            [0.005, 0.003, 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
deleted file mode 100644
index 78bc423d860..00000000000
--- a/website/benchmark/hardware/results/linode_cloud_amd_epyc_7601.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "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]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/macbook_air_m1.json b/website/benchmark/hardware/results/macbook_air_m1.json
deleted file mode 100644
index 33f15d02480..00000000000
--- a/website/benchmark/hardware/results/macbook_air_m1.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "MacBook Air M1",
-        "system_full":  "MacBook Air M1 13\" 2020, 8‑core CPU, 16 GiB RAM, 512 GB SSD",
-        "time":         "2021-04-11 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-[0.003, 0.001, 0.001],
-[0.019, 0.014, 0.014],
-[0.042, 0.034, 0.033],
-[0.101, 0.043, 0.041],
-[0.100, 0.102, 0.101],
-[0.394, 0.283, 0.289],
-[0.029, 0.027, 0.027],
-[0.018, 0.018, 0.018],
-[0.511, 0.489, 0.494],
-[0.620, 0.615, 0.618],
-[0.217, 0.200, 0.197],
-[0.237, 0.235, 0.242],
-[0.774, 0.762, 0.761],
-[0.969, 0.982, 0.969],
-[0.896, 0.887, 0.861],
-[0.999, 0.943, 0.945],
-[3.343, 2.426, 2.366],
-[1.463, 1.414, 1.382],
-[4.958, 4.268, 4.257],
-[0.056, 0.050, 0.049],
-[1.696, 0.851, 0.846],
-[1.036, 1.104, 1.174],
-[4.326, 2.224, 2.255],
-[1.397, 1.038, 1.055],
-[0.317, 0.310, 0.305],
-[0.274, 0.284, 0.269],
-[0.317, 0.316, 0.313],
-[0.943, 0.952, 0.951],
-[2.794, 1.427, 1.433],
-[1.606, 1.600, 1.605],
-[0.751, 0.691, 0.679],
-[1.532, 1.000, 0.952],
-[9.679, 8.895, 7.967],
-[7.001, 4.472, 4.050],
-[4.790, 3.971, 3.987],
-[1.215, 1.204, 1.256],
-[0.129, 0.125, 0.119],
-[0.057, 0.061, 0.056],
-[0.045, 0.043, 0.043],
-[0.256, 0.247, 0.249],
-[0.020, 0.014, 0.013],
-[0.013, 0.011, 0.012],
-[0.009, 0.009, 0.009]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/macbook_pro_core_i7_2014.json b/website/benchmark/hardware/results/macbook_pro_core_i7_2014.json
deleted file mode 100644
index 011401ed3e5..00000000000
--- a/website/benchmark/hardware/results/macbook_pro_core_i7_2014.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "MacBook Pro 2014",
-        "system_full":       "MacBook Pro 2014, 2.5 GHz Quad-Core Intel Core i7, 16 GiB RAM",
-        "time":         "2020-04-04 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-            [0.030, 0.003, 0.003],
-            [0.078, 0.020, 0.020],
-            [0.176, 0.056, 0.056],
-            [0.358, 0.082, 0.082],
-            [0.451, 0.254, 0.208],
-            [0.887, 0.582, 0.583],
-            [0.040, 0.004, 0.002],
-            [0.079, 0.023, 0.024],
-            [1.213, 1.100, 1.109],
-            [1.839, 1.250, 1.529],
-            [0.590, 0.304, 0.370],
-            [0.645, 0.502, 0.489],
-            [1.793, 1.418, 1.531],
-            [2.803, 1.953, 2.333],
-            [2.101, 1.871, 1.718],
-            [1.875, 1.508, 1.493],
-            [5.053, 5.682, 5.334],
-            [3.484, 4.643, 3.188],
-            [10.762, 10.994, 10.125],
-            [0.517, 0.241, 0.166],
-            [3.898, 1.701, 1.828],
-            [4.394, 2.155, 1.987],
-            [8.082, 4.622, 5.137],
-            [6.218, 2.413, 2.131],
-            [1.099, 0.531, 0.550],
-            [0.766, 0.436, 0.712],
-            [1.094, 0.585, 0.559],
-            [4.207, 1.628, 1.818],
-            [3.969, 2.775, 2.579],
-            [2.604, 2.441, 2.449],
-            [1.773, 1.262, 1.165],
-            [3.059, 1.803, 1.833],
-            [19.756, 17.851, 13.698],
-            [10.651, 8.640, 7.184],
-            [10.125, 8.230, 7.775],
-            [2.865, 2.256, 2.196],
-            [0.292, 0.226, 0.249],
-            [0.194, 0.084, 0.070],
-            [0.162, 0.063, 0.064],
-            [0.515, 0.404, 0.423],
-            [0.127, 0.024, 0.025],
-            [0.099, 0.021, 0.018],
-            [0.045, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/macbook_pro_core_i7_2018.json b/website/benchmark/hardware/results/macbook_pro_core_i7_2018.json
deleted file mode 100644
index fa7ff4d72ee..00000000000
--- a/website/benchmark/hardware/results/macbook_pro_core_i7_2018.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "MacBook Pro 2018",
-        "system_full":       "MacBook Pro 2018, 2.7 GHz Quad-Core Intel Core i7, 16 GiB RAM, 1TB SSD",
-        "time":         "2020-04-04 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-            [0.002, 0.002, 0.002],
-            [0.028, 0.031, 0.025],
-            [0.060, 0.058, 0.047],
-            [0.125, 0.101, 0.070],
-            [0.164, 0.185, 0.168],
-            [0.672, 0.568, 0.557],
-            [0.072, 0.038, 0.037],
-            [0.031, 0.021, 0.021],
-            [0.849, 0.836, 0.820],
-            [0.941, 0.938, 0.942],
-            [0.423, 0.444, 0.457],
-            [0.617, 0.556, 0.555],
-            [1.761, 1.694, 1.641],
-            [2.190, 2.277, 2.226],
-            [1.964, 1.895, 1.934],
-            [1.956, 1.978, 1.884],
-            [6.029, 5.977, 5.975],
-            [3.372, 3.436, 3.439],
-            [12.883, 12.778, 12.572],
-            [0.116, 0.080, 0.076],
-            [1.874, 1.372, 1.467],
-            [2.321, 2.356, 2.238],
-            [5.304, 4.955, 4.912],
-            [2.474, 1.993, 2.033],
-            [0.744, 0.708, 0.719],
-            [0.562, 0.568, 0.602],
-            [0.737, 0.742, 0.719],
-            [1.547, 1.580, 1.583],
-            [3.074, 2.665, 2.697],
-            [5.466, 5.560, 5.693],
-            [1.658, 1.562, 1.543],
-            [2.935, 2.802, 2.743],
-            [19.141, 19.674, 19.212],
-            [8.738, 8.334, 8.302],
-            [8.268, 8.276, 8.364],
-            [3.311, 3.288, 3.243],
-            [0.182, 0.169, 0.169],
-            [0.075, 0.066, 0.066],
-            [0.066, 0.057, 0.053],
-            [0.353, 0.324, 0.327],
-            [0.030, 0.018, 0.018],
-            [0.018, 0.015, 0.015],
-            [0.011, 0.007, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/macbook_pro_core_i7_2020.json b/website/benchmark/hardware/results/macbook_pro_core_i7_2020.json
deleted file mode 100644
index 8250c5f3c7e..00000000000
--- a/website/benchmark/hardware/results/macbook_pro_core_i7_2020.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "MacBook Pro 2020",
-        "system_full":  "MacBook Pro 2020, 2.3 GHz Quad-Core Intel Core i7 (10th gen), 32 GiB RAM, 2TB SSD",
-        "time":         "2020-06-25 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-[0.003, 0.002, 0.002],
-[0.046, 0.025, 0.015],
-[0.042, 0.042, 0.041],
-[0.069, 0.068, 0.069],
-[0.164, 0.166, 0.165],
-[0.559, 0.550, 0.552],
-[0.026, 0.026, 0.026],
-[0.016, 0.015, 0.016],
-[0.891, 0.880, 0.879],
-[1.029, 1.031, 1.022],
-[0.355, 0.358, 0.369],
-[0.415, 0.416, 0.417],
-[1.406, 1.355, 1.349],
-[1.775, 1.787, 1.788],
-[1.615, 1.633, 1.619],
-[1.532, 1.525, 1.482],
-[4.284, 4.203, 4.180],
-[2.825, 2.782, 2.756],
-[8.516, 8.328, 8.408],
-[0.097, 0.073, 0.074],
-[1.541, 1.557, 1.557],
-[1.945, 1.920, 1.911],
-[4.410, 4.375, 4.353],
-[null, null, null],
-[0.613, 0.616, 0.621],
-[0.535, 0.557, 0.541],
-[0.622, 0.622, 0.623],
-[1.536, 1.548, 1.535],
-[2.436, 2.430, 2.435],
-[2.551, 2.542, 2.589],
-[1.470, 1.426, 1.430],
-[2.377, 2.248, 2.227],
-[15.628, null, null],
-[6.155, 6.397, 6.368],
-[6.439, 6.392, 6.412],
-[2.643, 2.337, 2.316],
-[0.163, 0.174, 0.155],
-[0.060, 0.064, 0.063],
-[0.057, 0.057, 0.053],
-[0.331, 0.314, 0.314],
-[0.016, 0.023, 0.020],
-[0.014, 0.014, 0.013],
-[0.005, 0.006, 0.007]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/macbook_pro_m1_2020.json b/website/benchmark/hardware/results/macbook_pro_m1_2020.json
deleted file mode 100644
index 52e62b06d61..00000000000
--- a/website/benchmark/hardware/results/macbook_pro_m1_2020.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "MacBook Pro M1",
-        "system_full":  "MacBook Pro M1 13\" 2020, 8‑core CPU, 16 GiB RAM, 512 GB SSD",
-        "time":         "2021-10-22 18:17:00",
-        "kind":         "laptop",
-        "result":
-        [
-[0.001, 0.001, 0.001],
-[0.020, 0.013, 0.012],
-[0.046, 0.032, 0.032],
-[0.083, 0.045, 0.044],
-[0.099, 0.098, 0.099],
-[0.361, 0.306, 0.297],
-[0.031, 0.028, 0.026],
-[0.017, 0.015, 0.015],
-[0.530, 0.500, 0.497],
-[0.621, 0.633, 0.634],
-[0.229, 0.207, 0.207],
-[0.259, 0.243, 0.242],
-[0.818, 0.796, 0.767],
-[1.090, 1.052, 1.055],
-[1.053, 1.011, 1.071],
-[1.223, 0.966, 0.864],
-[14.533, 8.276, 8.041],
-[6.470, 8.012, 6.991],
-[38.097, 6.530, 8.532],
-[0.058, 0.054, 0.052],
-[1.341, 1.306, 1.141],
-[1.313, 1.330, 1.311],
-[3.156, 2.974, 2.919],
-[1.665, 1.423, 1.401],
-[0.421, 0.337, 0.338],
-[0.289, 0.287, 0.300],
-[0.348, 0.344, 0.341],
-[1.149, 1.142, 1.150],
-[1.855, 1.591, 1.984],
-[1.691, 1.644, 1.646],
-[0.921, 0.750, 0.771],
-[1.485, 1.233, 1.011],
-[91.560, 10.399, 8.895],
-[8.034, 7.663, 7.372],
-[6.836, 7.444, 7.235],
-[1.263, 1.166, 1.150],
-[0.125, 0.118, 0.118],
-[0.055, 0.053, 0.053],
-[0.043, 0.043, 0.043],
-[0.248, 0.243, 0.251],
-[0.016, 0.012, 0.012],
-[0.011, 0.010, 0.010],
-[0.003, 0.002, 0.002]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/macbook_pro_m1_2021.json b/website/benchmark/hardware/results/macbook_pro_m1_2021.json
deleted file mode 100644
index 516940e1ef2..00000000000
--- a/website/benchmark/hardware/results/macbook_pro_m1_2021.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "MacBook Pro M1",
-        "system_full":  "MacBook Pro M1 Max 16\" 2022, 64 GiB RAM, 1 TB SSD",
-        "time":         "2022-02-27 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-            [0.012, 0.001, 0.001],
-            [0.096, 0.012, 0.010],
-            [0.043, 0.022, 0.023],
-            [0.063, 0.031, 0.030],
-            [0.099, 0.070, 0.070],
-            [0.229, 0.197, 0.195],
-            [0.012, 0.001, 0.001],
-            [0.027, 0.012, 0.011],
-            [0.340, 0.301, 0.306],
-            [0.439, 0.383, 0.386],
-            [0.169, 0.134, 0.136],
-            [0.197, 0.160, 0.162],
-            [0.475, 0.435, 0.432],
-            [0.615, 0.557, 0.553],
-            [0.553, 0.502, 0.507],
-            [0.490, 0.445, 0.439],
-            [1.392, 1.260, 1.254],
-            [0.865, 0.833, 0.835],
-            [2.285, 2.180, 2.194],
-            [0.064, 0.035, 0.033],
-            [0.761, 0.650, 0.651],
-            [0.867, 0.715, 0.718],
-            [1.753, 1.478, 1.499],
-            [1.037, 0.737, 0.735],
-            [0.251, 0.201, 0.202],
-            [0.208, 0.172, 0.174],
-            [0.254, 0.202, 0.201],
-            [0.733, 0.598, 0.603],
-            [0.995, 0.882, 0.879],
-            [0.562, 0.545, 0.545],
-            [0.431, 0.371, 0.371],
-            [0.586, 0.490, 0.490],
-            [2.882, 2.664, 2.656],
-            [2.255, 2.147, 2.146],
-            [2.248, 2.137, 2.154],
-            [0.659, 0.638, 0.631],
-            [0.125, 0.108, 0.108],
-            [0.070, 0.052, 0.052],
-            [0.060, 0.042, 0.042],
-            [0.250, 0.229, 0.228],
-            [0.030, 0.013, 0.012],
-            [0.026, 0.011, 0.010],
-            [0.017, 0.003, 0.003]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/oracle.json b/website/benchmark/hardware/results/oracle.json
deleted file mode 100644
index 6470b70e109..00000000000
--- a/website/benchmark/hardware/results/oracle.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Oracle Cloud ARM 4vCPU",
-        "system_full":  "Oracle Cloud (free tier), Ampere Altra, 4 vCPU, 24 GiB RAM",
-        "time":         "2021-07-28 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.031, 0.008, 0.002],
-[0.087, 0.044, 0.039],
-[0.193, 0.068, 0.068],
-[0.807, 0.110, 0.089],
-[1.622, 0.230, 0.244],
-[2.539, 0.765, 0.742],
-[0.146, 0.087, 0.092],
-[0.074, 0.044, 0.038],
-[1.650, 0.973, 0.978],
-[2.020, 1.139, 1.166],
-[0.907, 0.530, 0.509],
-[0.964, 0.618, 0.608],
-[2.448, 1.500, 1.529],
-[4.810, 1.994, 1.930],
-[2.932, 1.814, 1.853],
-[1.935, 1.577, 1.583],
-[6.272, 4.697, 4.650],
-[4.279, 2.832, 2.871],
-[12.380, 9.137, 9.085],
-[0.601, 0.167, 0.118],
-[25.357, 1.873, 1.848],
-[28.153, 2.274, 2.202],
-[53.116, 4.946, 4.907],
-[56.118, 2.229, 2.192],
-[5.749, 0.732, 0.696],
-[1.829, 0.601, 0.592],
-[5.860, 0.748, 0.709],
-[24.439, 1.954, 1.949],
-[20.452, 3.093, 3.042],
-[1.539, 1.448, 1.437],
-[4.704, 1.362, 1.430],
-[12.698, 1.997, 1.940],
-[12.854, 10.336, 10.454],
-[26.098, 6.737, 6.771],
-[26.259, 6.679, 6.677],
-[2.602, 2.305, 2.278],
-[0.283, 0.182, 0.181],
-[0.130, 0.101, 0.085],
-[0.174, 0.068, 0.073],
-[0.557, 0.374, 0.377],
-[0.066, 0.017, 0.017],
-[0.049, 0.014, 0.014],
-[0.033, 0.006, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/pinebook_pro.json b/website/benchmark/hardware/results/pinebook_pro.json
deleted file mode 100644
index 7a79a299b7d..00000000000
--- a/website/benchmark/hardware/results/pinebook_pro.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Pinebook Pro",
-        "system_full":       "Pinebook Pro (AArch64, 4 GiB RAM)",
-        "time":         "2020-03-08 00:00:00",
-        "kind":         "laptop",
-        "result":
-        [
-            [0.021, 0.009, 0.007],
-            [0.195, 0.135, 0.144],
-            [0.439, 0.264, 0.273],
-            [1.266, 0.672, 0.706],
-            [1.337, 0.795, 0.790],
-            [2.706, 1.989, 1.947],
-            [0.246, 0.198, 0.197],
-            [0.157, 0.142, 0.133],
-            [4.150, 3.769, 3.617],
-            [5.223, 4.405, 4.234],
-            [2.391, 1.815, 1.785],
-            [2.534, 2.158, 2.042],
-            [7.895, 6.890, 7.003],
-            [10.338, 9.311, 9.410],
-            [8.139, 7.441, 7.312],
-            [8.532, 8.035, 8.011],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/pixel_3a.json b/website/benchmark/hardware/results/pixel_3a.json
deleted file mode 100644
index a79f3549676..00000000000
--- a/website/benchmark/hardware/results/pixel_3a.json
+++ /dev/null
@@ -1,57 +0,0 @@
-[
-    {
-        "system": "Google Pixel 3a",
-        "system_full": "Google Pixel 3a, 8 cores, 4 GB RAM",
-        "cpu_vendor": "Qualcomm",
-        "cpu_model": "Snapdragon 670",
-        "time": "2020-07-15 00:00:00",
-        "kind": "phone",
-        "result":
-        [
-            [0.034, 0.029, 0.035],
-            [0.283, 0.186, 0.320],
-            [0.447, 0.410, 0.359],
-            [0.808, 0.609, 0.534],
-            [1.162, 1.140, 1.230],
-            [2.149, 1.957, 2.019],
-            [0.336, 0.332, 0.404],
-            [0.316, 0.326, 0.243],
-            [2.671, 2.592, 2.692],
-            [3.138, 3.113, 3.122],
-            [1.870, 2.075, 2.012],
-            [1.673, 1.679, 1.698],
-            [null, null, null],
-            [null, null, null],
-            [6.340, 5.212, 5.476],
-            [5.184, 5.362, 5.213],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [0.818, 0.500, 0.605],
-            [8.266, 7.663, 7.208],
-            [8.109, 8.402, 8.925],
-            [null, null, null],
-            [null, null, null],
-            [2.655, 1.891, 1.916],
-            [1.609, 1.675, 1.607],
-            [1.873, 1.877, 1.882],
-            [7.922, 7.835, 7.648],
-            [null, null, null],
-            [10.069, 9.602, 9.614],
-            [4.542, 4.094, 4.049],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [null, null, null],
-            [0.962, 0.921, null],
-            [0.394, 0.344, 0.357],
-            [0.343, 0.312, 0.344],
-            [1.793, 1.617, 1.642],
-            [0.159, 0.134, 0.136],
-            [0.121, 0.110, 0.098],
-            [0.052, 0.033, 0.036]
-        ]
-    }
-]
-
diff --git a/website/benchmark/hardware/results/powerpc.json b/website/benchmark/hardware/results/powerpc.json
deleted file mode 100644
index f6701126697..00000000000
--- a/website/benchmark/hardware/results/powerpc.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "POWER9 x_large VM",
-        "system_full":  "POWER9 x_large VM (8 vCPU, pSeries, 16GiB RAM)",
-        "time":         "2022-05-10 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.263, 0.004, 0.004],
-[0.352, 0.044, 0.040],
-[1.556, 0.087, 0.083],
-[2.341, 0.129, 0.120],
-[0.490, 0.264, 0.258],
-[4.565, 1.059, 1.038],
-[0.042, 0.004, 0.004],
-[0.132, 0.057, 0.062],
-[3.168, 0.915, 0.917],
-[2.020, 1.180, 1.183],
-[1.510, 0.430, 0.435],
-[1.525, 0.552, 0.607],
-[3.104, 1.500, 1.529],
-[2.459, 1.995, 1.975],
-[5.291, 1.847, 1.849],
-[2.552, 1.842, 1.920],
-[7.378, 6.412, 6.283],
-[3.881, 3.592, 3.552],
-[13.757, 10.763, 10.880],
-[0.504, 0.156, 0.134],
-[16.285, 1.777, 1.770],
-[5.135, 2.305, 2.242],
-[21.215, 5.129, 5.183],
-[35.624, 2.645, 2.476],
-[2.648, 0.676, 0.715],
-[0.815, 0.576, 0.568],
-[1.365, 0.746, 0.692],
-[4.857, 1.922, 1.898],
-[14.380, 5.401, 5.445],
-[4.555, 4.535, 4.371],
-[4.095, 1.366, 1.349],
-[7.474, 1.816, 1.859],
-[14.235, 13.406, 13.854],
-[14.165, 9.465, 9.715],
-[11.313, 8.640, 8.462],
-[3.605, 3.009, 2.813],
-[0.662, 0.394, 0.391],
-[0.350, 0.196, 0.194],
-[0.217, 0.150, 0.145],
-[1.025, 0.918, 0.895],
-[0.254, 0.057, 0.057],
-[0.132, 0.045, 0.046],
-[0.047, 0.015, 0.012]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json b/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json
deleted file mode 100644
index ed25794c77b..00000000000
--- a/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Intel 80vCPU, QEMU, AArch64",
-        "system_full":  "Intel Cascade Lake 80vCPU running AArch64 ClickHouse under qemu-aarch64 version 4.2.1 (userspace emulation)",
-        "cpu_vendor":   "Intel",
-        "time":         "2021-04-05 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.045, 0.006, 0.006],
-[0.366, 0.201, 0.576],
-[0.314, 0.144, 0.152],
-[0.701, 0.111, 0.110],
-[0.308, 0.259, 0.261],
-[1.009, 0.642, 0.658],
-[0.160, 0.087, 0.086],
-[0.123, 0.079, 0.080],
-[0.570, 0.458, 0.454],
-[0.708, 0.540, 0.547],
-[0.541, 0.460, 0.464],
-[0.578, 0.524, 0.531],
-[0.927, 0.908, 0.906],
-[1.075, 0.992, 1.051],
-[1.055, 0.965, 0.991],
-[0.904, 0.790, 0.781],
-[2.076, 2.134, 2.121],
-[1.668, 1.648, 1.615],
-[4.134, 3.879, 4.002],
-[0.142, 0.103, 0.105],
-[7.018, 1.479, 1.515],
-[1.618, 1.643, 1.680],
-[6.516, 3.172, 3.182],
-[6.028, 2.070, 2.076],
-[0.608, 0.559, 0.577],
-[0.548, 0.515, 0.516],
-[0.598, 0.564, 0.563],
-[1.562, 1.529, 1.537],
-[5.968, 2.311, 2.375],
-[3.263, 3.239, 3.279],
-[1.134, 0.903, 0.928],
-[2.987, 1.270, 1.284],
-[6.256, 5.665, 5.320],
-[3.020, 3.148, 3.109],
-[3.092, 3.131, 3.146],
-[1.183, 1.140, 1.185],
-[0.762, 0.704, 0.715],
-[0.412, 0.380, 0.385],
-[0.376, 0.330, 0.327],
-[1.505, 1.532, 1.503],
-[0.201, 0.133, 0.130],
-[0.173, 0.123, 0.150],
-[0.070, 0.028, 0.028]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/raspberry_pi_b.json b/website/benchmark/hardware/results/raspberry_pi_b.json
deleted file mode 100644
index fff027f2bfe..00000000000
--- a/website/benchmark/hardware/results/raspberry_pi_b.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Raspberry Pi 4",
-        "system_full":  "Raspberry Pi 4 Model B 8GB",
-        "time":         "2020-11-14 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-[0.015, 0.005, 0.005],
-[0.214, 0.176, 0.171],
-[1.205, 0.535, 0.534],
-[5.138, 1.320, 1.342],
-[5.129, 1.489, 1.494],
-[8.349, 3.230, 3.290],
-[0.327, 0.234, 0.231],
-[0.228, 0.183, 0.175],
-[7.530, 5.440, 5.662],
-[9.073, 6.912, 6.881],
-[5.609, 2.995, 3.201],
-[5.817, 3.245, 3.239],
-[12.712, 11.231, 11.141],
-[18.517, 14.798, 14.698],
-[13.510, 11.171, 11.260],
-[12.944, 11.576, 11.706],
-[28.042, 23.958, 22.930],
-[18.430, 13.992, 14.173],
-[null, null, null],
-[5.193, 1.342, 1.311],
-[59.597, 19.483, 20.791],
-[68.012, 24.377, 24.159],
-[127.859, 49.266, 47.251],
-[133.812, 25.078, 24.812],
-[16.838, 5.128, 4.824],
-[8.195, 4.025, 4.066],
-[16.791, 4.911, 4.997],
-[59.740, 24.009, 23.916],
-[50.460, 25.922, 26.049],
-[23.961, 23.536, 23.835],
-[15.293, 8.960, 8.687],
-[36.904, 14.905, 14.755],
-[null, null, null],
-[74.268, 74.887, 74.103],
-[74.727, 59.369, 65.550],
-[15.400, 14.807, 15.437],
-[1.286, 0.836, 0.804],
-[0.501, 0.341, 0.320],
-[0.704, 0.299, 0.265],
-[2.539, 1.756, 1.710],
-[0.345, 0.085, 0.082],
-[0.219, 0.070, 0.072],
-[0.044, 0.021, 0.023]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/rock_pi.json b/website/benchmark/hardware/results/rock_pi.json
deleted file mode 100644
index 210dc213a49..00000000000
--- a/website/benchmark/hardware/results/rock_pi.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Rock Pi 4, 4GiB, NVMe",
-        "system_full":  "Rock Pi 4, 4GiB C, NVMe",
-        "time":         "2021-12-23 00:00:00",
-        "kind":         "desktop",
-        "result":
-        [
-[0.007, 0.014, 0.005],
-[0.229, 0.132, 0.215],
-[0.489, 0.351, 0.306],
-[0.879, 0.774, 0.768],
-[1.034, 0.966, 0.879],
-[2.491, 2.249, 2.493],
-[0.379, 0.212, 0.213],
-[0.227, 0.140, 0.152],
-[3.944, 3.823, 3.805],
-[5.272, 4.985, 5.069],
-[2.356, 2.193, 2.254],
-[2.819, 2.595, 2.568],
-[9.124, 8.306, 8.529],
-[11.857, 11.412, 11.290],
-[9.796, 9.477, 9.610],
-[8.846, 8.867, 8.909],
-[null, null, null],
-[null, null, null],
-[null, null, null],
-[1.293, 0.887, 0.980],
-[15.018, 14.928, 14.748],
-[19.179, 17.889, 18.021],
-[45.524, 46.927, 46.909],
-[23.904, 23.197, 23.511],
-[5.264, 4.891, 4.936],
-[4.211, 3.940, 4.047],
-[5.113, 4.615, 4.783],
-[17.910, 16.800, 16.410],
-[23.537, 22.249, 22.172],
-[16.549, 16.388, 16.337],
-[9.562, 9.006, 9.260],
-[17.097, 17.676, 17.585],
-[null, null, null],
-[null, null, null],
-[null, null, null],
-[null, null, null],
-[1.668, 1.469, 1.342],
-[0.463, 0.442, 0.353],
-[0.486, 0.410, 0.346],
-[2.190, 2.014, 1.878],
-[0.263, 0.097, 0.201],
-[0.173, 0.082, 0.139],
-[0.188, 0.024, 0.016]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/scaleway_epyc.json b/website/benchmark/hardware/results/scaleway_epyc.json
deleted file mode 100644
index 54cf6eaf459..00000000000
--- a/website/benchmark/hardware/results/scaleway_epyc.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Scaleway GP1-XS",
-        "system_full":  "Scaleway GP1-XS (AMD EPYC 7401P, 4 cores, 16 GiB RAM, NVMe)",
-        "time":         "2021-11-17 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.044, 0.026, 0.028],
-[0.100, 0.076, 0.067],
-[0.151, 0.101, 0.102],
-[0.276, 0.218, 0.207],
-[0.740, 0.693, 0.703],
-[0.066, 0.054, 0.050],
-[0.062, 0.035, 0.041],
-[1.271, 1.124, 1.141],
-[1.441, 1.279, 1.280],
-[0.438, 0.382, 0.376],
-[0.514, 0.485, 0.467],
-[1.914, 1.664, 1.694],
-[2.367, 2.277, 2.258],
-[2.143, 2.066, 2.131],
-[1.923, 1.826, 1.777],
-[5.894, 5.653, 5.765],
-[3.545, 3.464, 3.405],
-[12.060, 12.893, 13.049],
-[0.196, 0.121, 0.118],
-[2.328, 1.841, 1.808],
-[2.498, 2.100, 2.067],
-[5.839, 5.094, 5.078],
-[3.068, 2.255, 2.202],
-[0.718, 0.611, 0.616],
-[0.597, 0.531, 0.529],
-[0.702, 0.615, 0.592],
-[2.310, 1.991, 1.969],
-[3.540, 3.222, 3.179],
-[3.950, 3.977, 3.876],
-[1.527, 1.319, 1.319],
-[2.264, 1.950, 1.927],
-[11.987, 11.644, 11.777],
-[10.142, 9.150, 9.204],
-[9.627, 9.298, 9.183],
-[2.937, 2.812, 2.849],
-[0.229, 0.226, 0.227],
-[0.096, 0.097, 0.095],
-[0.087, 0.074, 0.071],
-[0.464, 0.447, 0.463],
-[0.037, 0.027, 0.032],
-[0.030, 0.046, 0.029],
-[0.006, 0.017, 0.014]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/selectel_cloud_16vcpu.json b/website/benchmark/hardware/results/selectel_cloud_16vcpu.json
deleted file mode 100644
index c7f734b8256..00000000000
--- a/website/benchmark/hardware/results/selectel_cloud_16vcpu.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-    {
-        "system":       "Selectel Cloud 'fast disk'",
-        "system_full":       "Selectel Cloud, 16 vCPU, 32 GB RAM, 'fast disk'",
-        "time":         "2020-01-26 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.017, 0.002, 0.002],
-            [0.047, 0.011, 0.012],
-            [0.070, 0.024, 0.024],
-            [0.350, 0.033, 0.031],
-            [0.353, 0.087, 0.091],
-            [0.623, 0.233, 0.226],
-            [0.040, 0.018, 0.019],
-            [0.021, 0.011, 0.011],
-            [0.628, 0.420, 0.415],
-            [0.725, 0.466, 0.468],
-            [0.389, 0.152, 0.151],
-            [0.416, 0.181, 0.172],
-            [0.819, 0.481, 0.495],
-            [1.332, 0.714, 0.719],
-            [1.044, 0.853, 0.796],
-            [0.865, 0.827, 0.846],
-            [2.010, 1.816, 1.798],
-            [1.097, 0.940, 0.927],
-            [4.414, 4.188, 4.310],
-            [0.336, 0.034, 0.030],
-            [4.807, 0.541, 0.527],
-            [5.494, 0.633, 0.608],
-            [10.233, 1.448, 1.469],
-            [9.897, 0.721, 0.676],
-            [1.322, 0.212, 0.213],
-            [0.594, 0.177, 0.175],
-            [1.319, 0.218, 0.216],
-            [4.804, 0.615, 0.567],
-            [4.093, 0.855, 0.801],
-            [1.428, 1.378, 1.300],
-            [1.299, 0.649, 0.646],
-            [2.921, 0.835, 0.809],
-            [5.717, 5.883, 6.368],
-            [5.655, 2.715, 2.666],
-            [5.943, 3.008, 2.795],
-            [1.091, 1.011, 1.089],
-            [0.264, 0.212, 0.221],
-            [0.097, 0.085, 0.081],
-            [0.083, 0.081, 0.075],
-            [0.498, 0.531, 0.446],
-            [0.063, 0.031, 0.033],
-            [0.029, 0.022, 0.022],
-            [0.006, 0.006, 0.005]
-        ]
-    },
-    {
-        "system":       "Selectel Cloud 'basic disk'",
-        "system_full":       "Selectel Cloud, 16 vCPU, 32 GB RAM, 'basic disk'",
-        "time":         "2020-01-26 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.142, 0.002, 0.002],
-            [0.090, 0.014, 0.013],
-            [0.478, 0.023, 0.023],
-            [2.305, 0.032, 0.032],
-            [2.371, 0.090, 0.087],
-            [3.377, 0.228, 0.224],
-            [0.080, 0.020, 0.017],
-            [0.034, 0.009, 0.009],
-            [3.210, 0.425, 0.414],
-            [3.389, 0.471, 0.459],
-            [2.446, 0.157, 0.152],
-            [2.331, 0.187, 0.177],
-            [3.826, 0.503, 0.505],
-            [5.749, 0.725, 0.701],
-            [4.521, 0.752, 0.705],
-            [2.345, 0.572, 0.588],
-            [6.360, 1.697, 1.512],
-            [5.928, 0.949, 0.908],
-            [11.325, 3.598, 3.829],
-            [6.485, 0.126, 0.033],
-            [24.494, 0.550, 0.519],
-            [27.711, 0.615, 0.594],
-            [52.599, 1.455, 1.435],
-            [50.820, 1.001, 0.648],
-            [6.933, 0.206, 0.203],
-            [3.278, 0.177, 0.172],
-            [7.082, 0.216, 0.206],
-            [24.399, 0.564, 0.541],
-            [20.916, 0.812, 0.801],
-            [1.574, 1.323, 1.358],
-            [6.717, 0.558, 0.550],
-            [13.772, 0.830, 0.801],
-            [12.547, 5.084, 4.637],
-            [25.178, 2.601, 2.337],
-            [25.118, 2.460, 2.432],
-            [1.626, 0.901, 0.895],
-            [0.286, 0.206, 0.209],
-            [0.130, 0.081, 0.083],
-            [0.220, 0.075, 0.076],
-            [6.502, 0.495, 0.520],
-            [0.223, 0.024, 0.024],
-            [0.045, 0.028, 0.030],
-            [0.006, 0.005, 0.004]
-        ]
-    },
-    {
-        "system":       "Selectel Cloud 'universal disk'",
-        "system_full":       "Selectel Cloud, 16 vCPU, 32 GB RAM, 'universal disk'",
-        "time":         "2020-01-26 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.016, 0.002, 0.002],
-            [0.055, 0.023, 0.009],
-            [0.252, 0.020, 0.019],
-            [1.337, 0.038, 0.031],
-            [1.342, 0.088, 0.086],
-            [2.192, 0.241, 0.222],
-            [0.047, 0.017, 0.016],
-            [0.017, 0.009, 0.009],
-            [1.946, 0.410, 0.412],
-            [2.262, 0.454, 0.455],
-            [1.427, 0.158, 0.150],
-            [1.487, 0.181, 0.172],
-            [2.327, 0.481, 0.464],
-            [3.794, 0.657, 0.633],
-            [2.582, 0.596, 0.602],
-            [1.708, 0.673, 0.670],
-            [4.431, 1.545, 1.622],
-            [3.661, 0.890, 0.871],
-            [7.950, 3.954, 3.844],
-            [1.327, 0.055, 0.031],
-            [16.200, 0.538, 0.523],
-            [18.455, 0.613, 0.599],
-            [34.059, 1.428, 1.436],
-            [31.534, 0.713, 0.653],
-            [4.576, 0.205, 0.201],
-            [2.155, 0.177, 0.172],
-            [4.574, 0.208, 0.206],
-            [16.201, 0.554, 0.534],
-            [13.787, 0.840, 0.809],
-            [1.443, 1.408, 1.331],
-            [3.815, 0.561, 0.536],
-            [8.831, 0.778, 0.761],
-            [9.031, 4.476, 4.428],
-            [16.938, 2.347, 2.287],
-            [17.093, 2.722, 2.257],
-            [1.133, 0.897, 0.888],
-            [0.240, 0.207, 0.202],
-            [0.101, 0.083, 0.082],
-            [0.086, 0.075, 0.074],
-            [0.467, 0.450, 0.440],
-            [0.060, 0.028, 0.024],
-            [0.028, 0.020, 0.020],
-            [0.006, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/skylake_kvm.json b/website/benchmark/hardware/results/skylake_kvm.json
deleted file mode 100644
index 7e05a95e0df..00000000000
--- a/website/benchmark/hardware/results/skylake_kvm.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Time4vps.eu",
-        "system_full":       "Time4vps.eu VPS (KVM) Linux Ubuntu 4 Core (Skylake) 16GB RAM 160GB Disk",
-        "time":         "2020-01-13 00:00:00",
-        "kind":         "vps",
-        "result":
-        [
-            [0.068, 0.002, 0.002],
-            [0.124, 0.021, 0.025],
-            [0.594, 0.089, 0.077],
-            [2.300, 0.133, 0.090],
-            [2.710, 0.205, 0.212],
-            [5.203, 0.603, 0.610],
-            [0.090, 0.029, 0.036],
-            [0.118, 0.021, 0.022],
-            [5.977, 1.295, 1.206],
-            [3.909, 1.415, 1.452],
-            [2.551, 0.336, 0.324],
-            [3.123, 0.446, 0.409],
-            [4.075, 1.743, 1.661],
-            [6.427, 2.499, 2.487],
-            [5.775, 2.156, 2.431],
-            [3.322, 2.288, 2.276],
-            [8.642, 6.463, 6.690],
-            [6.365, 3.852, 3.757],
-            [20.426, 13.849, 13.695],
-            [2.507, 0.105, 0.100],
-            [30.691, 1.747, 1.699],
-            [30.206, 2.010, 1.943],
-            [57.155, 4.699, 4.859],
-            [50.924, 2.173, 2.119],
-            [10.907, 0.660, 0.686],
-            [3.636, 0.505, 0.524],
-            [8.388, 0.683, 0.627],
-            [27.423, 1.650, 1.703],
-            [21.309, 2.824, 2.821],
-            [4.227, 4.053, 4.037],
-            [8.198, 1.797, 1.776],
-            [18.853, 2.927, 2.881],
-            [22.254, 21.156, 20.854],
-            [29.323, 8.728, 8.621],
-            [27.889, 8.759, 9.063],
-            [4.121, 3.837, 3.934],
-            [0.452, 0.292, 0.247],
-            [0.221, 0.093, 0.090],
-            [0.331, 0.069, 0.074],
-            [0.703, 0.469, 0.506],
-            [0.211, 0.026, 0.027],
-            [0.134, 0.021, 0.021],
-            [0.121, 0.007, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/ssdnodes.json b/website/benchmark/hardware/results/ssdnodes.json
deleted file mode 100644
index 623f4b49687..00000000000
--- a/website/benchmark/hardware/results/ssdnodes.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "SSDNodes G6",
-        "system_full":  "G6 Performance+ 48GB RAM, 720GB NVMe, 12x Intel Silver vCPU, KVM",
-        "time":         "2021-12-27 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.002, 0.002, 0.002],
-[0.021, 0.017, 0.017],
-[0.053, 0.034, 0.039],
-[0.090, 0.053, 0.047],
-[0.146, 0.123, 0.117],
-[0.358, 0.325, 0.323],
-[0.025, 0.020, 0.021],
-[0.042, 0.015, 0.014],
-[0.566, 0.511, 0.524],
-[0.704, 0.626, 0.591],
-[0.229, 0.174, 0.194],
-[0.255, 0.210, 0.206],
-[0.849, 0.725, 0.701],
-[0.984, 0.907, 0.948],
-[0.952, 0.886, 0.899],
-[0.772, 0.741, 0.738],
-[2.945, 2.667, 2.703],
-[1.645, 1.646, 1.576],
-[5.342, 5.042, 5.306],
-[0.088, 0.052, 0.051],
-[1.176, 0.825, 0.839],
-[1.261, 1.001, 0.933],
-[2.977, 2.190, 2.193],
-[1.872, 0.991, 0.956],
-[0.368, 0.264, 0.275],
-[0.300, 0.247, 0.241],
-[0.329, 0.272, 0.277],
-[1.124, 0.870, 0.824],
-[1.545, 1.270, 1.281],
-[1.478, 1.399, 1.463],
-[0.809, 0.696, 0.677],
-[1.095, 0.875, 0.832],
-[5.164, 4.841, 4.613],
-[3.859, 3.435, 3.396],
-[4.054, 3.479, 3.496],
-[1.325, 1.274, 1.294],
-[0.261, 0.248, 0.266],
-[0.102, 0.096, 0.104],
-[0.102, 0.090, 0.094],
-[0.600, 0.550, 0.566],
-[0.041, 0.031, 0.028],
-[0.029, 0.021, 0.025],
-[0.007, 0.006, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/upcloud_8cpu_32gb.json b/website/benchmark/hardware/results/upcloud_8cpu_32gb.json
deleted file mode 100644
index 7eb1434a143..00000000000
--- a/website/benchmark/hardware/results/upcloud_8cpu_32gb.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "UpCloud 8CPU 32GiB",
-        "system_full":  "UpCloud 8CPU 32GiB, AMD EPYC 7542",
-        "time":         "2021-11-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.002, 0.001, 0.001],
-[0.024, 0.020, 0.019],
-[0.123, 0.040, 0.048],
-[0.448, 0.061, 0.058],
-[0.517, 0.125, 0.119],
-[0.849, 0.357, 0.350],
-[0.037, 0.025, 0.033],
-[0.038, 0.018, 0.018],
-[0.804, 0.549, 0.551],
-[0.920, 0.602, 0.612],
-[0.542, 0.234, 0.231],
-[0.573, 0.272, 0.274],
-[1.032, 0.764, 0.777],
-[1.617, 0.991, 1.001],
-[1.219, 1.010, 0.994],
-[1.056, 0.999, 0.992],
-[2.643, 2.488, 2.498],
-[1.659, 1.583, 1.533],
-[4.957, 4.929, 4.960],
-[0.453, 0.056, 0.055],
-[6.116, 0.994, 0.951],
-[6.914, 1.035, 1.028],
-[12.878, 2.481, 2.450],
-[9.791, 1.195, 1.139],
-[1.682, 0.318, 0.319],
-[0.784, 0.286, 0.273],
-[1.706, 0.322, 0.318],
-[6.060, 0.968, 0.948],
-[5.184, 1.488, 1.450],
-[1.151, 1.206, 1.219],
-[1.520, 0.715, 0.723],
-[3.469, 0.910, 0.911],
-[5.128, 4.690, 4.771],
-[7.003, 3.448, 3.492],
-[7.022, 3.478, 3.430],
-[1.266, 1.246, 1.257],
-[0.225, 0.200, 0.199],
-[0.087, 0.079, 0.070],
-[0.076, 0.064, 0.063],
-[0.450, 0.458, 0.411],
-[0.034, 0.024, 0.026],
-[0.024, 0.020, 0.021],
-[0.006, 0.005, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_2176g.json b/website/benchmark/hardware/results/xeon_2176g.json
deleted file mode 100644
index 4145d77d95f..00000000000
--- a/website/benchmark/hardware/results/xeon_2176g.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Xeon 2176G",
-        "system_full":      "Xeon 2176G, 64GB RAM, 2xSSD 960GB (SAMSUNG MZQLB960HAJR-00007), ZFS RAID-1",
-        "time":         "2020-01-14 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.001, 0.001, 0.001],
-            [0.010, 0.011, 0.009],
-            [0.035, 0.031, 0.033],
-            [0.058, 0.056, 0.058],
-            [0.113, 0.126, 0.121],
-            [0.296, 0.300, 0.301],
-            [0.017, 0.016, 0.016],
-            [0.009, 0.009, 0.011],
-            [0.660, 0.659, 0.655],
-            [0.775, 0.746, 0.737],
-            [0.185, 0.181, 0.184],
-            [0.219, 0.237, 0.243],
-            [0.943, 0.933, 0.952],
-            [1.228, 1.185, 1.201],
-            [0.975, 0.963, 0.971],
-            [1.068, 1.086, 1.077],
-            [2.704, 2.713, 2.725],
-            [1.596, 1.564, 1.562],
-            [5.653, 5.571, 5.581],
-            [0.072, 0.065, 0.062],
-            [1.209, 0.958, 0.951],
-            [1.383, 1.222, 1.224],
-            [3.261, 2.771, 2.776],
-            [1.586, 1.210, 1.196],
-            [0.417, 0.392, 0.325],
-            [0.271, 0.268, 0.267],
-            [0.340, 0.338, 0.337],
-            [1.376, 1.160, 1.134],
-            [1.928, 1.643, 1.697],
-            [3.167, 3.135, 3.149],
-            [0.947, 0.859, 0.858],
-            [1.566, 1.446, 1.467],
-            [8.005, 8.065, 7.980],
-            [4.640, 4.322, 4.277],
-            [4.410, 4.330, 4.300],
-            [1.811, 1.749, 1.767],
-            [0.138, 0.142, 0.144],
-            [0.052, 0.047, 0.048],
-            [0.042, 0.043, 0.041],
-            [0.271, 0.249, 0.245],
-            [0.030, 0.016, 0.016],
-            [0.014, 0.013, 0.013],
-            [0.004, 0.004, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_clx_6230r.json b/website/benchmark/hardware/results/xeon_clx_6230r.json
deleted file mode 100644
index ee7c55a90f9..00000000000
--- a/website/benchmark/hardware/results/xeon_clx_6230r.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "2x Intel CLX 6230R",
-        "system_full":  "2x Intel CLX 6230R, 384 GB RAM, P4600 1.6 TB ext4",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "2x Intel CLX 6230R",
-        "time":         "2020-11-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.016, 0.003, 0.003],
-[0.042, 0.023, 0.022],
-[0.036, 0.031, 0.032],
-[0.083, 0.037, 0.036],
-[0.125, 0.111, 0.109],
-[0.206, 0.171, 0.172],
-[0.027, 0.028, 0.028],
-[0.021, 0.023, 0.023],
-[0.232, 0.196, 0.195],
-[0.260, 0.213, 0.210],
-[0.142, 0.100, 0.103],
-[0.141, 0.120, 0.109],
-[0.318, 0.255, 0.256],
-[0.394, 0.316, 0.311],
-[0.345, 0.301, 0.306],
-[0.332, 0.333, 0.318],
-[0.782, 0.734, 0.719],
-[0.494, 0.423, 0.412],
-[1.502, 1.379, 1.429],
-[0.094, 0.054, 0.057],
-[0.860, 0.295, 0.302],
-[0.978, 0.343, 0.344],
-[1.767, 0.823, 0.827],
-[2.214, 0.468, 0.443],
-[0.258, 0.116, 0.121],
-[0.142, 0.101, 0.104],
-[0.254, 0.113, 0.113],
-[0.860, 0.354, 0.356],
-[0.729, 0.449, 0.447],
-[0.846, 0.847, 0.854],
-[0.322, 0.247, 0.245],
-[0.582, 0.343, 0.348],
-[2.110, 2.008, 2.031],
-[1.417, 1.158, 1.135],
-[1.360, 1.069, 1.084],
-[0.377, 0.371, 0.357],
-[0.228, 0.160, 0.157],
-[0.092, 0.077, 0.076],
-[0.053, 0.043, 0.057],
-[0.423, 0.343, 0.348],
-[0.051, 0.032, 0.034],
-[0.023, 0.033, 0.035],
-[0.015, 0.010, 0.016]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_e5645.json b/website/benchmark/hardware/results/xeon_e5645.json
deleted file mode 100644
index 0468ef07830..00000000000
--- a/website/benchmark/hardware/results/xeon_e5645.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Xeon E5645",
-        "system_full":      "Xeon E5645 @ 2.40GHz, 2 sockets, 12 threads, 96 GiB, 14 x 2TB HDD RAID-10",
-        "time":         "2020-01-18 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.061, 0.003, 0.003],
-            [0.203, 0.026, 0.019],
-            [0.231, 0.056, 0.060],
-            [0.533, 0.080, 0.099],
-            [0.458, 0.202, 0.213],
-            [0.723, 0.468, 0.411],
-            [0.143, 0.034, 0.029],
-            [0.117, 0.025, 0.023],
-            [1.033, 0.810, 0.745],
-            [1.165, 0.916, 0.898],
-            [0.514, 0.249, 0.297],
-            [0.600, 0.343, 0.385],
-            [1.294, 1.156, 1.221],
-            [1.859, 1.459, 1.384],
-            [1.627, 1.349, 1.346],
-            [1.414, 1.269, 1.306],
-            [3.798, 3.774, 3.631],
-            [2.177, 2.054, 2.016],
-            [7.002, 6.187, 6.263],
-            [0.461, 0.081, 0.116],
-            [3.860, 1.296, 1.330],
-            [4.705, 1.587, 1.503],
-            [9.533, 3.887, 3.564],
-            [11.468, 1.932, 1.712],
-            [1.362, 0.451, 0.403],
-            [0.648, 0.374, 0.414],
-            [1.195, 0.437, 0.418],
-            [4.187, 1.686, 1.474],
-            [3.289, 2.146, 2.159],
-            [3.919, 4.242, 4.208],
-            [1.673, 1.084, 1.040],
-            [3.264, 1.496, 1.629],
-            [8.883, 8.965, 9.027],
-            [5.813, 5.225, 5.365],
-            [5.874, 5.376, 5.353],
-            [2.053, 1.910, 1.951],
-            [0.478, 0.324, 0.325],
-            [0.206, 0.132, 0.124],
-            [0.222, 0.105, 0.111],
-            [0.699, 0.599, 0.563],
-            [0.213, 0.041, 0.040],
-            [0.133, 0.032, 0.040],
-            [0.062, 0.010, 0.010]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_e5_1650v3.json b/website/benchmark/hardware/results/xeon_e5_1650v3.json
deleted file mode 100644
index 8dba51d37bd..00000000000
--- a/website/benchmark/hardware/results/xeon_e5_1650v3.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Intel Xeon E5-1650v3",
-        "system_full":       "Intel Xeon E5-1650v3 3.5 GHz, 64 GB DDR4, RAID1 2×480 GB SSD (INTEL SSDSC2BB480G4)",
-        "time":         "2020-01-26 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.005, 0.001, 0.001],
-            [0.025, 0.015, 0.016],
-            [0.085, 0.039, 0.034],
-            [0.302, 0.052, 0.057],
-            [0.313, 0.137, 0.136],
-            [0.639, 0.426, 0.434],
-            [0.036, 0.027, 0.027],
-            [0.021, 0.014, 0.014],
-            [0.871, 0.707, 0.707],
-            [1.060, 0.812, 0.811],
-            [0.521, 0.285, 0.290],
-            [0.548, 0.331, 0.339],
-            [1.358, 0.987, 0.983],
-            [1.832, 1.317, 1.326],
-            [1.464, 1.165, 1.134],
-            [1.311, 1.115, 1.111],
-            [3.426, 3.060, 3.069],
-            [2.113, 1.832, 1.849],
-            [7.000, 6.235, 6.309],
-            [0.293, 0.067, 0.074],
-            [3.325, 1.062, 1.030],
-            [3.765, 1.296, 1.311],
-            [7.438, 2.870, 2.831],
-            [7.820, 1.318, 1.277],
-            [1.139, 0.412, 0.405],
-            [0.704, 0.372, 0.362],
-            [1.154, 0.428, 0.427],
-            [3.557, 1.103, 1.060],
-            [3.249, 1.680, 1.666],
-            [2.411, 2.364, 2.312],
-            [1.365, 0.993, 1.003],
-            [2.696, 1.535, 1.523],
-            [9.226, 8.948, 8.734],
-            [6.053, 4.337, 4.321],
-            [6.020, 4.341, 4.300],
-            [1.919, 1.790, 1.759],
-            [0.220, 0.160, 0.161],
-            [0.085, 0.067, 0.061],
-            [0.116, 0.061, 0.061],
-            [0.431, 0.335, 0.320],
-            [0.050, 0.037, 0.025],
-            [0.083, 0.016, 0.019],
-            [0.029, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_e5_2640v4.json b/website/benchmark/hardware/results/xeon_e5_2640v4.json
deleted file mode 100644
index b24c5b03899..00000000000
--- a/website/benchmark/hardware/results/xeon_e5_2640v4.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Dell PowerEdge R730xd",
-        "system_full":       "Dell PowerEdge R730xd, 2 socket 10 cores E5-2640 v4, HW RAID5 3TBx12 SATA",
-        "time":         "2020-01-14 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.225, 0.001, 0.002],
-            [0.534, 0.010, 0.010],
-            [0.229, 0.025, 0.026],
-            [0.530, 0.042, 0.040],
-            [0.265, 0.094, 0.090],
-            [0.685, 0.224, 0.219],
-            [0.172, 0.013, 0.013],
-            [0.181, 0.010, 0.011],
-            [0.908, 0.418, 0.424],
-            [0.725, 0.450, 0.462],
-            [0.517, 0.138, 0.139],
-            [0.445, 0.168, 0.161],
-            [1.065, 0.585, 0.584],
-            [1.325, 0.756, 0.747],
-            [1.184, 0.627, 0.637],
-            [0.905, 0.676, 0.699],
-            [2.101, 1.848, 1.775],
-            [1.275, 0.927, 0.988],
-            [5.285, 4.201, 4.088],
-            [0.465, 0.040, 0.071],
-            [7.380, 0.557, 0.538],
-            [7.636, 0.665, 0.718],
-            [13.905, 1.685, 1.645],
-            [18.739, 0.828, 0.790],
-            [1.950, 0.195, 0.185],
-            [0.549, 0.163, 0.156],
-            [1.384, 0.205, 0.190],
-            [7.199, 0.650, 0.611],
-            [6.514, 0.935, 0.885],
-            [2.154, 2.034, 2.031],
-            [1.538, 0.546, 0.525],
-            [3.711, 0.916, 0.936],
-            [5.993, 4.973, 5.183],
-            [8.215, 2.759, 2.741],
-            [8.162, 2.795, 2.772],
-            [1.347, 1.074, 1.051],
-            [0.478, 0.208, 0.204],
-            [0.147, 0.077, 0.074],
-            [0.197, 0.066, 0.066],
-            [0.694, 0.438, 0.453],
-            [0.217, 0.024, 0.033],
-            [0.137, 0.032, 0.020],
-            [0.058, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_e5_2650_4hdd.json b/website/benchmark/hardware/results/xeon_e5_2650_4hdd.json
deleted file mode 100644
index 478229badcc..00000000000
--- a/website/benchmark/hardware/results/xeon_e5_2650_4hdd.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Xeon E5-2650",
-        "system_full":  "Xeon E5-2650 v2 @ 2.60GHz, 2 sockets, 16 threads, 4xHDD RAID-10",
-        "time":         "2020-09-25 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-[0.040, 0.002, 0.002],
-[0.698, 0.014, 0.013],
-[0.533, 0.030, 0.030],
-[0.700, 0.043, 0.046],
-[0.749, 0.108, 0.102],
-[1.350, 0.221, 0.259],
-[0.168, 0.020, 0.020],
-[0.096, 0.013, 0.013],
-[1.132, 0.406, 0.386],
-[1.279, 0.426, 0.440],
-[0.842, 0.153, 0.146],
-[1.042, 0.186, 0.182],
-[1.149, 0.536, 0.533],
-[1.734, 0.688, 0.683],
-[1.481, 0.688, 0.651],
-[1.100, 0.709, 0.700],
-[2.367, 1.668, 1.682],
-[1.687, 1.013, 0.988],
-[4.768, 3.647, 3.783],
-[0.599, 0.055, 0.040],
-[5.530, 0.646, 0.622],
-[6.658, 0.671, 0.648],
-[11.795, 1.645, 1.574],
-[19.248, 1.168, 0.906],
-[1.826, 0.224, 0.232],
-[0.964, 0.189, 0.187],
-[2.058, 0.234, 0.215],
-[5.811, 0.758, 0.704],
-[4.805, 1.014, 0.995],
-[2.272, 2.035, 1.838],
-[1.827, 0.546, 0.547],
-[3.643, 0.863, 0.834],
-[5.816, 5.069, 5.168],
-[6.585, 2.655, 2.756],
-[6.949, 2.681, 2.795],
-[1.325, 1.090, 1.072],
-[0.460, 0.183, 0.179],
-[1.000, 0.087, 0.091],
-[0.142, 0.051, 0.038],
-[0.808, 0.392, 0.391],
-[0.256, 0.021, 0.015],
-[0.132, 0.038, 0.012],
-[0.054, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_e5_2650_8hdd.json b/website/benchmark/hardware/results/xeon_e5_2650_8hdd.json
deleted file mode 100644
index 9c23205fda4..00000000000
--- a/website/benchmark/hardware/results/xeon_e5_2650_8hdd.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Xeon E5-2650",
-        "system_full":      "Xeon E5-2650 v2 @ 2.60GHz, 2 sockets, 16 threads, 8xHDD RAID-5",
-        "time":         "2020-01-12 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.101, 0.002, 0.002],
-            [0.196, 0.019, 0.021],
-            [0.486, 0.035, 0.029],
-            [0.413, 0.045, 0.043],
-            [0.368, 0.134, 0.105],
-            [0.563, 0.282, 0.269],
-            [0.078, 0.030, 0.025],
-            [0.070, 0.019, 0.014],
-            [0.751, 0.522, 0.558],
-            [0.856, 0.549, 0.547],
-            [0.458, 0.155, 0.163],
-            [0.439, 0.169, 0.190],
-            [0.929, 0.699, 0.608],
-            [1.494, 0.863, 0.902],
-            [1.379, 0.778, 0.794],
-            [1.032, 0.832, 0.851],
-            [2.364, 1.974, 1.914],
-            [1.284, 1.140, 1.043],
-            [4.745, 4.279, 4.294],
-            [0.713, 0.085, 0.071],
-            [4.133, 0.775, 0.729],
-            [3.485, 0.924, 0.880],
-            [7.568, 1.808, 1.853],
-            [9.496, 1.115, 1.119],
-            [1.130, 0.209, 0.243],
-            [0.643, 0.225, 0.211],
-            [1.338, 0.293, 0.233],
-            [4.353, 0.803, 0.759],
-            [2.667, 1.158, 1.070],
-            [2.612, 1.753, 1.721],
-            [1.370, 0.641, 0.704],
-            [2.348, 0.977, 1.015],
-            [6.154, 5.822, 5.696],
-            [4.553, 3.076, 3.232],
-            [4.647, 2.960, 3.249],
-            [1.441, 1.424, 1.285],
-            [0.560, 0.303, 0.245],
-            [0.223, 0.082, 0.084],
-            [0.275, 0.078, 0.076],
-            [0.929, 0.487, 0.416],
-            [0.362, 0.033, 0.049],
-            [0.179, 0.035, 0.022],
-            [0.075, 0.013, 0.013]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_e5_2650l_v3.json b/website/benchmark/hardware/results/xeon_e5_2650l_v3.json
deleted file mode 100644
index 42d01f69720..00000000000
--- a/website/benchmark/hardware/results/xeon_e5_2650l_v3.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "DO Xeon E5-2650Lv3",
-        "system_full":  "Digital Ocean, Xeon E5-2650L v3 @ 1.80GHz, 16 cores, 64 GB, SSD Disk 1.28 TB",
-        "time":         "2020-01-21 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.004, 0.004, 0.004],
-[0.056, 0.037, 0.036],
-[0.111, 0.079, 0.078],
-[0.151, 0.092, 0.095],
-[0.302, 0.262, 0.233],
-[0.602, 0.541, 0.552],
-[0.063, 0.049, 0.049],
-[0.039, 0.036, 0.036],
-[0.829, 0.762, 0.746],
-[0.939, 0.883, 0.862],
-[0.391, 0.311, 0.316],
-[0.445, 0.358, 0.356],
-[1.227, 1.024, 0.986],
-[1.455, 1.276, 1.235],
-[1.285, 1.146, 1.104],
-[1.229, 1.119, 1.062],
-[2.750, 2.555, 2.497],
-[1.798, 1.587, 1.527],
-[5.485, 5.167, 5.165],
-[0.184, 0.142, 0.106],
-[2.054, 1.350, 1.302],
-[2.229, 1.399, 1.290],
-[4.673, 3.013, 2.946],
-[3.984, 1.656, 1.566],
-[0.736, 0.492, 0.461],
-[0.479, 0.382, 0.378],
-[0.682, 0.456, 0.448],
-[1.974, 1.296, 1.146],
-[2.295, 1.847, 1.694],
-[2.232, 2.199, 2.213],
-[1.123, 0.953, 0.944],
-[1.814, 1.385, 1.279],
-[7.367, 7.127, 7.355],
-[4.973, 4.595, 4.775],
-[5.127, 4.639, 4.612],
-[1.794, 1.630, 1.633],
-[0.522, 0.420, 0.431],
-[0.216, 0.193, 0.202],
-[0.204, 0.171, 0.163],
-[0.888, 0.823, 0.789],
-[0.098, 0.077, 0.058],
-[0.078, 0.042, 0.041],
-[0.025, 0.015, 0.020]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_gold_6140.json b/website/benchmark/hardware/results/xeon_gold_6140.json
deleted file mode 100644
index b31ea90ab68..00000000000
--- a/website/benchmark/hardware/results/xeon_gold_6140.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "Xeon Gold 6140",
-        "system_full":  "Xeon Gold 6140, 1 socket, 32 threads, 64 GB RAM, vda",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6140",
-        "time":         "2021-08-24 00:00:00",
-        "kind": "server",
-        "result":
-        [
-[0.002, 0.002, 0.001],
-[0.017, 0.008, 0.008],
-[0.029, 0.019, 0.018],
-[0.043, 0.026, 0.025],
-[0.101, 0.087, 0.084],
-[0.213, 0.190, 0.187],
-[0.017, 0.012, 0.012],
-[0.036, 0.009, 0.009],
-[0.264, 0.240, 0.245],
-[0.313, 0.269, 0.270],
-[0.139, 0.120, 0.123],
-[0.149, 0.129, 0.134],
-[0.411, 0.342, 0.342],
-[0.490, 0.448, 0.445],
-[0.433, 0.411, 0.403],
-[0.459, 0.446, 0.445],
-[1.223, 1.143, 1.133],
-[0.723, 0.675, 0.685],
-[2.121, 2.095, 2.049],
-[0.058, 0.049, 0.030],
-[0.560, 0.429, 0.430],
-[0.653, 0.499, 0.501],
-[1.379, 1.171, 1.152],
-[1.153, 0.564, 0.562],
-[0.200, 0.155, 0.152],
-[0.150, 0.129, 0.127],
-[0.192, 0.151, 0.152],
-[0.583, 0.449, 0.459],
-[0.752, 0.666, 0.656],
-[1.073, 1.072, 1.073],
-[0.373, 0.330, 0.336],
-[0.525, 0.441, 0.441],
-[3.795, 2.731, 2.908],
-[1.918, 1.756, 1.787],
-[1.828, 1.732, 1.735],
-[0.725, 0.697, 0.711],
-[0.188, 0.171, 0.179],
-[0.072, 0.067, 0.065],
-[0.077, 0.062, 0.062],
-[0.435, 0.415, 0.391],
-[0.027, 0.022, 0.020],
-[0.023, 0.020, 0.014],
-[0.014, 0.008, 0.003]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_gold_6230.json b/website/benchmark/hardware/results/xeon_gold_6230.json
deleted file mode 100644
index 973c3ed41d6..00000000000
--- a/website/benchmark/hardware/results/xeon_gold_6230.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "Xeon Gold 6230",
-        "system_full":      "Xeon Gold 6230, 2 sockets, 40 threads",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6230",
-        "time":         "2020-01-01 00:00:00",
-        "kind": "server",
-        "result":
-        [
-            [0.009, 0.002, 0.001],
-            [0.028, 0.008, 0.009],
-            [0.055, 0.014, 0.014],
-            [0.122, 0.018, 0.018],
-            [0.157, 0.069, 0.068],
-            [0.217, 0.124, 0.121],
-            [0.020, 0.008, 0.008],
-            [0.013, 0.008, 0.007],
-            [0.284, 0.213, 0.217],
-            [0.312, 0.241, 0.239],
-            [0.164, 0.087, 0.090],
-            [0.168, 0.092, 0.092],
-            [0.318, 0.256, 0.251],
-            [0.436, 0.323, 0.325],
-            [0.385, 0.327, 0.327],
-            [0.419, 0.402, 0.398],
-            [1.061, 0.918, 0.935],
-            [0.523, 0.474, 0.598],
-            [1.706, 1.621, 1.657],
-            [0.124, 0.037, 0.024],
-            [1.192, 0.263, 0.258],
-            [1.362, 0.303, 0.302],
-            [2.473, 0.730, 0.735],
-            [2.857, 0.451, 0.382],
-            [0.374, 0.106, 0.103],
-            [0.204, 0.079, 0.078],
-            [0.381, 0.114, 0.109],
-            [1.185, 0.327, 0.318],
-            [1.011, 0.408, 0.415],
-            [0.895, 0.925, 0.880],
-            [0.406, 0.277, 0.274],
-            [0.846, 0.386, 0.389],
-            [3.174, 2.500, 2.533],
-            [1.758, 1.311, 1.315],
-            [1.766, 1.332, 1.355],
-            [0.469, 0.449, 0.462],
-            [0.201, 0.169, 0.170],
-            [0.069, 0.061, 0.061],
-            [0.064, 0.056, 0.057],
-            [0.362, 0.365, 0.369],
-            [0.035, 0.022, 0.024],
-            [0.030, 0.019, 0.019],
-            [0.009, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_gold_6266.json b/website/benchmark/hardware/results/xeon_gold_6266.json
deleted file mode 100644
index 0e68466a633..00000000000
--- a/website/benchmark/hardware/results/xeon_gold_6266.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "Huawei Cloud c6.xlarge.4, 4vCPUs, 16 GiB",
-        "system_full":  "Huawei Cloud c6.xlarge.4, Xeon Gold 6266C, 3GHz, 4vCPU, 16GiB RAM, vda1 40GB",
-        "cpu_vendor":   "Intel",
-        "cpu_model":    "Xeon Gold 6266C",
-        "time":         "2021-12-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.001, 0.001, 0.001],
-[0.034, 0.023, 0.023],
-[0.168, 0.105, 0.104],
-[0.745, 0.162, 0.160],
-[1.512, 0.328, 0.327],
-[2.408, 1.162, 1.155],
-[0.069, 0.052, 0.051],
-[0.074, 0.027, 0.026],
-[2.314, 1.833, 1.796],
-[2.749, 2.014, 2.011],
-[1.424, 0.618, 0.579],
-[1.494, 0.681, 0.677],
-[3.208, 2.457, 2.529],
-[5.071, 3.329, 3.411],
-[3.968, 3.289, 3.330],
-[3.142, 2.925, 2.827],
-[9.473, 9.034, 8.850],
-[6.768, 6.256, 6.115],
-[18.388, 17.790, 17.892],
-[1.105, 0.195, 0.194],
-[20.310, 3.459, 3.416],
-[22.772, 3.811, 3.773],
-[42.554, 8.738, 8.640],
-[30.747, 4.013, 3.967],
-[4.707, 0.973, 0.965],
-[2.003, 0.845, 0.839],
-[4.978, 0.991, 0.974],
-[19.726, 3.293, 3.264],
-[17.151, 5.171, 5.134],
-[3.620, 3.600, 3.600],
-[4.693, 2.172, 2.115],
-[10.842, 2.686, 2.750],
-[17.857, 17.086, 16.907],
-[22.926, 13.070, 12.808],
-[22.803, 12.727, 12.867],
-[4.189, 3.888, 3.893],
-[0.227, 0.176, 0.177],
-[0.085, 0.068, 0.067],
-[0.101, 0.064, 0.067],
-[0.493, 0.438, 0.399],
-[0.042, 0.022, 0.021],
-[0.029, 0.017, 0.015],
-[0.007, 0.005, 0.003]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_silver_4114.json b/website/benchmark/hardware/results/xeon_silver_4114.json
deleted file mode 100644
index e0de9fc2572..00000000000
--- a/website/benchmark/hardware/results/xeon_silver_4114.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-    {
-        "system":       "Xeon Silver 4114",
-        "system_full":       "Xeon Silver 4114, 256 Gb RAM, SSD RAID1",
-        "time":         "2020-04-23 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.010, 0.002, 0.002],
-            [0.047, 0.016, 0.016],
-            [0.080, 0.041, 0.044],
-            [0.236, 0.063, 0.059],
-            [0.266, 0.139, 0.133],
-            [0.507, 0.366, 0.346],
-            [0.045, 0.034, 0.035],
-            [0.027, 0.015, 0.017],
-            [0.716, 0.589, 0.565],
-            [0.771, 0.658, 0.635],
-            [0.320, 0.225, 0.251],
-            [0.358, 0.246, 0.248],
-            [0.934, 0.749, 0.764],
-            [1.252, 1.017, 1.020],
-            [1.144, 0.990, 0.997],
-            [1.106, 1.037, 1.030],
-            [3.004, 2.754, 2.779],
-            [1.865, 1.666, 1.687],
-            [5.054, 4.953, 5.174],
-            [0.229, 0.060, 0.057],
-            [2.609, 1.049, 1.058],
-            [2.968, 1.109, 1.113],
-            [5.592, 2.381, 2.401],
-            [5.589, 1.385, 1.241],
-            [0.768, 0.348, 0.340],
-            [0.431, 0.283, 0.282],
-            [0.774, 0.351, 0.349],
-            [2.591, 0.919, 0.842],
-            [2.493, 1.627, 1.536],
-            [1.849, 1.860, 1.823],
-            [1.088, 0.832, 0.842],
-            [1.862, 1.133, 1.177],
-            [null, null, null],
-            [4.641, 3.828, 3.872],
-            [4.580, 3.979, 4.150],
-            [1.471, 1.412, 1.406],
-            [0.250, 0.203, 0.212],
-            [0.097, 0.084, 0.085],
-            [0.121, 0.086, 0.074],
-            [0.541, 0.458, 0.448],
-            [0.057, 0.027, 0.037],
-            [0.035, 0.020, 0.018],
-            [0.017, 0.008, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_sp_gold.json b/website/benchmark/hardware/results/xeon_sp_gold.json
deleted file mode 100644
index 936a85e9999..00000000000
--- a/website/benchmark/hardware/results/xeon_sp_gold.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-    {
-        "system":       "Dell PowerEdge R640",
-        "system_full":      "Dell PowerEdge R640 DX292 2x Xeon SP Gold 16-Core 2.10GHz, 196 GB RAM, 2x SSD 960 GB RAID-1",
-        "cpu_vendor":   "Intel",
-        "cpu_model":   "Xeon SP Gold",
-        "time":         "2020-01-13 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.005, 0.003, 0.003],
-            [0.035, 0.013, 0.016],
-            [0.043, 0.023, 0.023],
-            [0.076, 0.030, 0.027],
-            [0.109, 0.087, 0.098],
-            [0.184, 0.154, 0.151],
-            [0.030, 0.017, 0.016],
-            [0.018, 0.017, 0.016],
-            [0.346, 0.357, 0.375],
-            [0.467, 0.397, 0.410],
-            [0.165, 0.135, 0.137],
-            [0.166, 0.146, 0.143],
-            [0.452, 0.432, 0.415],
-            [0.543, 0.523, 0.527],
-            [0.508, 0.489, 0.472],
-            [0.638, 0.551, 0.549],
-            [1.280, 1.231, 1.272],
-            [0.680, 0.748, 0.611],
-            [2.380, 2.465, 2.351],
-            [0.073, 0.065, 0.040],
-            [0.724, 0.371, 0.376],
-            [0.805, 0.474, 0.450],
-            [1.547, 1.064, 1.117],
-            [1.798, 0.543, 0.507],
-            [0.217, 0.145, 0.142],
-            [0.139, 0.122, 0.133],
-            [0.221, 0.161, 0.159],
-            [0.730, 0.440, 0.449],
-            [0.875, 0.744, 0.721],
-            [1.307, 1.259, 1.318],
-            [0.457, 0.401, 0.404],
-            [0.716, 0.688, 0.617],
-            [4.147, 4.251, 3.844],
-            [2.082, 1.950, 2.187],
-            [2.109, 2.095, 1.930],
-            [0.875, 0.851, 0.848],
-            [0.233, 0.235, 0.221],
-            [0.103, 0.087, 0.086],
-            [0.087, 0.078, 0.078],
-            [0.452, 0.407, 0.403],
-            [0.047, 0.041, 0.054],
-            [0.036, 0.034, 0.035],
-            [0.013, 0.010, 0.010]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/xeon_x5675.json b/website/benchmark/hardware/results/xeon_x5675.json
deleted file mode 100644
index e7dc40902d5..00000000000
--- a/website/benchmark/hardware/results/xeon_x5675.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-    {
-        "system":       "ProLiant DL380 G7 (2 CPU)",
-        "system_full":       "ProLiant DL380 G7, 12Gb RAM, 2x Xeon X5675 3.07GHz, 8x300GB SAS soft RAID5",
-        "time":         "2020-02-18 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.041, 0.005, 0.005],
-            [0.084, 0.020, 0.019],
-            [0.403, 0.046, 0.043],
-            [0.190, 0.081, 0.082],
-            [0.192, 0.127, 0.131],
-            [0.388, 0.324, 0.309],
-            [0.078, 0.028, 0.038],
-            [0.055, 0.019, 0.019],
-            [0.677, 0.614, 0.604],
-            [0.808, 0.706, 0.727],
-            [0.282, 0.190, 0.181],
-            [0.312, 0.223, 0.229],
-            [0.997, 0.895, 0.891],
-            [1.167, 1.155, 1.115],
-            [1.155, 1.088, 1.143],
-            [1.119, 1.090, 1.109],
-            [3.451, 3.222, 3.153],
-            [1.743, 1.770, 1.655],
-            [9.346, 6.206, 6.436],
-            [0.352, 0.108, 0.105],
-            [2.985, 0.993, 0.976],
-            [3.594, 1.211, 1.195],
-            [6.626, 2.829, 2.800],
-            [10.086, 1.331, 1.318],
-            [1.072, 0.348, 0.332],
-            [0.535, 0.298, 0.269],
-            [1.046, 0.362, 0.334],
-            [3.487, 1.221, 1.165],
-            [2.718, 1.742, 1.719],
-            [3.200, 3.158, 3.116],
-            [1.346, 0.901, 0.917],
-            [2.336, 1.285, 1.285],
-            [8.876, 64.491, 123.728],
-            [10.200, 5.127, 4.743],
-            [5.196, 4.783, 4.659],
-            [1.628, 1.544, 1.527],
-            [0.476, 0.296, 0.285],
-            [0.172, 0.127, 0.097],
-            [0.170, 0.078, 0.083],
-            [0.670, 0.529, 0.511],
-            [0.181, 0.065, 0.039],
-            [0.123, 0.029, 0.033],
-            [0.045, 0.011, 0.011]
-        ]
-    },
-    {
-        "system":       "ProLiant DL380 G7 (1 CPU)",
-        "system_full":       "ProLiant DL380 G7, 128Gb RAM, 1x Xeon X5675 3.07GHz, 8x300GB SAS Soft RAID5",
-        "time":         "2020-02-18 00:00:00",
-        "kind":         "server",
-        "result":
-        [
-            [0.048, 0.005, 0.005],
-            [0.092, 0.026, 0.026],
-            [0.167, 0.067, 0.073],
-            [0.200, 0.117, 0.116],
-            [0.263, 0.185, 0.203],
-            [0.587, 0.586, 0.586],
-            [0.094, 0.043, 0.043],
-            [0.067, 0.025, 0.026],
-            [1.371, 1.299, 1.298],
-            [1.638, 1.546, 1.548],
-            [0.441, 0.341, 0.337],
-            [0.482, 0.405, 0.385],
-            [2.682, 2.680, 2.630],
-            [3.189, 3.207, 3.167],
-            [2.634, 2.525, 2.556],
-            [3.181, 3.200, 3.213],
-            [7.793, 7.714, 7.768],
-            [3.802, 3.819, 3.960],
-            [19.101, 16.177, 15.840],
-            [0.320, 0.153, 0.134],
-            [3.108, 2.188, 2.115],
-            [4.515, 3.139, 3.069],
-            [7.712, 6.856, 6.906],
-            [11.063, 2.630, 2.567],
-            [1.015, 0.739, 0.723],
-            [0.738, 0.644, 0.623],
-            [1.048, 0.717, 0.736],
-            [3.371, 2.905, 2.903],
-            [4.772, 4.539, 4.518],
-            [11.700, 11.656, 11.589],
-            [2.217, 2.083, 2.072],
-            [4.329, 4.153, 3.889],
-            [21.212, 21.887, 21.417],
-            [12.816, 12.501, 12.664],
-            [13.192, 12.624, 12.820],
-            [5.454, 5.447, 5.462],
-            [0.376, 0.280, 0.288],
-            [0.152, 0.097, 0.113],
-            [0.171, 0.093, 0.100],
-            [0.594, 0.484, 0.464],
-            [0.129, 0.043, 0.036],
-            [0.098, 0.027, 0.045],
-            [0.033, 0.025, 0.011]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_broadwell_4_vcpu.json b/website/benchmark/hardware/results/yandex_cloud_broadwell_4_vcpu.json
deleted file mode 100644
index c33feefb006..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_broadwell_4_vcpu.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud s1.small",
-        "system_full":  "Yandex Cloud Broadwell, 4 vCPU (2 threads), 16 GB RAM, 30 GB SSD",
-        "cpu_vendor":   "Intel",
-        "time":         "2020-01-14 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.507, 0.002, 0.002],
-            [0.267, 0.035, 0.034],
-            [0.970, 0.120, 0.121],
-            [4.600, 0.200, 0.194],
-            [0.554, 0.469, 0.462],
-            [7.314, 1.276, 1.251],
-            [0.164, 0.062, 0.063],
-            [0.159, 0.035, 0.036],
-            [5.551, 1.935, 1.946],
-            [2.291, 2.170, 2.188],
-            [0.718, 0.653, 0.686],
-            [0.841, 0.796, 0.776],
-            [7.636, 2.906, 2.849],
-            [6.644, 4.234, 3.796],
-            [3.847, 3.080, 3.029],
-            [4.308, 3.285, 3.214],
-            [9.768, 8.793, 8.694],
-            [6.103, 5.225, 6.072],
-            [20.421, 17.609, 17.372],
-            [2.141, 0.182, 0.189],
-            [55.415, 3.527, 3.553],
-            [55.961, 4.545, 4.011],
-            [106.069, 9.063, 8.975],
-            [116.871, 4.638, 4.542],
-            [16.100, 1.818, 1.186],
-            [2.543, 0.950, 0.933],
-            [5.086, 1.199, 1.192],
-            [55.720, 3.259, 3.240],
-            [46.784, 5.170, 5.190],
-            [6.505, 6.229, 6.191],
-            [11.382, 2.817, 2.863],
-            [22.205, 4.495, 4.348],
-            [34.430, 27.314, 27.662],
-            [58.643, 14.066, 14.196],
-            [50.675, 14.220, 13.868],
-            [5.674, 5.107, 5.219],
-            [0.577, 0.293, 0.272],
-            [0.151, 0.098, 0.094],
-            [0.107, 0.094, 0.089],
-            [0.692, 0.582, 0.610],
-            [0.302, 0.040, 0.036],
-            [0.101, 0.027, 0.026],
-            [0.094, 0.006, 0.006]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_broadwell_8_vcpu.json b/website/benchmark/hardware/results/yandex_cloud_broadwell_8_vcpu.json
deleted file mode 100644
index 1217adbbff5..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_broadwell_8_vcpu.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud 8vCPU",
-        "system_full":  "Yandex Cloud Broadwell, 8 vCPU (4 threads), 64 GB RAM, 500 GB SSD",
-        "cpu_vendor":   "Intel",
-        "time":         "2021-02-05 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.004, 0.003, 0.003],
-            [0.047, 0.030, 0.021],
-            [0.129, 0.066, 0.067],
-            [0.873, 0.098, 0.095],
-            [0.869, 0.247, 0.257],
-            [1.429, 0.818, 0.768],
-            [0.055, 0.042, 0.043],
-            [0.034, 0.025, 0.024],
-            [1.372, 1.003, 1.051],
-            [1.605, 1.281, 1.209],
-            [0.942, 0.503, 0.483],
-            [0.980, 0.537, 0.558],
-            [2.076, 1.664, 1.635],
-            [3.136, 2.235, 2.171],
-            [2.351, 1.973, 1.974],
-            [2.369, 2.170, 2.133],
-            [6.281, 5.576, 5.498],
-            [3.739, 3.481, 3.354],
-            [10.947, 10.225, 10.271],
-            [0.875, 0.111, 0.108],
-            [10.832, 1.844, 1.877],
-            [12.344, 2.330, 2.227],
-            [22.999, 5.000, 4.903],
-            [20.086, 2.390, 2.278],
-            [3.036, 0.722, 0.673],
-            [1.420, 0.602, 0.578],
-            [3.040, 0.728, 0.714],
-            [10.842, 1.874, 1.783],
-            [9.207, 2.809, 2.705],
-            [2.751, 2.703, 2.714],
-            [2.810, 1.675, 1.568],
-            [6.507, 2.449, 2.505],
-            [15.968, 15.014, 15.318],
-            [13.479, 7.951, 7.702],
-            [13.227, 7.791, 7.699],
-            [2.811, 2.723, 2.549],
-            [0.358, 0.249, 0.273],
-            [0.157, 0.099, 0.101],
-            [0.189, 0.088, 0.080],
-            [0.758, 0.544, 0.525],
-            [0.115, 0.033, 0.027],
-            [0.063, 0.048, 0.023],
-            [0.014, 0.011, 0.008]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_broadwell_8_vcpu_s3.json b/website/benchmark/hardware/results/yandex_cloud_broadwell_8_vcpu_s3.json
deleted file mode 100644
index ace2442c86e..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_broadwell_8_vcpu_s3.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud 8vCPU Object Storage",
-        "system_full":  "Yandex Cloud Broadwell, 8 vCPU (4 threads), 64 GB RAM, Object Storage",
-        "cpu_vendor":   "Intel",
-        "time":         "2021-02-05 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.007, 0.003, 0.003],
-            [0.214, 0.111, 0.096],
-            [1.239, 1.359, 0.718],
-            [3.056, 3.366, 1.869],
-            [1.946, 1.552, 2.450],
-            [4.804, 2.307, 2.398],
-            [0.198, 0.108, 0.114],
-            [0.141, 0.104, 0.100],
-            [2.755, 2.749, 3.608],
-            [3.140, 3.905, 3.830],
-            [2.353, 4.996, 1.637],
-            [3.796, 1.536, 1.724],
-            [3.565, 3.016, 3.381],
-            [4.962, 4.263, 4.352],
-            [4.210, 3.974, 4.318],
-            [3.884, 3.434, 3.124],
-            [10.451, 9.147, 7.526],
-            [6.288, 5.882, 7.714],
-            [15.239, 33.243, 17.968],
-            [1.645, 1.870, 3.230],
-            [10.980, 8.984, 7.589],
-            [14.345, 11.503, 12.449],
-            [17.687, 17.764, 18.984],
-            [76.606, 65.179, 94.215],
-            [5.833, 3.347, 3.127],
-            [3.815, 2.574, 2.402],
-            [4.916, 6.169, 5.731],
-            [7.961, 9.930, 8.555],
-            [5.995, 7.382, 6.054],
-            [3.113, 4.176, 3.172],
-            [5.077, 5.221, 5.709],
-            [8.990, 9.598, 6.272],
-            [17.832, 17.668, 17.276],
-            [11.846, 14.692, 13.225],
-            [12.544, 12.502, 12.725],
-            [3.604, 4.811, 3.267],
-            [0.738, 0.751, 0.862],
-            [0.718, 0.611, 0.561],
-            [2.125, 0.688, 0.522],
-            [1.469, 1.546, 1.373],
-            [1.382, 1.069, 0.976],
-            [1.353, 1.212, 1.119],
-            [0.045, 0.031, 0.041]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_32_vcpu.json b/website/benchmark/hardware/results/yandex_cloud_cascade_lake_32_vcpu.json
deleted file mode 100644
index 5d2927c224d..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_32_vcpu.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud 32vCPU",
-        "system_full":  "Yandex Cloud Cascade Lake, 32 vCPU, 128 GB RAM, 300 GB SSD",
-        "cpu_vendor":   "Intel",
-        "time":         "2020-09-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.021, 0.001, 0.001],
-[0.051, 0.011, 0.010],
-[0.396, 0.025, 0.025],
-[1.400, 0.035, 0.033],
-[1.413, 0.095, 0.098],
-[2.272, 0.222, 0.208],
-[0.042, 0.014, 0.014],
-[0.024, 0.011, 0.010],
-[1.948, 0.311, 0.303],
-[2.267, 0.379, 0.348],
-[1.498, 0.138, 0.135],
-[1.563, 0.164, 0.155],
-[2.435, 0.544, 0.516],
-[3.937, 0.661, 0.659],
-[2.724, 0.727, 0.642],
-[1.795, 0.683, 0.641],
-[4.668, 1.682, 1.643],
-[3.802, 1.051, 0.895],
-[8.297, 3.835, 4.592],
-[1.427, 0.100, 0.033],
-[16.816, 0.652, 0.547],
-[19.159, 0.650, 0.532],
-[35.374, 1.538, 1.311],
-[32.736, 0.854, 0.699],
-[4.767, 0.203, 0.184],
-[2.249, 0.166, 0.158],
-[4.759, 0.207, 0.189],
-[16.826, 0.584, 0.529],
-[14.308, 0.920, 0.789],
-[1.137, 1.041, 0.992],
-[3.967, 0.545, 0.555],
-[9.196, 0.872, 0.789],
-[9.554, 5.501, 5.694],
-[17.810, 2.712, 2.329],
-[17.726, 2.653, 2.793],
-[1.260, 0.955, 0.978],
-[0.260, 0.171, 0.164],
-[0.092, 0.065, 0.069],
-[0.046, 0.041, 0.037],
-[0.475, 0.391, 0.383],
-[0.066, 0.021, 0.019],
-[0.023, 0.024, 0.011],
-[0.022, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_4_vcpu.json b/website/benchmark/hardware/results/yandex_cloud_cascade_lake_4_vcpu.json
deleted file mode 100644
index 81c5ca2e324..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_4_vcpu.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud s2.small",
-        "system_full":  "Yandex Cloud Cascade Lake, 4 vCPU (2 threads), 16 GB RAM, 30 GB SSD",
-        "cpu_vendor":   "Intel",
-        "time":         "2020-01-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.621, 0.002, 0.002],
-            [0.288, 0.035, 0.030],
-            [1.023, 0.126, 0.132],
-            [5.152, 0.219, 0.194],
-            [0.458, 0.427, 0.447],
-            [6.848, 1.223, 1.232],
-            [0.271, 0.077, 0.058],
-            [0.130, 0.044, 0.032],
-            [3.722, 2.145, 2.159],
-            [2.571, 2.459, 2.490],
-            [0.764, 0.679, 0.721],
-            [0.892, 0.816, 0.816],
-            [5.743, 3.467, 3.294],
-            [5.177, 4.540, 4.596],
-            [5.294, 4.565, 4.510],
-            [5.109, 3.902, 3.845],
-            [14.256, 12.943, 12.882],
-            [8.741, 8.056, 9.738],
-            [30.649, 26.987, 26.702],
-            [2.063, 0.183, 0.239],
-            [54.740, 3.602, 3.559],
-            [54.077, 6.038, 4.264],
-            [107.285, 11.156, 9.986],
-            [114.734, 4.735, 4.673],
-            [15.581, 1.257, 1.249],
-            [3.779, 1.002, 0.992],
-            [4.864, 1.305, 1.305],
-            [55.450, 3.348, 3.230],
-            [46.372, 5.424, 5.263],
-            [6.437, 6.404, 6.179],
-            [11.933, 3.524, 3.546],
-            [20.803, 5.352, 5.216],
-            [43.065, 41.106, 41.870],
-            [58.396, 16.545, 16.610],
-            [51.752, 16.329, 16.221],
-            [6.722, 6.256, 6.391],
-            [0.533, 0.241, 0.237],
-            [0.113, 0.085, 0.077],
-            [0.093, 0.083, 0.074],
-            [0.624, 0.497, 0.492],
-            [0.286, 0.036, 0.028],
-            [0.088, 0.022, 0.021],
-            [0.099, 0.005, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_64_vcpu.json b/website/benchmark/hardware/results/yandex_cloud_cascade_lake_64_vcpu.json
deleted file mode 100644
index e593c47e4dd..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_64_vcpu.json
+++ /dev/null
@@ -1,108 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud s2.6xlarge",
-        "system_full":      "Yandex Cloud Cascade Lake, 64 vCPU (32 threads), 128 GB RAM, 400 GB SSD",
-        "cpu_vendor":   "Intel",
-        "time":         "2020-01-11 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.037, 0.002, 0.002],
-            [0.113, 0.008, 0.014],
-            [0.275, 0.016, 0.016],
-            [0.448, 0.022, 0.022],
-            [0.472, 0.083, 0.082],
-            [0.808, 0.137, 0.136],
-            [0.063, 0.016, 0.010],
-            [0.055, 0.008, 0.008],
-            [0.753, 0.280, 0.327],
-            [0.850, 0.308, 0.305],
-            [0.540, 0.110, 0.105],
-            [0.533, 0.113, 0.112],
-            [0.930, 0.326, 0.314],
-            [1.463, 0.392, 0.374],
-            [0.994, 0.389, 0.386],
-            [0.763, 0.471, 0.499],
-            [1.890, 1.271, 1.280],
-            [1.335, 0.642, 1.776],
-            [3.886, 2.448, 2.370],
-            [0.452, 0.052, 0.029],
-            [5.834, 0.380, 0.374],
-            [6.645, 0.509, 0.385],
-            [12.401, 1.204, 1.146],
-            [12.727, 0.502, 0.513],
-            [1.628, 0.154, 0.128],
-            [0.739, 0.121, 0.144],
-            [1.632, 0.173, 0.127],
-            [5.856, 0.495, 0.568],
-            [4.960, 0.685, 0.784],
-            [1.619, 0.974, 1.638],
-            [1.420, 0.377, 0.361],
-            [3.379, 0.596, 0.580],
-            [5.797, 4.241, 4.280],
-            [6.864, 2.376, 2.224],
-            [6.834, 2.112, 2.118],
-            [0.996, 0.890, 0.947],
-            [0.286, 0.226, 0.218],
-            [0.110, 0.080, 0.077],
-            [0.146, 0.075, 0.068],
-            [0.531, 0.500, 0.438],
-            [0.076, 0.025, 0.027],
-            [0.054, 0.021, 0.022],
-            [0.033, 0.004, 0.004]
-        ]
-    },
-
-    {
-        "system":       "Yandex Cloud s2.6xlarge 4TB SSD",
-        "system_full":  "Yandex Cloud Cascade Lake, 64 vCPU (32 threads), 128 GB RAM, 4 TB SSD",
-        "time":         "2020-01-13 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.054, 0.002, 0.002],
-            [0.140, 0.009, 0.015],
-            [0.139, 0.017, 0.020],
-            [0.430, 0.022, 0.022],
-            [0.453, 0.083, 0.082],
-            [0.839, 0.160, 0.159],
-            [0.058, 0.010, 0.010],
-            [0.048, 0.009, 0.008],
-            [0.706, 0.307, 0.288],
-            [0.821, 0.328, 0.301],
-            [0.509, 0.108, 0.106],
-            [0.534, 0.117, 0.116],
-            [0.905, 0.318, 0.313],
-            [1.573, 0.429, 0.413],
-            [0.960, 0.410, 0.403],
-            [0.769, 0.619, 0.521],
-            [1.914, 1.335, 1.272],
-            [1.279, 0.657, 1.215],
-            [3.839, 2.264, 2.481],
-            [0.425, 0.064, 0.027],
-            [5.605, 0.344, 0.367],
-            [6.389, 0.382, 0.403],
-            [11.794, 0.894, 0.878],
-            [11.730, 0.536, 0.436],
-            [1.540, 0.120, 0.109],
-            [0.715, 0.091, 0.106],
-            [1.553, 0.132, 0.132],
-            [5.580, 0.375, 0.350],
-            [4.720, 0.511, 0.480],
-            [1.025, 0.953, 1.008],
-            [1.475, 0.359, 0.357],
-            [3.457, 0.504, 0.495],
-            [4.688, 3.581, 3.673],
-            [6.325, 1.913, 1.865],
-            [6.338, 1.933, 2.030],
-            [0.961, 0.785, 0.847],
-            [0.267, 0.221, 0.215],
-            [0.095, 0.071, 0.078],
-            [0.148, 0.065, 0.071],
-            [0.516, 0.471, 0.432],
-            [0.076, 0.028, 0.025],
-            [0.053, 0.018, 0.021],
-            [0.034, 0.004, 0.004]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_80_vcpu.json b/website/benchmark/hardware/results/yandex_cloud_cascade_lake_80_vcpu.json
deleted file mode 100644
index 565a5bd41c2..00000000000
--- a/website/benchmark/hardware/results/yandex_cloud_cascade_lake_80_vcpu.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "system":       "Yandex Cloud 80vCPU",
-        "system_full":  "Yandex Cloud Cascade Lake, 80 vCPU, 160 GB RAM, 4TB SSD",
-        "cpu_vendor":   "Intel",
-        "time":         "2020-09-23 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-[0.024, 0.002, 0.002],
-[0.067, 0.012, 0.012],
-[0.104, 0.017, 0.017],
-[0.411, 0.020, 0.021],
-[0.577, 0.069, 0.068],
-[0.739, 0.123, 0.122],
-[0.038, 0.015, 0.014],
-[0.024, 0.012, 0.012],
-[0.625, 0.169, 0.168],
-[0.748, 0.216, 0.207],
-[0.471, 0.089, 0.082],
-[0.487, 0.092, 0.087],
-[0.818, 0.256, 0.245],
-[1.324, 0.352, 0.352],
-[0.927, 0.333, 0.319],
-[0.642, 0.376, 0.377],
-[1.686, 0.983, 0.959],
-[1.290, 0.588, 0.582],
-[3.105, 1.793, 1.818],
-[0.426, 0.031, 0.034],
-[5.559, 0.415, 0.344],
-[6.343, 0.435, 0.405],
-[11.779, 1.151, 1.101],
-[11.851, 0.537, 0.509],
-[1.530, 0.125, 0.126],
-[0.695, 0.103, 0.103],
-[1.531, 0.127, 0.119],
-[5.576, 0.541, 0.496],
-[4.718, 0.740, 0.719],
-[1.429, 1.467, 1.500],
-[1.309, 0.335, 0.322],
-[3.138, 0.505, 0.518],
-[5.481, 3.475, 3.512],
-[6.330, 1.877, 1.818],
-[6.238, 1.843, 1.813],
-[0.660, 0.626, 0.603],
-[0.251, 0.152, 0.151],
-[0.090, 0.058, 0.059],
-[0.041, 0.038, 0.034],
-[0.470, 0.376, 0.385],
-[0.076, 0.015, 0.018],
-[0.030, 0.018, 0.010],
-[0.024, 0.006, 0.005]
-        ]
-    }
-]
diff --git a/website/benchmark/hardware/results/yandex_managed_clickhouse_s3_3xlarge.json b/website/benchmark/hardware/results/yandex_managed_clickhouse_s3_3xlarge.json
deleted file mode 100644
index 55e2a19ea85..00000000000
--- a/website/benchmark/hardware/results/yandex_managed_clickhouse_s3_3xlarge.json
+++ /dev/null
@@ -1,107 +0,0 @@
-[
-    {
-        "system":       "Yandex Managed ClickHouse s3.3xlarge",
-        "system_full":       "Yandex Managed ClickHouse, s3.3xlarge, Cascade Lake 32 vCPU, 128 GB RAM, 1 TB local SSD",
-        "time":         "2020-01-14 00:00:00",
-        "kind":         "cloud",
-        "result":
-        [
-            [0.039, 0.041, 0.046],
-            [0.079, 0.084, 0.081],
-            [0.069, 0.068, 0.060],
-            [0.067, 0.065, 0.073],
-            [0.114, 0.116, 0.115],
-            [0.176, 0.171, 0.166],
-            [0.055, 0.058, 0.065],
-            [0.060, 0.061, 0.057],
-            [0.290, 0.290, 0.289],
-            [0.323, 0.315, 0.309],
-            [0.128, 0.124, 0.137],
-            [0.144, 0.136, 0.136],
-            [0.344, 0.326, 0.325],
-            [0.402, 0.392, 0.431],
-            [0.430, 0.436, 0.414],
-            [0.509, 0.485, 0.485],
-            [1.233, 1.151, 1.167],
-            [0.652, 0.651, 0.631],
-            [2.078, 2.076, 2.046],
-            [0.070, 0.071, 0.070],
-            [0.358, 0.327, 0.355],
-            [0.428, 0.403, 0.405],
-            [0.974, 0.986, 0.976],
-            [0.532, 0.549, 0.500],
-            [0.164, 0.169, 0.158],
-            [0.128, 0.130, 0.138],
-            [0.166, 0.169, 0.159],
-            [0.428, 0.449, 0.471],
-            [0.586, 0.598, 0.568],
-            [1.115, 1.115, 1.147],
-            [0.342, 0.344, 0.342],
-            [0.481, 0.473, 0.470],
-            [4.436, 3.273, 3.320],
-            [1.661, 1.542, 1.545],
-            [1.573, 1.875, 1.576],
-            [0.600, 0.566, 0.586],
-            [0.261, 0.255, 0.251],
-            [0.134, 0.136, 0.120],
-            [0.135, 0.133, 0.132],
-            [0.525, 0.531, 0.521],
-            [0.073, 0.071, 0.068],
-            [0.060, 0.071, 0.071],
-            [0.051, 0.057, 0.050]
-        ]
-    },
-
-    {
-        "system":       "Yandex Managed ClickHouse s3.3xlarge",
-        "system_full":       "Yandex Managed ClickHouse, s3.3xlarge, Cascade Lake 32 vCPU, 128 GB RAM, 12.5 TB local HDD",
-        "time":         "2020-01-14 00:00:00",
-        "kind": "cloud",
-        "result":
-        [
-            [0.049, 0.049, 0.045],
-            [0.297, 0.079, 0.068],
-            [0.350, 0.059, 0.065],
-            [1.099, 0.068, 0.064],
-            [0.120, 0.123, 0.117],
-            [1.847, 0.202, 0.191],
-            [0.124, 0.056, 0.060],
-            [0.062, 0.058, 0.055],
-            [0.681, 0.321, 0.312],
-            [0.346, 0.349, 0.368],
-            [0.200, 0.140, 0.145],
-            [0.227, 0.142, 0.152],
-            [0.447, 0.410, 0.414],
-            [0.499, 0.570, 0.487],
-            [0.658, 0.467, 0.465],
-            [0.587, 0.576, 0.580],
-            [1.376, 1.340, 1.290],
-            [0.746, 0.748, 0.717],
-            [3.608, 2.427, 2.455],
-            [0.073, 0.106, 0.076],
-            [9.138, 0.422, 0.386],
-            [0.615, 0.463, 0.449],
-            [12.166, 1.067, 1.094],
-            [13.856, 0.735, 0.548],
-            [0.194, 0.187, 0.179],
-            [0.145, 0.140, 0.151],
-            [0.185, 0.180, 0.182],
-            [0.493, 0.507, 0.498],
-            [9.379, 0.618, 0.617],
-            [1.182, 1.187, 1.268],
-            [1.088, 0.402, 0.407],
-            [3.943, 0.646, 0.538],
-            [4.547, 3.858, 4.407],
-            [13.240, 1.776, 1.808],
-            [1.760, 1.823, 1.918],
-            [0.719, 0.693, 0.729],
-            [0.346, 0.309, 0.279],
-            [0.151, 0.143, 0.134],
-            [0.191, 0.141, 0.149],
-            [0.804, 0.550, 0.686],
-            [0.147, 0.093, 0.086],
-            [0.099, 0.085, 0.084],
-            [0.056, 0.059, 0.057]
-        ]
-    }
-]
diff --git a/website/benchmark/versions/index.html b/website/benchmark/versions/index.html
deleted file mode 100644
index cce85934a9b..00000000000
--- a/website/benchmark/versions/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends 'templates/base.html' %}
-
-{% set title = 'Performance comparison of different ClickHouse versions' %}
-{% set extra_js = [
-    'queries.js?' + rev_short,
-    'results.js?' + rev_short,
-    '../benchmark.js?' + rev_short]
-%}
-{% set url = 'https://clickhouse.com/benchmark/versions/' %}
-{% set no_footer = True %}
-
-{% block content %}
-<div class="container-fluid py-3">
-
-<div class="row mb-3">
-    <div class="col d-flex align-items-center">
-        <a href="/" title="Main page" class="float-left mr-3">
-            <img src="/docs/images/logo.svg" alt="ClickHouse" />
-        </a>
-        <h1 class="h2 mb-0">{{ title }}</h1>
-    </div>
-</div>
-
-<div class="row mb-3">
-    <div id="selectors" class="col"></div>
-</div>
-
-<div class="row mb-3">
-    <div class="col">
-        <h2 class="h4 my-3">Relative query processing time <span class="text-muted">(lower is better)</span></h2>
-        <div id="diagram"></div>
-    </div>
-</div>
-
-<div class="row mb-3">
-    <div class="col">
-        <h2 class="h4 my-3">Full results</h2>
-        <div id="comparison_table"></div>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
-        <h2 class="h4 my-3">Comments</h2>
-        <p>Hardware used to run tests: x86_64 AWS m5.8xlarge Ubuntu 20.04.</p>
-        <p>Old versions had no support of this features/syntax: toISOWeek, SUBSTRING, EXTRACT, WITH. Queries were changed. All versions runs use same queries. </p>
-        <p>Star Schema Benchmark Patrick O'Neil, Elizabeth (Betty) O'Neil and Xuedong Chen. "The Star Schema Benchmark," Online Publication of Database Generation program., January 2007. <a href="http://www.cs.umb.edu/~poneil/StarSchemaB.pdf">http://www.cs.umb.edu/~poneil/StarSchemaB.pdf</a></p>
-    <br/>
-</p>
-    </div>
-</div>
-{% endblock %}
diff --git a/website/benchmark/versions/queries.js b/website/benchmark/versions/queries.js
deleted file mode 100644
index f2de5a3c95a..00000000000
--- a/website/benchmark/versions/queries.js
+++ /dev/null
@@ -1,291 +0,0 @@
-var current_data_size = 0;
-
-var current_systems = [];
-
-var queries =
-    [
-        {
-            "query": "SELECT machine_name, MIN(cpu) AS cpu_min, MAX(cpu) AS cpu_max, AVG(cpu) AS cpu_avg, MIN(net_in) AS net_in_min, MAX(net_in) AS net_in_max, AVG(net_in) AS net_in_avg, MIN(net_out) AS net_out_min, MAX(net_out) AS net_out_max, AVG(net_out) AS net_out_avg FROM ( SELECT machine_name, ifNull(cpu_user, 0.0) AS cpu, ifNull(bytes_in, 0.0) AS net_in, ifNull(bytes_out, 0.0) AS net_out FROM mgbench.logs1 WHERE machine_name IN ('anansi','aragog','urd') AND log_time >= toDateTime('2017-01-11 00:00:00')) AS r GROUP BY machine_name;",
-            "comment": "Q1.1: What is the CPU/network utilization for each web server since midnight?",
-        },
-        {
-            "query": "SELECT machine_name, log_time FROM mgbench.logs1 WHERE (machine_name LIKE 'cslab%' OR machine_name LIKE 'mslab%') AND load_one IS NULL AND log_time >= toDateTime('2017-01-10 00:00:00') ORDER BY machine_name, log_time;",
-            "comment": "Q1.2: Which computer lab machines have been offline in the past day?",
-        },
-        {
-            "query": "SELECT dt, hr, AVG(load_fifteen) AS load_fifteen_avg, AVG(load_five) AS load_five_avg, AVG(load_one) AS load_one_avg, AVG(mem_free) AS mem_free_avg, AVG(swap_free) AS swap_free_avg FROM ( SELECT CAST(log_time AS DATE) AS dt, toHour(log_time) AS hr, load_fifteen, load_five, load_one, mem_free, swap_free FROM mgbench.logs1 WHERE machine_name = 'babbage' AND load_fifteen IS NOT NULL AND load_five IS NOT NULL AND load_one IS NOT NULL AND mem_free IS NOT NULL AND swap_free IS NOT NULL AND log_time >= toDateTime('2017-01-01 00:00:00')) AS r GROUP BY dt, hr ORDER BY dt, hr;",
-            "comment": "Q1.3: What are the hourly average metrics during the past 10 days for a specific workstation?",
-        },
-        {
-            "query": "SELECT machine_name, COUNT(*) AS spikes FROM mgbench.logs1 WHERE machine_group = 'Servers' AND cpu_wio > 0.99 AND log_time >= toDateTime('2016-12-01 00:00:00') AND log_time < toDateTime('2017-01-01 00:00:00') GROUP BY machine_name ORDER BY spikes DESC LIMIT 10;",
-            "comment": "Q1.4: Over 1 month, how often was each server blocked on disk I/O?",
-        },
-        {
-            "query": "SELECT machine_name, dt, MIN(mem_free) AS mem_free_min FROM ( SELECT machine_name, CAST(log_time AS DATE) AS dt, mem_free FROM mgbench.logs1 WHERE machine_group = 'DMZ' AND mem_free IS NOT NULL ) AS r GROUP BY machine_name, dt HAVING MIN(mem_free) < 10000 ORDER BY machine_name, dt;",
-            "comment": "Q1.5: Which externally reachable VMs have run low on memory?",
-        },
-        {
-            "query": "SELECT dt, hr, SUM(net_in) AS net_in_sum, SUM(net_out) AS net_out_sum, SUM(net_in) + SUM(net_out) AS both_sum FROM ( SELECT CAST(log_time AS DATE) AS dt, toHour(log_time) AS hr, ifNull(bytes_in, 0.0) / 1000000000.0 AS net_in, ifNull(bytes_out, 0.0) / 1000000000.0 AS net_out FROM mgbench.logs1 WHERE machine_name IN ('allsorts','andes','bigred','blackjack','bonbon','cadbury','chiclets','cotton','crows','dove','fireball','hearts','huey','lindt','milkduds','milkyway','mnm','necco','nerds','orbit','peeps','poprocks','razzles','runts','smarties','smuggler','spree','stride','tootsie','trident','wrigley','york') ) AS r GROUP BY dt, hr ORDER BY both_sum DESC LIMIT 10;",
-            "comment": "Q1.6: What is the total hourly network traffic across all file servers?",
-        },
-        {
-            "query": "SELECT * FROM mgbench.logs2 WHERE status_code >= 500 AND log_time >= toDateTime('2012-12-18 00:00:00') ORDER BY log_time;",
-            "comment": "Q2.1: Which requests have caused server errors within the past 2 weeks?",
-        },
-        {
-            "query": "SELECT * FROM mgbench.logs2 WHERE status_code >= 200 AND status_code < 300 AND request LIKE '%/etc/passwd%' AND log_time >= toDateTime('2012-05-06 00:00:00') AND log_time < toDateTime('2012-05-20 00:00:00');",
-            "comment": "Q2.3: What was the average path depth for top-level requests in the past month?",
-        },
-        {
-            "query": "SELECT top_level, AVG(length(request) - length(replaceOne(request, '/',''))) AS depth_avg FROM ( SELECT substring(request, 1, len) AS top_level, request FROM ( SELECT position('/', substring(request, 2)) AS len, request FROM mgbench.logs2 WHERE status_code >= 200 AND status_code < 300 AND log_time >= toDateTime('2012-12-01 00:00:00')) AS r WHERE len > 0 ) AS s WHERE top_level IN ('/about','/courses','/degrees','/events','/grad','/industry','/news','/people','/publications','/research','/teaching','/ugrad') GROUP BY top_level ORDER BY top_level;",
-            "comment": "Q2.2: During a specific 2-week period, was the user password file leaked?",
-        },
-        {
-            "query": "SELECT client_ip, COUNT(*) AS num_requests FROM mgbench.logs2 WHERE log_time >= toDateTime('2012-10-01 00:00:00') GROUP BY client_ip HAVING COUNT(*) >= 100000 ORDER BY num_requests DESC;",
-            "comment": "Q2.4: During the last 3 months, which clients have made an excessive number of requests?",
-        },
-        {
-            "query": "SELECT dt, COUNT(DISTINCT client_ip) FROM ( SELECT CAST(log_time AS DATE) AS dt, client_ip FROM mgbench.logs2) AS r GROUP BY dt ORDER BY dt;",
-            "comment": "Q2.5: What are the daily unique visitors?",
-        },
-        {
-            "query": "SELECT AVG(transfer) / 125000000.0 AS transfer_avg, MAX(transfer) / 125000000.0 AS transfer_max FROM ( SELECT log_time, SUM(object_size) AS transfer FROM mgbench.logs2 GROUP BY log_time) AS r;",
-            "comment": "Q2.6: What are the average and maximum data transfer rates (Gbps)?",
-        },
-        {
-            "query": "SELECT * FROM mgbench.logs3 WHERE event_type = 'temperature' AND event_value <= 32.0 AND log_time >= '2019-11-29 17:00:00';",
-            "comment": "Q3.1: Did the indoor temperature reach freezing over the weekend?",
-        },
-        {
-            "query": "SELECT device_name, device_floor, COUNT(*) AS ct FROM mgbench.logs3 WHERE event_type = 'door_open' AND log_time >= '2019-06-01 00:00:00' GROUP BY device_name, device_floor ORDER BY ct DESC;",
-            "comment": "Q3.4: Over the past 6 months, how frequently were each door opened?",
-        },
-        {
-            "query": "SELECT yr, mo, SUM(coffee_hourly_avg) AS coffee_monthly_sum, AVG(coffee_hourly_avg) AS coffee_monthly_avg, SUM(printer_hourly_avg) AS printer_monthly_sum, AVG(printer_hourly_avg) AS printer_monthly_avg, SUM(projector_hourly_avg) AS projector_monthly_sum, AVG(projector_hourly_avg) AS projector_monthly_avg, SUM(vending_hourly_avg) AS vending_monthly_sum, AVG(vending_hourly_avg) AS vending_monthly_avg FROM ( SELECT dt, yr, mo, hr, AVG(coffee) AS coffee_hourly_avg, AVG(printer) AS printer_hourly_avg, AVG(projector) AS projector_hourly_avg, AVG(vending) AS vending_hourly_avg FROM ( SELECT CAST(log_time AS DATE) AS dt, toYear(log_time) AS yr, EXTRACT(MONTH FROM log_time) AS mo, toHour(log_time) AS hr, CASE WHEN device_name LIKE 'coffee%' THEN event_value END AS coffee, CASE WHEN device_name LIKE 'printer%' THEN event_value END AS printer, CASE WHEN device_name LIKE 'projector%' THEN event_value END AS projector, CASE WHEN device_name LIKE 'vending%' THEN event_value END AS vending FROM mgbench.logs3 WHERE device_type = 'meter' ) AS r GROUP BY dt, yr, mo, hr ) AS s GROUP BY yr, mo ORDER BY yr, mo;",
-            "comment": " -- Q3.6: For each device category, what are the monthly power consumption metrics?",
-        },
-        {
-            "query": "SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE F_YEAR = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;",
-            "comment": " -- Q1.1",
-        },
-        {
-            "query": "SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toYYYYMM(LO_ORDERDATE) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35;",
-            "comment": " -- Q1.2",
-        },
-        {
-            "query": "SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toRelativeWeekNum(LO_ORDERDATE) - toRelativeWeekNum(toDate('1994-01-01')) = 6 AND F_YEAR = 1994 AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35;",
-            "comment": " -- Q1.3",
-        },
-        {
-            "query": "SELECT sum(LO_REVENUE), F_YEAR AS year, P_BRAND FROM lineorder_flat WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA' GROUP BY year, P_BRAND ORDER BY year, P_BRAND;",
-            "comment": " -- Q2.1",
-        },
-        {
-            "query": "SELECT sum(LO_REVENUE), F_YEAR AS year, P_BRAND FROM lineorder_flat WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA' GROUP BY year, P_BRAND ORDER BY year, P_BRAND;",
-            "comment": " -- Q2.2",
-        },
-        {
-            "query": "SELECT sum(LO_REVENUE), F_YEAR AS year, P_BRAND FROM lineorder_flat WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE' GROUP BY year, P_BRAND ORDER BY year, P_BRAND;",
-            "comment": " -- Q2.3",
-        },
-        {
-            "query": "SELECT C_NATION, S_NATION, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997 GROUP BY C_NATION, S_NATION, year ORDER BY year ASC, revenue DESC;",
-            "comment": " -- Q3.1",
-        },
-        {
-            "query": "SELECT C_CITY, S_CITY, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997 GROUP BY C_CITY, S_CITY, year ORDER BY year ASC, revenue DESC;",
-            "comment": " -- Q3.2",
-        },
-        {
-            "query": "SELECT C_CITY, S_CITY, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997 GROUP BY C_CITY, S_CITY, year ORDER BY year ASC, revenue DESC;",
-            "comment": " -- Q3.3",
-        },
-        {
-            "query": "SELECT C_CITY, S_CITY, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND toYYYYMM(LO_ORDERDATE) = 199712 GROUP BY C_CITY, S_CITY, year ORDER BY year ASC, revenue DESC;",
-            "comment": " -- Q3.4",
-        },
-        {
-            "query": "SELECT F_YEAR AS year, C_NATION, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year, C_NATION ORDER BY year ASC, C_NATION ASC;",
-            "comment": " -- Q4.1",
-        },
-        {
-            "query": "SELECT F_YEAR AS year, S_NATION, P_CATEGORY, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year, S_NATION, P_CATEGORY ORDER BY year ASC, S_NATION ASC, P_CATEGORY ASC;",
-            "comment": " -- Q4.2",
-        },
-        {
-            "query": "SELECT F_YEAR AS year, S_CITY, P_BRAND, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14' GROUP BY year, S_CITY, P_BRAND ORDER BY year ASC, S_CITY ASC, P_BRAND ASC;",
-            "comment": " -- Q4.",
-        },
-        {
-            "query": "SELECT count() FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT count() FROM hits WHERE AdvEngineID != 0",
-            "comment": "",
-        },
-        {
-            "query": "SELECT sum(AdvEngineID), count(), avg(ResolutionWidth) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT sum(UserID) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT uniq(UserID) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT uniq(SearchPhrase) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT min(EventDate), max(EventDate) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT AdvEngineID, count() FROM hits WHERE AdvEngineID != 0 GROUP BY AdvEngineID ORDER BY count() DESC",
-            "comment": "",
-        },
-        {
-            "query": "SELECT RegionID, uniq(UserID) AS u FROM hits GROUP BY RegionID ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT RegionID, sum(AdvEngineID), count() AS c, avg(ResolutionWidth), uniq(UserID) FROM hits GROUP BY RegionID ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT MobilePhoneModel, uniq(UserID) AS u FROM hits WHERE MobilePhoneModel != '' GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT MobilePhone, MobilePhoneModel, uniq(UserID) AS u FROM hits WHERE MobilePhoneModel != '' GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, count() AS c FROM hits WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, uniq(UserID) AS u FROM hits WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchEngineID, SearchPhrase, count() AS c FROM hits WHERE SearchPhrase != '' GROUP BY SearchEngineID, SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, count() FROM hits GROUP BY UserID ORDER BY count() DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, SearchPhrase, count() FROM hits GROUP BY UserID, SearchPhrase ORDER BY count() DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, SearchPhrase, count() FROM hits GROUP BY UserID, SearchPhrase LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID, toMinute(EventTime) AS m, SearchPhrase, count() FROM hits GROUP BY UserID, m, SearchPhrase ORDER BY count() DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT UserID FROM hits WHERE UserID = 12345678901234567890",
-            "comment": "",
-        },
-        {
-            "query": "SELECT count() FROM hits WHERE URL LIKE '%metrika%'",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, any(URL), count() AS c FROM hits WHERE URL LIKE '%metrika%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase, any(URL), any(Title), count() AS c, uniq(UserID) FROM hits WHERE Title LIKE '%Яндекс%' AND URL NOT LIKE '%.yandex.%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT * FROM hits WHERE URL LIKE '%metrika%' ORDER BY EventTime LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase FROM hits WHERE SearchPhrase != '' ORDER BY EventTime LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase FROM hits WHERE SearchPhrase != '' ORDER BY SearchPhrase LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchPhrase FROM hits WHERE SearchPhrase != '' ORDER BY EventTime, SearchPhrase LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT CounterID, avg(length(URL)) AS l, count() AS c FROM hits WHERE URL != '' GROUP BY CounterID HAVING c > 100000 ORDER BY l DESC LIMIT 25",
-            "comment": "",
-        },
-        {
-            "query": "SELECT domainWithoutWWW(Referer) AS key, avg(length(Referer)) AS l, count() AS c, any(Referer) FROM hits WHERE Referer != '' GROUP BY key HAVING c > 100000 ORDER BY l DESC LIMIT 25",
-            "comment": "",
-        },
-        {
-            "query": "SELECT sum(ResolutionWidth), sum(ResolutionWidth + 1), sum(ResolutionWidth + 2), sum(ResolutionWidth + 3), sum(ResolutionWidth + 4), sum(ResolutionWidth + 5), sum(ResolutionWidth + 6), sum(ResolutionWidth + 7), sum(ResolutionWidth + 8), sum(ResolutionWidth + 9), sum(ResolutionWidth + 10), sum(ResolutionWidth + 11), sum(ResolutionWidth + 12), sum(ResolutionWidth + 13), sum(ResolutionWidth + 14), sum(ResolutionWidth + 15), sum(ResolutionWidth + 16), sum(ResolutionWidth + 17), sum(ResolutionWidth + 18), sum(ResolutionWidth + 19), sum(ResolutionWidth + 20), sum(ResolutionWidth + 21), sum(ResolutionWidth + 22), sum(ResolutionWidth + 23), sum(ResolutionWidth + 24), sum(ResolutionWidth + 25), sum(ResolutionWidth + 26), sum(ResolutionWidth + 27), sum(ResolutionWidth + 28), sum(ResolutionWidth + 29), sum(ResolutionWidth + 30), sum(ResolutionWidth + 31), sum(ResolutionWidth + 32), sum(ResolutionWidth + 33), sum(ResolutionWidth + 34), sum(ResolutionWidth + 35), sum(ResolutionWidth + 36), sum(ResolutionWidth + 37), sum(ResolutionWidth + 38), sum(ResolutionWidth + 39), sum(ResolutionWidth + 40), sum(ResolutionWidth + 41), sum(ResolutionWidth + 42), sum(ResolutionWidth + 43), sum(ResolutionWidth + 44), sum(ResolutionWidth + 45), sum(ResolutionWidth + 46), sum(ResolutionWidth + 47), sum(ResolutionWidth + 48), sum(ResolutionWidth + 49), sum(ResolutionWidth + 50), sum(ResolutionWidth + 51), sum(ResolutionWidth + 52), sum(ResolutionWidth + 53), sum(ResolutionWidth + 54), sum(ResolutionWidth + 55), sum(ResolutionWidth + 56), sum(ResolutionWidth + 57), sum(ResolutionWidth + 58), sum(ResolutionWidth + 59), sum(ResolutionWidth + 60), sum(ResolutionWidth + 61), sum(ResolutionWidth + 62), sum(ResolutionWidth + 63), sum(ResolutionWidth + 64), sum(ResolutionWidth + 65), sum(ResolutionWidth + 66), sum(ResolutionWidth + 67), sum(ResolutionWidth + 68), sum(ResolutionWidth + 69), sum(ResolutionWidth + 70), sum(ResolutionWidth + 71), sum(ResolutionWidth + 72), sum(ResolutionWidth + 73), sum(ResolutionWidth + 74), sum(ResolutionWidth + 75), sum(ResolutionWidth + 76), sum(ResolutionWidth + 77), sum(ResolutionWidth + 78), sum(ResolutionWidth + 79), sum(ResolutionWidth + 80), sum(ResolutionWidth + 81), sum(ResolutionWidth + 82), sum(ResolutionWidth + 83), sum(ResolutionWidth + 84), sum(ResolutionWidth + 85), sum(ResolutionWidth + 86), sum(ResolutionWidth + 87), sum(ResolutionWidth + 88), sum(ResolutionWidth + 89) FROM hits",
-            "comment": "",
-        },
-        {
-            "query": "SELECT SearchEngineID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM hits WHERE SearchPhrase != '' GROUP BY SearchEngineID, ClientIP ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT WatchID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM hits WHERE SearchPhrase != '' GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT WatchID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM hits GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT URL, count() AS c FROM hits GROUP BY URL ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT 1, URL, count() AS c FROM hits GROUP BY 1, URL ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT ClientIP AS x, x - 1, x - 2, x - 3, count() AS c FROM hits GROUP BY x, x - 1, x - 2, x - 3 ORDER BY c DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    URL,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT DontCountHits    AND NOT Refresh    AND notEmpty(URL) GROUP BY URL ORDER BY PageViews DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    Title,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT DontCountHits    AND NOT Refresh    AND notEmpty(Title) GROUP BY Title ORDER BY PageViews DESC LIMIT 10",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    URL,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh    AND IsLink    AND NOT IsDownload GROUP BY URL ORDER BY PageViews DESC LIMIT 1000",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    TraficSourceID,    SearchEngineID,    AdvEngineID,    ((SearchEngineID = 0 AND AdvEngineID = 0) ? Referer : '') AS Src,    URL AS Dst,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh GROUP BY    TraficSourceID,    SearchEngineID,    AdvEngineID,    Src,    Dst ORDER BY PageViews DESC LIMIT 1000",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    URLHash,    EventDate,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh    AND TraficSourceID IN (-1, 6)    AND RefererHash = halfMD5('http://yandex.ru/') GROUP BY    URLHash,    EventDate ORDER BY PageViews DESC LIMIT 100",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    WindowClientWidth,    WindowClientHeight,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-31')    AND NOT Refresh    AND NOT DontCountHits    AND URLHash = halfMD5('http://yandex.ru/') GROUP BY    WindowClientWidth,    WindowClientHeight ORDER BY PageViews DESC LIMIT 10000;",
-            "comment": "",
-        },
-        {
-            "query": "SELECT    toStartOfMinute(EventTime) AS Minute,    count() AS PageViews FROM hits WHERE    CounterID = 62    AND EventDate >= toDate('2013-07-01')    AND EventDate <= toDate('2013-07-02')    AND NOT Refresh    AND NOT DontCountHits GROUP BY    Minute ORDER BY Minute;",
-            "comment": "",
-        }
-    ];
diff --git a/website/benchmark/versions/results/1.1.54378.json b/website/benchmark/versions/results/1.1.54378.json
deleted file mode 100644
index 987d4d50231..00000000000
--- a/website/benchmark/versions/results/1.1.54378.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-04-16 1.1.54378",
-        "system_full":  "ClickHouse 1.1.54378 2018-04-16",
-        "version":      "1.1.54378",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.099, 0.017, 0.014],
-[0.176, 0.005, 0.005],
-[0.818, 0.018, 0.016],
-[0.163, 0.011, 0.011],
-[0.264, 0.039, 0.031],
-[1.025, 0.026, 0.024],
-[0.076, 0.004, 0.003],
-[0.335, 0.018, 0.018],
-[0.511, 0.034, 0.034],
-[0.541, 0.090, 0.088],
-[1.881, 0.506, 0.497],
-[1.515, 0.546, 0.495],
-[0.033, 0.003, 0.003],
-[0.034, 0.016, 0.016],
-[0.123, 0.105, 0.103],
-[3.318, 0.090, 0.088],
-[2.609, 0.146, 0.145],
-[3.887, 0.067, 0.066],
-[1.417, 0.067, 0.065],
-[7.034, 0.332, 0.328],
-[4.289, 0.177, 0.176],
-[1.773, 0.204, 0.214],
-[63.407, 2.564, 2.490],
-[42.496, 2.011, 1.993],
-[4.502, 0.218, 0.216],
-[1.952, 0.120, 0.121],
-[0.474, 0.059, 0.062],
-[6.655, 0.106, 0.101],
-[0.044, 0.010, 0.010],
-[0.042, 0.007, 0.007],
-[0.480, 0.060, 0.056],
-[1.684, 0.042, 0.039],
-[1.721, 0.091, 0.091],
-[2.587, 0.207, 0.206],
-[0.067, 0.044, 0.044],
-[0.027, 0.008, 0.007],
-[2.282, 0.428, 0.425],
-[2.273, 0.501, 0.500],
-[1.072, 0.133, 0.133],
-[1.717, 0.163, 0.163],
-[2.604, 0.431, 0.418],
-[3.794, 0.546, 0.545],
-[2.398, 0.538, 0.585],
-[1.272, 0.564, 0.534],
-[4.313, 1.445, 1.481],
-[3.711, 0.860, 0.831],
-[8.169, 3.717, 3.386],
-[0.962, 0.029, 0.028],
-[18.979, 0.538, 0.533],
-[20.836, 0.642, 0.667],
-[38.657, 1.461, 1.388],
-[29.873, 0.735, 0.675],
-[4.756, 0.189, 0.188],
-[2.304, 0.161, 0.161],
-[5.272, 0.196, 0.195],
-[18.616, 0.557, 0.552],
-[15.437, 1.136, 1.125],
-[2.560, 2.523, 2.497],
-[3.912, 0.561, 0.557],
-[9.879, 0.774, 0.793],
-[9.665, 4.632, 4.677],
-[18.892, 2.283, 2.142],
-[18.894, 2.264, 2.160],
-[0.953, 0.921, 0.915],
-[0.099, 0.075, 0.076],
-[0.055, 0.038, 0.037],
-[0.055, 0.033, 0.031],
-[0.202, 0.159, 0.159],
-[0.038, 0.011, 0.011],
-[0.023, 0.009, 0.009],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/1.1.54394.json b/website/benchmark/versions/results/1.1.54394.json
deleted file mode 100644
index b88336c2fcd..00000000000
--- a/website/benchmark/versions/results/1.1.54394.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-07-12 1.1.54394",
-        "system_full":  "ClickHouse 1.1.54394 2018-07-12",
-        "version":      "1.1.54394",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.141, 0.016, 0.014],
-[0.152, 0.005, 0.005],
-[0.820, 0.018, 0.016],
-[0.161, 0.011, 0.011],
-[0.266, 0.033, 0.032],
-[1.024, 0.026, 0.024],
-[0.076, 0.004, 0.003],
-[0.335, 0.017, 0.017],
-[0.508, 0.033, 0.032],
-[0.553, 0.090, 0.090],
-[1.839, 0.501, 0.497],
-[1.519, 0.490, 0.513],
-[0.035, 0.003, 0.003],
-[0.033, 0.015, 0.015],
-[0.116, 0.135, 0.105],
-[3.324, 0.088, 0.085],
-[2.614, 0.145, 0.144],
-[3.882, 0.068, 0.066],
-[1.421, 0.067, 0.066],
-[7.042, 0.315, 0.312],
-[4.326, 0.170, 0.168],
-[1.810, 0.205, 0.198],
-[63.409, 2.479, 2.463],
-[42.496, 1.974, 1.963],
-[4.501, 0.223, 0.211],
-[1.947, 0.115, 0.114],
-[0.488, 0.058, 0.060],
-[6.636, 0.103, 0.099],
-[0.050, 0.010, 0.010],
-[0.043, 0.007, 0.006],
-[0.482, 0.055, 0.055],
-[1.669, 0.040, 0.041],
-[1.713, 0.093, 0.091],
-[2.563, 0.201, 0.202],
-[0.064, 0.041, 0.041],
-[0.028, 0.007, 0.007],
-[2.305, 0.425, 0.424],
-[2.270, 0.502, 0.506],
-[1.070, 0.139, 0.138],
-[1.689, 0.166, 0.165],
-[2.616, 0.447, 0.459],
-[3.835, 0.562, 0.540],
-[2.452, 0.581, 0.560],
-[1.282, 0.540, 0.544],
-[4.321, 1.565, 1.467],
-[3.678, 0.811, 0.812],
-[8.241, 3.565, 3.693],
-[0.961, 0.028, 0.027],
-[18.976, 0.509, 0.482],
-[20.838, 0.601, 0.737],
-[38.809, 1.514, 1.353],
-[29.889, 0.690, 0.628],
-[4.546, 0.190, 0.188],
-[2.314, 0.163, 0.165],
-[5.264, 0.197, 0.193],
-[18.615, 0.527, 0.516],
-[15.439, 1.156, 1.138],
-[2.552, 2.521, 2.509],
-[3.918, 0.566, 0.557],
-[9.883, 0.790, 0.794],
-[9.662, 4.592, 4.830],
-[18.976, 2.262, 2.254],
-[18.926, 2.132, 2.173],
-[0.945, 0.918, 0.921],
-[0.099, 0.074, 0.074],
-[0.053, 0.038, 0.038],
-[0.052, 0.030, 0.030],
-[0.199, 0.156, 0.155],
-[0.038, 0.011, 0.011],
-[0.023, 0.009, 0.009],
-[0.011, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.01.0.json b/website/benchmark/versions/results/18.01.0.json
deleted file mode 100644
index 15ed8360b47..00000000000
--- a/website/benchmark/versions/results/18.01.0.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-07-20 18.1",
-        "system_full":  "ClickHouse 18.1.0 2018-07-20",
-        "version":      "18.1.0",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.130, 0.015, 0.013],
-[0.139, 0.005, 0.005],
-[0.822, 0.017, 0.016],
-[0.160, 0.011, 0.010],
-[0.263, 0.051, 0.059],
-[0.994, 0.025, 0.024],
-[0.076, 0.004, 0.004],
-[0.334, 0.017, 0.017],
-[0.507, 0.031, 0.030],
-[0.553, 0.087, 0.084],
-[1.867, 0.486, 0.484],
-[1.528, 0.493, 0.493],
-[0.034, 0.003, 0.003],
-[0.033, 0.015, 0.015],
-[0.117, 0.099, 0.099],
-[3.353, 0.087, 0.086],
-[2.632, 0.145, 0.144],
-[3.913, 0.067, 0.065],
-[1.433, 0.063, 0.062],
-[7.058, 0.303, 0.301],
-[4.355, 0.163, 0.161],
-[1.826, 0.187, 0.212],
-[63.427, 2.395, 2.319],
-[42.481, 1.974, 1.956],
-[4.485, 0.213, 0.218],
-[1.945, 0.123, 0.116],
-[0.445, 0.056, 0.055],
-[6.633, 0.102, 0.099],
-[0.047, 0.010, 0.010],
-[0.044, 0.007, 0.007],
-[0.479, 0.055, 0.055],
-[1.695, 0.040, 0.039],
-[1.731, 0.092, 0.095],
-[2.547, 0.197, 0.192],
-[0.061, 0.041, 0.041],
-[0.025, 0.007, 0.007],
-[2.289, 0.429, 0.426],
-[2.240, 0.506, 0.502],
-[1.062, 0.128, 0.126],
-[1.688, 0.155, 0.155],
-[2.571, 0.456, 0.423],
-[3.814, 0.538, 0.546],
-[2.467, 0.563, 0.531],
-[1.263, 0.545, 0.553],
-[4.303, 1.526, 1.539],
-[3.667, 0.911, 0.922],
-[8.280, 3.588, 3.559],
-[0.938, 0.028, 0.027],
-[18.975, 0.519, 0.513],
-[20.851, 0.588, 0.724],
-[38.765, 1.508, 1.345],
-[29.904, 0.684, 0.648],
-[4.591, 0.180, 0.175],
-[2.350, 0.151, 0.150],
-[5.295, 0.185, 0.185],
-[18.635, 0.520, 0.512],
-[15.431, 1.169, 1.144],
-[2.543, 2.542, 2.504],
-[3.918, 0.545, 0.540],
-[9.879, 0.781, 0.765],
-[9.687, 4.567, 4.636],
-[18.949, 2.314, 2.136],
-[18.946, 2.168, 2.227],
-[0.950, 0.902, 0.934],
-[0.098, 0.073, 0.075],
-[0.056, 0.038, 0.037],
-[0.055, 0.030, 0.030],
-[0.205, 0.157, 0.155],
-[0.037, 0.011, 0.011],
-[0.022, 0.009, 0.009],
-[0.011, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.04.0.json b/website/benchmark/versions/results/18.04.0.json
deleted file mode 100644
index 65f41e6b9a4..00000000000
--- a/website/benchmark/versions/results/18.04.0.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-07-28 18.4",
-        "system_full":  "ClickHouse 18.4.0 2018-07-28",
-        "version":      "18.4.0",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.145, 0.015, 0.013],
-[0.042, 0.006, 0.005],
-[0.662, 0.016, 0.015],
-[0.161, 0.011, 0.010],
-[0.268, 0.030, 0.029],
-[1.026, 0.025, 0.023],
-[0.076, 0.004, 0.003],
-[0.334, 0.018, 0.018],
-[0.501, 0.031, 0.031],
-[0.551, 0.089, 0.086],
-[1.893, 0.495, 0.489],
-[1.521, 0.506, 0.479],
-[0.033, 0.003, 0.003],
-[0.032, 0.015, 0.015],
-[0.163, 0.131, 0.103],
-[3.347, 0.090, 0.087],
-[2.623, 0.145, 0.146],
-[3.895, 0.068, 0.067],
-[1.421, 0.063, 0.064],
-[7.053, 0.307, 0.304],
-[4.320, 0.159, 0.159],
-[1.811, 0.194, 0.200],
-[63.418, 2.390, 2.315],
-[42.482, 1.944, 1.934],
-[4.507, 0.213, 0.210],
-[1.947, 0.116, 0.119],
-[0.481, 0.057, 0.056],
-[6.653, 0.100, 0.098],
-[0.045, 0.010, 0.010],
-[0.043, 0.007, 0.007],
-[0.481, 0.054, 0.055],
-[1.683, 0.043, 0.044],
-[1.732, 0.092, 0.091],
-[2.570, 0.192, 0.193],
-[0.056, 0.039, 0.039],
-[0.025, 0.007, 0.007],
-[2.313, 0.428, 0.426],
-[2.253, 0.497, 0.498],
-[1.076, 0.121, 0.121],
-[1.728, 0.148, 0.149],
-[2.579, 0.444, 0.414],
-[3.796, 0.532, 0.531],
-[2.427, 0.556, 0.563],
-[1.267, 0.544, 0.542],
-[4.314, 1.538, 1.516],
-[3.662, 0.804, 0.869],
-[8.244, 3.696, 3.698],
-[0.956, 0.028, 0.027],
-[18.975, 0.514, 0.507],
-[20.853, 0.583, 0.726],
-[38.834, 1.380, 1.363],
-[29.884, 0.675, 0.640],
-[4.554, 0.175, 0.173],
-[2.360, 0.147, 0.145],
-[5.300, 0.179, 0.179],
-[18.661, 0.514, 0.505],
-[15.432, 1.161, 1.153],
-[2.528, 2.542, 2.512],
-[3.929, 0.543, 0.533],
-[9.838, 0.765, 0.761],
-[9.589, 4.506, 4.642],
-[18.961, 2.245, 2.185],
-[18.935, 2.127, 2.154],
-[0.950, 0.913, 0.889],
-[0.098, 0.072, 0.072],
-[0.054, 0.037, 0.037],
-[0.054, 0.030, 0.030],
-[0.203, 0.153, 0.158],
-[0.037, 0.011, 0.011],
-[0.023, 0.009, 0.009],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.05.1.json b/website/benchmark/versions/results/18.05.1.json
deleted file mode 100644
index 3d58829d607..00000000000
--- a/website/benchmark/versions/results/18.05.1.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-07-31 18.5",
-        "system_full":  "ClickHouse 18.5.1 2018-07-31",
-        "version":      "18.5.1",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.130, 0.015, 0.013],
-[0.147, 0.005, 0.005],
-[0.819, 0.017, 0.015],
-[0.162, 0.011, 0.011],
-[0.263, 0.040, 0.054],
-[1.003, 0.025, 0.023],
-[0.076, 0.004, 0.003],
-[0.335, 0.017, 0.017],
-[0.509, 0.032, 0.031],
-[0.551, 0.095, 0.087],
-[1.829, 0.489, 0.496],
-[1.510, 0.518, 0.492],
-[0.035, 0.003, 0.003],
-[0.032, 0.015, 0.015],
-[0.122, 0.127, 0.101],
-[3.329, 0.090, 0.087],
-[2.609, 0.143, 0.141],
-[3.895, 0.067, 0.066],
-[1.433, 0.064, 0.064],
-[7.038, 0.307, 0.305],
-[4.335, 0.160, 0.160],
-[1.817, 0.216, 0.214],
-[63.378, 2.378, 2.313],
-[42.494, 1.940, 1.929],
-[4.510, 0.212, 0.209],
-[1.955, 0.119, 0.117],
-[0.496, 0.058, 0.056],
-[6.639, 0.100, 0.097],
-[0.046, 0.010, 0.010],
-[0.044, 0.007, 0.006],
-[0.525, 0.055, 0.056],
-[1.739, 0.043, 0.041],
-[1.749, 0.091, 0.091],
-[2.566, 0.193, 0.189],
-[0.061, 0.041, 0.041],
-[0.026, 0.007, 0.007],
-[2.331, 0.427, 0.426],
-[2.279, 0.504, 0.502],
-[1.054, 0.122, 0.121],
-[1.735, 0.149, 0.150],
-[2.649, 0.426, 0.415],
-[3.799, 0.552, 0.564],
-[2.437, 0.573, 0.522],
-[1.255, 0.532, 0.556],
-[4.340, 1.534, 1.446],
-[3.647, 0.811, 0.846],
-[8.212, 3.519, 3.542],
-[0.951, 0.028, 0.027],
-[18.978, 0.661, 0.508],
-[20.848, 0.583, 0.575],
-[38.808, 1.432, 1.348],
-[29.875, 0.679, 0.651],
-[4.778, 0.176, 0.174],
-[2.370, 0.148, 0.146],
-[5.302, 0.186, 0.178],
-[18.666, 0.522, 0.514],
-[15.419, 1.157, 1.141],
-[2.527, 2.526, 2.513],
-[3.948, 0.539, 0.544],
-[9.857, 0.772, 0.750],
-[9.827, 4.565, 4.514],
-[18.957, 2.301, 2.151],
-[18.952, 2.147, 2.239],
-[0.940, 0.897, 0.907],
-[0.099, 0.072, 0.073],
-[0.055, 0.037, 0.037],
-[0.054, 0.030, 0.029],
-[0.193, 0.155, 0.152],
-[0.035, 0.011, 0.010],
-[0.023, 0.009, 0.009],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.06.0.json b/website/benchmark/versions/results/18.06.0.json
deleted file mode 100644
index d033aabc4f2..00000000000
--- a/website/benchmark/versions/results/18.06.0.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-08-01 18.6",
-        "system_full":  "ClickHouse 18.6.0 2018-08-01",
-        "version":      "18.6.0",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.125, 0.014, 0.013],
-[0.156, 0.005, 0.005],
-[0.818, 0.016, 0.015],
-[0.162, 0.011, 0.011],
-[0.265, 0.044, 0.031],
-[1.023, 0.025, 0.023],
-[0.076, 0.004, 0.004],
-[0.335, 0.019, 0.017],
-[0.508, 0.032, 0.031],
-[0.551, 0.088, 0.086],
-[1.844, 0.493, 0.491],
-[1.520, 0.485, 0.492],
-[0.035, 0.003, 0.003],
-[0.033, 0.015, 0.015],
-[0.155, 0.109, 0.129],
-[3.314, 0.090, 0.088],
-[2.611, 0.144, 0.142],
-[3.902, 0.066, 0.065],
-[1.423, 0.064, 0.062],
-[7.049, 0.304, 0.330],
-[4.330, 0.159, 0.158],
-[1.834, 0.193, 0.176],
-[63.516, 2.328, 2.310],
-[42.645, 1.945, 1.913],
-[4.521, 0.212, 0.217],
-[1.923, 0.112, 0.114],
-[0.479, 0.056, 0.055],
-[6.627, 0.101, 0.097],
-[0.047, 0.010, 0.009],
-[0.043, 0.007, 0.006],
-[0.482, 0.058, 0.055],
-[1.693, 0.043, 0.043],
-[1.744, 0.098, 0.093],
-[2.565, 0.192, 0.192],
-[0.059, 0.040, 0.040],
-[0.026, 0.007, 0.007],
-[2.325, 0.425, 0.426],
-[2.265, 0.501, 0.499],
-[1.043, 0.122, 0.122],
-[1.718, 0.151, 0.150],
-[2.627, 0.425, 0.441],
-[3.801, 0.530, 0.528],
-[2.398, 0.525, 0.520],
-[1.238, 0.523, 0.543],
-[4.345, 1.505, 1.513],
-[3.667, 0.851, 0.852],
-[8.282, 3.515, 3.493],
-[0.962, 0.028, 0.028],
-[18.978, 0.518, 0.514],
-[20.849, 0.814, 0.578],
-[38.796, 1.382, 1.331],
-[29.874, 0.665, 0.650],
-[4.545, 0.181, 0.174],
-[2.356, 0.147, 0.145],
-[5.302, 0.180, 0.179],
-[18.680, 0.516, 0.509],
-[15.430, 1.162, 1.158],
-[2.515, 2.502, 2.538],
-[3.927, 0.533, 0.525],
-[9.878, 0.769, 0.767],
-[9.608, 4.694, 4.443],
-[19.021, 2.138, 2.202],
-[18.958, 2.174, 2.204],
-[0.956, 0.899, 0.929],
-[0.099, 0.074, 0.073],
-[0.055, 0.037, 0.037],
-[0.051, 0.031, 0.030],
-[0.203, 0.157, 0.156],
-[0.040, 0.011, 0.011],
-[0.024, 0.009, 0.009],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.10.3.json b/website/benchmark/versions/results/18.10.3.json
deleted file mode 100644
index a29bdff3f7a..00000000000
--- a/website/benchmark/versions/results/18.10.3.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-08-13 18.10",
-        "system_full":  "ClickHouse 18.10.3 2018-08-13",
-        "version":      "18.10.3",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.138, 0.015, 0.013],
-[0.119, 0.006, 0.006],
-[0.820, 0.017, 0.016],
-[0.161, 0.011, 0.011],
-[0.270, 0.044, 0.046],
-[1.009, 0.025, 0.024],
-[0.076, 0.004, 0.004],
-[0.335, 0.017, 0.017],
-[0.505, 0.032, 0.030],
-[0.554, 0.087, 0.090],
-[1.887, 0.524, 0.504],
-[1.530, 0.485, 0.490],
-[0.034, 0.003, 0.003],
-[0.032, 0.022, 0.020],
-[0.174, 0.132, 0.134],
-[3.331, 0.091, 0.087],
-[2.632, 0.154, 0.152],
-[3.881, 0.074, 0.072],
-[1.421, 0.067, 0.067],
-[7.055, 0.298, 0.291],
-[4.370, 0.161, 0.160],
-[1.828, 0.417, 0.423],
-[63.020, 2.017, 1.993],
-[42.473, 1.863, 1.855],
-[4.489, 0.220, 0.215],
-[1.947, 0.158, 0.208],
-[0.357, 0.078, 0.092],
-[6.607, 0.115, 0.103],
-[0.043, 0.011, 0.010],
-[0.043, 0.008, 0.008],
-[0.483, 0.060, 0.061],
-[1.687, 0.042, 0.042],
-[1.732, 0.093, 0.093],
-[2.572, 0.194, 0.192],
-[0.066, 0.048, 0.048],
-[0.028, 0.008, 0.008],
-[2.290, 0.435, 0.438],
-[2.276, 0.503, 0.506],
-[1.054, 0.127, 0.126],
-[1.702, 0.160, 0.165],
-[2.545, 0.429, 0.464],
-[3.846, 0.551, 0.535],
-[2.413, 0.575, 0.554],
-[1.244, 0.539, 0.582],
-[4.310, 1.570, 1.539],
-[3.635, 0.910, 0.868],
-[8.212, 4.811, 4.268],
-[0.947, 0.028, 0.027],
-[18.972, 0.518, 0.506],
-[20.843, 0.588, 0.572],
-[38.776, 1.377, 1.363],
-[29.917, 0.670, 0.630],
-[4.779, 0.186, 0.182],
-[2.330, 0.163, 0.153],
-[5.283, 0.193, 0.187],
-[18.637, 0.544, 0.518],
-[15.417, 1.178, 1.161],
-[2.396, 2.348, 2.330],
-[3.916, 0.537, 0.539],
-[9.855, 0.752, 0.735],
-[9.330, 4.220, 4.258],
-[18.911, 2.108, 2.111],
-[18.849, 2.087, 2.145],
-[0.942, 0.885, 0.891],
-[0.102, 0.077, 0.073],
-[0.062, 0.038, 0.038],
-[0.052, 0.030, 0.030],
-[0.251, 0.173, 0.193],
-[0.035, 0.011, 0.011],
-[0.023, 0.009, 0.009],
-[0.011, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.12.17.json b/website/benchmark/versions/results/18.12.17.json
deleted file mode 100644
index 8a4ad751168..00000000000
--- a/website/benchmark/versions/results/18.12.17.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-09-16 18.12",
-        "system_full":  "ClickHouse 18.12.17 2018-09-16",
-        "version":      "18.12.17",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.132, 0.018, 0.014],
-[0.093, 0.006, 0.006],
-[0.818, 0.020, 0.017],
-[0.164, 0.012, 0.012],
-[0.262, 0.042, 0.044],
-[0.988, 0.028, 0.026],
-[0.076, 0.004, 0.004],
-[0.337, 0.020, 0.021],
-[0.506, 0.038, 0.036],
-[0.544, 0.098, 0.100],
-[1.844, 0.533, 0.538],
-[1.497, 0.510, 0.509],
-[0.034, 0.004, 0.004],
-[0.036, 0.016, 0.016],
-[0.142, 0.148, 0.131],
-[3.307, 0.098, 0.096],
-[2.591, 0.160, 0.157],
-[3.871, 0.082, 0.079],
-[1.398, 0.074, 0.074],
-[7.032, 0.349, 0.336],
-[4.265, 0.170, 0.165],
-[1.831, 0.221, 0.214],
-[63.399, 2.641, 2.602],
-[42.509, 2.107, 2.060],
-[4.499, 0.233, 0.229],
-[1.916, 0.146, 0.140],
-[0.418, 0.064, 0.071],
-[6.635, 0.123, 0.119],
-[0.046, 0.011, 0.011],
-[0.037, 0.008, 0.008],
-[0.485, 0.062, 0.067],
-[1.641, 0.044, 0.043],
-[1.696, 0.097, 0.092],
-[2.573, 0.200, 0.196],
-[0.067, 0.046, 0.046],
-[0.032, 0.010, 0.009],
-[2.249, 0.429, 0.431],
-[2.248, 0.513, 0.508],
-[1.058, 0.132, 0.132],
-[1.720, 0.162, 0.159],
-[2.538, 0.437, 0.431],
-[3.844, 0.542, 0.544],
-[2.392, 0.533, 0.540],
-[1.258, 0.541, 0.530],
-[4.264, 1.392, 1.386],
-[3.673, 0.799, 0.787],
-[8.001, 2.947, 2.931],
-[0.935, 0.060, 0.028],
-[18.966, 0.610, 0.583],
-[20.808, 0.629, 0.617],
-[38.800, 1.481, 1.506],
-[29.883, 0.663, 0.637],
-[4.797, 0.190, 0.188],
-[2.316, 0.167, 0.162],
-[5.250, 0.199, 0.195],
-[18.608, 0.545, 0.518],
-[15.452, 1.180, 1.163],
-[2.484, 2.458, 2.456],
-[3.906, 0.493, 0.500],
-[9.845, 0.714, 0.712],
-[9.286, 4.143, 4.528],
-[18.894, 2.139, 2.143],
-[18.917, 2.145, 2.108],
-[0.943, 0.872, 0.896],
-[0.104, 0.081, 0.079],
-[0.064, 0.045, 0.041],
-[0.059, 0.036, 0.034],
-[0.244, 0.183, 0.183],
-[0.040, 0.012, 0.012],
-[0.026, 0.011, 0.010],
-[0.013, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.14.19.json b/website/benchmark/versions/results/18.14.19.json
deleted file mode 100644
index b988dd2387c..00000000000
--- a/website/benchmark/versions/results/18.14.19.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-12-19 18.14",
-        "system_full":  "ClickHouse 18.14.19 2018-12-19",
-        "version":      "18.14.19",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.133, 0.016, 0.015],
-[0.157, 0.006, 0.006],
-[0.816, 0.018, 0.017],
-[0.164, 0.012, 0.012],
-[0.263, 0.036, 0.040],
-[1.029, 0.027, 0.025],
-[0.076, 0.004, 0.004],
-[0.337, 0.018, 0.018],
-[0.503, 0.034, 0.032],
-[0.557, 0.088, 0.091],
-[1.912, 0.517, 0.510],
-[1.523, 0.506, 0.485],
-[0.038, 0.004, 0.004],
-[0.035, 0.015, 0.015],
-[0.141, 0.109, 0.141],
-[3.336, 0.088, 0.086],
-[2.626, 0.147, 0.144],
-[3.906, 0.068, 0.065],
-[1.436, 0.067, 0.065],
-[7.020, 0.316, 0.300],
-[4.302, 0.169, 0.166],
-[1.817, 0.197, 0.192],
-[63.459, 2.171, 2.150],
-[42.546, 1.915, 1.894],
-[4.504, 0.219, 0.214],
-[1.864, 0.155, 0.146],
-[0.428, 0.074, 0.069],
-[6.621, 0.111, 0.106],
-[0.043, 0.010, 0.009],
-[0.044, 0.008, 0.007],
-[0.480, 0.059, 0.060],
-[1.686, 0.041, 0.040],
-[1.725, 0.090, 0.091],
-[2.558, 0.195, 0.191],
-[0.063, 0.046, 0.043],
-[0.033, 0.008, 0.008],
-[2.275, 0.434, 0.422],
-[2.260, 0.507, 0.511],
-[1.074, 0.123, 0.122],
-[1.718, 0.151, 0.150],
-[2.602, 0.429, 0.418],
-[3.819, 0.552, 0.535],
-[2.433, 0.508, 0.515],
-[1.265, 0.543, 0.536],
-[4.278, 1.386, 1.376],
-[3.658, 0.865, 0.774],
-[7.959, 2.910, 2.931],
-[0.948, 0.033, 0.060],
-[18.942, 0.572, 0.552],
-[20.834, 0.579, 0.570],
-[38.782, 1.378, 1.348],
-[29.262, 0.607, 0.636],
-[4.575, 0.185, 0.178],
-[2.330, 0.158, 0.153],
-[5.290, 0.193, 0.187],
-[18.670, 0.513, 0.505],
-[15.443, 1.150, 1.134],
-[2.452, 2.435, 2.429],
-[3.926, 0.474, 0.477],
-[9.856, 0.684, 0.678],
-[9.269, 4.033, 4.061],
-[18.931, 2.123, 2.073],
-[18.914, 2.101, 2.123],
-[0.910, 0.860, 0.860],
-[0.104, 0.076, 0.078],
-[0.060, 0.040, 0.038],
-[0.057, 0.033, 0.035],
-[0.232, 0.173, 0.162],
-[0.035, 0.025, 0.012],
-[0.024, 0.013, 0.010],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/18.16.1.json b/website/benchmark/versions/results/18.16.1.json
deleted file mode 100644
index 1e570b5b946..00000000000
--- a/website/benchmark/versions/results/18.16.1.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2018-12-21 18.16",
-        "system_full":  "ClickHouse 18.16.1 2018-12-21",
-        "version":      "18.16.1",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.133, 0.194, 0.016],
-[0.215, 0.082, 0.007],
-[0.818, 0.050, 0.021],
-[0.156, 0.066, 0.016],
-[0.269, 0.038, 0.045],
-[1.159, 0.032, 0.029],
-[0.086, 0.008, 0.008],
-[0.335, 0.065, 0.024],
-[0.488, 0.040, 0.040],
-[0.550, 0.097, 0.097],
-[1.906, 0.593, 0.584],
-[1.503, 0.533, 0.522],
-[0.038, 0.005, 0.005],
-[0.036, 0.023, 0.017],
-[0.185, 0.198, 0.162],
-[3.335, 0.096, 0.057],
-[2.631, 0.172, 0.142],
-[3.884, 0.084, 0.057],
-[1.463, 0.072, 0.072],
-[7.189, 0.312, 0.306],
-[4.632, 0.174, 0.171],
-[1.865, 0.245, 0.194],
-[63.399, 2.148, 2.072],
-[42.517, 1.863, 1.819],
-[4.507, 0.249, 0.221],
-[2.078, 0.138, 0.141],
-[0.455, 0.102, 0.070],
-[11.873, 0.138, 0.124],
-[0.046, 0.012, 0.012],
-[0.032, 0.009, 0.009],
-[0.482, 0.060, 0.060],
-[1.682, 0.045, 0.045],
-[1.719, 0.097, 0.096],
-[2.567, 0.203, 0.202],
-[0.063, 0.045, 0.044],
-[0.027, 0.010, 0.010],
-[2.283, 0.434, 0.437],
-[2.256, 0.520, 0.521],
-[1.078, 0.136, 0.135],
-[1.693, 0.162, 0.161],
-[2.589, 0.464, 0.460],
-[3.809, 0.623, 0.589],
-[2.391, 0.562, 0.579],
-[1.265, 0.575, 0.579],
-[4.293, 1.441, 1.485],
-[3.656, 0.792, 0.796],
-[7.960, 3.260, 3.240],
-[0.923, 0.030, 0.029],
-[18.973, 0.584, 0.581],
-[20.841, 0.600, 0.593],
-[38.786, 1.403, 1.398],
-[39.036, 0.702, 0.684],
-[4.554, 0.194, 0.195],
-[2.325, 0.169, 0.165],
-[5.239, 0.200, 0.197],
-[18.609, 0.522, 0.517],
-[15.427, 1.150, 1.153],
-[2.475, 2.443, 2.442],
-[3.870, 0.524, 0.523],
-[9.837, 0.757, 0.748],
-[9.334, 4.308, 4.309],
-[18.947, 2.232, 2.243],
-[18.972, 2.260, 2.283],
-[0.991, 0.930, 0.932],
-[0.116, 0.116, 0.093],
-[0.061, 0.075, 0.050],
-[0.056, 0.062, 0.036],
-[0.272, 0.303, 0.222],
-[0.041, 0.043, 0.014],
-[0.025, 0.041, 0.012],
-[0.014, 0.030, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.01.16.79.json b/website/benchmark/versions/results/19.01.16.79.json
deleted file mode 100644
index d20ac409a7a..00000000000
--- a/website/benchmark/versions/results/19.01.16.79.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-04-02 19.1",
-        "system_full":  "ClickHouse 19.1.16.79 2019-04-02",
-        "version":      "19.1.16.79",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.139, 0.015, 0.012],
-[0.041, 0.005, 0.005],
-[0.817, 0.017, 0.016],
-[0.160, 0.011, 0.010],
-[0.264, 0.060, 0.034],
-[0.987, 0.025, 0.023],
-[0.075, 0.004, 0.004],
-[0.335, 0.017, 0.017],
-[0.507, 0.031, 0.031],
-[0.555, 0.087, 0.087],
-[1.861, 0.494, 0.490],
-[1.510, 0.477, 0.488],
-[0.033, 0.003, 0.003],
-[0.031, 0.015, 0.015],
-[0.156, 0.100, 0.129],
-[3.293, 0.092, 0.088],
-[2.613, 0.146, 0.141],
-[3.902, 0.067, 0.065],
-[1.432, 0.063, 0.062],
-[7.049, 0.304, 0.304],
-[4.342, 0.160, 0.159],
-[1.827, 0.198, 0.197],
-[63.412, 2.385, 2.319],
-[42.497, 1.936, 1.924],
-[4.499, 0.213, 0.209],
-[1.975, 0.120, 0.112],
-[0.460, 0.060, 0.057],
-[6.642, 0.101, 0.095],
-[0.045, 0.010, 0.010],
-[0.042, 0.007, 0.007],
-[0.482, 0.055, 0.058],
-[1.667, 0.043, 0.042],
-[1.720, 0.093, 0.094],
-[2.556, 0.192, 0.188],
-[0.059, 0.039, 0.039],
-[0.026, 0.007, 0.007],
-[2.299, 0.431, 0.425],
-[2.258, 0.505, 0.502],
-[1.050, 0.122, 0.121],
-[1.715, 0.149, 0.153],
-[2.605, 0.441, 0.423],
-[3.786, 0.563, 0.520],
-[2.393, 0.532, 0.532],
-[1.268, 0.556, 0.533],
-[4.330, 1.530, 1.482],
-[3.647, 0.792, 0.833],
-[8.224, 3.651, 3.551],
-[0.941, 0.028, 0.027],
-[18.967, 0.511, 0.507],
-[20.837, 0.583, 0.583],
-[38.807, 1.472, 1.356],
-[29.895, 0.646, 0.669],
-[4.550, 0.175, 0.173],
-[2.371, 0.147, 0.145],
-[5.296, 0.179, 0.177],
-[18.656, 0.513, 0.501],
-[15.434, 1.153, 1.145],
-[2.549, 2.527, 2.507],
-[3.922, 0.537, 0.554],
-[9.872, 0.770, 0.784],
-[9.630, 4.556, 4.342],
-[18.955, 2.259, 2.280],
-[18.975, 2.125, 2.130],
-[0.930, 0.908, 0.909],
-[0.099, 0.074, 0.073],
-[0.053, 0.037, 0.036],
-[0.055, 0.030, 0.029],
-[0.201, 0.156, 0.158],
-[0.034, 0.011, 0.011],
-[0.023, 0.009, 0.009],
-[0.011, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.03.9.12_adaptive.json b/website/benchmark/versions/results/19.03.9.12_adaptive.json
deleted file mode 100644
index a61f28e7caa..00000000000
--- a/website/benchmark/versions/results/19.03.9.12_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-04-02 19.3",
-	"system_full":  "ClickHouse 19.3.9.12 2019-04-02(adaptive)",
-        "version":      "19.3.9.12",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.045, 0.003, 0.003],
-[0.022, 0.002, 0.002],
-[0.018, 0.003, 0.004],
-[0.016, 0.002, 0.002],
-[0.018, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.018, 0.002, 0.002],
-[0.073, 0.029, 0.029],
-[0.023, 0.011, 0.011],
-[0.010, 0.002, 0.002],
-[1.082, 0.342, 0.362],
-[0.613, 0.344, 0.320],
-[0.035, 0.003, 0.003],
-[0.031, 0.014, 0.019],
-[0.132, 0.102, 0.106],
-[3.420, 0.095, 0.090],
-[3.012, 0.748, 0.750],
-[2.259, 0.060, 0.057],
-[1.270, 0.047, 0.048],
-[4.462, 0.226, 0.204],
-[4.212, 0.184, 0.177],
-[1.818, 0.219, 0.206],
-[63.399, 2.050, 2.016],
-[42.454, 1.432, 1.429],
-[3.563, 0.822, 0.814],
-[0.785, 0.133, 0.141],
-[0.118, 0.079, 0.082],
-[3.214, 0.089, 0.077],
-[0.010, 0.001, 0.001],
-[0.029, 0.008, 0.009],
-[0.382, 0.025, 0.026],
-[1.707, 0.031, 0.031],
-[1.691, 0.079, 0.091],
-[2.601, 0.200, 0.212],
-[0.025, 0.012, 0.011],
-[0.018, 0.009, 0.009],
-[2.124, 0.417, 0.421],
-[1.997, 0.462, 0.461],
-[1.043, 0.130, 0.129],
-[1.665, 0.145, 0.147],
-[2.617, 0.485, 0.478],
-[3.811, 0.606, 0.569],
-[2.376, 0.559, 0.562],
-[1.199, 0.566, 0.570],
-[4.246, 1.434, 1.415],
-[3.672, 0.828, 0.813],
-[7.948, 3.037, 3.016],
-[0.911, 0.048, 0.039],
-[19.548, 0.495, 0.449],
-[21.486, 0.568, 0.557],
-[40.178, 1.318, 1.298],
-[39.525, 0.609, 0.554],
-[4.645, 0.196, 0.204],
-[2.291, 0.171, 0.175],
-[5.290, 0.234, 0.213],
-[19.139, 0.450, 0.450],
-[15.793, 0.791, 0.776],
-[1.155, 1.141, 1.128],
-[3.837, 0.491, 0.484],
-[9.820, 0.730, 0.704],
-[9.079, 4.077, 4.048],
-[19.457, 2.042, 2.017],
-[19.483, 2.137, 2.010],
-[0.899, 0.829, 0.833],
-[0.178, 0.135, 0.123],
-[0.073, 0.051, 0.048],
-[0.072, 0.037, 0.042],
-[0.314, 0.274, 0.253],
-[0.059, 0.017, 0.028],
-[0.041, 0.012, 0.022],
-[0.013, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.04.5.35.json b/website/benchmark/versions/results/19.04.5.35.json
deleted file mode 100644
index 884754b3370..00000000000
--- a/website/benchmark/versions/results/19.04.5.35.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-05-13 19.4",
-        "system_full":  "ClickHouse 19.4.5.35 2019-05-13",
-        "version":      "19.4.5.35",
-	    "kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.072, 0.009, 0.009],
-[0.075, 0.032, 0.032],
-[0.066, 0.008, 0.008],
-[0.055, 0.012, 0.012],
-[0.072, 0.036, 0.036],
-[0.124, 0.019, 0.018],
-[0.101, 0.005, 0.004],
-[0.335, 0.033, 0.032],
-[0.503, 0.047, 0.047],
-[0.528, 0.094, 0.093],
-[1.898, 0.567, 0.540],
-[1.502, 0.515, 0.508],
-[0.035, 0.004, 0.004],
-[0.032, 0.013, 0.015],
-[0.134, 0.110, 0.104],
-[3.333, 0.095, 0.095],
-[2.608, 0.159, 0.152],
-[2.203, 0.063, 0.062],
-[1.316, 0.057, 0.058],
-[5.163, 0.198, 0.186],
-[4.884, 0.160, 0.153],
-[1.903, 0.188, 0.184],
-[63.457, 2.105, 2.057],
-[42.487, 1.567, 1.545],
-[4.497, 0.232, 0.226],
-[1.435, 0.145, 0.166],
-[0.262, 0.053, 0.059],
-[2.915, 0.098, 0.081],
-[0.102, 0.011, 0.011],
-[0.045, 0.008, 0.007],
-[0.481, 0.066, 0.066],
-[1.682, 0.046, 0.046],
-[1.710, 0.099, 0.101],
-[2.556, 0.213, 0.206],
-[0.075, 0.050, 0.046],
-[0.031, 0.008, 0.008],
-[2.245, 0.429, 0.420],
-[2.246, 0.490, 0.483],
-[1.073, 0.117, 0.119],
-[1.735, 0.152, 0.157],
-[2.644, 0.415, 0.401],
-[3.812, 0.553, 0.556],
-[2.404, 0.521, 0.515],
-[1.262, 0.556, 0.561],
-[4.287, 1.389, 1.380],
-[3.628, 0.785, 0.777],
-[8.027, 2.905, 2.912],
-[0.945, 0.081, 0.028],
-[18.915, 0.529, 0.503],
-[20.803, 0.595, 0.580],
-[38.783, 1.390, 1.363],
-[38.820, 0.679, 0.639],
-[4.565, 0.180, 0.183],
-[2.309, 0.161, 0.150],
-[5.264, 0.191, 0.183],
-[18.646, 0.540, 0.521],
-[15.425, 1.115, 1.092],
-[2.306, 2.275, 2.265],
-[3.941, 0.478, 0.488],
-[9.883, 0.714, 0.704],
-[9.498, 4.322, 4.348],
-[18.919, 2.039, 2.010],
-[18.883, 2.028, 1.980],
-[0.916, 0.851, 0.867],
-[0.114, 0.083, 0.077],
-[0.058, 0.039, 0.041],
-[0.053, 0.035, 0.028],
-[0.248, 0.186, 0.182],
-[0.041, 0.016, 0.014],
-[0.025, 0.011, 0.010],
-[0.013, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.05.4.22.json b/website/benchmark/versions/results/19.05.4.22.json
deleted file mode 100644
index dc1505ce9d4..00000000000
--- a/website/benchmark/versions/results/19.05.4.22.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-05-13 19.5",
-        "system_full":  "ClickHouse 19.5.4.22 2019-05-13",
-	    "kind":         "",
-        "version":      "19.5.4.22",
-        "comments":     "",
-        "result":
-        [
-
-[0.067, 0.010, 0.009],
-[0.076, 0.032, 0.032],
-[0.045, 0.008, 0.008],
-[0.049, 0.011, 0.011],
-[0.071, 0.035, 0.035],
-[0.232, 0.020, 0.021],
-[0.101, 0.005, 0.005],
-[0.334, 0.035, 0.033],
-[0.499, 0.047, 0.048],
-[0.532, 0.096, 0.091],
-[1.878, 0.562, 0.555],
-[1.484, 0.513, 0.504],
-[0.034, 0.003, 0.003],
-[0.031, 0.015, 0.015],
-[0.130, 0.114, 0.108],
-[3.323, 0.095, 0.095],
-[2.616, 0.160, 0.147],
-[2.218, 0.063, 0.061],
-[1.333, 0.059, 0.057],
-[5.176, 0.211, 0.196],
-[4.883, 0.167, 0.172],
-[1.905, 0.194, 0.185],
-[63.470, 2.105, 2.067],
-[42.523, 1.606, 1.560],
-[4.501, 0.231, 0.231],
-[1.412, 0.159, 0.162],
-[0.247, 0.060, 0.057],
-[2.935, 0.075, 0.084],
-[0.073, 0.010, 0.010],
-[0.046, 0.008, 0.007],
-[0.481, 0.063, 0.061],
-[1.669, 0.042, 0.043],
-[1.693, 0.097, 0.096],
-[2.565, 0.211, 0.207],
-[0.062, 0.044, 0.044],
-[0.029, 0.008, 0.008],
-[2.243, 0.438, 0.429],
-[2.231, 0.493, 0.485],
-[1.071, 0.119, 0.121],
-[1.717, 0.143, 0.145],
-[2.616, 0.422, 0.416],
-[3.792, 0.523, 0.542],
-[2.383, 0.535, 0.503],
-[1.249, 0.568, 0.560],
-[4.310, 1.423, 1.386],
-[3.654, 0.776, 0.764],
-[8.060, 2.973, 2.907],
-[0.962, 0.058, 0.029],
-[18.952, 0.492, 0.487],
-[20.838, 0.593, 0.563],
-[38.796, 1.366, 1.345],
-[38.903, 0.672, 0.637],
-[4.568, 0.181, 0.177],
-[2.335, 0.148, 0.151],
-[5.300, 0.194, 0.181],
-[18.630, 0.520, 0.498],
-[15.435, 1.086, 1.064],
-[2.320, 2.304, 2.300],
-[3.932, 0.477, 0.485],
-[9.834, 0.713, 0.687],
-[9.485, 4.400, 4.381],
-[18.930, 2.046, 1.980],
-[18.933, 2.012, 1.974],
-[0.949, 0.882, 0.875],
-[0.112, 0.097, 0.082],
-[0.054, 0.043, 0.046],
-[0.052, 0.029, 0.036],
-[0.243, 0.207, 0.188],
-[0.044, 0.014, 0.019],
-[0.026, 0.010, 0.010],
-[0.015, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.06.3.18_adaptive.json b/website/benchmark/versions/results/19.06.3.18_adaptive.json
deleted file mode 100644
index 6a3814b0cdb..00000000000
--- a/website/benchmark/versions/results/19.06.3.18_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-06-15 19.6",
-	"system_full":  "ClickHouse 19.6.3.18 2019-06-15(adaptive)",
-        "version":      "19.6.3.18",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.033, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.021, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.016, 0.002, 0.002],
-[0.019, 0.003, 0.003],
-[0.018, 0.001, 0.001],
-[0.063, 0.024, 0.024],
-[0.022, 0.008, 0.008],
-[0.015, 0.002, 0.002],
-[1.237, 0.349, 0.337],
-[0.600, 0.297, 0.316],
-[0.040, 0.003, 0.003],
-[0.034, 0.014, 0.013],
-[0.135, 0.109, 0.099],
-[3.433, 0.097, 0.093],
-[3.003, 0.670, 0.666],
-[2.257, 0.063, 0.064],
-[1.274, 0.051, 0.052],
-[4.465, 0.202, 0.199],
-[4.254, 0.161, 0.164],
-[1.818, 0.177, 0.188],
-[63.476, 2.082, 2.042],
-[42.480, 1.577, 1.542],
-[3.488, 0.723, 0.708],
-[0.786, 0.147, 0.156],
-[0.115, 0.066, 0.063],
-[3.706, 0.087, 0.089],
-[0.060, 0.012, 0.011],
-[0.055, 0.009, 0.008],
-[0.433, 0.067, 0.072],
-[1.620, 0.049, 0.050],
-[1.647, 0.109, 0.101],
-[2.557, 0.207, 0.194],
-[0.078, 0.050, 0.047],
-[0.037, 0.009, 0.009],
-[1.997, 0.420, 0.411],
-[2.002, 0.465, 0.469],
-[1.027, 0.117, 0.116],
-[1.681, 0.141, 0.139],
-[2.648, 0.398, 0.391],
-[3.791, 0.510, 0.499],
-[2.353, 0.529, 0.529],
-[1.226, 0.547, 0.542],
-[4.267, 1.333, 1.305],
-[3.680, 0.733, 0.708],
-[8.051, 2.804, 2.865],
-[0.917, 0.042, 0.031],
-[19.546, 0.463, 0.438],
-[21.449, 0.555, 0.548],
-[40.133, 1.226, 1.204],
-[39.599, 0.606, 0.569],
-[4.663, 0.176, 0.174],
-[2.341, 0.161, 0.147],
-[5.326, 0.188, 0.176],
-[19.228, 0.468, 0.449],
-[15.821, 1.027, 1.003],
-[2.306, 2.271, 2.296],
-[3.861, 0.479, 0.446],
-[9.817, 0.688, 0.668],
-[9.318, 4.049, 4.092],
-[19.435, 1.893, 1.868],
-[19.280, 1.873, 1.860],
-[0.921, 0.865, 0.852],
-[0.095, 0.059, 0.064],
-[0.055, 0.028, 0.035],
-[0.048, 0.021, 0.020],
-[0.191, 0.135, 0.126],
-[0.039, 0.012, 0.010],
-[0.028, 0.008, 0.008],
-[0.016, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.07.5.29_adaptive.json b/website/benchmark/versions/results/19.07.5.29_adaptive.json
deleted file mode 100644
index a8b2a9d2cbb..00000000000
--- a/website/benchmark/versions/results/19.07.5.29_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-07-05 19.7",
-	"system_full":  "ClickHouse 19.7.5.29 2019-07-05(adaptive)",
-        "version":      "19.7.5.29",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.039, 0.003, 0.003],
-[0.015, 0.002, 0.001],
-[0.020, 0.003, 0.003],
-[0.016, 0.002, 0.002],
-[0.016, 0.002, 0.002],
-[0.019, 0.003, 0.003],
-[0.016, 0.001, 0.001],
-[0.067, 0.025, 0.024],
-[0.020, 0.008, 0.008],
-[0.011, 0.002, 0.002],
-[1.090, 0.342, 0.338],
-[0.591, 0.306, 0.312],
-[0.036, 0.003, 0.003],
-[0.032, 0.014, 0.014],
-[0.137, 0.107, 0.101],
-[3.428, 0.100, 0.093],
-[2.994, 0.681, 0.678],
-[2.268, 0.066, 0.063],
-[1.258, 0.052, 0.047],
-[4.453, 0.211, 0.188],
-[4.249, 0.163, 0.160],
-[1.831, 0.176, 0.173],
-[63.471, 2.099, 2.050],
-[42.482, 1.609, 1.601],
-[3.497, 0.735, 0.714],
-[0.799, 0.147, 0.176],
-[0.116, 0.056, 0.058],
-[3.715, 0.088, 0.086],
-[0.064, 0.011, 0.010],
-[0.047, 0.008, 0.008],
-[0.432, 0.065, 0.066],
-[1.635, 0.049, 0.048],
-[1.658, 0.105, 0.105],
-[2.558, 0.201, 0.198],
-[0.066, 0.040, 0.040],
-[0.034, 0.008, 0.008],
-[2.066, 0.432, 0.433],
-[2.033, 0.491, 0.479],
-[1.050, 0.122, 0.122],
-[1.696, 0.147, 0.146],
-[2.613, 0.427, 0.389],
-[3.795, 0.508, 0.500],
-[2.339, 0.509, 0.526],
-[1.202, 0.541, 0.548],
-[4.288, 1.364, 1.337],
-[3.671, 0.734, 0.723],
-[8.031, 2.884, 2.832],
-[0.896, 0.038, 0.031],
-[19.524, 0.461, 0.441],
-[21.437, 0.578, 0.549],
-[40.135, 1.244, 1.213],
-[39.587, 0.612, 0.601],
-[4.660, 0.181, 0.178],
-[2.325, 0.161, 0.149],
-[5.324, 0.203, 0.178],
-[19.194, 0.483, 0.460],
-[15.815, 1.027, 1.021],
-[2.272, 2.248, 2.269],
-[3.857, 0.466, 0.455],
-[9.839, 0.694, 0.669],
-[9.343, 4.105, 4.058],
-[19.485, 1.906, 1.864],
-[19.375, 1.905, 1.862],
-[0.924, 0.848, 0.844],
-[0.091, 0.066, 0.058],
-[0.052, 0.029, 0.029],
-[0.046, 0.024, 0.020],
-[0.185, 0.132, 0.140],
-[0.037, 0.010, 0.011],
-[0.027, 0.008, 0.009],
-[0.015, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.08.3.8_adaptive.json b/website/benchmark/versions/results/19.08.3.8_adaptive.json
deleted file mode 100644
index 87afb885c3d..00000000000
--- a/website/benchmark/versions/results/19.08.3.8_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-06-11 19.8",
-	"system_full":  "ClickHouse 19.8.3.8 2019-06-11(adaptive)",
-        "version":      "19.8.3.8",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.036, 0.003, 0.003],
-[0.014, 0.002, 0.001],
-[0.022, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.016, 0.002, 0.002],
-[0.019, 0.003, 0.003],
-[0.017, 0.001, 0.001],
-[0.063, 0.026, 0.027],
-[0.019, 0.008, 0.008],
-[0.009, 0.002, 0.001],
-[1.119, 0.338, 0.340],
-[0.593, 0.300, 0.300],
-[0.040, 0.003, 0.003],
-[0.035, 0.014, 0.013],
-[0.162, 0.107, 0.107],
-[3.426, 0.100, 0.091],
-[3.003, 0.671, 0.667],
-[2.275, 0.062, 0.063],
-[1.285, 0.054, 0.055],
-[4.459, 0.210, 0.192],
-[4.257, 0.179, 0.163],
-[1.813, 0.178, 0.183],
-[63.480, 2.122, 2.062],
-[42.481, 1.598, 1.581],
-[3.489, 0.717, 0.709],
-[0.796, 0.124, 0.195],
-[0.114, 0.054, 0.052],
-[3.719, 0.088, 0.085],
-[0.063, 0.011, 0.011],
-[0.046, 0.009, 0.008],
-[0.411, 0.060, 0.058],
-[1.630, 0.044, 0.043],
-[1.666, 0.098, 0.097],
-[2.572, 0.200, 0.194],
-[0.072, 0.041, 0.043],
-[0.038, 0.009, 0.008],
-[2.024, 0.439, 0.425],
-[2.018, 0.486, 0.484],
-[1.032, 0.122, 0.120],
-[1.691, 0.153, 0.151],
-[2.577, 0.398, 0.386],
-[3.811, 0.511, 0.494],
-[2.366, 0.527, 0.515],
-[1.183, 0.535, 0.537],
-[4.240, 1.323, 1.311],
-[3.667, 0.733, 0.717],
-[7.945, 2.772, 2.820],
-[0.863, 0.046, 0.028],
-[19.550, 0.424, 0.417],
-[21.446, 0.539, 0.520],
-[40.092, 1.202, 1.167],
-[39.601, 0.617, 0.556],
-[4.662, 0.175, 0.174],
-[2.349, 0.156, 0.145],
-[5.350, 0.181, 0.179],
-[19.239, 0.455, 0.438],
-[15.829, 1.015, 0.996],
-[2.297, 2.269, 2.278],
-[3.865, 0.468, 0.440],
-[9.817, 0.674, 0.645],
-[9.106, 3.916, 4.283],
-[19.440, 1.872, 1.838],
-[19.427, 1.858, 1.818],
-[0.894, 0.835, 0.847],
-[0.088, 0.059, 0.060],
-[0.048, 0.027, 0.030],
-[0.046, 0.022, 0.024],
-[0.180, 0.137, 0.124],
-[0.037, 0.011, 0.010],
-[0.025, 0.008, 0.009],
-[0.015, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.09.5.36_adaptive.json b/website/benchmark/versions/results/19.09.5.36_adaptive.json
deleted file mode 100644
index 6a4de63a0dc..00000000000
--- a/website/benchmark/versions/results/19.09.5.36_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-07-20 19.9",
-	"system_full":  "ClickHouse 19.9.5.36 2019-07-20(adaptive)",
-        "version":      "19.9.5.36",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.034, 0.003, 0.003],
-[0.014, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.014, 0.002, 0.002],
-[0.015, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.016, 0.001, 0.001],
-[0.120, 0.024, 0.027],
-[0.021, 0.008, 0.008],
-[0.016, 0.001, 0.001],
-[1.225, 0.331, 0.331],
-[0.620, 0.301, 0.296],
-[0.038, 0.003, 0.003],
-[0.034, 0.013, 0.013],
-[0.125, 0.108, 0.100],
-[3.432, 0.095, 0.090],
-[2.993, 0.667, 0.673],
-[2.271, 0.060, 0.059],
-[1.282, 0.047, 0.051],
-[4.467, 0.201, 0.185],
-[4.258, 0.167, 0.157],
-[1.845, 0.180, 0.180],
-[63.456, 2.040, 2.008],
-[42.482, 1.578, 1.566],
-[3.485, 0.714, 0.717],
-[0.789, 0.176, 0.176],
-[0.120, 0.063, 0.061],
-[3.680, 0.092, 0.084],
-[0.060, 0.010, 0.010],
-[0.053, 0.008, 0.007],
-[0.429, 0.060, 0.054],
-[1.646, 0.042, 0.045],
-[1.659, 0.105, 0.106],
-[2.557, 0.207, 0.195],
-[0.072, 0.041, 0.043],
-[0.041, 0.008, 0.008],
-[2.012, 0.439, 0.424],
-[2.021, 0.486, 0.480],
-[1.054, 0.126, 0.124],
-[1.666, 0.158, 0.167],
-[2.565, 0.437, 0.392],
-[3.795, 0.497, 0.529],
-[2.355, 0.524, 0.517],
-[1.191, 0.540, 0.538],
-[4.245, 1.306, 1.298],
-[3.654, 0.728, 0.717],
-[7.948, 2.782, 2.789],
-[0.893, 0.061, 0.027],
-[19.518, 0.425, 0.408],
-[21.473, 0.524, 0.513],
-[40.168, 1.177, 1.137],
-[39.602, 0.574, 0.588],
-[4.663, 0.169, 0.176],
-[2.346, 0.155, 0.144],
-[5.320, 0.193, 0.176],
-[19.215, 0.437, 0.418],
-[15.836, 0.996, 0.982],
-[2.297, 2.258, 2.274],
-[3.824, 0.448, 0.454],
-[9.803, 0.657, 0.632],
-[9.051, 3.826, 3.919],
-[19.430, 1.820, 1.798],
-[19.387, 1.847, 1.820],
-[0.885, 0.815, 0.823],
-[0.089, 0.065, 0.057],
-[0.056, 0.028, 0.033],
-[0.041, 0.022, 0.022],
-[0.199, 0.128, 0.120],
-[0.036, 0.010, 0.010],
-[0.025, 0.008, 0.009],
-[0.017, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.10.1.5_adaptive.json b/website/benchmark/versions/results/19.10.1.5_adaptive.json
deleted file mode 100644
index b66d70caab6..00000000000
--- a/website/benchmark/versions/results/19.10.1.5_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-07-12 19.10",
-	"system_full":  "ClickHouse 19.10.1.5 2019-07-12(adaptive)",
-        "version":      "19.10.1.5",
-	"type":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.045, 0.003, 0.003],
-[0.017, 0.001, 0.001],
-[0.018, 0.003, 0.003],
-[0.023, 0.002, 0.001],
-[0.016, 0.002, 0.002],
-[0.021, 0.003, 0.003],
-[0.017, 0.001, 0.001],
-[0.062, 0.024, 0.023],
-[0.021, 0.008, 0.008],
-[0.011, 0.001, 0.001],
-[1.159, 0.338, 0.334],
-[0.620, 0.323, 0.307],
-[0.021, 0.002, 0.001],
-[0.009, 0.001, 0.001],
-[0.017, 0.004, 0.004],
-[3.646, 0.094, 0.089],
-[2.997, 0.679, 0.667],
-[2.240, 0.060, 0.059],
-[1.177, 0.060, 0.056],
-[4.103, 0.224, 0.194],
-[3.934, 0.167, 0.171],
-[1.754, 0.188, 0.177],
-[63.474, 2.051, 2.021],
-[42.421, 1.550, 1.518],
-[3.482, 0.725, 0.731],
-[0.683, 0.161, 0.136],
-[0.087, 0.058, 0.055],
-[3.057, 0.061, 0.055],
-[0.095, 0.010, 0.010],
-[0.062, 0.008, 0.007],
-[0.425, 0.062, 0.065],
-[1.645, 0.047, 0.045],
-[1.655, 0.117, 0.113],
-[2.541, 0.220, 0.198],
-[0.058, 0.044, 0.044],
-[0.019, 0.008, 0.008],
-[2.034, 0.434, 0.420],
-[2.035, 0.485, 0.484],
-[1.036, 0.116, 0.118],
-[1.672, 0.150, 0.148],
-[2.584, 0.397, 0.385],
-[3.829, 0.512, 0.488],
-[2.373, 0.518, 0.504],
-[1.191, 0.546, 0.539],
-[4.394, 1.359, 1.319],
-[3.649, 0.754, 0.735],
-[7.906, 2.846, 2.808],
-[0.906, 0.044, 0.027],
-[19.556, 0.441, 0.410],
-[21.468, 0.529, 0.521],
-[40.145, 1.194, 1.165],
-[39.573, 0.559, 0.529],
-[4.652, 0.180, 0.171],
-[2.321, 0.154, 0.147],
-[5.312, 0.188, 0.178],
-[19.213, 0.444, 0.424],
-[15.806, 1.006, 0.981],
-[2.265, 2.257, 2.274],
-[3.826, 0.470, 0.449],
-[9.797, 0.666, 0.639],
-[9.059, 3.902, 3.855],
-[19.428, 1.865, 1.804],
-[19.377, 1.843, 1.815],
-[0.885, 0.828, 0.828],
-[0.090, 0.061, 0.061],
-[0.052, 0.029, 0.027],
-[0.045, 0.021, 0.022],
-[0.195, 0.129, 0.137],
-[0.035, 0.011, 0.011],
-[0.027, 0.009, 0.008],
-[0.013, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.11.14.1_adaptive.json b/website/benchmark/versions/results/19.11.14.1_adaptive.json
deleted file mode 100644
index 11e9a4abffb..00000000000
--- a/website/benchmark/versions/results/19.11.14.1_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-12-04 19.11",
-	"system_full":  "ClickHouse 19.11.14.1 2019-12-04(adaptive)",
-        "version":      "19.11.14.1",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.037, 0.003, 0.003],
-[0.018, 0.001, 0.001],
-[0.019, 0.003, 0.003],
-[0.017, 0.002, 0.001],
-[0.015, 0.002, 0.002],
-[0.020, 0.003, 0.003],
-[0.018, 0.001, 0.001],
-[0.066, 0.025, 0.028],
-[0.020, 0.008, 0.008],
-[0.011, 0.001, 0.001],
-[1.138, 0.350, 0.340],
-[0.580, 0.309, 0.305],
-[0.034, 0.003, 0.004],
-[0.031, 0.014, 0.013],
-[0.137, 0.103, 0.107],
-[3.421, 0.099, 0.090],
-[3.002, 0.653, 0.647],
-[2.253, 0.064, 0.060],
-[1.258, 0.056, 0.052],
-[4.436, 0.230, 0.208],
-[4.214, 0.163, 0.176],
-[1.854, 0.208, 0.208],
-[63.371, 2.164, 2.111],
-[42.444, 1.585, 1.551],
-[3.448, 0.708, 0.699],
-[0.793, 0.154, 0.169],
-[0.104, 0.081, 0.075],
-[3.178, 0.080, 0.091],
-[0.039, 0.010, 0.010],
-[0.060, 0.007, 0.007],
-[0.427, 0.073, 0.071],
-[1.616, 0.046, 0.047],
-[1.654, 0.098, 0.096],
-[2.561, 0.211, 0.211],
-[0.064, 0.048, 0.048],
-[0.019, 0.008, 0.007],
-[1.989, 0.396, 0.394],
-[1.991, 0.456, 0.453],
-[1.020, 0.132, 0.129],
-[1.640, 0.168, 0.161],
-[2.523, 0.430, 0.406],
-[3.826, 0.511, 0.505],
-[2.356, 0.507, 0.509],
-[1.177, 0.538, 0.534],
-[4.299, 1.294, 1.286],
-[3.662, 0.732, 0.704],
-[7.885, 2.777, 2.784],
-[0.911, 0.053, 0.027],
-[19.526, 0.431, 0.419],
-[21.478, 0.557, 0.536],
-[40.140, 1.248, 1.209],
-[39.497, 0.589, 0.542],
-[4.644, 0.195, 0.187],
-[2.302, 0.167, 0.164],
-[5.303, 0.203, 0.196],
-[19.169, 0.439, 0.425],
-[15.754, 0.803, 0.777],
-[2.251, 2.236, 2.251],
-[3.831, 0.475, 0.454],
-[9.802, 0.666, 0.656],
-[9.119, 3.820, 3.843],
-[19.443, 1.864, 1.825],
-[19.451, 1.848, 1.819],
-[0.854, 0.808, 0.799],
-[0.153, 0.119, 0.111],
-[0.071, 0.048, 0.045],
-[0.065, 0.037, 0.035],
-[0.319, 0.253, 0.247],
-[0.051, 0.019, 0.018],
-[0.033, 0.013, 0.014],
-[0.013, 0.002, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.13.7.57_adaptive.json b/website/benchmark/versions/results/19.13.7.57_adaptive.json
deleted file mode 100644
index bacbe36fbce..00000000000
--- a/website/benchmark/versions/results/19.13.7.57_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-11-06 19.13",
-	"system_full":  "ClickHouse 19.13.7.57 2019-11-06(adaptive)",
-        "version":      "19.13.7.57",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.032, 0.003, 0.003],
-[0.014, 0.002, 0.002],
-[0.019, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.017, 0.002, 0.002],
-[0.018, 0.003, 0.003],
-[0.018, 0.001, 0.001],
-[0.065, 0.025, 0.028],
-[0.022, 0.009, 0.009],
-[0.013, 0.002, 0.002],
-[1.218, 0.344, 0.339],
-[0.597, 0.317, 0.318],
-[0.033, 0.003, 0.003],
-[0.031, 0.013, 0.017],
-[0.141, 0.106, 0.096],
-[3.401, 0.092, 0.087],
-[3.037, 0.748, 0.740],
-[2.263, 0.059, 0.057],
-[1.277, 0.045, 0.057],
-[4.439, 0.223, 0.213],
-[4.197, 0.178, 0.174],
-[1.817, 0.223, 0.195],
-[63.350, 2.157, 2.109],
-[42.422, 1.557, 1.551],
-[3.545, 0.808, 0.798],
-[0.791, 0.185, 0.154],
-[0.110, 0.082, 0.079],
-[3.174, 0.093, 0.106],
-[0.047, 0.030, 0.031],
-[0.023, 0.008, 0.008],
-[0.306, 0.069, 0.067],
-[1.635, 0.049, 0.047],
-[1.669, 0.096, 0.096],
-[2.579, 0.216, 0.207],
-[0.060, 0.040, 0.043],
-[0.017, 0.008, 0.008],
-[2.057, 0.421, 0.403],
-[2.015, 0.464, 0.458],
-[1.039, 0.122, 0.127],
-[1.676, 0.151, 0.144],
-[2.624, 0.421, 0.394],
-[3.777, 0.536, 0.508],
-[2.352, 0.523, 0.494],
-[1.205, 0.537, 0.532],
-[4.218, 1.303, 1.273],
-[3.674, 0.724, 0.714],
-[7.911, 2.748, 2.734],
-[0.910, 0.057, 0.029],
-[19.529, 0.434, 0.415],
-[21.471, 0.577, 0.527],
-[40.121, 1.221, 1.191],
-[39.482, 0.566, 0.544],
-[4.644, 0.191, 0.191],
-[2.312, 0.168, 0.159],
-[5.286, 0.204, 0.199],
-[19.174, 0.449, 0.431],
-[15.773, 0.772, 0.755],
-[2.270, 2.254, 2.254],
-[3.855, 0.469, 0.455],
-[9.782, 0.667, 0.640],
-[9.127, 3.834, 3.826],
-[19.407, 1.852, 1.794],
-[19.405, 1.838, 1.803],
-[0.850, 0.803, 0.799],
-[0.146, 0.118, 0.111],
-[0.070, 0.048, 0.050],
-[0.067, 0.038, 0.035],
-[0.318, 0.238, 0.256],
-[0.058, 0.019, 0.018],
-[0.034, 0.013, 0.013],
-[0.013, 0.003, 0.005]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.14.13.4_adaptive.json b/website/benchmark/versions/results/19.14.13.4_adaptive.json
deleted file mode 100644
index 27e969d7046..00000000000
--- a/website/benchmark/versions/results/19.14.13.4_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-07-21 19.14",
-	"system_full":  "ClickHouse 19.14.13.4 2020-07-21(adaptive)",
-        "version":      "19.14.13.4",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.037, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.021, 0.003, 0.003],
-[0.016, 0.002, 0.002],
-[0.016, 0.002, 0.002],
-[0.015, 0.003, 0.003],
-[0.018, 0.002, 0.002],
-[0.071, 0.040, 0.030],
-[0.022, 0.009, 0.009],
-[0.014, 0.002, 0.002],
-[1.241, 0.353, 0.357],
-[0.550, 0.346, 0.341],
-[0.034, 0.004, 0.003],
-[0.031, 0.019, 0.018],
-[0.124, 0.101, 0.106],
-[3.424, 0.101, 0.095],
-[3.021, 0.745, 0.742],
-[2.268, 0.057, 0.055],
-[1.266, 0.052, 0.051],
-[4.452, 0.219, 0.226],
-[4.183, 0.188, 0.198],
-[1.823, 0.227, 0.221],
-[63.392, 2.282, 2.249],
-[42.447, 1.526, 1.529],
-[3.546, 0.809, 0.813],
-[0.763, 0.173, 0.141],
-[0.119, 0.079, 0.094],
-[3.172, 0.100, 0.085],
-[0.025, 0.006, 0.006],
-[0.026, 0.009, 0.008],
-[0.365, 0.027, 0.026],
-[1.690, 0.034, 0.032],
-[1.668, 0.090, 0.089],
-[2.592, 0.207, 0.211],
-[0.027, 0.011, 0.011],
-[0.018, 0.009, 0.009],
-[2.114, 0.410, 0.403],
-[2.003, 0.457, 0.444],
-[1.025, 0.130, 0.131],
-[1.645, 0.160, 0.156],
-[2.559, 0.463, 0.454],
-[3.838, 0.579, 0.570],
-[2.380, 0.552, 0.549],
-[1.202, 0.600, 0.583],
-[4.286, 1.424, 1.415],
-[3.680, 0.808, 0.823],
-[7.918, 3.030, 3.035],
-[0.906, 0.044, 0.044],
-[19.539, 0.495, 0.483],
-[21.464, 0.603, 0.562],
-[40.117, 1.299, 1.279],
-[39.494, 0.622, 0.607],
-[4.644, 0.209, 0.216],
-[2.249, 0.165, 0.183],
-[5.262, 0.223, 0.218],
-[19.142, 0.461, 0.449],
-[15.763, 0.824, 0.828],
-[1.168, 1.135, 1.139],
-[3.836, 0.492, 0.509],
-[9.800, 0.729, 0.705],
-[9.106, 4.009, 4.031],
-[19.505, 1.972, 1.949],
-[19.475, 2.047, 1.972],
-[0.858, 0.846, 0.825],
-[0.163, 0.122, 0.117],
-[0.067, 0.048, 0.049],
-[0.072, 0.043, 0.039],
-[0.336, 0.262, 0.277],
-[0.050, 0.027, 0.018],
-[0.030, 0.023, 0.012],
-[0.013, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.15.7.30_adaptive.json b/website/benchmark/versions/results/19.15.7.30_adaptive.json
deleted file mode 100644
index 376058e1748..00000000000
--- a/website/benchmark/versions/results/19.15.7.30_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2019-12-29 19.15",
-	"system_full":  "ClickHouse 19.15.7.30 2019-12-29(adaptive)",
-        "version":      "19.15.7.30",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.036, 0.003, 0.003],
-[0.014, 0.002, 0.002],
-[0.016, 0.003, 0.003],
-[0.016, 0.002, 0.002],
-[0.015, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.016, 0.002, 0.002],
-[0.067, 0.039, 0.039],
-[0.021, 0.008, 0.008],
-[0.011, 0.002, 0.002],
-[1.241, 0.346, 0.359],
-[0.572, 0.336, 0.340],
-[0.034, 0.003, 0.003],
-[0.032, 0.019, 0.014],
-[0.130, 0.102, 0.098],
-[3.424, 0.092, 0.092],
-[3.032, 0.737, 0.746],
-[2.283, 0.055, 0.055],
-[1.275, 0.049, 0.049],
-[4.531, 0.222, 0.216],
-[4.224, 0.190, 0.174],
-[1.808, 0.212, 0.211],
-[63.378, 2.088, 2.059],
-[42.433, 1.451, 1.445],
-[3.535, 0.788, 0.792],
-[0.783, 0.166, 0.146],
-[0.117, 0.075, 0.083],
-[3.194, 0.081, 0.091],
-[0.025, 0.005, 0.005],
-[0.025, 0.008, 0.008],
-[0.400, 0.022, 0.023],
-[1.716, 0.032, 0.032],
-[1.684, 0.082, 0.088],
-[2.604, 0.201, 0.203],
-[0.029, 0.014, 0.015],
-[0.019, 0.008, 0.009],
-[2.128, 0.415, 0.408],
-[2.008, 0.445, 0.442],
-[1.031, 0.119, 0.119],
-[1.673, 0.149, 0.143],
-[2.623, 0.468, 0.491],
-[3.772, 0.566, 0.556],
-[2.345, 0.545, 0.540],
-[1.198, 0.581, 0.604],
-[4.245, 1.422, 1.421],
-[3.641, 0.797, 0.799],
-[7.931, 3.072, 3.036],
-[0.899, 0.046, 0.037],
-[19.526, 0.453, 0.454],
-[21.447, 0.556, 0.583],
-[39.978, 1.279, 1.248],
-[39.505, 0.567, 0.563],
-[4.637, 0.205, 0.204],
-[2.262, 0.170, 0.170],
-[5.273, 0.211, 0.214],
-[19.142, 0.448, 0.435],
-[15.800, 0.780, 0.782],
-[1.154, 1.138, 1.134],
-[3.820, 0.508, 0.524],
-[9.790, 0.722, 0.689],
-[9.068, 4.062, 4.036],
-[19.494, 2.033, 1.911],
-[19.512, 2.044, 1.967],
-[0.860, 0.839, 0.830],
-[0.151, 0.129, 0.118],
-[0.068, 0.048, 0.053],
-[0.068, 0.043, 0.037],
-[0.312, 0.251, 0.273],
-[0.051, 0.023, 0.026],
-[0.034, 0.024, 0.022],
-[0.014, 0.002, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.16.19.85_adaptive.json b/website/benchmark/versions/results/19.16.19.85_adaptive.json
deleted file mode 100644
index 259b6310720..00000000000
--- a/website/benchmark/versions/results/19.16.19.85_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-04-27 19.16",
-	"system_full":  "ClickHouse 19.16.19.85 2020-04-27(adaptive)",
-        "version":      "19.16.19.85",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.035, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.015, 0.002, 0.002],
-[0.014, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.107, 0.029, 0.039],
-[0.021, 0.010, 0.010],
-[0.015, 0.002, 0.002],
-[1.238, 0.359, 0.360],
-[0.573, 0.324, 0.311],
-[0.032, 0.003, 0.003],
-[0.032, 0.018, 0.013],
-[0.133, 0.106, 0.106],
-[3.420, 0.095, 0.092],
-[3.048, 0.746, 0.735],
-[2.274, 0.064, 0.058],
-[1.277, 0.050, 0.056],
-[4.456, 0.250, 0.240],
-[4.146, 0.197, 0.183],
-[1.821, 0.223, 0.220],
-[63.395, 2.248, 2.241],
-[42.449, 1.517, 1.519],
-[3.568, 0.798, 0.795],
-[0.793, 0.147, 0.142],
-[0.128, 0.081, 0.066],
-[3.217, 0.085, 0.096],
-[0.026, 0.006, 0.005],
-[0.027, 0.008, 0.009],
-[0.363, 0.025, 0.024],
-[1.716, 0.034, 0.030],
-[1.683, 0.099, 0.086],
-[2.517, 0.216, 0.197],
-[0.030, 0.014, 0.015],
-[0.018, 0.009, 0.008],
-[2.142, 0.410, 0.407],
-[2.009, 0.449, 0.435],
-[1.020, 0.125, 0.123],
-[1.677, 0.146, 0.152],
-[2.577, 0.468, 0.488],
-[3.794, 0.572, 0.550],
-[2.362, 0.567, 0.528],
-[1.204, 0.544, 0.548],
-[4.506, 1.420, 1.415],
-[3.668, 0.804, 0.803],
-[7.920, 3.041, 3.031],
-[0.917, 0.032, 0.043],
-[19.548, 0.498, 0.477],
-[21.481, 0.573, 0.563],
-[40.165, 1.294, 1.261],
-[39.503, 0.619, 0.606],
-[4.642, 0.207, 0.203],
-[2.278, 0.169, 0.170],
-[5.301, 0.209, 0.214],
-[19.193, 0.451, 0.458],
-[15.769, 0.793, 0.782],
-[1.171, 1.139, 1.129],
-[3.804, 0.511, 0.511],
-[9.797, 0.724, 0.704],
-[9.091, 4.112, 4.069],
-[19.481, 1.974, 1.937],
-[19.489, 2.049, 1.976],
-[0.849, 0.820, 0.830],
-[0.144, 0.117, 0.115],
-[0.068, 0.052, 0.051],
-[0.075, 0.035, 0.040],
-[0.321, 0.263, 0.267],
-[0.052, 0.018, 0.024],
-[0.032, 0.012, 0.012],
-[0.012, 0.011, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/19.17.10.1_adaptive.json b/website/benchmark/versions/results/19.17.10.1_adaptive.json
deleted file mode 100644
index e7471d40b3f..00000000000
--- a/website/benchmark/versions/results/19.17.10.1_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-07-22 19.17",
-	"system_full":  "ClickHouse 19.17.10.1 2020-07-22(adaptive)",
-        "version":      "19.17.10.1",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.032, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.014, 0.002, 0.002],
-[0.016, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.018, 0.002, 0.002],
-[0.144, 0.030, 0.038],
-[0.023, 0.011, 0.011],
-[0.014, 0.002, 0.002],
-[1.242, 0.340, 0.347],
-[0.605, 0.325, 0.327],
-[0.033, 0.003, 0.003],
-[0.031, 0.014, 0.017],
-[0.130, 0.107, 0.108],
-[3.419, 0.104, 0.095],
-[3.005, 0.751, 0.754],
-[2.318, 0.055, 0.049],
-[1.282, 0.048, 0.040],
-[4.472, 0.235, 0.219],
-[4.206, 0.171, 0.171],
-[1.862, 0.212, 0.205],
-[63.410, 2.035, 2.023],
-[42.454, 1.429, 1.427],
-[3.558, 0.811, 0.802],
-[0.771, 0.168, 0.149],
-[0.123, 0.089, 0.070],
-[3.175, 0.092, 0.102],
-[0.010, 0.001, 0.001],
-[0.026, 0.009, 0.009],
-[0.340, 0.025, 0.024],
-[1.713, 0.031, 0.031],
-[1.689, 0.089, 0.079],
-[2.601, 0.214, 0.197],
-[0.025, 0.011, 0.011],
-[0.018, 0.009, 0.009],
-[2.105, 0.415, 0.411],
-[2.001, 0.454, 0.458],
-[1.032, 0.125, 0.124],
-[1.659, 0.150, 0.161],
-[2.585, 0.486, 0.474],
-[3.798, 0.580, 0.578],
-[2.360, 0.558, 0.542],
-[1.197, 0.558, 0.563],
-[4.244, 1.423, 1.425],
-[3.638, 0.813, 0.807],
-[7.920, 3.054, 3.030],
-[0.909, 0.060, 0.040],
-[19.522, 0.477, 0.454],
-[21.467, 0.575, 0.563],
-[40.174, 1.311, 1.269],
-[39.523, 0.619, 0.584],
-[4.649, 0.217, 0.201],
-[2.274, 0.173, 0.167],
-[5.286, 0.227, 0.216],
-[19.157, 0.467, 0.464],
-[15.790, 0.783, 0.784],
-[1.156, 1.141, 1.129],
-[3.850, 0.488, 0.518],
-[9.832, 0.722, 0.685],
-[9.068, 4.054, 4.058],
-[19.490, 2.038, 2.035],
-[19.504, 2.129, 1.977],
-[0.910, 0.842, 0.848],
-[0.166, 0.142, 0.122],
-[0.078, 0.050, 0.048],
-[0.069, 0.038, 0.042],
-[0.335, 0.255, 0.256],
-[0.053, 0.025, 0.019],
-[0.031, 0.012, 0.022],
-[0.012, 0.003, 0.002]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.01.16.120_adaptive.json b/website/benchmark/versions/results/20.01.16.120_adaptive.json
deleted file mode 100644
index 91c22297b07..00000000000
--- a/website/benchmark/versions/results/20.01.16.120_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-06-26 20.1",
-	"system_full":  "ClickHouse 20.1.16.120 2020-06-26(adaptive)",
-        "version":      "20.1.16.120",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.036, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.017, 0.004, 0.004],
-[0.019, 0.002, 0.002],
-[0.017, 0.002, 0.002],
-[0.015, 0.003, 0.003],
-[0.018, 0.002, 0.002],
-[0.238, 0.032, 0.022],
-[0.018, 0.009, 0.009],
-[0.014, 0.002, 0.002],
-[1.227, 0.336, 0.336],
-[0.623, 0.346, 0.328],
-[0.032, 0.003, 0.003],
-[0.031, 0.014, 0.014],
-[0.127, 0.095, 0.101],
-[3.415, 0.109, 0.108],
-[3.271, 1.135, 1.135],
-[2.268, 0.057, 0.065],
-[1.415, 0.049, 0.055],
-[4.452, 0.210, 0.223],
-[4.192, 0.195, 0.195],
-[1.769, 0.238, 0.230],
-[63.306, 2.245, 2.191],
-[42.435, 1.591, 1.558],
-[3.901, 1.178, 1.182],
-[0.778, 0.194, 0.143],
-[0.115, 0.076, 0.094],
-[4.628, 0.097, 0.095],
-[0.012, 0.001, 0.001],
-[0.029, 0.009, 0.008],
-[0.268, 0.027, 0.025],
-[1.709, 0.034, 0.032],
-[1.662, 0.093, 0.095],
-[2.554, 0.222, 0.208],
-[0.033, 0.015, 0.016],
-[0.018, 0.009, 0.008],
-[2.092, 0.425, 0.411],
-[2.011, 0.461, 0.452],
-[1.012, 0.130, 0.128],
-[1.636, 0.160, 0.154],
-[2.553, 0.501, 0.482],
-[3.775, 0.595, 0.568],
-[2.336, 0.548, 0.518],
-[1.217, 0.554, 0.552],
-[4.248, 1.415, 1.410],
-[3.650, 0.815, 0.799],
-[7.889, 2.996, 2.999],
-[0.906, 0.035, 0.038],
-[19.528, 0.487, 0.479],
-[21.456, 0.586, 0.560],
-[40.019, 1.302, 1.277],
-[39.505, 0.621, 0.584],
-[4.627, 0.186, 0.184],
-[2.321, 0.152, 0.153],
-[5.298, 0.193, 0.192],
-[19.189, 0.460, 0.444],
-[15.722, 0.766, 0.757],
-[1.193, 1.173, 1.169],
-[3.824, 0.529, 0.510],
-[9.801, 0.735, 0.711],
-[9.054, 4.012, 4.011],
-[19.468, 2.084, 2.060],
-[19.447, 2.108, 2.078],
-[0.907, 0.857, 0.845],
-[0.174, 0.146, 0.130],
-[0.067, 0.045, 0.048],
-[0.074, 0.047, 0.035],
-[0.314, 0.237, 0.260],
-[0.056, 0.013, 0.022],
-[0.043, 0.010, 0.010],
-[0.014, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.03.21.2_adaptive.json b/website/benchmark/versions/results/20.03.21.2_adaptive.json
deleted file mode 100644
index 324c7f76139..00000000000
--- a/website/benchmark/versions/results/20.03.21.2_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-11-02 20.3",
-	"system_full":  "ClickHouse 20.3.21.2 2020-11-02(adaptive)",
-        "version":      "20.3.21.2",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.038, 0.003, 0.003],
-[0.018, 0.002, 0.002],
-[0.021, 0.004, 0.004],
-[0.019, 0.002, 0.002],
-[0.018, 0.002, 0.002],
-[0.015, 0.003, 0.003],
-[0.019, 0.002, 0.002],
-[0.067, 0.028, 0.027],
-[0.021, 0.009, 0.009],
-[0.012, 0.002, 0.002],
-[1.232, 0.332, 0.336],
-[0.595, 0.316, 0.319],
-[0.036, 0.004, 0.004],
-[0.032, 0.014, 0.013],
-[0.156, 0.098, 0.097],
-[3.409, 0.100, 0.097],
-[3.255, 1.130, 1.118],
-[2.251, 0.063, 0.061],
-[1.402, 0.052, 0.054],
-[4.425, 0.245, 0.234],
-[4.160, 0.189, 0.191],
-[1.763, 0.228, 0.227],
-[63.662, 2.106, 2.094],
-[42.534, 1.413, 1.384],
-[3.879, 1.163, 1.163],
-[0.785, 0.185, 0.148],
-[0.120, 0.081, 0.071],
-[4.663, 0.110, 0.089],
-[0.011, 0.001, 0.001],
-[0.027, 0.010, 0.009],
-[0.341, 0.025, 0.022],
-[1.719, 0.033, 0.032],
-[1.687, 0.085, 0.084],
-[2.584, 0.196, 0.191],
-[0.028, 0.015, 0.016],
-[0.019, 0.009, 0.009],
-[2.053, 0.315, 0.317],
-[2.037, 0.355, 0.347],
-[1.172, 0.122, 0.125],
-[1.671, 0.145, 0.155],
-[2.552, 0.483, 0.507],
-[3.795, 0.557, 0.556],
-[2.323, 0.516, 0.548],
-[1.184, 0.526, 0.525],
-[4.187, 1.384, 1.385],
-[3.674, 0.827, 0.822],
-[7.857, 2.964, 2.991],
-[0.905, 0.062, 0.037],
-[19.548, 0.516, 0.473],
-[21.492, 0.549, 0.543],
-[40.083, 1.304, 1.276],
-[39.617, 0.624, 0.602],
-[4.629, 0.186, 0.192],
-[2.391, 0.157, 0.163],
-[5.297, 0.195, 0.195],
-[19.173, 0.464, 0.467],
-[15.765, 0.794, 0.789],
-[1.204, 1.180, 1.175],
-[3.823, 0.503, 0.493],
-[9.800, 0.708, 0.710],
-[9.058, 4.009, 3.968],
-[19.437, 1.976, 1.998],
-[19.368, 2.031, 2.052],
-[0.884, 0.838, 0.831],
-[0.169, 0.117, 0.115],
-[0.067, 0.046, 0.042],
-[0.079, 0.042, 0.044],
-[0.293, 0.245, 0.233],
-[0.050, 0.014, 0.019],
-[0.029, 0.018, 0.029],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.04.9.110_adaptive.json b/website/benchmark/versions/results/20.04.9.110_adaptive.json
deleted file mode 100644
index 1e286c9f984..00000000000
--- a/website/benchmark/versions/results/20.04.9.110_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-08-20 20.4",
-	"system_full":  "ClickHouse 20.4.9.110 2020-08-20(adaptive)",
-        "version":      "20.4.9.110",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.034, 0.003, 0.003],
-[0.061, 0.002, 0.002],
-[0.018, 0.004, 0.004],
-[0.019, 0.002, 0.002],
-[0.016, 0.002, 0.002],
-[0.017, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.058, 0.030, 0.026],
-[0.021, 0.009, 0.008],
-[0.011, 0.002, 0.002],
-[1.115, 0.329, 0.321],
-[0.626, 0.338, 0.330],
-[0.032, 0.004, 0.004],
-[0.030, 0.014, 0.013],
-[0.118, 0.129, 0.097],
-[3.428, 0.103, 0.094],
-[3.001, 0.470, 0.466],
-[2.266, 0.056, 0.061],
-[1.414, 0.056, 0.050],
-[4.436, 0.206, 0.211],
-[4.218, 0.170, 0.166],
-[1.825, 0.218, 0.218],
-[63.353, 2.084, 2.009],
-[42.428, 1.361, 1.341],
-[3.240, 0.513, 0.515],
-[0.769, 0.152, 0.151],
-[0.107, 0.068, 0.069],
-[4.636, 0.092, 0.089],
-[0.012, 0.001, 0.001],
-[0.035, 0.010, 0.010],
-[0.262, 0.024, 0.024],
-[1.695, 0.033, 0.029],
-[1.671, 0.099, 0.091],
-[2.564, 0.220, 0.207],
-[0.027, 0.012, 0.012],
-[0.020, 0.010, 0.010],
-[1.986, 0.327, 0.330],
-[2.008, 0.365, 0.362],
-[0.997, 0.122, 0.121],
-[1.657, 0.154, 0.151],
-[2.537, 0.467, 0.466],
-[3.767, 0.572, 0.559],
-[2.315, 0.521, 0.546],
-[1.126, 0.519, 0.540],
-[4.176, 1.361, 1.375],
-[3.667, 0.824, 0.819],
-[7.799, 2.987, 2.913],
-[0.890, 0.058, 0.043],
-[19.493, 0.543, 0.513],
-[21.321, 0.585, 0.575],
-[39.970, 1.294, 1.275],
-[39.519, 0.656, 0.618],
-[4.625, 0.179, 0.174],
-[2.327, 0.150, 0.153],
-[5.305, 0.202, 0.197],
-[19.199, 0.458, 0.447],
-[15.612, 0.784, 0.773],
-[1.152, 1.136, 1.134],
-[3.821, 0.470, 0.470],
-[9.794, 0.712, 0.688],
-[9.036, 4.000, 3.941],
-[19.410, 1.997, 1.967],
-[19.237, 2.013, 2.008],
-[0.884, 0.828, 0.831],
-[0.172, 0.135, 0.117],
-[0.067, 0.046, 0.051],
-[0.072, 0.037, 0.041],
-[0.293, 0.220, 0.243],
-[0.053, 0.026, 0.013],
-[0.032, 0.021, 0.015],
-[0.015, 0.003, 0.010]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.05.5.74_adaptive.json b/website/benchmark/versions/results/20.05.5.74_adaptive.json
deleted file mode 100644
index cbed25cdf08..00000000000
--- a/website/benchmark/versions/results/20.05.5.74_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-08-20 20.5",
-	"system_full":  "ClickHouse 20.5.5.74 2020-08-20(adaptive)",
-        "version":      "20.5.5.74",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.017, 0.003, 0.003],
-[0.012, 0.002, 0.002],
-[0.017, 0.004, 0.004],
-[0.011, 0.002, 0.002],
-[0.014, 0.002, 0.002],
-[0.010, 0.003, 0.003],
-[0.019, 0.002, 0.002],
-[0.075, 0.029, 0.026],
-[0.018, 0.008, 0.008],
-[0.009, 0.002, 0.002],
-[0.987, 0.327, 0.319],
-[0.649, 0.326, 0.291],
-[0.034, 0.004, 0.004],
-[0.031, 0.014, 0.014],
-[0.139, 0.101, 0.097],
-[3.401, 0.097, 0.090],
-[2.982, 0.493, 0.470],
-[2.267, 0.061, 0.054],
-[1.421, 0.050, 0.046],
-[4.444, 0.206, 0.206],
-[4.235, 0.170, 0.171],
-[1.830, 0.210, 0.213],
-[63.495, 1.978, 1.955],
-[42.433, 1.320, 1.303],
-[3.312, 0.528, 0.515],
-[0.879, 0.168, 0.163],
-[0.115, 0.065, 0.071],
-[4.676, 0.097, 0.093],
-[0.010, 0.001, 0.001],
-[0.027, 0.009, 0.009],
-[0.313, 0.025, 0.023],
-[1.700, 0.031, 0.029],
-[1.684, 0.096, 0.096],
-[2.569, 0.221, 0.207],
-[0.027, 0.013, 0.012],
-[0.020, 0.010, 0.009],
-[1.965, 0.327, 0.331],
-[2.019, 0.371, 0.363],
-[1.054, 0.124, 0.121],
-[1.669, 0.157, 0.144],
-[2.538, 0.442, 0.427],
-[3.784, 0.537, 0.544],
-[2.356, 0.512, 0.524],
-[1.179, 0.526, 0.516],
-[4.170, 1.364, 1.314],
-[3.675, 0.821, 0.795],
-[7.808, 2.835, 2.806],
-[0.897, 0.049, 0.040],
-[19.506, 0.490, 0.478],
-[21.397, 0.535, 0.574],
-[39.973, 1.263, 1.231],
-[39.497, 0.623, 0.580],
-[4.624, 0.180, 0.177],
-[2.332, 0.149, 0.149],
-[5.305, 0.183, 0.185],
-[19.203, 0.456, 0.443],
-[15.583, 0.771, 0.783],
-[1.159, 1.134, 1.123],
-[3.818, 0.443, 0.460],
-[9.802, 0.690, 0.662],
-[9.004, 3.952, 3.935],
-[19.402, 1.989, 1.922],
-[19.316, 1.972, 1.892],
-[0.876, 0.826, 0.797],
-[0.177, 0.119, 0.112],
-[0.067, 0.043, 0.049],
-[0.076, 0.044, 0.039],
-[0.312, 0.238, 0.245],
-[0.047, 0.022, 0.017],
-[0.040, 0.014, 0.015],
-[0.014, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.06.11.1_adaptive.json b/website/benchmark/versions/results/20.06.11.1_adaptive.json
deleted file mode 100644
index 816df9b93e5..00000000000
--- a/website/benchmark/versions/results/20.06.11.1_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-12-09 20.6",
-	"system_full":  "ClickHouse 20.6.11.1 2020-12-09(adaptive)",
-        "version":      "2020-12-09",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.021, 0.004, 0.004],
-[0.012, 0.002, 0.002],
-[0.019, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.013, 0.003, 0.003],
-[0.010, 0.003, 0.004],
-[0.016, 0.002, 0.002],
-[0.063, 0.029, 0.026],
-[0.018, 0.008, 0.009],
-[0.009, 0.002, 0.002],
-[0.988, 0.318, 0.320],
-[0.631, 0.304, 0.315],
-[0.032, 0.004, 0.004],
-[0.031, 0.014, 0.015],
-[0.114, 0.102, 0.133],
-[3.430, 0.098, 0.093],
-[3.001, 0.496, 0.488],
-[2.257, 0.057, 0.059],
-[1.412, 0.054, 0.054],
-[4.430, 0.215, 0.214],
-[4.211, 0.174, 0.172],
-[1.831, 0.216, 0.217],
-[63.359, 2.025, 2.017],
-[42.442, 1.349, 1.339],
-[3.265, 0.533, 0.540],
-[0.796, 0.155, 0.178],
-[0.117, 0.070, 0.065],
-[4.640, 0.093, 0.101],
-[0.011, 0.002, 0.001],
-[0.027, 0.011, 0.010],
-[0.322, 0.022, 0.025],
-[1.729, 0.031, 0.031],
-[1.692, 0.095, 0.092],
-[2.558, 0.212, 0.196],
-[0.025, 0.015, 0.013],
-[0.020, 0.010, 0.010],
-[2.065, 0.340, 0.335],
-[2.015, 0.380, 0.378],
-[1.016, 0.132, 0.131],
-[1.644, 0.161, 0.156],
-[2.509, 0.441, 0.447],
-[3.769, 0.577, 0.530],
-[2.357, 0.538, 0.530],
-[1.175, 0.545, 0.532],
-[4.177, 1.338, 1.320],
-[3.671, 0.800, 0.804],
-[7.821, 2.833, 2.787],
-[0.908, 0.122, 0.075],
-[19.423, 0.477, 0.463],
-[21.438, 0.591, 0.545],
-[39.980, 1.269, 1.253],
-[39.490, 0.625, 0.589],
-[4.620, 0.196, 0.182],
-[2.322, 0.155, 0.158],
-[5.295, 0.193, 0.198],
-[19.194, 0.452, 0.449],
-[15.789, 0.785, 0.765],
-[1.160, 1.127, 1.128],
-[3.854, 0.470, 0.451],
-[9.914, 0.727, 0.703],
-[9.172, 4.111, 4.067],
-[19.409, 2.006, 1.927],
-[19.235, 1.968, 1.900],
-[0.868, 0.831, 0.798],
-[0.173, 0.116, 0.116],
-[0.072, 0.047, 0.048],
-[0.077, 0.039, 0.045],
-[0.294, 0.227, 0.228],
-[0.048, 0.016, 0.025],
-[0.037, 0.026, 0.018],
-[0.015, 0.012, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.07.4.11_adaptive.json b/website/benchmark/versions/results/20.07.4.11_adaptive.json
deleted file mode 100644
index e4e14d1b4ed..00000000000
--- a/website/benchmark/versions/results/20.07.4.11_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-10-09 20.7",
-	"system_full":  "ClickHouse 20.7.4.11 2020-10-09(adaptive)",
-        "version":      "20.7.4.11",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.017, 0.004, 0.004],
-[0.012, 0.002, 0.002],
-[0.017, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.013, 0.003, 0.003],
-[0.010, 0.003, 0.003],
-[0.016, 0.002, 0.003],
-[0.073, 0.030, 0.027],
-[0.019, 0.008, 0.009],
-[0.009, 0.002, 0.003],
-[1.109, 0.324, 0.320],
-[0.639, 0.323, 0.287],
-[0.031, 0.004, 0.004],
-[0.031, 0.014, 0.014],
-[0.119, 0.136, 0.094],
-[3.426, 0.109, 0.100],
-[2.994, 0.161, 0.161],
-[2.740, 0.063, 0.060],
-[1.402, 0.052, 0.054],
-[4.421, 0.187, 0.190],
-[4.250, 0.157, 0.138],
-[1.880, 0.219, 0.201],
-[63.407, 1.970, 1.960],
-[42.465, 1.336, 1.321],
-[2.928, 0.207, 0.218],
-[1.134, 0.155, 0.142],
-[0.119, 0.070, 0.072],
-[4.686, 0.089, 0.089],
-[0.010, 0.001, 0.002],
-[0.029, 0.010, 0.010],
-[0.322, 0.024, 0.026],
-[1.696, 0.033, 0.030],
-[1.681, 0.094, 0.092],
-[2.576, 0.204, 0.197],
-[0.029, 0.015, 0.015],
-[0.020, 0.010, 0.011],
-[2.019, 0.330, 0.328],
-[2.029, 0.370, 0.378],
-[1.031, 0.126, 0.134],
-[1.638, 0.150, 0.150],
-[2.582, 0.454, 0.413],
-[3.750, 0.550, 0.518],
-[2.374, 0.533, 0.504],
-[1.189, 0.526, 0.509],
-[4.192, 1.329, 1.299],
-[3.656, 0.811, 0.788],
-[7.830, 2.852, 2.762],
-[0.888, 0.128, 0.056],
-[19.419, 0.541, 0.491],
-[21.463, 0.543, 0.536],
-[40.010, 1.276, 1.247],
-[39.537, 0.660, 0.607],
-[4.633, 0.192, 0.189],
-[2.296, 0.150, 0.154],
-[5.319, 0.186, 0.181],
-[19.258, 0.449, 0.449],
-[15.793, 0.767, 0.766],
-[1.147, 1.125, 1.121],
-[3.821, 0.474, 0.466],
-[9.793, 0.690, 0.666],
-[9.069, 3.982, 4.006],
-[19.417, 1.995, 1.882],
-[19.408, 1.973, 1.894],
-[0.870, 0.807, 0.799],
-[0.148, 0.119, 0.111],
-[0.075, 0.046, 0.052],
-[0.072, 0.041, 0.039],
-[0.318, 0.230, 0.226],
-[0.068, 0.018, 0.025],
-[0.029, 0.015, 0.014],
-[0.018, 0.004, 0.004]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.08.19.4.json b/website/benchmark/versions/results/20.08.19.4.json
deleted file mode 100644
index d2b2b41ceb0..00000000000
--- a/website/benchmark/versions/results/20.08.19.4.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-07-11 20.8",
-        "system_full":  "ClickHouse 20.8.19.4 2021-07-11",
-        "version":      "20.8.19.4",
-	"kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.042, 0.011, 0.012],
-[0.064, 0.031, 0.032],
-[0.037, 0.010, 0.010],
-[0.038, 0.015, 0.015],
-[0.053, 0.033, 0.029],
-[0.065, 0.016, 0.017],
-[0.060, 0.005, 0.006],
-[0.335, 0.031, 0.029],
-[0.498, 0.052, 0.053],
-[0.507, 0.082, 0.084],
-[1.930, 0.553, 0.551],
-[1.488, 0.498, 0.476],
-[0.029, 0.005, 0.005],
-[0.030, 0.014, 0.014],
-[0.133, 0.106, 0.102],
-[3.315, 0.116, 0.103],
-[2.560, 0.138, 0.145],
-[2.209, 0.087, 0.063],
-[1.218, 0.061, 0.056],
-[5.103, 0.201, 0.192],
-[4.795, 0.166, 0.161],
-[1.884, 0.174, 0.196],
-[63.515, 2.121, 2.103],
-[42.496, 1.428, 1.386],
-[4.439, 0.193, 0.187],
-[1.458, 0.156, 0.155],
-[0.238, 0.057, 0.063],
-[5.102, 0.088, 0.085],
-[0.008, 0.002, 0.002],
-[0.029, 0.011, 0.011],
-[0.479, 0.028, 0.026],
-[1.723, 0.028, 0.031],
-[1.730, 0.091, 0.093],
-[2.545, 0.199, 0.195],
-[0.029, 0.016, 0.016],
-[0.021, 0.010, 0.010],
-[2.223, 0.345, 0.329],
-[2.234, 0.380, 0.382],
-[1.029, 0.115, 0.113],
-[1.703, 0.146, 0.138],
-[2.568, 0.452, 0.430],
-[3.769, 0.545, 0.548],
-[2.370, 0.542, 0.518],
-[1.239, 0.526, 0.528],
-[4.186, 1.388, 1.335],
-[3.652, 0.845, 0.824],
-[7.822, 2.888, 2.870],
-[0.937, 0.134, 0.052],
-[18.851, 0.550, 0.538],
-[20.853, 0.578, 0.608],
-[38.786, 1.395, 1.372],
-[38.926, 0.706, 0.656],
-[4.545, 0.182, 0.184],
-[2.309, 0.143, 0.142],
-[5.274, 0.182, 0.182],
-[18.667, 0.502, 0.524],
-[15.385, 0.807, 0.816],
-[1.203, 1.191, 1.180],
-[3.875, 0.457, 0.468],
-[9.798, 0.714, 0.673],
-[9.077, 3.991, 3.987],
-[18.866, 2.138, 2.090],
-[18.921, 2.146, 2.070],
-[0.904, 0.854, 0.846],
-[0.118, 0.088, 0.114],
-[0.061, 0.043, 0.039],
-[0.058, 0.045, 0.037],
-[0.212, 0.188, 0.161],
-[0.046, 0.014, 0.012],
-[0.026, 0.021, 0.009],
-[0.015, 0.004, 0.011]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.08.19.4_adaptive.json b/website/benchmark/versions/results/20.08.19.4_adaptive.json
deleted file mode 100644
index 4f1ef56cdd0..00000000000
--- a/website/benchmark/versions/results/20.08.19.4_adaptive.json
+++ /dev/null
@@ -1,86 +0,0 @@
-
-[
-    {
-        "system":       "2021-07-11 20.8",
-	"system_full":  "ClickHouse 20.8.19.4 2021-07-11(adaptive)",
-        "version":      "20.8.19.4",
-	"kind":         "adaptive", 
-	"kind":         "",
-        "comments":     "",
-        "result":
-        [
-
-[0.021, 0.004, 0.004],
-[0.013, 0.002, 0.002],
-[0.017, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.013, 0.002, 0.003],
-[0.011, 0.003, 0.003],
-[0.018, 0.002, 0.002],
-[0.076, 0.028, 0.021],
-[0.018, 0.009, 0.008],
-[0.010, 0.002, 0.002],
-[1.009, 0.331, 0.329],
-[0.604, 0.311, 0.319],
-[0.029, 0.004, 0.004],
-[0.033, 0.014, 0.014],
-[0.119, 0.096, 0.098],
-[3.418, 0.102, 0.098],
-[3.006, 0.165, 0.157],
-[2.750, 0.060, 0.066],
-[1.390, 0.050, 0.051],
-[4.429, 0.202, 0.214],
-[4.188, 0.150, 0.159],
-[1.854, 0.200, 0.206],
-[63.423, 2.078, 2.029],
-[42.477, 1.373, 1.340],
-[2.925, 0.205, 0.209],
-[1.147, 0.154, 0.146],
-[0.109, 0.071, 0.085],
-[4.647, 0.088, 0.091],
-[0.010, 0.001, 0.001],
-[0.027, 0.009, 0.010],
-[0.339, 0.024, 0.025],
-[1.723, 0.031, 0.031],
-[1.670, 0.093, 0.091],
-[2.589, 0.205, 0.212],
-[0.035, 0.016, 0.017],
-[0.020, 0.011, 0.010],
-[1.997, 0.337, 0.323],
-[2.027, 0.359, 0.365],
-[1.043, 0.118, 0.116],
-[1.673, 0.149, 0.146],
-[2.558, 0.453, 0.425],
-[3.782, 0.546, 0.525],
-[2.372, 0.525, 0.502],
-[1.178, 0.529, 0.515],
-[4.370, 1.352, 1.305],
-[3.655, 0.798, 0.791],
-[7.837, 2.829, 2.802],
-[0.896, 0.153, 0.086],
-[19.375, 0.554, 0.506],
-[21.462, 0.552, 0.559],
-[40.026, 1.272, 1.253],
-[39.523, 0.656, 0.638],
-[4.624, 0.190, 0.191],
-[2.287, 0.149, 0.148],
-[5.342, 0.186, 0.191],
-[19.237, 0.460, 0.446],
-[15.673, 0.782, 0.759],
-[1.148, 1.127, 1.125],
-[3.812, 0.452, 0.447],
-[9.773, 0.672, 0.652],
-[8.977, 3.897, 3.828],
-[19.403, 1.921, 1.925],
-[19.249, 1.966, 1.929],
-[0.863, 0.810, 0.787],
-[0.144, 0.115, 0.114],
-[0.078, 0.048, 0.045],
-[0.068, 0.044, 0.045],
-[0.291, 0.245, 0.221],
-[0.062, 0.015, 0.014],
-[0.042, 0.014, 0.011],
-[0.015, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.09.7.11_adaptive.json b/website/benchmark/versions/results/20.09.7.11_adaptive.json
deleted file mode 100644
index cd2bbae0158..00000000000
--- a/website/benchmark/versions/results/20.09.7.11_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-12-07 20.9",
-	"system_full":  "ClickHouse 20.9.7.11 2020-12-07(adaptive)",
-        "version":      "20.9.7.11",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.020, 0.004, 0.004],
-[0.011, 0.002, 0.002],
-[0.017, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.015, 0.003, 0.003],
-[0.011, 0.003, 0.003],
-[0.019, 0.002, 0.002],
-[0.059, 0.031, 0.030],
-[0.019, 0.009, 0.008],
-[0.011, 0.002, 0.002],
-[0.863, 0.338, 0.338],
-[0.583, 0.306, 0.311],
-[0.028, 0.004, 0.005],
-[0.030, 0.014, 0.014],
-[0.151, 0.093, 0.096],
-[3.419, 0.110, 0.096],
-[2.907, 0.154, 0.151],
-[2.774, 0.054, 0.060],
-[1.319, 0.044, 0.048],
-[4.413, 0.185, 0.189],
-[4.250, 0.147, 0.153],
-[1.861, 0.204, 0.191],
-[63.419, 2.030, 1.990],
-[42.508, 1.353, 1.333],
-[2.928, 0.208, 0.208],
-[1.150, 0.179, 0.157],
-[0.105, 0.079, 0.067],
-[4.658, 0.097, 0.092],
-[0.010, 0.002, 0.002],
-[0.029, 0.010, 0.010],
-[0.303, 0.025, 0.024],
-[1.725, 0.031, 0.030],
-[1.665, 0.085, 0.083],
-[2.586, 0.197, 0.192],
-[0.029, 0.016, 0.016],
-[0.018, 0.010, 0.010],
-[2.014, 0.309, 0.306],
-[2.069, 0.340, 0.341],
-[1.097, 0.121, 0.116],
-[1.658, 0.142, 0.141],
-[2.564, 0.470, 0.439],
-[3.798, 0.538, 0.529],
-[2.328, 0.537, 0.492],
-[1.157, 0.515, 0.514],
-[4.157, 1.346, 1.311],
-[3.663, 0.796, 0.777],
-[7.840, 2.878, 2.741],
-[0.899, 0.126, 0.048],
-[19.450, 0.536, 0.485],
-[21.523, 0.539, 0.531],
-[40.028, 1.275, 1.236],
-[39.551, 0.647, 0.618],
-[4.656, 0.178, 0.176],
-[2.335, 0.151, 0.139],
-[5.338, 0.176, 0.177],
-[19.315, 0.452, 0.433],
-[15.803, 0.770, 0.759],
-[1.150, 1.122, 1.129],
-[3.845, 0.449, 0.457],
-[9.791, 0.689, 0.666],
-[9.005, 3.932, 3.850],
-[19.470, 1.954, 1.916],
-[19.262, 1.966, 1.901],
-[0.873, 0.798, 0.802],
-[0.154, 0.114, 0.113],
-[0.066, 0.041, 0.042],
-[0.077, 0.056, 0.042],
-[0.294, 0.243, 0.245],
-[0.053, 0.016, 0.015],
-[0.043, 0.011, 0.024],
-[0.015, 0.005, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.10.7.4_adaptive.json b/website/benchmark/versions/results/20.10.7.4_adaptive.json
deleted file mode 100644
index 166c3d462ac..00000000000
--- a/website/benchmark/versions/results/20.10.7.4_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2020-12-24 20.10",
-	"system_full":  "ClickHouse 20.10.7.4 2020-12-24(adaptive)",
-        "version":      "20.10.7.4",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.019, 0.004, 0.004],
-[0.011, 0.002, 0.002],
-[0.019, 0.004, 0.004],
-[0.009, 0.002, 0.002],
-[0.013, 0.002, 0.002],
-[0.010, 0.004, 0.004],
-[0.017, 0.002, 0.002],
-[0.078, 0.028, 0.024],
-[0.016, 0.011, 0.008],
-[0.010, 0.002, 0.002],
-[1.227, 0.346, 0.338],
-[0.579, 0.341, 0.335],
-[0.031, 0.004, 0.004],
-[0.032, 0.015, 0.019],
-[0.125, 0.097, 0.099],
-[3.426, 0.101, 0.098],
-[3.020, 0.149, 0.146],
-[2.789, 0.060, 0.057],
-[1.430, 0.049, 0.058],
-[4.427, 0.242, 0.224],
-[4.169, 0.193, 0.186],
-[1.818, 0.238, 0.239],
-[63.459, 2.557, 2.539],
-[42.438, 1.662, 1.627],
-[2.923, 0.209, 0.199],
-[1.165, 0.178, 0.154],
-[0.120, 0.082, 0.087],
-[4.645, 0.105, 0.120],
-[0.011, 0.001, 0.001],
-[0.026, 0.011, 0.010],
-[0.262, 0.023, 0.022],
-[1.686, 0.031, 0.032],
-[1.681, 0.095, 0.092],
-[2.548, 0.238, 0.227],
-[0.029, 0.015, 0.015],
-[0.019, 0.010, 0.010],
-[1.941, 0.320, 0.316],
-[2.027, 0.356, 0.362],
-[1.055, 0.146, 0.146],
-[1.618, 0.170, 0.182],
-[2.513, 0.484, 0.423],
-[3.774, 0.555, 0.534],
-[2.363, 0.566, 0.516],
-[1.180, 0.534, 0.544],
-[4.235, 1.425, 1.384],
-[3.644, 0.819, 0.801],
-[8.000, 3.018, 2.921],
-[0.879, 0.165, 0.035],
-[19.441, 0.484, 0.463],
-[21.474, 0.583, 0.606],
-[40.105, 1.336, 1.341],
-[39.496, 0.607, 0.587],
-[4.623, 0.194, 0.194],
-[2.320, 0.167, 0.162],
-[5.290, 0.189, 0.200],
-[19.186, 0.507, 0.486],
-[15.783, 0.730, 0.715],
-[1.133, 1.110, 1.115],
-[3.838, 0.471, 0.469],
-[9.799, 0.692, 0.677],
-[9.014, 3.920, 3.907],
-[19.380, 1.999, 1.962],
-[19.270, 1.979, 1.950],
-[0.844, 0.775, 0.759],
-[0.169, 0.110, 0.116],
-[0.064, 0.041, 0.048],
-[0.091, 0.042, 0.037],
-[0.301, 0.245, 0.226],
-[0.050, 0.021, 0.020],
-[0.034, 0.011, 0.014],
-[0.015, 0.004, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.11.7.16_adaptive.json b/website/benchmark/versions/results/20.11.7.16_adaptive.json
deleted file mode 100644
index bf706fbdeb1..00000000000
--- a/website/benchmark/versions/results/20.11.7.16_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-02-03 20.11",
-	"system_full":  "ClickHouse 20.11.7.16 2021-02-03(adaptive)",
-        "version":      "2021-02-03",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.023, 0.004, 0.004],
-[0.013, 0.002, 0.002],
-[0.019, 0.005, 0.004],
-[0.009, 0.002, 0.002],
-[0.013, 0.003, 0.003],
-[0.010, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.085, 0.030, 0.027],
-[0.016, 0.009, 0.009],
-[0.009, 0.002, 0.002],
-[1.034, 0.337, 0.347],
-[0.558, 0.330, 0.313],
-[0.036, 0.004, 0.004],
-[0.032, 0.016, 0.015],
-[0.118, 0.099, 0.103],
-[3.423, 0.102, 0.097],
-[3.129, 0.146, 0.139],
-[2.774, 0.064, 0.056],
-[1.368, 0.058, 0.050],
-[4.421, 0.259, 0.226],
-[4.154, 0.204, 0.192],
-[1.790, 0.239, 0.236],
-[63.324, 2.536, 2.532],
-[42.446, 1.660, 1.645],
-[2.928, 0.211, 0.206],
-[1.151, 0.137, 0.168],
-[0.116, 0.079, 0.072],
-[4.668, 0.125, 0.118],
-[0.010, 0.001, 0.001],
-[0.036, 0.010, 0.010],
-[0.268, 0.020, 0.021],
-[1.723, 0.032, 0.032],
-[1.674, 0.104, 0.091],
-[2.554, 0.237, 0.248],
-[0.029, 0.016, 0.016],
-[0.019, 0.009, 0.009],
-[1.927, 0.319, 0.325],
-[1.997, 0.363, 0.351],
-[1.071, 0.147, 0.145],
-[1.617, 0.176, 0.188],
-[2.512, 0.455, 0.465],
-[3.782, 0.551, 0.542],
-[2.367, 0.530, 0.557],
-[1.195, 0.560, 0.527],
-[4.303, 1.411, 1.411],
-[3.652, 0.830, 0.811],
-[7.991, 3.038, 2.955],
-[0.892, 0.143, 0.039],
-[19.450, 0.493, 0.506],
-[21.273, 0.604, 0.617],
-[40.013, 1.335, 1.313],
-[39.502, 0.628, 0.578],
-[4.624, 0.202, 0.200],
-[2.295, 0.158, 0.163],
-[5.295, 0.193, 0.187],
-[19.195, 0.524, 0.500],
-[15.579, 0.730, 0.731],
-[1.139, 1.114, 1.112],
-[3.826, 0.492, 0.481],
-[9.809, 0.707, 0.677],
-[8.992, 3.956, 3.902],
-[19.401, 1.989, 1.952],
-[19.272, 1.963, 1.901],
-[0.811, 0.772, 0.765],
-[0.140, 0.110, 0.108],
-[0.065, 0.047, 0.049],
-[0.074, 0.040, 0.046],
-[0.294, 0.231, 0.226],
-[0.047, 0.021, 0.020],
-[0.039, 0.011, 0.025],
-[0.012, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/20.12.8.5_adaptive.json b/website/benchmark/versions/results/20.12.8.5_adaptive.json
deleted file mode 100644
index 8322c449144..00000000000
--- a/website/benchmark/versions/results/20.12.8.5_adaptive.json
+++ /dev/null
@@ -1,86 +0,0 @@
-
-[
-    {
-        "system":       "2021-03-02 20.12",
-	"system_full":  "ClickHouse 20.12.8.5 2021-03-02(adaptive)",
-        "version":      "2021-03-02",
-        "time":         "2021-03-02",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.019, 0.004, 0.004],
-[0.011, 0.002, 0.002],
-[0.015, 0.004, 0.005],
-[0.009, 0.002, 0.002],
-[0.014, 0.003, 0.003],
-[0.010, 0.004, 0.003],
-[0.016, 0.002, 0.002],
-[0.076, 0.028, 0.020],
-[0.016, 0.010, 0.008],
-[0.014, 0.002, 0.002],
-[1.224, 0.345, 0.336],
-[0.600, 0.315, 0.331],
-[0.029, 0.004, 0.004],
-[0.033, 0.015, 0.016],
-[0.120, 0.099, 0.095],
-[3.426, 0.106, 0.119],
-[3.117, 0.242, 0.234],
-[2.595, 0.061, 0.052],
-[1.436, 0.061, 0.060],
-[4.433, 0.230, 0.222],
-[4.213, 0.190, 0.205],
-[1.810, 0.260, 0.239],
-[63.332, 2.577, 2.558],
-[42.473, 1.621, 1.564],
-[3.025, 0.304, 0.309],
-[0.956, 0.174, 0.170],
-[0.126, 0.084, 0.104],
-[4.624, 0.102, 0.131],
-[0.011, 0.001, 0.001],
-[0.027, 0.009, 0.010],
-[0.240, 0.023, 0.021],
-[1.711, 0.030, 0.027],
-[1.681, 0.099, 0.100],
-[2.541, 0.232, 0.235],
-[0.029, 0.015, 0.015],
-[0.017, 0.011, 0.010],
-[2.008, 0.342, 0.326],
-[2.037, 0.374, 0.358],
-[1.067, 0.158, 0.156],
-[1.612, 0.181, 0.167],
-[2.496, 0.504, 0.427],
-[3.784, 0.561, 0.557],
-[2.386, 0.576, 0.543],
-[1.213, 0.554, 0.538],
-[4.249, 1.422, 1.398],
-[3.692, 0.825, 0.814],
-[8.007, 2.959, 2.938],
-[0.919, 0.155, 0.035],
-[19.417, 0.492, 0.457],
-[21.492, 0.593, 0.566],
-[40.016, 1.311, 1.271],
-[39.555, 0.602, 0.589],
-[4.636, 0.217, 0.203],
-[2.307, 0.161, 0.166],
-[5.319, 0.209, 0.206],
-[19.166, 0.501, 0.482],
-[15.822, 0.718, 0.725],
-[1.096, 1.070, 1.073],
-[3.831, 0.496, 0.493],
-[9.821, 0.731, 0.688],
-[9.067, 3.928, 3.881],
-[19.446, 1.976, 1.898],
-[19.444, 2.021, 1.946],
-[0.819, 0.777, 0.765],
-[0.146, 0.115, 0.114],
-[0.065, 0.051, 0.044],
-[0.071, 0.047, 0.044],
-[0.288, 0.211, 0.219],
-[0.050, 0.019, 0.021],
-[0.028, 0.012, 0.010],
-[0.015, 0.010, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.01.9.41_adaptive.json b/website/benchmark/versions/results/21.01.9.41_adaptive.json
deleted file mode 100644
index 541fdc92ffb..00000000000
--- a/website/benchmark/versions/results/21.01.9.41_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-04-13 21.1",
-	"system_full":  "ClickHouse 21.1.9.41 2021-04-13(adaptive)",
-        "version":      "21.1.9.41",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.020, 0.004, 0.004],
-[0.011, 0.002, 0.002],
-[0.015, 0.004, 0.004],
-[0.009, 0.002, 0.002],
-[0.014, 0.003, 0.003],
-[0.010, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.081, 0.027, 0.026],
-[0.017, 0.008, 0.010],
-[0.016, 0.002, 0.002],
-[1.227, 0.335, 0.302],
-[0.656, 0.324, 0.325],
-[0.033, 0.005, 0.004],
-[0.034, 0.016, 0.015],
-[0.128, 0.098, 0.159],
-[3.429, 0.097, 0.096],
-[3.031, 0.251, 0.227],
-[3.755, 0.083, 0.081],
-[1.369, 0.045, 0.052],
-[4.412, 0.230, 0.219],
-[4.211, 0.208, 0.177],
-[1.788, 0.239, 0.222],
-[63.467, 2.373, 2.366],
-[42.459, 1.503, 1.478],
-[3.071, 0.292, 0.278],
-[1.660, 0.156, 0.151],
-[0.360, 0.106, 0.097],
-[4.666, 0.113, 0.111],
-[0.011, 0.001, 0.001],
-[0.027, 0.009, 0.010],
-[0.277, 0.021, 0.023],
-[1.700, 0.032, 0.028],
-[1.670, 0.089, 0.092],
-[2.554, 0.233, 0.245],
-[0.028, 0.015, 0.014],
-[0.020, 0.009, 0.009],
-[1.918, 0.321, 0.326],
-[2.024, 0.354, 0.360],
-[1.097, 0.152, 0.143],
-[1.621, 0.184, 0.194],
-[2.496, 0.462, 0.443],
-[3.811, 0.554, 0.557],
-[2.351, 0.568, 0.549],
-[1.207, 0.551, 0.545],
-[4.253, 1.418, 1.384],
-[3.671, 0.832, 0.817],
-[7.993, 3.087, 2.952],
-[0.922, 0.156, 0.059],
-[19.390, 0.480, 0.464],
-[21.473, 0.577, 0.559],
-[40.078, 1.308, 1.275],
-[39.505, 0.602, 0.584],
-[4.637, 0.207, 0.194],
-[2.299, 0.167, 0.165],
-[5.295, 0.199, 0.204],
-[19.197, 0.476, 0.489],
-[15.831, 0.725, 0.711],
-[1.103, 1.073, 1.068],
-[3.845, 0.483, 0.477],
-[9.822, 0.724, 0.689],
-[9.006, 3.969, 3.947],
-[19.443, 1.984, 1.918],
-[19.262, 1.993, 1.926],
-[0.823, 0.789, 0.754],
-[0.161, 0.110, 0.111],
-[0.064, 0.045, 0.048],
-[0.070, 0.038, 0.048],
-[0.290, 0.224, 0.235],
-[0.050, 0.014, 0.013],
-[0.040, 0.012, 0.022],
-[0.013, 0.009, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.02.10.48_adaptive.json b/website/benchmark/versions/results/21.02.10.48_adaptive.json
deleted file mode 100644
index 3c710e3e236..00000000000
--- a/website/benchmark/versions/results/21.02.10.48_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-04-17 21.2",
-	"system_full":  "ClickHouse 21.2.10.48 2021-04-17(adaptive)",
-        "version":      "21.2.10.48",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.023, 0.005, 0.005],
-[0.012, 0.003, 0.003],
-[0.017, 0.005, 0.005],
-[0.011, 0.003, 0.003],
-[0.015, 0.003, 0.003],
-[0.011, 0.004, 0.004],
-[0.015, 0.002, 0.002],
-[0.060, 0.030, 0.021],
-[0.018, 0.009, 0.008],
-[0.009, 0.002, 0.002],
-[1.213, 0.335, 0.324],
-[0.799, 0.347, 0.310],
-[0.032, 0.004, 0.004],
-[0.031, 0.016, 0.017],
-[0.117, 0.098, 0.101],
-[3.424, 0.105, 0.096],
-[3.014, 0.229, 0.234],
-[3.778, 0.078, 0.077],
-[1.376, 0.058, 0.057],
-[4.413, 0.235, 0.198],
-[4.229, 0.191, 0.201],
-[1.805, 0.254, 0.228],
-[63.464, 2.504, 2.457],
-[42.441, 1.549, 1.610],
-[3.070, 0.283, 0.279],
-[1.675, 0.168, 0.168],
-[0.329, 0.085, 0.085],
-[4.712, 0.131, 0.104],
-[0.010, 0.002, 0.002],
-[0.026, 0.009, 0.009],
-[0.301, 0.022, 0.022],
-[1.726, 0.032, 0.032],
-[1.664, 0.093, 0.101],
-[2.568, 0.258, 0.247],
-[0.031, 0.015, 0.016],
-[0.018, 0.010, 0.010],
-[1.946, 0.333, 0.317],
-[2.054, 0.361, 0.371],
-[1.065, 0.147, 0.150],
-[1.611, 0.176, 0.164],
-[2.519, 0.445, 0.442],
-[3.793, 0.586, 0.572],
-[2.383, 0.560, 0.555],
-[1.202, 0.551, 0.557],
-[4.249, 1.419, 1.410],
-[3.666, 0.823, 0.793],
-[7.991, 3.022, 2.988],
-[0.921, 0.078, 0.040],
-[19.494, 0.495, 0.472],
-[21.495, 0.584, 0.589],
-[40.170, 1.361, 1.331],
-[39.540, 0.620, 0.591],
-[4.635, 0.202, 0.201],
-[2.313, 0.175, 0.176],
-[5.267, 0.206, 0.191],
-[19.183, 0.500, 0.493],
-[15.799, 0.739, 0.723],
-[1.083, 1.060, 1.060],
-[3.830, 0.495, 0.470],
-[9.810, 0.730, 0.724],
-[9.028, 3.997, 3.907],
-[19.429, 2.052, 1.930],
-[19.247, 2.000, 1.937],
-[0.825, 0.767, 0.785],
-[0.170, 0.121, 0.113],
-[0.066, 0.046, 0.044],
-[0.075, 0.044, 0.038],
-[0.296, 0.236, 0.241],
-[0.047, 0.036, 0.026],
-[0.036, 0.015, 0.021],
-[0.017, 0.007, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.03.20.1_adaptive.json b/website/benchmark/versions/results/21.03.20.1_adaptive.json
deleted file mode 100644
index 38aaf75dc91..00000000000
--- a/website/benchmark/versions/results/21.03.20.1_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-01-26 21.3",
-	"system_full":  "ClickHouse 21.3.20.1 2022-01-26(adaptive)",
-        "version":      "21.3.20.1",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.023, 0.004, 0.004],
-[0.012, 0.003, 0.003],
-[0.016, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.013, 0.003, 0.003],
-[0.012, 0.004, 0.004],
-[0.016, 0.002, 0.002],
-[0.057, 0.026, 0.022],
-[0.018, 0.007, 0.007],
-[0.010, 0.002, 0.002],
-[1.109, 0.317, 0.335],
-[0.661, 0.338, 0.334],
-[0.034, 0.004, 0.004],
-[0.032, 0.016, 0.015],
-[0.155, 0.100, 0.091],
-[3.424, 0.111, 0.099],
-[3.005, 0.234, 0.225],
-[2.609, 0.064, 0.057],
-[1.401, 0.056, 0.057],
-[4.437, 0.220, 0.213],
-[4.219, 0.196, 0.186],
-[1.801, 0.231, 0.211],
-[63.368, 2.297, 2.282],
-[42.444, 1.494, 1.453],
-[3.023, 0.297, 0.293],
-[1.007, 0.149, 0.139],
-[0.149, 0.079, 0.083],
-[4.692, 0.122, 0.093],
-[0.011, 0.002, 0.001],
-[0.026, 0.010, 0.010],
-[0.338, 0.022, 0.022],
-[1.727, 0.035, 0.031],
-[1.684, 0.090, 0.097],
-[2.597, 0.218, 0.237],
-[0.030, 0.014, 0.014],
-[0.021, 0.010, 0.010],
-[2.004, 0.330, 0.316],
-[2.060, 0.364, 0.357],
-[1.073, 0.149, 0.142],
-[1.644, 0.166, 0.170],
-[2.549, 0.445, 0.437],
-[3.802, 0.568, 0.540],
-[2.363, 0.558, 0.551],
-[1.233, 0.562, 0.556],
-[4.255, 1.424, 1.390],
-[3.692, 0.809, 0.820],
-[8.017, 3.001, 2.985],
-[0.925, 0.134, 0.065],
-[19.426, 0.507, 0.506],
-[21.481, 0.571, 0.556],
-[40.204, 1.353, 1.283],
-[39.541, 0.624, 0.642],
-[4.633, 0.192, 0.193],
-[2.313, 0.174, 0.170],
-[5.278, 0.196, 0.197],
-[19.189, 0.503, 0.490],
-[15.698, 0.724, 0.701],
-[1.088, 1.064, 1.059],
-[3.822, 0.467, 0.427],
-[9.807, 0.712, 0.675],
-[9.042, 3.844, 3.828],
-[19.440, 2.069, 1.911],
-[19.342, 1.989, 1.950],
-[0.836, 0.754, 0.775],
-[0.152, 0.111, 0.122],
-[0.069, 0.046, 0.042],
-[0.070, 0.040, 0.051],
-[0.300, 0.228, 0.225],
-[0.053, 0.015, 0.034],
-[0.030, 0.011, 0.013],
-[0.015, 0.003, 0.012]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.04.7.3_adaptive.json b/website/benchmark/versions/results/21.04.7.3_adaptive.json
deleted file mode 100644
index bb5edb4e447..00000000000
--- a/website/benchmark/versions/results/21.04.7.3_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-05-20 21.4",
-	"system_full":  "ClickHouse 21.4.7.3 2021-05-20(adaptive)",
-        "version":      "21.4.7.3",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.021, 0.004, 0.004],
-[0.013, 0.003, 0.003],
-[0.016, 0.005, 0.005],
-[0.010, 0.003, 0.003],
-[0.014, 0.003, 0.003],
-[0.010, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.060, 0.027, 0.026],
-[0.015, 0.012, 0.009],
-[0.009, 0.002, 0.002],
-[1.193, 0.327, 0.326],
-[0.633, 0.344, 0.327],
-[0.032, 0.005, 0.004],
-[0.032, 0.015, 0.015],
-[0.121, 0.105, 0.103],
-[3.414, 0.098, 0.102],
-[11.208, 0.217, 0.209],
-[0.237, 0.072, 0.074],
-[1.411, 0.051, 0.126],
-[4.444, 0.218, 0.203],
-[4.219, 0.175, 0.175],
-[1.788, 0.233, 0.236],
-[22.316, 1.279, 1.214],
-[25.837, 1.361, 1.323],
-[12.063, 1.031, 1.059],
-[0.299, 0.169, 0.160],
-[0.114, 0.078, 0.083],
-[0.945, 0.061, 0.059],
-[0.011, 0.002, 0.002],
-[0.030, 0.010, 0.008],
-[0.058, 0.022, 0.021],
-[1.447, 0.034, 0.030],
-[1.518, 0.107, 0.095],
-[2.377, 0.218, 0.217],
-[0.028, 0.013, 0.013],
-[0.019, 0.010, 0.010],
-[1.541, 0.324, 0.330],
-[1.872, 0.376, 0.379],
-[1.032, 0.130, 0.139],
-[1.472, 0.157, 0.150],
-[1.846, 0.445, 0.432],
-[3.153, 0.560, 0.556],
-[1.698, 0.529, 0.543],
-[1.213, 0.569, 0.543],
-[3.571, 1.416, 1.398],
-[2.978, 0.853, 0.810],
-[7.312, 3.041, 2.953],
-[0.916, 0.101, 0.058],
-[19.296, 0.431, 0.426],
-[2.597, 0.519, 0.501],
-[21.286, 1.229, 1.181],
-[18.186, 0.611, 0.571],
-[3.249, 0.207, 0.173],
-[1.183, 0.161, 0.163],
-[3.153, 0.194, 0.185],
-[0.764, 0.432, 0.429],
-[15.719, 0.706, 0.686],
-[1.082, 1.065, 1.064],
-[2.955, 0.455, 0.444],
-[8.856, 0.658, 0.626],
-[5.234, 3.545, 3.447],
-[1.934, 1.909, 1.853],
-[1.853, 1.938, 1.840],
-[0.802, 0.772, 0.765],
-[0.130, 0.109, 0.108],
-[0.062, 0.051, 0.053],
-[0.054, 0.042, 0.043],
-[0.239, 0.242, 0.214],
-[0.039, 0.012, 0.011],
-[0.031, 0.010, 0.018],
-[0.020, 0.014, 0.004]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.05.9.4_adaptive.json b/website/benchmark/versions/results/21.05.9.4_adaptive.json
deleted file mode 100644
index 05f7bfa2a0b..00000000000
--- a/website/benchmark/versions/results/21.05.9.4_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-07-10 21.5",
-	"system_full":  "ClickHouse 21.5.9.4 2021-07-10(adaptive)",
-        "version":      "21.5.9.4",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.022, 0.004, 0.004],
-[0.014, 0.002, 0.003],
-[0.016, 0.004, 0.004],
-[0.009, 0.002, 0.003],
-[0.013, 0.003, 0.003],
-[0.011, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.072, 0.026, 0.026],
-[0.016, 0.007, 0.007],
-[0.008, 0.002, 0.002],
-[1.156, 0.347, 0.318],
-[0.608, 0.336, 0.324],
-[0.033, 0.004, 0.004],
-[0.029, 0.015, 0.014],
-[0.112, 0.102, 0.095],
-[3.432, 0.115, 0.114],
-[11.038, 0.224, 0.225],
-[2.938, 0.086, 0.084],
-[1.367, 0.044, 0.047],
-[4.466, 0.223, 0.214],
-[4.230, 0.195, 0.181],
-[1.826, 0.228, 0.223],
-[22.627, 1.270, 1.250],
-[26.679, 1.423, 1.379],
-[28.615, 1.147, 1.084],
-[0.607, 0.139, 0.155],
-[0.112, 0.079, 0.080],
-[1.520, 0.063, 0.056],
-[0.010, 0.002, 0.002],
-[0.026, 0.010, 0.009],
-[0.426, 0.023, 0.020],
-[1.734, 0.036, 0.031],
-[1.696, 0.093, 0.084],
-[2.596, 0.236, 0.224],
-[0.030, 0.015, 0.015],
-[0.020, 0.011, 0.010],
-[1.970, 0.314, 0.313],
-[2.073, 0.367, 0.358],
-[1.068, 0.163, 0.136],
-[1.622, 0.174, 0.169],
-[2.539, 0.467, 0.469],
-[3.845, 0.562, 0.563],
-[2.331, 0.540, 0.539],
-[1.217, 0.570, 0.551],
-[4.257, 1.407, 1.449],
-[3.663, 0.813, 0.832],
-[8.009, 2.986, 3.047],
-[0.922, 0.141, 0.066],
-[19.407, 0.458, 0.454],
-[21.493, 0.551, 0.540],
-[40.210, 1.275, 1.246],
-[39.569, 0.604, 0.596],
-[4.654, 0.213, 0.170],
-[2.342, 0.157, 0.167],
-[5.301, 0.190, 0.200],
-[19.220, 0.498, 0.482],
-[15.816, 0.692, 0.692],
-[1.096, 1.063, 1.059],
-[3.858, 0.461, 0.431],
-[9.850, 0.673, 0.637],
-[9.063, 3.608, 3.629],
-[19.417, 1.977, 1.908],
-[19.431, 2.004, 1.907],
-[0.838, 0.800, 0.777],
-[0.175, 0.110, 0.108],
-[0.076, 0.046, 0.054],
-[0.080, 0.042, 0.035],
-[0.327, 0.250, 0.235],
-[0.037, 0.017, 0.011],
-[0.031, 0.021, 0.009],
-[0.014, 0.015, 0.017]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.06.9.7_adaptive.json b/website/benchmark/versions/results/21.06.9.7_adaptive.json
deleted file mode 100644
index 5ddb79105e4..00000000000
--- a/website/benchmark/versions/results/21.06.9.7_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-09-03 21.6",
-	"system_full":  "ClickHouse 21.6.9.7 2021-09-03(adaptive)",
-        "version":      "21.6.9.7",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.021, 0.003, 0.003],
-[0.012, 0.002, 0.002],
-[0.018, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.014, 0.003, 0.002],
-[0.014, 0.003, 0.003],
-[0.014, 0.002, 0.002],
-[0.066, 0.028, 0.027],
-[0.059, 0.009, 0.007],
-[0.010, 0.002, 0.002],
-[1.226, 0.350, 0.349],
-[0.573, 0.341, 0.322],
-[0.032, 0.005, 0.006],
-[0.033, 0.015, 0.015],
-[0.112, 0.095, 0.099],
-[3.431, 0.112, 0.143],
-[3.106, 0.231, 0.226],
-[2.623, 0.072, 0.060],
-[1.397, 0.058, 0.056],
-[4.432, 0.237, 0.225],
-[4.207, 0.208, 0.196],
-[1.801, 0.233, 0.250],
-[63.562, 2.649, 2.593],
-[42.495, 1.661, 1.672],
-[3.054, 0.292, 0.266],
-[1.139, 0.176, 0.177],
-[0.130, 0.070, 0.088],
-[4.663, 0.108, 0.126],
-[0.010, 0.001, 0.002],
-[0.026, 0.009, 0.009],
-[0.323, 0.023, 0.022],
-[1.709, 0.034, 0.033],
-[1.703, 0.091, 0.092],
-[2.612, 0.234, 0.237],
-[0.027, 0.014, 0.014],
-[0.029, 0.009, 0.009],
-[1.967, 0.330, 0.323],
-[2.053, 0.371, 0.358],
-[1.059, 0.140, 0.130],
-[1.663, 0.165, 0.149],
-[2.534, 0.450, 0.448],
-[3.803, 0.575, 0.549],
-[2.410, 0.557, 0.532],
-[1.230, 0.557, 0.563],
-[4.250, 1.433, 1.387],
-[3.695, 0.832, 0.823],
-[8.005, 3.048, 2.991],
-[0.925, 0.108, 0.052],
-[19.516, 0.509, 0.473],
-[21.482, 0.587, 0.571],
-[40.055, 1.356, 1.337],
-[39.576, 0.644, 0.607],
-[4.633, 0.201, 0.207],
-[2.300, 0.173, 0.178],
-[5.286, 0.205, 0.201],
-[19.282, 0.497, 0.506],
-[15.767, 0.751, 0.724],
-[1.095, 1.065, 1.065],
-[3.838, 0.448, 0.448],
-[9.826, 0.674, 0.645],
-[9.114, 3.490, 3.507],
-[19.456, 1.993, 1.956],
-[19.353, 2.015, 1.956],
-[0.824, 0.785, 0.779],
-[0.166, 0.116, 0.106],
-[0.091, 0.052, 0.066],
-[0.076, 0.039, 0.048],
-[0.305, 0.240, 0.251],
-[0.046, 0.027, 0.027],
-[0.056, 0.023, 0.011],
-[0.017, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.07.11.3_adaptive.json b/website/benchmark/versions/results/21.07.11.3_adaptive.json
deleted file mode 100644
index 76b181ad253..00000000000
--- a/website/benchmark/versions/results/21.07.11.3_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-09-24 21.7",
-	"system_full":  "ClickHouse 21.7.11.3 2021-09-24(adaptive)",
-        "version":      "2021-09-24",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.017, 0.004, 0.003],
-[0.011, 0.002, 0.002],
-[0.016, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.014, 0.002, 0.002],
-[0.013, 0.003, 0.003],
-[0.016, 0.003, 0.002],
-[0.056, 0.025, 0.029],
-[0.013, 0.007, 0.012],
-[0.010, 0.002, 0.002],
-[1.197, 0.338, 0.385],
-[0.744, 0.328, 0.309],
-[0.030, 0.005, 0.004],
-[0.030, 0.017, 0.015],
-[0.117, 0.092, 0.104],
-[3.411, 0.106, 0.101],
-[2.986, 0.233, 0.229],
-[2.630, 0.065, 0.066],
-[1.400, 0.057, 0.054],
-[4.443, 0.230, 0.226],
-[4.219, 0.199, 0.205],
-[1.785, 0.229, 0.238],
-[63.427, 2.479, 2.411],
-[42.498, 1.582, 1.532],
-[3.005, 0.297, 0.279],
-[1.045, 0.157, 0.189],
-[0.118, 0.082, 0.089],
-[4.653, 0.136, 0.098],
-[0.010, 0.001, 0.001],
-[0.025, 0.012, 0.009],
-[0.319, 0.023, 0.023],
-[1.723, 0.032, 0.032],
-[1.682, 0.092, 0.091],
-[2.607, 0.242, 0.225],
-[0.027, 0.014, 0.014],
-[0.019, 0.010, 0.009],
-[1.980, 0.323, 0.328],
-[2.042, 0.363, 0.371],
-[1.064, 0.135, 0.143],
-[1.659, 0.172, 0.172],
-[2.533, 0.484, 0.440],
-[3.839, 0.598, 0.547],
-[2.378, 0.583, 0.562],
-[1.223, 0.562, 0.556],
-[4.259, 1.447, 1.399],
-[3.713, 0.862, 0.825],
-[8.055, 3.074, 3.056],
-[0.921, 0.124, 0.044],
-[19.450, 0.493, 0.476],
-[21.501, 0.585, 0.568],
-[40.294, 1.348, 1.326],
-[39.583, 0.622, 0.615],
-[4.634, 0.220, 0.196],
-[2.309, 0.173, 0.176],
-[5.275, 0.214, 0.206],
-[19.186, 0.524, 0.479],
-[15.773, 0.744, 0.727],
-[1.093, 1.071, 1.070],
-[3.858, 0.469, 0.437],
-[9.827, 0.661, 0.650],
-[9.028, 3.542, 3.558],
-[19.424, 2.010, 1.953],
-[19.434, 2.045, 1.965],
-[0.814, 0.792, 0.775],
-[0.158, 0.113, 0.119],
-[0.069, 0.043, 0.047],
-[0.073, 0.045, 0.056],
-[0.301, 0.243, 0.231],
-[0.047, 0.013, 0.018],
-[0.037, 0.015, 0.011],
-[0.013, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.08.15.7_adaptive.json b/website/benchmark/versions/results/21.08.15.7_adaptive.json
deleted file mode 100644
index 8607d494cb4..00000000000
--- a/website/benchmark/versions/results/21.08.15.7_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-02-25 21.8",
-	"system_full":  "ClickHouse 21.8.15.7 2022-02-25(adaptive)",
-        "version":      "21.8.15.7",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.019, 0.004, 0.003],
-[0.010, 0.003, 0.002],
-[0.017, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.014, 0.003, 0.002],
-[0.012, 0.003, 0.003],
-[0.016, 0.002, 0.003],
-[0.060, 0.029, 0.025],
-[0.014, 0.007, 0.007],
-[0.009, 0.002, 0.002],
-[1.137, 0.343, 0.351],
-[0.752, 0.350, 0.329],
-[0.030, 0.006, 0.004],
-[0.031, 0.016, 0.015],
-[0.113, 0.098, 0.095],
-[3.412, 0.112, 0.102],
-[2.999, 0.230, 0.224],
-[2.620, 0.068, 0.073],
-[1.394, 0.055, 0.056],
-[4.439, 0.232, 0.242],
-[4.215, 0.218, 0.187],
-[1.819, 0.230, 0.226],
-[63.446, 2.475, 2.432],
-[42.542, 1.559, 1.545],
-[2.991, 0.297, 0.279],
-[1.020, 0.154, 0.144],
-[0.124, 0.078, 0.083],
-[4.689, 0.123, 0.118],
-[0.012, 0.001, 0.001],
-[0.027, 0.011, 0.009],
-[0.286, 0.025, 0.022],
-[1.709, 0.034, 0.032],
-[1.692, 0.092, 0.095],
-[2.611, 0.230, 0.226],
-[0.026, 0.013, 0.014],
-[0.020, 0.010, 0.010],
-[1.973, 0.339, 0.326],
-[2.014, 0.380, 0.372],
-[1.034, 0.139, 0.145],
-[1.661, 0.162, 0.164],
-[2.537, 0.475, 0.450],
-[3.815, 0.588, 0.544],
-[2.368, 0.559, 0.550],
-[1.201, 0.575, 0.563],
-[4.254, 1.424, 1.416],
-[3.701, 0.841, 0.837],
-[8.060, 3.123, 3.095],
-[0.922, 0.176, 0.068],
-[19.380, 0.486, 0.476],
-[21.535, 0.622, 0.582],
-[40.306, 1.364, 1.329],
-[39.580, 0.622, 0.605],
-[4.635, 0.199, 0.194],
-[2.337, 0.174, 0.165],
-[5.270, 0.194, 0.196],
-[19.226, 0.522, 0.508],
-[15.791, 0.734, 0.727],
-[1.093, 1.067, 1.070],
-[3.841, 0.479, 0.452],
-[9.837, 0.660, 0.670],
-[9.048, 3.597, 3.576],
-[19.469, 1.964, 1.962],
-[19.474, 1.983, 1.981],
-[0.839, 0.781, 0.772],
-[0.149, 0.112, 0.110],
-[0.072, 0.059, 0.053],
-[0.086, 0.047, 0.041],
-[0.308, 0.227, 0.234],
-[0.047, 0.023, 0.013],
-[0.029, 0.012, 0.014],
-[0.026, 0.004, 0.005]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.09.6.24_adaptive.json b/website/benchmark/versions/results/21.09.6.24_adaptive.json
deleted file mode 100644
index 447f7bef853..00000000000
--- a/website/benchmark/versions/results/21.09.6.24_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2021-12-02 21.9",
-	"system_full":  "ClickHouse 21.9.6.24 2021-12-02(adaptive)",
-        "version":      "2021-12-02",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.022, 0.004, 0.003],
-[0.014, 0.002, 0.002],
-[0.018, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.015, 0.003, 0.002],
-[0.012, 0.003, 0.003],
-[0.017, 0.002, 0.002],
-[0.071, 0.035, 0.032],
-[0.017, 0.007, 0.007],
-[0.045, 0.002, 0.002],
-[0.920, 0.346, 0.332],
-[0.573, 0.286, 0.285],
-[0.032, 0.006, 0.005],
-[0.028, 0.014, 0.018],
-[0.116, 0.099, 0.101],
-[3.420, 0.110, 0.099],
-[2.968, 0.295, 0.235],
-[2.711, 0.067, 0.064],
-[1.415, 0.065, 0.060],
-[4.427, 0.222, 0.241],
-[4.183, 0.180, 0.184],
-[1.854, 0.233, 0.244],
-[63.467, 2.360, 2.306],
-[42.527, 1.533, 1.488],
-[3.013, 0.286, 0.275],
-[1.009, 0.163, 0.178],
-[0.150, 0.078, 0.084],
-[4.553, 0.123, 0.097],
-[0.011, 0.001, 0.001],
-[0.026, 0.010, 0.008],
-[0.249, 0.023, 0.022],
-[1.679, 0.031, 0.032],
-[1.660, 0.096, 0.097],
-[2.579, 0.228, 0.215],
-[0.031, 0.012, 0.013],
-[0.022, 0.009, 0.009],
-[1.960, 0.321, 0.322],
-[2.028, 0.348, 0.357],
-[1.069, 0.126, 0.143],
-[1.648, 0.157, 0.156],
-[2.569, 0.454, 0.427],
-[3.799, 0.571, 0.563],
-[2.363, 0.552, 0.529],
-[1.174, 0.511, 0.501],
-[4.261, 1.418, 1.387],
-[3.693, 0.856, 0.806],
-[7.945, 2.932, 2.995],
-[0.919, 0.120, 0.082],
-[19.420, 0.502, 0.473],
-[21.480, 0.609, 0.590],
-[40.279, 1.340, 1.318],
-[39.461, 0.624, 0.604],
-[4.635, 0.206, 0.202],
-[2.313, 0.164, 0.166],
-[5.325, 0.201, 0.191],
-[19.250, 0.491, 0.481],
-[15.833, 0.713, 0.710],
-[1.100, 1.070, 1.067],
-[3.816, 0.426, 0.424],
-[9.758, 0.568, 0.546],
-[8.369, 2.686, 2.746],
-[19.439, 1.971, 1.923],
-[19.436, 1.985, 1.931],
-[0.781, 0.723, 0.728],
-[0.150, 0.143, 0.108],
-[0.078, 0.054, 0.048],
-[0.071, 0.050, 0.075],
-[0.313, 0.224, 0.214],
-[0.044, 0.016, 0.025],
-[0.032, 0.014, 0.020],
-[0.022, 0.015, 0.010]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.10.6.2_adaptive.json b/website/benchmark/versions/results/21.10.6.2_adaptive.json
deleted file mode 100644
index bc77e0e8889..00000000000
--- a/website/benchmark/versions/results/21.10.6.2_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-01-24 21.10",
-	"system_full":  "ClickHouse 21.10.6.2 2022-01-24(adaptive)",
-        "version":      "21.10.6.2",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.021, 0.004, 0.004],
-[0.012, 0.002, 0.002],
-[0.016, 0.004, 0.004],
-[0.010, 0.002, 0.002],
-[0.013, 0.003, 0.002],
-[0.011, 0.003, 0.003],
-[0.015, 0.002, 0.002],
-[0.062, 0.032, 0.035],
-[0.019, 0.007, 0.007],
-[0.045, 0.002, 0.002],
-[1.173, 0.329, 0.302],
-[0.622, 0.276, 0.278],
-[0.033, 0.004, 0.006],
-[0.035, 0.015, 0.014],
-[0.125, 0.094, 0.099],
-[3.431, 0.106, 0.098],
-[2.989, 0.241, 0.226],
-[2.769, 0.062, 0.059],
-[1.413, 0.051, 0.048],
-[4.433, 0.245, 0.211],
-[4.198, 0.183, 0.172],
-[1.837, 0.223, 0.232],
-[63.368, 2.339, 2.324],
-[42.447, 1.474, 1.469],
-[3.007, 0.296, 0.274],
-[1.002, 0.167, 0.176],
-[0.143, 0.093, 0.082],
-[4.599, 0.118, 0.098],
-[0.010, 0.001, 0.001],
-[0.026, 0.009, 0.007],
-[0.321, 0.023, 0.023],
-[1.734, 0.031, 0.030],
-[1.696, 0.090, 0.100],
-[2.586, 0.217, 0.222],
-[0.026, 0.013, 0.013],
-[0.020, 0.008, 0.009],
-[2.026, 0.322, 0.312],
-[2.059, 0.355, 0.348],
-[1.109, 0.130, 0.137],
-[1.656, 0.152, 0.148],
-[2.565, 0.420, 0.410],
-[3.843, 0.565, 0.536],
-[2.362, 0.510, 0.521],
-[1.177, 0.494, 0.480],
-[4.206, 1.336, 1.315],
-[3.694, 0.828, 0.802],
-[7.829, 2.826, 2.838],
-[0.933, 0.101, 0.050],
-[19.482, 0.505, 0.470],
-[21.289, 0.582, 0.565],
-[39.997, 1.372, 1.307],
-[39.358, 0.656, 0.609],
-[4.636, 0.200, 0.177],
-[2.328, 0.155, 0.167],
-[5.278, 0.198, 0.177],
-[19.227, 0.519, 0.507],
-[15.788, 0.749, 0.717],
-[1.093, 1.063, 1.060],
-[3.848, 0.412, 0.418],
-[9.738, 0.557, 0.528],
-[8.344, 2.681, 2.646],
-[19.421, 1.944, 1.914],
-[19.217, 1.937, 1.929],
-[0.798, 0.711, 0.704],
-[0.165, 0.111, 0.109],
-[0.081, 0.045, 0.040],
-[0.071, 0.060, 0.052],
-[0.294, 0.245, 0.223],
-[0.053, 0.025, 0.016],
-[0.030, 0.018, 0.023],
-[0.017, 0.005, 0.012]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.11.11.1_adaptive.json b/website/benchmark/versions/results/21.11.11.1_adaptive.json
deleted file mode 100644
index 9228e607e77..00000000000
--- a/website/benchmark/versions/results/21.11.11.1_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-01-23 21.11",
-	"system_full":  "ClickHouse 21.11.11.1 2022-01-23(adaptive)",
-        "version":      "21.11.11.1",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.031, 0.004, 0.003],
-[0.017, 0.002, 0.002],
-[0.024, 0.004, 0.004],
-[0.015, 0.002, 0.002],
-[0.019, 0.002, 0.002],
-[0.019, 0.003, 0.003],
-[0.020, 0.002, 0.002],
-[0.060, 0.023, 0.022],
-[0.023, 0.007, 0.007],
-[0.052, 0.002, 0.002],
-[1.080, 0.333, 0.317],
-[0.795, 0.262, 0.279],
-[0.038, 0.004, 0.004],
-[0.037, 0.014, 0.016],
-[0.116, 0.099, 0.094],
-[3.492, 0.085, 0.074],
-[2.783, 0.223, 0.218],
-[2.676, 0.055, 0.051],
-[1.449, 0.054, 0.052],
-[4.442, 0.202, 0.196],
-[4.269, 0.180, 0.170],
-[1.907, 0.225, 0.213],
-[63.380, 2.320, 2.283],
-[42.459, 1.482, 1.417],
-[2.926, 0.288, 0.279],
-[1.156, 0.140, 0.141],
-[0.135, 0.080, 0.069],
-[3.156, 0.090, 0.092],
-[0.018, 0.002, 0.001],
-[0.031, 0.008, 0.007],
-[0.396, 0.020, 0.021],
-[1.745, 0.030, 0.030],
-[1.695, 0.086, 0.084],
-[2.610, 0.220, 0.204],
-[0.031, 0.011, 0.011],
-[0.027, 0.008, 0.008],
-[2.071, 0.313, 0.306],
-[2.075, 0.333, 0.334],
-[1.133, 0.118, 0.113],
-[1.693, 0.136, 0.131],
-[2.607, 0.391, 0.372],
-[3.839, 0.520, 0.506],
-[2.428, 0.521, 0.494],
-[1.176, 0.473, 0.463],
-[4.198, 1.345, 1.298],
-[3.697, 0.809, 0.768],
-[7.942, 2.859, 2.861],
-[0.935, 0.064, 0.031],
-[19.534, 0.490, 0.468],
-[21.514, 0.556, 0.536],
-[40.022, 1.329, 1.267],
-[33.001, 0.673, 0.575],
-[4.655, 0.167, 0.153],
-[2.383, 0.135, 0.128],
-[5.388, 0.163, 0.155],
-[19.305, 0.509, 0.484],
-[15.801, 0.738, 0.714],
-[1.080, 1.059, 1.061],
-[3.817, 0.371, 0.364],
-[9.735, 0.504, 0.484],
-[8.324, 2.674, 2.645],
-[19.419, 1.884, 1.860],
-[19.383, 1.888, 1.861],
-[0.785, 0.691, 0.691],
-[0.141, 0.108, 0.106],
-[0.078, 0.040, 0.050],
-[0.085, 0.048, 0.039],
-[0.292, 0.232, 0.240],
-[0.052, 0.025, 0.022],
-[0.036, 0.020, 0.013],
-[0.022, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/21.12.4.1_adaptive.json b/website/benchmark/versions/results/21.12.4.1_adaptive.json
deleted file mode 100644
index d5d4ff0db8d..00000000000
--- a/website/benchmark/versions/results/21.12.4.1_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-01-23 21.12",
-	"system_full":  "ClickHouse 21.12.4.1 2022-01-23(adaptive)",
-        "version":      "21.12.4.1",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.036, 0.003, 0.003],
-[0.020, 0.002, 0.002],
-[0.025, 0.004, 0.004],
-[0.019, 0.002, 0.002],
-[0.020, 0.002, 0.002],
-[0.020, 0.003, 0.003],
-[0.022, 0.002, 0.002],
-[0.067, 0.023, 0.027],
-[0.024, 0.007, 0.007],
-[0.060, 0.002, 0.002],
-[1.121, 0.334, 0.318],
-[0.607, 0.259, 0.260],
-[0.038, 0.004, 0.004],
-[0.039, 0.018, 0.014],
-[0.120, 0.107, 0.096],
-[3.493, 0.078, 0.075],
-[2.812, 0.229, 0.226],
-[2.654, 0.058, 0.052],
-[1.437, 0.051, 0.051],
-[4.449, 0.213, 0.200],
-[4.273, 0.176, 0.166],
-[1.864, 0.222, 0.213],
-[63.700, 2.301, 2.246],
-[42.592, 1.463, 1.410],
-[2.933, 0.307, 0.283],
-[1.117, 0.163, 0.134],
-[0.135, 0.083, 0.077],
-[3.151, 0.083, 0.080],
-[0.019, 0.001, 0.001],
-[0.033, 0.008, 0.008],
-[0.407, 0.022, 0.021],
-[1.755, 0.035, 0.030],
-[1.719, 0.084, 0.087],
-[2.633, 0.224, 0.212],
-[0.032, 0.011, 0.010],
-[0.028, 0.008, 0.008],
-[2.071, 0.311, 0.300],
-[2.107, 0.331, 0.327],
-[1.158, 0.115, 0.112],
-[1.707, 0.133, 0.128],
-[2.621, 0.378, 0.369],
-[3.826, 0.522, 0.488],
-[2.445, 0.522, 0.521],
-[1.181, 0.466, 0.461],
-[4.246, 1.319, 1.293],
-[3.692, 0.805, 0.761],
-[7.928, 2.828, 2.907],
-[0.920, 0.071, 0.033],
-[19.573, 0.501, 0.472],
-[21.520, 0.565, 0.550],
-[40.245, 1.305, 1.263],
-[33.018, 0.620, 0.574],
-[4.656, 0.157, 0.151],
-[2.426, 0.149, 0.134],
-[5.345, 0.169, 0.154],
-[19.347, 0.520, 0.493],
-[15.793, 0.753, 0.728],
-[1.082, 1.058, 1.057],
-[3.851, 0.355, 0.359],
-[9.758, 0.508, 0.485],
-[8.379, 2.657, 2.712],
-[19.461, 1.884, 1.886],
-[19.397, 1.896, 1.854],
-[0.785, 0.696, 0.689],
-[0.137, 0.116, 0.117],
-[0.076, 0.040, 0.060],
-[0.080, 0.043, 0.043],
-[0.320, 0.253, 0.235],
-[0.064, 0.014, 0.022],
-[0.048, 0.014, 0.030],
-[0.020, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/22.1.4.30_adaptive.json b/website/benchmark/versions/results/22.1.4.30_adaptive.json
deleted file mode 100644
index 0cc2ea8f48a..00000000000
--- a/website/benchmark/versions/results/22.1.4.30_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-02-25 22.1",
-	"system_full":  "ClickHouse 22.1.4.30 2022-02-25(adaptive)",
-        "version":      "22.1.4.30",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.026, 0.003, 0.003],
-[0.021, 0.002, 0.002],
-[0.024, 0.004, 0.004],
-[0.019, 0.002, 0.002],
-[0.020, 0.002, 0.002],
-[0.020, 0.003, 0.003],
-[0.021, 0.002, 0.002],
-[0.076, 0.026, 0.023],
-[0.026, 0.007, 0.008],
-[0.057, 0.002, 0.002],
-[1.235, 0.335, 0.323],
-[0.605, 0.295, 0.259],
-[0.037, 0.006, 0.006],
-[0.039, 0.016, 0.016],
-[0.134, 0.102, 0.105],
-[3.485, 0.082, 0.074],
-[2.802, 0.224, 0.232],
-[2.682, 0.062, 0.056],
-[1.436, 0.051, 0.051],
-[4.452, 0.225, 0.190],
-[4.245, 0.189, 0.172],
-[1.951, 0.225, 0.212],
-[63.456, 2.290, 2.253],
-[42.478, 1.453, 1.417],
-[2.930, 0.301, 0.280],
-[1.145, 0.144, 0.137],
-[0.136, 0.079, 0.078],
-[3.136, 0.105, 0.081],
-[0.020, 0.001, 0.001],
-[0.035, 0.008, 0.008],
-[0.391, 0.021, 0.021],
-[1.751, 0.032, 0.031],
-[1.697, 0.083, 0.085],
-[2.610, 0.208, 0.212],
-[0.033, 0.012, 0.012],
-[0.026, 0.008, 0.008],
-[1.972, 0.319, 0.304],
-[2.083, 0.335, 0.328],
-[1.087, 0.127, 0.113],
-[1.670, 0.128, 0.123],
-[2.615, 0.381, 0.364],
-[3.817, 0.521, 0.486],
-[2.390, 0.511, 0.502],
-[1.148, 0.472, 0.463],
-[4.492, 1.327, 1.318],
-[3.722, 0.828, 0.818],
-[8.008, 2.936, 2.951],
-[0.941, 0.058, 0.031],
-[19.524, 0.518, 0.500],
-[21.530, 0.565, 0.549],
-[40.236, 1.326, 1.276],
-[32.973, 0.629, 0.603],
-[4.656, 0.161, 0.158],
-[2.387, 0.138, 0.127],
-[5.362, 0.164, 0.154],
-[19.264, 0.502, 0.487],
-[15.836, 0.733, 0.726],
-[1.083, 1.061, 1.059],
-[3.832, 0.359, 0.350],
-[9.755, 0.511, 0.485],
-[8.436, 2.740, 2.725],
-[19.561, 2.010, 2.005],
-[19.328, 2.023, 2.008],
-[0.774, 0.702, 0.714],
-[0.152, 0.113, 0.111],
-[0.069, 0.050, 0.056],
-[0.086, 0.052, 0.041],
-[0.328, 0.247, 0.264],
-[0.056, 0.015, 0.016],
-[0.040, 0.016, 0.017],
-[0.019, 0.003, 0.003]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/22.2.3.5_adaptive.json b/website/benchmark/versions/results/22.2.3.5_adaptive.json
deleted file mode 100644
index d7c61f7fe03..00000000000
--- a/website/benchmark/versions/results/22.2.3.5_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-02-25 22.2",
-	"system_full":  "ClickHouse 22.2.3.5 2022-02-25(adaptive)",
-        "version":      "22.2.3.5",
-	"kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.028, 0.004, 0.004],
-[0.021, 0.003, 0.003],
-[0.025, 0.004, 0.005],
-[0.018, 0.003, 0.003],
-[0.020, 0.003, 0.003],
-[0.021, 0.004, 0.004],
-[0.024, 0.002, 0.002],
-[0.086, 0.036, 0.032],
-[0.024, 0.011, 0.009],
-[0.055, 0.002, 0.002],
-[1.146, 0.330, 0.323],
-[0.605, 0.282, 0.259],
-[0.040, 0.007, 0.006],
-[0.040, 0.014, 0.014],
-[0.131, 0.112, 0.091],
-[3.459, 0.083, 0.078],
-[2.788, 0.227, 0.220],
-[2.657, 0.063, 0.053],
-[1.441, 0.050, 0.058],
-[4.444, 0.207, 0.197],
-[4.273, 0.178, 0.177],
-[1.864, 0.217, 0.218],
-[63.697, 2.299, 2.228],
-[42.575, 1.462, 1.420],
-[2.934, 0.314, 0.286],
-[1.139, 0.151, 0.156],
-[0.136, 0.074, 0.082],
-[3.131, 0.088, 0.083],
-[0.022, 0.002, 0.001],
-[0.035, 0.009, 0.009],
-[0.371, 0.023, 0.021],
-[1.697, 0.034, 0.034],
-[1.706, 0.087, 0.082],
-[2.618, 0.209, 0.195],
-[0.019, 0.002, 0.001],
-[0.027, 0.009, 0.008],
-[2.084, 0.314, 0.303],
-[2.126, 0.344, 0.329],
-[1.116, 0.117, 0.115],
-[1.682, 0.137, 0.131],
-[2.646, 0.386, 0.371],
-[3.832, 0.514, 0.487],
-[2.412, 0.505, 0.492],
-[1.179, 0.457, 0.463],
-[4.264, 1.362, 1.369],
-[3.729, 0.856, 0.796],
-[7.967, 3.005, 2.935],
-[0.937, 0.059, 0.033],
-[19.577, 0.544, 0.523],
-[21.519, 0.593, 0.556],
-[40.278, 1.335, 1.281],
-[33.029, 0.672, 0.644],
-[4.674, 0.161, 0.158],
-[2.398, 0.136, 0.130],
-[5.391, 0.175, 0.157],
-[19.313, 0.515, 0.496],
-[15.716, 0.736, 0.713],
-[1.089, 1.067, 1.066],
-[3.787, 0.366, 0.346],
-[9.775, 0.510, 0.497],
-[8.451, 2.676, 2.772],
-[19.577, 2.037, 2.001],
-[19.571, 2.024, 2.008],
-[0.814, 0.718, 0.712],
-[0.158, 0.107, 0.112],
-[0.082, 0.041, 0.045],
-[0.096, 0.068, 0.045],
-[0.305, 0.250, 0.250],
-[0.055, 0.027, 0.015],
-[0.037, 0.013, 0.012],
-[0.025, 0.004, 0.005]
-		]
-    }
-]
diff --git a/website/benchmark/versions/results/22.3.3.44_adaptive.json b/website/benchmark/versions/results/22.3.3.44_adaptive.json
deleted file mode 100644
index bc236a438d6..00000000000
--- a/website/benchmark/versions/results/22.3.3.44_adaptive.json
+++ /dev/null
@@ -1,85 +0,0 @@
-
-[
-    {
-        "system":       "2022-04-06 22.3",
-	"system_full":  "ClickHouse 22.3.3.44 2022-04-06(adaptive)",
-        "version":      "22.3.3.44",
-        "kind":         "adaptive", 
-        "comments":     "",
-        "result":
-        [
-
-[0.031, 0.004, 0.004],
-[0.021, 0.003, 0.003],
-[0.026, 0.005, 0.005],
-[0.019, 0.002, 0.003],
-[0.021, 0.003, 0.003],
-[0.024, 0.004, 0.004],
-[0.023, 0.002, 0.002],
-[0.130, 0.032, 0.029],
-[0.027, 0.008, 0.008],
-[0.057, 0.002, 0.002],
-[1.145, 0.328, 0.313],
-[0.635, 0.267, 0.297],
-[0.039, 0.006, 0.009],
-[0.038, 0.017, 0.015],
-[0.129, 0.106, 0.104],
-[3.447, 0.081, 0.070],
-[2.784, 0.233, 0.223],
-[2.670, 0.057, 0.056],
-[1.449, 0.054, 0.052],
-[4.461, 0.217, 0.196],
-[4.270, 0.179, 0.171],
-[1.845, 0.220, 0.205],
-[63.657, 2.305, 2.263],
-[42.601, 1.471, 1.432],
-[2.952, 0.294, 0.280],
-[1.143, 0.142, 0.146],
-[0.134, 0.084, 0.080],
-[3.128, 0.085, 0.082],
-[0.021, 0.002, 0.002],
-[0.034, 0.008, 0.008],
-[0.365, 0.022, 0.021],
-[1.751, 0.033, 0.032],
-[1.691, 0.088, 0.088],
-[2.620, 0.216, 0.203],
-[0.018, 0.002, 0.001],
-[0.026, 0.008, 0.008],
-[2.045, 0.318, 0.309],
-[2.074, 0.343, 0.336],
-[1.119, 0.120, 0.119],
-[1.674, 0.141, 0.138],
-[2.637, 0.389, 0.374],
-[3.842, 0.510, 0.488],
-[2.378, 0.516, 0.495],
-[1.185, 0.468, 0.457],
-[4.261, 1.369, 1.354],
-[3.745, 0.826, 0.791],
-[8.026, 2.927, 2.951],
-[0.908, 0.060, 0.039],
-[19.572, 0.550, 0.522],
-[21.498, 0.584, 0.549],
-[40.296, 1.307, 1.275],
-[33.134, 0.662, 0.630],
-[4.665, 0.163, 0.154],
-[2.389, 0.143, 0.142],
-[5.373, 0.167, 0.165],
-[19.294, 0.513, 0.480],
-[15.836, 0.749, 0.722],
-[1.083, 1.064, 1.066],
-[3.812, 0.370, 0.360],
-[9.763, 0.513, 0.487],
-[8.477, 2.733, 2.725],
-[19.572, 2.006, 2.019],
-[19.497, 2.026, 2.032],
-[0.784, 0.708, 0.716],
-[0.148, 0.109, 0.126],
-[0.073, 0.047, 0.041],
-[0.077, 0.042, 0.054],
-[0.317, 0.247, 0.257],
-[0.061, 0.022, 0.014],
-[0.038, 0.017, 0.020],
-[0.021, 0.004, 0.005]
-		]
-    }
-]
diff --git a/website/benchmark/versions/scripts/benchmarks.sh b/website/benchmark/versions/scripts/benchmarks.sh
deleted file mode 100644
index 4e6baff42ef..00000000000
--- a/website/benchmark/versions/scripts/benchmarks.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-CH_QUERIES_FILE="ch_queries.sql"
-SSB_QUERIES_FILE="ssb_queries.sql"
-BROWN_QUERIES_FILE="brown_queries.sql"
-CH_TABLE="hits_100m_obfuscated"
-TRIES=3
-
-if [ -x ./clickhouse ]
-then
-    CLICKHOUSE_CLIENT="./clickhouse client"
-elif command -v clickhouse-client >/dev/null 2>&1
-then
-    CLICKHOUSE_CLIENT="clickhouse-client"
-else
-    echo "clickhouse-client is not found"
-    exit 1
-fi
-
-${CLICKHOUSE_CLIENT} --query 'SELECT version();'
-
-echo "Brown Benchmark:"
-
-cat "$BROWN_QUERIES_FILE" | while read query; do
-    sync
-    echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
-
-    echo -n "["
-    for i in $(seq 1 $TRIES); do
-        RES=$(${CLICKHOUSE_CLIENT} --time --format=Null --max_memory_usage=100G --query="$query" 2>&1)
-        [[ "$?" == "0" ]] && echo -n "${RES}" || echo -n "null"
-        [[ "$i" != $TRIES ]] && echo -n ", "
-    done
-    echo "],"
-done
-
-echo "SSB Benchmark:"
-
-cat "$SSB_QUERIES_FILE" | while read query; do
-    sync
-    echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
-
-    echo -n "["
-    for i in $(seq 1 $TRIES); do
-        RES=$(${CLICKHOUSE_CLIENT} --time --format=Null --max_memory_usage=100G --query="$query" 2>&1)
-        [[ "$?" == "0" ]] && echo -n "${RES}" || echo -n "null"
-        [[ "$i" != $TRIES ]] && echo -n ", "
-    done
-    echo "],"
-done
-
-
-echo "ClickHouse Benchmark:"
-
-cat "$CH_QUERIES_FILE" | sed "s/{table}/${CH_TABLE}/g" | while read query; do
-    sync
-    echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
-
-    echo -n "["
-    for i in $(seq 1 $TRIES); do
-        RES=$(${CLICKHOUSE_CLIENT} --time --format=Null --max_memory_usage=100G --query="$query" 2>&1)
-        [[ "$?" == "0" ]] && echo -n "${RES}" || echo -n "null"
-        [[ "$i" != $TRIES ]] && echo -n ", "
-    done
-    echo "],"
-done
diff --git a/website/benchmark/versions/scripts/brown_queries.sql b/website/benchmark/versions/scripts/brown_queries.sql
deleted file mode 100644
index f22175646b9..00000000000
--- a/website/benchmark/versions/scripts/brown_queries.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-SELECT machine_name, MIN(cpu) AS cpu_min, MAX(cpu) AS cpu_max, AVG(cpu) AS cpu_avg, MIN(net_in) AS net_in_min, MAX(net_in) AS net_in_max, AVG(net_in) AS net_in_avg, MIN(net_out) AS net_out_min, MAX(net_out) AS net_out_max, AVG(net_out) AS net_out_avg FROM ( SELECT machine_name, ifNull(cpu_user, 0.0) AS cpu, ifNull(bytes_in, 0.0) AS net_in, ifNull(bytes_out, 0.0) AS net_out FROM mgbench.logs1 WHERE machine_name IN ('anansi','aragog','urd') AND log_time >= toDateTime('2017-01-11 00:00:00')) AS r GROUP BY machine_name; -- Q1.1: What is the CPU/network utilization for each web server since midnight?
-SELECT machine_name, log_time FROM mgbench.logs1 WHERE (machine_name LIKE 'cslab%' OR machine_name LIKE 'mslab%') AND load_one IS NULL AND log_time >= toDateTime('2017-01-10 00:00:00') ORDER BY machine_name, log_time; -- Q1.2: Which computer lab machines have been offline in the past day?
-SELECT dt, hr, AVG(load_fifteen) AS load_fifteen_avg, AVG(load_five) AS load_five_avg, AVG(load_one) AS load_one_avg, AVG(mem_free) AS mem_free_avg, AVG(swap_free) AS swap_free_avg FROM ( SELECT CAST(log_time AS DATE) AS dt, toHour(log_time) AS hr, load_fifteen, load_five, load_one, mem_free, swap_free FROM mgbench.logs1 WHERE machine_name = 'babbage' AND load_fifteen IS NOT NULL AND load_five IS NOT NULL AND load_one IS NOT NULL AND mem_free IS NOT NULL AND swap_free IS NOT NULL AND log_time >= toDateTime('2017-01-01 00:00:00')) AS r GROUP BY dt, hr ORDER BY dt, hr; -- Q1.3: What are the hourly average metrics during the past 10 days for a specific workstation?
-SELECT machine_name, COUNT(*) AS spikes FROM mgbench.logs1 WHERE machine_group = 'Servers' AND cpu_wio > 0.99 AND log_time >= toDateTime('2016-12-01 00:00:00') AND log_time < toDateTime('2017-01-01 00:00:00') GROUP BY machine_name ORDER BY spikes DESC LIMIT 10; -- Q1.4: Over 1 month, how often was each server blocked on disk I/O?
-SELECT machine_name, dt, MIN(mem_free) AS mem_free_min FROM ( SELECT machine_name, CAST(log_time AS DATE) AS dt, mem_free FROM mgbench.logs1 WHERE machine_group = 'DMZ' AND mem_free IS NOT NULL ) AS r GROUP BY machine_name, dt HAVING MIN(mem_free) < 10000 ORDER BY machine_name, dt; -- Q1.5: Which externally reachable VMs have run low on memory?
-SELECT dt, hr, SUM(net_in) AS net_in_sum, SUM(net_out) AS net_out_sum, SUM(net_in) + SUM(net_out) AS both_sum FROM ( SELECT CAST(log_time AS DATE) AS dt, toHour(log_time) AS hr, ifNull(bytes_in, 0.0) / 1000000000.0 AS net_in, ifNull(bytes_out, 0.0) / 1000000000.0 AS net_out FROM mgbench.logs1 WHERE machine_name IN ('allsorts','andes','bigred','blackjack','bonbon','cadbury','chiclets','cotton','crows','dove','fireball','hearts','huey','lindt','milkduds','milkyway','mnm','necco','nerds','orbit','peeps','poprocks','razzles','runts','smarties','smuggler','spree','stride','tootsie','trident','wrigley','york') ) AS r GROUP BY dt, hr ORDER BY both_sum DESC LIMIT 10; -- Q1.6: What is the total hourly network traffic across all file servers?
-SELECT * FROM mgbench.logs2 WHERE status_code >= 500 AND log_time >= toDateTime('2012-12-18 00:00:00') ORDER BY log_time; -- Q2.1: Which requests have caused server errors within the past 2 weeks?
-SELECT * FROM mgbench.logs2 WHERE status_code >= 200 AND status_code < 300 AND request LIKE '%/etc/passwd%' AND log_time >= toDateTime('2012-05-06 00:00:00') AND log_time < toDateTime('2012-05-20 00:00:00'); -- Q2.3: What was the average path depth for top-level requests in the past month?
-SELECT top_level, AVG(length(request) - length(replaceOne(request, '/',''))) AS depth_avg FROM ( SELECT substring(request, 1, len) AS top_level, request FROM ( SELECT position('/', substring(request, 2)) AS len, request FROM mgbench.logs2 WHERE status_code >= 200 AND status_code < 300 AND log_time >= toDateTime('2012-12-01 00:00:00')) AS r WHERE len > 0 ) AS s WHERE top_level IN ('/about','/courses','/degrees','/events','/grad','/industry','/news','/people','/publications','/research','/teaching','/ugrad') GROUP BY top_level ORDER BY top_level; -- Q2.2: During a specific 2-week period, was the user password file leaked?
-SELECT client_ip, COUNT(*) AS num_requests FROM mgbench.logs2 WHERE log_time >= toDateTime('2012-10-01 00:00:00') GROUP BY client_ip HAVING COUNT(*) >= 100000 ORDER BY num_requests DESC; -- Q2.4: During the last 3 months, which clients have made an excessive number of requests?
-SELECT dt, COUNT(DISTINCT client_ip) FROM ( SELECT CAST(log_time AS DATE) AS dt, client_ip FROM mgbench.logs2) AS r GROUP BY dt ORDER BY dt; -- Q2.5: What are the daily unique visitors?
-SELECT AVG(transfer) / 125000000.0 AS transfer_avg, MAX(transfer) / 125000000.0 AS transfer_max FROM ( SELECT log_time, SUM(object_size) AS transfer FROM mgbench.logs2 GROUP BY log_time) AS r; -- Q2.6: What are the average and maximum data transfer rates (Gbps)?
-SELECT * FROM mgbench.logs3 WHERE event_type = 'temperature' AND event_value <= 32.0 AND log_time >= '2019-11-29 17:00:00'; -- Q3.1: Did the indoor temperature reach freezing over the weekend?
-SELECT device_name, device_floor, COUNT(*) AS ct FROM mgbench.logs3 WHERE event_type = 'door_open' AND log_time >= '2019-06-01 00:00:00' GROUP BY device_name, device_floor ORDER BY ct DESC; -- Q3.4: Over the past 6 months, how frequently were each door opened?
-SELECT DISTINCT device_name, device_type, device_floor, if (dt >= toDate('2018-12-01') AND dt < toDate('2019-03-01'), 'WINTER', 'SUMMER') FROM (SELECT dt, device_name, device_type, device_floor FROM ( SELECT dt, hr, device_name, device_type, device_floor, AVG(event_value) AS temperature_hourly_avg FROM ( SELECT CAST(log_time AS DATE) AS dt, toHour(log_time) AS hr, device_name, device_type, device_floor, event_value FROM mgbench.logs3 WHERE event_type = 'temperature' ) AS r GROUP BY dt, hr, device_name, device_type, device_floor ) AS s GROUP BY dt, device_name, device_type, device_floor HAVING MAX(temperature_hourly_avg) - MIN(temperature_hourly_avg) >= 25.0 ) -- Q3.5: Where in the building do large temperature variations occur in winter and summer?
-SELECT yr, mo, SUM(coffee_hourly_avg) AS coffee_monthly_sum, AVG(coffee_hourly_avg) AS coffee_monthly_avg, SUM(printer_hourly_avg) AS printer_monthly_sum, AVG(printer_hourly_avg) AS printer_monthly_avg, SUM(projector_hourly_avg) AS projector_monthly_sum, AVG(projector_hourly_avg) AS projector_monthly_avg, SUM(vending_hourly_avg) AS vending_monthly_sum, AVG(vending_hourly_avg) AS vending_monthly_avg FROM ( SELECT dt, yr, mo, hr, AVG(coffee) AS coffee_hourly_avg, AVG(printer) AS printer_hourly_avg, AVG(projector) AS projector_hourly_avg, AVG(vending) AS vending_hourly_avg FROM ( SELECT CAST(log_time AS DATE) AS dt, toYear(log_time) AS yr, EXTRACT(MONTH FROM log_time) AS mo, toHour(log_time) AS hr, CASE WHEN device_name LIKE 'coffee%' THEN event_value END AS coffee, CASE WHEN device_name LIKE 'printer%' THEN event_value END AS printer, CASE WHEN device_name LIKE 'projector%' THEN event_value END AS projector, CASE WHEN device_name LIKE 'vending%' THEN event_value END AS vending FROM mgbench.logs3 WHERE device_type = 'meter' ) AS r GROUP BY dt, yr, mo, hr ) AS s GROUP BY yr, mo ORDER BY yr, mo; -- Q3.6: For each device category, what are the monthly power consumption metrics?
\ No newline at end of file
diff --git a/website/benchmark/versions/scripts/ch_queries.sql b/website/benchmark/versions/scripts/ch_queries.sql
deleted file mode 100644
index 89c4616c642..00000000000
--- a/website/benchmark/versions/scripts/ch_queries.sql
+++ /dev/null
@@ -1,43 +0,0 @@
-SELECT count() FROM {table};
-SELECT count() FROM {table} WHERE AdvEngineID != 0;
-SELECT sum(AdvEngineID), count(), avg(ResolutionWidth) FROM {table} ;
-SELECT sum(UserID) FROM {table} ;
-SELECT uniq(UserID) FROM {table} ;
-SELECT uniq(SearchPhrase) FROM {table} ;
-SELECT min(EventDate), max(EventDate) FROM {table} ;
-SELECT AdvEngineID, count() FROM {table} WHERE AdvEngineID != 0 GROUP BY AdvEngineID ORDER BY count() DESC;
-SELECT RegionID, uniq(UserID) AS u FROM {table} GROUP BY RegionID ORDER BY u DESC LIMIT 10;
-SELECT RegionID, sum(AdvEngineID), count() AS c, avg(ResolutionWidth), uniq(UserID) FROM {table} GROUP BY RegionID ORDER BY c DESC LIMIT 10;
-SELECT MobilePhoneModel, uniq(UserID) AS u FROM {table} WHERE MobilePhoneModel != '' GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10;
-SELECT MobilePhone, MobilePhoneModel, uniq(UserID) AS u FROM {table} WHERE MobilePhoneModel != '' GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10;
-SELECT SearchPhrase, count() AS c FROM {table} WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
-SELECT SearchPhrase, uniq(UserID) AS u FROM {table} WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10;
-SELECT SearchEngineID, SearchPhrase, count() AS c FROM {table} WHERE SearchPhrase != '' GROUP BY SearchEngineID, SearchPhrase ORDER BY c DESC LIMIT 10;
-SELECT UserID, count() FROM {table} GROUP BY UserID ORDER BY count() DESC LIMIT 10;
-SELECT UserID, SearchPhrase, count() FROM {table} GROUP BY UserID, SearchPhrase ORDER BY count() DESC LIMIT 10;
-SELECT UserID, SearchPhrase, count() FROM {table} GROUP BY UserID, SearchPhrase LIMIT 10;
-SELECT UserID, toMinute(EventTime) AS m, SearchPhrase, count() FROM {table} GROUP BY UserID, m, SearchPhrase ORDER BY count() DESC LIMIT 10;
-SELECT UserID FROM {table} WHERE UserID = 12345678901234567890;
-SELECT count() FROM {table} WHERE URL LIKE '%metrika%';
-SELECT SearchPhrase, any(URL), count() AS c FROM {table} WHERE URL LIKE '%metrika%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
-SELECT SearchPhrase, any(URL), any(Title), count() AS c, uniq(UserID) FROM {table} WHERE Title LIKE '%Яндекс%' AND URL NOT LIKE '%.yandex.%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
-SELECT * FROM {table} WHERE URL LIKE '%metrika%' ORDER BY EventTime LIMIT 10;
-SELECT SearchPhrase FROM {table} WHERE SearchPhrase != '' ORDER BY EventTime LIMIT 10;
-SELECT SearchPhrase FROM {table} WHERE SearchPhrase != '' ORDER BY SearchPhrase LIMIT 10;
-SELECT SearchPhrase FROM {table} WHERE SearchPhrase != '' ORDER BY EventTime, SearchPhrase LIMIT 10;
-SELECT CounterID, avg(length(URL)) AS l, count() AS c FROM {table} WHERE URL != '' GROUP BY CounterID HAVING c > 100000 ORDER BY l DESC LIMIT 25;
-SELECT domainWithoutWWW(Referer) AS key, avg(length(Referer)) AS l, count() AS c, any(Referer) FROM {table} WHERE Referer != '' GROUP BY key HAVING c > 100000 ORDER BY l DESC LIMIT 25;
-SELECT sum(ResolutionWidth), sum(ResolutionWidth + 1), sum(ResolutionWidth + 2), sum(ResolutionWidth + 3), sum(ResolutionWidth + 4), sum(ResolutionWidth + 5), sum(ResolutionWidth + 6), sum(ResolutionWidth + 7), sum(ResolutionWidth + 8), sum(ResolutionWidth + 9), sum(ResolutionWidth + 10), sum(ResolutionWidth + 11), sum(ResolutionWidth + 12), sum(ResolutionWidth + 13), sum(ResolutionWidth + 14), sum(ResolutionWidth + 15), sum(ResolutionWidth + 16), sum(ResolutionWidth + 17), sum(ResolutionWidth + 18), sum(ResolutionWidth + 19), sum(ResolutionWidth + 20), sum(ResolutionWidth + 21), sum(ResolutionWidth + 22), sum(ResolutionWidth + 23), sum(ResolutionWidth + 24), sum(ResolutionWidth + 25), sum(ResolutionWidth + 26), sum(ResolutionWidth + 27), sum(ResolutionWidth + 28), sum(ResolutionWidth + 29), sum(ResolutionWidth + 30), sum(ResolutionWidth + 31), sum(ResolutionWidth + 32), sum(ResolutionWidth + 33), sum(ResolutionWidth + 34), sum(ResolutionWidth + 35), sum(ResolutionWidth + 36), sum(ResolutionWidth + 37), sum(ResolutionWidth + 38), sum(ResolutionWidth + 39), sum(ResolutionWidth + 40), sum(ResolutionWidth + 41), sum(ResolutionWidth + 42), sum(ResolutionWidth + 43), sum(ResolutionWidth + 44), sum(ResolutionWidth + 45), sum(ResolutionWidth + 46), sum(ResolutionWidth + 47), sum(ResolutionWidth + 48), sum(ResolutionWidth + 49), sum(ResolutionWidth + 50), sum(ResolutionWidth + 51), sum(ResolutionWidth + 52), sum(ResolutionWidth + 53), sum(ResolutionWidth + 54), sum(ResolutionWidth + 55), sum(ResolutionWidth + 56), sum(ResolutionWidth + 57), sum(ResolutionWidth + 58), sum(ResolutionWidth + 59), sum(ResolutionWidth + 60), sum(ResolutionWidth + 61), sum(ResolutionWidth + 62), sum(ResolutionWidth + 63), sum(ResolutionWidth + 64), sum(ResolutionWidth + 65), sum(ResolutionWidth + 66), sum(ResolutionWidth + 67), sum(ResolutionWidth + 68), sum(ResolutionWidth + 69), sum(ResolutionWidth + 70), sum(ResolutionWidth + 71), sum(ResolutionWidth + 72), sum(ResolutionWidth + 73), sum(ResolutionWidth + 74), sum(ResolutionWidth + 75), sum(ResolutionWidth + 76), sum(ResolutionWidth + 77), sum(ResolutionWidth + 78), sum(ResolutionWidth + 79), sum(ResolutionWidth + 80), sum(ResolutionWidth + 81), sum(ResolutionWidth + 82), sum(ResolutionWidth + 83), sum(ResolutionWidth + 84), sum(ResolutionWidth + 85), sum(ResolutionWidth + 86), sum(ResolutionWidth + 87), sum(ResolutionWidth + 88), sum(ResolutionWidth + 89) FROM {table};
-SELECT SearchEngineID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM {table} WHERE SearchPhrase != '' GROUP BY SearchEngineID, ClientIP ORDER BY c DESC LIMIT 10;
-SELECT WatchID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM {table} WHERE SearchPhrase != '' GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;
-SELECT WatchID, ClientIP, count() AS c, sum(Refresh), avg(ResolutionWidth) FROM {table} GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;
-SELECT URL, count() AS c FROM {table} GROUP BY URL ORDER BY c DESC LIMIT 10;
-SELECT 1, URL, count() AS c FROM {table} GROUP BY 1, URL ORDER BY c DESC LIMIT 10;
-SELECT ClientIP AS x, x - 1, x - 2, x - 3, count() AS c FROM {table} GROUP BY x, x - 1, x - 2, x - 3 ORDER BY c DESC LIMIT 10;
-SELECT URL, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND NOT DontCountHits AND NOT Refresh AND notEmpty(URL) GROUP BY URL ORDER BY PageViews DESC LIMIT 10;
-SELECT Title, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND NOT DontCountHits AND NOT Refresh AND notEmpty(Title) GROUP BY Title ORDER BY PageViews DESC LIMIT 10;
-SELECT URL, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND NOT Refresh AND IsLink AND NOT IsDownload GROUP BY URL ORDER BY PageViews DESC LIMIT 1000;
-SELECT TraficSourceID, SearchEngineID, AdvEngineID, ((SearchEngineID = 0 AND AdvEngineID = 0) ? Referer : '') AS Src, URL AS Dst, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND NOT Refresh GROUP BY TraficSourceID, SearchEngineID, AdvEngineID, Src, Dst ORDER BY PageViews DESC LIMIT 1000;
-SELECT URLHash, EventDate, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND NOT Refresh AND TraficSourceID IN (-1, 6) AND RefererHash = halfMD5('http://example.ru/') GROUP BY URLHash, EventDate ORDER BY PageViews DESC LIMIT 100;
-SELECT WindowClientWidth, WindowClientHeight, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND NOT Refresh AND NOT DontCountHits AND URLHash = halfMD5('http://example.ru/') GROUP BY WindowClientWidth, WindowClientHeight ORDER BY PageViews DESC LIMIT 10000;
-SELECT toStartOfMinute(EventTime) AS Minute, count() AS PageViews FROM {table} WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-02' AND NOT Refresh AND NOT DontCountHits GROUP BY Minute ORDER BY Minute;
diff --git a/website/benchmark/versions/scripts/runner.sh b/website/benchmark/versions/scripts/runner.sh
deleted file mode 100644
index 7678738b6cb..00000000000
--- a/website/benchmark/versions/scripts/runner.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "VERSION = $1"
-echo "DATE = $2"
\ No newline at end of file
diff --git a/website/benchmark/versions/scripts/ssb_queries.sql b/website/benchmark/versions/scripts/ssb_queries.sql
deleted file mode 100644
index 375cf511489..00000000000
--- a/website/benchmark/versions/scripts/ssb_queries.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE F_YEAR = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25; -- Q1.1
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toYYYYMM(LO_ORDERDATE) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35; -- Q1.2
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toRelativeWeekNum(LO_ORDERDATE) - toRelativeWeekNum(toDate('1994-01-01')) = 6 AND F_YEAR = 1994 AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35; -- Q1.3
-SELECT sum(LO_REVENUE), F_YEAR AS year, P_BRAND FROM lineorder_flat WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA' GROUP BY year, P_BRAND ORDER BY year, P_BRAND; -- Q2.1
-SELECT sum(LO_REVENUE), F_YEAR AS year, P_BRAND FROM lineorder_flat WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA' GROUP BY year, P_BRAND ORDER BY year, P_BRAND; -- Q2.2
-SELECT sum(LO_REVENUE), F_YEAR AS year, P_BRAND FROM lineorder_flat WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE' GROUP BY year, P_BRAND ORDER BY year, P_BRAND; -- Q2.3
-SELECT C_NATION, S_NATION, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997 GROUP BY C_NATION, S_NATION, year ORDER BY year ASC, revenue DESC; -- Q3.1
-SELECT C_CITY, S_CITY, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997 GROUP BY C_CITY, S_CITY, year ORDER BY year ASC, revenue DESC; -- Q3.2
-SELECT C_CITY, S_CITY, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997 GROUP BY C_CITY, S_CITY, year ORDER BY year ASC, revenue DESC; -- Q3.3
-SELECT C_CITY, S_CITY, F_YEAR AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND toYYYYMM(LO_ORDERDATE) = 199712 GROUP BY C_CITY, S_CITY, year ORDER BY year ASC, revenue DESC; -- Q3.4
-SELECT F_YEAR AS year, C_NATION, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year, C_NATION ORDER BY year ASC, C_NATION ASC; -- Q4.1
-SELECT F_YEAR AS year, S_NATION, P_CATEGORY, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year, S_NATION, P_CATEGORY ORDER BY year ASC, S_NATION ASC, P_CATEGORY ASC; -- Q4.2
-SELECT F_YEAR AS year, S_CITY, P_BRAND, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14' GROUP BY year, S_CITY, P_BRAND ORDER BY year ASC, S_CITY ASC, P_BRAND ASC; -- Q4.
\ No newline at end of file
diff --git a/website/css/base.css b/website/css/base.css
deleted file mode 100644
index d81b231789a..00000000000
--- a/website/css/base.css
+++ /dev/null
@@ -1,203 +0,0 @@
-.blog a:link, .blog a:visited,
-.docs a:link, .docs a:visited {
-    color: #f14600;
-    text-decoration: none;
-}
-
-.blog a:hover, .blog a:active,
-.docs a:hover, .docs a:active {
-    text-decoration: underline;
-}
-
-.btn.disabled, .btn:disabled {
-    cursor: default;
-    opacity: 0.4;
-}
-
-.fake-btn {
-    display: inline-block;
-    padding: 0.375rem 0.75rem;
-    text-align: center;
-    font-size: 1rem;
-    line-height: 1.5;
-}
-
-#logo-icon, #docs-logo-icon {
-    width: 64px;
-}
-
-#logo-text {
-    width: 180px;
-    margin-left: 12px;
-}
-
-.display-5 {
-    font-size: 2rem;
-    font-weight: 300;
-    line-height: 1.2;
-}
-
-.display-6 {
-    font-size: 1.75rem;
-    font-weight: 300;
-    line-height: 1.2;
-}
-
-.bg-dark-alt, .bg-dark-alt:focus {
-    background: #36363F;
-}
-
-.bg-secondary-alt, .bg-secondary-alt:focus {
-    background: #444451;
-}
-
-.bg-orange, .bg-orange:focus {
-    background: #f14600;
-}
-
-.text-dark-alt {
-    color: #36363F;
-}
-
-.btn-dark-alt {
-    background: #36363F;
-}
-
-.btn-dark-alt:focus {
-    background: #36363F;
-}
-
-.btn-outline-orange {
-    border-color: #f14600;
-    color: #f14600;
-}
-
-.btn-orange, .btn-outline-orange:hover {
-    background: #f14600;
-    color: #fff;
-}
-
-a.btn-outline-yellow {
-    border-color: #fc0;
-    color: #fc0;
-}
-
-.btn-yellow, .btn-outline-yellow:hover {
-    background: #fc0;
-    color: #000;
-}
-
-.btn-yellow:hover {
-    background: #ffe100;
-}
-
-.btn-yellow:hover, .btn-yellow:link, .btn-yellow:visited {
-    color: #000;
-}
-
-.btn:hover, .btn:active {
-    text-decoration: none;
-}
-
-.text-red {
-    color: #ff3939;
-}
-
-.text-orange {
-    color: #f14600;
-}
-
-.text-yellow {
-    color: #fc0;
-}
-
-.bg-number {
-    position: absolute;
-    font-size: 900%;
-    font-weight: bold;
-    color: rgba(241, 70, 0, 0.1);
-    line-height: 1;
-    margin-top: -1rem;
-}
-
-.dropdown-item {
-  color: #e1e1e1 !important;
-}
-
-.dropdown-item:hover,
-.dropdown-item:focus {
-  background-color: #1e1e1e;
-}
-
-.nav .dropdown-toggle::after {
-    vertical-align: 0 !important;
-}
-.nav .dropdown-toggle[aria-expanded=false]::after {
-    display: inline-block;
-    margin-right: .255em;
-    vertical-align: 0;
-    content: "";
-    border-top: .3em solid transparent;
-    border-right: .3em solid;
-    border-bottom: .3em solid transparent;
-}
-
-.dots-lb {
-    background: #fff url('/images/dots.svg') no-repeat 0 100%;
-}
-
-.dots-cb {
-    background: #fff url('/images/dots.svg') no-repeat 50% 100%;
-}
-
-.dots-rb {
-    background: #fff url('/images/dots.svg') no-repeat 100% 100%;
-}
-
-.dots-rhb {
-    background: #fff url('/images/dots.svg') no-repeat 75% 100%;
-}
-
-.dots-cc {
-    background: #fff url('/images/dots.svg') repeat-y 50% -17.5%;
-}
-
-.benchmark-query-cell {
-    width: 20rem;
-    white-space: pre;
-    overflow-x: hidden;
-}
-
-.benchmark-query-cell:hover {
-    width: auto;
-    background-color: #efefef;
-    position: absolute;
-    padding: 0.5rem;
-    margin: -0.5rem 0 0 -0.5rem;
-    overflow-x: auto;
-    white-space: normal;
-}
-
-.benchmark-query-cell-wrapper {
-    width: 22rem;
-}
-
-.w-15 {
-    width: 15% !important;
-}
-
-#feedback_email {
-    white-space: nowrap;
-}
-
-.height-20 {
-    height: 20px;
-}
-
-ol.default{
-	margin-top: 10px;
-}
-
-ol.default li{
-	margin-bottom: 10px;
-}
diff --git a/website/css/bootstrap.css b/website/css/bootstrap.css
deleted file mode 100644
index eb26dce70d7..00000000000
--- a/website/css/bootstrap.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v4.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 The Bootstrap Authors
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--gray:#6c757d;--gray-dark:#343a40;--brand-primary:#fc0;--brand-secondary:#ff3939;--primary-accent-yellow:#fc0;--primary-accent-light-yellow:#fffaf0;--primary-accent-blue:#257af4;--primary-accent-light-blue:#e3f1fe;--secondary-accent-orange:#ff8c00;--secondary-accent-light-orange:#ffe4b5;--secondary-accent-red:#ff3939;--secondary-accent-light-red:#ffe4e1;--primary:#fc0;--secondary:#212529;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f1f6f9;--dark:#495057;--primary-light:#fffaf0;--secondary-light:#fff;--tertiary:#257af4;--tertiary-light:#e3f1fe;--white:#fff;--black:#212529;--blue:#257af4;--light-blue:#e3f1fe;--yellow:#fc0;--light-yellow:#fffaf0;--orange:#ff8c00;--light-orange:#ffe4b5;--red:#ff3939;--light-red:#ffe4e1;--medium:#d6dbdf;--breakpoint-xxs:0;--breakpoint-xs:400px;--breakpoint-sm:616px;--breakpoint-md:768px;--breakpoint-lg:980px;--breakpoint-xl:1240px;--font-family-sans-serif:"Noto Sans",sans-serif;--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(33,37,41,0)}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Noto Sans,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:16px}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{text-decoration:none;background-color:transparent}a,a:hover{color:#ff8c00}a:hover{text-decoration:underline}a:not([href]),a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{border-style:none}img,svg{vertical-align:middle}svg{overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}@media(max-width:1200px){legend{font-size:calc(1.275rem + .3vw)}}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:16px;font-family:Hind Siliguri,sans-serif;font-weight:500;line-height:1.125}.h1,h1{font-size:2.5rem}@media(max-width:1200px){.h1,h1{font-size:calc(1.375rem + 1.5vw)}}.h2,h2{font-size:2rem}@media(max-width:1200px){.h2,h2{font-size:calc(1.325rem + .9vw)}}.h3,h3{font-size:1.75rem}@media(max-width:1200px){.h3,h3{font-size:calc(1.3rem + .6vw)}}.h4,h4{font-size:1.5rem}@media(max-width:1200px){.h4,h4{font-size:calc(1.275rem + .3vw)}}.h5,h5{font-size:1.125rem}.h6,h6{font-size:.875rem}.lead{font-size:1.375rem;font-weight:400}@media(max-width:1200px){.lead{font-size:calc(1.2625rem + .15vw)}}.display-1{font-size:4rem;font-weight:600;line-height:1.125}@media(max-width:1200px){.display-1{font-size:calc(1.525rem + 3.3vw)}}.display-2{font-size:2.5rem;font-weight:600;line-height:1.125}@media(max-width:1200px){.display-2{font-size:calc(1.375rem + 1.5vw)}}.display-3{font-size:2rem;font-weight:500;line-height:1.125}@media(max-width:1200px){.display-3{font-size:calc(1.325rem + .9vw)}}.display-4{font-size:1.75rem;font-weight:500;line-height:1.125}@media(max-width:1200px){.display-4{font-size:calc(1.3rem + .6vw)}}hr{margin-top:8px;margin-bottom:8px;border:0;border-top:1px solid rgba(33,37,41,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:8px;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"— "}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:8px}.figure{display:inline-block}.figure-img{margin-bottom:4px;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#e83e8c;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#495057;border-radius:4px}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#495057}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:20px;padding-left:20px;margin-right:auto;margin-left:auto}@media(min-width:400px){.container{max-width:576px}}@media(min-width:616px){.container{max-width:576px}}@media(min-width:768px){.container{max-width:958px}}@media(min-width:980px){.container{max-width:1008px}}@media(min-width:1240px){.container{max-width:1118px}}.container-fluid,.container-lg,.container-md,.container-sm,.container-xl,.container-xs{width:100%;padding-right:20px;padding-left:20px;margin-right:auto;margin-left:auto}@media(min-width:400px){.container,.container-xs{max-width:576px}}@media(min-width:616px){.container,.container-sm,.container-xs{max-width:576px}}@media(min-width:768px){.container,.container-md,.container-sm,.container-xs{max-width:958px}}@media(min-width:980px){.container,.container-lg,.container-md,.container-sm,.container-xs{max-width:1008px}}@media(min-width:1240px){.container,.container-lg,.container-md,.container-sm,.container-xl,.container-xs{max-width:1118px}}.row{display:flex;flex-wrap:wrap;margin-right:-20px;margin-left:-20px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto,.col-xs,.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-auto{position:relative;width:100%;padding-right:20px;padding-left:20px}.col{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-1>*{flex:0 0 100%;max-width:100%}.row-cols-2>*{flex:0 0 50%;max-width:50%}.row-cols-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-4>*{flex:0 0 25%;max-width:25%}.row-cols-5>*{flex:0 0 20%;max-width:20%}.row-cols-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-auto{flex:0 0 auto;width:auto;max-width:100%}.col-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-3{flex:0 0 25%;max-width:25%}.col-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-6{flex:0 0 50%;max-width:50%}.col-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-9{flex:0 0 75%;max-width:75%}.col-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-12{flex:0 0 100%;max-width:100%}.order-first{order:-1}.order-last{order:13}.order-0{order:0}.order-1{order:1}.order-2{order:2}.order-3{order:3}.order-4{order:4}.order-5{order:5}.order-6{order:6}.order-7{order:7}.order-8{order:8}.order-9{order:9}.order-10{order:10}.order-11{order:11}.order-12{order:12}.offset-1{margin-left:8.3333333333%}.offset-2{margin-left:16.6666666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.3333333333%}.offset-5{margin-left:41.6666666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.3333333333%}.offset-8{margin-left:66.6666666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.3333333333%}.offset-11{margin-left:91.6666666667%}@media(min-width:400px){.col-xs{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-xs-1>*{flex:0 0 100%;max-width:100%}.row-cols-xs-2>*{flex:0 0 50%;max-width:50%}.row-cols-xs-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-xs-4>*{flex:0 0 25%;max-width:25%}.row-cols-xs-5>*{flex:0 0 20%;max-width:20%}.row-cols-xs-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xs-auto{flex:0 0 auto;width:auto;max-width:100%}.col-xs-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-xs-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xs-3{flex:0 0 25%;max-width:25%}.col-xs-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-xs-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-xs-6{flex:0 0 50%;max-width:50%}.col-xs-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-xs-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-xs-9{flex:0 0 75%;max-width:75%}.col-xs-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-xs-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-xs-12{flex:0 0 100%;max-width:100%}.order-xs-first{order:-1}.order-xs-last{order:13}.order-xs-0{order:0}.order-xs-1{order:1}.order-xs-2{order:2}.order-xs-3{order:3}.order-xs-4{order:4}.order-xs-5{order:5}.order-xs-6{order:6}.order-xs-7{order:7}.order-xs-8{order:8}.order-xs-9{order:9}.order-xs-10{order:10}.order-xs-11{order:11}.order-xs-12{order:12}.offset-xs-0{margin-left:0}.offset-xs-1{margin-left:8.3333333333%}.offset-xs-2{margin-left:16.6666666667%}.offset-xs-3{margin-left:25%}.offset-xs-4{margin-left:33.3333333333%}.offset-xs-5{margin-left:41.6666666667%}.offset-xs-6{margin-left:50%}.offset-xs-7{margin-left:58.3333333333%}.offset-xs-8{margin-left:66.6666666667%}.offset-xs-9{margin-left:75%}.offset-xs-10{margin-left:83.3333333333%}.offset-xs-11{margin-left:91.6666666667%}}@media(min-width:616px){.col-sm{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-sm-1>*{flex:0 0 100%;max-width:100%}.row-cols-sm-2>*{flex:0 0 50%;max-width:50%}.row-cols-sm-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-sm-4>*{flex:0 0 25%;max-width:25%}.row-cols-sm-5>*{flex:0 0 20%;max-width:20%}.row-cols-sm-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-sm-auto{flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-sm-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-sm-3{flex:0 0 25%;max-width:25%}.col-sm-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-sm-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-sm-6{flex:0 0 50%;max-width:50%}.col-sm-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-sm-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-sm-9{flex:0 0 75%;max-width:75%}.col-sm-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-sm-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-sm-12{flex:0 0 100%;max-width:100%}.order-sm-first{order:-1}.order-sm-last{order:13}.order-sm-0{order:0}.order-sm-1{order:1}.order-sm-2{order:2}.order-sm-3{order:3}.order-sm-4{order:4}.order-sm-5{order:5}.order-sm-6{order:6}.order-sm-7{order:7}.order-sm-8{order:8}.order-sm-9{order:9}.order-sm-10{order:10}.order-sm-11{order:11}.order-sm-12{order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.3333333333%}.offset-sm-2{margin-left:16.6666666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.3333333333%}.offset-sm-5{margin-left:41.6666666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.3333333333%}.offset-sm-8{margin-left:66.6666666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.3333333333%}.offset-sm-11{margin-left:91.6666666667%}}@media(min-width:768px){.col-md{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-md-1>*{flex:0 0 100%;max-width:100%}.row-cols-md-2>*{flex:0 0 50%;max-width:50%}.row-cols-md-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-md-4>*{flex:0 0 25%;max-width:25%}.row-cols-md-5>*{flex:0 0 20%;max-width:20%}.row-cols-md-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-md-auto{flex:0 0 auto;width:auto;max-width:100%}.col-md-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-md-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-md-3{flex:0 0 25%;max-width:25%}.col-md-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-md-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-md-6{flex:0 0 50%;max-width:50%}.col-md-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-md-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-md-9{flex:0 0 75%;max-width:75%}.col-md-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-md-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-md-12{flex:0 0 100%;max-width:100%}.order-md-first{order:-1}.order-md-last{order:13}.order-md-0{order:0}.order-md-1{order:1}.order-md-2{order:2}.order-md-3{order:3}.order-md-4{order:4}.order-md-5{order:5}.order-md-6{order:6}.order-md-7{order:7}.order-md-8{order:8}.order-md-9{order:9}.order-md-10{order:10}.order-md-11{order:11}.order-md-12{order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.3333333333%}.offset-md-2{margin-left:16.6666666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.3333333333%}.offset-md-5{margin-left:41.6666666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.3333333333%}.offset-md-8{margin-left:66.6666666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.3333333333%}.offset-md-11{margin-left:91.6666666667%}}@media(min-width:980px){.col-lg{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-lg-1>*{flex:0 0 100%;max-width:100%}.row-cols-lg-2>*{flex:0 0 50%;max-width:50%}.row-cols-lg-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-lg-4>*{flex:0 0 25%;max-width:25%}.row-cols-lg-5>*{flex:0 0 20%;max-width:20%}.row-cols-lg-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-lg-auto{flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-lg-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-lg-3{flex:0 0 25%;max-width:25%}.col-lg-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-lg-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-lg-6{flex:0 0 50%;max-width:50%}.col-lg-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-lg-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-lg-9{flex:0 0 75%;max-width:75%}.col-lg-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-lg-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-lg-12{flex:0 0 100%;max-width:100%}.order-lg-first{order:-1}.order-lg-last{order:13}.order-lg-0{order:0}.order-lg-1{order:1}.order-lg-2{order:2}.order-lg-3{order:3}.order-lg-4{order:4}.order-lg-5{order:5}.order-lg-6{order:6}.order-lg-7{order:7}.order-lg-8{order:8}.order-lg-9{order:9}.order-lg-10{order:10}.order-lg-11{order:11}.order-lg-12{order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.3333333333%}.offset-lg-2{margin-left:16.6666666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.3333333333%}.offset-lg-5{margin-left:41.6666666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.3333333333%}.offset-lg-8{margin-left:66.6666666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.3333333333%}.offset-lg-11{margin-left:91.6666666667%}}@media(min-width:1240px){.col-xl{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-xl-1>*{flex:0 0 100%;max-width:100%}.row-cols-xl-2>*{flex:0 0 50%;max-width:50%}.row-cols-xl-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-xl-4>*{flex:0 0 25%;max-width:25%}.row-cols-xl-5>*{flex:0 0 20%;max-width:20%}.row-cols-xl-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xl-auto{flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-xl-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xl-3{flex:0 0 25%;max-width:25%}.col-xl-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-xl-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-xl-6{flex:0 0 50%;max-width:50%}.col-xl-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-xl-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-xl-9{flex:0 0 75%;max-width:75%}.col-xl-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-xl-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-xl-12{flex:0 0 100%;max-width:100%}.order-xl-first{order:-1}.order-xl-last{order:13}.order-xl-0{order:0}.order-xl-1{order:1}.order-xl-2{order:2}.order-xl-3{order:3}.order-xl-4{order:4}.order-xl-5{order:5}.order-xl-6{order:6}.order-xl-7{order:7}.order-xl-8{order:8}.order-xl-9{order:9}.order-xl-10{order:10}.order-xl-11{order:11}.order-xl-12{order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.3333333333%}.offset-xl-2{margin-left:16.6666666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.3333333333%}.offset-xl-5{margin-left:41.6666666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.3333333333%}.offset-xl-8{margin-left:66.6666666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.3333333333%}.offset-xl-11{margin-left:91.6666666667%}}.table{width:100%;margin-bottom:8px;color:#212529}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #d6dbdf}.table thead th{vertical-align:bottom;border-bottom:2px solid #d6dbdf}.table tbody+tbody{border-top:2px solid #d6dbdf}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #d6dbdf}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(33,37,41,.05)}.table-hover tbody tr:hover{color:#212529;background-color:rgba(33,37,41,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#fff1b8}.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#ffe47a}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#ffec9f}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#c1c2c3}.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#8c8e90}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#b4b5b6}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-success tbody+tbody,.table-success td,.table-success th,.table-success thead th{border-color:#8fd19e}.table-hover .table-success:hover,.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-info tbody+tbody,.table-info td,.table-info th,.table-info thead th{border-color:#86cfda}.table-hover .table-info:hover,.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-warning tbody+tbody,.table-warning td,.table-warning th,.table-warning thead th{border-color:#ffdf7e}.table-hover .table-warning:hover,.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-danger tbody+tbody,.table-danger td,.table-danger th,.table-danger thead th{border-color:#ed969e}.table-hover .table-danger:hover,.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fbfcfd}.table-light tbody+tbody,.table-light td,.table-light th,.table-light thead th{border-color:#f8fafc}.table-hover .table-light:hover,.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#eaeff5}.table-dark,.table-dark>td,.table-dark>th{background-color:#ccced0}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#a0a4a8}.table-hover .table-dark:hover,.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#bfc1c4}.table-primary-light,.table-primary-light>td,.table-primary-light>th{background-color:#fffefb}.table-primary-light tbody+tbody,.table-primary-light td,.table-primary-light th,.table-primary-light thead th{border-color:#fffcf7}.table-hover .table-primary-light:hover,.table-hover .table-primary-light:hover>td,.table-hover .table-primary-light:hover>th{background-color:#fff8e2}.table-secondary-light,.table-secondary-light>td,.table-secondary-light>th{background-color:#fff}.table-secondary-light tbody+tbody,.table-secondary-light td,.table-secondary-light th,.table-secondary-light thead th{border-color:#fff}.table-hover .table-secondary-light:hover,.table-hover .table-secondary-light:hover>td,.table-hover .table-secondary-light:hover>th{background-color:#f2f2f2}.table-tertiary,.table-tertiary>td,.table-tertiary>th{background-color:#c2dafc}.table-tertiary tbody+tbody,.table-tertiary td,.table-tertiary th,.table-tertiary thead th{border-color:#8ebaf9}.table-hover .table-tertiary:hover,.table-hover .table-tertiary:hover>td,.table-hover .table-tertiary:hover>th{background-color:#aacbfb}.table-tertiary-light,.table-tertiary-light>td,.table-tertiary-light>th{background-color:#f7fbff}.table-tertiary-light tbody+tbody,.table-tertiary-light td,.table-tertiary-light th,.table-tertiary-light thead th{border-color:#f0f8fe}.table-hover .table-tertiary-light:hover,.table-hover .table-tertiary-light:hover>td,.table-hover .table-tertiary-light:hover>th{background-color:#deeeff}.table-white,.table-white>td,.table-white>th{background-color:#fff}.table-white tbody+tbody,.table-white td,.table-white th,.table-white thead th{border-color:#fff}.table-hover .table-white:hover,.table-hover .table-white:hover>td,.table-hover .table-white:hover>th{background-color:#f2f2f2}.table-black,.table-black>td,.table-black>th{background-color:#c1c2c3}.table-black tbody+tbody,.table-black td,.table-black th,.table-black thead th{border-color:#8c8e90}.table-hover .table-black:hover,.table-hover .table-black:hover>td,.table-hover .table-black:hover>th{background-color:#b4b5b6}.table-blue,.table-blue>td,.table-blue>th{background-color:#c2dafc}.table-blue tbody+tbody,.table-blue td,.table-blue th,.table-blue thead th{border-color:#8ebaf9}.table-hover .table-blue:hover,.table-hover .table-blue:hover>td,.table-hover .table-blue:hover>th{background-color:#aacbfb}.table-light-blue,.table-light-blue>td,.table-light-blue>th{background-color:#f7fbff}.table-light-blue tbody+tbody,.table-light-blue td,.table-light-blue th,.table-light-blue thead th{border-color:#f0f8fe}.table-hover .table-light-blue:hover,.table-hover .table-light-blue:hover>td,.table-hover .table-light-blue:hover>th{background-color:#deeeff}.table-yellow,.table-yellow>td,.table-yellow>th{background-color:#fff1b8}.table-yellow tbody+tbody,.table-yellow td,.table-yellow th,.table-yellow thead th{border-color:#ffe47a}.table-hover .table-yellow:hover,.table-hover .table-yellow:hover>td,.table-hover .table-yellow:hover>th{background-color:#ffec9f}.table-light-yellow,.table-light-yellow>td,.table-light-yellow>th{background-color:#fffefb}.table-light-yellow tbody+tbody,.table-light-yellow td,.table-light-yellow th,.table-light-yellow thead th{border-color:#fffcf7}.table-hover .table-light-yellow:hover,.table-hover .table-light-yellow:hover>td,.table-hover .table-light-yellow:hover>th{background-color:#fff8e2}.table-orange,.table-orange>td,.table-orange>th{background-color:#ffdfb8}.table-orange tbody+tbody,.table-orange td,.table-orange th,.table-orange thead th{border-color:#ffc37a}.table-hover .table-orange:hover,.table-hover .table-orange:hover>td,.table-hover .table-orange:hover>th{background-color:#ffd49f}.table-light-orange,.table-light-orange>td,.table-light-orange>th{background-color:#fff7ea}.table-light-orange tbody+tbody,.table-light-orange td,.table-light-orange th,.table-light-orange thead th{border-color:#fff1d9}.table-hover .table-light-orange:hover,.table-hover .table-light-orange:hover>td,.table-hover .table-light-orange:hover>th{background-color:#ffedd1}.table-red,.table-red>td,.table-red>th{background-color:#ffc8c8}.table-red tbody+tbody,.table-red td,.table-red th,.table-red thead th{border-color:#ff9898}.table-hover .table-red:hover,.table-hover .table-red:hover>td,.table-hover .table-red:hover>th{background-color:#ffafaf}.table-light-red,.table-light-red>td,.table-light-red>th{background-color:#fff7f7}.table-light-red tbody+tbody,.table-light-red td,.table-light-red th,.table-light-red thead th{border-color:#fff1ef}.table-hover .table-light-red:hover,.table-hover .table-light-red:hover>td,.table-hover .table-light-red:hover>th{background-color:#ffdede}.table-medium,.table-medium>td,.table-medium>th{background-color:#f4f5f6}.table-medium tbody+tbody,.table-medium td,.table-medium th,.table-medium thead th{border-color:#eaecee}.table-hover .table-medium:hover,.table-hover .table-medium:hover>td,.table-hover .table-medium:hover>th{background-color:#e6e8eb}.table-active,.table-active>td,.table-active>th{background-color:rgba(33,37,41,.075)}.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(22,24,27,.075)}.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}.table .thead-light th{color:#6c757d;background-color:#e9ecef;border-color:#d6dbdf}.table-dark{color:#fff;background-color:#343a40}.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:hsla(0,0%,100%,.075)}@media(max-width:399.98px){.table-responsive-xs{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xs>.table-bordered{border:0}}@media(max-width:615.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media(max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media(max-width:979.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media(max-width:1239.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#6c757d;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:8px;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:-moz-focusring{color:transparent;text-shadow:0 0 0 #6c757d}.form-control:focus{color:#6c757d;background-color:#fff;border-color:#ffe680;outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:focus::-ms-value{color:#6c757d;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.125rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding:.375rem 0;margin-bottom:0;font-size:1rem;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.5em + .5rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:4px}.form-control-lg{height:calc(1.5em + 1rem + 2px);padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:8px}select.form-control[multiple],select.form-control[size],textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:flex;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label,.form-check-input[disabled]~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:inline-flex;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:8px}.is-valid~.valid-feedback,.is-valid~.valid-tooltip,.was-validated :valid~.valid-feedback,.was-validated :valid~.valid-tooltip{display:block}.form-control.is-valid,.was-validated .form-control:valid{border-color:#28a745;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-valid,.was-validated .custom-select:valid{border-color:#28a745;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-valid:focus,.was-validated .custom-select:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label:before,.was-validated .custom-control-input:valid~.custom-control-label:before{border-color:#28a745}.custom-control-input.is-valid:checked~.custom-control-label:before,.was-validated .custom-control-input:valid:checked~.custom-control-label:before{border-color:#34ce57;background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label:before,.was-validated .custom-control-input:valid:focus~.custom-control-label:before{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-control-input.is-valid:focus:not(:checked)~.custom-control-label:before,.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-control-input:valid:focus:not(:checked)~.custom-control-label:before,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:8px}.is-invalid~.invalid-feedback,.is-invalid~.invalid-tooltip,.was-validated :invalid~.invalid-feedback,.was-validated :invalid~.invalid-tooltip{display:block}.form-control.is-invalid,.was-validated .form-control:invalid{border-color:#dc3545;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545'%3E%3Ccircle cx='6' cy='6' r='4.5'/%3E%3Cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3E%3Ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-invalid,.was-validated .custom-select:invalid{border-color:#dc3545;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545'%3E%3Ccircle cx='6' cy='6' r='4.5'/%3E%3Cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3E%3Ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3E%3C/svg%3E") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-invalid:focus,.was-validated .custom-select:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label:before,.was-validated .custom-control-input:invalid~.custom-control-label:before{border-color:#dc3545}.custom-control-input.is-invalid:checked~.custom-control-label:before,.was-validated .custom-control-input:invalid:checked~.custom-control-label:before{border-color:#e4606d;background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label:before,.was-validated .custom-control-input:invalid:focus~.custom-control-label:before{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-control-input.is-invalid:focus:not(:checked)~.custom-control-label:before,.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-control-input:invalid:focus:not(:checked)~.custom-control-label:before,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:flex;flex-flow:row wrap;align-items:center}.form-inline .form-check{width:100%}@media(min-width:616px){.form-inline label{justify-content:center}.form-inline .form-group,.form-inline label{display:flex;align-items:center;margin-bottom:0}.form-inline .form-group{flex:0 0 auto;flex-flow:row wrap}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .custom-select,.form-inline .input-group{width:auto}.form-inline .form-check{display:flex;align-items:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;flex-shrink:0;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{align-items:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-family:inherit;font-weight:700;color:#212529;text-align:center;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:12px 32px;font-size:.875rem;line-height:20px;border-radius:8px;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529;text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:none}.btn.disabled,.btn:disabled{opacity:.65}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#495057;background-color:#fc0;border-color:#fc0}.btn-primary.focus,.btn-primary:focus,.btn-primary:hover{color:#495057;background-color:#d9ad00;border-color:#cca300}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#495057;background-color:#fc0;border-color:#fc0}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#495057;background-color:#cca300;border-color:#bf9900}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-secondary{color:#fff;background-color:#212529;border-color:#212529}.btn-secondary.focus,.btn-secondary:focus,.btn-secondary:hover{color:#fff;background-color:#101214;border-color:#0a0c0d}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#212529;border-color:#212529}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#0a0c0d;border-color:#050506}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success.focus,.btn-success:focus,.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{box-shadow:0 0 0 0 rgba(72,180,97,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(72,180,97,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info.focus,.btn-info:focus,.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{box-shadow:0 0 0 0 rgba(58,176,195,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(58,176,195,.5)}.btn-warning{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-warning.focus,.btn-warning:focus,.btn-warning:hover{color:#495057;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{box-shadow:0 0 0 0 rgba(228,176,19,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#495057;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,176,19,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger.focus,.btn-danger:focus,.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{box-shadow:0 0 0 0 rgba(225,83,97,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(225,83,97,.5)}.btn-light{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-light.focus,.btn-light:focus,.btn-light:hover{color:#495057;background-color:#d6e5ee;border-color:#cddfea}.btn-light.focus,.btn-light:focus{box-shadow:0 0 0 0 rgba(216,221,225,.5)}.btn-light.disabled,.btn-light:disabled{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#495057;background-color:#cddfea;border-color:#c4d9e6}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(216,221,225,.5)}.btn-dark{color:#fff;background-color:#495057;border-color:#495057}.btn-dark.focus,.btn-dark:focus,.btn-dark:hover{color:#fff;background-color:#383d42;border-color:#32373b}.btn-dark.focus,.btn-dark:focus{box-shadow:0 0 0 0 rgba(100,106,112,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#495057;border-color:#495057}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#32373b;border-color:#2c3034}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(100,106,112,.5)}.btn-primary-light{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-primary-light.focus,.btn-primary-light:focus,.btn-primary-light:hover{color:#495057;background-color:#ffedca;border-color:#ffe9bd}.btn-primary-light.focus,.btn-primary-light:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-primary-light.disabled,.btn-primary-light:disabled{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-primary-light:not(:disabled):not(.disabled).active,.btn-primary-light:not(:disabled):not(.disabled):active,.show>.btn-primary-light.dropdown-toggle{color:#495057;background-color:#ffe9bd;border-color:#ffe5b0}.btn-primary-light:not(:disabled):not(.disabled).active:focus,.btn-primary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-primary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-secondary-light{color:#495057;background-color:#fff;border-color:#fff}.btn-secondary-light.focus,.btn-secondary-light:focus,.btn-secondary-light:hover{color:#495057;background-color:#ececec;border-color:#e6e6e6}.btn-secondary-light.focus,.btn-secondary-light:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-secondary-light.disabled,.btn-secondary-light:disabled{color:#495057;background-color:#fff;border-color:#fff}.btn-secondary-light:not(:disabled):not(.disabled).active,.btn-secondary-light:not(:disabled):not(.disabled):active,.show>.btn-secondary-light.dropdown-toggle{color:#495057;background-color:#e6e6e6;border-color:#dfdfdf}.btn-secondary-light:not(:disabled):not(.disabled).active:focus,.btn-secondary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-tertiary{color:#fff;background-color:#257af4;border-color:#257af4}.btn-tertiary.focus,.btn-tertiary:focus,.btn-tertiary:hover{color:#fff;background-color:#0c66e7;border-color:#0b60db}.btn-tertiary.focus,.btn-tertiary:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-tertiary.disabled,.btn-tertiary:disabled{color:#fff;background-color:#257af4;border-color:#257af4}.btn-tertiary:not(:disabled):not(.disabled).active,.btn-tertiary:not(:disabled):not(.disabled):active,.show>.btn-tertiary.dropdown-toggle{color:#fff;background-color:#0b60db;border-color:#0a5bcf}.btn-tertiary:not(:disabled):not(.disabled).active:focus,.btn-tertiary:not(:disabled):not(.disabled):active:focus,.show>.btn-tertiary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-tertiary-light{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-tertiary-light.focus,.btn-tertiary-light:focus,.btn-tertiary-light:hover{color:#495057;background-color:#bedffd;border-color:#b2d8fc}.btn-tertiary-light.focus,.btn-tertiary-light:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-tertiary-light.disabled,.btn-tertiary-light:disabled{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-tertiary-light:not(:disabled):not(.disabled).active,.btn-tertiary-light:not(:disabled):not(.disabled):active,.show>.btn-tertiary-light.dropdown-toggle{color:#495057;background-color:#b2d8fc;border-color:#a5d2fc}.btn-tertiary-light:not(:disabled):not(.disabled).active:focus,.btn-tertiary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-tertiary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-white{color:#495057;background-color:#fff;border-color:#fff}.btn-white.focus,.btn-white:focus,.btn-white:hover{color:#495057;background-color:#ececec;border-color:#e6e6e6}.btn-white.focus,.btn-white:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-white.disabled,.btn-white:disabled{color:#495057;background-color:#fff;border-color:#fff}.btn-white:not(:disabled):not(.disabled).active,.btn-white:not(:disabled):not(.disabled):active,.show>.btn-white.dropdown-toggle{color:#495057;background-color:#e6e6e6;border-color:#dfdfdf}.btn-white:not(:disabled):not(.disabled).active:focus,.btn-white:not(:disabled):not(.disabled):active:focus,.show>.btn-white.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-black{color:#fff;background-color:#212529;border-color:#212529}.btn-black.focus,.btn-black:focus,.btn-black:hover{color:#fff;background-color:#101214;border-color:#0a0c0d}.btn-black.focus,.btn-black:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-black.disabled,.btn-black:disabled{color:#fff;background-color:#212529;border-color:#212529}.btn-black:not(:disabled):not(.disabled).active,.btn-black:not(:disabled):not(.disabled):active,.show>.btn-black.dropdown-toggle{color:#fff;background-color:#0a0c0d;border-color:#050506}.btn-black:not(:disabled):not(.disabled).active:focus,.btn-black:not(:disabled):not(.disabled):active:focus,.show>.btn-black.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-blue{color:#fff;background-color:#257af4;border-color:#257af4}.btn-blue.focus,.btn-blue:focus,.btn-blue:hover{color:#fff;background-color:#0c66e7;border-color:#0b60db}.btn-blue.focus,.btn-blue:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-blue.disabled,.btn-blue:disabled{color:#fff;background-color:#257af4;border-color:#257af4}.btn-blue:not(:disabled):not(.disabled).active,.btn-blue:not(:disabled):not(.disabled):active,.show>.btn-blue.dropdown-toggle{color:#fff;background-color:#0b60db;border-color:#0a5bcf}.btn-blue:not(:disabled):not(.disabled).active:focus,.btn-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-light-blue{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-light-blue.focus,.btn-light-blue:focus,.btn-light-blue:hover{color:#495057;background-color:#bedffd;border-color:#b2d8fc}.btn-light-blue.focus,.btn-light-blue:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-light-blue.disabled,.btn-light-blue:disabled{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-light-blue:not(:disabled):not(.disabled).active,.btn-light-blue:not(:disabled):not(.disabled):active,.show>.btn-light-blue.dropdown-toggle{color:#495057;background-color:#b2d8fc;border-color:#a5d2fc}.btn-light-blue:not(:disabled):not(.disabled).active:focus,.btn-light-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-light-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-yellow{color:#495057;background-color:#fc0;border-color:#fc0}.btn-yellow.focus,.btn-yellow:focus,.btn-yellow:hover{color:#495057;background-color:#d9ad00;border-color:#cca300}.btn-yellow.focus,.btn-yellow:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-yellow.disabled,.btn-yellow:disabled{color:#495057;background-color:#fc0;border-color:#fc0}.btn-yellow:not(:disabled):not(.disabled).active,.btn-yellow:not(:disabled):not(.disabled):active,.show>.btn-yellow.dropdown-toggle{color:#495057;background-color:#cca300;border-color:#bf9900}.btn-yellow:not(:disabled):not(.disabled).active:focus,.btn-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-light-yellow{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-light-yellow.focus,.btn-light-yellow:focus,.btn-light-yellow:hover{color:#495057;background-color:#ffedca;border-color:#ffe9bd}.btn-light-yellow.focus,.btn-light-yellow:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-light-yellow.disabled,.btn-light-yellow:disabled{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-light-yellow:not(:disabled):not(.disabled).active,.btn-light-yellow:not(:disabled):not(.disabled):active,.show>.btn-light-yellow.dropdown-toggle{color:#495057;background-color:#ffe9bd;border-color:#ffe5b0}.btn-light-yellow:not(:disabled):not(.disabled).active:focus,.btn-light-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-light-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-orange{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-orange.focus,.btn-orange:focus,.btn-orange:hover{color:#fff;background-color:#d97700;border-color:#cc7000}.btn-orange.focus,.btn-orange:focus{box-shadow:0 0 0 0 rgba(228,131,13,.5)}.btn-orange.disabled,.btn-orange:disabled{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-orange:not(:disabled):not(.disabled).active,.btn-orange:not(:disabled):not(.disabled):active,.show>.btn-orange.dropdown-toggle{color:#fff;background-color:#cc7000;border-color:#bf6900}.btn-orange:not(:disabled):not(.disabled).active:focus,.btn-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,131,13,.5)}.btn-light-orange{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-light-orange.focus,.btn-light-orange:focus,.btn-light-orange:hover{color:#495057;background-color:#ffd68f;border-color:#ffd182}.btn-light-orange.focus,.btn-light-orange:focus{box-shadow:0 0 0 0 rgba(228,206,167,.5)}.btn-light-orange.disabled,.btn-light-orange:disabled{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-light-orange:not(:disabled):not(.disabled).active,.btn-light-orange:not(:disabled):not(.disabled):active,.show>.btn-light-orange.dropdown-toggle{color:#495057;background-color:#ffd182;border-color:#ffcd75}.btn-light-orange:not(:disabled):not(.disabled).active:focus,.btn-light-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-light-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,206,167,.5)}.btn-red{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-red.focus,.btn-red:focus,.btn-red:hover{color:#fff;background-color:#ff1313;border-color:#ff0606}.btn-red.focus,.btn-red:focus{box-shadow:0 0 0 0 rgba(255,87,87,.5)}.btn-red.disabled,.btn-red:disabled{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-red:not(:disabled):not(.disabled).active,.btn-red:not(:disabled):not(.disabled):active,.show>.btn-red.dropdown-toggle{color:#fff;background-color:#ff0606;border-color:#f80000}.btn-red:not(:disabled):not(.disabled).active:focus,.btn-red:not(:disabled):not(.disabled):active:focus,.show>.btn-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,87,87,.5)}.btn-light-red{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-light-red.focus,.btn-light-red:focus,.btn-light-red:hover{color:#495057;background-color:#ffc2bb;border-color:#ffb6ae}.btn-light-red.focus,.btn-light-red:focus{box-shadow:0 0 0 0 rgba(228,206,204,.5)}.btn-light-red.disabled,.btn-light-red:disabled{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-light-red:not(:disabled):not(.disabled).active,.btn-light-red:not(:disabled):not(.disabled):active,.show>.btn-light-red.dropdown-toggle{color:#495057;background-color:#ffb6ae;border-color:#ffaba1}.btn-light-red:not(:disabled):not(.disabled).active:focus,.btn-light-red:not(:disabled):not(.disabled):active:focus,.show>.btn-light-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,206,204,.5)}.btn-medium{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-medium.focus,.btn-medium:focus,.btn-medium:hover{color:#495057;background-color:#c1c8ce;border-color:#b9c2c9}.btn-medium.focus,.btn-medium:focus{box-shadow:0 0 0 0 rgba(193,198,203,.5)}.btn-medium.disabled,.btn-medium:disabled{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-medium:not(:disabled):not(.disabled).active,.btn-medium:not(:disabled):not(.disabled):active,.show>.btn-medium.dropdown-toggle{color:#495057;background-color:#b9c2c9;border-color:#b2bcc3}.btn-medium:not(:disabled):not(.disabled).active:focus,.btn-medium:not(:disabled):not(.disabled):active:focus,.show>.btn-medium.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(193,198,203,.5)}.btn-outline-primary{color:#fc0;border-color:#fc0}.btn-outline-primary:hover{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#fc0;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-secondary{color:#212529;border-color:#212529}.btn-outline-secondary:hover{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#212529;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-success{color:#28a745;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 0 rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 0 rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;border-color:#ffc107}.btn-outline-warning:hover{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 0 rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 0 rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(220,53,69,.5)}.btn-outline-light{color:#f1f6f9;border-color:#f1f6f9}.btn-outline-light:hover{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 0 rgba(241,246,249,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f1f6f9;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(241,246,249,.5)}.btn-outline-dark{color:#495057;border-color:#495057}.btn-outline-dark:hover{color:#fff;background-color:#495057;border-color:#495057}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 0 rgba(73,80,87,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#495057;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#495057;border-color:#495057}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(73,80,87,.5)}.btn-outline-primary-light{color:#fffaf0;border-color:#fffaf0}.btn-outline-primary-light:hover{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-primary-light.focus,.btn-outline-primary-light:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-primary-light.disabled,.btn-outline-primary-light:disabled{color:#fffaf0;background-color:transparent}.btn-outline-primary-light:not(:disabled):not(.disabled).active,.btn-outline-primary-light:not(:disabled):not(.disabled):active,.show>.btn-outline-primary-light.dropdown-toggle{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-primary-light:not(:disabled):not(.disabled).active:focus,.btn-outline-primary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-secondary-light{color:#fff;border-color:#fff}.btn-outline-secondary-light:hover{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-secondary-light.focus,.btn-outline-secondary-light:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-secondary-light.disabled,.btn-outline-secondary-light:disabled{color:#fff;background-color:transparent}.btn-outline-secondary-light:not(:disabled):not(.disabled).active,.btn-outline-secondary-light:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary-light.dropdown-toggle{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-secondary-light:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-tertiary{color:#257af4;border-color:#257af4}.btn-outline-tertiary:hover{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-tertiary.focus,.btn-outline-tertiary:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-tertiary.disabled,.btn-outline-tertiary:disabled{color:#257af4;background-color:transparent}.btn-outline-tertiary:not(:disabled):not(.disabled).active,.btn-outline-tertiary:not(:disabled):not(.disabled):active,.show>.btn-outline-tertiary.dropdown-toggle{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-tertiary:not(:disabled):not(.disabled).active:focus,.btn-outline-tertiary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-tertiary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-tertiary-light{color:#e3f1fe;border-color:#e3f1fe}.btn-outline-tertiary-light:hover{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-tertiary-light.focus,.btn-outline-tertiary-light:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-tertiary-light.disabled,.btn-outline-tertiary-light:disabled{color:#e3f1fe;background-color:transparent}.btn-outline-tertiary-light:not(:disabled):not(.disabled).active,.btn-outline-tertiary-light:not(:disabled):not(.disabled):active,.show>.btn-outline-tertiary-light.dropdown-toggle{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-tertiary-light:not(:disabled):not(.disabled).active:focus,.btn-outline-tertiary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-tertiary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-white{color:#fff;border-color:#fff}.btn-outline-white:hover{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-white.focus,.btn-outline-white:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-white.disabled,.btn-outline-white:disabled{color:#fff;background-color:transparent}.btn-outline-white:not(:disabled):not(.disabled).active,.btn-outline-white:not(:disabled):not(.disabled):active,.show>.btn-outline-white.dropdown-toggle{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-white:not(:disabled):not(.disabled).active:focus,.btn-outline-white:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-white.dropdown-toggle:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-black{color:#212529;border-color:#212529}.btn-outline-black:hover{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-black.focus,.btn-outline-black:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-black.disabled,.btn-outline-black:disabled{color:#212529;background-color:transparent}.btn-outline-black:not(:disabled):not(.disabled).active,.btn-outline-black:not(:disabled):not(.disabled):active,.show>.btn-outline-black.dropdown-toggle{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-black:not(:disabled):not(.disabled).active:focus,.btn-outline-black:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-black.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-blue{color:#257af4;border-color:#257af4}.btn-outline-blue:hover{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-blue.focus,.btn-outline-blue:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-blue.disabled,.btn-outline-blue:disabled{color:#257af4;background-color:transparent}.btn-outline-blue:not(:disabled):not(.disabled).active,.btn-outline-blue:not(:disabled):not(.disabled):active,.show>.btn-outline-blue.dropdown-toggle{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-blue:not(:disabled):not(.disabled).active:focus,.btn-outline-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-light-blue{color:#e3f1fe;border-color:#e3f1fe}.btn-outline-light-blue:hover{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-light-blue.focus,.btn-outline-light-blue:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-light-blue.disabled,.btn-outline-light-blue:disabled{color:#e3f1fe;background-color:transparent}.btn-outline-light-blue:not(:disabled):not(.disabled).active,.btn-outline-light-blue:not(:disabled):not(.disabled):active,.show>.btn-outline-light-blue.dropdown-toggle{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-light-blue:not(:disabled):not(.disabled).active:focus,.btn-outline-light-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-yellow{color:#fc0;border-color:#fc0}.btn-outline-yellow:hover{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-yellow.focus,.btn-outline-yellow:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-yellow.disabled,.btn-outline-yellow:disabled{color:#fc0;background-color:transparent}.btn-outline-yellow:not(:disabled):not(.disabled).active,.btn-outline-yellow:not(:disabled):not(.disabled):active,.show>.btn-outline-yellow.dropdown-toggle{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-yellow:not(:disabled):not(.disabled).active:focus,.btn-outline-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-light-yellow{color:#fffaf0;border-color:#fffaf0}.btn-outline-light-yellow:hover{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-light-yellow.focus,.btn-outline-light-yellow:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-light-yellow.disabled,.btn-outline-light-yellow:disabled{color:#fffaf0;background-color:transparent}.btn-outline-light-yellow:not(:disabled):not(.disabled).active,.btn-outline-light-yellow:not(:disabled):not(.disabled):active,.show>.btn-outline-light-yellow.dropdown-toggle{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-light-yellow:not(:disabled):not(.disabled).active:focus,.btn-outline-light-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-orange{color:#ff8c00;border-color:#ff8c00}.btn-outline-orange:hover{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-outline-orange.focus,.btn-outline-orange:focus{box-shadow:0 0 0 0 rgba(255,140,0,.5)}.btn-outline-orange.disabled,.btn-outline-orange:disabled{color:#ff8c00;background-color:transparent}.btn-outline-orange:not(:disabled):not(.disabled).active,.btn-outline-orange:not(:disabled):not(.disabled):active,.show>.btn-outline-orange.dropdown-toggle{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-outline-orange:not(:disabled):not(.disabled).active:focus,.btn-outline-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,140,0,.5)}.btn-outline-light-orange{color:#ffe4b5;border-color:#ffe4b5}.btn-outline-light-orange:hover{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-outline-light-orange.focus,.btn-outline-light-orange:focus{box-shadow:0 0 0 0 rgba(255,228,181,.5)}.btn-outline-light-orange.disabled,.btn-outline-light-orange:disabled{color:#ffe4b5;background-color:transparent}.btn-outline-light-orange:not(:disabled):not(.disabled).active,.btn-outline-light-orange:not(:disabled):not(.disabled):active,.show>.btn-outline-light-orange.dropdown-toggle{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-outline-light-orange:not(:disabled):not(.disabled).active:focus,.btn-outline-light-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,228,181,.5)}.btn-outline-red{color:#ff3939;border-color:#ff3939}.btn-outline-red:hover{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-outline-red.focus,.btn-outline-red:focus{box-shadow:0 0 0 0 rgba(255,57,57,.5)}.btn-outline-red.disabled,.btn-outline-red:disabled{color:#ff3939;background-color:transparent}.btn-outline-red:not(:disabled):not(.disabled).active,.btn-outline-red:not(:disabled):not(.disabled):active,.show>.btn-outline-red.dropdown-toggle{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-outline-red:not(:disabled):not(.disabled).active:focus,.btn-outline-red:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,57,57,.5)}.btn-outline-light-red{color:#ffe4e1;border-color:#ffe4e1}.btn-outline-light-red:hover{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-outline-light-red.focus,.btn-outline-light-red:focus{box-shadow:0 0 0 0 rgba(255,228,225,.5)}.btn-outline-light-red.disabled,.btn-outline-light-red:disabled{color:#ffe4e1;background-color:transparent}.btn-outline-light-red:not(:disabled):not(.disabled).active,.btn-outline-light-red:not(:disabled):not(.disabled):active,.show>.btn-outline-light-red.dropdown-toggle{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-outline-light-red:not(:disabled):not(.disabled).active:focus,.btn-outline-light-red:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,228,225,.5)}.btn-outline-medium{color:#d6dbdf;border-color:#d6dbdf}.btn-outline-medium:hover{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-outline-medium.focus,.btn-outline-medium:focus{box-shadow:0 0 0 0 rgba(214,219,223,.5)}.btn-outline-medium.disabled,.btn-outline-medium:disabled{color:#d6dbdf;background-color:transparent}.btn-outline-medium:not(:disabled):not(.disabled).active,.btn-outline-medium:not(:disabled):not(.disabled):active,.show>.btn-outline-medium.dropdown-toggle{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-outline-medium:not(:disabled):not(.disabled).active:focus,.btn-outline-medium:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-medium.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(214,219,223,.5)}.btn-link{font-weight:400;color:#ff8c00;text-decoration:none}.btn-link:hover{color:#ff8c00;text-decoration:underline}.btn-link.focus,.btn-link:focus{text-decoration:underline;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#d6dbdf;pointer-events:none}.btn-group-lg>.btn,.btn-lg{padding:16px 32px;font-size:1.125rem;line-height:26px;border-radius:8px}.btn-group-sm>.btn,.btn-sm{padding:6px 12px;font-size:.75rem;line-height:16px;border-radius:4px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:24px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media(prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media(prefers-reduced-motion:reduce){.collapsing{transition:none}}.dropdown,.dropleft,.dropright,.dropup{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty:after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(33,37,41,.15);border-radius:8px}.dropdown-menu-left{right:auto;left:0}.dropdown-menu-right{right:0;left:auto}@media(min-width:400px){.dropdown-menu-xs-left{right:auto;left:0}.dropdown-menu-xs-right{right:0;left:auto}}@media(min-width:616px){.dropdown-menu-sm-left{right:auto;left:0}.dropdown-menu-sm-right{right:0;left:auto}}@media(min-width:768px){.dropdown-menu-md-left{right:auto;left:0}.dropdown-menu-md-right{right:0;left:auto}}@media(min-width:980px){.dropdown-menu-lg-left{right:auto;left:0}.dropdown-menu-lg-right{right:0;left:auto}}@media(min-width:1240px){.dropdown-menu-xl-left{right:auto;left:0}.dropdown-menu-xl-right{right:0;left:auto}}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-toggle:after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";display:none}.dropleft .dropdown-toggle:before{display:inline-block;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty:after{margin-left:0}.dropleft .dropdown-toggle:before{vertical-align:0}.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:4px 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#495057;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#3d4349;text-decoration:none;background-color:#f1f6f9}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#fc0}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;pointer-events:none;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#495057}.btn-group,.btn-group-vertical{position:relative;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;flex:1 1 auto}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:1}.btn-toolbar{display:flex;flex-wrap:wrap;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn-group:not(:first-child),.btn-group>.btn:not(:first-child){margin-left:-1px}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:24px;padding-left:24px}.dropdown-toggle-split:after,.dropright .dropdown-toggle-split:after,.dropup .dropdown-toggle-split:after{margin-left:0}.dropleft .dropdown-toggle-split:before{margin-right:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:9px;padding-left:9px}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:24px;padding-left:24px}.btn-group-vertical{flex-direction:column;align-items:flex-start;justify-content:center}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}.btn-group-vertical>.btn-group:not(:first-child),.btn-group-vertical>.btn:not(:first-child){margin-top:-1px}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio],.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:flex;flex-wrap:wrap;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control,.input-group>.form-control-plaintext{position:relative;flex:1 1 0%;min-width:0;margin-bottom:0}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control,.input-group>.form-control-plaintext+.custom-file,.input-group>.form-control-plaintext+.custom-select,.input-group>.form-control-plaintext+.form-control{margin-left:-1px}.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:flex;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label:after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn:focus,.input-group-prepend .btn:focus{z-index:3}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:flex;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#6c757d;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:8px}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group-lg>.custom-select,.input-group-lg>.form-control:not(textarea){height:calc(1.5em + 1rem + 2px)}.input-group-lg>.custom-select,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:8px}.input-group-sm>.custom-select,.input-group-sm>.form-control:not(textarea){height:calc(1.5em + .5rem + 2px)}.input-group-sm>.custom-select,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:4px}.input-group-lg>.custom-select,.input-group-sm>.custom-select{padding-right:1.75rem}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;left:0;z-index:-1;width:1rem;height:1.25rem;opacity:0}.custom-control-input:checked~.custom-control-label:before{color:#fff;border-color:#fc0;background-color:#fc0}.custom-control-input:focus~.custom-control-label:before{box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.custom-control-input:focus:not(:checked)~.custom-control-label:before{border-color:#ffe680}.custom-control-input:not(:disabled):active~.custom-control-label:before{color:#fff;background-color:#fff0b3;border-color:#fff0b3}.custom-control-input:disabled~.custom-control-label,.custom-control-input[disabled]~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label:before,.custom-control-input[disabled]~.custom-control-label:before{background-color:#e9ecef}.custom-control-label{position:relative;margin-bottom:0;vertical-align:top}.custom-control-label:before{pointer-events:none;background-color:#fff;border:1px solid #d6dbdf}.custom-control-label:after,.custom-control-label:before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:""}.custom-control-label:after{background:no-repeat 50%/50% 50%}.custom-checkbox .custom-control-label:before{border-radius:8px}.custom-checkbox .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:before{border-color:#fc0;background-color:#fc0}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-radio .custom-control-label:before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-switch{padding-left:2.25rem}.custom-switch .custom-control-label:before{left:-2.25rem;width:1.75rem;pointer-events:all;border-radius:.5rem}.custom-switch .custom-control-label:after{top:calc(.25rem + 2px);left:calc(-2.25rem + 2px);width:calc(1rem - 4px);height:calc(1rem - 4px);background-color:#d6dbdf;border-radius:.5rem;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.custom-switch .custom-control-label:after{transition:none}}.custom-switch .custom-control-input:checked~.custom-control-label:after{background-color:#fff;transform:translateX(.75rem)}.custom-switch .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-select{display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem 1.75rem .375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#6c757d;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center/8px 10px;border:1px solid #ced4da;border-radius:8px;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#ffe680;outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.custom-select:focus::-ms-value{color:#6c757d;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{display:none}.custom-select:-moz-focusring{color:transparent;text-shadow:0 0 0 #6c757d}.custom-select-sm{height:calc(1.5em + .5rem + 2px);padding-top:.25rem;padding-bottom:.25rem;padding-left:.5rem;font-size:.875rem}.custom-select-lg{height:calc(1.5em + 1rem + 2px);padding-top:.5rem;padding-bottom:.5rem;padding-left:1rem;font-size:1.125rem}.custom-file{display:inline-block;margin-bottom:0}.custom-file,.custom-file-input{position:relative;width:100%;height:calc(1.5em + .75rem + 2px)}.custom-file-input{z-index:2;margin:0;opacity:0}.custom-file-input:focus~.custom-file-label{border-color:#ffe680;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.custom-file-input:disabled~.custom-file-label,.custom-file-input[disabled]~.custom-file-label{background-color:#e9ecef}.custom-file-input:lang(en)~.custom-file-label:after{content:"Browse"}.custom-file-input~.custom-file-label[data-browse]:after{content:attr(data-browse)}.custom-file-label{left:0;z-index:1;height:calc(1.5em + .75rem + 2px);font-weight:400;background-color:#fff;border:1px solid #ced4da;border-radius:8px}.custom-file-label,.custom-file-label:after{position:absolute;top:0;right:0;padding:.375rem .75rem;line-height:1.5;color:#6c757d}.custom-file-label:after{bottom:0;z-index:3;display:block;height:calc(1.5em + .75rem);content:"Browse";background-color:#e9ecef;border-left:inherit;border-radius:0 8px 8px 0}.custom-range{width:100%;height:1.4rem;padding:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:none}.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(255,204,0,.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(255,204,0,.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(255,204,0,.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#fc0;border:0;border-radius:1rem;-webkit-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}@media(prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#fff0b3}.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#fc0;border:0;border-radius:1rem;-moz-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}@media(prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{-moz-transition:none;transition:none}}.custom-range::-moz-range-thumb:active{background-color:#fff0b3}.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#fc0;border:0;border-radius:1rem;-ms-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}@media(prefers-reduced-motion:reduce){.custom-range::-ms-thumb{-ms-transition:none;transition:none}}.custom-range::-ms-thumb:active{background-color:#fff0b3}.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}.custom-range::-ms-fill-lower,.custom-range::-ms-fill-upper{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px}.custom-range:disabled::-webkit-slider-thumb{background-color:#d6dbdf}.custom-range:disabled::-webkit-slider-runnable-track{cursor:default}.custom-range:disabled::-moz-range-thumb{background-color:#d6dbdf}.custom-range:disabled::-moz-range-track{cursor:default}.custom-range:disabled::-ms-thumb{background-color:#d6dbdf}.custom-control-label:before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.custom-control-label:before,.custom-file-label,.custom-select{transition:none}}.nav{display:flex;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:0}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#d6dbdf;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #6c757d}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:8px;border-top-right-radius:8px}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:transparent}.nav-tabs .nav-link.disabled{color:#d6dbdf;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#257af4;background-color:#fff;border-color:#6c757d}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:8px}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#fc0}.nav-fill .nav-item{flex:1 1 auto;text-align:center}.nav-justified .nav-item{flex-basis:0;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:24px 0}.navbar,.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl,.navbar .container-xs{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:-.09375rem;padding-bottom:-.09375rem;margin-right:0;font-size:1.125rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:flex;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:0;padding-bottom:0}.navbar-collapse{flex-basis:100%;flex-grow:1;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.125rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:8px}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media(max-width:399.98px){.navbar-expand-xs>.container,.navbar-expand-xs>.container-fluid,.navbar-expand-xs>.container-lg,.navbar-expand-xs>.container-md,.navbar-expand-xs>.container-sm,.navbar-expand-xs>.container-xl,.navbar-expand-xs>.container-xs{padding-right:0;padding-left:0}}@media(min-width:400px){.navbar-expand-xs{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-xs .navbar-nav{flex-direction:row}.navbar-expand-xs .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xs .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xs>.container,.navbar-expand-xs>.container-fluid,.navbar-expand-xs>.container-lg,.navbar-expand-xs>.container-md,.navbar-expand-xs>.container-sm,.navbar-expand-xs>.container-xl,.navbar-expand-xs>.container-xs{flex-wrap:nowrap}.navbar-expand-xs .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xs .navbar-toggler{display:none}}@media(max-width:615.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl,.navbar-expand-sm>.container-xs{padding-right:0;padding-left:0}}@media(min-width:616px){.navbar-expand-sm{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-sm .navbar-nav{flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl,.navbar-expand-sm>.container-xs{flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media(max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl,.navbar-expand-md>.container-xs{padding-right:0;padding-left:0}}@media(min-width:768px){.navbar-expand-md{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-md .navbar-nav{flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl,.navbar-expand-md>.container-xs{flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media(max-width:979.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl,.navbar-expand-lg>.container-xs{padding-right:0;padding-left:0}}@media(min-width:980px){.navbar-expand-lg{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-lg .navbar-nav{flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl,.navbar-expand-lg>.container-xs{flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media(max-width:1239.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl,.navbar-expand-xl>.container-xs{padding-right:0;padding-left:0}}@media(min-width:1240px){.navbar-expand-xl{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-xl .navbar-nav{flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl,.navbar-expand-xl>.container-xs{flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl,.navbar-expand>.container-xs{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl,.navbar-expand>.container-xs{flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(33,37,41,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(33,37,41,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(33,37,41,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(33,37,41,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(33,37,41,.9)}.navbar-light .navbar-toggler{color:rgba(33,37,41,.5);border-color:rgba(33,37,41,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30'%3E%3Cpath stroke='rgba(33, 37, 41, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(33,37,41,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(33,37,41,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:flex;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid #d6dbdf;border-radius:8px}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:8px;border-top-right-radius:8px}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:8px;border-bottom-left-radius:8px}.card-body{flex:1 1 auto;min-height:1px;padding:24px}.card-title{margin-bottom:24px}.card-subtitle{margin-top:-12px}.card-subtitle,.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:24px}.card-header{padding:24px;margin-bottom:0;background-color:#f1f6f9;border-bottom:1px solid #d6dbdf}.card-header:first-child{border-radius:subtract(8px,1px) subtract(8px,1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:24px;background-color:#f1f6f9;border-top:1px solid #d6dbdf}.card-footer:last-child{border-radius:0 0 subtract(8px,1px) subtract(8px,1px)}.card-header-tabs{margin-bottom:-24px;border-bottom:0}.card-header-pills,.card-header-tabs{margin-right:-12px;margin-left:-12px}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:24px}.card-img,.card-img-bottom,.card-img-top{flex-shrink:0;width:100%}.card-img,.card-img-top{border-top-left-radius:subtract(8px,1px);border-top-right-radius:subtract(8px,1px)}.card-img,.card-img-bottom{border-bottom-right-radius:subtract(8px,1px);border-bottom-left-radius:subtract(8px,1px)}.card-deck .card{margin-bottom:20px}@media(min-width:616px){.card-deck{display:flex;flex-flow:row wrap;margin-right:-20px;margin-left:-20px}.card-deck .card{flex:1 0 0%;margin-right:20px;margin-bottom:0;margin-left:20px}}.card-group>.card{margin-bottom:20px}@media(min-width:616px){.card-group{display:flex;flex-flow:row wrap}.card-group>.card{flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:not(:last-child) .card-header,.card-group>.card:not(:last-child) .card-img-top{border-top-right-radius:0}.card-group>.card:not(:last-child) .card-footer,.card-group>.card:not(:last-child) .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:not(:first-child) .card-header,.card-group>.card:not(:first-child) .card-img-top{border-top-left-radius:0}.card-group>.card:not(:first-child) .card-footer,.card-group>.card:not(:first-child) .card-img-bottom{border-bottom-left-radius:0}}.card-columns .card{margin-bottom:40px}@media(min-width:616px){.card-columns{-moz-column-count:3;column-count:3;-moz-column-gap:40px;column-gap:40px;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion>.card{overflow:hidden}.accordion>.card:not(:last-of-type){border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion>.card:not(:first-of-type){border-top-left-radius:0;border-top-right-radius:0}.accordion>.card>.card-header{border-radius:0;margin-bottom:-1px}.breadcrumb{display:flex;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:8px}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:flex;padding-left:0;list-style:none;border-radius:8px}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#ff8c00;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{z-index:2;color:#ff8c00;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:3;outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:8px;border-bottom-left-radius:8px}.page-item:last-child .page-link{border-top-right-radius:8px;border-bottom-right-radius:8px}.page-item.active .page-link{z-index:3;color:#fff;background-color:#fc0;border-color:#fc0}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.125rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:8px;border-bottom-left-radius:8px}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:8px;border-bottom-right-radius:8px}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:4px;border-bottom-right-radius:4px}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:8px;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.badge{transition:none}}a.badge:focus,a.badge:hover{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#495057;background-color:#fc0}a.badge-primary:focus,a.badge-primary:hover{color:#495057;background-color:#cca300}a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.5)}.badge-secondary{color:#fff;background-color:#212529}a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#0a0c0d}a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(33,37,41,.5)}.badge-success{color:#fff;background-color:#28a745}a.badge-success:focus,a.badge-success:hover{color:#fff;background-color:#1e7e34}a.badge-success.focus,a.badge-success:focus{outline:0;box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.badge-info{color:#fff;background-color:#17a2b8}a.badge-info:focus,a.badge-info:hover{color:#fff;background-color:#117a8b}a.badge-info.focus,a.badge-info:focus{outline:0;box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.badge-warning{color:#495057;background-color:#ffc107}a.badge-warning:focus,a.badge-warning:hover{color:#495057;background-color:#d39e00}a.badge-warning.focus,a.badge-warning:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.badge-danger{color:#fff;background-color:#dc3545}a.badge-danger:focus,a.badge-danger:hover{color:#fff;background-color:#bd2130}a.badge-danger.focus,a.badge-danger:focus{outline:0;box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.badge-light{color:#495057;background-color:#f1f6f9}a.badge-light:focus,a.badge-light:hover{color:#495057;background-color:#cddfea}a.badge-light.focus,a.badge-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(241,246,249,.5)}.badge-dark{color:#fff;background-color:#495057}a.badge-dark:focus,a.badge-dark:hover{color:#fff;background-color:#32373b}a.badge-dark.focus,a.badge-dark:focus{outline:0;box-shadow:0 0 0 .2rem rgba(73,80,87,.5)}.badge-primary-light{color:#495057;background-color:#fffaf0}a.badge-primary-light:focus,a.badge-primary-light:hover{color:#495057;background-color:#ffe9bd}a.badge-primary-light.focus,a.badge-primary-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,250,240,.5)}.badge-secondary-light{color:#495057;background-color:#fff}a.badge-secondary-light:focus,a.badge-secondary-light:hover{color:#495057;background-color:#e6e6e6}a.badge-secondary-light.focus,a.badge-secondary-light:focus{outline:0;box-shadow:0 0 0 .2rem hsla(0,0%,100%,.5)}.badge-tertiary{color:#fff;background-color:#257af4}a.badge-tertiary:focus,a.badge-tertiary:hover{color:#fff;background-color:#0b60db}a.badge-tertiary.focus,a.badge-tertiary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(37,122,244,.5)}.badge-tertiary-light{color:#495057;background-color:#e3f1fe}a.badge-tertiary-light:focus,a.badge-tertiary-light:hover{color:#495057;background-color:#b2d8fc}a.badge-tertiary-light.focus,a.badge-tertiary-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(227,241,254,.5)}.badge-white{color:#495057;background-color:#fff}a.badge-white:focus,a.badge-white:hover{color:#495057;background-color:#e6e6e6}a.badge-white.focus,a.badge-white:focus{outline:0;box-shadow:0 0 0 .2rem hsla(0,0%,100%,.5)}.badge-black{color:#fff;background-color:#212529}a.badge-black:focus,a.badge-black:hover{color:#fff;background-color:#0a0c0d}a.badge-black.focus,a.badge-black:focus{outline:0;box-shadow:0 0 0 .2rem rgba(33,37,41,.5)}.badge-blue{color:#fff;background-color:#257af4}a.badge-blue:focus,a.badge-blue:hover{color:#fff;background-color:#0b60db}a.badge-blue.focus,a.badge-blue:focus{outline:0;box-shadow:0 0 0 .2rem rgba(37,122,244,.5)}.badge-light-blue{color:#495057;background-color:#e3f1fe}a.badge-light-blue:focus,a.badge-light-blue:hover{color:#495057;background-color:#b2d8fc}a.badge-light-blue.focus,a.badge-light-blue:focus{outline:0;box-shadow:0 0 0 .2rem rgba(227,241,254,.5)}.badge-yellow{color:#495057;background-color:#fc0}a.badge-yellow:focus,a.badge-yellow:hover{color:#495057;background-color:#cca300}a.badge-yellow.focus,a.badge-yellow:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.5)}.badge-light-yellow{color:#495057;background-color:#fffaf0}a.badge-light-yellow:focus,a.badge-light-yellow:hover{color:#495057;background-color:#ffe9bd}a.badge-light-yellow.focus,a.badge-light-yellow:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,250,240,.5)}.badge-orange{color:#495057;background-color:#ff8c00}a.badge-orange:focus,a.badge-orange:hover{color:#495057;background-color:#cc7000}a.badge-orange.focus,a.badge-orange:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,140,0,.5)}.badge-light-orange{color:#495057;background-color:#ffe4b5}a.badge-light-orange:focus,a.badge-light-orange:hover{color:#495057;background-color:#ffd182}a.badge-light-orange.focus,a.badge-light-orange:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,228,181,.5)}.badge-red{color:#fff;background-color:#ff3939}a.badge-red:focus,a.badge-red:hover{color:#fff;background-color:#ff0606}a.badge-red.focus,a.badge-red:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,57,57,.5)}.badge-light-red{color:#495057;background-color:#ffe4e1}a.badge-light-red:focus,a.badge-light-red:hover{color:#495057;background-color:#ffb6ae}a.badge-light-red.focus,a.badge-light-red:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,228,225,.5)}.badge-medium{color:#495057;background-color:#d6dbdf}a.badge-medium:focus,a.badge-medium:hover{color:#495057;background-color:#b9c2c9}a.badge-medium.focus,a.badge-medium:focus{outline:0;box-shadow:0 0 0 .2rem rgba(214,219,223,.5)}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:8px}@media(min-width:616px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:8px}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#947c14;background-color:#fff5cc;border-color:#fff1b8}.alert-primary hr{border-top-color:#ffec9f}.alert-primary .alert-link{color:#67560e}.alert-secondary{color:#212529;background-color:#d3d3d4;border-color:#c1c2c3}.alert-secondary hr{border-top-color:#b4b5b6}.alert-secondary .alert-link{color:#0a0c0d}.alert-success{color:#256938;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#184324}.alert-info{color:#1c6673;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#12424a}.alert-warning{color:#947617;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#685310}.alert-danger{color:#822d38;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#5c2028}.alert-light{color:#8d9295;background-color:#fcfdfe;border-color:#fbfcfd}.alert-light hr{border-top-color:#eaeff5}.alert-light .alert-link{color:#73797c}.alert-dark{color:#363b41;background-color:#dbdcdd;border-color:#ccced0}.alert-dark hr{border-top-color:#bfc1c4}.alert-dark .alert-link{color:#1f2225}.alert-primary-light{color:#949490;background-color:#fffefc;border-color:#fffefb}.alert-primary-light hr{border-top-color:#fff8e2}.alert-primary-light .alert-link{color:#7b7b76}.alert-secondary-light{color:#949698;background-color:#fff;border-color:#fff}.alert-secondary-light hr{border-top-color:#f2f2f2}.alert-secondary-light .alert-link{color:#7a7d7f}.alert-tertiary{color:#235193;background-color:#d3e4fd;border-color:#c2dafc}.alert-tertiary hr{border-top-color:#aacbfb}.alert-tertiary .alert-link{color:#193a6a}.alert-tertiary-light{color:#868f98;background-color:#f9fcff;border-color:#f7fbff}.alert-tertiary-light hr{border-top-color:#deeeff}.alert-tertiary-light .alert-link{color:#6c767f}.alert-white{color:#949698;background-color:#fff;border-color:#fff}.alert-white hr{border-top-color:#f2f2f2}.alert-white .alert-link{color:#7a7d7f}.alert-black{color:#212529;background-color:#d3d3d4;border-color:#c1c2c3}.alert-black hr{border-top-color:#b4b5b6}.alert-black .alert-link{color:#0a0c0d}.alert-blue{color:#235193;background-color:#d3e4fd;border-color:#c2dafc}.alert-blue hr{border-top-color:#aacbfb}.alert-blue .alert-link{color:#193a6a}.alert-light-blue{color:#868f98;background-color:#f9fcff;border-color:#f7fbff}.alert-light-blue hr{border-top-color:#deeeff}.alert-light-blue .alert-link{color:#6c767f}.alert-yellow{color:#947c14;background-color:#fff5cc;border-color:#fff1b8}.alert-yellow hr{border-top-color:#ffec9f}.alert-yellow .alert-link{color:#67560e}.alert-light-yellow{color:#949490;background-color:#fffefc;border-color:#fffefb}.alert-light-yellow hr{border-top-color:#fff8e2}.alert-light-yellow .alert-link{color:#7b7b76}.alert-orange{color:#945b14;background-color:#ffe8cc;border-color:#ffdfb8}.alert-orange hr{border-top-color:#ffd49f}.alert-orange .alert-link{color:#673f0e}.alert-light-orange{color:#948872;background-color:#fffaf0;border-color:#fff7ea}.alert-light-orange hr{border-top-color:#ffedd1}.alert-light-orange .alert-link{color:#786e5b}.alert-red{color:#942f31;background-color:#ffd7d7;border-color:#ffc8c8}.alert-red hr{border-top-color:#ffafaf}.alert-red .alert-link{color:#6d2324}.alert-light-red{color:#948889;background-color:#fffaf9;border-color:#fff7f7}.alert-light-red hr{border-top-color:#ffdede}.alert-light-red .alert-link{color:#7b6e6f}.alert-medium{color:#7f8488;background-color:#f7f8f9;border-color:#f4f5f6}.alert-medium hr{border-top-color:#e6e8eb}.alert-medium .alert-link{color:#666a6e}@-webkit-keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}.progress{height:1rem;font-size:.75rem;background-color:#e9ecef;border-radius:8px}.progress,.progress-bar{display:flex;overflow:hidden}.progress-bar{flex-direction:column;justify-content:center;color:#fff;text-align:center;white-space:nowrap;background-color:#fc0;transition:width .6s ease}@media(prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}@media(prefers-reduced-motion:reduce){.progress-bar-animated{-webkit-animation:none;animation:none}}.media{display:flex;align-items:flex-start}.media-body{flex:1}.list-group{display:flex;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#6c757d;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{z-index:1;color:#6c757d;text-decoration:none;background-color:#f1f6f9}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:1px solid rgba(33,37,41,.125)}.list-group-item:first-child{border-top-left-radius:8px;border-top-right-radius:8px}.list-group-item:last-child{border-bottom-right-radius:8px;border-bottom-left-radius:8px}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;pointer-events:none;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#fc0;border-color:#fc0}.list-group-item+.list-group-item{border-top-width:0}.list-group-item+.list-group-item.active{margin-top:-1px;border-top-width:1px}.list-group-horizontal{flex-direction:row}.list-group-horizontal .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal .list-group-item.active{margin-top:0}.list-group-horizontal .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}@media(min-width:400px){.list-group-horizontal-xs{flex-direction:row}.list-group-horizontal-xs .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-xs .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-xs .list-group-item.active{margin-top:0}.list-group-horizontal-xs .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xs .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:616px){.list-group-horizontal-sm{flex-direction:row}.list-group-horizontal-sm .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-sm .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-sm .list-group-item.active{margin-top:0}.list-group-horizontal-sm .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-sm .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:768px){.list-group-horizontal-md{flex-direction:row}.list-group-horizontal-md .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-md .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-md .list-group-item.active{margin-top:0}.list-group-horizontal-md .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-md .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:980px){.list-group-horizontal-lg{flex-direction:row}.list-group-horizontal-lg .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-lg .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-lg .list-group-item.active{margin-top:0}.list-group-horizontal-lg .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-lg .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:1240px){.list-group-horizontal-xl{flex-direction:row}.list-group-horizontal-xl .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-xl .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-xl .list-group-item.active{margin-top:0}.list-group-horizontal-xl .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xl .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}.list-group-flush .list-group-item{border-right-width:0;border-left-width:0;border-radius:0}.list-group-flush .list-group-item:first-child{border-top-width:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom-width:0}.list-group-item-primary{color:#947c14;background-color:#fff1b8}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#947c14;background-color:#ffec9f}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#947c14;border-color:#947c14}.list-group-item-secondary{color:#212529;background-color:#c1c2c3}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#212529;background-color:#b4b5b6}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#212529;border-color:#212529}.list-group-item-success{color:#256938;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#256938;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#256938;border-color:#256938}.list-group-item-info{color:#1c6673;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#1c6673;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#1c6673;border-color:#1c6673}.list-group-item-warning{color:#947617;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#947617;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#947617;border-color:#947617}.list-group-item-danger{color:#822d38;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#822d38;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#822d38;border-color:#822d38}.list-group-item-light{color:#8d9295;background-color:#fbfcfd}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#8d9295;background-color:#eaeff5}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#8d9295;border-color:#8d9295}.list-group-item-dark{color:#363b41;background-color:#ccced0}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#363b41;background-color:#bfc1c4}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#363b41;border-color:#363b41}.list-group-item-primary-light{color:#949490;background-color:#fffefb}.list-group-item-primary-light.list-group-item-action:focus,.list-group-item-primary-light.list-group-item-action:hover{color:#949490;background-color:#fff8e2}.list-group-item-primary-light.list-group-item-action.active{color:#fff;background-color:#949490;border-color:#949490}.list-group-item-secondary-light{color:#949698;background-color:#fff}.list-group-item-secondary-light.list-group-item-action:focus,.list-group-item-secondary-light.list-group-item-action:hover{color:#949698;background-color:#f2f2f2}.list-group-item-secondary-light.list-group-item-action.active{color:#fff;background-color:#949698;border-color:#949698}.list-group-item-tertiary{color:#235193;background-color:#c2dafc}.list-group-item-tertiary.list-group-item-action:focus,.list-group-item-tertiary.list-group-item-action:hover{color:#235193;background-color:#aacbfb}.list-group-item-tertiary.list-group-item-action.active{color:#fff;background-color:#235193;border-color:#235193}.list-group-item-tertiary-light{color:#868f98;background-color:#f7fbff}.list-group-item-tertiary-light.list-group-item-action:focus,.list-group-item-tertiary-light.list-group-item-action:hover{color:#868f98;background-color:#deeeff}.list-group-item-tertiary-light.list-group-item-action.active{color:#fff;background-color:#868f98;border-color:#868f98}.list-group-item-white{color:#949698;background-color:#fff}.list-group-item-white.list-group-item-action:focus,.list-group-item-white.list-group-item-action:hover{color:#949698;background-color:#f2f2f2}.list-group-item-white.list-group-item-action.active{color:#fff;background-color:#949698;border-color:#949698}.list-group-item-black{color:#212529;background-color:#c1c2c3}.list-group-item-black.list-group-item-action:focus,.list-group-item-black.list-group-item-action:hover{color:#212529;background-color:#b4b5b6}.list-group-item-black.list-group-item-action.active{color:#fff;background-color:#212529;border-color:#212529}.list-group-item-blue{color:#235193;background-color:#c2dafc}.list-group-item-blue.list-group-item-action:focus,.list-group-item-blue.list-group-item-action:hover{color:#235193;background-color:#aacbfb}.list-group-item-blue.list-group-item-action.active{color:#fff;background-color:#235193;border-color:#235193}.list-group-item-light-blue{color:#868f98;background-color:#f7fbff}.list-group-item-light-blue.list-group-item-action:focus,.list-group-item-light-blue.list-group-item-action:hover{color:#868f98;background-color:#deeeff}.list-group-item-light-blue.list-group-item-action.active{color:#fff;background-color:#868f98;border-color:#868f98}.list-group-item-yellow{color:#947c14;background-color:#fff1b8}.list-group-item-yellow.list-group-item-action:focus,.list-group-item-yellow.list-group-item-action:hover{color:#947c14;background-color:#ffec9f}.list-group-item-yellow.list-group-item-action.active{color:#fff;background-color:#947c14;border-color:#947c14}.list-group-item-light-yellow{color:#949490;background-color:#fffefb}.list-group-item-light-yellow.list-group-item-action:focus,.list-group-item-light-yellow.list-group-item-action:hover{color:#949490;background-color:#fff8e2}.list-group-item-light-yellow.list-group-item-action.active{color:#fff;background-color:#949490;border-color:#949490}.list-group-item-orange{color:#945b14;background-color:#ffdfb8}.list-group-item-orange.list-group-item-action:focus,.list-group-item-orange.list-group-item-action:hover{color:#945b14;background-color:#ffd49f}.list-group-item-orange.list-group-item-action.active{color:#fff;background-color:#945b14;border-color:#945b14}.list-group-item-light-orange{color:#948872;background-color:#fff7ea}.list-group-item-light-orange.list-group-item-action:focus,.list-group-item-light-orange.list-group-item-action:hover{color:#948872;background-color:#ffedd1}.list-group-item-light-orange.list-group-item-action.active{color:#fff;background-color:#948872;border-color:#948872}.list-group-item-red{color:#942f31;background-color:#ffc8c8}.list-group-item-red.list-group-item-action:focus,.list-group-item-red.list-group-item-action:hover{color:#942f31;background-color:#ffafaf}.list-group-item-red.list-group-item-action.active{color:#fff;background-color:#942f31;border-color:#942f31}.list-group-item-light-red{color:#948889;background-color:#fff7f7}.list-group-item-light-red.list-group-item-action:focus,.list-group-item-light-red.list-group-item-action:hover{color:#948889;background-color:#ffdede}.list-group-item-light-red.list-group-item-action.active{color:#fff;background-color:#948889;border-color:#948889}.list-group-item-medium{color:#7f8488;background-color:#f4f5f6}.list-group-item-medium.list-group-item-action:focus,.list-group-item-medium.list-group-item-action:hover{color:#7f8488;background-color:#e6e8eb}.list-group-item-medium.list-group-item-action.active{color:#fff;background-color:#7f8488;border-color:#7f8488}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#212529;text-shadow:0 1px 0 #fff;opacity:.5}@media(max-width:1200px){.close{font-size:calc(1.275rem + .3vw)}}.close:hover{color:#212529;text-decoration:none}.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{opacity:.75}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}a.close.disabled{pointer-events:none}.toast{max-width:350px;overflow:hidden;font-size:.875rem;background-color:hsla(0,0%,100%,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 .25rem .75rem rgba(33,37,41,.1);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);opacity:0;border-radius:.25rem}.toast:not(:last-child){margin-bottom:.75rem}.toast.showing{opacity:1}.toast.show{display:block;opacity:1}.toast.hide{display:none}.toast-header{display:flex;align-items:center;padding:.25rem .75rem;color:#6c757d;background-color:hsla(0,0%,100%,.85);background-clip:padding-box;border-bottom:1px solid rgba(0,0,0,.05)}.toast-body{padding:.75rem}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:transform .3s ease-out;transform:translateY(-50px)}@media(prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{transform:none}.modal.modal-static .modal-dialog{transform:scale(1.02)}.modal-dialog-scrollable{display:flex;max-height:calc(100% - 1rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 1rem);overflow:hidden}.modal-dialog-scrollable .modal-footer,.modal-dialog-scrollable .modal-header{flex-shrink:0}.modal-dialog-scrollable .modal-body{overflow-y:auto}.modal-dialog-centered{display:flex;align-items:center;min-height:calc(100% - 1rem)}.modal-dialog-centered:before{display:block;height:calc(100vh - 1rem);content:""}.modal-dialog-centered.modal-dialog-scrollable{flex-direction:column;justify-content:center;height:100%}.modal-dialog-centered.modal-dialog-scrollable .modal-content{max-height:none}.modal-dialog-centered.modal-dialog-scrollable:before{content:none}.modal-content{position:relative;display:flex;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(33,37,41,.2);border-radius:8px;outline:0}.modal-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#212529}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:flex;align-items:flex-start;justify-content:space-between;padding:1rem;border-bottom:1px solid #d6dbdf;border-top-left-radius:7px;border-top-right-radius:7px}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;flex:1 1 auto;padding:1rem}.modal-footer{display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;padding:.75rem;border-top:1px solid #d6dbdf;border-bottom-right-radius:7px;border-bottom-left-radius:7px}.modal-footer>*{margin:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media(min-width:616px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-scrollable{max-height:calc(100% - 3.5rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 3.5rem)}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-dialog-centered:before{height:calc(100vh - 3.5rem)}.modal-sm{max-width:300px}}@media(min-width:980px){.modal-lg,.modal-xl{max-width:800px}}@media(min-width:1240px){.modal-xl{max-width:1140px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:Noto Sans,sans-serif;font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow:before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow:before,.bs-tooltip-top .arrow:before{top:0;border-width:.4rem .4rem 0;border-top-color:#212529}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow:before,.bs-tooltip-right .arrow:before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#212529}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow:before,.bs-tooltip-bottom .arrow:before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#212529}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow:before,.bs-tooltip-left .arrow:before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#212529}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#212529;border-radius:8px}.popover{top:0;left:0;z-index:1060;max-width:276px;font-family:Noto Sans,sans-serif;font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(33,37,41,.2);border-radius:8px}.popover,.popover .arrow{position:absolute;display:block}.popover .arrow{width:1rem;height:.5rem;margin:0 8px}.popover .arrow:after,.popover .arrow:before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top]>.arrow,.bs-popover-top>.arrow{bottom:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=top]>.arrow:before,.bs-popover-top>.arrow:before{bottom:0;border-width:.5rem .5rem 0;border-top-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=top]>.arrow:after,.bs-popover-top>.arrow:after{bottom:1px;border-width:.5rem .5rem 0;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right]>.arrow,.bs-popover-right>.arrow{left:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:8px 0}.bs-popover-auto[x-placement^=right]>.arrow:before,.bs-popover-right>.arrow:before{left:0;border-width:.5rem .5rem .5rem 0;border-right-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=right]>.arrow:after,.bs-popover-right>.arrow:after{left:1px;border-width:.5rem .5rem .5rem 0;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom]>.arrow,.bs-popover-bottom>.arrow{top:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=bottom]>.arrow:before,.bs-popover-bottom>.arrow:before{top:0;border-width:0 .5rem .5rem;border-bottom-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=bottom]>.arrow:after,.bs-popover-bottom>.arrow:after{top:1px;border-width:0 .5rem .5rem;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header:before,.bs-popover-bottom .popover-header:before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left]>.arrow,.bs-popover-left>.arrow{right:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:8px 0}.bs-popover-auto[x-placement^=left]>.arrow:before,.bs-popover-left>.arrow:before{right:0;border-width:.5rem 0 .5rem .5rem;border-left-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=left]>.arrow:after,.bs-popover-left>.arrow:after{right:1px;border-width:.5rem 0 .5rem .5rem;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:7px;border-top-right-radius:7px}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel.pointer-event{touch-action:pan-y}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner:after{display:block;clear:both;content:""}.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:transform .6s ease-in-out}@media(prefers-reduced-motion:reduce){.carousel-item{transition:none}}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.active.carousel-item-right,.carousel-item-next:not(.carousel-item-left){transform:translateX(100%)}.active.carousel-item-left,.carousel-item-prev:not(.carousel-item-right){transform:translateX(-100%)}.carousel-fade .carousel-item{opacity:0;transition-property:opacity;transform:none}.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{z-index:1;opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{z-index:0;opacity:0;transition:opacity 0s .6s}@media(prefers-reduced-motion:reduce){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{transition:none}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;z-index:1;display:flex;align-items:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5;transition:opacity .15s ease}@media(prefers-reduced-motion:reduce){.carousel-control-next,.carousel-control-prev{transition:none}}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:no-repeat 50%/100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8'%3E%3Cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:15;display:flex;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{box-sizing:content-box;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;transition:opacity .6s ease}@media(prefers-reduced-motion:reduce){.carousel-indicators li{transition:none}}.carousel-indicators .active{opacity:1}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}@-webkit-keyframes spinner-border{to{transform:rotate(1turn)}}@keyframes spinner-border{to{transform:rotate(1turn)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:.25em solid;border-right:.25em solid transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}@-webkit-keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}@keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#fc0!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#cca300!important}.bg-secondary{background-color:#212529!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#0a0c0d!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f1f6f9!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#cddfea!important}.bg-dark{background-color:#495057!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#32373b!important}.bg-primary-light{background-color:#fffaf0!important}a.bg-primary-light:focus,a.bg-primary-light:hover,button.bg-primary-light:focus,button.bg-primary-light:hover{background-color:#ffe9bd!important}.bg-secondary-light{background-color:#fff!important}a.bg-secondary-light:focus,a.bg-secondary-light:hover,button.bg-secondary-light:focus,button.bg-secondary-light:hover{background-color:#e6e6e6!important}.bg-tertiary{background-color:#257af4!important}a.bg-tertiary:focus,a.bg-tertiary:hover,button.bg-tertiary:focus,button.bg-tertiary:hover{background-color:#0b60db!important}.bg-tertiary-light{background-color:#e3f1fe!important}a.bg-tertiary-light:focus,a.bg-tertiary-light:hover,button.bg-tertiary-light:focus,button.bg-tertiary-light:hover{background-color:#b2d8fc!important}a.bg-white:focus,a.bg-white:hover,button.bg-white:focus,button.bg-white:hover{background-color:#e6e6e6!important}.bg-black{background-color:#212529!important}a.bg-black:focus,a.bg-black:hover,button.bg-black:focus,button.bg-black:hover{background-color:#0a0c0d!important}.bg-blue{background-color:#257af4!important}a.bg-blue:focus,a.bg-blue:hover,button.bg-blue:focus,button.bg-blue:hover{background-color:#0b60db!important}.bg-light-blue{background-color:#e3f1fe!important}a.bg-light-blue:focus,a.bg-light-blue:hover,button.bg-light-blue:focus,button.bg-light-blue:hover{background-color:#b2d8fc!important}.bg-yellow{background-color:#fc0!important}a.bg-yellow:focus,a.bg-yellow:hover,button.bg-yellow:focus,button.bg-yellow:hover{background-color:#cca300!important}.bg-light-yellow{background-color:#fffaf0!important}a.bg-light-yellow:focus,a.bg-light-yellow:hover,button.bg-light-yellow:focus,button.bg-light-yellow:hover{background-color:#ffe9bd!important}.bg-orange{background-color:#ff8c00!important}a.bg-orange:focus,a.bg-orange:hover,button.bg-orange:focus,button.bg-orange:hover{background-color:#cc7000!important}.bg-light-orange{background-color:#ffe4b5!important}a.bg-light-orange:focus,a.bg-light-orange:hover,button.bg-light-orange:focus,button.bg-light-orange:hover{background-color:#ffd182!important}.bg-red{background-color:#ff3939!important}a.bg-red:focus,a.bg-red:hover,button.bg-red:focus,button.bg-red:hover{background-color:#ff0606!important}.bg-light-red{background-color:#ffe4e1!important}a.bg-light-red:focus,a.bg-light-red:hover,button.bg-light-red:focus,button.bg-light-red:hover{background-color:#ffb6ae!important}.bg-medium{background-color:#d6dbdf!important}a.bg-medium:focus,a.bg-medium:hover,button.bg-medium:focus,button.bg-medium:hover{background-color:#b9c2c9!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #d6dbdf!important}.border-top{border-top:1px solid #d6dbdf!important}.border-right{border-right:1px solid #d6dbdf!important}.border-bottom{border-bottom:1px solid #d6dbdf!important}.border-left{border-left:1px solid #d6dbdf!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#fc0!important}.border-secondary{border-color:#212529!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f1f6f9!important}.border-dark{border-color:#495057!important}.border-primary-light{border-color:#fffaf0!important}.border-secondary-light{border-color:#fff!important}.border-tertiary{border-color:#257af4!important}.border-tertiary-light{border-color:#e3f1fe!important}.border-black{border-color:#212529!important}.border-blue{border-color:#257af4!important}.border-light-blue{border-color:#e3f1fe!important}.border-yellow{border-color:#fc0!important}.border-light-yellow{border-color:#fffaf0!important}.border-orange{border-color:#ff8c00!important}.border-light-orange{border-color:#ffe4b5!important}.border-red{border-color:#ff3939!important}.border-light-red{border-color:#ffe4e1!important}.border-medium{border-color:#d6dbdf!important}.border-white{border-color:#fff!important}.rounded-sm{border-radius:4px!important}.rounded{border-radius:8px!important}.rounded-top{border-top-left-radius:8px!important}.rounded-right,.rounded-top{border-top-right-radius:8px!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:8px!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:8px!important}.rounded-left{border-top-left-radius:8px!important}.rounded-lg{border-radius:8px!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:50rem!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:flex!important}.d-inline-flex{display:inline-flex!important}@media(min-width:400px){.d-xs-none{display:none!important}.d-xs-inline{display:inline!important}.d-xs-inline-block{display:inline-block!important}.d-xs-block{display:block!important}.d-xs-table{display:table!important}.d-xs-table-row{display:table-row!important}.d-xs-table-cell{display:table-cell!important}.d-xs-flex{display:flex!important}.d-xs-inline-flex{display:inline-flex!important}}@media(min-width:616px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:flex!important}.d-sm-inline-flex{display:inline-flex!important}}@media(min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:flex!important}.d-md-inline-flex{display:inline-flex!important}}@media(min-width:980px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:flex!important}.d-lg-inline-flex{display:inline-flex!important}}@media(min-width:1240px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:flex!important}.d-xl-inline-flex{display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:flex!important}.d-print-inline-flex{display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.8571428571%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{flex-direction:row!important}.flex-column{flex-direction:column!important}.flex-row-reverse{flex-direction:row-reverse!important}.flex-column-reverse{flex-direction:column-reverse!important}.flex-wrap{flex-wrap:wrap!important}.flex-nowrap{flex-wrap:nowrap!important}.flex-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-fill{flex:1 1 auto!important}.flex-grow-0{flex-grow:0!important}.flex-grow-1{flex-grow:1!important}.flex-shrink-0{flex-shrink:0!important}.flex-shrink-1{flex-shrink:1!important}.justify-content-start{justify-content:flex-start!important}.justify-content-end{justify-content:flex-end!important}.justify-content-center{justify-content:center!important}.justify-content-between{justify-content:space-between!important}.justify-content-around{justify-content:space-around!important}.align-items-start{align-items:flex-start!important}.align-items-end{align-items:flex-end!important}.align-items-center{align-items:center!important}.align-items-baseline{align-items:baseline!important}.align-items-stretch{align-items:stretch!important}.align-content-start{align-content:flex-start!important}.align-content-end{align-content:flex-end!important}.align-content-center{align-content:center!important}.align-content-between{align-content:space-between!important}.align-content-around{align-content:space-around!important}.align-content-stretch{align-content:stretch!important}.align-self-auto{align-self:auto!important}.align-self-start{align-self:flex-start!important}.align-self-end{align-self:flex-end!important}.align-self-center{align-self:center!important}.align-self-baseline{align-self:baseline!important}.align-self-stretch{align-self:stretch!important}@media(min-width:400px){.flex-xs-row{flex-direction:row!important}.flex-xs-column{flex-direction:column!important}.flex-xs-row-reverse{flex-direction:row-reverse!important}.flex-xs-column-reverse{flex-direction:column-reverse!important}.flex-xs-wrap{flex-wrap:wrap!important}.flex-xs-nowrap{flex-wrap:nowrap!important}.flex-xs-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-xs-fill{flex:1 1 auto!important}.flex-xs-grow-0{flex-grow:0!important}.flex-xs-grow-1{flex-grow:1!important}.flex-xs-shrink-0{flex-shrink:0!important}.flex-xs-shrink-1{flex-shrink:1!important}.justify-content-xs-start{justify-content:flex-start!important}.justify-content-xs-end{justify-content:flex-end!important}.justify-content-xs-center{justify-content:center!important}.justify-content-xs-between{justify-content:space-between!important}.justify-content-xs-around{justify-content:space-around!important}.align-items-xs-start{align-items:flex-start!important}.align-items-xs-end{align-items:flex-end!important}.align-items-xs-center{align-items:center!important}.align-items-xs-baseline{align-items:baseline!important}.align-items-xs-stretch{align-items:stretch!important}.align-content-xs-start{align-content:flex-start!important}.align-content-xs-end{align-content:flex-end!important}.align-content-xs-center{align-content:center!important}.align-content-xs-between{align-content:space-between!important}.align-content-xs-around{align-content:space-around!important}.align-content-xs-stretch{align-content:stretch!important}.align-self-xs-auto{align-self:auto!important}.align-self-xs-start{align-self:flex-start!important}.align-self-xs-end{align-self:flex-end!important}.align-self-xs-center{align-self:center!important}.align-self-xs-baseline{align-self:baseline!important}.align-self-xs-stretch{align-self:stretch!important}}@media(min-width:616px){.flex-sm-row{flex-direction:row!important}.flex-sm-column{flex-direction:column!important}.flex-sm-row-reverse{flex-direction:row-reverse!important}.flex-sm-column-reverse{flex-direction:column-reverse!important}.flex-sm-wrap{flex-wrap:wrap!important}.flex-sm-nowrap{flex-wrap:nowrap!important}.flex-sm-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-sm-fill{flex:1 1 auto!important}.flex-sm-grow-0{flex-grow:0!important}.flex-sm-grow-1{flex-grow:1!important}.flex-sm-shrink-0{flex-shrink:0!important}.flex-sm-shrink-1{flex-shrink:1!important}.justify-content-sm-start{justify-content:flex-start!important}.justify-content-sm-end{justify-content:flex-end!important}.justify-content-sm-center{justify-content:center!important}.justify-content-sm-between{justify-content:space-between!important}.justify-content-sm-around{justify-content:space-around!important}.align-items-sm-start{align-items:flex-start!important}.align-items-sm-end{align-items:flex-end!important}.align-items-sm-center{align-items:center!important}.align-items-sm-baseline{align-items:baseline!important}.align-items-sm-stretch{align-items:stretch!important}.align-content-sm-start{align-content:flex-start!important}.align-content-sm-end{align-content:flex-end!important}.align-content-sm-center{align-content:center!important}.align-content-sm-between{align-content:space-between!important}.align-content-sm-around{align-content:space-around!important}.align-content-sm-stretch{align-content:stretch!important}.align-self-sm-auto{align-self:auto!important}.align-self-sm-start{align-self:flex-start!important}.align-self-sm-end{align-self:flex-end!important}.align-self-sm-center{align-self:center!important}.align-self-sm-baseline{align-self:baseline!important}.align-self-sm-stretch{align-self:stretch!important}}@media(min-width:768px){.flex-md-row{flex-direction:row!important}.flex-md-column{flex-direction:column!important}.flex-md-row-reverse{flex-direction:row-reverse!important}.flex-md-column-reverse{flex-direction:column-reverse!important}.flex-md-wrap{flex-wrap:wrap!important}.flex-md-nowrap{flex-wrap:nowrap!important}.flex-md-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-md-fill{flex:1 1 auto!important}.flex-md-grow-0{flex-grow:0!important}.flex-md-grow-1{flex-grow:1!important}.flex-md-shrink-0{flex-shrink:0!important}.flex-md-shrink-1{flex-shrink:1!important}.justify-content-md-start{justify-content:flex-start!important}.justify-content-md-end{justify-content:flex-end!important}.justify-content-md-center{justify-content:center!important}.justify-content-md-between{justify-content:space-between!important}.justify-content-md-around{justify-content:space-around!important}.align-items-md-start{align-items:flex-start!important}.align-items-md-end{align-items:flex-end!important}.align-items-md-center{align-items:center!important}.align-items-md-baseline{align-items:baseline!important}.align-items-md-stretch{align-items:stretch!important}.align-content-md-start{align-content:flex-start!important}.align-content-md-end{align-content:flex-end!important}.align-content-md-center{align-content:center!important}.align-content-md-between{align-content:space-between!important}.align-content-md-around{align-content:space-around!important}.align-content-md-stretch{align-content:stretch!important}.align-self-md-auto{align-self:auto!important}.align-self-md-start{align-self:flex-start!important}.align-self-md-end{align-self:flex-end!important}.align-self-md-center{align-self:center!important}.align-self-md-baseline{align-self:baseline!important}.align-self-md-stretch{align-self:stretch!important}}@media(min-width:980px){.flex-lg-row{flex-direction:row!important}.flex-lg-column{flex-direction:column!important}.flex-lg-row-reverse{flex-direction:row-reverse!important}.flex-lg-column-reverse{flex-direction:column-reverse!important}.flex-lg-wrap{flex-wrap:wrap!important}.flex-lg-nowrap{flex-wrap:nowrap!important}.flex-lg-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-lg-fill{flex:1 1 auto!important}.flex-lg-grow-0{flex-grow:0!important}.flex-lg-grow-1{flex-grow:1!important}.flex-lg-shrink-0{flex-shrink:0!important}.flex-lg-shrink-1{flex-shrink:1!important}.justify-content-lg-start{justify-content:flex-start!important}.justify-content-lg-end{justify-content:flex-end!important}.justify-content-lg-center{justify-content:center!important}.justify-content-lg-between{justify-content:space-between!important}.justify-content-lg-around{justify-content:space-around!important}.align-items-lg-start{align-items:flex-start!important}.align-items-lg-end{align-items:flex-end!important}.align-items-lg-center{align-items:center!important}.align-items-lg-baseline{align-items:baseline!important}.align-items-lg-stretch{align-items:stretch!important}.align-content-lg-start{align-content:flex-start!important}.align-content-lg-end{align-content:flex-end!important}.align-content-lg-center{align-content:center!important}.align-content-lg-between{align-content:space-between!important}.align-content-lg-around{align-content:space-around!important}.align-content-lg-stretch{align-content:stretch!important}.align-self-lg-auto{align-self:auto!important}.align-self-lg-start{align-self:flex-start!important}.align-self-lg-end{align-self:flex-end!important}.align-self-lg-center{align-self:center!important}.align-self-lg-baseline{align-self:baseline!important}.align-self-lg-stretch{align-self:stretch!important}}@media(min-width:1240px){.flex-xl-row{flex-direction:row!important}.flex-xl-column{flex-direction:column!important}.flex-xl-row-reverse{flex-direction:row-reverse!important}.flex-xl-column-reverse{flex-direction:column-reverse!important}.flex-xl-wrap{flex-wrap:wrap!important}.flex-xl-nowrap{flex-wrap:nowrap!important}.flex-xl-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-xl-fill{flex:1 1 auto!important}.flex-xl-grow-0{flex-grow:0!important}.flex-xl-grow-1{flex-grow:1!important}.flex-xl-shrink-0{flex-shrink:0!important}.flex-xl-shrink-1{flex-shrink:1!important}.justify-content-xl-start{justify-content:flex-start!important}.justify-content-xl-end{justify-content:flex-end!important}.justify-content-xl-center{justify-content:center!important}.justify-content-xl-between{justify-content:space-between!important}.justify-content-xl-around{justify-content:space-around!important}.align-items-xl-start{align-items:flex-start!important}.align-items-xl-end{align-items:flex-end!important}.align-items-xl-center{align-items:center!important}.align-items-xl-baseline{align-items:baseline!important}.align-items-xl-stretch{align-items:stretch!important}.align-content-xl-start{align-content:flex-start!important}.align-content-xl-end{align-content:flex-end!important}.align-content-xl-center{align-content:center!important}.align-content-xl-between{align-content:space-between!important}.align-content-xl-around{align-content:space-around!important}.align-content-xl-stretch{align-content:stretch!important}.align-self-xl-auto{align-self:auto!important}.align-self-xl-start{align-self:flex-start!important}.align-self-xl-end{align-self:flex-end!important}.align-self-xl-center{align-self:center!important}.align-self-xl-baseline{align-self:baseline!important}.align-self-xl-stretch{align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media(min-width:400px){.float-xs-left{float:left!important}.float-xs-right{float:right!important}.float-xs-none{float:none!important}}@media(min-width:616px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media(min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media(min-width:980px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media(min-width:1240px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports(position:sticky){.sticky-top{position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 2px 14px rgba(108,117,125,.2)!important}.shadow{box-shadow:0 8px 20px rgba(108,117,125,.2)!important}.shadow-lg{box-shadow:0 12px 32px rgba(108,117,125,.2)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.min-vw-100{min-width:100vw!important}.min-vh-100{min-height:100vh!important}.vw-100{width:100vw!important}.vh-100{height:100vh!important}.stretched-link:after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:transparent}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:8px!important}.mt-1,.my-1{margin-top:8px!important}.mr-1,.mx-1{margin-right:8px!important}.mb-1,.my-1{margin-bottom:8px!important}.ml-1,.mx-1{margin-left:8px!important}.m-2{margin:16px!important}.mt-2,.my-2{margin-top:16px!important}.mr-2,.mx-2{margin-right:16px!important}.mb-2,.my-2{margin-bottom:16px!important}.ml-2,.mx-2{margin-left:16px!important}.m-3{margin:24px!important}.mt-3,.my-3{margin-top:24px!important}.mr-3,.mx-3{margin-right:24px!important}.mb-3,.my-3{margin-bottom:24px!important}.ml-3,.mx-3{margin-left:24px!important}.m-4{margin:32px!important}.mt-4,.my-4{margin-top:32px!important}.mr-4,.mx-4{margin-right:32px!important}.mb-4,.my-4{margin-bottom:32px!important}.ml-4,.mx-4{margin-left:32px!important}.m-5{margin:40px!important}.mt-5,.my-5{margin-top:40px!important}.mr-5,.mx-5{margin-right:40px!important}.mb-5,.my-5{margin-bottom:40px!important}.ml-5,.mx-5{margin-left:40px!important}.m-6{margin:48px!important}.mt-6,.my-6{margin-top:48px!important}.mr-6,.mx-6{margin-right:48px!important}.mb-6,.my-6{margin-bottom:48px!important}.ml-6,.mx-6{margin-left:48px!important}.m-7{margin:56px!important}.mt-7,.my-7{margin-top:56px!important}.mr-7,.mx-7{margin-right:56px!important}.mb-7,.my-7{margin-bottom:56px!important}.ml-7,.mx-7{margin-left:56px!important}.m-8{margin:64px!important}.mt-8,.my-8{margin-top:64px!important}.mr-8,.mx-8{margin-right:64px!important}.mb-8,.my-8{margin-bottom:64px!important}.ml-8,.mx-8{margin-left:64px!important}.m-9{margin:72px!important}.mt-9,.my-9{margin-top:72px!important}.mr-9,.mx-9{margin-right:72px!important}.mb-9,.my-9{margin-bottom:72px!important}.ml-9,.mx-9{margin-left:72px!important}.m-10{margin:80px!important}.mt-10,.my-10{margin-top:80px!important}.mr-10,.mx-10{margin-right:80px!important}.mb-10,.my-10{margin-bottom:80px!important}.ml-10,.mx-10{margin-left:80px!important}.m-12{margin:96px!important}.mt-12,.my-12{margin-top:96px!important}.mr-12,.mx-12{margin-right:96px!important}.mb-12,.my-12{margin-bottom:96px!important}.ml-12,.mx-12{margin-left:96px!important}.m-15{margin:120px!important}.mt-15,.my-15{margin-top:120px!important}.mr-15,.mx-15{margin-right:120px!important}.mb-15,.my-15{margin-bottom:120px!important}.ml-15,.mx-15{margin-left:120px!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:8px!important}.pt-1,.py-1{padding-top:8px!important}.pr-1,.px-1{padding-right:8px!important}.pb-1,.py-1{padding-bottom:8px!important}.pl-1,.px-1{padding-left:8px!important}.p-2{padding:16px!important}.pt-2,.py-2{padding-top:16px!important}.pr-2,.px-2{padding-right:16px!important}.pb-2,.py-2{padding-bottom:16px!important}.pl-2,.px-2{padding-left:16px!important}.p-3{padding:24px!important}.pt-3,.py-3{padding-top:24px!important}.pr-3,.px-3{padding-right:24px!important}.pb-3,.py-3{padding-bottom:24px!important}.pl-3,.px-3{padding-left:24px!important}.p-4{padding:32px!important}.pt-4,.py-4{padding-top:32px!important}.pr-4,.px-4{padding-right:32px!important}.pb-4,.py-4{padding-bottom:32px!important}.pl-4,.px-4{padding-left:32px!important}.p-5{padding:40px!important}.pt-5,.py-5{padding-top:40px!important}.pr-5,.px-5{padding-right:40px!important}.pb-5,.py-5{padding-bottom:40px!important}.pl-5,.px-5{padding-left:40px!important}.p-6{padding:48px!important}.pt-6,.py-6{padding-top:48px!important}.pr-6,.px-6{padding-right:48px!important}.pb-6,.py-6{padding-bottom:48px!important}.pl-6,.px-6{padding-left:48px!important}.p-7{padding:56px!important}.pt-7,.py-7{padding-top:56px!important}.pr-7,.px-7{padding-right:56px!important}.pb-7,.py-7{padding-bottom:56px!important}.pl-7,.px-7{padding-left:56px!important}.p-8{padding:64px!important}.pt-8,.py-8{padding-top:64px!important}.pr-8,.px-8{padding-right:64px!important}.pb-8,.py-8{padding-bottom:64px!important}.pl-8,.px-8{padding-left:64px!important}.p-9{padding:72px!important}.pt-9,.py-9{padding-top:72px!important}.pr-9,.px-9{padding-right:72px!important}.pb-9,.py-9{padding-bottom:72px!important}.pl-9,.px-9{padding-left:72px!important}.p-10{padding:80px!important}.pt-10,.py-10{padding-top:80px!important}.pr-10,.px-10{padding-right:80px!important}.pb-10,.py-10{padding-bottom:80px!important}.pl-10,.px-10{padding-left:80px!important}.p-12{padding:96px!important}.pt-12,.py-12{padding-top:96px!important}.pr-12,.px-12{padding-right:96px!important}.pb-12,.py-12{padding-bottom:96px!important}.pl-12,.px-12{padding-left:96px!important}.p-15{padding:120px!important}.pt-15,.py-15{padding-top:120px!important}.pr-15,.px-15{padding-right:120px!important}.pb-15,.py-15{padding-bottom:120px!important}.pl-15,.px-15{padding-left:120px!important}.m-n1{margin:-8px!important}.mt-n1,.my-n1{margin-top:-8px!important}.mr-n1,.mx-n1{margin-right:-8px!important}.mb-n1,.my-n1{margin-bottom:-8px!important}.ml-n1,.mx-n1{margin-left:-8px!important}.m-n2{margin:-16px!important}.mt-n2,.my-n2{margin-top:-16px!important}.mr-n2,.mx-n2{margin-right:-16px!important}.mb-n2,.my-n2{margin-bottom:-16px!important}.ml-n2,.mx-n2{margin-left:-16px!important}.m-n3{margin:-24px!important}.mt-n3,.my-n3{margin-top:-24px!important}.mr-n3,.mx-n3{margin-right:-24px!important}.mb-n3,.my-n3{margin-bottom:-24px!important}.ml-n3,.mx-n3{margin-left:-24px!important}.m-n4{margin:-32px!important}.mt-n4,.my-n4{margin-top:-32px!important}.mr-n4,.mx-n4{margin-right:-32px!important}.mb-n4,.my-n4{margin-bottom:-32px!important}.ml-n4,.mx-n4{margin-left:-32px!important}.m-n5{margin:-40px!important}.mt-n5,.my-n5{margin-top:-40px!important}.mr-n5,.mx-n5{margin-right:-40px!important}.mb-n5,.my-n5{margin-bottom:-40px!important}.ml-n5,.mx-n5{margin-left:-40px!important}.m-n6{margin:-48px!important}.mt-n6,.my-n6{margin-top:-48px!important}.mr-n6,.mx-n6{margin-right:-48px!important}.mb-n6,.my-n6{margin-bottom:-48px!important}.ml-n6,.mx-n6{margin-left:-48px!important}.m-n7{margin:-56px!important}.mt-n7,.my-n7{margin-top:-56px!important}.mr-n7,.mx-n7{margin-right:-56px!important}.mb-n7,.my-n7{margin-bottom:-56px!important}.ml-n7,.mx-n7{margin-left:-56px!important}.m-n8{margin:-64px!important}.mt-n8,.my-n8{margin-top:-64px!important}.mr-n8,.mx-n8{margin-right:-64px!important}.mb-n8,.my-n8{margin-bottom:-64px!important}.ml-n8,.mx-n8{margin-left:-64px!important}.m-n9{margin:-72px!important}.mt-n9,.my-n9{margin-top:-72px!important}.mr-n9,.mx-n9{margin-right:-72px!important}.mb-n9,.my-n9{margin-bottom:-72px!important}.ml-n9,.mx-n9{margin-left:-72px!important}.m-n10{margin:-80px!important}.mt-n10,.my-n10{margin-top:-80px!important}.mr-n10,.mx-n10{margin-right:-80px!important}.mb-n10,.my-n10{margin-bottom:-80px!important}.ml-n10,.mx-n10{margin-left:-80px!important}.m-n12{margin:-96px!important}.mt-n12,.my-n12{margin-top:-96px!important}.mr-n12,.mx-n12{margin-right:-96px!important}.mb-n12,.my-n12{margin-bottom:-96px!important}.ml-n12,.mx-n12{margin-left:-96px!important}.m-n15{margin:-120px!important}.mt-n15,.my-n15{margin-top:-120px!important}.mr-n15,.mx-n15{margin-right:-120px!important}.mb-n15,.my-n15{margin-bottom:-120px!important}.ml-n15,.mx-n15{margin-left:-120px!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media(min-width:400px){.m-xs-0{margin:0!important}.mt-xs-0,.my-xs-0{margin-top:0!important}.mr-xs-0,.mx-xs-0{margin-right:0!important}.mb-xs-0,.my-xs-0{margin-bottom:0!important}.ml-xs-0,.mx-xs-0{margin-left:0!important}.m-xs-1{margin:8px!important}.mt-xs-1,.my-xs-1{margin-top:8px!important}.mr-xs-1,.mx-xs-1{margin-right:8px!important}.mb-xs-1,.my-xs-1{margin-bottom:8px!important}.ml-xs-1,.mx-xs-1{margin-left:8px!important}.m-xs-2{margin:16px!important}.mt-xs-2,.my-xs-2{margin-top:16px!important}.mr-xs-2,.mx-xs-2{margin-right:16px!important}.mb-xs-2,.my-xs-2{margin-bottom:16px!important}.ml-xs-2,.mx-xs-2{margin-left:16px!important}.m-xs-3{margin:24px!important}.mt-xs-3,.my-xs-3{margin-top:24px!important}.mr-xs-3,.mx-xs-3{margin-right:24px!important}.mb-xs-3,.my-xs-3{margin-bottom:24px!important}.ml-xs-3,.mx-xs-3{margin-left:24px!important}.m-xs-4{margin:32px!important}.mt-xs-4,.my-xs-4{margin-top:32px!important}.mr-xs-4,.mx-xs-4{margin-right:32px!important}.mb-xs-4,.my-xs-4{margin-bottom:32px!important}.ml-xs-4,.mx-xs-4{margin-left:32px!important}.m-xs-5{margin:40px!important}.mt-xs-5,.my-xs-5{margin-top:40px!important}.mr-xs-5,.mx-xs-5{margin-right:40px!important}.mb-xs-5,.my-xs-5{margin-bottom:40px!important}.ml-xs-5,.mx-xs-5{margin-left:40px!important}.m-xs-6{margin:48px!important}.mt-xs-6,.my-xs-6{margin-top:48px!important}.mr-xs-6,.mx-xs-6{margin-right:48px!important}.mb-xs-6,.my-xs-6{margin-bottom:48px!important}.ml-xs-6,.mx-xs-6{margin-left:48px!important}.m-xs-7{margin:56px!important}.mt-xs-7,.my-xs-7{margin-top:56px!important}.mr-xs-7,.mx-xs-7{margin-right:56px!important}.mb-xs-7,.my-xs-7{margin-bottom:56px!important}.ml-xs-7,.mx-xs-7{margin-left:56px!important}.m-xs-8{margin:64px!important}.mt-xs-8,.my-xs-8{margin-top:64px!important}.mr-xs-8,.mx-xs-8{margin-right:64px!important}.mb-xs-8,.my-xs-8{margin-bottom:64px!important}.ml-xs-8,.mx-xs-8{margin-left:64px!important}.m-xs-9{margin:72px!important}.mt-xs-9,.my-xs-9{margin-top:72px!important}.mr-xs-9,.mx-xs-9{margin-right:72px!important}.mb-xs-9,.my-xs-9{margin-bottom:72px!important}.ml-xs-9,.mx-xs-9{margin-left:72px!important}.m-xs-10{margin:80px!important}.mt-xs-10,.my-xs-10{margin-top:80px!important}.mr-xs-10,.mx-xs-10{margin-right:80px!important}.mb-xs-10,.my-xs-10{margin-bottom:80px!important}.ml-xs-10,.mx-xs-10{margin-left:80px!important}.m-xs-12{margin:96px!important}.mt-xs-12,.my-xs-12{margin-top:96px!important}.mr-xs-12,.mx-xs-12{margin-right:96px!important}.mb-xs-12,.my-xs-12{margin-bottom:96px!important}.ml-xs-12,.mx-xs-12{margin-left:96px!important}.m-xs-15{margin:120px!important}.mt-xs-15,.my-xs-15{margin-top:120px!important}.mr-xs-15,.mx-xs-15{margin-right:120px!important}.mb-xs-15,.my-xs-15{margin-bottom:120px!important}.ml-xs-15,.mx-xs-15{margin-left:120px!important}.p-xs-0{padding:0!important}.pt-xs-0,.py-xs-0{padding-top:0!important}.pr-xs-0,.px-xs-0{padding-right:0!important}.pb-xs-0,.py-xs-0{padding-bottom:0!important}.pl-xs-0,.px-xs-0{padding-left:0!important}.p-xs-1{padding:8px!important}.pt-xs-1,.py-xs-1{padding-top:8px!important}.pr-xs-1,.px-xs-1{padding-right:8px!important}.pb-xs-1,.py-xs-1{padding-bottom:8px!important}.pl-xs-1,.px-xs-1{padding-left:8px!important}.p-xs-2{padding:16px!important}.pt-xs-2,.py-xs-2{padding-top:16px!important}.pr-xs-2,.px-xs-2{padding-right:16px!important}.pb-xs-2,.py-xs-2{padding-bottom:16px!important}.pl-xs-2,.px-xs-2{padding-left:16px!important}.p-xs-3{padding:24px!important}.pt-xs-3,.py-xs-3{padding-top:24px!important}.pr-xs-3,.px-xs-3{padding-right:24px!important}.pb-xs-3,.py-xs-3{padding-bottom:24px!important}.pl-xs-3,.px-xs-3{padding-left:24px!important}.p-xs-4{padding:32px!important}.pt-xs-4,.py-xs-4{padding-top:32px!important}.pr-xs-4,.px-xs-4{padding-right:32px!important}.pb-xs-4,.py-xs-4{padding-bottom:32px!important}.pl-xs-4,.px-xs-4{padding-left:32px!important}.p-xs-5{padding:40px!important}.pt-xs-5,.py-xs-5{padding-top:40px!important}.pr-xs-5,.px-xs-5{padding-right:40px!important}.pb-xs-5,.py-xs-5{padding-bottom:40px!important}.pl-xs-5,.px-xs-5{padding-left:40px!important}.p-xs-6{padding:48px!important}.pt-xs-6,.py-xs-6{padding-top:48px!important}.pr-xs-6,.px-xs-6{padding-right:48px!important}.pb-xs-6,.py-xs-6{padding-bottom:48px!important}.pl-xs-6,.px-xs-6{padding-left:48px!important}.p-xs-7{padding:56px!important}.pt-xs-7,.py-xs-7{padding-top:56px!important}.pr-xs-7,.px-xs-7{padding-right:56px!important}.pb-xs-7,.py-xs-7{padding-bottom:56px!important}.pl-xs-7,.px-xs-7{padding-left:56px!important}.p-xs-8{padding:64px!important}.pt-xs-8,.py-xs-8{padding-top:64px!important}.pr-xs-8,.px-xs-8{padding-right:64px!important}.pb-xs-8,.py-xs-8{padding-bottom:64px!important}.pl-xs-8,.px-xs-8{padding-left:64px!important}.p-xs-9{padding:72px!important}.pt-xs-9,.py-xs-9{padding-top:72px!important}.pr-xs-9,.px-xs-9{padding-right:72px!important}.pb-xs-9,.py-xs-9{padding-bottom:72px!important}.pl-xs-9,.px-xs-9{padding-left:72px!important}.p-xs-10{padding:80px!important}.pt-xs-10,.py-xs-10{padding-top:80px!important}.pr-xs-10,.px-xs-10{padding-right:80px!important}.pb-xs-10,.py-xs-10{padding-bottom:80px!important}.pl-xs-10,.px-xs-10{padding-left:80px!important}.p-xs-12{padding:96px!important}.pt-xs-12,.py-xs-12{padding-top:96px!important}.pr-xs-12,.px-xs-12{padding-right:96px!important}.pb-xs-12,.py-xs-12{padding-bottom:96px!important}.pl-xs-12,.px-xs-12{padding-left:96px!important}.p-xs-15{padding:120px!important}.pt-xs-15,.py-xs-15{padding-top:120px!important}.pr-xs-15,.px-xs-15{padding-right:120px!important}.pb-xs-15,.py-xs-15{padding-bottom:120px!important}.pl-xs-15,.px-xs-15{padding-left:120px!important}.m-xs-n1{margin:-8px!important}.mt-xs-n1,.my-xs-n1{margin-top:-8px!important}.mr-xs-n1,.mx-xs-n1{margin-right:-8px!important}.mb-xs-n1,.my-xs-n1{margin-bottom:-8px!important}.ml-xs-n1,.mx-xs-n1{margin-left:-8px!important}.m-xs-n2{margin:-16px!important}.mt-xs-n2,.my-xs-n2{margin-top:-16px!important}.mr-xs-n2,.mx-xs-n2{margin-right:-16px!important}.mb-xs-n2,.my-xs-n2{margin-bottom:-16px!important}.ml-xs-n2,.mx-xs-n2{margin-left:-16px!important}.m-xs-n3{margin:-24px!important}.mt-xs-n3,.my-xs-n3{margin-top:-24px!important}.mr-xs-n3,.mx-xs-n3{margin-right:-24px!important}.mb-xs-n3,.my-xs-n3{margin-bottom:-24px!important}.ml-xs-n3,.mx-xs-n3{margin-left:-24px!important}.m-xs-n4{margin:-32px!important}.mt-xs-n4,.my-xs-n4{margin-top:-32px!important}.mr-xs-n4,.mx-xs-n4{margin-right:-32px!important}.mb-xs-n4,.my-xs-n4{margin-bottom:-32px!important}.ml-xs-n4,.mx-xs-n4{margin-left:-32px!important}.m-xs-n5{margin:-40px!important}.mt-xs-n5,.my-xs-n5{margin-top:-40px!important}.mr-xs-n5,.mx-xs-n5{margin-right:-40px!important}.mb-xs-n5,.my-xs-n5{margin-bottom:-40px!important}.ml-xs-n5,.mx-xs-n5{margin-left:-40px!important}.m-xs-n6{margin:-48px!important}.mt-xs-n6,.my-xs-n6{margin-top:-48px!important}.mr-xs-n6,.mx-xs-n6{margin-right:-48px!important}.mb-xs-n6,.my-xs-n6{margin-bottom:-48px!important}.ml-xs-n6,.mx-xs-n6{margin-left:-48px!important}.m-xs-n7{margin:-56px!important}.mt-xs-n7,.my-xs-n7{margin-top:-56px!important}.mr-xs-n7,.mx-xs-n7{margin-right:-56px!important}.mb-xs-n7,.my-xs-n7{margin-bottom:-56px!important}.ml-xs-n7,.mx-xs-n7{margin-left:-56px!important}.m-xs-n8{margin:-64px!important}.mt-xs-n8,.my-xs-n8{margin-top:-64px!important}.mr-xs-n8,.mx-xs-n8{margin-right:-64px!important}.mb-xs-n8,.my-xs-n8{margin-bottom:-64px!important}.ml-xs-n8,.mx-xs-n8{margin-left:-64px!important}.m-xs-n9{margin:-72px!important}.mt-xs-n9,.my-xs-n9{margin-top:-72px!important}.mr-xs-n9,.mx-xs-n9{margin-right:-72px!important}.mb-xs-n9,.my-xs-n9{margin-bottom:-72px!important}.ml-xs-n9,.mx-xs-n9{margin-left:-72px!important}.m-xs-n10{margin:-80px!important}.mt-xs-n10,.my-xs-n10{margin-top:-80px!important}.mr-xs-n10,.mx-xs-n10{margin-right:-80px!important}.mb-xs-n10,.my-xs-n10{margin-bottom:-80px!important}.ml-xs-n10,.mx-xs-n10{margin-left:-80px!important}.m-xs-n12{margin:-96px!important}.mt-xs-n12,.my-xs-n12{margin-top:-96px!important}.mr-xs-n12,.mx-xs-n12{margin-right:-96px!important}.mb-xs-n12,.my-xs-n12{margin-bottom:-96px!important}.ml-xs-n12,.mx-xs-n12{margin-left:-96px!important}.m-xs-n15{margin:-120px!important}.mt-xs-n15,.my-xs-n15{margin-top:-120px!important}.mr-xs-n15,.mx-xs-n15{margin-right:-120px!important}.mb-xs-n15,.my-xs-n15{margin-bottom:-120px!important}.ml-xs-n15,.mx-xs-n15{margin-left:-120px!important}.m-xs-auto{margin:auto!important}.mt-xs-auto,.my-xs-auto{margin-top:auto!important}.mr-xs-auto,.mx-xs-auto{margin-right:auto!important}.mb-xs-auto,.my-xs-auto{margin-bottom:auto!important}.ml-xs-auto,.mx-xs-auto{margin-left:auto!important}}@media(min-width:616px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:8px!important}.mt-sm-1,.my-sm-1{margin-top:8px!important}.mr-sm-1,.mx-sm-1{margin-right:8px!important}.mb-sm-1,.my-sm-1{margin-bottom:8px!important}.ml-sm-1,.mx-sm-1{margin-left:8px!important}.m-sm-2{margin:16px!important}.mt-sm-2,.my-sm-2{margin-top:16px!important}.mr-sm-2,.mx-sm-2{margin-right:16px!important}.mb-sm-2,.my-sm-2{margin-bottom:16px!important}.ml-sm-2,.mx-sm-2{margin-left:16px!important}.m-sm-3{margin:24px!important}.mt-sm-3,.my-sm-3{margin-top:24px!important}.mr-sm-3,.mx-sm-3{margin-right:24px!important}.mb-sm-3,.my-sm-3{margin-bottom:24px!important}.ml-sm-3,.mx-sm-3{margin-left:24px!important}.m-sm-4{margin:32px!important}.mt-sm-4,.my-sm-4{margin-top:32px!important}.mr-sm-4,.mx-sm-4{margin-right:32px!important}.mb-sm-4,.my-sm-4{margin-bottom:32px!important}.ml-sm-4,.mx-sm-4{margin-left:32px!important}.m-sm-5{margin:40px!important}.mt-sm-5,.my-sm-5{margin-top:40px!important}.mr-sm-5,.mx-sm-5{margin-right:40px!important}.mb-sm-5,.my-sm-5{margin-bottom:40px!important}.ml-sm-5,.mx-sm-5{margin-left:40px!important}.m-sm-6{margin:48px!important}.mt-sm-6,.my-sm-6{margin-top:48px!important}.mr-sm-6,.mx-sm-6{margin-right:48px!important}.mb-sm-6,.my-sm-6{margin-bottom:48px!important}.ml-sm-6,.mx-sm-6{margin-left:48px!important}.m-sm-7{margin:56px!important}.mt-sm-7,.my-sm-7{margin-top:56px!important}.mr-sm-7,.mx-sm-7{margin-right:56px!important}.mb-sm-7,.my-sm-7{margin-bottom:56px!important}.ml-sm-7,.mx-sm-7{margin-left:56px!important}.m-sm-8{margin:64px!important}.mt-sm-8,.my-sm-8{margin-top:64px!important}.mr-sm-8,.mx-sm-8{margin-right:64px!important}.mb-sm-8,.my-sm-8{margin-bottom:64px!important}.ml-sm-8,.mx-sm-8{margin-left:64px!important}.m-sm-9{margin:72px!important}.mt-sm-9,.my-sm-9{margin-top:72px!important}.mr-sm-9,.mx-sm-9{margin-right:72px!important}.mb-sm-9,.my-sm-9{margin-bottom:72px!important}.ml-sm-9,.mx-sm-9{margin-left:72px!important}.m-sm-10{margin:80px!important}.mt-sm-10,.my-sm-10{margin-top:80px!important}.mr-sm-10,.mx-sm-10{margin-right:80px!important}.mb-sm-10,.my-sm-10{margin-bottom:80px!important}.ml-sm-10,.mx-sm-10{margin-left:80px!important}.m-sm-12{margin:96px!important}.mt-sm-12,.my-sm-12{margin-top:96px!important}.mr-sm-12,.mx-sm-12{margin-right:96px!important}.mb-sm-12,.my-sm-12{margin-bottom:96px!important}.ml-sm-12,.mx-sm-12{margin-left:96px!important}.m-sm-15{margin:120px!important}.mt-sm-15,.my-sm-15{margin-top:120px!important}.mr-sm-15,.mx-sm-15{margin-right:120px!important}.mb-sm-15,.my-sm-15{margin-bottom:120px!important}.ml-sm-15,.mx-sm-15{margin-left:120px!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:8px!important}.pt-sm-1,.py-sm-1{padding-top:8px!important}.pr-sm-1,.px-sm-1{padding-right:8px!important}.pb-sm-1,.py-sm-1{padding-bottom:8px!important}.pl-sm-1,.px-sm-1{padding-left:8px!important}.p-sm-2{padding:16px!important}.pt-sm-2,.py-sm-2{padding-top:16px!important}.pr-sm-2,.px-sm-2{padding-right:16px!important}.pb-sm-2,.py-sm-2{padding-bottom:16px!important}.pl-sm-2,.px-sm-2{padding-left:16px!important}.p-sm-3{padding:24px!important}.pt-sm-3,.py-sm-3{padding-top:24px!important}.pr-sm-3,.px-sm-3{padding-right:24px!important}.pb-sm-3,.py-sm-3{padding-bottom:24px!important}.pl-sm-3,.px-sm-3{padding-left:24px!important}.p-sm-4{padding:32px!important}.pt-sm-4,.py-sm-4{padding-top:32px!important}.pr-sm-4,.px-sm-4{padding-right:32px!important}.pb-sm-4,.py-sm-4{padding-bottom:32px!important}.pl-sm-4,.px-sm-4{padding-left:32px!important}.p-sm-5{padding:40px!important}.pt-sm-5,.py-sm-5{padding-top:40px!important}.pr-sm-5,.px-sm-5{padding-right:40px!important}.pb-sm-5,.py-sm-5{padding-bottom:40px!important}.pl-sm-5,.px-sm-5{padding-left:40px!important}.p-sm-6{padding:48px!important}.pt-sm-6,.py-sm-6{padding-top:48px!important}.pr-sm-6,.px-sm-6{padding-right:48px!important}.pb-sm-6,.py-sm-6{padding-bottom:48px!important}.pl-sm-6,.px-sm-6{padding-left:48px!important}.p-sm-7{padding:56px!important}.pt-sm-7,.py-sm-7{padding-top:56px!important}.pr-sm-7,.px-sm-7{padding-right:56px!important}.pb-sm-7,.py-sm-7{padding-bottom:56px!important}.pl-sm-7,.px-sm-7{padding-left:56px!important}.p-sm-8{padding:64px!important}.pt-sm-8,.py-sm-8{padding-top:64px!important}.pr-sm-8,.px-sm-8{padding-right:64px!important}.pb-sm-8,.py-sm-8{padding-bottom:64px!important}.pl-sm-8,.px-sm-8{padding-left:64px!important}.p-sm-9{padding:72px!important}.pt-sm-9,.py-sm-9{padding-top:72px!important}.pr-sm-9,.px-sm-9{padding-right:72px!important}.pb-sm-9,.py-sm-9{padding-bottom:72px!important}.pl-sm-9,.px-sm-9{padding-left:72px!important}.p-sm-10{padding:80px!important}.pt-sm-10,.py-sm-10{padding-top:80px!important}.pr-sm-10,.px-sm-10{padding-right:80px!important}.pb-sm-10,.py-sm-10{padding-bottom:80px!important}.pl-sm-10,.px-sm-10{padding-left:80px!important}.p-sm-12{padding:96px!important}.pt-sm-12,.py-sm-12{padding-top:96px!important}.pr-sm-12,.px-sm-12{padding-right:96px!important}.pb-sm-12,.py-sm-12{padding-bottom:96px!important}.pl-sm-12,.px-sm-12{padding-left:96px!important}.p-sm-15{padding:120px!important}.pt-sm-15,.py-sm-15{padding-top:120px!important}.pr-sm-15,.px-sm-15{padding-right:120px!important}.pb-sm-15,.py-sm-15{padding-bottom:120px!important}.pl-sm-15,.px-sm-15{padding-left:120px!important}.m-sm-n1{margin:-8px!important}.mt-sm-n1,.my-sm-n1{margin-top:-8px!important}.mr-sm-n1,.mx-sm-n1{margin-right:-8px!important}.mb-sm-n1,.my-sm-n1{margin-bottom:-8px!important}.ml-sm-n1,.mx-sm-n1{margin-left:-8px!important}.m-sm-n2{margin:-16px!important}.mt-sm-n2,.my-sm-n2{margin-top:-16px!important}.mr-sm-n2,.mx-sm-n2{margin-right:-16px!important}.mb-sm-n2,.my-sm-n2{margin-bottom:-16px!important}.ml-sm-n2,.mx-sm-n2{margin-left:-16px!important}.m-sm-n3{margin:-24px!important}.mt-sm-n3,.my-sm-n3{margin-top:-24px!important}.mr-sm-n3,.mx-sm-n3{margin-right:-24px!important}.mb-sm-n3,.my-sm-n3{margin-bottom:-24px!important}.ml-sm-n3,.mx-sm-n3{margin-left:-24px!important}.m-sm-n4{margin:-32px!important}.mt-sm-n4,.my-sm-n4{margin-top:-32px!important}.mr-sm-n4,.mx-sm-n4{margin-right:-32px!important}.mb-sm-n4,.my-sm-n4{margin-bottom:-32px!important}.ml-sm-n4,.mx-sm-n4{margin-left:-32px!important}.m-sm-n5{margin:-40px!important}.mt-sm-n5,.my-sm-n5{margin-top:-40px!important}.mr-sm-n5,.mx-sm-n5{margin-right:-40px!important}.mb-sm-n5,.my-sm-n5{margin-bottom:-40px!important}.ml-sm-n5,.mx-sm-n5{margin-left:-40px!important}.m-sm-n6{margin:-48px!important}.mt-sm-n6,.my-sm-n6{margin-top:-48px!important}.mr-sm-n6,.mx-sm-n6{margin-right:-48px!important}.mb-sm-n6,.my-sm-n6{margin-bottom:-48px!important}.ml-sm-n6,.mx-sm-n6{margin-left:-48px!important}.m-sm-n7{margin:-56px!important}.mt-sm-n7,.my-sm-n7{margin-top:-56px!important}.mr-sm-n7,.mx-sm-n7{margin-right:-56px!important}.mb-sm-n7,.my-sm-n7{margin-bottom:-56px!important}.ml-sm-n7,.mx-sm-n7{margin-left:-56px!important}.m-sm-n8{margin:-64px!important}.mt-sm-n8,.my-sm-n8{margin-top:-64px!important}.mr-sm-n8,.mx-sm-n8{margin-right:-64px!important}.mb-sm-n8,.my-sm-n8{margin-bottom:-64px!important}.ml-sm-n8,.mx-sm-n8{margin-left:-64px!important}.m-sm-n9{margin:-72px!important}.mt-sm-n9,.my-sm-n9{margin-top:-72px!important}.mr-sm-n9,.mx-sm-n9{margin-right:-72px!important}.mb-sm-n9,.my-sm-n9{margin-bottom:-72px!important}.ml-sm-n9,.mx-sm-n9{margin-left:-72px!important}.m-sm-n10{margin:-80px!important}.mt-sm-n10,.my-sm-n10{margin-top:-80px!important}.mr-sm-n10,.mx-sm-n10{margin-right:-80px!important}.mb-sm-n10,.my-sm-n10{margin-bottom:-80px!important}.ml-sm-n10,.mx-sm-n10{margin-left:-80px!important}.m-sm-n12{margin:-96px!important}.mt-sm-n12,.my-sm-n12{margin-top:-96px!important}.mr-sm-n12,.mx-sm-n12{margin-right:-96px!important}.mb-sm-n12,.my-sm-n12{margin-bottom:-96px!important}.ml-sm-n12,.mx-sm-n12{margin-left:-96px!important}.m-sm-n15{margin:-120px!important}.mt-sm-n15,.my-sm-n15{margin-top:-120px!important}.mr-sm-n15,.mx-sm-n15{margin-right:-120px!important}.mb-sm-n15,.my-sm-n15{margin-bottom:-120px!important}.ml-sm-n15,.mx-sm-n15{margin-left:-120px!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media(min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:8px!important}.mt-md-1,.my-md-1{margin-top:8px!important}.mr-md-1,.mx-md-1{margin-right:8px!important}.mb-md-1,.my-md-1{margin-bottom:8px!important}.ml-md-1,.mx-md-1{margin-left:8px!important}.m-md-2{margin:16px!important}.mt-md-2,.my-md-2{margin-top:16px!important}.mr-md-2,.mx-md-2{margin-right:16px!important}.mb-md-2,.my-md-2{margin-bottom:16px!important}.ml-md-2,.mx-md-2{margin-left:16px!important}.m-md-3{margin:24px!important}.mt-md-3,.my-md-3{margin-top:24px!important}.mr-md-3,.mx-md-3{margin-right:24px!important}.mb-md-3,.my-md-3{margin-bottom:24px!important}.ml-md-3,.mx-md-3{margin-left:24px!important}.m-md-4{margin:32px!important}.mt-md-4,.my-md-4{margin-top:32px!important}.mr-md-4,.mx-md-4{margin-right:32px!important}.mb-md-4,.my-md-4{margin-bottom:32px!important}.ml-md-4,.mx-md-4{margin-left:32px!important}.m-md-5{margin:40px!important}.mt-md-5,.my-md-5{margin-top:40px!important}.mr-md-5,.mx-md-5{margin-right:40px!important}.mb-md-5,.my-md-5{margin-bottom:40px!important}.ml-md-5,.mx-md-5{margin-left:40px!important}.m-md-6{margin:48px!important}.mt-md-6,.my-md-6{margin-top:48px!important}.mr-md-6,.mx-md-6{margin-right:48px!important}.mb-md-6,.my-md-6{margin-bottom:48px!important}.ml-md-6,.mx-md-6{margin-left:48px!important}.m-md-7{margin:56px!important}.mt-md-7,.my-md-7{margin-top:56px!important}.mr-md-7,.mx-md-7{margin-right:56px!important}.mb-md-7,.my-md-7{margin-bottom:56px!important}.ml-md-7,.mx-md-7{margin-left:56px!important}.m-md-8{margin:64px!important}.mt-md-8,.my-md-8{margin-top:64px!important}.mr-md-8,.mx-md-8{margin-right:64px!important}.mb-md-8,.my-md-8{margin-bottom:64px!important}.ml-md-8,.mx-md-8{margin-left:64px!important}.m-md-9{margin:72px!important}.mt-md-9,.my-md-9{margin-top:72px!important}.mr-md-9,.mx-md-9{margin-right:72px!important}.mb-md-9,.my-md-9{margin-bottom:72px!important}.ml-md-9,.mx-md-9{margin-left:72px!important}.m-md-10{margin:80px!important}.mt-md-10,.my-md-10{margin-top:80px!important}.mr-md-10,.mx-md-10{margin-right:80px!important}.mb-md-10,.my-md-10{margin-bottom:80px!important}.ml-md-10,.mx-md-10{margin-left:80px!important}.m-md-12{margin:96px!important}.mt-md-12,.my-md-12{margin-top:96px!important}.mr-md-12,.mx-md-12{margin-right:96px!important}.mb-md-12,.my-md-12{margin-bottom:96px!important}.ml-md-12,.mx-md-12{margin-left:96px!important}.m-md-15{margin:120px!important}.mt-md-15,.my-md-15{margin-top:120px!important}.mr-md-15,.mx-md-15{margin-right:120px!important}.mb-md-15,.my-md-15{margin-bottom:120px!important}.ml-md-15,.mx-md-15{margin-left:120px!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:8px!important}.pt-md-1,.py-md-1{padding-top:8px!important}.pr-md-1,.px-md-1{padding-right:8px!important}.pb-md-1,.py-md-1{padding-bottom:8px!important}.pl-md-1,.px-md-1{padding-left:8px!important}.p-md-2{padding:16px!important}.pt-md-2,.py-md-2{padding-top:16px!important}.pr-md-2,.px-md-2{padding-right:16px!important}.pb-md-2,.py-md-2{padding-bottom:16px!important}.pl-md-2,.px-md-2{padding-left:16px!important}.p-md-3{padding:24px!important}.pt-md-3,.py-md-3{padding-top:24px!important}.pr-md-3,.px-md-3{padding-right:24px!important}.pb-md-3,.py-md-3{padding-bottom:24px!important}.pl-md-3,.px-md-3{padding-left:24px!important}.p-md-4{padding:32px!important}.pt-md-4,.py-md-4{padding-top:32px!important}.pr-md-4,.px-md-4{padding-right:32px!important}.pb-md-4,.py-md-4{padding-bottom:32px!important}.pl-md-4,.px-md-4{padding-left:32px!important}.p-md-5{padding:40px!important}.pt-md-5,.py-md-5{padding-top:40px!important}.pr-md-5,.px-md-5{padding-right:40px!important}.pb-md-5,.py-md-5{padding-bottom:40px!important}.pl-md-5,.px-md-5{padding-left:40px!important}.p-md-6{padding:48px!important}.pt-md-6,.py-md-6{padding-top:48px!important}.pr-md-6,.px-md-6{padding-right:48px!important}.pb-md-6,.py-md-6{padding-bottom:48px!important}.pl-md-6,.px-md-6{padding-left:48px!important}.p-md-7{padding:56px!important}.pt-md-7,.py-md-7{padding-top:56px!important}.pr-md-7,.px-md-7{padding-right:56px!important}.pb-md-7,.py-md-7{padding-bottom:56px!important}.pl-md-7,.px-md-7{padding-left:56px!important}.p-md-8{padding:64px!important}.pt-md-8,.py-md-8{padding-top:64px!important}.pr-md-8,.px-md-8{padding-right:64px!important}.pb-md-8,.py-md-8{padding-bottom:64px!important}.pl-md-8,.px-md-8{padding-left:64px!important}.p-md-9{padding:72px!important}.pt-md-9,.py-md-9{padding-top:72px!important}.pr-md-9,.px-md-9{padding-right:72px!important}.pb-md-9,.py-md-9{padding-bottom:72px!important}.pl-md-9,.px-md-9{padding-left:72px!important}.p-md-10{padding:80px!important}.pt-md-10,.py-md-10{padding-top:80px!important}.pr-md-10,.px-md-10{padding-right:80px!important}.pb-md-10,.py-md-10{padding-bottom:80px!important}.pl-md-10,.px-md-10{padding-left:80px!important}.p-md-12{padding:96px!important}.pt-md-12,.py-md-12{padding-top:96px!important}.pr-md-12,.px-md-12{padding-right:96px!important}.pb-md-12,.py-md-12{padding-bottom:96px!important}.pl-md-12,.px-md-12{padding-left:96px!important}.p-md-15{padding:120px!important}.pt-md-15,.py-md-15{padding-top:120px!important}.pr-md-15,.px-md-15{padding-right:120px!important}.pb-md-15,.py-md-15{padding-bottom:120px!important}.pl-md-15,.px-md-15{padding-left:120px!important}.m-md-n1{margin:-8px!important}.mt-md-n1,.my-md-n1{margin-top:-8px!important}.mr-md-n1,.mx-md-n1{margin-right:-8px!important}.mb-md-n1,.my-md-n1{margin-bottom:-8px!important}.ml-md-n1,.mx-md-n1{margin-left:-8px!important}.m-md-n2{margin:-16px!important}.mt-md-n2,.my-md-n2{margin-top:-16px!important}.mr-md-n2,.mx-md-n2{margin-right:-16px!important}.mb-md-n2,.my-md-n2{margin-bottom:-16px!important}.ml-md-n2,.mx-md-n2{margin-left:-16px!important}.m-md-n3{margin:-24px!important}.mt-md-n3,.my-md-n3{margin-top:-24px!important}.mr-md-n3,.mx-md-n3{margin-right:-24px!important}.mb-md-n3,.my-md-n3{margin-bottom:-24px!important}.ml-md-n3,.mx-md-n3{margin-left:-24px!important}.m-md-n4{margin:-32px!important}.mt-md-n4,.my-md-n4{margin-top:-32px!important}.mr-md-n4,.mx-md-n4{margin-right:-32px!important}.mb-md-n4,.my-md-n4{margin-bottom:-32px!important}.ml-md-n4,.mx-md-n4{margin-left:-32px!important}.m-md-n5{margin:-40px!important}.mt-md-n5,.my-md-n5{margin-top:-40px!important}.mr-md-n5,.mx-md-n5{margin-right:-40px!important}.mb-md-n5,.my-md-n5{margin-bottom:-40px!important}.ml-md-n5,.mx-md-n5{margin-left:-40px!important}.m-md-n6{margin:-48px!important}.mt-md-n6,.my-md-n6{margin-top:-48px!important}.mr-md-n6,.mx-md-n6{margin-right:-48px!important}.mb-md-n6,.my-md-n6{margin-bottom:-48px!important}.ml-md-n6,.mx-md-n6{margin-left:-48px!important}.m-md-n7{margin:-56px!important}.mt-md-n7,.my-md-n7{margin-top:-56px!important}.mr-md-n7,.mx-md-n7{margin-right:-56px!important}.mb-md-n7,.my-md-n7{margin-bottom:-56px!important}.ml-md-n7,.mx-md-n7{margin-left:-56px!important}.m-md-n8{margin:-64px!important}.mt-md-n8,.my-md-n8{margin-top:-64px!important}.mr-md-n8,.mx-md-n8{margin-right:-64px!important}.mb-md-n8,.my-md-n8{margin-bottom:-64px!important}.ml-md-n8,.mx-md-n8{margin-left:-64px!important}.m-md-n9{margin:-72px!important}.mt-md-n9,.my-md-n9{margin-top:-72px!important}.mr-md-n9,.mx-md-n9{margin-right:-72px!important}.mb-md-n9,.my-md-n9{margin-bottom:-72px!important}.ml-md-n9,.mx-md-n9{margin-left:-72px!important}.m-md-n10{margin:-80px!important}.mt-md-n10,.my-md-n10{margin-top:-80px!important}.mr-md-n10,.mx-md-n10{margin-right:-80px!important}.mb-md-n10,.my-md-n10{margin-bottom:-80px!important}.ml-md-n10,.mx-md-n10{margin-left:-80px!important}.m-md-n12{margin:-96px!important}.mt-md-n12,.my-md-n12{margin-top:-96px!important}.mr-md-n12,.mx-md-n12{margin-right:-96px!important}.mb-md-n12,.my-md-n12{margin-bottom:-96px!important}.ml-md-n12,.mx-md-n12{margin-left:-96px!important}.m-md-n15{margin:-120px!important}.mt-md-n15,.my-md-n15{margin-top:-120px!important}.mr-md-n15,.mx-md-n15{margin-right:-120px!important}.mb-md-n15,.my-md-n15{margin-bottom:-120px!important}.ml-md-n15,.mx-md-n15{margin-left:-120px!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media(min-width:980px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:8px!important}.mt-lg-1,.my-lg-1{margin-top:8px!important}.mr-lg-1,.mx-lg-1{margin-right:8px!important}.mb-lg-1,.my-lg-1{margin-bottom:8px!important}.ml-lg-1,.mx-lg-1{margin-left:8px!important}.m-lg-2{margin:16px!important}.mt-lg-2,.my-lg-2{margin-top:16px!important}.mr-lg-2,.mx-lg-2{margin-right:16px!important}.mb-lg-2,.my-lg-2{margin-bottom:16px!important}.ml-lg-2,.mx-lg-2{margin-left:16px!important}.m-lg-3{margin:24px!important}.mt-lg-3,.my-lg-3{margin-top:24px!important}.mr-lg-3,.mx-lg-3{margin-right:24px!important}.mb-lg-3,.my-lg-3{margin-bottom:24px!important}.ml-lg-3,.mx-lg-3{margin-left:24px!important}.m-lg-4{margin:32px!important}.mt-lg-4,.my-lg-4{margin-top:32px!important}.mr-lg-4,.mx-lg-4{margin-right:32px!important}.mb-lg-4,.my-lg-4{margin-bottom:32px!important}.ml-lg-4,.mx-lg-4{margin-left:32px!important}.m-lg-5{margin:40px!important}.mt-lg-5,.my-lg-5{margin-top:40px!important}.mr-lg-5,.mx-lg-5{margin-right:40px!important}.mb-lg-5,.my-lg-5{margin-bottom:40px!important}.ml-lg-5,.mx-lg-5{margin-left:40px!important}.m-lg-6{margin:48px!important}.mt-lg-6,.my-lg-6{margin-top:48px!important}.mr-lg-6,.mx-lg-6{margin-right:48px!important}.mb-lg-6,.my-lg-6{margin-bottom:48px!important}.ml-lg-6,.mx-lg-6{margin-left:48px!important}.m-lg-7{margin:56px!important}.mt-lg-7,.my-lg-7{margin-top:56px!important}.mr-lg-7,.mx-lg-7{margin-right:56px!important}.mb-lg-7,.my-lg-7{margin-bottom:56px!important}.ml-lg-7,.mx-lg-7{margin-left:56px!important}.m-lg-8{margin:64px!important}.mt-lg-8,.my-lg-8{margin-top:64px!important}.mr-lg-8,.mx-lg-8{margin-right:64px!important}.mb-lg-8,.my-lg-8{margin-bottom:64px!important}.ml-lg-8,.mx-lg-8{margin-left:64px!important}.m-lg-9{margin:72px!important}.mt-lg-9,.my-lg-9{margin-top:72px!important}.mr-lg-9,.mx-lg-9{margin-right:72px!important}.mb-lg-9,.my-lg-9{margin-bottom:72px!important}.ml-lg-9,.mx-lg-9{margin-left:72px!important}.m-lg-10{margin:80px!important}.mt-lg-10,.my-lg-10{margin-top:80px!important}.mr-lg-10,.mx-lg-10{margin-right:80px!important}.mb-lg-10,.my-lg-10{margin-bottom:80px!important}.ml-lg-10,.mx-lg-10{margin-left:80px!important}.m-lg-12{margin:96px!important}.mt-lg-12,.my-lg-12{margin-top:96px!important}.mr-lg-12,.mx-lg-12{margin-right:96px!important}.mb-lg-12,.my-lg-12{margin-bottom:96px!important}.ml-lg-12,.mx-lg-12{margin-left:96px!important}.m-lg-15{margin:120px!important}.mt-lg-15,.my-lg-15{margin-top:120px!important}.mr-lg-15,.mx-lg-15{margin-right:120px!important}.mb-lg-15,.my-lg-15{margin-bottom:120px!important}.ml-lg-15,.mx-lg-15{margin-left:120px!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:8px!important}.pt-lg-1,.py-lg-1{padding-top:8px!important}.pr-lg-1,.px-lg-1{padding-right:8px!important}.pb-lg-1,.py-lg-1{padding-bottom:8px!important}.pl-lg-1,.px-lg-1{padding-left:8px!important}.p-lg-2{padding:16px!important}.pt-lg-2,.py-lg-2{padding-top:16px!important}.pr-lg-2,.px-lg-2{padding-right:16px!important}.pb-lg-2,.py-lg-2{padding-bottom:16px!important}.pl-lg-2,.px-lg-2{padding-left:16px!important}.p-lg-3{padding:24px!important}.pt-lg-3,.py-lg-3{padding-top:24px!important}.pr-lg-3,.px-lg-3{padding-right:24px!important}.pb-lg-3,.py-lg-3{padding-bottom:24px!important}.pl-lg-3,.px-lg-3{padding-left:24px!important}.p-lg-4{padding:32px!important}.pt-lg-4,.py-lg-4{padding-top:32px!important}.pr-lg-4,.px-lg-4{padding-right:32px!important}.pb-lg-4,.py-lg-4{padding-bottom:32px!important}.pl-lg-4,.px-lg-4{padding-left:32px!important}.p-lg-5{padding:40px!important}.pt-lg-5,.py-lg-5{padding-top:40px!important}.pr-lg-5,.px-lg-5{padding-right:40px!important}.pb-lg-5,.py-lg-5{padding-bottom:40px!important}.pl-lg-5,.px-lg-5{padding-left:40px!important}.p-lg-6{padding:48px!important}.pt-lg-6,.py-lg-6{padding-top:48px!important}.pr-lg-6,.px-lg-6{padding-right:48px!important}.pb-lg-6,.py-lg-6{padding-bottom:48px!important}.pl-lg-6,.px-lg-6{padding-left:48px!important}.p-lg-7{padding:56px!important}.pt-lg-7,.py-lg-7{padding-top:56px!important}.pr-lg-7,.px-lg-7{padding-right:56px!important}.pb-lg-7,.py-lg-7{padding-bottom:56px!important}.pl-lg-7,.px-lg-7{padding-left:56px!important}.p-lg-8{padding:64px!important}.pt-lg-8,.py-lg-8{padding-top:64px!important}.pr-lg-8,.px-lg-8{padding-right:64px!important}.pb-lg-8,.py-lg-8{padding-bottom:64px!important}.pl-lg-8,.px-lg-8{padding-left:64px!important}.p-lg-9{padding:72px!important}.pt-lg-9,.py-lg-9{padding-top:72px!important}.pr-lg-9,.px-lg-9{padding-right:72px!important}.pb-lg-9,.py-lg-9{padding-bottom:72px!important}.pl-lg-9,.px-lg-9{padding-left:72px!important}.p-lg-10{padding:80px!important}.pt-lg-10,.py-lg-10{padding-top:80px!important}.pr-lg-10,.px-lg-10{padding-right:80px!important}.pb-lg-10,.py-lg-10{padding-bottom:80px!important}.pl-lg-10,.px-lg-10{padding-left:80px!important}.p-lg-12{padding:96px!important}.pt-lg-12,.py-lg-12{padding-top:96px!important}.pr-lg-12,.px-lg-12{padding-right:96px!important}.pb-lg-12,.py-lg-12{padding-bottom:96px!important}.pl-lg-12,.px-lg-12{padding-left:96px!important}.p-lg-15{padding:120px!important}.pt-lg-15,.py-lg-15{padding-top:120px!important}.pr-lg-15,.px-lg-15{padding-right:120px!important}.pb-lg-15,.py-lg-15{padding-bottom:120px!important}.pl-lg-15,.px-lg-15{padding-left:120px!important}.m-lg-n1{margin:-8px!important}.mt-lg-n1,.my-lg-n1{margin-top:-8px!important}.mr-lg-n1,.mx-lg-n1{margin-right:-8px!important}.mb-lg-n1,.my-lg-n1{margin-bottom:-8px!important}.ml-lg-n1,.mx-lg-n1{margin-left:-8px!important}.m-lg-n2{margin:-16px!important}.mt-lg-n2,.my-lg-n2{margin-top:-16px!important}.mr-lg-n2,.mx-lg-n2{margin-right:-16px!important}.mb-lg-n2,.my-lg-n2{margin-bottom:-16px!important}.ml-lg-n2,.mx-lg-n2{margin-left:-16px!important}.m-lg-n3{margin:-24px!important}.mt-lg-n3,.my-lg-n3{margin-top:-24px!important}.mr-lg-n3,.mx-lg-n3{margin-right:-24px!important}.mb-lg-n3,.my-lg-n3{margin-bottom:-24px!important}.ml-lg-n3,.mx-lg-n3{margin-left:-24px!important}.m-lg-n4{margin:-32px!important}.mt-lg-n4,.my-lg-n4{margin-top:-32px!important}.mr-lg-n4,.mx-lg-n4{margin-right:-32px!important}.mb-lg-n4,.my-lg-n4{margin-bottom:-32px!important}.ml-lg-n4,.mx-lg-n4{margin-left:-32px!important}.m-lg-n5{margin:-40px!important}.mt-lg-n5,.my-lg-n5{margin-top:-40px!important}.mr-lg-n5,.mx-lg-n5{margin-right:-40px!important}.mb-lg-n5,.my-lg-n5{margin-bottom:-40px!important}.ml-lg-n5,.mx-lg-n5{margin-left:-40px!important}.m-lg-n6{margin:-48px!important}.mt-lg-n6,.my-lg-n6{margin-top:-48px!important}.mr-lg-n6,.mx-lg-n6{margin-right:-48px!important}.mb-lg-n6,.my-lg-n6{margin-bottom:-48px!important}.ml-lg-n6,.mx-lg-n6{margin-left:-48px!important}.m-lg-n7{margin:-56px!important}.mt-lg-n7,.my-lg-n7{margin-top:-56px!important}.mr-lg-n7,.mx-lg-n7{margin-right:-56px!important}.mb-lg-n7,.my-lg-n7{margin-bottom:-56px!important}.ml-lg-n7,.mx-lg-n7{margin-left:-56px!important}.m-lg-n8{margin:-64px!important}.mt-lg-n8,.my-lg-n8{margin-top:-64px!important}.mr-lg-n8,.mx-lg-n8{margin-right:-64px!important}.mb-lg-n8,.my-lg-n8{margin-bottom:-64px!important}.ml-lg-n8,.mx-lg-n8{margin-left:-64px!important}.m-lg-n9{margin:-72px!important}.mt-lg-n9,.my-lg-n9{margin-top:-72px!important}.mr-lg-n9,.mx-lg-n9{margin-right:-72px!important}.mb-lg-n9,.my-lg-n9{margin-bottom:-72px!important}.ml-lg-n9,.mx-lg-n9{margin-left:-72px!important}.m-lg-n10{margin:-80px!important}.mt-lg-n10,.my-lg-n10{margin-top:-80px!important}.mr-lg-n10,.mx-lg-n10{margin-right:-80px!important}.mb-lg-n10,.my-lg-n10{margin-bottom:-80px!important}.ml-lg-n10,.mx-lg-n10{margin-left:-80px!important}.m-lg-n12{margin:-96px!important}.mt-lg-n12,.my-lg-n12{margin-top:-96px!important}.mr-lg-n12,.mx-lg-n12{margin-right:-96px!important}.mb-lg-n12,.my-lg-n12{margin-bottom:-96px!important}.ml-lg-n12,.mx-lg-n12{margin-left:-96px!important}.m-lg-n15{margin:-120px!important}.mt-lg-n15,.my-lg-n15{margin-top:-120px!important}.mr-lg-n15,.mx-lg-n15{margin-right:-120px!important}.mb-lg-n15,.my-lg-n15{margin-bottom:-120px!important}.ml-lg-n15,.mx-lg-n15{margin-left:-120px!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media(min-width:1240px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:8px!important}.mt-xl-1,.my-xl-1{margin-top:8px!important}.mr-xl-1,.mx-xl-1{margin-right:8px!important}.mb-xl-1,.my-xl-1{margin-bottom:8px!important}.ml-xl-1,.mx-xl-1{margin-left:8px!important}.m-xl-2{margin:16px!important}.mt-xl-2,.my-xl-2{margin-top:16px!important}.mr-xl-2,.mx-xl-2{margin-right:16px!important}.mb-xl-2,.my-xl-2{margin-bottom:16px!important}.ml-xl-2,.mx-xl-2{margin-left:16px!important}.m-xl-3{margin:24px!important}.mt-xl-3,.my-xl-3{margin-top:24px!important}.mr-xl-3,.mx-xl-3{margin-right:24px!important}.mb-xl-3,.my-xl-3{margin-bottom:24px!important}.ml-xl-3,.mx-xl-3{margin-left:24px!important}.m-xl-4{margin:32px!important}.mt-xl-4,.my-xl-4{margin-top:32px!important}.mr-xl-4,.mx-xl-4{margin-right:32px!important}.mb-xl-4,.my-xl-4{margin-bottom:32px!important}.ml-xl-4,.mx-xl-4{margin-left:32px!important}.m-xl-5{margin:40px!important}.mt-xl-5,.my-xl-5{margin-top:40px!important}.mr-xl-5,.mx-xl-5{margin-right:40px!important}.mb-xl-5,.my-xl-5{margin-bottom:40px!important}.ml-xl-5,.mx-xl-5{margin-left:40px!important}.m-xl-6{margin:48px!important}.mt-xl-6,.my-xl-6{margin-top:48px!important}.mr-xl-6,.mx-xl-6{margin-right:48px!important}.mb-xl-6,.my-xl-6{margin-bottom:48px!important}.ml-xl-6,.mx-xl-6{margin-left:48px!important}.m-xl-7{margin:56px!important}.mt-xl-7,.my-xl-7{margin-top:56px!important}.mr-xl-7,.mx-xl-7{margin-right:56px!important}.mb-xl-7,.my-xl-7{margin-bottom:56px!important}.ml-xl-7,.mx-xl-7{margin-left:56px!important}.m-xl-8{margin:64px!important}.mt-xl-8,.my-xl-8{margin-top:64px!important}.mr-xl-8,.mx-xl-8{margin-right:64px!important}.mb-xl-8,.my-xl-8{margin-bottom:64px!important}.ml-xl-8,.mx-xl-8{margin-left:64px!important}.m-xl-9{margin:72px!important}.mt-xl-9,.my-xl-9{margin-top:72px!important}.mr-xl-9,.mx-xl-9{margin-right:72px!important}.mb-xl-9,.my-xl-9{margin-bottom:72px!important}.ml-xl-9,.mx-xl-9{margin-left:72px!important}.m-xl-10{margin:80px!important}.mt-xl-10,.my-xl-10{margin-top:80px!important}.mr-xl-10,.mx-xl-10{margin-right:80px!important}.mb-xl-10,.my-xl-10{margin-bottom:80px!important}.ml-xl-10,.mx-xl-10{margin-left:80px!important}.m-xl-12{margin:96px!important}.mt-xl-12,.my-xl-12{margin-top:96px!important}.mr-xl-12,.mx-xl-12{margin-right:96px!important}.mb-xl-12,.my-xl-12{margin-bottom:96px!important}.ml-xl-12,.mx-xl-12{margin-left:96px!important}.m-xl-15{margin:120px!important}.mt-xl-15,.my-xl-15{margin-top:120px!important}.mr-xl-15,.mx-xl-15{margin-right:120px!important}.mb-xl-15,.my-xl-15{margin-bottom:120px!important}.ml-xl-15,.mx-xl-15{margin-left:120px!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:8px!important}.pt-xl-1,.py-xl-1{padding-top:8px!important}.pr-xl-1,.px-xl-1{padding-right:8px!important}.pb-xl-1,.py-xl-1{padding-bottom:8px!important}.pl-xl-1,.px-xl-1{padding-left:8px!important}.p-xl-2{padding:16px!important}.pt-xl-2,.py-xl-2{padding-top:16px!important}.pr-xl-2,.px-xl-2{padding-right:16px!important}.pb-xl-2,.py-xl-2{padding-bottom:16px!important}.pl-xl-2,.px-xl-2{padding-left:16px!important}.p-xl-3{padding:24px!important}.pt-xl-3,.py-xl-3{padding-top:24px!important}.pr-xl-3,.px-xl-3{padding-right:24px!important}.pb-xl-3,.py-xl-3{padding-bottom:24px!important}.pl-xl-3,.px-xl-3{padding-left:24px!important}.p-xl-4{padding:32px!important}.pt-xl-4,.py-xl-4{padding-top:32px!important}.pr-xl-4,.px-xl-4{padding-right:32px!important}.pb-xl-4,.py-xl-4{padding-bottom:32px!important}.pl-xl-4,.px-xl-4{padding-left:32px!important}.p-xl-5{padding:40px!important}.pt-xl-5,.py-xl-5{padding-top:40px!important}.pr-xl-5,.px-xl-5{padding-right:40px!important}.pb-xl-5,.py-xl-5{padding-bottom:40px!important}.pl-xl-5,.px-xl-5{padding-left:40px!important}.p-xl-6{padding:48px!important}.pt-xl-6,.py-xl-6{padding-top:48px!important}.pr-xl-6,.px-xl-6{padding-right:48px!important}.pb-xl-6,.py-xl-6{padding-bottom:48px!important}.pl-xl-6,.px-xl-6{padding-left:48px!important}.p-xl-7{padding:56px!important}.pt-xl-7,.py-xl-7{padding-top:56px!important}.pr-xl-7,.px-xl-7{padding-right:56px!important}.pb-xl-7,.py-xl-7{padding-bottom:56px!important}.pl-xl-7,.px-xl-7{padding-left:56px!important}.p-xl-8{padding:64px!important}.pt-xl-8,.py-xl-8{padding-top:64px!important}.pr-xl-8,.px-xl-8{padding-right:64px!important}.pb-xl-8,.py-xl-8{padding-bottom:64px!important}.pl-xl-8,.px-xl-8{padding-left:64px!important}.p-xl-9{padding:72px!important}.pt-xl-9,.py-xl-9{padding-top:72px!important}.pr-xl-9,.px-xl-9{padding-right:72px!important}.pb-xl-9,.py-xl-9{padding-bottom:72px!important}.pl-xl-9,.px-xl-9{padding-left:72px!important}.p-xl-10{padding:80px!important}.pt-xl-10,.py-xl-10{padding-top:80px!important}.pr-xl-10,.px-xl-10{padding-right:80px!important}.pb-xl-10,.py-xl-10{padding-bottom:80px!important}.pl-xl-10,.px-xl-10{padding-left:80px!important}.p-xl-12{padding:96px!important}.pt-xl-12,.py-xl-12{padding-top:96px!important}.pr-xl-12,.px-xl-12{padding-right:96px!important}.pb-xl-12,.py-xl-12{padding-bottom:96px!important}.pl-xl-12,.px-xl-12{padding-left:96px!important}.p-xl-15{padding:120px!important}.pt-xl-15,.py-xl-15{padding-top:120px!important}.pr-xl-15,.px-xl-15{padding-right:120px!important}.pb-xl-15,.py-xl-15{padding-bottom:120px!important}.pl-xl-15,.px-xl-15{padding-left:120px!important}.m-xl-n1{margin:-8px!important}.mt-xl-n1,.my-xl-n1{margin-top:-8px!important}.mr-xl-n1,.mx-xl-n1{margin-right:-8px!important}.mb-xl-n1,.my-xl-n1{margin-bottom:-8px!important}.ml-xl-n1,.mx-xl-n1{margin-left:-8px!important}.m-xl-n2{margin:-16px!important}.mt-xl-n2,.my-xl-n2{margin-top:-16px!important}.mr-xl-n2,.mx-xl-n2{margin-right:-16px!important}.mb-xl-n2,.my-xl-n2{margin-bottom:-16px!important}.ml-xl-n2,.mx-xl-n2{margin-left:-16px!important}.m-xl-n3{margin:-24px!important}.mt-xl-n3,.my-xl-n3{margin-top:-24px!important}.mr-xl-n3,.mx-xl-n3{margin-right:-24px!important}.mb-xl-n3,.my-xl-n3{margin-bottom:-24px!important}.ml-xl-n3,.mx-xl-n3{margin-left:-24px!important}.m-xl-n4{margin:-32px!important}.mt-xl-n4,.my-xl-n4{margin-top:-32px!important}.mr-xl-n4,.mx-xl-n4{margin-right:-32px!important}.mb-xl-n4,.my-xl-n4{margin-bottom:-32px!important}.ml-xl-n4,.mx-xl-n4{margin-left:-32px!important}.m-xl-n5{margin:-40px!important}.mt-xl-n5,.my-xl-n5{margin-top:-40px!important}.mr-xl-n5,.mx-xl-n5{margin-right:-40px!important}.mb-xl-n5,.my-xl-n5{margin-bottom:-40px!important}.ml-xl-n5,.mx-xl-n5{margin-left:-40px!important}.m-xl-n6{margin:-48px!important}.mt-xl-n6,.my-xl-n6{margin-top:-48px!important}.mr-xl-n6,.mx-xl-n6{margin-right:-48px!important}.mb-xl-n6,.my-xl-n6{margin-bottom:-48px!important}.ml-xl-n6,.mx-xl-n6{margin-left:-48px!important}.m-xl-n7{margin:-56px!important}.mt-xl-n7,.my-xl-n7{margin-top:-56px!important}.mr-xl-n7,.mx-xl-n7{margin-right:-56px!important}.mb-xl-n7,.my-xl-n7{margin-bottom:-56px!important}.ml-xl-n7,.mx-xl-n7{margin-left:-56px!important}.m-xl-n8{margin:-64px!important}.mt-xl-n8,.my-xl-n8{margin-top:-64px!important}.mr-xl-n8,.mx-xl-n8{margin-right:-64px!important}.mb-xl-n8,.my-xl-n8{margin-bottom:-64px!important}.ml-xl-n8,.mx-xl-n8{margin-left:-64px!important}.m-xl-n9{margin:-72px!important}.mt-xl-n9,.my-xl-n9{margin-top:-72px!important}.mr-xl-n9,.mx-xl-n9{margin-right:-72px!important}.mb-xl-n9,.my-xl-n9{margin-bottom:-72px!important}.ml-xl-n9,.mx-xl-n9{margin-left:-72px!important}.m-xl-n10{margin:-80px!important}.mt-xl-n10,.my-xl-n10{margin-top:-80px!important}.mr-xl-n10,.mx-xl-n10{margin-right:-80px!important}.mb-xl-n10,.my-xl-n10{margin-bottom:-80px!important}.ml-xl-n10,.mx-xl-n10{margin-left:-80px!important}.m-xl-n12{margin:-96px!important}.mt-xl-n12,.my-xl-n12{margin-top:-96px!important}.mr-xl-n12,.mx-xl-n12{margin-right:-96px!important}.mb-xl-n12,.my-xl-n12{margin-bottom:-96px!important}.ml-xl-n12,.mx-xl-n12{margin-left:-96px!important}.m-xl-n15{margin:-120px!important}.mt-xl-n15,.my-xl-n15{margin-top:-120px!important}.mr-xl-n15,.mx-xl-n15{margin-right:-120px!important}.mb-xl-n15,.my-xl-n15{margin-bottom:-120px!important}.ml-xl-n15,.mx-xl-n15{margin-left:-120px!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace!important}.text-justify{text-align:justify!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media(min-width:400px){.text-xs-left{text-align:left!important}.text-xs-right{text-align:right!important}.text-xs-center{text-align:center!important}}@media(min-width:616px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media(min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media(min-width:980px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media(min-width:1240px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-lighter{font-weight:lighter!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-weight-bolder{font-weight:bolder!important}.font-italic{font-style:italic!important}.text-primary{color:#fc0!important}a.text-primary:focus,a.text-primary:hover{color:#b38f00!important}.text-secondary{color:#212529!important}a.text-secondary:focus,a.text-secondary:hover{color:#000!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#19692c!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#0f6674!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#ba8b00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#a71d2a!important}.text-light{color:#f1f6f9!important}a.text-light:focus,a.text-light:hover{color:#bbd4e2!important}.text-dark{color:#495057!important}a.text-dark:focus,a.text-dark:hover{color:#262a2d!important}.text-primary-light{color:#fffaf0!important}a.text-primary-light:focus,a.text-primary-light:hover{color:#ffe1a4!important}.text-secondary-light{color:#fff!important}a.text-secondary-light:focus,a.text-secondary-light:hover{color:#d9d9d9!important}.text-tertiary{color:#257af4!important}a.text-tertiary:focus,a.text-tertiary:hover{color:#0a56c3!important}.text-tertiary-light{color:#e3f1fe!important}a.text-tertiary-light:focus,a.text-tertiary-light:hover{color:#99ccfb!important}.text-white{color:#fff!important}a.text-white:focus,a.text-white:hover{color:#d9d9d9!important}.text-black{color:#212529!important}a.text-black:focus,a.text-black:hover{color:#000!important}.text-blue{color:#257af4!important}a.text-blue:focus,a.text-blue:hover{color:#0a56c3!important}.text-light-blue{color:#e3f1fe!important}a.text-light-blue:focus,a.text-light-blue:hover{color:#99ccfb!important}.text-yellow{color:#fc0!important}a.text-yellow:focus,a.text-yellow:hover{color:#b38f00!important}.text-light-yellow{color:#fffaf0!important}a.text-light-yellow:focus,a.text-light-yellow:hover{color:#ffe1a4!important}.text-orange{color:#ff8c00!important}a.text-orange:focus,a.text-orange:hover{color:#b36200!important}.text-light-orange{color:#ffe4b5!important}a.text-light-orange:focus,a.text-light-orange:hover{color:#ffc869!important}.text-red{color:#ff3939!important}a.text-red:focus,a.text-red:hover{color:#ec0000!important}.text-light-red{color:#ffe4e1!important}a.text-light-red:focus,a.text-light-red:hover{color:#ff9f95!important}.text-medium{color:#d6dbdf!important}a.text-medium:focus,a.text-medium:hover{color:#abb5bd!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(33,37,41,.5)!important}.text-white-50{color:hsla(0,0%,100%,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none!important}.text-break{word-break:break-word!important;overflow-wrap:break-word!important}.text-reset{color:inherit!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,:after,:before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]:after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #d6dbdf;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}.container,body{min-width:980px!important}.navbar{display:none}.badge{border:1px solid #212529}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}.table-dark{color:inherit}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#d6dbdf}.table .thead-dark th{color:inherit;border-color:#d6dbdf}}
\ No newline at end of file
diff --git a/website/css/docs.css b/website/css/docs.css
deleted file mode 100644
index e7d41bc28bf..00000000000
--- a/website/css/docs.css
+++ /dev/null
@@ -1,155 +0,0 @@
-details {
-    background: #444451;
-    color: #eee;
-    padding: 1rem;
-    margin-bottom: 1rem;
-    margin-top: 1rem;
-}
-
-summary {
-    font-weight: bold;
-    color: #eee;
-}
-
-#sidebar {
-    position: fixed;
-    z-index: 50;
-    left: 0;
-}
-
-#toc.toc-right {
-    position: fixed;
-}
-
-#languages-dropdown .disabled {
-    color: #666 !important;
-}
-
-#search-icon {
-    width: 40px;
-}
-
-.toc-right {
-    right: 0;
-}
-
-#sidebar-nav .nav-link.active {
-    font-weight: bold;
-}
-
-.headerlink {
-    text-decoration: none !important;
-    margin-left: .5rem;
-}
-
-#content table {
-    border: 1px solid #dee2e6;
-    width: 100%;
-    margin-bottom: 1rem;
-    overflow-x: auto;
-}
-
-#content thead {
-    background: #444451;
-    color: #fff;
-}
-
-#content td, #content th {
-    padding: .75rem;
-    vertical-align: top;
-}
-
-#content td {
-    border: 1px solid #dee2e6;
-}
-
-#content th {
-    border: 1px solid #444451;
-}
-
-#content code {
-    color: #000;
-    background: #eee;
-    padding: 0.125rem 0.25rem;
-}
-
-#content code.syntax {
-    padding: 0;
-}
-
-#content pre {
-    background: #efefef;
-    padding: 1rem;
-    line-height: 1.25;
-}
-
-#toc .nav-link {
-    color: #333;
-}
-
-.toc-left, #toc.toc-left .nav-link {
-    color: #efefef;
-}
-
-#toc .nav {
-    flex-wrap: nowrap !important;
-}
-
-.toc-muted {
-    color: #888 !important;
-}
-
-#toc .nav-link:hover {
-    color: #f14600 !important;
-}
-
-@media print {
-    body {
-        min-width: 0!important;
-    }
-    h1, h2, h3, h4, h5, h6, p, li, thead, tr, th, td, img, code, pre {
-        page-break-inside: avoid !important;
-    }
-}
-
-@media (prefers-color-scheme: dark) {
-    body[data-spy], body.amp, body.blog, #to-full-website {
-        background: #1c1c1c;
-        color: #efefef;
-    }
-
-    .invert-dark {
-        filter: invert(100%);
-    }
-
-    #sidebar {
-        background: #333;
-    }
-
-    #content table {
-        border: 1px solid #2a2b2c;
-    }
-
-    #content thead {
-        background: #333;
-    }
-
-    #content td {
-        border: 1px solid #444451;
-    }
-
-    #content code {
-        background: #444;
-        color: #eee;
-        padding: 0.125rem 0.25rem;
-    }
-
-    #content pre, .blog .tag, .blog .dropdown-menu {
-        background: #444;
-        color: #eee;
-    }
-
-    #toc .nav-link {
-        color: #bbb;
-    }
-}
diff --git a/website/css/main.css b/website/css/main.css
deleted file mode 100644
index 1b4f7c48830..00000000000
--- a/website/css/main.css
+++ /dev/null
@@ -1 +0,0 @@
-@media screen and (max-width:978.98px){.btn{padding:8px 16px}}@media screen and (max-width:978.98px){.btn-lg{padding:12px 24px}}.btn-primary,.btn-primary:active,.btn-primary:hover{color:#212529}.btn-outline-primary{background:#fffaf0;border-color:#fc0;color:#212529}.btn-outline-primary:active,.btn-outline-primary:hover{background:#fc0;border-color:#fc0;color:#212529}.btn-secondary{border-color:#212529;color:#fff}.btn-outline-secondary,.btn-secondary:active,.btn-secondary:hover{background:#fff;border-color:#212529;color:#212529}.btn-outline-secondary:active,.btn-outline-secondary:hover{background:#212529;border-color:#212529;color:#fff}.btn-tertiary{border-color:#257af4;color:#fff}.btn-tertiary:active,.btn-tertiary:hover{background:#257af4;border-color:#257af4;color:#fff}.btn-outline-tertiary{background:#e3f1fe;color:#257af4}.btn-outline-tertiary:active,.btn-outline-tertiary:hover{background:#257af4;color:#fff}.btns{align-items:center;display:grid;-moz-column-gap:24px;column-gap:24px;row-gap:16px;grid-auto-flow:column;justify-content:center}@media screen and (max-width:767.98px){.btns{grid-auto-flow:row}}.btns.btns-lg{-moz-column-gap:40px;column-gap:40px}.btns.is-2{grid-template-columns:1fr 1fr}@media screen and (max-width:767.98px){.btns.is-2{grid-template-columns:1fr}}.btns.is-3{grid-template-columns:1fr 1fr 1fr}@media screen and (max-width:767.98px){.btns.is-3{grid-template-columns:1fr}}.card{box-shadow:0 8px 20px rgba(108,117,125,.2);overflow:hidden;transition:box-shadow .2s,transform .2s;width:100%}.card,.card-body{position:relative}.card-body{z-index:10}.card.is-large .card-body{padding:40px}.card.bg-primary-light{border-color:#fc0}.card.has-dark-border{border-color:#6c757d}.card.has-pattern:after,.card.has-pattern:before{background-repeat:no-repeat;background-size:auto 100%;bottom:0;content:"";display:block;position:absolute;top:0;width:72px}.card.has-pattern:before{background-image:url(../images/backgrounds/bg-card-pattern-blue-1.png);background-position:0 0;left:0}.card.has-pattern:after{background-image:url(../images/backgrounds/bg-card-pattern-blue-2.png);background-position:100% 0;right:0}.card.has-hover:active,.card.has-hover:hover,a.card:active,a.card:hover{box-shadow:0 12px 32px rgba(108,117,125,.2);transform:translateY(-8px)}.card.has-highlight:after,.card.has-hover:after,a.card:after{content:"";display:block;height:8px;margin-top:auto;transition:background .2s;width:100%}.card.has-highlight:after,.card.has-hover:active:after,.card.has-hover:hover:after,a.card:active:after,a.card:hover:after{background:#e3f1fe}.case-study-cards{-moz-column-gap:40px;column-gap:40px;display:grid;grid-template-columns:1fr;row-gap:40px;padding-bottom:40px;position:relative}.case-study-cards>div{align-items:stretch;display:flex}.case-study-cards:before{background:#d6dbdf;bottom:0;content:"";display:block;left:20px;position:absolute;top:40px;width:100vw}@media screen and (min-width:980px){.case-study-cards{grid-template-columns:repeat(2,minmax(0,1fr));row-gap:80px;padding-bottom:120px}.case-study-cards:before{left:-40px;top:120px}}.case-study-card{align-items:stretch;flex-direction:row;flex-shrink:0;left:0;transition:box-shadow .2s,left .4s,width .4s,z-index 0s;transition-delay:0s,.6s,.6s,0s;width:100%;z-index:2}@media screen and (max-width:979.98px){.case-study-card .row{min-height:0!important}}@media screen and (min-width:980px){.case-study-card:active,.case-study-card:hover{box-shadow:0 12px 32px rgba(108,117,125,.2)}.case-study-card:not(.is-open){cursor:pointer}.case-study-card.is-open{transform:none!important;transition-delay:0s,0s,0s,0s;width:calc(200% + 40px);z-index:10}.case-study-card.is-closing{z-index:10}.case-study-card.open-left.is-open{left:calc(-100% - 40px)}.case-study-card:before{background:no-repeat url(../images/backgrounds/bg-card-pattern-red.png);background-position:100%;background-size:contain;content:"";display:block;height:calc(100% - 80px);max-height:224px;max-width:234px;position:absolute;right:0;top:40px;transform:translateX(30%);transition:transform .4s;transition-delay:.6s;width:100%;z-index:1}}@media screen and (min-width:980px)and (min-width:1240px){.case-study-card:before{transform:translateX(50%)}}@media screen and (min-width:980px){.case-study-card.is-open:before{transform:translateX(70%);transition-delay:0s}}@media screen and (min-width:980px){.case-study-card-wrap{align-items:stretch;display:flex;flex-shrink:0;min-height:304px;position:relative;transition:width .4s;transition-delay:.6s;width:calc(200% + 42px);z-index:2}}@media screen and (min-width:980px){.case-study-card.is-open .case-study-card-wrap{transition-delay:0s;width:100%}}@media screen and (min-width:980px){.case-study-card-body{display:flex;flex-direction:column;padding-right:80px!important}.case-study-card-body>.row{align-self:stretch}}@media screen and (min-width:980px){.case-study-card-toggle{background:#fff;box-shadow:0 8px 20px rgba(108,117,125,.2);border-radius:100%;cursor:pointer;height:56px;position:relative;width:56px}.case-study-card-toggle:after,.case-study-card-toggle:before{background:#257af4;content:"";display:block;height:4px;left:calc(50% - 15px);position:absolute;top:calc(50% - 2px);transition:opacity .2s,transform .2s;width:30px}.case-study-card-toggle:after{transform:rotate(90deg)}}@media screen and (min-width:980px){.case-study-card.is-open .case-study-card-toggle:before{opacity:0;transform:rotate(-90deg)}}@media screen and (min-width:980px){.case-study-card.is-open .case-study-card-toggle:after{transform:rotate(0)}}@media screen and (min-width:980px){.case-study-card .col-lg-3{left:-60%;position:relative;transition:left .4s;transition-delay:.6s}}@media screen and (min-width:980px)and (min-width:980px){.case-study-card .col-lg-3{flex:0 0 250px;max-width:250px;width:250px}}@media screen and (min-width:980px){.case-study-card.is-open .col-lg-3{left:0;transition-delay:0s}}@media screen and (min-width:980px){.case-study-card .col-lg-auto{opacity:0;transform:translateX(24px);transition:opacity .4s,transform .4s;transition-delay:.2s}}@media screen and (min-width:980px)and (min-width:980px){.case-study-card .col-lg-auto{max-width:605px;width:calc(100% - 319px)}}@media screen and (min-width:980px){.case-study-card.is-open .col-lg-auto{opacity:1;transform:none;transition-delay:.2s}}.footer-copy,.footer-links{white-space:nowrap}form .form-group{position:relative}form .form-group.is-select:before{border-left:6px solid transparent;border-right:6px solid transparent;border-top:8px solid #6c757d;content:"";display:block;position:absolute;right:33px;top:calc(50% - 4px);z-index:10}form .form-control{border:1px solid #6c757d;border-radius:6px;height:auto;line-height:20px;min-height:44px;padding:12px 16px;width:100%}form .form-control,form .form-control:focus{box-shadow:0 8px 20px rgba(108,117,125,.2);color:#212529}form .form-control:focus{border-color:#212529}form .form-control::-moz-placeholder{color:#6c757d}form .form-control:-ms-input-placeholder{color:#6c757d}form .form-control::placeholder{color:#6c757d}form select.form-control{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding-right:24px;white-space:pre-wrap}form select.form-control:not([data-chosen]){color:#6c757d}form .btn-secondary:active,form .btn-secondary:hover{color:#212529;background:#fc0;border-color:#fc0}.hero{overflow:visible;position:relative}.hero,.hero-bg{background-repeat:no-repeat;background-position:50%;background-size:cover}.hero-bg{display:block;height:100%;left:50%;position:absolute;top:0;transform:translateX(-50%);z-index:1}.hero>.container{position:relative;z-index:2}.hero.has-offset{margin-bottom:-160px;padding-bottom:160px}.base-hero{height:22.5vw;max-height:324px;min-height:280px}.index-hero{background-image:url(/images/backgrounds/bg-hero-home.svg);height:68vw;max-height:980px}.index-hero,.other-hero{max-width:2448px;width:170vw}.other-hero{background-image:url(/images/backgrounds/bg-hero.svg)}.bg-footer-cta{background-image:url(/images/backgrounds/bg-footer-cta.svg);width:2448px}.quickstart-bg{background-image:url(/images/backgrounds/bg-quick-start.svg);height:40vw;top:220px;width:170vw}hr{background:#f1f6f9;border:0;display:block;height:4px;margin:0;width:100%}hr.is-small{height:2px}hr.is-large{height:8px}hr.is-medium{background:#d6dbdf}hr.is-dark{background:#495057}hr.is-yellow{background:linear-gradient(90deg,#ff8c00,#ff8c00 8px,#fc0 16px,rgba(255,204,0,0));-webkit-clip-path:polygon(8px 100%,0 100%,0 0,8px 0,8px 100%,16px 100%,16px 0,100% 0,100% 100%);clip-path:polygon(8px 100%,0 100%,0 0,8px 0,8px 100%,16px 100%,16px 0,100% 0,100% 100%);height:8px}.icon{display:block;height:48px;margin-bottom:24px;-o-object-fit:contain;object-fit:contain;-o-object-position:center;object-position:center}@media screen and (min-width:576px){.icon{height:64px}}@media screen and (min-width:980px){.icon{height:80px}}img{max-width:100%}.kicker{color:#6c757d;font-family:Hind Siliguri,sans-serif;font-size:.875rem;font-weight:600;letter-spacing:1px;margin:0}@media screen and (max-width:978.98px){.lead{font-size:1.125rem}}.logo{display:block;height:36px;max-width:220px;-o-object-fit:contain;object-fit:contain;-o-object-position:center;object-position:center;width:100%}.navbar-clickhouse{border-bottom:4px solid #f1f6f9;height:142px}.navbar-clickhouse>.container{flex-wrap:wrap}.navbar-super{flex-shrink:0;width:100%}.navbar-super ul{list-style:none}.navbar-super li:not(:last-child){margin-bottom:0;margin-right:24px}.navbar-super a{align-items:center;color:#212529;display:flex;font-size:.875rem}.navbar-super a:active,.navbar-super a:hover{color:#257af4;text-decoration:none}.navbar-super img{flex-shrink:0;margin-right:4px}.navbar-brand-clickhouse{background:no-repeat url(../images/logo-clickhouse.svg);background-size:contain;flex-shrink:0;height:28px;margin-right:48px;padding:0;width:180px}.navbar-nav{align-items:center;height:46px}.navbar .nav-item:not(:last-child){margin-bottom:0;margin-right:24px}.navbar .nav-link{color:#212529}.navbar .nav-link:active,.navbar .nav-link:hover{color:#257af4}.navbar .navbar-nav{flex-direction:row}@media screen and (max-width:978.98px){.navbar>.container{padding-left:20px;padding-right:20px}.navbar .navbar-toggler{height:24px;padding:0;width:24px}.navbar .navbar-toggler:focus{outline:none}.navbar .navbar-toggler-icon{background:no-repeat url(../images/icons/icon-menu.svg);background-position:50%;background-size:contain;height:24px;width:24px}.navbar .navbar-collapse{background:#fff;border-bottom:4px solid #f1f6f9;height:56px;left:0;padding:0 20px 16px;position:absolute;right:0;top:100%}.navbar .nav-link{font-size:.875rem;white-space:nowrap}}@media screen and (max-width:615.98px){.navbar .navbar-collapse{height:auto}.navbar .navbar-nav{flex-direction:column;height:auto}.navbar .nav-item:not(:last-child){margin-bottom:16px;margin-right:0}}@media screen and (max-width:399.98px){.navbar{height:80px}}@media screen and (min-width:616px){.navbar.py-1+div .anchor-fixer :target{scroll-margin-top:62px}}@media screen and (min-width:616px){.navbar.py-2+div .anchor-fixer :target{scroll-margin-top:78px}}@media screen and (min-width:616px){.navbar.py-3+div .anchor-fixer :target{scroll-margin-top:94px}}@media screen and (min-width:616px){.navbar.py-4+div .anchor-fixer :target{scroll-margin-top:110px}}@media screen and (min-width:616px){.navbar.py-5+div .anchor-fixer :target{scroll-margin-top:126px}}@media screen and (min-width:616px){.navbar.py-6+div .anchor-fixer :target{scroll-margin-top:142px}}@media screen and (min-width:616px){.navbar.py-7+div .anchor-fixer :target{scroll-margin-top:158px}}@media screen and (min-width:616px){.navbar.py-8+div .anchor-fixer :target{scroll-margin-top:174px}}@media screen and (max-width:615.98px){.navbar+div .anchor-fixer :target{scroll-margin-top:73px}}@media screen and (max-width:399.98px){.navbar+div .anchor-fixer :target{scroll-margin-top:80px}}.photo-frame{background:hsla(0,0%,100%,.6);border-radius:100%;box-shadow:0 8px 20px rgba(108,117,125,.2);display:block;margin-bottom:24px;max-width:160px;position:relative}.photo-frame:before{content:"";display:block;padding-bottom:100%;width:100%}.photo-frame img{display:block;height:100%;left:0;-o-object-fit:contain;object-fit:contain;-o-object-position:center;object-position:center;position:absolute;top:0;width:100%}.pullquote{position:relative;width:70%}.pullquote:before{background:no-repeat url(../images/backgrounds/bg-quotes.svg);background-position:50%;background-size:100%;content:"";mix-blend-mode:multiply;right:56px;width:calc(100% - 16px);z-index:2}.pullquote-bg,.pullquote:before{bottom:0;display:block;position:absolute;top:0}.pullquote-bg{right:0;width:calc(50vw + 28.57143%);z-index:1}.pullquote-body{padding:64px 40px 64px 0;position:relative;z-index:3}.pullquote-quote{font-family:Hind Siliguri,sans-serif;font-size:32px;font-weight:700}.pullquote-citation{font-size:1.125rem}.section{overflow:visible;position:relative}.section,.section-bg{background-repeat:no-repeat;background-position:50%;background-size:cover}.section-bg{display:block;height:100%;left:50%;position:absolute;top:0;transform:translateX(-50%);z-index:1}.section>.container{position:relative;z-index:2}.severity-table th{background:#f1f6f9;font-size:.875rem;padding:8px 16px}.severity-table td{border-top:1px solid #d6dbdf;padding:16px}.social-icons{align-items:center;display:flex}.social-icons>a{aspect-ratio:24/24;background:#6c757d;display:block;height:24px;width:24px;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;transition:background .2s}.social-icons>a:active,.social-icons>a:hover{background:#212529}.social-icons>a+a{margin-left:32px}.social-icons-facebook{-webkit-mask-image:url(/images/icons/icon-facebook-gray.svg);mask-image:url(/images/icons/icon-facebook-gray.svg)}.social-icons-twitter{-webkit-mask-image:url(/images/icons/icon-twitter-gray.svg);mask-image:url(/images/icons/icon-twitter-gray.svg);width:31px}.social-icons-linkedin{-webkit-mask-image:url(/images/icons/icon-linkedin-gray.svg);mask-image:url(/images/icons/icon-linkedin-gray.svg)}.social-icons-linkedin-alt{-webkit-mask-image:url(/images/icons/icon-linkedin-alt-gray.svg);mask-image:url(/images/icons/icon-linkedin-alt-gray.svg)}.social-icons.size-small>a{height:20px;width:20px}.social-icons.size-small>a:active,.social-icons.size-small>a:hover{background:#212529}.social-icons.size-small>a+a{margin-left:16px}.tabs{position:relative}.tabs:before{background:#fff;border-radius:7px 7px 0 0;content:"";display:block;height:8px;left:1px;position:absolute;right:1px;top:68px;z-index:10}@media screen and (min-width:1240px){.tabs:before{top:76px}}.tabs-body{background:#fff;border-radius:8px;border:1px solid #6c757d;box-shadow:0 8px 20px rgba(108,117,125,.2);padding:24px}@media screen and (min-width:980px){.tabs-body{padding:32px}}@media screen and (min-width:1240px){.tabs-body{padding:40px}}.tabs .nav-tabs{border-bottom:0;flex-wrap:nowrap;height:76px;margin:-20px -20px -9px;-webkit-mask-image:linear-gradient(90deg,transparent,#000 20px,#000 calc(100% - 20px),transparent);mask-image:linear-gradient(90deg,transparent,#000 20px,#000 calc(100% - 20px),transparent);overflow:scroll;overflow-x:scroll;overflow-y:visible;padding:20px 20px 0;position:relative}@media screen and (min-width:940px){.tabs .nav-tabs{overflow:visible}}@media screen and (min-width:1240px){.tabs .nav-tabs{height:84px}}.tabs .nav-link{align-items:center;border-bottom:0;color:#6c757d;display:flex;font-size:.875rem;flex-shrink:0;height:56px;justify-content:center;padding:0 12px 8px;text-align:center;white-space:nowrap}@media screen and (min-width:1240px){.tabs .nav-link{height:64px;padding:0 16px 8px}}.tabs .nav-link.active{background:#fff;box-shadow:0 -4px 8px rgba(108,117,125,.1);font-weight:700;padding:0 16px 8px}@media screen and (min-width:980px){.tabs .nav-link.active{padding:0 24px 8px}}@media screen and (min-width:1240px){.tabs .nav-link.active{padding:0 32px 8px}}.tab-pane pre{background:#212529;border-radius:16px;color:#fff;padding:24px 16px}@media screen and (min-width:1240px){.tab-pane pre{padding:32px 24px}}.trailing-link{align-items:center;color:#212529;display:flex;font-size:.875rem;font-weight:700}.trailing-link:after{background:no-repeat url(../images/icons/icon-arrow.svg);background-position:100%;background-size:contain;content:"";display:block;height:12px;transition:transform .2s;width:20px}.trailing-link:active,.trailing-link:hover{color:#212529;text-decoration:none}.trailing-link:active:after,.trailing-link:hover:after{transform:translateX(8px)}.trailing-link.span-full:after{margin-left:auto}ul{list-style-type:square;padding-left:1.25em}ul li:not(:last-child){margin-bottom:16px}ul li::marker{color:#ff3939}ul.has-separators{list-style:none;padding:0}ul.has-separators li:not(:last-child){border-bottom:4px solid #f1f6f9;margin-bottom:24px;padding-bottom:24px}.bg-gradient-secondary{background-image:linear-gradient(58deg,#ff6443 3%,#fe561d 24%,#e32f0d 93%)}.bg-gradient-light-orange{background-image:linear-gradient(90deg,rgba(255,203,128,0),#ffcb80)}.bg-offset-right{bottom:0;left:-24px;position:absolute;top:0;width:calc(100vw + 24px);z-index:-1}@media screen and (min-width:1240px){.bg-offset-right{left:-96px;width:calc(100vw + 96px)}}.bg-inset-right{bottom:0;left:40px;position:absolute;top:0;width:calc(100vw - 40px);z-index:-1}@media screen and (min-width:980px){.bg-inset-right{left:96px;width:calc(100vw - 96px)}}.has-border-left{border-left:8px solid #f1f6f9;padding-left:16px}.font-xl{font-size:1.25rem}.font-lg{font-size:1.125rem}.font-sm{font-size:.875rem}.font-xs{font-size:.625rem}.font-weight-semibold{font-weight:600}.display-5{color:#212529;font-size:20px;font-weight:500}.display-6{color:#212529;font-size:14px;font-weight:700}.overflow-auto{overflow:auto}.text-decoration-underline{text-decoration:underline}.text-upper{text-transform:uppercase}
\ No newline at end of file
diff --git a/website/favicon.ico b/website/favicon.ico
deleted file mode 100644
index 82a0c175833..00000000000
Binary files a/website/favicon.ico and /dev/null differ
diff --git a/website/google419fbd824d7ff97d.html b/website/google419fbd824d7ff97d.html
deleted file mode 100644
index b7e25cf48cc..00000000000
--- a/website/google419fbd824d7ff97d.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: google419fbd824d7ff97d.html
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-card-pattern-blue-1.png b/website/images/backgrounds/bg-card-pattern-blue-1.png
deleted file mode 100644
index b15958adcb1..00000000000
Binary files a/website/images/backgrounds/bg-card-pattern-blue-1.png and /dev/null differ
diff --git a/website/images/backgrounds/bg-card-pattern-blue-2.png b/website/images/backgrounds/bg-card-pattern-blue-2.png
deleted file mode 100644
index a0bf1a9f752..00000000000
Binary files a/website/images/backgrounds/bg-card-pattern-blue-2.png and /dev/null differ
diff --git a/website/images/backgrounds/bg-card-pattern-red.png b/website/images/backgrounds/bg-card-pattern-red.png
deleted file mode 100644
index 84f781590e6..00000000000
Binary files a/website/images/backgrounds/bg-card-pattern-red.png and /dev/null differ
diff --git a/website/images/backgrounds/bg-footer-cta.svg b/website/images/backgrounds/bg-footer-cta.svg
deleted file mode 100644
index d3a89339800..00000000000
--- a/website/images/backgrounds/bg-footer-cta.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="2448" height="432" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:#fff"><defs><linearGradient x1="50%" y1="5.387%" x2="7.925%" y2="92.027%" id="c"><stop stop-color="#F9FBFD" offset="0%"/><stop stop-color="#F1F6F9" offset="100%"/></linearGradient><linearGradient x1="100%" y1="51.29%" x2="46.829%" y2="50%" id="d"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.974%" x2="0%" y2="49.026%" id="e"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="52.688%" x2="0%" y2="47.312%" id="f"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.075%" x2="0%" y2="49.925%" id="g"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="53.995%" x2="0%" y2="46.005%" id="h"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="174.731%" y1="44.617%" x2="39.814%" y2="50%" id="i"><stop stop-color="#FC0" stop-opacity=".5" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="41.708%" x2="50%" y2="50%" id="j"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="0%" y1="45.225%" x2="100%" y2="45.225%" id="l"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="58.268%" gradientTransform="matrix(0 1 -.83643 0 .918 0)" id="k"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" offset="67.349%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></radialGradient><path id="a" d="M0 0h2440v432H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v432H0z"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g transform="translate(-102.53 -434)"><path fill="#F1F6F9" d="m910.393 42.766 280.178 401.785h51.753V42.766z"/><path fill="url(#c)" d="M1454.914 42.766 1304.35 444.55h60.387l364.967-401.785z"/><path fill="#F1F6F9" d="M404.005 116.997V42.766h215.782L1163.73 444.55h-99.023zM1971.115 42.766 1432.546 444.55h-68.271L1860.29 42.766zM2080.643 67.526 1450.85 444.55h99.557l530.236-249.26zM404.005 1170.053v-29.1l641.914-407.38v6.246zM40.143 777.895-.001 643l1045.92-80.68v36.91zM404.005 1240.003v-35.749l641.914-449.535v7.447z"/><path fill="#E3F1FE" d="M404.005 1121.728v-34.717l641.914-353.437v21.145z"/><path fill="#F1F6F9" d="M404.005 1092.392v-34.716l641.914-344.008v21.145z"/><path stroke="#212529" stroke-width="4.193" stroke-linecap="round" d="m571.921 519.073-209.388-15.732"/><path stroke="url(#d)" stroke-width="4" stroke-linecap="round" d="m326.533 424.551 363.631 58.419"/><path fill="#F1F6F9" d="M500.727 1300h-96.722v-33.122l641.914-483.792v4.88z"/><path fill="#E3F1FE" d="M510.27 1243.866H559.9l486.02-449.729v-7.28z"/><path fill="#F1F6F9" d="m537.253 1300 508.666-498.297v20.886L606.515 1300zM1108.891 1300h-38.07l118.984-457.171h9.533zM690.648 1300h259.057l203.112-457.171h-100.61z"/><path fill="#E3F1FE" d="m1023.785 1300 149.672-457.171h20.54L1070.82 1300z"/><path fill="#F1F6F9" d="m1205.88 1300 28.8-457.171h14.117L1259.772 1300zM1323.541 1300 1265.1 842.829h87.477L1559.838 1300z"/><path fill="#E3F1FE" d="m1631.19 1300-253.687-457.171h14.457L1691.684 1300z"/><path fill="#F1F6F9" d="m1737.126 1300-315.57-457.171h16.719L1779.916 1300zM1828.814 1300l-370.629-457.171h56.593L2025.242 1300z"/><path fill="#E3F1FE" d="M1746.45 1148.382h60.518l-316.816-305.553h-18.72z"/><path fill="#F1F6F9" d="m2080.643 1295.81-530.87-452.981h21.622l509.248 318.638z"/><path fill="#E3F1FE" d="M2005.468 1190.69h68.007l-513.637-347.861h-14.631z"/><path fill="#F1F6F9" d="M1610.137 693.209v149.62l470.506 274.392 209.297-205.83z"/><path fill="#E3F1FE" d="M2080.643 1117.221v-45.807l-448-228.585h-22.506z"/><path fill="#F1F6F9" d="m2578.576 708.117 9.977-176.054-978.416 70.972v56.775z"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1610.137 498.34 503.443-178.173"/><path stroke="url(#e)" stroke-width="4" stroke-linecap="round" d="m1828.809 709.768 266.153 37.145"/><path stroke="url(#f)" stroke-width="4" stroke-linecap="round" d="m1830.992 528.692 261.787-60.703"/><path stroke="url(#g)" stroke-width="4" stroke-linecap="round" d="m871.533 562.321-435.448-16.852"/><path d="M863.48 722.628 444.138 841.162" stroke="url(#h)" stroke-width="4" stroke-linecap="round"/><path d="M1174.48 276.628 755.138 395.162" stroke="url(#i)" stroke-width="4" stroke-linecap="round" transform="rotate(47 964.809 335.895)"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1741.714 774.678 401.515 177.135"/><path stroke="#F1F6F9" stroke-width="4" stroke-linecap="round" d="m391.431 763.066 313.998-66.714"/><path stroke="url(#j)" stroke-width="4" stroke-linecap="round" d="m738.059 813.797-346.628 141.16"/><ellipse fill="url(#k)" cx="1326.533" cy="688.5" rx="860" ry="563.5"/></g></g><path fill="url(#l)" mask="url(#b)" transform="matrix(-1 0 0 1 4690 0)" d="M2242 0h206v799h-206z"/><path fill="url(#l)" mask="url(#b)" d="M0-184h206v799H0z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-hero-home.svg b/website/images/backgrounds/bg-hero-home.svg
deleted file mode 100644
index 5df2ea819d6..00000000000
--- a/website/images/backgrounds/bg-hero-home.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="2448" height="980" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:#fff"><defs><linearGradient x1="50%" y1="5.387%" x2="7.925%" y2="92.027%" id="c"><stop stop-color="#F9FBFD" offset="0%"/><stop stop-color="#F1F6F9" offset="100%"/></linearGradient><linearGradient x1="100%" y1="58.669%" x2="50%" y2="50%" id="d"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="51.29%" x2="46.829%" y2="50%" id="e"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.974%" x2="0%" y2="49.026%" id="f"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="52.688%" x2="0%" y2="47.312%" id="g"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.075%" x2="0%" y2="49.925%" id="h"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="53.995%" x2="0%" y2="46.005%" id="i"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="174.731%" y1="44.617%" x2="39.814%" y2="50%" id="j"><stop stop-color="#FC0" stop-opacity=".5" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="41.708%" x2="50%" y2="50%" id="k"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="50%" y2="71.743%" id="l"><stop stop-color="#F8F9FA" stop-opacity="0" offset="0%"/><stop stop-color="#FFF" offset="100%"/></linearGradient><linearGradient x1="0%" y1="45.225%" x2="100%" y2="45.225%" id="n"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="58.268%" gradientTransform="matrix(0 1 -.86232 0 .931 0)" id="m"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" offset="67.349%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></radialGradient><path id="a" d="M0 0h2448v980H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v980H0z"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g transform="translate(-32.69 -169)"><path fill="#F1F6F9" d="M840.551 42.766 1120.73 444.55h51.753V42.766z"/><path fill="url(#c)" d="M1385.072 42.766 1234.508 444.55h60.387l364.967-401.785z"/><path fill="#F1F6F9" d="M334.163 116.997V42.766h215.782l543.943 401.785h-99.023zM1901.273 42.766 1362.704 444.55h-68.271l496.016-401.785zM2010.802 67.526 1381.008 444.55h99.557l643.831-302.47zM334.163 1170.053v-29.1l641.915-407.38v6.246zM0 772.227V636.48l976.078-74.16v36.91zM334.163 1240.003v-35.749l641.915-449.535v7.447z"/><path fill="#E3F1FE" d="M334.163 1121.728v-34.717l641.915-353.437v21.145z"/><path fill="#F1F6F9" d="M334.163 1092.392v-34.716l641.915-344.008v21.145z"/><path stroke="#212529" stroke-width="4.193" stroke-linecap="round" d="m502.08 519.073-209.389-15.732"/><path stroke="url(#d)" stroke-width="4" stroke-linecap="round" d="m435.791 271.35 354.531 147.62"/><path stroke="url(#e)" stroke-width="4" stroke-linecap="round" d="m256.691 424.551 363.631 58.419"/><path fill="#F1F6F9" d="M430.885 1300h-96.722v-33.122l641.915-483.792v4.88z"/><path fill="#E3F1FE" d="M440.429 1243.866h49.628l486.02-449.729v-7.28z"/><path fill="#F1F6F9" d="m467.41 1300 508.668-498.297v20.886L536.673 1300zM1039.05 1300h-38.07l118.983-457.171h9.534zM620.807 1300h259.056l203.112-457.171h-100.61z"/><path fill="#E3F1FE" d="m953.944 1300 149.67-457.171h20.541L1000.98 1300z"/><path fill="#F1F6F9" d="m1136.038 1300 28.8-457.171h14.117L1189.93 1300zM1253.7 1300l-58.443-457.171h87.477L1489.996 1300z"/><path fill="#E3F1FE" d="m1561.349 1300-253.688-457.171h14.457L1621.843 1300z"/><path fill="#F1F6F9" d="m1667.285 1300-315.572-457.171h16.72L1710.074 1300zM1758.972 1300l-370.629-457.171h56.593L1955.4 1300z"/><path fill="#E3F1FE" d="M1676.609 1148.382h60.518L1420.31 842.829h-18.72z"/><path fill="#F1F6F9" d="m2010.802 1295.81-530.87-452.981h21.62l509.25 318.638z"/><path fill="#E3F1FE" d="M1935.626 1190.69h68.007l-513.637-347.861h-14.63z"/><path fill="#F1F6F9" d="M1540.295 693.209v149.62l470.507 274.392 476.694-114.616z"/><path fill="#E3F1FE" d="M2010.802 1117.221v-45.807l-448-228.585h-22.507z"/><path fill="#F1F6F9" d="m2518.71 707.768-5.425-172.963-972.99 68.23v56.775z"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="M1516.717 339.289 2025.12 0M1540.295 498.34l503.443-178.173"/><path stroke="url(#f)" stroke-width="4" stroke-linecap="round" d="m1758.967 709.768 266.153 37.145"/><path stroke="url(#g)" stroke-width="4" stroke-linecap="round" d="m1761.15 528.692 261.787-60.703"/><path stroke="url(#h)" stroke-width="4" stroke-linecap="round" d="m801.691 562.321-435.448-16.852"/><path d="M793.639 722.628 374.295 841.162" stroke="url(#i)" stroke-width="4" stroke-linecap="round"/><path d="M1104.639 276.628 685.295 395.162" stroke="url(#j)" stroke-width="4" stroke-linecap="round" transform="rotate(47 894.967 335.895)"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1671.872 774.678 401.515 177.135M863.642 243.658 632.443 21.112"/><path stroke="#FC0" stroke-width="4" stroke-linecap="round" d="m1281.983 199.578 25.678-114.798"/><path stroke="#F1F6F9" stroke-width="4" stroke-linecap="round" d="m321.589 763.066 313.998-66.714"/><path stroke="url(#k)" stroke-width="4" stroke-linecap="round" d="m668.217 813.797-346.628 141.16"/><path fill="url(#l)" d="M32.69 649h2448v500h-2448z"/><ellipse fill="url(#m)" cx="1256.202" cy="608" rx="649.877" ry="439"/></g></g><path fill="url(#n)" d="M0 0h206v980H0z"/><path fill="url(#n)" transform="matrix(-1 0 0 1 4690 0)" d="M2242 0h206v980h-206z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-hero.svg b/website/images/backgrounds/bg-hero.svg
deleted file mode 100644
index a3dd0df7beb..00000000000
--- a/website/images/backgrounds/bg-hero.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="2448" height="336" xmlns="http://www.w3.org/2000/svg"><g fill="#FFE4B5" fill-rule="evenodd"><path d="M1248 336v-48h1200v48zM1463 253v-48h985v48zM1248 176v-48h1200v48zM1246 96V48h356v48z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-quick-start.svg b/website/images/backgrounds/bg-quick-start.svg
deleted file mode 100644
index c68b8f94788..00000000000
--- a/website/images/backgrounds/bg-quick-start.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="2448" height="576" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="50%" x2="100%" y2="50%" id="a"><stop stop-color="#FF8C00" offset="0%"/><stop stop-color="#FFC000" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="0%" y1="50%" x2="50%" y2="50%" id="b"><stop stop-color="#FF8C00" offset="0%"/><stop stop-color="#FFC000" stop-opacity="0" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v576H0z"/><path fill="#FFFAF0" d="M0 56h2448v480H0z"/><path fill="url(#a)" opacity=".797" style="mix-blend-mode:multiply" d="M504 240h720v320H504z" transform="translate(0 16)"/><path fill="url(#b)" opacity=".797" style="mix-blend-mode:multiply" transform="rotate(-180 1584 88)" d="M1224 0h720v160h-720z"/><path fill="#FF8C00" opacity=".8" style="mix-blend-mode:multiply" d="M1944 0h504v160h-504zM0 240h504v320H0z" transform="translate(0 16)"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-quotes.svg b/website/images/backgrounds/bg-quotes.svg
deleted file mode 100644
index 2bab82c0d75..00000000000
--- a/website/images/backgrounds/bg-quotes.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="700" height="320" version="1.1" viewBox="0 0 700 320"><title>Artboard</title><g id="Artboard" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Quote-Panel-BG" fill="#FF8C00"><path id="Combined-Shape" d="M577.058824,0 L577.058824,96.5483699 L576.887,96.548 L576.880049,97.4482487 C576.317392,132.334805 548.290575,160.5098 513.587495,161.075432 L512.523092,161.084101 L512.523092,117.946846 C524.315884,117.946846 533.886494,108.382248 533.977629,96.5487133 L480,96.5483699 L480,0 L577.058824,0 Z"/><path id="Combined-Shape" d="M700,0 L700,96.5483699 L699.828176,96.548 L699.821226,97.4482487 C699.258568,132.334805 671.231751,160.5098 636.528671,161.075432 L635.464269,161.084101 L635.464269,117.946846 C647.257061,117.946846 656.82767,108.382248 656.918806,96.5487133 L602.941176,96.5483699 L602.941176,0 L700,0 Z"/><path id="Combined-Shape" d="M220,159 L220,255.54837 L219.828176,255.548 L219.821226,256.448249 C219.258568,291.334805 191.231751,319.5098 156.528671,320.075432 L155.464269,320.084101 L155.464269,276.946846 C167.257061,276.946846 176.82767,267.382248 176.918806,255.548713 L122.941176,255.54837 L122.941176,159 L220,159 Z" transform="translate(171.470588, 239.500000) scale(-1, 1) translate(-171.470588, -239.500000)"/><path id="Combined-Shape" d="M97.0588235,159 L97.0588235,255.54837 L96.887,255.548 L96.8800492,256.448249 C96.3173916,291.334805 68.2905748,319.5098 33.587495,320.075432 L32.5230924,320.084101 L32.5230924,276.946846 C44.3158844,276.946846 53.8864936,267.382248 53.9776294,255.548713 L-7.10542736e-15,255.54837 L-7.10542736e-15,159 L97.0588235,159 Z" transform="translate(48.529412, 239.500000) scale(-1, 1) translate(-48.529412, -239.500000)"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/clickhouse-209x60.png b/website/images/clickhouse-209x60.png
deleted file mode 100644
index 0ba3ae8893b..00000000000
Binary files a/website/images/clickhouse-209x60.png and /dev/null differ
diff --git a/website/images/clickhouse-3069x1531.png b/website/images/clickhouse-3069x1531.png
deleted file mode 100644
index f143c1d1518..00000000000
Binary files a/website/images/clickhouse-3069x1531.png and /dev/null differ
diff --git a/website/images/clickhouse-black.svg b/website/images/clickhouse-black.svg
deleted file mode 100644
index a0a607dc0b2..00000000000
--- a/website/images/clickhouse-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66.12 10.29"><defs><style>.a{fill:#231f20}</style></defs><title>ClickHouse</title><path d="M58.54,74.8a5,5,0,0,1-1.88-.34,4.26,4.26,0,0,1-1.48-1,4.46,4.46,0,0,1-1-1.55,6.32,6.32,0,0,1,0-4.21,4.39,4.39,0,0,1,2.58-2.57,5.36,5.36,0,0,1,1.93-.34,5.84,5.84,0,0,1,1.56.18,6.38,6.38,0,0,1,1.2.46l-0.36,1.13A5.17,5.17,0,0,0,60,66a4.23,4.23,0,0,0-1.43-.22,3.07,3.07,0,0,0-2.35,1.06,3.81,3.81,0,0,0-.72,1.27,5.17,5.17,0,0,0-.27,1.73,5.35,5.35,0,0,0,.25,1.69,3.61,3.61,0,0,0,.69,1.25,2.88,2.88,0,0,0,1.06.77,3.49,3.49,0,0,0,1.38.27,4,4,0,0,0,1.27-.2A5.71,5.71,0,0,0,61,73.09l0.35,0.85a3.86,3.86,0,0,1-1.12.59A5,5,0,0,1,58.54,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M64.07,64.51V74.66H62.88V64.51h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M66.64,66.55a0.71,0.71,0,0,1-.76-0.74,0.78,0.78,0,0,1,.2-0.55,0.79,0.79,0,0,1,1.1,0,0.77,0.77,0,0,1,.21.55,0.72,0.72,0,0,1-.21.53A0.74,0.74,0,0,1,66.64,66.55Zm0.6,1.06v7H66.06v-7h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M72.29,74.8a3.78,3.78,0,0,1-1.37-.25,3.08,3.08,0,0,1-1.11-.72,3.45,3.45,0,0,1-.74-1.15,4.48,4.48,0,0,1,0-3.08,3.35,3.35,0,0,1,.76-1.15A3.19,3.19,0,0,1,71,67.72a4,4,0,0,1,1.41-.25,4.68,4.68,0,0,1,1.13.13,2.68,2.68,0,0,1,.84.35L74,69a4,4,0,0,0-.79-0.47,2.32,2.32,0,0,0-.92-0.16,2.28,2.28,0,0,0-.88.17,2,2,0,0,0-.73.52,2.52,2.52,0,0,0-.49.85A3.5,3.5,0,0,0,70,71.11a2.8,2.8,0,0,0,.66,2,2.4,2.4,0,0,0,1.79.67,3,3,0,0,0,1.62-.52l0.27,0.88a2.89,2.89,0,0,1-.89.45A3.88,3.88,0,0,1,72.29,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M77,64.51V74.66H75.79V64.51H77ZM80.1,74.66L77.16,70.9l2.9-3.28H81.3l-2.87,3.14,3.07,3.9H80.1Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M89.17,70.34h-5v4.31H82.88V64.93h1.29v4.44h5V64.93h1.29v9.73H89.17V70.34Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M95.55,74.8a3.49,3.49,0,0,1-1.3-.25,3.11,3.11,0,0,1-1.08-.71,3.44,3.44,0,0,1-.73-1.15,4.6,4.6,0,0,1,0-3.12,3.36,3.36,0,0,1,.73-1.14,3.16,3.16,0,0,1,1.08-.71,3.49,3.49,0,0,1,1.3-.25,3.55,3.55,0,0,1,1.31.25,3.22,3.22,0,0,1,1.09.71,3.39,3.39,0,0,1,.75,1.14,4.49,4.49,0,0,1,0,3.12A3.47,3.47,0,0,1,98,73.84a3.16,3.16,0,0,1-1.09.71A3.55,3.55,0,0,1,95.55,74.8Zm0-.91a2.37,2.37,0,0,0,.82-0.15,1.79,1.79,0,0,0,.71-0.48,2.48,2.48,0,0,0,.5-0.86,3.79,3.79,0,0,0,.19-1.27,3.73,3.73,0,0,0-.19-1.27,2.48,2.48,0,0,0-.5-0.85,1.79,1.79,0,0,0-.71-0.48,2.37,2.37,0,0,0-.82-0.15,2.25,2.25,0,0,0-.8.15,1.82,1.82,0,0,0-.69.48,2.4,2.4,0,0,0-.49.85,3.86,3.86,0,0,0-.18,1.27,3.92,3.92,0,0,0,.18,1.27,2.4,2.4,0,0,0,.49.86,1.81,1.81,0,0,0,.69.48A2.25,2.25,0,0,0,95.55,73.89Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M104.21,74.39a2.69,2.69,0,0,1-1.55.41,2.15,2.15,0,0,1-1.58-.6,2.49,2.49,0,0,1-.6-1.84V67.61h1.2v4.75a2.14,2.14,0,0,0,.1.7,1.08,1.08,0,0,0,.28.45,1,1,0,0,0,.42.24,1.82,1.82,0,0,0,.52.07,2,2,0,0,0,1.27-.38,3,3,0,0,0,.82-1V67.61h1.19v7h-1.05l-0.11-1.26h0A2.5,2.5,0,0,1,104.21,74.39Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M110.11,74.8a7.07,7.07,0,0,1-.9,0,5.45,5.45,0,0,1-.67-0.13,3.23,3.23,0,0,1-.51-0.17,3.55,3.55,0,0,1-.4-0.21l0.39-1a1.88,1.88,0,0,0,.28.19,3.34,3.34,0,0,0,.45.21,3.64,3.64,0,0,0,.61.18,3.74,3.74,0,0,0,.75.07,1.87,1.87,0,0,0,1.15-.3,1,1,0,0,0,.39-0.83,0.87,0.87,0,0,0-.32-0.71,3.35,3.35,0,0,0-1.11-.5l-0.86-.29a3,3,0,0,1-.73-0.38,1.8,1.8,0,0,1-.52-0.58,1.76,1.76,0,0,1-.2-0.88A1.68,1.68,0,0,1,108.6,68a3.23,3.23,0,0,1,1.89-.48,5.65,5.65,0,0,1,1.25.12,4.16,4.16,0,0,1,.84.27l-0.28,1a6.73,6.73,0,0,0-.7-0.3,3.05,3.05,0,0,0-1.06-.16,2.36,2.36,0,0,0-1.09.21,0.79,0.79,0,0,0-.41.77,0.73,0.73,0,0,0,.13.43,1.11,1.11,0,0,0,.34.31,2.48,2.48,0,0,0,.5.23l0.6,0.18,0.81,0.27a2.74,2.74,0,0,1,.72.39,1.74,1.74,0,0,1,.71,1.5,1.91,1.91,0,0,1-.23,1,2,2,0,0,1-.61.66,2.6,2.6,0,0,1-.87.38A4.33,4.33,0,0,1,110.11,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M119.76,74.05a3,3,0,0,1-1,.53,4.15,4.15,0,0,1-1.37.21,3.35,3.35,0,0,1-2.58-1,3.82,3.82,0,0,1-.9-2.71,4.38,4.38,0,0,1,.25-1.53,3.42,3.42,0,0,1,.69-1.15,2.91,2.91,0,0,1,1-.72,3.34,3.34,0,0,1,1.28-.25,3.2,3.2,0,0,1,1.28.25,2.31,2.31,0,0,1,.94.73,2.75,2.75,0,0,1,.5,1.2,5,5,0,0,1,0,1.66h-4.76q0.08,2.51,2.37,2.51a3.11,3.11,0,0,0,1.08-.17,4.26,4.26,0,0,0,.88-0.44Zm-2.59-5.74a1.77,1.77,0,0,0-1.29.54,2.71,2.71,0,0,0-.68,1.62h3.57a2.18,2.18,0,0,0-.37-1.63A1.53,1.53,0,0,0,117.17,68.31Z" class="a" transform="translate(-53.86 -64.51)"/></svg>
\ No newline at end of file
diff --git a/website/images/clickhouse-logomark.png b/website/images/clickhouse-logomark.png
deleted file mode 100644
index d521c8147f7..00000000000
Binary files a/website/images/clickhouse-logomark.png and /dev/null differ
diff --git a/website/images/clickhouse-white.svg b/website/images/clickhouse-white.svg
deleted file mode 100644
index 2d4c795abe8..00000000000
--- a/website/images/clickhouse-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66.12 10.29"><defs><style>.a{fill:#fff}</style></defs><title>ClickHouse white</title><path d="M58.54,74.8a5,5,0,0,1-1.88-.34,4.26,4.26,0,0,1-1.48-1,4.46,4.46,0,0,1-1-1.55,6.32,6.32,0,0,1,0-4.21,4.39,4.39,0,0,1,2.58-2.57,5.36,5.36,0,0,1,1.93-.34,5.84,5.84,0,0,1,1.56.18,6.38,6.38,0,0,1,1.2.46l-0.36,1.13A5.17,5.17,0,0,0,60,66a4.23,4.23,0,0,0-1.43-.22,3.07,3.07,0,0,0-2.35,1.06,3.81,3.81,0,0,0-.72,1.27,5.17,5.17,0,0,0-.27,1.73,5.35,5.35,0,0,0,.25,1.69,3.61,3.61,0,0,0,.69,1.25,2.88,2.88,0,0,0,1.06.77,3.49,3.49,0,0,0,1.38.27,4,4,0,0,0,1.27-.2A5.71,5.71,0,0,0,61,73.09l0.35,0.85a3.86,3.86,0,0,1-1.12.59A5,5,0,0,1,58.54,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M64.07,64.51V74.66H62.88V64.51h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M66.64,66.55a0.71,0.71,0,0,1-.76-0.74,0.78,0.78,0,0,1,.2-0.55,0.79,0.79,0,0,1,1.1,0,0.77,0.77,0,0,1,.21.55,0.72,0.72,0,0,1-.21.53A0.74,0.74,0,0,1,66.64,66.55Zm0.6,1.06v7H66.06v-7h1.19Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M72.29,74.8a3.78,3.78,0,0,1-1.37-.25,3.08,3.08,0,0,1-1.11-.72,3.45,3.45,0,0,1-.74-1.15,4.48,4.48,0,0,1,0-3.08,3.35,3.35,0,0,1,.76-1.15A3.19,3.19,0,0,1,71,67.72a4,4,0,0,1,1.41-.25,4.68,4.68,0,0,1,1.13.13,2.68,2.68,0,0,1,.84.35L74,69a4,4,0,0,0-.79-0.47,2.32,2.32,0,0,0-.92-0.16,2.28,2.28,0,0,0-.88.17,2,2,0,0,0-.73.52,2.52,2.52,0,0,0-.49.85A3.5,3.5,0,0,0,70,71.11a2.8,2.8,0,0,0,.66,2,2.4,2.4,0,0,0,1.79.67,3,3,0,0,0,1.62-.52l0.27,0.88a2.89,2.89,0,0,1-.89.45A3.88,3.88,0,0,1,72.29,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M77,64.51V74.66H75.79V64.51H77ZM80.1,74.66L77.16,70.9l2.9-3.28H81.3l-2.87,3.14,3.07,3.9H80.1Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M89.17,70.34h-5v4.31H82.88V64.93h1.29v4.44h5V64.93h1.29v9.73H89.17V70.34Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M95.55,74.8a3.49,3.49,0,0,1-1.3-.25,3.11,3.11,0,0,1-1.08-.71,3.44,3.44,0,0,1-.73-1.15,4.6,4.6,0,0,1,0-3.12,3.36,3.36,0,0,1,.73-1.14,3.16,3.16,0,0,1,1.08-.71,3.49,3.49,0,0,1,1.3-.25,3.55,3.55,0,0,1,1.31.25,3.22,3.22,0,0,1,1.09.71,3.39,3.39,0,0,1,.75,1.14,4.49,4.49,0,0,1,0,3.12A3.47,3.47,0,0,1,98,73.84a3.16,3.16,0,0,1-1.09.71A3.55,3.55,0,0,1,95.55,74.8Zm0-.91a2.37,2.37,0,0,0,.82-0.15,1.79,1.79,0,0,0,.71-0.48,2.48,2.48,0,0,0,.5-0.86,3.79,3.79,0,0,0,.19-1.27,3.73,3.73,0,0,0-.19-1.27,2.48,2.48,0,0,0-.5-0.85,1.79,1.79,0,0,0-.71-0.48,2.37,2.37,0,0,0-.82-0.15,2.25,2.25,0,0,0-.8.15,1.82,1.82,0,0,0-.69.48,2.4,2.4,0,0,0-.49.85,3.86,3.86,0,0,0-.18,1.27,3.92,3.92,0,0,0,.18,1.27,2.4,2.4,0,0,0,.49.86,1.81,1.81,0,0,0,.69.48A2.25,2.25,0,0,0,95.55,73.89Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M104.21,74.39a2.69,2.69,0,0,1-1.55.41,2.15,2.15,0,0,1-1.58-.6,2.49,2.49,0,0,1-.6-1.84V67.61h1.2v4.75a2.14,2.14,0,0,0,.1.7,1.08,1.08,0,0,0,.28.45,1,1,0,0,0,.42.24,1.82,1.82,0,0,0,.52.07,2,2,0,0,0,1.27-.38,3,3,0,0,0,.82-1V67.61h1.19v7h-1.05l-0.11-1.26h0A2.5,2.5,0,0,1,104.21,74.39Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M110.11,74.8a7.07,7.07,0,0,1-.9,0,5.45,5.45,0,0,1-.67-0.13,3.23,3.23,0,0,1-.51-0.17,3.55,3.55,0,0,1-.4-0.21l0.39-1a1.88,1.88,0,0,0,.28.19,3.34,3.34,0,0,0,.45.21,3.64,3.64,0,0,0,.61.18,3.74,3.74,0,0,0,.75.07,1.87,1.87,0,0,0,1.15-.3,1,1,0,0,0,.39-0.83,0.87,0.87,0,0,0-.32-0.71,3.35,3.35,0,0,0-1.11-.5l-0.86-.29a3,3,0,0,1-.73-0.38,1.8,1.8,0,0,1-.52-0.58,1.76,1.76,0,0,1-.2-0.88A1.68,1.68,0,0,1,108.6,68a3.23,3.23,0,0,1,1.89-.48,5.65,5.65,0,0,1,1.25.12,4.16,4.16,0,0,1,.84.27l-0.28,1a6.73,6.73,0,0,0-.7-0.3,3.05,3.05,0,0,0-1.06-.16,2.36,2.36,0,0,0-1.09.21,0.79,0.79,0,0,0-.41.77,0.73,0.73,0,0,0,.13.43,1.11,1.11,0,0,0,.34.31,2.48,2.48,0,0,0,.5.23l0.6,0.18,0.81,0.27a2.74,2.74,0,0,1,.72.39,1.74,1.74,0,0,1,.71,1.5,1.91,1.91,0,0,1-.23,1,2,2,0,0,1-.61.66,2.6,2.6,0,0,1-.87.38A4.33,4.33,0,0,1,110.11,74.8Z" class="a" transform="translate(-53.86 -64.51)"/><path d="M119.76,74.05a3,3,0,0,1-1,.53,4.15,4.15,0,0,1-1.37.21,3.35,3.35,0,0,1-2.58-1,3.82,3.82,0,0,1-.9-2.71,4.38,4.38,0,0,1,.25-1.53,3.42,3.42,0,0,1,.69-1.15,2.91,2.91,0,0,1,1-.72,3.34,3.34,0,0,1,1.28-.25,3.2,3.2,0,0,1,1.28.25,2.31,2.31,0,0,1,.94.73,2.75,2.75,0,0,1,.5,1.2,5,5,0,0,1,0,1.66h-4.76q0.08,2.51,2.37,2.51a3.11,3.11,0,0,0,1.08-.17,4.26,4.26,0,0,0,.88-0.44Zm-2.59-5.74a1.77,1.77,0,0,0-1.29.54,2.71,2.71,0,0,0-.68,1.62h3.57a2.18,2.18,0,0,0-.37-1.63A1.53,1.53,0,0,0,117.17,68.31Z" class="a" transform="translate(-53.86 -64.51)"/></svg>
\ No newline at end of file
diff --git a/website/images/curl.svg b/website/images/curl.svg
deleted file mode 100644
index e694f5d5e82..00000000000
--- a/website/images/curl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="111" height="70" fill="none" viewBox="0 0 111 70"><path fill="#F14600" d="M67.3198 0.959506C67.4924 0.96748 67.6363 0.974118 67.8076 1.01082C70.126 1.37706 71.9328 3.44725 72.682 6.56272C73.2135 8.77555 73.5999 11.0105 73.8424 13.2387C76.7404 14.7835 80.1201 15.8898 83.7252 16.4882C92.1398 17.8271 100.87 16.0996 108.373 11.609C109.054 11.2086 109.938 11.4222 110.339 12.1029C110.74 12.7837 110.526 13.6664 109.844 14.0668C101.777 18.9057 92.3202 20.7723 83.2479 19.3167C79.9854 18.7916 76.858 17.841 74.0631 16.5601C74.3551 23.3112 73.3263 29.9437 70.9901 36.1703C67.7363 44.7731 62.0783 52.3723 54.6303 58.1612C47.1822 63.95 38.4205 67.6051 29.2583 68.708C19.5454 69.8717 9.796 68.0969 1.04043 63.5462C0.337163 63.1682 0.0593615 62.3204 0.437963 61.618C0.816556 60.9157 1.66559 60.6382 2.36886 61.0162C10.5885 65.3117 19.7665 66.9738 28.8999 65.8697C37.5403 64.8291 45.831 61.3826 52.8315 55.9186C59.8607 50.4559 65.1822 43.273 68.2682 35.1808C70.6686 28.8132 71.6204 21.9756 71.05 15.0101C68.3011 13.3571 65.9738 11.3204 64.3202 9.05577C62.775 6.94009 62.4776 4.65169 63.5385 2.91552C64.378 1.60102 65.795 0.889069 67.3198 0.959506ZM70.648 11.2484C70.4504 9.91481 70.1665 8.57721 69.8539 7.23828C69.3966 5.28802 68.4456 4.03478 67.3289 3.86802C66.785 3.78532 66.2852 3.99256 66.035 4.4129C65.5989 5.11258 65.866 6.19028 66.7059 7.35201C67.7364 8.75289 69.0875 10.0822 70.648 11.2484Z"/></svg>
\ No newline at end of file
diff --git a/website/images/dots.svg b/website/images/dots.svg
deleted file mode 100644
index 39272c1470d..00000000000
--- a/website/images/dots.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="92" height="73" fill="none" viewBox="0 0 92 73"><path fill="#F14600" fill-opacity=".2" d="M89.4292 5.50578C90.7234 5.50578 91.7725 4.45718 91.7725 3.16366C91.7725 1.87014 90.7234 0.821533 89.4292 0.821533C88.1351 0.821533 87.0859 1.87014 87.0859 3.16366C87.0859 4.45718 88.1351 5.50578 89.4292 5.50578Z"/><path fill="#F14600" fill-opacity=".2" d="M89.4292 26.1166C90.7234 26.1166 91.7725 25.068 91.7725 23.7745C91.7725 22.481 90.7234 21.4324 89.4292 21.4324C88.1351 21.4324 87.0859 22.481 87.0859 23.7745C87.0859 25.068 88.1351 26.1166 89.4292 26.1166Z"/><path fill="#F14600" fill-opacity=".2" d="M89.4292 46.7269C90.7234 46.7269 91.7725 45.6783 91.7725 44.3848C91.7725 43.0913 90.7234 42.0427 89.4292 42.0427C88.1351 42.0427 87.0859 43.0913 87.0859 44.3848C87.0859 45.6783 88.1351 46.7269 89.4292 46.7269Z"/><path fill="#F14600" fill-opacity=".2" d="M89.4292 67.3375C90.7234 67.3375 91.7725 66.2889 91.7725 64.9954C91.7725 63.7019 90.7234 62.6533 89.4292 62.6533C88.1351 62.6533 87.0859 63.7019 87.0859 64.9954C87.0859 66.2889 88.1351 67.3375 89.4292 67.3375Z"/><path fill="#F14600" fill-opacity=".2" d="M68.8111 5.50578C70.1052 5.50578 71.1543 4.45718 71.1543 3.16366C71.1543 1.87014 70.1052 0.821533 68.8111 0.821533C67.5169 0.821533 66.4678 1.87014 66.4678 3.16366C66.4678 4.45718 67.5169 5.50578 68.8111 5.50578Z"/><path fill="#F14600" fill-opacity=".2" d="M68.8111 26.1161C70.1052 26.1161 71.1543 25.0675 71.1543 23.774C71.1543 22.4805 70.1052 21.4319 68.8111 21.4319C67.5169 21.4319 66.4678 22.4805 66.4678 23.774C66.4678 25.0675 67.5169 26.1161 68.8111 26.1161Z"/><path fill="#F14600" fill-opacity=".2" d="M68.8111 46.7272C70.1052 46.7272 71.1543 45.6786 71.1543 44.3851C71.1543 43.0916 70.1052 42.043 68.8111 42.043C67.5169 42.043 66.4678 43.0916 66.4678 44.3851C66.4678 45.6786 67.5169 46.7272 68.8111 46.7272Z"/><path fill="#F14600" fill-opacity=".2" d="M68.8111 67.3375C70.1052 67.3375 71.1543 66.2889 71.1543 64.9954C71.1543 63.7019 70.1052 62.6533 68.8111 62.6533C67.5169 62.6533 66.4678 63.7019 66.4678 64.9954C66.4678 66.2889 67.5169 67.3375 68.8111 67.3375Z"/><path fill="#F14600" fill-opacity=".2" d="M48.1871 5.50578C49.4812 5.50578 50.5304 4.45718 50.5304 3.16366C50.5304 1.87014 49.4812 0.821533 48.1871 0.821533C46.8929 0.821533 45.8438 1.87014 45.8438 3.16366C45.8438 4.45718 46.8929 5.50578 48.1871 5.50578Z"/><path fill="#F14600" fill-opacity=".2" d="M48.1871 26.1163C49.4812 26.1163 50.5304 25.0677 50.5304 23.7742C50.5304 22.4807 49.4812 21.4321 48.1871 21.4321C46.8929 21.4321 45.8438 22.4807 45.8438 23.7742C45.8438 25.0677 46.8929 26.1163 48.1871 26.1163Z"/><path fill="#F14600" fill-opacity=".2" d="M48.1871 46.7269C49.4812 46.7269 50.5304 45.6783 50.5304 44.3848C50.5304 43.0913 49.4812 42.0427 48.1871 42.0427C46.8929 42.0427 45.8438 43.0913 45.8438 44.3848C45.8438 45.6783 46.8929 46.7269 48.1871 46.7269Z"/><path fill="#F14600" fill-opacity=".2" d="M48.1871 67.3375C49.4812 67.3375 50.5304 66.2889 50.5304 64.9954C50.5304 63.7019 49.4812 62.6533 48.1871 62.6533C46.8929 62.6533 45.8438 63.7019 45.8438 64.9954C45.8438 66.2889 46.8929 67.3375 48.1871 67.3375Z"/><path fill="#F14600" fill-opacity=".2" d="M27.566 5.50578C28.8601 5.50578 29.9093 4.45718 29.9093 3.16366C29.9093 1.87014 28.8601 0.821533 27.566 0.821533C26.2718 0.821533 25.2227 1.87014 25.2227 3.16366C25.2227 4.45718 26.2718 5.50578 27.566 5.50578Z"/><path fill="#F14600" fill-opacity=".2" d="M27.566 26.1161C28.8601 26.1161 29.9093 25.0675 29.9093 23.774C29.9093 22.4805 28.8601 21.4319 27.566 21.4319C26.2718 21.4319 25.2227 22.4805 25.2227 23.774C25.2227 25.0675 26.2718 26.1161 27.566 26.1161Z"/><path fill="#F14600" fill-opacity=".2" d="M27.566 46.7272C28.8601 46.7272 29.9093 45.6786 29.9093 44.3851C29.9093 43.0916 28.8601 42.043 27.566 42.043C26.2718 42.043 25.2227 43.0916 25.2227 44.3851C25.2227 45.6786 26.2718 46.7272 27.566 46.7272Z"/><path fill="#F14600" fill-opacity=".2" d="M27.566 67.3375C28.8601 67.3375 29.9093 66.2889 29.9093 64.9954C29.9093 63.7019 28.8601 62.6533 27.566 62.6533C26.2718 62.6533 25.2227 63.7019 25.2227 64.9954C25.2227 66.2889 26.2718 67.3375 27.566 67.3375Z"/><path fill="#F14600" fill-opacity=".2" d="M6.94437 5.50578C8.23854 5.50578 9.28767 4.45718 9.28767 3.16366C9.28767 1.87014 8.23854 0.821533 6.94437 0.821533C5.65021 0.821533 4.60107 1.87014 4.60107 3.16366C4.60107 4.45718 5.65021 5.50578 6.94437 5.50578Z"/><path fill="#F14600" fill-opacity=".2" d="M6.94389 26.1166C8.23805 26.1166 9.28719 25.068 9.28719 23.7745C9.28719 22.481 8.23805 21.4324 6.94389 21.4324C5.64972 21.4324 4.60059 22.481 4.60059 23.7745C4.60059 25.068 5.64972 26.1166 6.94389 26.1166Z"/><path fill="#F14600" fill-opacity=".2" d="M6.94389 46.7269C8.23805 46.7269 9.28719 45.6783 9.28719 44.3848C9.28719 43.0913 8.23805 42.0427 6.94389 42.0427C5.64972 42.0427 4.60059 43.0913 4.60059 44.3848C4.60059 45.6783 5.64972 46.7269 6.94389 46.7269Z"/><path fill="#F14600" fill-opacity=".2" d="M6.94389 67.3375C8.23805 67.3375 9.28719 66.2889 9.28719 64.9954C9.28719 63.7019 8.23805 62.6533 6.94389 62.6533C5.64972 62.6533 4.60059 63.7019 4.60059 64.9954C4.60059 66.2889 5.64972 67.3375 6.94389 67.3375Z"/></svg>
\ No newline at end of file
diff --git a/website/images/flags/en.svg b/website/images/flags/en.svg
deleted file mode 100644
index b1dab887bcf..00000000000
--- a/website/images/flags/en.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="0 0 60 30"><clipPath id="t"><path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/></clipPath><path fill="#00247d" d="M0,0 v30 h60 v-30 z"/><path stroke="#fff" stroke-width="6" d="M0,0 L60,30 M60,0 L0,30"/><path stroke="#cf142b" stroke-width="4" d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)"/><path stroke="#fff" stroke-width="10" d="M30,0 v30 M0,15 h60"/><path stroke="#cf142b" stroke-width="6" d="M30,0 v30 M0,15 h60"/></svg>
\ No newline at end of file
diff --git a/website/images/flags/es.svg b/website/images/flags/es.svg
deleted file mode 100644
index d859aa650b2..00000000000
--- a/website/images/flags/es.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="750" height="500"><path fill="#c60b1e" d="M0 0h750v500H0z"/><path fill="#ffc400" d="M0 125h750v250H0z"/><g stroke="#000" stroke-width=".39"><g stroke-width=".26"><path d="M167.99 222.24c-8.943-3.634 2.42-9.829 7.69-7.92 4.54-1.233 15.064 2.852 8.589 7.703-5.347-.29-10.902-1.228-16.279.217z" fill="#ad1519" stroke-linejoin="round"/><g fill="#c8b100"><path d="M177.04 215.68c.568 2.35-2.664 3.51-2.71.669-.87-1.87 1.823-4.765 2.56-1.803.103.368.15.752.15 1.134z"/><path d="M176.32 215.68c.298.866-.676 3.5-1.141 1.43-.128-.914-.494-3.78.75-3.548.35.637.37 1.408.391 2.118z"/><path d="M176.61 213.04c-.24 2.025-3.164-.096-1.179-.838.544-.159 1.188.247 1.179.838z" stroke="none"/><path d="M176.96 212.74c-2.644 2.146-2.287-1.206-1.675-1.89 2.48-1.687-.547 2.32 1.675 1.89z" stroke-width=".3"/><path d="M175.94 212.2c2.019.783-1.037 2.865-1.178.786.02-.377.318-.698.678-.786" fill="none"/><path d="M175.68 222.08c-4.813 1.322-4.923-1.651-6.346-5.128-3.956-6.246 4.585 4.347 8.346 2.318 2.794-5.233 8.907-5.743 3.24-.072.455 4.054-2.412 2.695-5.24 2.882z"/><path d="M167.55 215.44c2.182-.207 3.556 2.244 4.73 3.74m11.55-3.74c-2.182-.206-3.551 2.249-4.73 3.74" fill="none"/></g><g id="a" fill="#c8b100"><path d="M168.58 224.25c-.505-4.809 22.063-.177 10.866.031-3.285-1.06-8.633.979-10.866-.031z"/><path d="M175.67 226.73c5.201.965 10.329-2.779 1.957-2.591-4.954-1.34-13.678 2.326-3.798 2.523zM183.48 222.08c-3.28-1.384-7.234-1.22-10.469-.999-4.87-.078-6.828 2.3.51.682 3.17-.594 7.643.945 9.959.317z"/><path d="M175.69 219.49c2.517 2.57 4.611-.353 7.18 1.6 5.282 1.158-2.314.733-5.86.52-2.928-1.005-11.186 1.44-10.15-.12 2.922-.228 3.43-1.516 6.21-1.22.109.295 2.4 1.503 2.62-.78z"/><path d="M175.67 222.23c-2.87-.042-12.553 1.597-4.338-.265 4.434-1.497 19.164 2.235 6.534.336l-1.082-.051z" stroke-linejoin="round"/><path d="M165.43 221c-3.15-1.859.814-1.968 0 0z"/><path d="M167.32 220.22c-.668 2.491-3.53-.68 0 0z"/><path d="M165.45 220.75c1.58-.082.106 1.54 0 0zM168.02 220.88c.226-1.42 1.024 1.035 0 0zM168.67 220.04c1.909 1.712 2.673-2.632 0 0z"/><path d="M170.08 217.76c-2.192 2.17 3.125 2.401 0 0z"/><path d="M172.36 219.3c-1.047 2.292-3.511-1.356 0 0z"/><path d="M171 219.65c-.754 1.55-1.437-1.273-.053-.213.034.065.053.139.053.213zM172.87 219.95c.46-1.333.81 1.164 0 0zM173.78 219.24c1.435 2.067 3.277-2.1 0 0z"/><path d="M175.66 217.15c-2.876 1.837 2.78 3.002 0 0z"/><path d="M177.55 219.24c-1.578 2.032-3.061-2.024 0 0z"/><path d="M176.16 219.21c-.754 1.55-1.437-1.273-.053-.213.034.065.053.139.053.213zM178.5 219.95c-.476-1.326-.815 1.159 0 0zM178.99 219.3c1.047 2.292 3.511-1.356 0 0z"/><path d="M181.27 217.76c2.192 2.17-3.125 2.401 0 0z"/><path d="M182.68 220.04c-1.877 1.744-2.725-2.692 0 0z"/><path d="M181.34 219.65c-.754 1.55-1.437-1.273-.053-.213.035.065.053.139.053.213zM183.34 220.88c-.226-1.42-1.024 1.035 0 0zM185.73 221c3.157-1.855-.828-1.966 0 0z"/><path d="M183.84 220.22c.61 2.47 3.592-.661 0 0z"/><path d="M185.74 220.75c-1.61-.072-.07 1.541 0 0z"/></g><g id="b" fill="none"><path d="M168.05 224.3c.813-1.694 1.565.75 0 0z" fill="#ad1519"/><path d="M170.85 223.81c-3.234-.075 2.718-1.494 0 0z" fill="#058e6e"/><path d="M173.63 223.3c-.38 1.219-1.519-.656-.229-.36.134.067.23.208.229.36z" fill="#fff"/><path d="M175.7 223.48c-4.854-1.034 4.717-.6 0 0z" fill="#ad1519"/><path d="M178.6 223.3c-.38 1.219-1.519-.656-.229-.36.134.067.23.208.229.36z" fill="#fff"/><path d="M180.5 223.81c3.234-.075-2.718-1.494 0 0z" fill="#058e6e"/><path d="M183.24 224.33c-.593-1.755-1.67.555 0 0z" fill="#ad1519"/><path d="M175.66 226.16c-4.37.24-8.62-1.13-1.775-1.297 3.919-.523 11.856 1.026 3.557 1.256z" fill="#ad1519" stroke-linejoin="round"/><path d="M176.8 226.08v-1.16m-.58 1.2l.01-1.23m-.43 1.25v-1.26" stroke-width=".01"/><path d="M175.44 226.15v-1.27" stroke-width=".02"/><path d="M175.09 226.15v-1.27" stroke-width=".03"/><path d="M174.77 226.15v-1.27M174.44 226.15v-1.27" stroke-width=".04"/><path d="M174.16 226.15v-1.27" stroke-width=".05"/><path d="M173.61 226.08l-.01-1.15m.27 1.17v-1.21" stroke-width=".06"/><path d="M173.1 226.03v-1.06m.26 1.09l-.01-1.13" stroke-width=".07"/><path d="M172.42 225.97v-.93m.23.94V225m.23 1.02V225" stroke-width=".08"/><path d="M172.19 225.96v-.9" stroke-width=".09"/><path d="M171.97 225.92v-.85" stroke-width=".1"/><path d="M171.73 225.89v-.78" stroke-width=".11"/><path d="M171.24 225.82l-.009-.535-.001-.085m.26.66V225.16M170.99 225.77v-.55" stroke-width=".12"/><path d="M170.76 225.73v-.46" stroke-width=".13"/><path d="M170.51 225.67v-.36" stroke-width=".14"/><path d="M170.26 225.64v-.27" stroke-width=".15"/><path d="M169.99 225.58v-.13" stroke-width=".18"/></g></g><g id="c"><g fill="#005bbf"><path d="M191.28 330.68c-8.527-3.28-16.86 1.553-25.465-1.48-4.996-.69-8.69 5.893-1.735 3.01 7.225-.451 14.224 1.29 21.527-.596 2.223.513 6.742 3.505 5.673-.934z"/><path d="M191.28 333.09c-8.528-3.293-16.859 1.558-25.465-1.485-4.994-.685-8.691 5.898-1.735 3.015 7.225-.448 14.223 1.286 21.527-.595 2.217.528 6.745 3.494 5.673-.935z" fill="#ccc"/><path d="M191.28 335.5c-8.53-3.288-16.86 1.556-25.465-1.485-4.989-.683-8.692 5.891-1.735 3.005 7.23-.423 14.224 1.282 21.527-.581 2.214.505 6.74 3.487 5.673-.939z"/><path d="M191.26 340.32c-8.518-3.28-16.848 1.55-25.445-1.48-4.999 4.044-8.684-1.625-1.735-1.82 7.23-.423 14.224 1.282 21.527-.581 2.164 1.793 6.825-.006 5.653 3.881z" fill="#ccc"/><path d="M191.26 342.73c-8.52-3.287-16.846 1.553-25.445-1.485-4.987 4.049-8.69-1.614-1.735-1.805 7.228-.443 14.222 1.284 21.527-.591 2.153 1.788 6.823.009 5.653 3.881z"/></g><g fill="#c8b100"><path d="M166.92 320.78c-2.3 4.477-2.56 3.014 2.67 3.25h17.59c-2.556-3.243-5.334-3.68-10.116-3.19-3.379-.044-6.773.086-10.144-.06z" stroke-linejoin="round"/><path d="M167.33 319.27c5.792.158 11.68-.312 17.414.229-.725 2.749-6.469.715-9.285 1.341-2.648-.652-8.314 1.451-8.849-1.341zM164.27 329.86h22.87c.369-3.739.491-7.232-4.28-5.83h-18.59v5.83z"/></g><path d="M167.55 318.32h16.25v-79.63h-16.25v79.63z" fill="#ccc"/><path d="M179.13 238.8v79.46m1.83-79.46v79.46" fill="none"/><g fill="#c8b100"><path d="M164.58 232.37h22.29c.365-3.739.496-7.243-4.28-5.84h-18.01v5.84z"/><path d="M166.92 236.26c5.839-.107 11.723-.133 17.56.01.75-4.19-4.05-2.07-7.941-2.57-3.118-.028-6.787.056-9.589-.04 1.274.326 1.205 2.277-.03 2.6z" stroke-linejoin="round"/><path d="M167.33 236.19c5.792.158 11.68-.312 17.414.229-.722 2.75-6.469.715-9.285 1.341-2.648-.652-8.317 1.452-8.849-1.341zM167.33 232.37c5.8.134 11.671-.266 17.429.195-.957 2.374-6.473.573-9.29 1.135-2.647-.59-8.086 1.285-8.859-1.135z"/></g></g><g id="d" fill="#ad1519"><path d="M162.48 298.62c-7.766 1.519.937 7.95 1.058 8.226 2.077-2.417 1.53-6.396-1.058-8.226z"/><path d="M200.4 268.47c-12.87-4.202-28.638-4.176-39.851 4.131-1.03 6.87-8.494-10.238-.91-10.59 12.368-6.451 27.427-7.086 40.721-3.361l.04 9.82z" stroke-linejoin="round"/><path d="M167.52 278.47c-7.565 1.923-10.69-8.496-2.049-7.888 3.859-1.169 1.35 5.858 2.049 7.888zM183.83 272.38c10.217-1.502 3.314 8.8-.026 6.76.01-2.253.017-4.507.026-6.76z"/><path d="M157.42 293.83c5.08-6.162 14.629-6.78 21.39-10.942 4.08-.176 11.058-9.014 11.388-7.06 4.476 10.04-7.573 13.983-14.545 17.4-5.428.517-15.404 8.218-17.018 7.124-.404-2.174-.814-4.348-1.215-6.522z" stroke-linejoin="round"/></g><g stroke-width=".26"><path d="M324.85 220.42c-3.41.305-6.92 2.69-10.089.397.754-6.879 14.532-3.865 20.11-2.67 1.622 5.296-4.782 3.263-7.227 2.944-.814-.429-1.954.92-2.794-.671z" fill="#ad1519" stroke-width=".27"/><g fill="#c8b100"><path d="M326.2 216.2c-.498 4.853-5.14-1.273-1.242-1.95.87.156 1.245 1.166 1.242 1.95z"/><path d="M325.48 216.2c.356 1.11-.998 2.74-1.191.821-.491-.86.456-3.922 1.091-1.799.07.32.1.65.1.978z"/><path d="M325.77 213.95c-.237 2.046-3.167-.098-1.179-.848.548-.161 1.19.256 1.179.848z" stroke="none"/><path d="M326.13 213.64c-2.64 2.138-2.289-1.192-1.675-1.88 1.638-1.537.407 1.45 1.23 1.88z" stroke-width=".3"/><path d="M325.11 213.12c2 .843-1.119 2.868-1.2.765.03-.374.33-.69.69-.775" fill="none"/></g><g fill="none" stroke-width=".21"><path d="M314.41 219.99c-1.092-2.346 1.715-4.997 3.98-3.59" stroke-width=".26" stroke-linecap="round"/><path d="M319.48 217.93c-1.33-2.288 2.45-3.74 4-2.47M330.17 217.96c1.228-2.329-2.42-3.763-4.03-2.5" stroke-width=".26"/><path d="M335.21 219.99c1.066-2.351-1.716-4.997-3.99-3.59" stroke-width=".26" stroke-linecap="round"/><path d="M314.02 218.68c-.983 1.68-1.262-1.585 0 0zM314.19 217.1c-.983 1.68-1.262-1.585 0 0zM315.21 215.9c-.983 1.68-1.262-1.585 0 0zM316.56 215.25c-.983 1.68-1.262-1.585 0 0zM318 215.31c-.983 1.68-1.262-1.585 0 0z"/><path d="M318.88 217.08c-.983 1.68-1.262-1.585 0 0z" fill="#fff"/><path d="M319.13 215.58c-.983 1.68-1.262-1.585 0 0zM320.26 214.64c-.983 1.68-1.262-1.585 0 0zM321.68 214.19c-.983 1.68-1.262-1.585 0 0zM323.12 214.24c-.983 1.68-1.262-1.585 0 0zM327.39 214.24c-.983 1.68-1.262-1.585 0 0zM328.84 214.19c-.983 1.68-1.262-1.585 0 0zM330.25 214.64c-.983 1.68-1.262-1.585 0 0zM331.38 215.58c-.983 1.68-1.262-1.585 0 0z"/><path d="M331.63 217.08c-.983 1.68-1.262-1.585 0 0z" fill="#fff"/><path d="M332.51 215.31c-.983 1.68-1.262-1.585 0 0zM333.96 215.25c-.983 1.68-1.262-1.585 0 0zM335.31 215.9c-.983 1.68-1.262-1.585 0 0zM336.33 217.1c-.983 1.68-1.262-1.585 0 0z"/><path d="M336.5 218.68c-.983 1.68-1.262-1.585 0 0z"/></g><use x="149.17" xlink:href="#a"/><use x="149.17" xlink:href="#b"/></g><use x="149.17" xlink:href="#c"/><use transform="matrix(-1 0 0 1 500.57 0)" xlink:href="#d"/><g fill="#c8b100" stroke="none"><path d="M166.42 264.65c8.803-3.818-6.767-5.817-1.816.196.483 4.09 4.235 3.847 1.816-.196zm-1.18-2.91c4.61-1.312.942 5.689 0 0z"/><path d="M172.78 259.22c-2.749-.5-1.389 8.415 1.768 6.198 5.387-.855-3.37-.645-1.68-5.809zM181.56 264.63c2.152-3.68 3.266-10.338.369-2.994-.154 2.962-5.507-7.762-4.072-1.632 1.47 1.033 1.48 5.171 3.703 4.626zM190.72 259.8c-1.378-4.553-7.398 2.07-1.12 3.74-2.46.748-5.816-.339-.563 1.337 6.303-1.08-5.556-7.702 1.503-5.097zM310.3 264.98c1.825-3.838 2.3-10.562.098-3.007.115 2.976-6.195-7.287-4.21-1.295 1.562.89 1.942 5.054 4.112 4.302zM316.48 258.16c-2.765-.818-3.245 8.315.785 6.428 4.619.27-3.587-1.106-.785-6.428zM323.52 259.21c7.723-.286-9.524-1.606-1.76-.14-1.59 3.693 1.167 8.94 1.524 2.713l.236-2.573zM326.01 265.53c3.06.31 2.195-4.81 3.92.86 4.662 1.66-1.936-3.83 2.57-4.49-2.926-5.203-6.56-1.5-6.35 3.057l-.127.52zm3.14-5.42c4.734 1.049-2.48 5.396 0 0zM337.57 267.46c.407 7.515 3.408-2.806 1.27-4.6-1.99 1.036-9.564 6.116-3.66 3.28.793.442 1.611.87 2.39 1.32zm-1.81-1.66c3.321-3.806 2.677 3.134 0 0z"/></g><g><path d="M249.65 182.72c9.293-.793 17.623 3.899 26.635 4.878 8.047-.626 18.534 1.857 23.046 7.788-2.19 2.296-1.047 6.341-4.438 8.227-2.654 2.938-5.92 5.712-9.256 7.64-2.885 1-4.003 3.492-8.171 1.794-9.553-.957-19.106-2.57-28.659-3.113l-31.957 3.736c-.551-3.564-5.322-2.222-7.158-5.471-2.988-2.328-5.986-5.13-7.831-8.34-2.941-5.982 1.381-8.06 7.317-10.348 8.917-3.333 18.944-.6 27.6-5.314 4.197-1.084 8.547-1.468 12.872-1.477z" fill="#ad1519" stroke-width=".26"/><g fill="#c8b100"><path d="M225.34 191.42c4.156 2.411 3.254-5.548-.063-6.825-1.934-9.996 11.964-13.023 18.999-9.358 5.9-.12-6.397-4.802-9.82-2.908-10.594.132-13.225 12.25-8.85 18.653z"/><path d="M225.43 191.46c-6.203-3.685-5.116-13.156 1.31-15.99-7.802 4.584-.1 11.485-1.31 15.99z"/><path d="M202.21 194.89c-7.662-9.17 4.83-18.421 13.817-17.603 5.045-1.36 10.631 2.788 2.787 1.664-8.539-1.786-23.198 6.607-14.374 15.639-.675 3.665-5.743 5.494-2.616.915l.284-.453z"/><path d="M204.9 180.48c-8.791 3.543-1.625 12.121-4.29 17-4.847-5.638-1.832-13.813 4.29-17zM250.04 171.27c6.379 2.13 4.06 13.59 4.201 18.111-2.428 2.843-4.858 5.333-7.31 1.086-4.316-4.017 0-12-.109-17.556.714-1.038 1.968-1.645 3.218-1.641z"/><path d="M250.04 172.94c2.528 3.475 4.49 13.003 1.567 16.729-3.5 3.777-6.783-4.65-4.047-7.484.799-2.82-1.32-8.365 2.48-9.245zM274.7 191.42c-4.174 2.41-3.26-5.543.063-6.825 1.934-9.996-11.965-13.024-19-9.358-5.911-.12 6.397-4.802 9.822-2.908 10.6.13 13.217 12.258 8.844 18.65z"/><path d="M274.61 191.46c6.203-3.685 5.116-13.156-1.31-15.99 7.822 4.588.069 11.495 1.31 15.99z"/><path d="M297.83 194.89c7.66-9.173-4.831-18.417-13.817-17.603-5.052-1.358-10.638 2.787-2.788 1.664 8.538-1.788 23.186 6.612 14.365 15.639.672 3.669 5.752 5.495 2.626.915l-.284-.453z"/><path d="M295.14 180.48c8.793 3.543 1.62 12.12 4.29 17 4.832-5.638 1.822-13.809-4.29-17z"/><path d="M254.48 167.3c.143 5.456-9.003 5.455-8.86 0 .107-5.525 8.73-5.552 8.86 0z" fill="#005bbf" stroke-width=".26"/><path d="M248.89 155.54c.983 2.61-5.874 3.86-.28 4.56.058 1.944 1.915 8.098-2.395 6.61-1.965 3.967 5.282 1.662 7.811 2.26.894-3.238-4.713-1.694-2.706-6.76-.463-2.215 5.712-4.12 0-4.41.306-2.602-.001-2.381-2.43-2.26z" stroke-width=".26"/></g><g fill="#fff"><path d="M251.95 188.94c-.166 3.547-5.895.934-3.097-1.41 1.148-.918 3.115-.127 3.097 1.41z"/><path d="M251.95 185.4c-.166 3.547-5.895.934-3.097-1.41 1.148-.918 3.115-.127 3.097 1.41zM251.56 181.6c-.052 2.596-4.377 1.108-2.683-.928.831-1.007 2.708-.424 2.683.928zM251.14 178.18c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM250.92 175.18c-.225 1.93-2.996-.092-1.115-.8.517-.151 1.124.24 1.115.8zM200.04 198.67c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM198.54 196.02c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM197.54 192.94c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM197.41 189.64c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM198.22 186.4c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM199.91 183.45c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM202.16 181.02c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM204.78 179.01c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM207.9 177.36c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM211.14 176.19c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM214.76 175.54c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM218.2 175.36c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM221.57 175.48c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM225.31 190.32c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM223.44 187.65c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM222.45 184.75c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM222.57 181.57c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM223.26 178.37c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM224.94 175.48c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM227.5 173.47c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM230.49 171.81c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM233.8 170.82c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM237.23 170.23c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM240.6 170.28c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM244.09 170.87c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM247.33 171.99c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM254.9 171.99c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM258.14 170.87c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM261.64 170.28c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM265 170.23c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM268.44 170.82c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM271.74 171.81c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM274.74 173.47c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM277.29 175.48c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM278.98 178.37c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM279.67 181.57c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM279.79 184.75c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM278.79 187.65c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM276.93 190.32c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM280.67 175.48c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM284.04 175.36c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM287.48 175.54c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM291.1 176.19c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM294.34 177.36c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM297.46 179.01c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM300.07 181.02c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM302.32 183.45c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM304.01 186.4c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM304.82 189.64c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM304.7 192.94c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM303.7 196.02c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025zM302.2 198.67c-.344 2.51-3.804-.3-1.287-1.025.624-.119 1.298.368 1.287 1.025z"/></g><g fill="#c8b100"><path d="M250.15 226.18c-10.647-.22-21.728-.614-31.735-4.316 5.113-5.91 17.834-4.431 26.088-5.652 12.507-.246 25.51.038 37.362 4.172-5.032 5.964-17.823 4.455-26.065 5.684-1.882.072-3.766.109-5.65.112z"/><path d="M250.07 216.09c-10.563.078-21.226.987-31.39 4 .987-4.566-5.77-6.792 2.497-6.955 20.795-4.092 42.654-4.01 63.213 1.335-4.396 2.062-1.234 8.36-7.484 4.355-8.797-1.965-17.836-2.69-26.836-2.735z"/><path d="M250.12 210.3c-11.783-.084-23.598 1.402-34.996 4.15 2.75-5.43 15.622-4.422 22.573-5.809 15.824-1.108 31.992-.456 47.323 3.889.215 4.641-11.702-2.117-16.001-1.092-6.267-.779-12.585-1.126-18.899-1.138z"/><path d="M250.2 199.78c.345 4.037 8.199 10.628 10.871 2.471.763 7.323 10.497 3.352 12.1-1.39-1.828 7.182 7.172 9.64 9.735 5.234-.858 11.286 15.956-7.218 7.458 3.98-5.204 5.505-8.8-1.793-14.318.238-4.045-6.446-9.998 2.296-15.056-3.893-5.46 5.631-10.505-4.08-14.961 1.65-5.898-2.026-9.163 1.238-15.152.31-3.345-3.672-7.11 5.87-12.157 1.24-3.519 10.386-17.43-10.355-7.46-1.05 4.77 6.404 5.907-4.45 7.16-1.76 5.822 6.43 8.675-3.596 9.34-6.064 1.25 7.832 11.291 6.788 11.514 1.505 3.196 8.358 10.27 1.974 10.926-2.471z"/><path d="M208.37 206.32c-2.698-1.83-7.1-3.654-8.92-5.487 3.126-3.312 9.146-1.848 7.39 3.897 2.507-6.335 10.417-2.508 6.79.91 1.24 1.246-4.583.835-5.26.68z"/><path d="M205.29 205.01c7.136-1.077.35 7.169 0 0z" fill="#ad1519"/><path d="M216.39 205.91c.964-6.072 3.945 4.37 0 0z" fill="#fff"/><path d="M226.12 201.86c-1.865-7.612-11.672.478-4.64 1.99-.227 1.614 4.308-1.415 4.64-1.99z"/><path d="M225.68 191.65c3.058 2.378 5.805 3.893 2.174 7.07-4.404 1.587-5.766-4.298-3.031-5.391z"/><path d="M228.97 201.38c-.952-7.777 11.152-3.296 5.08.37.831 1.447-4.599.06-5.08-.36"/><path d="M229.54 200.45c-.032 3.547-6.005 1.81-3.961-1.163 1.114-1.634 3.979-.88 3.961 1.163z" fill="#ad1519"/><path d="M237.76 201.77c2.151-5.81 3.025 5.014 0 0z" fill="#fff"/><path d="M248.5 199.83c.304-4.875-5.923-5.416-7.286-2.526-4.706 1.263 3.915 4.377 2.776 4.316 1.631-.224 3.191-.777 4.51-1.78M250.11 188.36c2.818 3.712 5.744 5.11.966 8.296-4.437 1.721-6.093-6.329-2.663-5.555a6.078 6.078 0 011.697-2.741zM251.76 199.83c-.46-4.778 6.418-5.7 7.29-2.526 3.1 1.33-2.489 4.075-2.77 4.316-1.634-.221-3.197-.78-4.52-1.78"/><path d="M252.31 198.5c-.032 3.547-6.005 1.81-3.961-1.163 1.114-1.634 3.98-.88 3.961 1.163z" fill="#ad1519"/><path d="M262.58 201.77c-2.151-5.813-3.02 5.016 0 0z" fill="#fff"/><path d="M271.38 201.38c.977-7.759-11.164-3.318-5.08.37-.558 1.371 4.423.093 5.07-.36"/><path d="M274.67 191.65c-3.071 2.378-5.81 3.891-2.175 7.07 4.41 1.589 5.745-4.3 3.027-5.391z"/><path d="M274.22 201.86c1.867-7.611 11.69.482 4.64 1.99.227 1.607-4.307-1.41-4.64-1.99z"/><path d="M275.15 200.45c-.032 3.547-6.005 1.81-3.961-1.163 1.114-1.634 3.98-.88 3.961 1.163z" fill="#ad1519"/><path d="M283.96 205.91c-.963-6.07-3.967 4.37 0 0z" fill="#fff"/><path d="M291.97 206.32c2.702-1.83 7.107-3.657 8.929-5.487-3.136-3.309-9.132-1.85-7.399 3.897-2.49-6.337-10.41-2.51-6.79.91-1.199 1.25 4.572.832 5.26.68z"/><path d="M295.05 205.01c-7.13-1.077-.35 7.17 0 0z" fill="#ad1519"/></g><g fill="none"><path d="M250.12 224.57c-8.044-.03-24.353-1.006-27.225-3.62 18.356-3.9 37.67-3.882 55.965.36-9.375 2.372-19.09 3.218-28.74 3.26z" fill="#ad1519" stroke-linejoin="round"/><path d="M258.04 224.28v-6.01m-3.02 6.21l.04-6.37m-2.24 6.45v-6.49" stroke-width=".05"/><path d="M250.95 224.64v-6.57" stroke-width=".09"/><path d="M249.16 224.64v-6.57" stroke-width=".14"/><path d="M247.48 224.64v-6.57" stroke-width=".18"/><path d="M245.81 224.64v-6.57" stroke-width=".23"/><path d="M244.32 224.64v-6.57" stroke-width=".28"/><path d="M241.48 224.28l-.04-5.97m1.39 6.05v-6.25" stroke-width=".33"/><path d="M238.86 224.01v-5.5m1.33 5.66l-.04-5.86" stroke-width=".37"/><path d="M235.35 223.7v-4.84m1.15 4.92v-5.08m1.19 5.24v-5.28" stroke-width=".42"/><path d="M234.12 223.66v-4.68" stroke-width=".46"/><path d="M232.97 223.42v-4.36" stroke-width=".51"/><path d="M231.74 223.31v-4.06" stroke-width=".56"/><path d="M229.22 222.95l-.04-3.22m1.33 3.38v-3.62" stroke-width=".6"/><path d="M227.93 222.68v-2.84" stroke-width=".63"/><path d="M226.74 222.45v-2.36" stroke-width=".68"/><path d="M225.45 222.13v-1.85" stroke-width=".73"/><path d="M224.12 221.98v-1.38" stroke-width=".77"/><path d="M222.72 221.66v-.67" stroke-width=".91"/><path d="M220.12 221.66c19.5-4.795 40.561-4.784 60.06 0"/><path d="M216.72 217.16c2.104-3.62 6.75.074 1.407.592l-1.407-.592z" fill="#ad1519"/><path d="M224.03 215.28c2.927-4.2 2.626 4.059 0 0z" fill="#fff"/><path d="M233.64 215.07c-6.036.941-1.689-3.194 2.15-2.34 3.355 1.219-.692 2.566-2.15 2.34z" fill="#058e6e"/><path d="M240.54 213.35c2.922-4.196 2.624 4.055 0 0z" fill="#fff"/><path d="M250.15 214.16c-5.894.995-3.854-3.436.98-2.07 5.634-.484 3.468 3.022-.98 2.07z" fill="#ad1519"/><path d="M257.56 213.35c2.927-4.198 2.626 4.058 0 0z" fill="#fff"/><path d="M266.66 215.07c6.032.942 1.686-3.196-2.15-2.34-3.358 1.217.69 2.566 2.15 2.34z" fill="#058e6e"/><path d="M274.07 215.28c2.927-4.2 2.626 4.059 0 0z" fill="#fff"/><path d="M283.57 217.16c-2.095-3.625-6.738.08-1.397.591l1.397-.591z" fill="#ad1519"/></g></g><g stroke-width=".52"><path d="M250.49 344.33c-14.758-.331-30.321-3.416-42.425-12.238-7.93-6.33-8.242-16.79-7.885-26.053V281.3H300.6c-.143 12.226.298 24.478-.244 36.686-1.314 11.815-12.247 18.745-22.72 21.778-8.72 2.985-17.927 4.564-27.146 4.566z" fill="#ccc"/><path d="M252.91 329.55c11.916 7.805-14.152 11.697-5.849.493.319-1.31 6.166-3.282 5.849-.493z" fill="#ffd691"/><path d="M250.32 340.32c-3.685-4.38-17.435-4.281-6.19.2 2.029.502 4.19.385 6.19-.2zM251.46 340.56c3.404-5.82 17.712-2.144 5.95.02-1.978.15-3.994-.43-5.95-.02z" fill="#058e6e"/><path d="M250.69 337.28c-4.268-2.562 1.064-11.621 1.62-3.72l-.435 2.062z" fill="#ad1519"/><path d="M249.68 342.71c-.46-7.132 3.28-4.578.8-.29z" fill="#058e6e"/><g fill="#c8b100"><path d="M250.32 314.57c.404 15.647-16.715 27.273-31.335 23.07-11.772-2.502-20.27-14.327-18.865-26.28v-30.14h50.2v33.35z" fill="#ad1519"/><path d="M200.03 314.12c-.626 4.312 4.024 16.276 5.73 14.065V280.32c-3.736-.424-7.039-.412-5.669 4.28l-.061 29.52zM211.08 334.23c5.767 5.088 6.784 1.24 6.012-4.186l-.132-50.004c-3.74-.353-7.288-.515-5.88 4.28v49.91zM222.28 338.25c7.061 2.672 6.014-3.374 5.87-8.026V280.04c-3.74-.356-7.277-.51-5.87 4.28v53.93zM233.32 337c6.978.013 6.266-5.773 6.03-10.656V280.04c-3.738-.353-7.287-.515-5.891 4.28L233.32 337zM244.81 329.24c7.842-8.306 5.101-20.117 5.658-30.417l.072-18.783c-3.74-.356-7.278-.51-5.858 4.28l.128 44.92z"/></g><g><path d="M300.65 281.22c-.17 12.322.354 24.681-.29 36.979-2.31 16.394-22.8 25.208-36.875 17.317-9.426-4.468-14.279-15.119-13.165-25.227V281.22h50.33z" fill="#ad1519"/><path d="M272.71 306.14c-.989-2.809-4.072-5.17-6.457-5.214-3.333-2.28-.386-4.984-4.191-7.251-2.311-5.543-4.667.655-1.189 1.706 1.818 3.716-2.039 4.441-1.563 7.674.805 5.465 5.012 1.904 7.59 1.415 3.718-.997 1.943 2.813 5.81 1.67zm-6.98-18.5c-.112 4.53 6.011-1.225.085 0zm-7.3 20.37c4.15-2.706-4.012-2.405 0 0zm15.99-9.73c-3.731-.582-1.253-5.485-.006-6.51-1.938-5.357-4.578-.495-7.66-.85-1.518-.444-7.62-3.775-4.49.529 1.898 3.121 4.296 3.99 6.69 4.854 2.711 2.328.391 4.98 4.209 7.235 2.357 3.565.77-4.569 1.257-5.258zm-7.25-1.39c-4.264 2.223 5.489 4.782 0 0zm8.004 36.186c-3.33-1.567-11.66-6.056-2.324-3.636 2.966-2.197 1.675-7.049-.17-8.58-.95-3.89 3.126-3.943 1.76-8.15 1.071-5.885-2.197-1.271-4.138.924 2.242 2.222-2.33 5.468-4.13 4.574-5.405 3.162-.6 7.33-.652 10.312-6.215-2.973-7.621-5.806-7.87-12.52 2.929.995 3.653 7.29 7.127 1.262-1.007-1.607 1.462-6.464 4.183-4.632 1.58-1.885 6.525-5.86 1.02-4.88-.738 3.615-5.625 1.135-6.8-.003-5.261-1.704-2.181 6.151-5.58 5.643.174-4.756-2.915-6.886.015-11.1-.12-2.037-3.943-5.15-.726-7.142 3.086-2.675-4.996-10.577 3.249-8.788 3.252 3.915 4.723-2.15 8.863-.39 1.269 4.945 7.695-3.272 6.205 3.1 1.225 3.299-2.124 6.236.039 7.77l-.021 21.59c-1.965 1.546 1.097 4.707-.025 7.96l-.025 6.686zm-5.914-18.306c-3.143-3.54-3.93 5.777 0 0zm-9.96-18.44c-4.77-.824.901 6.92 0 0zm9.16 11.41c.78-4.45-7.722.72 0 0zm-10.6 9.69c-3.7.796-1.606-8.025-.26-4.35-.002 1.453-.03 2.917.26 4.35zm1.46-5.52c5.093.72-1.036 10.178-.006 1.59l.006-1.59zm10.81 16.93c1.383-4.76-10.232-3.478-1.36-.51zm-.85 1.44c-3.697 3.985-8.495-6.43-1.348-.523z" id="e" fill="#c8b100" stroke="#c8b100" stroke-width=".26"/><use transform="matrix(-1 0 0 1 550.43 0)" xlink:href="#e" width="100%" height="100%"/><path d="M272.59 306.94c6.7-10.031 6.883 9.762 0 0z" fill="#058e6e" stroke="none"/></g><g fill="#c8b100" stroke-width=".46"><path d="M200.12 281.25h50.18v-55.72h-50.18v55.72z" fill="#ad1519" stroke-width=".52"/><path d="M217.34 238.41c-2.128-3.527-4.425 3.09-.92 2.77 1.14 4.395-5.67.84-3.47 6.295-1.028 4.287 3.223 3.294 1.85 7.926v10.509c-4.917-1.544-3.62 3.128-3.7 6.42.527 2.731 6.041.473 8.561 1.21h19.859c-.81-2.447 1.98-8.494-2.14-7.63-3.257-.113-.774-5.967-1.55-8.561-.691-3.92.526-5.93 1.85-7.834.644-3.907-.088-6.439-3.47-6.32-.09-1.624 4.153-5.097 0-5.705-.846.618-3.145.819-4.77 0-2.898 2.524 2.95 4.08.535 6.24-4.722 1.429-2.39-4.197-2.925-6.956 1.599-.302 3.208-6.192 0-4.299-1.908-.512-2.682.33-5.32-.535-1.034 4.31 3.21 3.343 1.85 7.98 2.26 3.861-4.204 5.852-3.47 1.67 3.141.447 1.38-6.697-.535-3.18.182-.866-2.693-1.845-2.235 0zm-6.24 35.13h28.42m-28.42-1.85h28.42m-28.42-1.85h28.42m-28.42-1.85h28.42m-28.42-2.08h28.42m-24.72-1.62h21.03m-21.03-1.85h21.03m-21.03-2.08h21.03m-21.03-1.84h21.03m-21.03-1.85h21.03m-21.03-1.85h21.03m-21.03-1.85h21.03m-22.88-1.85h24.73m-24.73-1.85h24.73m-24.73-1.85h24.73m-24.73-1.84h24.73m-21.26-1.85h17.79m-10.63-1.85h3.47m-3.47-1.85h3.47m-3.47-1.85h3.47m-3.47-1.85h3.47m-5.32-2.31h7.16m-12.47 7.86h3.69m-5.31-2.31h6.93m-6.93 33.97v-1.85m0-1.85v-1.85m-1.85 1.85v1.85m3.47 0v-1.85m1.84 3.7v-1.85m0-1.85v-1.85m0-2.08v-1.62m0-1.85v-2.08m-1.84 7.63v-2.08m-3.47 2.08v-2.08m7.16 0v2.08m1.62-2.08v-1.62m-5.31-1.85v1.85m3.69-1.85v1.85m3.47-1.85v1.85m-1.85-1.85v-2.08m1.85-1.84v1.84m0-5.54v1.85m-1.85-3.7v1.85m1.85-3.7v1.85m-3.47-1.85v1.85m-3.69-1.85v1.85m-1.62-3.7v1.85m3.46-1.85v1.85m3.47-1.85v1.85m1.85-3.7v1.85m-3.47-1.85v1.85m-3.69-1.85v1.85m-1.62-3.69v1.84m6.93-1.84v1.84m-3.47-5.54v1.85m15.95-1.85h-3.7m5.32-2.31h-6.94m6.94 33.97v-1.85m0-1.85v-1.85m1.85 1.85v1.85m-3.47 0v-1.85m-1.85 3.7v-1.85m0-1.85v-1.85m0-2.08v-1.62m0-1.85v-2.08m1.85 7.63v-2.08m3.47 2.08v-2.08m-7.17 0v2.08m-1.62-2.08v-1.62m5.32-1.85v1.85m-3.7-1.85v1.85m-3.46-1.85v1.85m1.84-1.85v-2.08m-1.84-1.84v1.84m0-5.54v1.85m1.84-3.7v1.85m-1.84-3.7v1.85m3.46-1.85v1.85m3.7-1.85v1.85m1.62-3.7v1.85m-3.47-1.85v1.85m-3.47-1.85v1.85m-1.84-3.7v1.85m3.46-1.85v1.85m3.7-1.85v1.85m1.62-3.69v1.84m-6.94-1.84v1.84m3.47-5.54v1.85m-7.16 18.71v-2.08m0-5.54v-1.85m0 5.55v-1.85m0-5.55v-1.85m0-1.85v-1.84m0-3.7v-1.85m0-1.85v-1.85m-8.78 4.85h3.69m3.47-5.54h3.47m3.46 5.54h3.7"/><path d="M230.05 273.54c2.225-6.027-5.332-12.548-9.333-5.826-.673 3.721-.645 7.329 4.144 5.826h5.189z"/><path d="M222.19 268.91c-6.845.143 1.968-6.13 0 0z"/><path d="M226.12 266.6c4.475-5.9-7.81-.827 0 0zM228.43 268.91c6.826.15-1.93-6.134 0 0zM221.73 260.83c1.854-4.225-3.228-11.664-5.08-4.555-.69 5.128.37 4.813 5.08 4.555zM228.89 260.83c-1.857-4.228 3.236-11.662 5.09-4.555.695 5.136-.381 4.81-5.09 4.555zM220.11 248.35c1.696-3.834-1.529-6.159-4.106-4.088.108 3.58.063 4.724 4.106 4.088zM227.05 248.35c1.877-3.817-1.208-6.166-3.903-4.086-.065 3.63-.205 4.7 3.903 4.086zM230.51 248.35c-1.978-4.006 1.427-6.076 4.107-4.088-.097 3.592-.06 4.72-4.107 4.088z"/><g fill="#0039f0" stroke="none"><path d="M228.43 273.54c2.574-5.792-6.665-10.12-6.24-2.555-1.283 4.34 3.8 1.946 6.24 2.555zM221.27 260.36c1.932-4.12-3.601-10.206-4.16-3.32-.722 4.202.69 3.312 4.16 3.32zM229.36 260.36c-1.93-4.118 3.596-10.206 4.16-3.32.722 4.202-.69 3.312-4.16 3.32z"/></g></g><g><path d="M250.28 281.25h50.32v-55.72h-50.32v55.72z" fill="#ccc"/><path d="M275.93 239.26c-1.035-2.087-13.86-5.676-5.06-.26 1.683.262 3.387-.143 5.06.26z" fill="#db4446" stroke-width=".39"/><g fill="none" stroke-width=".39"><path d="M283.46 237c.427 5.39-1.187 4.428.659 8.547-3.365-3.734.655 5.17-3.339.013 2.261 4.844-1.528 3.025-.9 3.84-.803 8.144 13.368 10.71 8.72.75-1.918-4.095-.127-16.253 1.92-15.21-.478 2.755 6.93-5.903 1.94 1.779 2.644.97-7.869 9.63-1.5 15.384 2.241 7.022-11.628 8.809-2.9 14.837-2.238 4.32-1.482 8.354-4.556 6.716-2.518-.777-.673-1.96-2.004-4.106 4.978.234.388-4.853.26-2.23-1.29-3.18.311 3.537-2.42-1.09 1.306-6.637-5.643-4.325-2.42 1.26-3.937 1.102-7.775 1.553-8.981.159-2.013-1.065 1.194-6.885 3.04-2.634 4.106.314 1.958-2.644 1.421-2.155.321-3.11-1.672 2.317-.93-3.43 1.912-3.418 10.498-.477 3.25-3.97-1.568-4.78-5.36-2.088-5.63-2.64.098-1.228-3.3 3.582-2.621.558-3.607 2.766-5.397 3.473-5.909-.398 1.38-.26-1.103-4.105 3.28-1.709 6.029-.973 2.934-5.141-1.64-5.331 5.529-1.394-5.827-1.339.84-2.09-2.63-1.982-5.683-3.113-3.81-4.89-.68-2.43 2.557-1.372 3.53-2.43-2.651 4.234 12.908 10.655 10.231 3.641 8.566-.226-5.953-6.08 3.229-5.791 1.832-3.44 5.724 1.16 7.24 2.63" fill="#ed72aa"/><path d="M269 243.39c-4.203 3.197 6.371-.433 1.64 5.57 2.937-.749 4.277-3.737 3.93.91 2.89-4.105 3.281 2.262 4.603-1.944l.167.364m-11.41.61c.653-1.207 1.927-1.771 3.08-2.36m.99 5.17c.963-.416 1.965-.978 2.57-1.87"/><path d="M282.57 240.9c-.14-.217-.573-.97-.65-1.13" stroke-width=".26"/><path d="M278.33 257.41c2.113.983 2.554 3.007.85 4.72"/></g><path d="M273.05 236.24c-1.2-1.567 1.546-.928 0 0z" stroke-width=".26"/><path d="M277.06 234.85c1.617-1.148 3.33 2.364 0 0z" stroke-width=".05"/><g stroke-width=".26"><path d="M273.08 240.14c.1-1.364 1.43.59 0 0zM273.89 240.12c.366-1.228 1.435.52 0 0zM273.53 236.83c2.334.095-.774 1.335 0 0z"/><path d="M274.52 237.1c1.594-.178-.323 1.427 0 0z"/></g><g fill="#db4446" stroke-width=".39"><path d="M261.88 236.08c3.547 1.9.253-4.595 0 0zM259.59 237.12c-4.012-2.329-1.691 2.758 0 0zM258.49 240.25c-4.375 1.564 1.924 3.023 0 0zM261.06 250.37c-4.185-1.302-1.445 2.608 0 0zM260.21 253.34c-4.083.684.875 2.983 0 0zM261.66 256.08c.427 3.974 2.977-.428 0 0zM269 263.12c-3.523-2.182-2.06 2.382 0 0zM266.83 265.93c-4.557.73 1.244 3.064 0 0zM268.84 268.9c-.873 4.538 3.374-.593 0 0zM281.24 270.11c-4.375.267.346 2.808 0 0zM281.64 273.1c-2.03 3.673 3.437.663 0 0zM284.75 274.04c.413 4.485 3.025-1.404 0 0z"/></g><g fill="#c8b100" stroke-width=".26"><path d="M282.88 232.71c-2.185.247-2.78-.79-4.33-2.34-1.426 4.661 9.722 9.226 6.12 4.06-1.277.804-2.617-.561-1.79-1.72z"/><g fill="#000" stroke-width=".05"><path d="M280.63 233.4c.699-.111.059.663 0 0z"/><path d="M281.58 234.19c-2.238-1.873 1.872 1.155 0 0z"/><path d="M279.84 233c-1.167-1.058 1.352.589 0 0zM278.8 232.29c.67-.132.092.686 0 0zM282.63 234.92c-.038-.664-.709.107 0 0zM283.2 235.58c1.344.86-.878-1.128 0 0zM284.15 236.39c-.059-.686-.675.122 0 0z"/></g><path d="M281.4 230.36c-2.134-.325.577 2.869 0 0z"/><path d="M281.4 230.36c-2.134-.325.577 2.869 0 0z"/><path d="M279.8 230.84c2.05 1.268-.111.31 0 0z"/><path d="M281.7 231.92c-1.691 1.319-.865-2.815 0 0z"/><path d="M280.51 231.25c1.131-.475.12 1.196 0 0zM278.36 230.35c-1.914-2.188 1.395-1.203 0 0z"/><path d="M279.39 230.66c-1.349 1.685-1.383-2.554 0 0z"/><path d="M278.24 230.29c.815-.776.136 1.11 0 0zM283.67 231.77c-2.078-.537.126 2.857 0 0z"/><path d="M282.01 232.03c1.302 1.871.437.001 0 0z"/><path d="M283.73 233.36c-1.859 1.123-.439-2.96 0 0z"/><path d="M282.65 232.54c1.217-.323-.073 1.21 0 0zM285.64 233.61c1.136 1.873-3.573.12 0 0z"/><path d="M285.49 235.2c-2.006.87-.032-3.002 0 0z"/><path d="M283.97 233.66c-1.182 2.222 4.067-.485 0 0z"/><path d="M284.91 234.63c.268-1.198-1.256.135 0 0zM286.29 236.43c2.595 1.312 1.013-1.539 0 0z"/><path d="M285.75 235.54c-1.635 1.534 3.237.801 0 0z"/><path d="M286.37 236.53c.631-.927-1.136.095 0 0z"/></g></g><g stroke-width=".61"><path d="M266.69 281.01c.824 11.393-11.634 22.46-22.592 16.855-13.96-6.378-12.864-29.94 1.982-34.488 10.906-3.609 21.076 7.024 20.61 17.633z" fill="#ad1519"/><path d="M261.88 280.97c.8 8.543-9.036 17.166-16.925 11.777-9.936-6.009-6.855-24.827 5.485-25.197 6.91-.02 11.597 7.012 11.44 13.42z" fill="#005bbf"/><g id="f" fill="#c8b100" stroke-width=".34"><path d="M245.03 271.74c-2.33 4.056.296 4.805-3.69 5.88 1.593 2.632 2.579 1.392 2.065 3.49-.907 1.711 2.554 2.16 3.297 1.13.384-2.185-1.313-2.656 1.808-3.85-.144-4.083-4.19.687-2.307-4.82l-.478-.918z" stroke-linejoin="round"/><path d="M242.87 281.11c5.043.779 5.134-1.713.08-1.03-.445-.074.196.937-.08 1.03z"/></g><use x="10.63" xlink:href="#f"/><use x="5.31" y="9.14" xlink:href="#f"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/flags/fa.svg b/website/images/flags/fa.svg
deleted file mode 100644
index 35cd83dded2..00000000000
--- a/website/images/flags/fa.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" viewBox="0 0 630 360"><rect width="630" height="360" fill="#da0000"/><rect width="630" height="240" fill="#fff"/><rect width="630" height="120" fill="#239f40"/><g transform="translate(8.4,100.4)"><g id="tb4"><g id="tb1" fill="none" stroke="#fff" stroke-width="2"><path id="tbp1" d="M0,1H26M1,10V5H9V9H17V5H12M4,9H6M26,9H21V5H29M29,0V9H37V0M33,0V9" transform="scale(1.4)"/><path id="tbp2" d="M0,7H9M10,7H19" transform="scale(2.8)"/><use y="120" xlink:href="#tbp2"/><use y="145.2" xlink:href="#tbp1"/></g><g id="tb3"><use x="56" xlink:href="#tb1"/><use x="112" xlink:href="#tb1"/><use x="168" xlink:href="#tb1"/></g></g><use x="168" xlink:href="#tb3"/><use x="392" xlink:href="#tb4"/></g><g fill="#da0000" transform="matrix(45,0,0,45,315,180)"><g id="emblem_half"><path d="M-0.54815,0.83638A0.912046,0.912046 0 0,0 0.328544,-0.722384A1,1 0 0,1 -0.54815,0.83638"/><path d="M0.618339,0.661409A0.763932,0.763932 0 0,0 0.421644,-0.741049A1,1 0 0,1 0.618339,0.661409"/><path d="M0,1 -0.05,0 0,-0.787278A0.309995,0.309995 0 0,0 0.118034,-0.688191V-0.100406L0.077809,0.892905z"/><path d="M-0.02,-0.85 0,-0.831217A0.14431,0.14431 0 0,0 0.252075,-0.967708A0.136408,0.136408 0 0,1 0,-0.924634"/></g><use transform="scale(-1,1)" xlink:href="#emblem_half"/></g></svg>
\ No newline at end of file
diff --git a/website/images/flags/fr.svg b/website/images/flags/fr.svg
deleted file mode 100644
index 9733f5c270c..00000000000
--- a/website/images/flags/fr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect width="900" height="600" fill="#ED2939"/><rect width="600" height="600" fill="#fff"/><rect width="300" height="600" fill="#002395"/></svg>
\ No newline at end of file
diff --git a/website/images/flags/ja.svg b/website/images/flags/ja.svg
deleted file mode 100644
index ad8286de8f8..00000000000
--- a/website/images/flags/ja.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="60" version="1.1" viewBox="0 0 90 60"><g id="surface1"><rect width="90" height="60" x="0" y="0" fill="#A0A0A0" fill-opacity="1" stroke="none"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 0.601562 0.601562 L 89.398438 0.601562 L 89.398438 59.398438 L 0.601562 59.398438 Z M 0.601562 0.601562"/><path fill="#BE0026" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 63 30 C 63 39.941406 54.941406 48 45 48 C 35.058594 48 27 39.941406 27 30 C 27 20.058594 35.058594 12 45 12 C 54.941406 12 63 20.058594 63 30 Z M 63 30"/></g></svg>
\ No newline at end of file
diff --git a/website/images/flags/ru.svg b/website/images/flags/ru.svg
deleted file mode 100644
index 1733cc42728..00000000000
--- a/website/images/flags/ru.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="0 0 9 6"><rect width="9" height="3" fill="#fff"/><rect width="9" height="3" y="3" fill="#d52b1e"/><rect width="9" height="2" y="2" fill="#0039a6"/></svg>
\ No newline at end of file
diff --git a/website/images/flags/tr.svg b/website/images/flags/tr.svg
deleted file mode 100644
index 7f9f90a079d..00000000000
--- a/website/images/flags/tr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="800"><rect width="1200" height="800" fill="#E30A17"/><circle cx="425" cy="400" r="200" style="fill:#fff"/><circle cx="475" cy="400" r="160" style="fill:#e30a17"/><polygon style="fill:#fff" points="583.334 400 764.235 458.779 652.431 304.894 652.431 495.106 764.235 341.221"/></svg>
\ No newline at end of file
diff --git a/website/images/flags/zh.svg b/website/images/flags/zh.svg
deleted file mode 100644
index 903b1eca640..00000000000
--- a/website/images/flags/zh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" viewBox="0 0 30 20"><defs><path id="s" fill="#ffde00" d="M0,-1 0.587785,0.809017 -0.951057,-0.309017H0.951057L-0.587785,0.809017z"/></defs><rect width="30" height="20" fill="#de2910"/><use transform="translate(5,5) scale(3)" xlink:href="#s"/><use transform="translate(10,2) rotate(23.036243)" xlink:href="#s"/><use transform="translate(12,4) rotate(45.869898)" xlink:href="#s"/><use transform="translate(12,7) rotate(69.945396)" xlink:href="#s"/><use transform="translate(10,9) rotate(20.659808)" xlink:href="#s"/></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-arrow.svg b/website/images/icons/icon-arrow.svg
deleted file mode 100644
index 22f67781c6e..00000000000
--- a/website/images/icons/icon-arrow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14" version="1.1" viewBox="0 0 14 14"><title>icon-arrow</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Homepage" stroke="#212529" stroke-width="2" transform="translate(-557.000000, -2491.000000)"><g id="Page/Use-Cases" transform="translate(0.000000, 2108.000000)"><g id="Row-1" transform="translate(185.000000, 134.000000)"><g id="Link/Read" transform="translate(222.000000, 247.000000)"><g id="icon-arrow" transform="translate(150.000000, 3.000000)"><path id="Path-39" d="M6,0 L12,6 L6,12 M12,6 L0,6"/></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-blog-black.svg b/website/images/icons/icon-blog-black.svg
deleted file mode 100644
index 42d5c1a3010..00000000000
--- a/website/images/icons/icon-blog-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="14" version="1.1" viewBox="0 0 18 14"><title>icon-blog</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"><g id="Link/Blog" stroke="#000" stroke-width="1.25" transform="translate(0.870000, 1.375000)"><g id="Icon/News"><line id="Path" x1="6.25" x2="12.5" y1="4.407" y2="4.407"/><line id="Path" x1="6.25" x2="12.5" y1="6.907" y2="6.907"/><path id="Path" d="M1.25,11.25 C1.94035594,11.25 2.5,10.6903559 2.5,10 L2.5,0.625 C2.5,0.279822031 2.77982203,0 3.125,0 L15.625,0 C15.970178,0 16.25,0.279822031 16.25,0.625 L16.25,10 C16.25,10.6903559 15.6903559,11.25 15,11.25 L1.25,11.25 Z"/><path id="Path" d="M1.25,11.25 C0.559644063,11.25 0,10.6903559 0,10 L0,2.5"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-facebook-gray.svg b/website/images/icons/icon-facebook-gray.svg
deleted file mode 100644
index 6c0e3190e0a..00000000000
--- a/website/images/icons/icon-facebook-gray.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" version="1.1" viewBox="0 0 24 24"><title>icon-facebook-gray</title><defs><path id="path-1" d="M24,12.0730223 C24,5.40365112 18.6290323,0 12,0 C5.37096774,0 0,5.40365112 0,12.0730223 C0,18.0988235 4.38822581,23.0935497 10.125,24 L10.125,15.563002 L7.0766129,15.563002 L7.0766129,12.0730223 L10.125,12.0730223 L10.125,9.41306288 C10.125,6.38750507 11.9153226,4.71626775 14.6574194,4.71626775 C15.9706452,4.71626775 17.343871,4.95188641 17.343871,4.95188641 L17.343871,7.92146045 L15.8303226,7.92146045 C14.34,7.92146045 13.875,8.85225152 13.875,9.80689655 L13.875,12.0730223 L17.2030645,12.0730223 L16.6708065,15.563002 L13.875,15.563002 L13.875,24 C19.6117742,23.0935497 24,18.0988235 24,12.0730223 Z"/></defs><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Logo"><mask id="mask-2" fill="#fff"><use xlink:href="#path-1"/></mask><use id="Brands/facebook" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-facebook.svg b/website/images/icons/icon-facebook.svg
deleted file mode 100644
index c7c66a5cb5d..00000000000
--- a/website/images/icons/icon-facebook.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81" version="1.1" viewBox="0 0 81 81"><title>Group</title><defs><polygon id="path-1" points="0 0 80 0 80 79.516 0 79.516"/></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Group" transform="translate(0.060000, 0.040000)"><g id="Group-3"><mask id="mask-2" fill="#fff"><use xlink:href="#path-1"/></mask><path id="Fill-1" fill="#1877F2" d="M80,39.9992187 C80,17.906518 62.0903569,-0.00312518312 39.9976561,-0.00312518312 C17.9049554,-0.00312518312 -0.00468777467,17.906518 -0.00468777467,39.9992187 C-0.00468777467,59.9655449 14.6235912,76.5146395 33.7472899,79.5155966 L33.7472899,51.5623962 L23.5904448,51.5623962 L23.5904448,39.9992187 L33.7472899,39.9992187 L33.7472899,31.1862023 C33.7472899,21.1606149 39.7193586,15.6227904 48.856769,15.6227904 C53.2333535,15.6227904 57.8111999,16.4040862 57.8111999,16.4040862 L57.8111999,26.248413 L52.7669981,26.248413 C47.7977225,26.248413 46.2480223,29.331953 46.2480223,32.4954197 L46.2480223,39.9992187 L57.3424224,39.9992187 L55.568881,51.5623962 L46.2480223,51.5623962 L46.2480223,79.5155966 C65.371721,76.5146395 80,59.9655449 80,39.9992187" mask="url(#mask-2)"/></g><path id="Fill-4" fill="#FFF" d="M55.568881,51.5623962 L57.3424224,39.9992187 L46.2480223,39.9992187 L46.2480223,32.4954197 C46.2480223,29.331953 47.7977225,26.248413 52.7669981,26.248413 L57.8111999,26.248413 L57.8111999,16.4040862 C57.8111999,16.4040862 53.2333535,15.6227904 48.856769,15.6227904 C39.7193586,15.6227904 33.7472899,21.1606149 33.7472899,31.1862023 L33.7472899,39.9992187 L23.5904448,39.9992187 L23.5904448,51.5623962 L33.7472899,51.5623962 L33.7472899,79.5155966 C35.7838936,79.8351466 37.8712815,80.0015626 39.9976561,80.0015626 C42.1240307,80.0015626 44.2114186,79.8351466 46.2480223,79.5155966 L46.2480223,51.5623962 L55.568881,51.5623962"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-github.svg b/website/images/icons/icon-github.svg
deleted file mode 100644
index 79f936ad51b..00000000000
--- a/website/images/icons/icon-github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="82" height="80" version="1.1" viewBox="0 0 82 80"><title>icon-github</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="icon-github" fill="#212529" fill-rule="nonzero"><path id="Path" d="M36.3976019,0.285587315 C17.4993108,2.34863347 2.29853201,17.6152782 0.244369937,36.1826935 C-1.80979214,55.5751211 9.28268307,72.9047088 26.1267915,79.5064565 C27.3592888,79.9190657 28.591786,79.0938472 28.591786,77.4434103 L28.591786,70.8416626 C28.591786,70.8416626 26.9484564,71.2542719 24.8942943,71.2542719 C19.1426405,71.2542719 16.677646,66.3029611 16.2668136,63.4146965 C15.8559812,61.7642595 15.0343163,60.5264319 13.8018191,59.2886042 C12.5693218,58.8759949 12.1584894,58.8762012 12.1584894,58.463592 C12.1584894,57.6383735 13.3909867,57.6381672 13.8018191,57.6381672 C16.2668136,57.6381672 18.3209757,60.5264319 19.1426405,61.7642595 C21.1968026,65.0651334 23.6617971,65.8903519 24.8942943,65.8903519 C26.537624,65.8903519 27.7701212,65.4777426 28.591786,65.0651334 C29.0026185,62.1768688 30.2351157,59.2886042 32.7001102,57.6381672 C23.2509646,55.5751211 16.2668136,50.2114074 16.2668136,41.1340043 C16.2668136,36.5953028 18.3209757,32.0566012 21.1968026,28.7557274 C20.7859702,27.9305089 20.3751377,25.8674628 20.3751377,22.9791982 C20.3751377,21.3287612 20.3751377,19.2657151 21.1968026,17.6152782 C21.1968026,16.7900597 22.0184674,16.3774505 22.4292998,16.3774505 L22.8401322,16.3774505 C24.8942943,16.7900597 29.0026185,18.0278874 32.7001102,21.7413705 C35.1651047,20.916152 38.0409316,20.5035428 40.9167585,20.5035428 C43.7925854,20.5035428 46.6684123,20.916152 49.1334068,21.7413705 C52.8308985,18.0278874 57.3500551,16.7900597 59.4042172,16.3774505 L59.8150496,16.3774505 C60.6367144,16.3774505 61.0475468,16.7900597 61.4583792,17.6152782 C61.4583792,19.2657151 61.4583792,21.3287612 61.4583792,22.9791982 C61.4583792,26.280072 61.0475468,27.9305089 60.6367144,28.7557274 C63.5125413,32.0566012 65.5667034,36.1826935 65.5667034,41.1340043 C65.5667034,50.2114074 58.5825523,55.5751211 49.1334068,57.6381672 C51.5984013,59.7012134 53.2417309,63.4146965 53.2417309,67.1281795 L53.2417309,77.8560195 C53.2417309,79.0938472 54.4742282,80.3316749 56.1175578,79.9190657 C71.3183572,73.7299272 82,58.8759949 82,41.5466135 C82,16.7900597 61.0475468,-2.6026773 36.3976019,0.285587315 Z"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-google.svg b/website/images/icons/icon-google.svg
deleted file mode 100644
index 732c960a052..00000000000
--- a/website/images/icons/icon-google.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-google</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="icon-google" fill-rule="nonzero"><path id="Path" fill="#FFC107" d="M79.222,32.1658392 L76,32.1658392 L76,31.99984 L40,31.99984 L40,47.99976 L62.606,47.99976 C59.308,57.3137134 50.446,63.99968 40,63.99968 C26.746,63.99968 16,53.2537337 16,39.9998 C16,26.7458663 26.746,15.99992 40,15.99992 C46.118,15.99992 51.684,18.3079085 55.922,22.0778896 L67.236,10.7639462 C60.092,4.10597947 50.536,0 40,0 C17.91,0 0,17.9099105 0,39.9998 C0,62.0896896 17.91,79.9996 40,79.9996 C62.09,79.9996 80,62.0896896 80,39.9998 C80,37.3178134 79.724,34.6998265 79.222,32.1658392 Z"/><path id="Path" fill="#FF3D00" d="M4.60938,21.3818931 L17.7514,31.0198449 C21.3074,22.2158889 29.9194,15.99992 39.9974,15.99992 C46.1154,15.99992 51.6814,18.3079085 55.9194,22.0778896 L67.2334,10.7639462 C60.0894,4.10597947 50.5334,0 39.9974,0 C24.6334,0 11.30938,8.67395663 4.60938,21.3818931 Z"/><path id="Path" fill="#4CAF50" d="M39.9996,80 C50.3316,80 59.7196,76.0460198 66.8176,69.6160519 L54.4376,59.1401043 C50.4216,62.1820891 45.4296,64.00008 39.9996,64.00008 C29.5956,64.00008 20.7616,57.3661132 17.4336,48.1081595 L4.38964,58.1581092 C11.00964,71.1120444 24.4536,80 39.9996,80 Z"/><path id="Path" fill="#1976D2" d="M79.222,32.1658392 L76,32.1658392 L76,31.99984 L40,31.99984 L40,47.99976 L62.606,47.99976 C61.022,52.4737376 58.144,56.3317183 54.432,59.1417043 C54.434,59.1397043 54.436,59.1397043 54.438,59.1377043 L66.818,69.6136519 C65.942,70.409648 80,59.9997 80,39.9998 C80,37.3178134 79.724,34.6998265 79.222,32.1658392 Z"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin-alt-gray.svg b/website/images/icons/icon-linkedin-alt-gray.svg
deleted file mode 100644
index eb5931c3a65..00000000000
--- a/website/images/icons/icon-linkedin-alt-gray.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" version="1.1" viewBox="0 0 24 24"><title>icon-linkedin-gray</title><defs><path id="path-1" d="M22.2857143,0 L1.70892857,0 C0.766071429,0 0,0.776785714 0,1.73035714 L0,22.2696429 C0,23.2232143 0.766071429,24 1.70892857,24 L22.2857143,24 C23.2285714,24 24,23.2232143 24,22.2696429 L24,1.73035714 C24,0.776785714 23.2285714,0 22.2857143,0 Z M7.25357143,20.5714286 L3.69642857,20.5714286 L3.69642857,9.11785714 L7.25892857,9.11785714 L7.25892857,20.5714286 L7.25357143,20.5714286 Z M5.475,7.55357143 C4.33392857,7.55357143 3.4125,6.62678571 3.4125,5.49107143 C3.4125,4.35535714 4.33392857,3.42857143 5.475,3.42857143 C6.61071429,3.42857143 7.5375,4.35535714 7.5375,5.49107143 C7.5375,6.63214286 6.61607143,7.55357143 5.475,7.55357143 L5.475,7.55357143 Z M20.5875,20.5714286 L17.0303571,20.5714286 L17.0303571,15 C17.0303571,13.6714286 17.0035714,11.9625 15.1821429,11.9625 C13.3285714,11.9625 13.0446429,13.4089286 13.0446429,14.9035714 L13.0446429,20.5714286 L9.4875,20.5714286 L9.4875,9.11785714 L12.9,9.11785714 L12.9,10.6821429 L12.9482143,10.6821429 C13.425,9.78214286 14.5875,8.83392857 16.3178571,8.83392857 C19.9178571,8.83392857 20.5875,11.2071429 20.5875,14.2928571 L20.5875,20.5714286 L20.5875,20.5714286 Z"/></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><mask id="mask-2" fill="#fff"><use xlink:href="#path-1"/></mask><use id="icon-linkedin-gray" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"/></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin-gray.svg b/website/images/icons/icon-linkedin-gray.svg
deleted file mode 100644
index 684f35e8f47..00000000000
--- a/website/images/icons/icon-linkedin-gray.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" version="1.1" viewBox="0 0 24 24"><title>icon-linkedin-gray</title><defs><path id="path-1" d="M5.37214286,24 L0.396428571,24 L0.396428571,7.97642802 L5.37214286,7.97642802 L5.37214286,24 Z M2.88160714,5.79066494 C1.29053571,5.79066494 0,4.47277838 0,2.88167143 C0,1.29016824 1.29013948,0 2.88160714,0 C4.47307481,0 5.76321429,1.29016824 5.76321429,2.88167143 C5.76321429,4.47277838 4.47214286,5.79066494 2.88160714,5.79066494 Z M23.9946429,24 L19.0296429,24 L19.0296429,16.1998259 C19.0296429,14.3408558 18.9921429,11.956874 16.4426786,11.956874 C13.8557143,11.956874 13.4592857,13.976562 13.4592857,16.0658943 L13.4592857,24 L8.48892857,24 L8.48892857,7.97642802 L13.2610714,7.97642802 L13.2610714,10.1621911 L13.3307143,10.1621911 C13.995,8.90323442 15.6176786,7.57463333 18.0385714,7.57463333 C23.0742857,7.57463333 24,10.8907788 24,15.1980178 L24,24 L23.9946429,24 Z"/></defs><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Logo"><mask id="mask-2" fill="#fff"><use xlink:href="#path-1"/></mask><use id="Brands/linkedin-in" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin.png b/website/images/icons/icon-linkedin.png
deleted file mode 100644
index 1facc9e76df..00000000000
Binary files a/website/images/icons/icon-linkedin.png and /dev/null differ
diff --git a/website/images/icons/icon-menu.svg b/website/images/icons/icon-menu.svg
deleted file mode 100644
index 08d3edb0dfa..00000000000
--- a/website/images/icons/icon-menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="21" version="1.1" viewBox="0 0 24 21"><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Group" fill="#495057"><rect id="Rectangle" width="24" height="3" x="0" y="0"/><rect id="Rectangle" width="24" height="3" x="0" y="9"/><rect id="Rectangle" width="24" height="3" x="0" y="18"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-performance.svg b/website/images/icons/icon-performance.svg
deleted file mode 100644
index 9fcd2a6558a..00000000000
--- a/website/images/icons/icon-performance.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-performance</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Homepage" fill-rule="nonzero" transform="translate(-185.000000, -1263.000000)"><g id="Page/Why" transform="translate(185.000000, 1047.000000)"><g id="Feature-1" transform="translate(0.000000, 216.000000)"><g id="icon-performance" transform="translate(0.000000, 0.000000)"><circle id="Oval" cx="40" cy="40" r="40" fill="#F1F6F9"/><path id="Path" fill="#257AF4" d="M35.2021333,19.2 C34.8261333,19.2 34.4621333,19.3328 34.1741333,19.5745333 C33.8861333,19.8161333 33.6924,20.1516 33.6270667,20.5218667 L28.8584,41.1718667 L28.8614667,41.1750667 C28.8226667,41.3133333 28.8026667,41.4564 28.8021333,41.6 C28.8021333,42.0244 28.9706667,42.4313333 29.2706667,42.7314667 C29.5708,43.0314667 29.9777333,43.2 30.4021333,43.2 L39.2021333,43.2 L36.8333333,58.8813333 C36.8122667,58.9862667 36.8018667,59.0930667 36.8021333,59.2 C36.8021333,59.6244 36.9706667,60.0313333 37.2706667,60.3314667 C37.5708,60.6314667 37.9777333,60.8 38.4021333,60.8 C38.6928,60.8 38.978,60.7198667 39.2268,60.5696 C39.4756,60.4193333 39.6789333,60.204 39.8145333,59.9469333 L39.8177333,59.9469333 L50.8926667,39.3437333 L50.8770667,39.3156 C51.0665333,39.0528 51.2021333,38.7485333 51.2021333,38.4 C51.2021333,37.5168 50.4853333,36.8 49.6021333,36.8 L40.8021333,36.8 L46.2614667,21.4562667 C46.3542667,21.25 46.4021333,21.0262667 46.4021333,20.8 C46.4021333,20.3757333 46.2334667,19.9686667 45.9334667,19.6686667 C45.6333333,19.3686667 45.2264,19.2 44.8021333,19.2 L35.2021333,19.2 Z"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-reliability.svg b/website/images/icons/icon-reliability.svg
deleted file mode 100644
index add18fe0e76..00000000000
--- a/website/images/icons/icon-reliability.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-reliability</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Homepage" transform="translate(-185.000000, -1674.000000)"><g id="Page/Why" transform="translate(185.000000, 1047.000000)"><g id="Feature-3" transform="translate(0.000000, 627.000000)"><g id="icon-reliability" transform="translate(0.000000, 0.000000)"><circle id="Oval" cx="40" cy="40" r="40" fill="#F1F6F9" fill-rule="nonzero"/><path id="Path" stroke="#257AF4" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="M39.8666667,62.2222222 C39.8666667,62.2222222 57.6444444,53.3333333 57.6444444,40 L57.6444444,24.4444444 L39.8666667,17.7777778 L22.0888889,24.4444444 L22.0888889,40 C22.0888889,53.3333333 39.8666667,62.2222222 39.8666667,62.2222222 Z"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-scalability.svg b/website/images/icons/icon-scalability.svg
deleted file mode 100644
index 9b015300f99..00000000000
--- a/website/images/icons/icon-scalability.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-scalability</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Homepage" fill-rule="nonzero" transform="translate(-741.000000, -1263.000000)"><g id="Page/Why" transform="translate(185.000000, 1047.000000)"><g id="Feature-2" transform="translate(556.000000, 216.000000)"><g id="icon-scalability" transform="translate(0.000000, 0.000000)"><circle id="Oval" cx="40" cy="40" r="40" fill="#F1F6F9"/><path id="Shape" fill="#257AF4" d="M25.602,22.4 C25.39,22.3969333 25.1794667,22.4361333 24.9826667,22.5152 C24.786,22.5942667 24.6068,22.7116 24.4558667,22.8605333 C24.3049333,23.0093333 24.1849333,23.1868 24.1032,23.3824 C24.0213333,23.578 23.9792,23.788 23.9792,24 C23.9792,24.212 24.0213333,24.422 24.1032,24.6176 C24.1849333,24.8132 24.3049333,24.9905333 24.4558667,25.1394667 C24.6068,25.2882667 24.786,25.4057333 24.9826667,25.4848 C25.1794667,25.5638667 25.39,25.6029333 25.602,25.6 L39.9769333,25.6 L54.402,25.6 C54.614,25.6029333 54.8245333,25.5638667 55.0212,25.4848 C55.218,25.4057333 55.3970667,25.2882667 55.548,25.1394667 C55.6990667,24.9905333 55.8189333,24.8132 55.9008,24.6176 C55.9825333,24.422 56.0248,24.212 56.0248,24 C56.0248,23.788 55.9825333,23.578 55.9008,23.3824 C55.8189333,23.1868 55.6990667,23.0093333 55.548,22.8605333 C55.3970667,22.7116 55.218,22.5942667 55.0212,22.5152 C54.8245333,22.4361333 54.614,22.3969333 54.402,22.4 L25.602,22.4 Z M39.9769333,25.599807 C39.5613333,25.6066667 39.1645333,25.7746667 38.8706667,26.0686667 L35.6706667,29.2686667 C35.5172,29.4161333 35.3945333,29.5928 35.3101333,29.7881333 C35.2256,29.9836 35.1810667,30.1938667 35.1787197,30.4066667 C35.1766667,30.6196 35.2170667,30.8308 35.2974667,31.0278667 C35.378,31.2249333 35.4969333,31.404 35.6474667,31.5545333 C35.798,31.7050667 35.9770667,31.824 36.1741333,31.9044 C36.3712,31.9849333 36.5824,32.0252 36.7952,32.0230667 C37.0081333,32.0209333 37.2184,31.9762667 37.4137333,31.8918667 C37.6092,31.8073333 37.7857333,31.6848 37.9332,31.5312 L38.402,31.0625333 L38.402,48.9374667 L37.9332,48.4686667 C37.7841333,48.3154667 37.6057333,48.1936 37.4088,48.1104 C37.2118667,48.0272 37.0001333,47.9844 36.7862667,47.9844 C36.468,47.9844 36.1569333,48.0794667 35.8929333,48.2572 C35.6289333,48.4350667 35.424,48.6874667 35.3041333,48.9824 C35.1844,49.2773333 35.1553333,49.6012 35.2206667,49.9126667 C35.2858667,50.2242667 35.4426667,50.5092 35.6706667,50.7312 L38.8706667,53.9312 C39.0222667,54.0828 39.2026667,54.2024 39.4012,54.2829333 C39.5998667,54.3634667 39.8126667,54.4032 40.0269333,54.400179 C40.4425333,54.3933333 40.8393333,54.2252 41.1332,53.9312 L44.3332,50.7312 C44.5656,50.5077333 44.7250667,50.2193333 44.7906667,49.9037333 C44.8564,49.5881333 44.8251472,49.2601333 44.7012,48.9625333 C44.5772,48.6649333 44.3662667,48.4117333 44.096,48.236 C43.8256,48.0604 43.5086667,47.9705333 43.1862667,47.9781333 C42.7642667,47.9881333 42.3633333,48.1644 42.0706667,48.4686667 L41.602,48.9374667 L41.602,31.0625333 L42.0706667,31.5312 C42.2181333,31.6848 42.3946667,31.8073333 42.5901333,31.8918667 C42.7856,31.9762667 42.9958667,32.0209333 43.2086667,32.0230667 C43.4216,32.0252 43.6326667,31.9849333 43.8297333,31.9044 C44.0269333,31.824 44.2058667,31.7050667 44.3564,31.5545333 C44.5069333,31.404 44.626,31.2249333 44.7064,31.0278667 C44.7869333,30.8308 44.8272,30.6196 44.8251472,30.4066667 C44.8229333,30.1938667 44.7782667,29.9836 44.6938667,29.7881333 C44.6093333,29.5928 44.4868,29.4161333 44.3332,29.2686667 L41.1332,26.0686667 C40.9817333,25.9172 40.8013333,25.7976 40.6026667,25.7170667 C40.404,25.6365333 40.1912,25.5966667 39.9769333,25.599807 Z M40.0269333,54.4 L25.602,54.4 C25.39,54.3969333 25.1794667,54.4361333 24.9826667,54.5152 C24.786,54.5942667 24.6068,54.7116 24.4558667,54.8605333 C24.3049333,55.0093333 24.1849333,55.1868 24.1032,55.3824 C24.0213333,55.578 23.9792,55.788 23.9792,56 C23.9792,56.212 24.0213333,56.422 24.1032,56.6176 C24.1849333,56.8132 24.3049333,56.9905333 24.4558667,57.1394667 C24.6068,57.2882667 24.786,57.4057333 24.9826667,57.4848 C25.1794667,57.5638667 25.39,57.6029333 25.602,57.6 L54.402,57.6 C54.614,57.6029333 54.8245333,57.5638667 55.0212,57.4848 C55.218,57.4057333 55.3970667,57.2882667 55.548,57.1394667 C55.6990667,56.9905333 55.8189333,56.8132 55.9008,56.6176 C55.9825333,56.422 56.0248,56.212 56.0248,56 C56.0248,55.788 55.9825333,55.578 55.9008,55.3824 C55.8189333,55.1868 55.6990667,55.0093333 55.548,54.8605333 C55.3970667,54.7116 55.218,54.5942667 55.0212,54.5152 C54.8245333,54.4361333 54.614,54.3969333 54.402,54.4 L40.0269333,54.4 Z M25.602,28.8 C25.1776,28.8 24.7706667,28.9685333 24.4705333,29.2686667 C24.1705333,29.5686667 24.002,29.9756 24.002,30.4 C24.002,30.8242667 24.1705333,31.2313333 24.4705333,31.5313333 C24.7706667,31.8314667 25.1776,32 25.602,32 C26.0262667,32 26.4333333,31.8314667 26.7333333,31.5313333 C27.0333333,31.2313333 27.202,30.8242667 27.202,30.4 C27.202,29.9756 27.0333333,29.5686667 26.7333333,29.2686667 C26.4333333,28.9685333 26.0262667,28.8 25.602,28.8 Z M54.402,28.8 C53.9776,28.8 53.5706667,28.9685333 53.2705333,29.2686667 C52.9705333,29.5686667 52.802,29.9756 52.802,30.4 C52.802,30.8242667 52.9705333,31.2313333 53.2705333,31.5313333 C53.5706667,31.8314667 53.9776,32 54.402,32 C54.8262667,32 55.2332,31.8314667 55.5333333,31.5313333 C55.8333333,31.2313333 56.002,30.8242667 56.002,30.4 C56.002,29.9756 55.8333333,29.5686667 55.5333333,29.2686667 C55.2332,28.9685333 54.8262667,28.8 54.402,28.8 Z M25.602,35.2 C25.1776,35.2 24.7706667,35.3685333 24.4705333,35.6686667 C24.1705333,35.9686667 24.002,36.3756 24.002,36.8 C24.002,37.2242667 24.1705333,37.6313333 24.4705333,37.9313333 C24.7706667,38.2314667 25.1776,38.4 25.602,38.4 C26.0262667,38.4 26.4333333,38.2314667 26.7333333,37.9313333 C27.0333333,37.6313333 27.202,37.2242667 27.202,36.8 C27.202,36.3756 27.0333333,35.9686667 26.7333333,35.6686667 C26.4333333,35.3685333 26.0262667,35.2 25.602,35.2 Z M54.402,35.2 C53.9776,35.2 53.5706667,35.3685333 53.2705333,35.6686667 C52.9705333,35.9686667 52.802,36.3756 52.802,36.8 C52.802,37.2242667 52.9705333,37.6313333 53.2705333,37.9313333 C53.5706667,38.2314667 53.9776,38.4 54.402,38.4 C54.8262667,38.4 55.2332,38.2314667 55.5333333,37.9313333 C55.8333333,37.6313333 56.002,37.2242667 56.002,36.8 C56.002,36.3756 55.8333333,35.9686667 55.5333333,35.6686667 C55.2332,35.3685333 54.8262667,35.2 54.402,35.2 Z M25.602,41.6 C25.1776,41.6 24.7706667,41.7685333 24.4705333,42.0686667 C24.1705333,42.3686667 24.002,42.7756 24.002,43.2 C24.002,43.6242667 24.1705333,44.0313333 24.4705333,44.3313333 C24.7706667,44.6314667 25.1776,44.8 25.602,44.8 C26.0262667,44.8 26.4333333,44.6314667 26.7333333,44.3313333 C27.0333333,44.0313333 27.202,43.6242667 27.202,43.2 C27.202,42.7756 27.0333333,42.3686667 26.7333333,42.0686667 C26.4333333,41.7685333 26.0262667,41.6 25.602,41.6 Z M54.402,41.6 C53.9776,41.6 53.5706667,41.7685333 53.2705333,42.0686667 C52.9705333,42.3686667 52.802,42.7756 52.802,43.2 C52.802,43.6242667 52.9705333,44.0313333 53.2705333,44.3313333 C53.5706667,44.6314667 53.9776,44.8 54.402,44.8 C54.8262667,44.8 55.2332,44.6314667 55.5333333,44.3313333 C55.8333333,44.0313333 56.002,43.6242667 56.002,43.2 C56.002,42.7756 55.8333333,42.3686667 55.5333333,42.0686667 C55.2332,41.7685333 54.8262667,41.6 54.402,41.6 Z M25.602,48 C25.1776,48 24.7706667,48.1685333 24.4705333,48.4686667 C24.1705333,48.7686667 24.002,49.1756 24.002,49.6 C24.002,50.0242667 24.1705333,50.4313333 24.4705333,50.7313333 C24.7706667,51.0314667 25.1776,51.2 25.602,51.2 C26.0262667,51.2 26.4333333,51.0314667 26.7333333,50.7313333 C27.0333333,50.4313333 27.202,50.0242667 27.202,49.6 C27.202,49.1756 27.0333333,48.7686667 26.7333333,48.4686667 C26.4333333,48.1685333 26.0262667,48 25.602,48 Z M54.402,48 C53.9776,48 53.5706667,48.1685333 53.2705333,48.4686667 C52.9705333,48.7686667 52.802,49.1756 52.802,49.6 C52.802,50.0242667 52.9705333,50.4313333 53.2705333,50.7313333 C53.5706667,51.0314667 53.9776,51.2 54.402,51.2 C54.8262667,51.2 55.2332,51.0314667 55.5333333,50.7313333 C55.8333333,50.4313333 56.002,50.0242667 56.002,49.6 C56.002,49.1756 55.8333333,48.7686667 55.5333333,48.4686667 C55.2332,48.1685333 54.8262667,48 54.402,48 Z"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-security.svg b/website/images/icons/icon-security.svg
deleted file mode 100644
index da341224ed3..00000000000
--- a/website/images/icons/icon-security.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-security</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Homepage" fill-rule="nonzero" transform="translate(-741.000000, -1674.000000)"><g id="Page/Why" transform="translate(185.000000, 1047.000000)"><g id="Feature-4" transform="translate(556.000000, 627.000000)"><g id="icon-security" transform="translate(0.000000, 0.000000)"><circle id="Oval" cx="40" cy="40" r="40" fill="#F1F6F9"/><path id="Shape" fill="#257AF4" d="M24,24 C21.794,24 20,25.794 20,28 L20,52 C20,54.206 21.794,56 24,56 C24,57.104 24.896,58 26,58 C27.104,58 28,57.104 28,56 L52,56 C52,57.104 52.896,58 54,58 C55.104,58 56,57.104 56,56 C58.206,56 60,54.206 60,52 L60,28 C60,25.794 58.206,24 56,24 L24,24 Z M53.1757333,30.8281333 C53.6877333,30.8281333 54.1998667,31.0201333 54.5898667,31.4101333 C55.3718667,32.1921333 55.3698667,33.4582667 54.5898667,34.2382667 L52.8672,35.9609333 C53.5712,37.1529333 54,38.52 54,40 C54,41.48 53.5712,42.8490667 52.8672,44.0390667 L54.7656,45.9374667 C55.5456,46.7174667 55.5456,47.9856 54.7656,48.7656 C53.9856,49.5476 52.7194667,49.5456 51.9374667,48.7656 L50.0390667,46.8672 C48.8490667,47.5692 47.48,48 46,48 C44.52,48 43.1509333,47.5712 41.9609333,46.8672 L40.2382667,48.5898667 C39.4582667,49.3698667 38.1901333,49.3698667 37.4101333,48.5898667 C36.6301333,47.8098667 36.6301333,46.5417333 37.4101333,45.7617333 L39.1328,44.0390667 C38.4288,42.8490667 38,41.48 38,40 C38,38.52 38.4288,37.1509333 39.1328,35.9609333 L37.5898667,34.414 C36.8098667,33.634 36.8098667,32.3698667 37.5898667,31.5898667 C38.3698667,30.8098667 39.634,30.8098667 40.414,31.5898667 L41.9609333,33.1328 C43.1509333,32.4288 44.52,32 46,32 C47.48,32 48.8490667,32.4288 50.0390667,33.1328 L51.7617333,31.4101333 C52.1517333,31.0201333 52.6637333,30.8281333 53.1757333,30.8281333 Z M28,34 C29.104,34 30,34.896 30,36 L30,44 C30,45.104 29.104,46 28,46 C26.896,46 26,45.104 26,44 L26,36 C26,34.896 26.896,34 28,34 Z M46,36 C44.9392,36 43.9217333,36.4214667 43.1716,37.1716 C42.4214667,37.9217333 42,38.9392 42,40 C42,41.0608 42.4214667,42.0782667 43.1716,42.8284 C43.9217333,43.5785333 44.9392,44 46,44 C47.0608,44 48.0782667,43.5785333 48.8284,42.8284 C49.5785333,42.0782667 50,41.0608 50,40 C50,38.9392 49.5785333,37.9217333 48.8284,37.1716 C48.0782667,36.4214667 47.0608,36 46,36 Z"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-slack-black.svg b/website/images/icons/icon-slack-black.svg
deleted file mode 100644
index 03420c85534..00000000000
--- a/website/images/icons/icon-slack-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14" version="1.1" viewBox="0 0 14 14"><title>icon-slack</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Link/Slack" fill="#212529" fill-rule="nonzero"><g id="Icon/Slack"><path id="Shape" d="M5.13302911,0 C4.35912849,0.000570846075 3.73280093,0.627359837 3.73337253,1.39971458 C3.73280093,2.17206932 4.35970047,2.79885831 5.13360109,2.79942915 L6.53382966,2.79942915 L6.53382966,1.40028542 C6.53440125,0.627930683 5.90750171,0.00114169215 5.13302911,0 C5.13360109,0 5.13360109,0 5.13302911,0 M5.13302911,3.73333333 L1.40023129,3.73333333 C0.626330674,3.73390418 -0.000568866549,4.36069317 1.55890848e-06,5.13304791 C-0.00114085518,5.90540265 0.625758685,6.53219164 1.3996593,6.53333333 L5.13302911,6.53333333 C5.90692972,6.53276249 6.53382926,5.9059735 6.53325767,5.13361876 C6.53382926,4.36069317 5.90692972,3.73390418 5.13302911,3.73333333 Z"/><path id="Shape" d="M13.9999973,5.13304791 C14.0005689,4.36069317 13.3736693,3.73390418 12.5997687,3.73333333 C11.8258681,3.73390418 11.1989685,4.36069317 11.1995401,5.13304791 L11.1995401,6.53333333 L12.5997687,6.53333333 C13.3736693,6.53276249 14.0005689,5.9059735 13.9999973,5.13304791 Z M10.2666275,5.13304791 L10.2666275,1.39971458 C10.2671991,0.627930683 9.64087151,0.00114169215 8.86697089,0 C8.09307028,0.000570846075 7.46617074,0.627359837 7.46674116,1.39971458 L7.46674116,5.13304791 C7.46559875,5.90540265 8.09249829,6.53219164 8.86639891,6.53333333 C9.64029953,6.53276249 10.2671991,5.9059735 10.2666275,5.13304791 L10.2666275,5.13304791 Z"/><path id="Shape" d="M8.86639891,14 C9.64029953,13.9994292 10.2671991,13.3726402 10.2666275,12.6002854 C10.2671991,11.8279307 9.64029953,11.2011417 8.86639891,11.2005708 L7.46617034,11.2005708 L7.46617034,12.6002854 C7.46559875,13.3720693 8.09249829,13.9988583 8.86639891,14 Z M8.86639891,10.2660958 L12.5997687,10.2660958 C13.3736693,10.265525 14.0005689,9.63873598 13.9999984,8.86638124 C14.0011409,8.0940265 13.3742413,7.46723751 12.6003407,7.46609582 L8.86697089,7.46609582 C8.09307028,7.46666667 7.46617074,8.09345566 7.46674233,8.8658104 C7.46617074,9.63873598 8.09249829,10.265525 8.86639891,10.2660958 L8.86639891,10.2660958 Z"/><path id="Shape" d="M2.73097794e-06,8.86638124 C-0.00056886655,9.63873598 0.626330674,10.265525 1.40023129,10.2660958 C2.17413191,10.265525 2.80103145,9.63873598 2.80045986,8.86638124 L2.80045986,7.46666667 L1.40023129,7.46666667 C0.626330674,7.46723751 -0.00056886655,8.0940265 2.73097794e-06,8.86638124 Z M3.73337136,8.86638124 L3.73337136,12.5997146 C3.73222895,13.3720693 4.35912849,13.9988583 5.13302911,14 C5.90692972,13.9994292 6.53382926,13.3726402 6.53325884,12.6002854 L6.53325884,8.86752294 C6.53440125,8.0951682 5.90750171,7.4683792 5.13360109,7.46723751 C4.35912849,7.46723751 3.73280093,8.0940265 3.73337136,8.86638124 C3.73337136,8.86638124 3.73337136,8.86695209 3.73337136,8.86638124"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-slack.svg b/website/images/icons/icon-slack.svg
deleted file mode 100644
index 42e33c4d65f..00000000000
--- a/website/images/icons/icon-slack.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-slack</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="icon-slack" fill-rule="nonzero"><path id="Shape" fill="#36C5F0" d="M29.3315949,0 C24.9093056,0.00326197757 21.3302911,3.58491335 21.3335573,7.99836901 C21.3302911,12.4118247 24.9125741,15.993476 29.3348634,15.996738 L37.3361695,15.996738 L37.3361695,8.00163099 C37.3394357,3.58817533 33.7571526,0.00652395515 29.3315949,0 C29.3348634,0 29.3348634,0 29.3315949,0 M29.3315949,21.3333333 L8.00132167,21.3333333 C3.57903242,21.3365953 -0.003250666,24.9182467 8.9080479e-06,29.3317023 C-0.00651917247,33.745158 3.57576392,37.3268094 7.99805317,37.3333333 L29.3315949,37.3333333 C33.7538841,37.3300714 37.3361672,33.74842 37.332901,29.3349643 C37.3361672,24.9182467 33.7538841,21.3365953 29.3315949,21.3333333 Z"/><path id="Shape" fill="#2EB67D" d="M79.9999844,29.3317023 C80.0032507,24.9182467 76.4209676,21.3365953 71.9986783,21.3333333 C67.5763891,21.3365953 63.994106,24.9182467 63.9973723,29.3317023 L63.9973723,37.3333333 L71.9986783,37.3333333 C76.4209676,37.3300714 80.0032507,33.74842 79.9999844,29.3317023 Z M58.6664427,29.3317023 L58.6664427,7.99836901 C58.6697089,3.58817533 55.0906944,0.00652395515 50.6684051,0 C46.2461159,0.00326197757 42.6638328,3.58491335 42.6670923,7.99836901 L42.6670923,29.3317023 C42.6605643,33.745158 46.2428474,37.3268094 50.6651366,37.3333333 C55.0874259,37.3300714 58.6697089,33.74842 58.6664427,29.3317023 L58.6664427,29.3317023 Z"/><path id="Shape" fill="#ECB22E" d="M50.6651366,80 C55.0874259,79.996738 58.6697089,76.4150866 58.6664427,72.001631 C58.6697089,67.5881753 55.0874259,64.006524 50.6651366,64.003262 L42.6638305,64.003262 L42.6638305,72.001631 C42.6605643,76.4118247 46.2428474,79.993476 50.6651366,80 Z M50.6651366,58.6634047 L71.9986783,58.6634047 C76.4209676,58.6601427 80.0032507,55.0784913 79.9999911,50.6650357 C80.0065192,46.25158 76.4242361,42.6699286 72.0019468,42.6634047 L50.6684051,42.6634047 C46.2461159,42.6666667 42.6638328,46.248318 42.667099,50.6617737 C42.6638328,55.0784913 46.2428474,58.6601427 50.6651366,58.6634047 L50.6651366,58.6634047 Z"/><path id="Shape" fill="#E01E5A" d="M1.56055896e-05,50.6650357 C-0.003250666,55.0784913 3.57903242,58.6601427 8.00132167,58.6634047 C12.4236109,58.6601427 16.005894,55.0784913 16.0026277,50.6650357 L16.0026277,42.6666667 L8.00132167,42.6666667 C3.57903242,42.6699286 -0.003250666,46.25158 1.56055896e-05,50.6650357 Z M21.3335506,50.6650357 L21.3335506,71.998369 C21.3270225,76.4118247 24.9093056,79.993476 29.3315949,80 C33.7538841,79.996738 37.3361672,76.4150866 37.3329077,72.001631 L37.3329077,50.6715596 C37.3394357,46.258104 33.7571526,42.6764526 29.3348634,42.6699286 C24.9093056,42.6699286 21.3302911,46.25158 21.3335506,50.6650357 C21.3335506,50.6650357 21.3335506,50.6682977 21.3335506,50.6650357"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-stack-overflow.svg b/website/images/icons/icon-stack-overflow.svg
deleted file mode 100644
index c8244ac9e4c..00000000000
--- a/website/images/icons/icon-stack-overflow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="80" version="1.1" viewBox="0 0 64 80"><title>icon-stack-overflow</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="icon-stack-overflow" fill-rule="nonzero"><polygon id="Path" fill="#607D8B" points="0 47.568 6.399 47.568 6.399 77.838 0 77.838"/><polygon id="Path" fill="#607D8B" points="0 73.514 55.459 73.514 55.459 80 0 80"/><path id="Shape" fill="#607D8B" d="M49.0601253,47.5675676 L55.4592721,47.5675676 L55.4592721,77.8378378 L49.0601253,77.8378378 L49.0601253,47.5675676 Z M12.7982936,60.5405405 L42.6609785,60.5405405 L42.6609785,67.027027 L12.7982936,67.027027 L12.7982936,60.5405405 Z"/><polygon id="Path" fill="#A68A6E" points="12.973 48.129 42.665 51.368 41.98 57.817 12.289 54.578"/><polygon id="Path" fill="#EF6C00" points="59.449 0 64 29.915 57.674 30.903 53.123 .989"/><polygon id="Path" fill="#FF9800" points="41.528 4.836 56.099 31.254 50.512 34.42 35.941 8.003"/><polygon id="Path" fill="#D38B28" points="24.53 18.489 49.059 35.747 45.409 41.078 20.88 23.82"/><polygon id="Path" fill="#C09553" points="16.85 32.903 44.948 43.149 42.781 49.254 14.683 39.009"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-telegram.svg b/website/images/icons/icon-telegram.svg
deleted file mode 100644
index 3bf90eea1a4..00000000000
--- a/website/images/icons/icon-telegram.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-telegram</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="icon-telegram" fill-rule="nonzero"><path id="Path" fill="#29B6F6" d="M40,0 C29.3914,0 19.2172,4.21428 11.71572,11.71572 C4.21428,19.2172 0,29.3914 0,40 C0,50.6086 4.21428,60.7828 11.71572,68.2842 C19.2172,75.7858 29.3914,80 40,80 C50.6086,80 60.7828,75.7858 68.2842,68.2842 C75.7858,60.7828 80,50.6086 80,40 C80,29.3914 75.7858,19.2172 68.2842,11.71572 C60.7828,4.21428 50.6086,0 40,0 Z"/><path id="Path" fill="#FFF" d="M59.9,21.9999936 L52.408,60.252 C52.408,60.252 52.086,61.9999936 49.918,61.9999936 C48.766,61.9999936 48.172,61.452 48.172,61.452 L31.944,47.986 L24.004,43.984 L13.814,41.274 C13.814,41.274 12,40.75 12,39.25 C12,37.9999936 13.866,37.404 13.866,37.404 L56.498,20.468 C56.496,20.466 57.8,19.998 58.75,19.9999936 C59.334,19.9999936 60,20.25 60,20.9999936 C60,21.4999936 59.9,21.9999936 59.9,21.9999936 Z"/><path id="Path" fill="#B0BEC5" d="M37.9996,53.01 L31.1476,59.758 C31.1476,59.758 30.8496,59.988 30.4516,59.998 C30.3136,60.002 30.1656,59.98 30.0136,59.912 L31.9416,47.982 L37.9996,53.01 Z"/><path id="Path" fill="#CFD8DC" d="M51.794,28.3918 C51.456,27.9518 50.832,27.8718 50.392,28.2058 L24,43.9998 C24,43.9998 28.212,55.7838 28.854,57.8238 C29.498,59.8658 30.014,59.9138 30.014,59.9138 L31.942,47.9838 L51.606,29.7918 C52.046,29.4578 52.128,28.8318 51.794,28.3918 Z"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-twitter-gray.svg b/website/images/icons/icon-twitter-gray.svg
deleted file mode 100644
index b209f7b07cb..00000000000
--- a/website/images/icons/icon-twitter-gray.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31" height="24" version="1.1" viewBox="0 0 31 24"><title>icon-twitter-gray</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Twitter-Link" fill="#6C757D" fill-rule="nonzero"><g id="twitter"><path id="Path" d="M30.2608696,2.8377931 C29.1488762,3.32275862 27.9528319,3.64634483 26.691228,3.79944828 C27.9738447,3.04965517 28.9606022,1.8537931 29.4237226,0.441103448 C28.2234758,1.1337931 26.8937906,1.64275862 25.4792141,1.91089655 C24.34957,0.731586207 22.7383143,0 20.9530733,0 C17.5237967,0 14.7442335,2.71282759 14.7442335,6.05793103 C14.7442335,6.53131034 14.8005476,6.99227586 14.9064518,7.44 C9.74740771,7.18510345 5.17167689,4.7702069 2.11051802,1.10565517 C1.57259228,2.00110345 1.27000905,3.04965517 1.27000905,4.15613793 C1.27000905,6.25903448 2.36351122,8.11034483 4.03110622,9.20110345 C3.01322465,9.17048276 2.05504443,8.89158621 1.21621648,8.44468966 C1.21621648,8.46289655 1.21621648,8.4902069 1.21621648,8.51586207 C1.21621648,11.4546207 3.35699282,13.9017931 6.1945763,14.4587586 C5.67598227,14.5986207 5.12797042,14.6764138 4.5631484,14.6764138 C4.16222562,14.6764138 3.77138895,14.6317241 3.39315992,14.5646897 C4.18323835,16.9663448 6.4753063,18.7216552 9.19099077,18.7737931 C7.0661841,20.3958621 4.39000355,21.3674483 1.48013629,21.3674483 C0.977511929,21.3674483 0.485814183,21.3393103 -7.46521926e-16,21.2813793 C2.74930483,22.9953103 6.01386688,24 9.51794876,24 C20.9362631,24 27.1829257,14.7674483 27.1829257,6.75806897 C27.1829257,6.49572414 27.1745206,6.2342069 27.161913,5.976 C28.380651,5.12855172 29.4312872,4.05931034 30.2608696,2.8377931 Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-twitter.svg b/website/images/icons/icon-twitter.svg
deleted file mode 100644
index ef11bb2f0ba..00000000000
--- a/website/images/icons/icon-twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Logo" x="0" y="0" version="1.1" viewBox="0 0 248 204" xml:space="preserve" style="enable-background:new 0 0 248 204"><style type="text/css">.st0{fill:#1d9bf0}</style><g id="Logo_1_"><path id="white_background" d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04 C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66 c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64 c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76 c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26 c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z" class="st0"/></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-youtube-black.svg b/website/images/icons/icon-youtube-black.svg
deleted file mode 100644
index bb20f823a06..00000000000
--- a/website/images/icons/icon-youtube-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="14" version="1.1" viewBox="0 0 20 14"><title>icon-youtube</title><defs><path id="path-1" d="M19.5820806,2.19052604 C19.3520638,1.32828646 18.6743546,0.649213542 17.8138699,0.418760417 C16.2541794,0 10,0 10,0 C10,0 3.74585724,0 2.18613014,0.418760417 C1.32564535,0.64925 0.647936221,1.32828646 0.417919412,2.19052604 C0,3.75338542 0,7.01414583 0,7.01414583 C0,7.01414583 0,10.2749062 0.417919412,11.8377656 C0.647936221,12.7000052 1.32564535,13.3507865 2.18613014,13.5812396 C3.74585724,14 10,14 10,14 C10,14 16.2541428,14 17.8138699,13.5812396 C18.6743546,13.3507865 19.3520638,12.7000052 19.5820806,11.8377656 C20,10.2749062 20,7.01414583 20,7.01414583 C20,7.01414583 20,3.75338542 19.5820806,2.19052604 Z M7.95453131,9.97467188 L7.95453131,4.05361979 L13.1817832,7.01421875 L7.95453131,9.97467188 Z"/></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="Icon/Youtube"><mask id="mask-2" fill="#fff"><use xlink:href="#path-1"/></mask><use id="Brands/youtube" fill="#212529" fill-rule="nonzero" xlink:href="#path-1"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-youtube.svg b/website/images/icons/icon-youtube.svg
deleted file mode 100644
index 224fc1c49cf..00000000000
--- a/website/images/icons/icon-youtube.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="80" height="80" version="1.1" viewBox="0 0 80 80"><title>icon-youtube</title><g id="Symbols" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="icon-youtube" fill-rule="nonzero" transform="translate(0.000000, 10.000000)"><path id="Path" fill="#FF3D00" d="M78.2044888,49.8 C77.4064838,54 74.0149626,57.2 69.8254364,57.8 C63.2418953,58.8 52.2693267,60 39.9002494,60 C27.7306733,60 16.7581047,58.8 9.97506234,57.8 C5.78553616,57.2 2.39401496,54 1.59600998,49.8 C0.798004988,45.2 0,38.4 0,30 C0,21.6 0.798004988,14.8 1.59600998,10.2 C2.39401496,6 5.78553616,2.8 9.97506234,2.2 C16.5586035,1.2 27.5311721,0 39.9002494,0 C52.2693267,0 63.042394,1.2 69.8254364,2.2 C74.0149626,2.8 77.4064838,6 78.2044888,10.2 C79.0024938,14.8 80,21.6 80,30 C79.8004988,38.4 79.0024938,45.2 78.2044888,49.8 Z"/><polygon id="Path" fill="#FFF" points="31.92 44 31.92 16 55.86 30"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/index/blog.svg b/website/images/index/blog.svg
deleted file mode 100644
index 871e5c753bc..00000000000
--- a/website/images/index/blog.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" fill="none" viewBox="0 0 40 40"><g clip-path="url(#clip0)"><path fill="#fff" fill-opacity=".8" d="M10.0013 3.3335C8.16797 3.3335 6.66797 4.8335 6.66797 6.66683V33.3335C6.66797 35.1668 8.16797 36.6668 10.0013 36.6668H28.6211L21.668 29.7137V21.6668H29.7148L33.3346 25.2866V13.3335L23.3346 3.3335H10.0013ZM25.0013 25.0002V28.3335L33.5788 36.911L36.9121 33.5776L28.3346 25.0002H25.0013ZM38.0905 34.756L34.7572 38.0894L36.4238 39.756C36.7488 40.081 37.2772 40.081 37.6022 39.756L39.7572 37.6011C40.0822 37.2744 40.0822 36.7477 39.7572 36.4227L38.0905 34.756Z"/></g><defs><clipPath id="clip0"><rect width="40" height="40" fill="#fff"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/website/images/index/flash.svg b/website/images/index/flash.svg
deleted file mode 100644
index ddb8f911c3c..00000000000
--- a/website/images/index/flash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" fill="none" viewBox="0 0 60 60"><circle cx="30" cy="30" r="30" fill="#FAFAFA"/><path fill="#F14600" d="M26.4016 14.4C26.1196 14.4001 25.8466 14.4996 25.6306 14.6809C25.4146 14.8621 25.2693 15.1137 25.2203 15.3914L21.6438 30.8789L21.6461 30.8813C21.617 30.985 21.602 31.0923 21.6016 31.2C21.6016 31.5183 21.728 31.8235 21.953 32.0486C22.1781 32.2736 22.4833 32.4 22.8016 32.4H29.4016L27.625 44.161C27.6092 44.2397 27.6014 44.3198 27.6016 44.4C27.6016 44.7183 27.728 45.0235 27.953 45.2486C28.1781 45.4736 28.4833 45.6 28.8016 45.6C29.0196 45.5997 29.2335 45.5399 29.4201 45.4272C29.6067 45.3145 29.7592 45.153 29.8609 44.9602H29.8633L38.1695 29.5078L38.1578 29.4867C38.2999 29.2896 38.4016 29.0614 38.4016 28.8C38.4016 28.1376 37.864 27.6 37.2016 27.6H30.6016L34.6961 16.0922C34.7657 15.9375 34.8016 15.7697 34.8016 15.6C34.8016 15.2818 34.6751 14.9765 34.4501 14.7515C34.225 14.5265 33.9198 14.4 33.6016 14.4H26.4016Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/github.svg b/website/images/index/github.svg
deleted file mode 100644
index fc532813365..00000000000
--- a/website/images/index/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#eee" d="M21.8005 4.19995C12.6005 5.19995 5.20051 12.6 4.20051 21.6C3.20051 30.9999 8.60051 39.3999 16.8005 42.5999C17.4005 42.7999 18.0005 42.3999 18.0005 41.5999V38.3999C18.0005 38.3999 17.2005 38.5999 16.2005 38.5999C13.4005 38.5999 12.2005 36.1999 12.0005 34.7999C11.8005 33.9999 11.4005 33.3999 10.8005 32.7999C10.2005 32.5999 10.0005 32.6 10.0005 32.4C10.0005 32 10.6005 31.9999 10.8005 31.9999C12.0005 31.9999 13.0005 33.3999 13.4005 33.9999C14.4005 35.5999 15.6005 35.9999 16.2005 35.9999C17.0005 35.9999 17.6005 35.7999 18.0005 35.5999C18.2005 34.1999 18.8005 32.7999 20.0005 31.9999C15.4005 30.9999 12.0005 28.4 12.0005 24C12.0005 21.8 13.0005 19.6 14.4005 18C14.2005 17.6 14.0005 16.6 14.0005 15.2C14.0005 14.4 14.0005 13.4 14.4005 12.6C14.4005 12.2 14.8005 12 15.0005 12H15.2005C16.2005 12.2 18.2005 12.8 20.0005 14.6C21.2005 14.2 22.6005 14 24.0005 14C25.4005 14 26.8005 14.2 28.0005 14.6C29.8005 12.8 32.0005 12.2 33.0005 12H33.2005C33.6005 12 33.8005 12.2 34.0005 12.6C34.0005 13.4 34.0005 14.4 34.0005 15.2C34.0005 16.8 33.8005 17.6 33.6005 18C35.0005 19.6 36.0005 21.6 36.0005 24C36.0005 28.4 32.6005 30.9999 28.0005 31.9999C29.2005 32.9999 30.0005 34.7999 30.0005 36.5999V41.7999C30.0005 42.3999 30.6005 42.9999 31.4005 42.7999C38.8005 39.7999 44.0005 32.5999 44.0005 24.2C44.0005 12.2 33.8005 2.79995 21.8005 4.19995Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/google-groups.svg b/website/images/index/google-groups.svg
deleted file mode 100644
index fc879fcdf0f..00000000000
--- a/website/images/index/google-groups.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#FFC107" d="M43.611 19.083H42V19H24V27H35.303C33.654 31.657 29.223 35 24 35C17.373 35 12 29.627 12 23C12 16.373 17.373 11 24 11C27.059 11 29.842 12.154 31.961 14.039L37.618 8.382C34.046 5.053 29.268 3 24 3C12.955 3 4 11.955 4 23C4 34.045 12.955 43 24 43C35.045 43 44 34.045 44 23C44 21.659 43.862 20.35 43.611 19.083Z"/><path fill="#FF3D00" d="M6.30469 13.691L12.8757 18.51C14.6537 14.108 18.9597 11 23.9987 11C27.0577 11 29.8407 12.154 31.9597 14.039L37.6167 8.382C34.0447 5.053 29.2667 3 23.9987 3C16.3167 3 9.65469 7.337 6.30469 13.691Z"/><path fill="#4CAF50" d="M23.9998 43.0002C29.1658 43.0002 33.8598 41.0232 37.4088 37.8082L31.2188 32.5702C29.2108 34.0912 26.7148 35.0002 23.9998 35.0002C18.7978 35.0002 14.3808 31.6832 12.7168 27.0542L6.19482 32.0792C9.50482 38.5562 16.2268 43.0002 23.9998 43.0002Z"/><path fill="#1976D2" d="M43.611 19.083H42V19H24V27H35.303C34.511 29.237 33.072 31.166 31.216 32.571C31.217 32.57 31.218 32.57 31.219 32.569L37.409 37.807C36.971 38.205 44 33 44 23C44 21.659 43.862 20.35 43.611 19.083Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/hackernews.svg b/website/images/index/hackernews.svg
deleted file mode 100644
index 0ee57d73c40..00000000000
--- a/website/images/index/hackernews.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" preserveAspectRatio="xMidYMid" version="1.1" viewBox="0 0 256 256"><g><rect width="256" height="256" x="0" y="0" fill="#FB651E"/><path fill="#FFF" d="M119.373653,144.745813 L75.43296,62.4315733 L95.5144533,62.4315733 L121.36192,114.52416 C121.759575,115.452022 122.2235,116.413008 122.753707,117.407147 C123.283914,118.401285 123.747838,119.428546 124.145493,120.48896 C124.410597,120.886615 124.609422,121.251127 124.741973,121.582507 C124.874525,121.913886 125.007075,122.212123 125.139627,122.477227 C125.802386,123.802744 126.39886,125.095105 126.929067,126.354347 C127.459274,127.613589 127.923198,128.773399 128.320853,129.833813 C129.381268,127.580433 130.541078,125.1614 131.80032,122.57664 C133.059562,119.99188 134.351922,117.307747 135.67744,114.52416 L161.92256,62.4315733 L180.612267,62.4315733 L136.27392,145.739947 L136.27392,198.826667 L119.373653,198.826667 L119.373653,144.745813 Z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/index/hardware-efficient.svg b/website/images/index/hardware-efficient.svg
deleted file mode 100644
index f7f06d5a962..00000000000
--- a/website/images/index/hardware-efficient.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1280 960"><defs><style>.a{isolation:isolate}.b{fill:url(#a)}.c{fill:url(#b)}.d{fill:url(#c)}.e{fill:url(#d)}.f{fill:#e7eaee}.g{fill:url(#e)}.ad,.ae,.ak,.am,.an,.as,.au,.ay,.bb,.bc,.h,.x{fill:none;stroke-linecap:round;stroke-miterlimit:10}.h{stroke:#fff}.am,.an,.as,.bb,.bc,.h,.x{stroke-width:4px}.ab,.i{fill:#616172}.i,.t{opacity:.05}.j{fill:url(#f)}.k{fill:#a6b1ba}.l{fill:url(#g)}.m{fill:url(#h)}.n{fill:url(#i)}.o{fill:url(#j)}.p{fill:url(#k)}.aj,.az{opacity:.5}.r{fill:url(#l)}.s{fill:url(#m)}.t{fill:#057afe;mix-blend-mode:multiply}.u{fill:url(#n)}.v{fill:url(#o)}.aa,.w{fill:#444450}.w{opacity:.2}.x{stroke:url(#p)}.ap,.at,.y{opacity:.8}.y{fill:url(#q)}.z{fill:#313138}.ac{fill:#f6f6f6}.ad{stroke:#313138}.ad,.ae,.ak,.au,.ay{stroke-width:2px}.ae{stroke:#616172}.af{fill:#00d880}.ag,.ao{fill:#257af4}.ah{fill:#f8cc47}.ai{fill:#f14600}.aj{fill:url(#r)}.ak{stroke:#dce6ef}.al,.ba{opacity:.3}.al{fill:url(#s)}.am{stroke:#b6c2cb}.an{stroke:#7f8a93}.ao{opacity:.4}.ap{fill:#444451}.aq{fill:url(#t)}.ar{fill:url(#u)}.as{stroke:url(#v)}.at{fill:url(#w)}.au{stroke:#b3c5da}.av{fill:#c40000}.aw{fill:#dd4a07}.ax{fill:#ff571d}.ay{stroke:#dd4a07}.az{fill:url(#x)}.ba{fill:url(#y)}.bb{stroke:#b7c3cc}.bc{stroke:#c5d0da}</style><linearGradient id="a" x1="413.52" x2="866.46" y1="757.37" y2="757.37" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e9ecef"/><stop offset=".32" stop-color="#e6e9ed"/><stop offset=".69" stop-color="#c6ced4"/><stop offset="1" stop-color="#bac3ca"/></linearGradient><linearGradient id="b" x1="413.53" x2="866.47" y1="821.94" y2="821.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e8ebee"/><stop offset=".25" stop-color="#e7eaed"/><stop offset=".54" stop-color="#cbd2d8"/><stop offset=".7" stop-color="#c6cdd3"/><stop offset="1" stop-color="#bbc4cb"/></linearGradient><linearGradient id="c" x1="529.85" x2="750.14" y1="719.76" y2="719.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e9ecef"/><stop offset=".65" stop-color="#c7ced4"/><stop offset="1" stop-color="#c4ccd2"/></linearGradient><linearGradient id="d" x1="644.2" x2="658.87" y1="714.01" y2="633.34" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e9ecef" stop-opacity="0"/><stop offset=".92" stop-color="#818f99"/></linearGradient><linearGradient id="e" x1="618.4" x2="661.58" y1="413.27" y2="413.27" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d5dce4"/><stop offset="1" stop-color="#b1bbc4"/></linearGradient><linearGradient id="f" x1="344.76" x2="592.43" y1="154.84" y2="154.84" xlink:href="#e"/><linearGradient id="g" x1="611.1" x2="668.89" y1="207.77" y2="207.77" xlink:href="#e"/><linearGradient id="h" x1="687.57" x2="935.24" y1="154.84" y2="154.84" xlink:href="#e"/><linearGradient id="i" x1="310.74" x2="335.99" y1="137.64" y2="170.89" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e9ecef"/><stop offset="1" stop-color="#c8d3dd"/></linearGradient><linearGradient id="j" x1="942.14" x2="970.47" y1="139.28" y2="170.62" xlink:href="#i"/><linearGradient id="k" x1="610.3" x2="665.96" y1="123.9" y2="181.9" xlink:href="#i"/><linearGradient id="l" x1="628.19" x2="651.79" y1="94.18" y2="94.18" xlink:href="#e"/><linearGradient id="m" x1="630.42" x2="648.67" y1="53.49" y2="77.49" xlink:href="#i"/><linearGradient id="n" x1="77.96" x2="569.64" y1="577.16" y2="577.16" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b7c3cc"/><stop offset="1" stop-color="#a8b5be"/></linearGradient><linearGradient id="o" x1="66.79" x2="580.8" y1="551.2" y2="551.2" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c8d3dd"/><stop offset="1" stop-color="#8b99a2"/></linearGradient><linearGradient id="p" x1="321.96" x2="551.22" y1="323.99" y2="323.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a8b0b6"/><stop offset="1" stop-color="#7f8a93"/></linearGradient><linearGradient id="q" x1="118.5" x2="529.25" y1="441.22" y2="441.22" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#dfe4ea"/><stop offset="1" stop-color="#f5f6ff"/></linearGradient><linearGradient id="r" x1="116.25" x2="529.61" y1="550.11" y2="557.24" xlink:href="#o"/><linearGradient id="s" x1="118.51" x2="529.26" y1="594.85" y2="594.85" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7a9ac1"/><stop offset="1" stop-color="#b8cee8" stop-opacity=".5"/></linearGradient><linearGradient id="t" x1="1185.47" x2="713.15" y1="577.16" y2="577.16" xlink:href="#n"/><linearGradient id="u" x1="707.29" x2="1209.96" y1="546.9" y2="555.57" xlink:href="#o"/><linearGradient id="v" x1="728.78" x2="958.04" y1="323.99" y2="323.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c5d0da"/><stop offset="1" stop-color="#a8b0b6"/></linearGradient><linearGradient id="w" x1="658.13" x2="1068.89" y1="441.22" y2="441.22" gradientTransform="matrix(-1, 0, 0, 1, 1819.63, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cce4ff"/><stop offset="1" stop-color="#e3f1fe"/></linearGradient><linearGradient id="x" x1="658.13" x2="1068.89" y1="555.43" y2="555.43" gradientTransform="matrix(-1, 0, 0, 1, 1819.63, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#aecdec" stop-opacity=".66"/><stop offset="1" stop-color="#6b9ac1"/></linearGradient><linearGradient id="y" x1="658.14" x2="1068.89" y1="594.85" y2="594.85" gradientTransform="matrix(-1, 0, 0, 1, 1819.63, 0)" xlink:href="#s"/></defs><title>215</title><g class="a"><ellipse cx="639.99" cy="757.37" class="b" rx="226.47" ry="129.13"/><path d="M866.47,757.37c0,71.32-101.39,129.13-226.47,129.13S413.53,828.69,413.53,757.37Z" class="c"/><path d="M719.23,697.75c-34.26-19.47-36.59-52-36.59-52H597.35s-2.34,32.53-36.6,52c-19.13,10.19-30.9,24.06-30.9,39.35,0,31.3,49.31,56.67,110.14,56.67S750.14,768.4,750.14,737.1C750.14,721.81,738.36,707.94,719.23,697.75Z" class="d"/><path d="M719.24,697.75c-34.26-19.47-36.59-52-36.59-52h-85.3s-2.33,32.53-36.59,52c-19.13,10.19-30.91,24.06-30.91,39.35,0,31.3,49.32,56.67,110.15,56.67S750.15,768.4,750.15,737.1C750.15,721.81,738.37,707.94,719.24,697.75Z" class="e"/><ellipse cx="639.99" cy="645.75" class="f" rx="42.65" ry="24.31"/><path d="M640,168.49c-11.92,0-21.59,5.51-21.59,12.31v465c0,6.79,9.67,12.31,21.59,12.31s21.59-5.52,21.59-12.31V180.8C661.58,174,651.91,168.49,640,168.49Z" class="g"/><path d="M576.84,750.62a172.28,172.28,0,0,1-14.74,16.62" class="h"/><path d="M607.87,675.24c-3.14,22.78-10,42.06-19.79,58.75" class="h"/><path d="M586.89,713.52A93.31,93.31,0,0,1,560.14,746" class="h"/><line x1="624.33" x2="624.33" y1="277" y2="356.33" class="h"/><path d="M413.52,757.37a77,77,0,0,0,5.36,28c74.39-21.16,125.49-65,125.49-115.6a77.07,77.07,0,0,0-5.36-28C464.62,662.94,413.52,706.75,413.52,757.37Z" class="i"/><path d="M748.52,644A76.63,76.63,0,0,0,744,669.79c0,48.9,47.67,91.44,118,113.36a76.62,76.62,0,0,0,4.51-25.78C866.47,708.48,818.8,665.93,748.52,644Z" class="i"/><path d="M587.43,159.84H349.76a5,5,0,0,1,0-10H587.43a5,5,0,0,1,0,10Z" class="j"/><path d="M356.11,149.84h-6.35a5,5,0,0,0,0,10h12.31A27.3,27.3,0,0,0,356.11,149.84Z" class="k"/><path d="M652.32,229.69l-31.47,4.42a8.4,8.4,0,0,0-2.45,5.68v15.74c7.1,11.36,25.74,16,43.18,6.49V239.79C661.58,235.6,657.91,231.91,652.32,229.69Z" class="k"/><path d="M640,157.3c-16,0-28.89,7.37-28.89,16.47v68c0,9.1,12.93,16.48,28.89,16.48s28.9-7.38,28.9-16.48v-68C668.89,164.67,656,157.3,640,157.3Z" class="l"/><path d="M656.51,170.87l-42.06,5.91a11.27,11.27,0,0,0-3.26,7.58v21c9.49,15.18,33.94,29.7,57.7,12.43V184.36C668.89,178.78,664,173.84,656.51,170.87Z" class="k"/><path d="M692.57,159.84H930.24a5,5,0,0,0,0-10H692.57a5,5,0,0,0,0,10Z" class="m"/><path d="M923.89,149.84h6.35a5,5,0,0,1,0,10H917.93A27.3,27.3,0,0,1,923.89,149.84Z" class="k"/><circle cx="323.8" cy="154.84" r="25.96" class="n"/><path d="M314.24,139a18.54,18.54,0,0,0-6.56,6.89" class="h"/><circle cx="956.2" cy="154.84" r="25.96" class="o"/><path d="M946.64,139a18.62,18.62,0,0,0-6.56,6.89" class="h"/><path d="M701.11,149.84h-6.35a5,5,0,0,0,0,10h12.31A27.3,27.3,0,0,0,701.11,149.84Z" class="k"/><circle cx="639.99" cy="154.84" r="52.56" class="p"/><path d="M619.84,120a40.4,40.4,0,0,0-12.73,11.64" class="h"/><path d="M640,71c-6.52,0-11.8,3-11.8,6.73v32.82c0,3.72,5.28,6.73,11.8,6.73s11.8-3,11.8-6.73V77.77C651.79,74.06,646.51,71,640,71Z" class="r"/><path d="M646.73,72.25l-17.2,2.42a4.6,4.6,0,0,0-1.34,3.1v8.6c3.88,6.21,13.88,12.15,23.6,5.09V77.77C651.79,75.49,649.79,73.47,646.73,72.25Z" class="k"/><circle cx="639.99" cy="66.07" r="20.15" class="s"/><path d="M956.24,128.66a26,26,0,0,0-25.49,21c-.16,0-.31,0-.47,0H692.61c-.09,0-.17,0-.26,0a52.59,52.59,0,0,0-40.52-46.24V82.17a20.15,20.15,0,1,0-23.6,0v21.24a52.59,52.59,0,0,0-40.53,46.24c-.08,0-.16,0-.24,0H349.79c-.16,0-.31,0-.47,0a26,26,0,1,0,0,9.91c.16,0,.31,0,.47,0H587.46l.24,0a52.53,52.53,0,0,0,23.43,38.93v43c0,4.2,2.76,8,7.31,10.95V624.57a46.3,46.3,0,0,0-10.16,4.73c-33.89,2.72-65.38,9.7-92.72,20l-.09,0q-6.44,2.43-12.56,5.08l-.05,0q-4.5,2-8.82,4l-.36.17q-4.2,2-8.22,4.18l-.35.18-2.58,1.4-.38.21c-2.56,1.42-5.06,2.88-7.5,4.36l-.7.44q-3.48,2.13-6.78,4.35l-.81.55c-.66.45-1.33.91-2,1.37l-.8.56c-1.18.83-2.34,1.68-3.48,2.53l-.82.61c-.59.44-1.17.88-1.74,1.33l-1,.8c-.56.43-1.12.87-1.67,1.32l-.12.1c-1.21,1-2.39,2-3.56,3l-1.11,1c-.48.41-.95.83-1.42,1.25l-1.22,1.12c-.7.64-1.38,1.28-2.06,1.93-.42.4-.84.8-1.25,1.21l-1.21,1.2-1.21,1.23-1.08,1.12c-.67.71-1.32,1.41-2,2.13l-1,1.09c-.4.46-.81.92-1.21,1.39s-.63.73-.93,1.1c-.53.63-1,1.27-1.57,1.91L433,704.7c-.45.57-.88,1.13-1.31,1.7l-.78,1.05-1.22,1.71c-.2.28-.41.57-.6.86-.56.8-1.09,1.61-1.62,2.42l-.6.94c-.37.59-.73,1.18-1.09,1.77l-.56.94c-.5.84-1,1.68-1.45,2.53l-.35.66c-.37.69-.72,1.38-1.07,2.07-.16.3-.31.61-.46.92-.36.72-.7,1.44-1,2.16l-.27.58c-.4.89-.78,1.78-1.14,2.68-.12.28-.23.56-.34.84-.27.69-.54,1.38-.8,2.08-.09.27-.19.53-.29.79-.32.92-.63,1.84-.92,2.76l-.18.59c-.23.77-.46,1.53-.67,2.29-.07.29-.15.57-.23.85-.22.86-.43,1.72-.63,2.59,0,.1-.05.19-.07.29-.21,1-.4,1.9-.57,2.86-.05.27-.1.54-.14.81-.14.77-.25,1.54-.36,2.31,0,.23-.07.46-.1.69-.13,1-.24,1.93-.32,2.9,0,.21,0,.42-.05.63-.07.8-.12,1.6-.16,2.39,0,.28,0,.55,0,.83,0,1-.07,2-.07,3,0,1.17,0,2.33.09,3.49,0,.31,0,.61.06.92.05.86.1,1.72.18,2.57,0,.32.08.64.11,1,.09.85.19,1.7.31,2.54,0,.29.09.57.13.86.14.88.28,1.77.45,2.65,0,.24.09.47.14.7.19.94.39,1.88.61,2.81,0,.18.09.36.13.54.25,1,.51,2,.79,3,0,.11.07.23.11.35.3,1.05.64,2.11,1,3.16l.06.16c.37,1.12.78,2.23,1.2,3.33h0C441.36,843,531.82,886.29,640,886.29h0c109.59,0,201-44.39,222-103.35h0a79.05,79.05,0,0,0,3.37-12.7l0-.17c.17-1,.33-2,.47-3.06,0-.21,0-.42.07-.62.11-.88.21-1.75.29-2.63,0-.44,0-.87.08-1.31.05-.66.11-1.31.14-2,0-1.1.07-2.2.07-3.31,0-15.6-4.86-30.55-13.75-44.39h0a113,113,0,0,0-11-14.37l0,0c-1.63-1.82-3.35-3.62-5.13-5.39l-.15-.15q-2.64-2.61-5.47-5.14l-.27-.24q-2.81-2.49-5.81-4.9l-.35-.29c-2-1.59-4-3.15-6.16-4.69l-.43-.31c-1-.72-2-1.43-3-2.14l-.19-.13c-1.08-.75-2.18-1.48-3.29-2.22l-.48-.31c-1-.65-2-1.29-3-1.92-.15-.1-.3-.2-.46-.29-1.12-.71-2.25-1.4-3.4-2.09l-.49-.29-3-1.77-.69-.39c-1.16-.66-2.33-1.32-3.52-2l-.43-.23c-1.05-.57-2.1-1.13-3.17-1.69l-.87-.45c-1.19-.61-2.4-1.23-3.62-1.83l-.28-.14-3.43-1.65-1-.47-3.44-1.58-.36-.16c-1.24-.56-2.49-1.1-3.75-1.64l-1.13-.48c-1-.45-2.1-.89-3.17-1.32l-.79-.33-3.82-1.51-1.21-.46c-1-.39-2-.77-3-1.14l-1.1-.41c-1.28-.47-2.58-.93-3.88-1.38l-1.26-.44-3-1-1.32-.44c-1.24-.4-2.48-.8-3.74-1.19h0a354,354,0,0,0-76.78-14.5,46.22,46.22,0,0,0-10.15-4.73V252.51c4.54-2.92,7.3-6.75,7.3-10.95v-43a52.55,52.55,0,0,0,23.43-38.93l.26,0H930.28c.16,0,.32,0,.47,0a26,26,0,1,0,25.49-30.92Z" class="t"/><ellipse cx="323.8" cy="577.16" class="u" rx="245.84" ry="140.17"/><ellipse cx="323.8" cy="551.2" class="v" rx="257" ry="148.24"/><path d="M581,551.2C581,469.32,465.9,403,324,403S67,469.32,67,551.2c0,17.29,5.15,33.88,14.58,49.31C101,666.8,202.14,717.32,324,717.32S546.88,666.8,566.38,600.51C575.81,585.08,581,568.49,581,551.2Z" class="t"/><path d="M323.8,437C188,437,78,499.74,78,577.16a82.31,82.31,0,0,0,3.42,23.35c35.23,57.63,130.45,98.93,242.42,98.93S531,658.14,566.22,600.51a82.67,82.67,0,0,0,3.42-23.35C569.64,499.74,459.57,437,323.8,437Z" class="f"/><path d="M579.75,536.76C569.23,474,490.88,422.69,387.5,407.52l-29.35,32.07-169.87,157,23.36-8.09L256,634.55,279,626.46l44.83,46.08,244-112.85Z" class="w"/><line x1="323.96" x2="549.22" y1="180.8" y2="467.19" class="x"/><path d="M323.88,462.94c113.42,0,205.37,51.14,205.37,114.22V419.5c0-63.08-91.95-114.22-205.37-114.22S118.5,356.42,118.5,419.5V577.16C118.5,514.08,210.45,462.94,323.88,462.94Z" class="y"/><polygon points="274.91 344.14 274.91 504.94 323.88 529.27 323.88 368.48 274.91 344.14" class="z"/><polygon points="372.69 344.14 372.69 504.94 323.88 529.27 323.88 368.48 372.69 344.14" class="aa"/><polygon points="323.8 320.98 274.91 344.14 323.88 368.48 372.69 344.14 323.8 320.98" class="ab"/><polygon points="317.85 370.76 317.85 522.27 280.33 503.63 280.33 352.12 317.85 370.76" class="ac"/><line x1="280.9" x2="317.9" y1="438.4" y2="456.6" class="ad"/><line x1="280.9" x2="317.9" y1="482.4" y2="500.6" class="ad"/><line x1="280.9" x2="317.9" y1="460.4" y2="478.6" class="ad"/><line x1="280.9" x2="317.9" y1="416.62" y2="434.82" class="ad"/><line x1="280.9" x2="317.9" y1="394.62" y2="412.82" class="ad"/><line x1="280.9" x2="317.9" y1="372.62" y2="390.82" class="ad"/><line x1="294.08" x2="314.1" y1="368.72" y2="378.57" class="ae"/><ellipse cx="287.25" cy="365.4" class="af" rx="3.7" ry="4.26" transform="translate(-126.99 154.6) rotate(-24.86)"/><line x1="294.08" x2="314.1" y1="390.86" y2="400.71" class="ae"/><ellipse cx="287.25" cy="387.53" class="ag" rx="3.7" ry="4.26" transform="translate(-136.29 156.65) rotate(-24.86)"/><line x1="294.08" x2="314.1" y1="412.46" y2="422.31" class="ae"/><ellipse cx="287.25" cy="409.14" class="ag" rx="3.7" ry="4.26" transform="translate(-145.37 158.65) rotate(-24.86)"/><line x1="294.08" x2="314.1" y1="433.77" y2="443.62" class="ae"/><ellipse cx="287.25" cy="430.45" class="ag" rx="3.7" ry="4.26" transform="translate(-154.33 160.62) rotate(-24.86)"/><line x1="294.08" x2="314.1" y1="456.64" y2="466.49" class="ae"/><ellipse cx="287.25" cy="453.32" class="ah" rx="3.7" ry="4.26" transform="translate(-163.94 162.74) rotate(-24.86)"/><line x1="294.08" x2="314.1" y1="478.64" y2="488.49" class="ae"/><ellipse cx="287.25" cy="475.32" class="ag" rx="3.7" ry="4.26" transform="translate(-173.19 164.78) rotate(-24.86)"/><line x1="294.08" x2="314.1" y1="499.87" y2="509.72" class="ae"/><ellipse cx="287.25" cy="496.55" class="ai" rx="3.7" ry="4.26" transform="translate(-182.12 166.75) rotate(-24.86)"/><polygon points="207.15 376.25 256.04 402.1 304.92 377.81 256.04 353.09 207.15 376.25" class="ab"/><polygon points="391.56 353.09 440.45 376.25 391.56 402.1 342.67 377.81 391.56 353.09" class="ab"/><polygon points="304.92 377.81 304.92 538.6 256.04 562.89 256.04 402.1 304.92 377.81" class="aa"/><polygon points="207.15 376.25 207.15 537.04 256.04 562.89 256.04 402.1 207.15 376.25" class="z"/><polygon points="391.56 402.1 391.56 562.89 440.45 537.04 440.45 376.25 391.56 402.1" class="aa"/><polygon points="342.67 377.81 342.67 538.6 391.56 562.89 391.56 402.1 342.67 377.81" class="z"/><polygon points="385.7 403.14 385.7 554.65 348.19 536.01 348.19 384.5 385.7 403.14" class="ac"/><line x1="348.65" x2="385.65" y1="472.16" y2="490.36" class="ad"/><line x1="348.65" x2="385.65" y1="516.16" y2="534.36" class="ad"/><line x1="348.65" x2="385.65" y1="494.16" y2="512.36" class="ad"/><line x1="348.65" x2="385.65" y1="450.37" y2="468.57" class="ad"/><line x1="348.65" x2="385.65" y1="428.37" y2="446.57" class="ad"/><line x1="348.65" x2="385.65" y1="406.37" y2="424.57" class="ad"/><line x1="361.83" x2="381.86" y1="402.47" y2="412.32" class="ae"/><ellipse cx="355" cy="399.15" class="af" rx="3.7" ry="4.26" transform="translate(-134.9 186.2) rotate(-24.86)"/><line x1="361.83" x2="381.86" y1="424.61" y2="434.46" class="ae"/><ellipse cx="355" cy="421.29" class="ag" rx="3.7" ry="4.26" transform="translate(-144.2 188.26) rotate(-24.86)"/><line x1="361.83" x2="381.86" y1="446.21" y2="456.06" class="ae"/><ellipse cx="355" cy="442.89" class="ag" rx="3.7" ry="4.26" transform="translate(-153.28 190.26) rotate(-24.86)"/><line x1="361.83" x2="381.86" y1="467.53" y2="477.38" class="ae"/><ellipse cx="355" cy="464.21" class="ag" rx="3.7" ry="4.26" transform="translate(-162.24 192.23) rotate(-24.86)"/><line x1="361.83" x2="381.86" y1="490.39" y2="500.24" class="ae"/><ellipse cx="355" cy="487.07" class="ah" rx="3.7" ry="4.26" transform="translate(-171.85 194.35) rotate(-24.86)"/><line x1="361.83" x2="381.86" y1="512.39" y2="522.24" class="ae"/><ellipse cx="355" cy="509.07" class="ag" rx="3.7" ry="4.26" transform="translate(-181.1 196.39) rotate(-24.86)"/><line x1="361.83" x2="381.86" y1="533.62" y2="543.47" class="ae"/><ellipse cx="355" cy="530.3" class="ai" rx="3.7" ry="4.26" transform="translate(-190.03 198.35) rotate(-24.86)"/><polygon points="274.91 412.08 274.91 572.88 323.8 600.28 323.8 437.93 274.91 412.08" class="z"/><polygon points="372.69 412.08 372.69 574.43 323.8 600.28 323.8 437.93 372.69 412.08" class="aa"/><polygon points="274.91 412.08 323.88 387.4 372.69 412.08 323.8 437.93 274.91 412.08" class="ab"/><polygon points="459.32 435.77 459.32 596.56 410.44 572.27 410.44 411.48 459.32 435.77" class="z"/><polygon points="453.64 438.14 453.64 589.65 416.12 571.01 416.12 419.5 453.64 438.14" class="ac"/><line x1="416.38" x2="453.38" y1="506.36" y2="524.56" class="ad"/><line x1="416.38" x2="453.38" y1="550.36" y2="568.56" class="ad"/><line x1="416.38" x2="453.38" y1="528.36" y2="546.56" class="ad"/><line x1="416.38" x2="453.38" y1="484.58" y2="502.78" class="ad"/><line x1="416.38" x2="453.38" y1="462.58" y2="480.78" class="ad"/><line x1="416.38" x2="453.38" y1="440.58" y2="458.78" class="ad"/><line x1="429.56" x2="449.58" y1="436.68" y2="446.53" class="ae"/><ellipse cx="422.73" cy="433.36" class="af" rx="3.7" ry="4.26" transform="translate(-143 217.84) rotate(-24.86)"/><line x1="429.56" x2="449.58" y1="458.82" y2="468.67" class="ae"/><ellipse cx="422.73" cy="455.5" class="ag" rx="3.7" ry="4.26" transform="translate(-152.31 219.89) rotate(-24.86)"/><line x1="429.56" x2="449.58" y1="480.42" y2="490.27" class="ae"/><ellipse cx="422.73" cy="477.1" class="ag" rx="3.7" ry="4.26" transform="translate(-161.39 221.9) rotate(-24.86)"/><line x1="429.56" x2="449.58" y1="501.74" y2="511.59" class="ae"/><ellipse cx="422.73" cy="498.42" class="ag" rx="3.7" ry="4.26" transform="translate(-170.35 223.87) rotate(-24.86)"/><line x1="429.56" x2="449.58" y1="524.6" y2="534.45" class="ae"/><ellipse cx="422.73" cy="521.28" class="ah" rx="3.7" ry="4.26" transform="translate(-179.96 225.99) rotate(-24.86)"/><line x1="429.56" x2="449.58" y1="546.6" y2="556.45" class="ae"/><ellipse cx="422.73" cy="543.28" class="ag" rx="3.7" ry="4.26" transform="translate(-189.21 228.03) rotate(-24.86)"/><line x1="429.56" x2="449.58" y1="567.83" y2="577.68" class="ae"/><ellipse cx="422.73" cy="564.51" class="ai" rx="3.7" ry="4.26" transform="translate(-198.13 229.99) rotate(-24.86)"/><polygon points="508.21 408.36 508.21 569.15 459.32 596.56 459.32 435.77 508.21 408.36" class="aa"/><polygon points="459.32 385.19 508.21 408.36 459.32 435.77 410.44 411.48 459.32 385.19" class="ab"/><polygon points="342.67 447.91 342.67 608.7 391.56 634.55 391.56 473.76 342.67 447.91" class="z"/><polygon points="348.26 456 348.26 607.57 385.97 627.5 385.97 475.94 348.26 456" class="ac"/><polygon points="280.18 419.84 280.18 571.41 317.89 591.35 317.89 439.78 280.18 419.84" class="ac"/><polygon points="212.42 383.82 212.42 535.39 250.12 555.32 250.12 403.76 212.42 383.82" class="ac"/><polygon points="440.45 446.35 440.45 607.14 391.56 634.55 391.56 473.76 440.45 446.35" class="aa"/><line x1="348.5" x2="385.5" y1="543.53" y2="562.79" class="ad"/><line x1="348.5" x2="385.5" y1="587.53" y2="606.79" class="ad"/><line x1="348.5" x2="385.5" y1="565.53" y2="584.79" class="ad"/><line x1="348.5" x2="385.5" y1="521.75" y2="541.01" class="ad"/><line x1="348.5" x2="385.5" y1="499.75" y2="519.01" class="ad"/><line x1="348.5" x2="385.5" y1="477.75" y2="497.01" class="ad"/><line x1="361.68" x2="381.7" y1="474.23" y2="484.65" class="ae"/><ellipse cx="354.85" cy="470.71" class="af" rx="3.66" ry="4.31" transform="translate(-176.77 216.01) rotate(-27.39)"/><line x1="361.68" x2="381.7" y1="496.36" y2="506.79" class="ae"/><ellipse cx="354.85" cy="492.85" class="ag" rx="3.66" ry="4.31" transform="translate(-186.95 218.49) rotate(-27.39)"/><line x1="361.68" x2="381.7" y1="517.97" y2="528.39" class="ae"/><ellipse cx="354.85" cy="514.45" class="ag" rx="3.66" ry="4.31" transform="translate(-196.89 220.92) rotate(-27.39)"/><line x1="361.68" x2="381.7" y1="539.28" y2="549.71" class="ae"/><ellipse cx="354.85" cy="535.76" class="ag" rx="3.66" ry="4.31" transform="translate(-206.69 223.31) rotate(-27.39)"/><line x1="361.68" x2="381.7" y1="562.14" y2="572.57" class="ae"/><ellipse cx="354.85" cy="558.63" class="ah" rx="3.66" ry="4.31" transform="translate(-217.21 225.87) rotate(-27.39)"/><line x1="361.68" x2="381.7" y1="584.14" y2="594.57" class="ae"/><ellipse cx="354.85" cy="580.63" class="ag" rx="3.66" ry="4.31" transform="translate(-227.33 228.33) rotate(-27.39)"/><line x1="361.68" x2="381.7" y1="605.38" y2="615.8" class="ae"/><ellipse cx="354.85" cy="601.86" class="ai" rx="3.66" ry="4.31" transform="translate(-237.1 230.71) rotate(-27.39)"/><line x1="280.9" x2="317.9" y1="507.96" y2="527.22" class="ad"/><line x1="280.9" x2="317.9" y1="551.96" y2="571.22" class="ad"/><line x1="280.9" x2="317.9" y1="529.96" y2="549.22" class="ad"/><line x1="280.9" x2="317.9" y1="486.17" y2="505.44" class="ad"/><line x1="280.9" x2="317.9" y1="464.17" y2="483.44" class="ad"/><line x1="280.9" x2="317.9" y1="442.17" y2="461.44" class="ad"/><line x1="294.08" x2="314.1" y1="438.65" y2="449.08" class="ae"/><ellipse cx="287.25" cy="435.14" class="af" rx="3.66" ry="4.31" transform="translate(-167.98 180.93) rotate(-27.39)"/><line x1="294.08" x2="314.1" y1="460.79" y2="471.22" class="ae"/><ellipse cx="287.25" cy="457.27" class="ag" rx="3.66" ry="4.31" transform="translate(-178.16 183.41) rotate(-27.39)"/><line x1="294.08" x2="314.1" y1="482.39" y2="492.82" class="ae"/><ellipse cx="287.25" cy="478.88" class="ag" rx="3.66" ry="4.31" transform="translate(-188.1 185.83) rotate(-27.39)"/><line x1="294.08" x2="314.1" y1="503.71" y2="514.13" class="ae"/><ellipse cx="287.25" cy="500.19" class="ag" rx="3.66" ry="4.31" transform="translate(-197.91 188.22) rotate(-27.39)"/><line x1="294.08" x2="314.1" y1="526.57" y2="537" class="ae"/><ellipse cx="287.25" cy="523.06" class="ah" rx="3.66" ry="4.31" transform="translate(-208.43 190.78) rotate(-27.39)"/><line x1="294.08" x2="314.1" y1="548.57" y2="559" class="ae"/><ellipse cx="287.25" cy="545.06" class="ag" rx="3.66" ry="4.31" transform="translate(-218.55 193.25) rotate(-27.39)"/><line x1="294.08" x2="314.1" y1="569.8" y2="580.23" class="ae"/><ellipse cx="287.25" cy="566.29" class="ai" rx="3.66" ry="4.31" transform="translate(-228.31 195.63) rotate(-27.39)"/><line x1="213.09" x2="250.09" y1="470.89" y2="490.16" class="ad"/><line x1="213.09" x2="250.09" y1="514.89" y2="534.16" class="ad"/><line x1="213.09" x2="250.09" y1="492.89" y2="512.16" class="ad"/><line x1="213.09" x2="250.09" y1="449.11" y2="468.38" class="ad"/><line x1="213.09" x2="250.09" y1="427.11" y2="446.38" class="ad"/><line x1="213.09" x2="250.09" y1="405.11" y2="424.38" class="ad"/><line x1="226.27" x2="246.3" y1="401.59" y2="412.02" class="ae"/><ellipse cx="219.45" cy="398.07" class="af" rx="3.66" ry="4.31" transform="translate(-158.53 145.58) rotate(-27.39)"/><line x1="226.27" x2="246.3" y1="423.73" y2="434.15" class="ae"/><ellipse cx="219.45" cy="420.21" class="ag" rx="3.66" ry="4.31" transform="translate(-168.71 148.06) rotate(-27.39)"/><line x1="226.27" x2="246.3" y1="445.33" y2="455.76" class="ae"/><ellipse cx="219.45" cy="441.81" class="ag" rx="3.66" ry="4.31" transform="translate(-178.65 150.48) rotate(-27.39)"/><line x1="226.27" x2="246.3" y1="466.65" y2="477.07" class="ae"/><ellipse cx="219.45" cy="463.13" class="ag" rx="3.66" ry="4.31" transform="translate(-188.46 152.87) rotate(-27.39)"/><line x1="226.27" x2="246.3" y1="489.51" y2="499.93" class="ae"/><ellipse cx="219.45" cy="485.99" class="ah" rx="3.66" ry="4.31" transform="translate(-198.98 155.44) rotate(-27.39)"/><line x1="226.27" x2="246.3" y1="511.51" y2="521.93" class="ae"/><ellipse cx="219.45" cy="507.99" class="ag" rx="3.66" ry="4.31" transform="translate(-209.1 157.9) rotate(-27.39)"/><line x1="226.27" x2="246.3" y1="532.74" y2="543.17" class="ae"/><ellipse cx="219.45" cy="529.22" class="ai" rx="3.66" ry="4.31" transform="translate(-218.86 160.28) rotate(-27.39)"/><polygon points="342.67 447.91 391.56 473.76 440.45 446.35 391.56 421.63 342.67 447.91" class="ab"/><polygon points="188.28 435.77 188.28 596.56 237.16 572.27 237.16 411.48 188.28 435.77" class="aa"/><polygon points="139.39 408.36 139.39 569.15 188.28 596.56 188.28 435.77 139.39 408.36" class="z"/><polygon points="188.28 385.19 139.39 408.36 188.28 435.77 237.16 411.48 188.28 385.19" class="ab"/><polygon points="207.15 446.35 207.15 607.14 256.04 634.55 256.04 473.76 207.15 446.35" class="z"/><polygon points="304.92 447.91 304.92 608.7 256.04 634.55 256.04 473.76 304.92 447.91" class="aa"/><polygon points="207.15 446.35 256.04 473.76 304.92 447.91 256.04 421.63 207.15 446.35" class="ab"/><polygon points="274.91 484.34 274.91 645.13 323.8 672.54 323.8 511.75 274.91 484.34" class="z"/><polygon points="372.69 484.34 372.69 645.13 323.8 672.54 323.8 511.75 372.69 484.34" class="aa"/><polygon points="323.88 458.01 372.69 484.34 323.8 511.75 274.91 484.34 323.88 458.01" class="ab"/><polygon points="280.82 492.74 280.82 643.99 317.89 664.77 317.89 513.52 280.82 492.74" class="ac"/><line x1="280.82" x2="317.89" y1="579.24" y2="600.02" class="ad"/><line x1="280.82" x2="317.89" y1="623.24" y2="644.02" class="ad"/><line x1="280.82" x2="317.89" y1="601.24" y2="622.02" class="ad"/><line x1="280.82" x2="317.89" y1="557.46" y2="578.24" class="ad"/><line x1="280.82" x2="317.89" y1="535.46" y2="556.24" class="ad"/><line x1="280.82" x2="317.89" y1="513.46" y2="534.24" class="ad"/><line x1="294.03" x2="314.08" y1="510.48" y2="521.72" class="ae"/><ellipse cx="287.19" cy="506.68" class="af" rx="3.6" ry="4.38" transform="translate(-214.86 211.48) rotate(-30)"/><line x1="294.03" x2="314.08" y1="532.61" y2="543.86" class="ae"/><ellipse cx="287.19" cy="528.82" class="af" rx="3.6" ry="4.38" transform="translate(-225.93 214.44) rotate(-30)"/><line x1="294.03" x2="314.08" y1="554.22" y2="565.46" class="ae"/><ellipse cx="287.19" cy="550.42" class="af" rx="3.6" ry="4.38" transform="translate(-236.73 217.34) rotate(-30)"/><line x1="294.03" x2="314.08" y1="575.53" y2="586.78" class="ae"/><ellipse cx="287.19" cy="571.74" class="af" rx="3.6" ry="4.38" transform="translate(-247.39 220.19) rotate(-30)"/><line x1="294.03" x2="314.08" y1="598.4" y2="609.64" class="ae"/><ellipse cx="287.19" cy="594.6" class="af" rx="3.6" ry="4.38" transform="translate(-258.82 223.26) rotate(-30)"/><line x1="294.03" x2="314.08" y1="620.4" y2="631.64" class="ae"/><ellipse cx="287.19" cy="616.6" class="af" rx="3.6" ry="4.38" transform="translate(-269.82 226.2) rotate(-30)"/><line x1="294.03" x2="314.08" y1="641.63" y2="652.87" class="ae"/><ellipse cx="287.19" cy="637.83" class="af" rx="3.6" ry="4.38" transform="translate(-280.44 229.05) rotate(-30)"/><polygon points="145.3 416.45 145.3 567.7 182.36 588.47 182.36 437.22 145.3 416.45" class="ac"/><polygon points="213.06 454.44 213.06 605.69 250.12 626.46 250.12 475.21 213.06 454.44" class="ac"/><line x1="212.74" x2="249.8" y1="541.01" y2="561.79" class="ad"/><line x1="212.74" x2="249.8" y1="585.01" y2="605.79" class="ad"/><line x1="212.74" x2="249.8" y1="563.01" y2="583.79" class="ad"/><line x1="212.74" x2="249.8" y1="519.23" y2="540.01" class="ad"/><line x1="212.74" x2="249.8" y1="497.23" y2="518.01" class="ad"/><line x1="212.74" x2="249.8" y1="475.23" y2="496.01" class="ad"/><line x1="225.94" x2="246" y1="472.25" y2="483.5" class="ae"/><ellipse cx="219.11" cy="468.45" class="af" rx="3.6" ry="4.38" transform="translate(-204.87 172.31) rotate(-30)"/><line x1="225.94" x2="246" y1="494.39" y2="505.63" class="ae"/><ellipse cx="219.11" cy="490.59" class="af" rx="3.6" ry="4.38" transform="translate(-215.94 175.28) rotate(-30)"/><line x1="225.94" x2="246" y1="515.99" y2="527.24" class="ae"/><ellipse cx="219.11" cy="512.19" class="af" rx="3.6" ry="4.38" transform="translate(-226.74 178.17) rotate(-30)"/><line x1="225.94" x2="246" y1="537.31" y2="548.55" class="ae"/><ellipse cx="219.11" cy="533.51" class="af" rx="3.6" ry="4.38" transform="translate(-237.4 181.03) rotate(-30)"/><line x1="225.94" x2="246" y1="560.17" y2="571.41" class="ae"/><ellipse cx="219.11" cy="556.37" class="af" rx="3.6" ry="4.38" transform="translate(-248.83 184.09) rotate(-30)"/><line x1="225.94" x2="246" y1="582.17" y2="593.41" class="ae"/><ellipse cx="219.11" cy="578.37" class="af" rx="3.6" ry="4.38" transform="translate(-259.83 187.04) rotate(-30)"/><line x1="225.94" x2="246" y1="603.4" y2="614.65" class="ae"/><ellipse cx="219.11" cy="599.61" class="af" rx="3.6" ry="4.38" transform="translate(-270.45 189.88) rotate(-30)"/><line x1="145.3" x2="182.36" y1="502.02" y2="522.8" class="ad"/><line x1="145.3" x2="182.36" y1="546.02" y2="566.8" class="ad"/><line x1="145.3" x2="182.36" y1="524.02" y2="544.8" class="ad"/><line x1="145.3" x2="182.36" y1="480.24" y2="501.02" class="ad"/><line x1="145.3" x2="182.36" y1="458.24" y2="479.02" class="ad"/><line x1="145.3" x2="182.36" y1="436.24" y2="457.02" class="ad"/><line x1="158.5" x2="178.56" y1="433.26" y2="444.51" class="ae"/><ellipse cx="151.67" cy="429.46" class="af" rx="3.6" ry="4.38" transform="translate(-194.41 133.37) rotate(-30)"/><line x1="158.5" x2="178.56" y1="455.4" y2="466.64" class="ae"/><ellipse cx="151.67" cy="451.6" class="af" rx="3.6" ry="4.38" transform="translate(-205.48 136.34) rotate(-30)"/><line x1="158.5" x2="178.56" y1="477" y2="488.25" class="ae"/><ellipse cx="151.67" cy="473.2" class="af" rx="3.6" ry="4.38" transform="translate(-216.28 139.23) rotate(-30)"/><line x1="158.5" x2="178.56" y1="498.32" y2="509.56" class="ae"/><ellipse cx="151.67" cy="494.52" class="af" rx="3.6" ry="4.38" transform="translate(-226.94 142.09) rotate(-30)"/><line x1="158.5" x2="178.56" y1="521.18" y2="532.42" class="ae"/><ellipse cx="151.67" cy="517.38" class="af" rx="3.6" ry="4.38" transform="translate(-238.37 145.15) rotate(-30)"/><line x1="158.5" x2="178.56" y1="543.18" y2="554.42" class="ae"/><ellipse cx="151.67" cy="539.38" class="af" rx="3.6" ry="4.38" transform="translate(-249.37 148.1) rotate(-30)"/><line x1="158.5" x2="178.56" y1="564.41" y2="575.66" class="ae"/><ellipse cx="151.67" cy="560.62" class="af" rx="3.6" ry="4.38" transform="translate(-259.99 150.94) rotate(-30)"/><path d="M323.88,533.71c-113.43,0-205.38-51.13-205.38-114.21V577.16c0,63.07,91.95,114.21,205.38,114.21s205.37-51.14,205.37-114.21V419.5C529.25,482.58,437.3,533.71,323.88,533.71Z" class="aj"/><path d="M502.31,524.32c-21.8,21.26-55.54,38.24-96.13,48.14" class="ak"/><path d="M134.54,463.92c-10.38-13.65-16.12-28.67-16.12-44.42" class="h"/><path d="M259.52,528a283.12,283.12,0,0,1-64.93-19.73" class="h"/><path d="M529.17,419.5c0,45.52-47.89,84.83-117.19,103.18" class="h"/><path d="M323.88,612.54c-113.42,0-205.37-51.13-205.37-114.21v78.83c0,63.07,92,114.21,205.37,114.21s205.38-51.14,205.38-114.21V498.33C529.26,561.41,437.31,612.54,323.88,612.54Z" class="al"/><path d="M508.86,581.47a124.3,124.3,0,0,1-15.78,15.09" class="ak"/><path d="M488.93,626.46c-14.79,11.11-33.11,20.67-54.05,28.17" class="ak"/><path d="M502.31,615.06a135.39,135.39,0,0,1-13.38,11.4" class="ak"/><path d="M269.19,608.45c-86.88-13.32-150.68-57.58-150.68-110.12" class="h"/><path d="M409.41,602.2a335.74,335.74,0,0,1-56.31,9.19" class="h"/><line x1="90.95" x2="323.96" y1="594.85" y2="180.8" class="am"/><path d="M110.54,633.82c-11.33-35.13-21.4-48.38-30-34.9" class="am"/><path d="M535.29,466.82c11.29-8.7,22.09,4.27,28.07,33.93" class="an"/><ellipse cx="463.04" cy="529.78" class="ag" rx="9.96" ry="8.18" transform="translate(-220.09 698.36) rotate(-62.71)"/><ellipse cx="434.88" cy="541.77" class="ai" rx="9.96" ry="8.18" transform="translate(-251.75 647.5) rotate(-60)"/><ellipse cx="394.63" cy="639.36" class="ai" rx="9.96" ry="8.18" transform="translate(-356.39 661.44) rotate(-60)"/><ellipse cx="487.62" cy="514.91" class="ag" rx="9.96" ry="8.18" transform="translate(-193.56 712.15) rotate(-62.71)"/><ellipse cx="165.17" cy="625.28" class="ao" rx="4.3" ry="5.52" transform="translate(-74.56 24.62) rotate(-6.96)"/><ellipse cx="191.44" cy="615.64" class="ap" rx="4.43" ry="5.52" transform="translate(-81.97 31.77) rotate(-7.82)"/><ellipse cx="151.67" cy="597.98" class="ap" rx="4.43" ry="5.52" transform="translate(-79.94 26.19) rotate(-7.82)"/><ellipse cx="191.09" cy="597.98" class="ao" rx="4.43" ry="5.52" transform="translate(-79.57 31.55) rotate(-7.82)"/><ellipse cx="192.15" cy="650.98" class="ag" rx="4.43" ry="5.52" transform="translate(-86.77 32.19) rotate(-7.82)"/><ellipse cx="209.52" cy="640.85" class="ap" rx="4.58" ry="5.53" transform="translate(-98.51 41.1) rotate(-9.08)"/><ellipse cx="227.85" cy="646.36" class="ao" rx="4.58" ry="5.53" transform="translate(-99.15 44.06) rotate(-9.08)"/><ellipse cx="956.2" cy="577.16" class="aq" rx="245.84" ry="140.17"/><ellipse cx="956.2" cy="551.2" class="ar" rx="257" ry="148.24"/><path d="M956.51,436.77c135.78,0,245.84,62.76,245.84,140.17a82.55,82.55,0,0,1-3.41,23.35c-35.24,57.63-130.46,98.93-242.43,98.93s-207.18-41.3-242.42-98.93a82.55,82.55,0,0,1-3.41-23.35C710.68,499.53,820.74,436.77,956.51,436.77Z" class="f"/><path d="M1055.91,414.53,888.28,569.42l23.36-8.08L956,607.41,979,599.33l44.82,46.07L1201,563.48l12.18-10.87a.49.49,0,0,1,0-.11c0-.43,0-.87,0-1.3C1213.21,489.72,1148.33,437,1055.91,414.53Z" class="w"/><line x1="956.04" x2="730.78" y1="180.8" y2="467.19" class="as"/><path d="M956.12,462.94c-113.42,0-205.37,51.14-205.37,114.22V419.5c0-63.08,92-114.22,205.37-114.22S1161.5,356.42,1161.5,419.5V577.16C1161.5,514.08,1069.55,462.94,956.12,462.94Z" class="at"/><path d="M898.74,467.46C831.57,478.31,778.6,507.72,759,545.05" class="au"/><path d="M1213.27,551.2c0-81.88-115.07-148.25-257-148.25s-257,66.37-257,148.25c0,17.29,5.15,33.88,14.58,49.31,19.5,66.29,120.61,116.81,242.42,116.81s222.92-50.52,242.43-116.81C1208.12,585.08,1213.27,568.49,1213.27,551.2Z" class="t"/><polygon points="888.28 408.64 888.28 569.43 937.17 545.14 937.17 384.35 888.28 408.64" class="av"/><polygon points="839.39 381.23 839.39 542.02 888.28 569.43 888.28 408.64 839.39 381.23" class="aw"/><polygon points="888.28 358.07 839.39 381.23 888.28 408.64 937.17 384.35 888.28 358.07" class="ax"/><polygon points="907.16 419.22 907.16 580.01 956.04 607.42 956.04 446.63 907.16 419.22" class="aw"/><polygon points="1004.93 420.78 1004.93 581.57 956.04 607.42 956.04 446.63 1004.93 420.78" class="av"/><polygon points="907.16 419.22 956.04 446.63 1004.93 420.78 956.04 394.5 907.16 419.22" class="ax"/><polygon points="974.92 457.21 974.92 618 1023.8 645.41 1023.8 484.62 974.92 457.21" class="aw"/><polygon points="1072.69 457.21 1072.69 618 1023.8 645.41 1023.8 484.62 1072.69 457.21" class="av"/><polygon points="1023.89 430.88 1072.69 457.21 1023.8 484.62 974.92 457.21 1023.89 430.88" class="ax"/><polygon points="980.83 465.62 980.83 616.87 1017.89 637.64 1017.89 486.39 980.83 465.62" class="ac"/><polygon points="845.31 389.32 845.31 540.57 882.37 561.35 882.37 410.1 845.31 389.32" class="ac"/><polygon points="913.07 427.31 913.07 578.56 950.13 599.34 950.13 448.09 913.07 427.31" class="ac"/><line x1="980.83" x2="1017.89" y1="551" y2="571.78" class="ay"/><line x1="980.83" x2="1017.89" y1="595" y2="615.78" class="ay"/><line x1="980.83" x2="1017.89" y1="573" y2="593.78" class="ay"/><line x1="980.83" x2="1017.89" y1="529.22" y2="549.99" class="ay"/><line x1="980.83" x2="1017.89" y1="507.22" y2="527.99" class="ay"/><line x1="980.83" x2="1017.89" y1="485.22" y2="505.99" class="ay"/><line x1="994.03" x2="1014.09" y1="482.24" y2="493.48" class="ae"/><ellipse cx="987.19" cy="478.44" class="af" rx="3.6" ry="4.38" transform="translate(-106.96 557.7) rotate(-30)"/><line x1="994.03" x2="1014.09" y1="504.37" y2="515.62" class="ae"/><ellipse cx="987.19" cy="500.57" class="af" rx="3.6" ry="4.38" transform="translate(-118.03 560.66) rotate(-30)"/><line x1="994.03" x2="1014.09" y1="525.98" y2="537.22" class="ae"/><ellipse cx="987.19" cy="522.18" class="af" rx="3.6" ry="4.38" transform="translate(-128.83 563.56) rotate(-30)"/><line x1="994.03" x2="1014.09" y1="547.29" y2="558.53" class="ae"/><ellipse cx="987.19" cy="543.49" class="af" rx="3.6" ry="4.38" transform="translate(-139.49 566.41) rotate(-30)"/><line x1="994.03" x2="1014.09" y1="570.15" y2="581.4" class="ae"/><ellipse cx="987.19" cy="566.36" class="af" rx="3.6" ry="4.38" transform="translate(-150.92 569.47) rotate(-30)"/><line x1="994.03" x2="1014.09" y1="592.15" y2="603.4" class="ae"/><ellipse cx="987.19" cy="588.36" class="af" rx="3.6" ry="4.38" transform="translate(-161.92 572.42) rotate(-30)"/><line x1="994.03" x2="1014.09" y1="613.39" y2="624.63" class="ae"/><ellipse cx="987.19" cy="609.59" class="af" rx="3.6" ry="4.38" transform="translate(-172.54 575.27) rotate(-30)"/><line x1="913.07" x2="950.13" y1="513.89" y2="534.66" class="ay"/><line x1="913.07" x2="950.13" y1="557.89" y2="578.66" class="ay"/><line x1="913.07" x2="950.13" y1="535.89" y2="556.66" class="ay"/><line x1="913.07" x2="950.13" y1="492.1" y2="512.88" class="ay"/><line x1="913.07" x2="950.13" y1="470.1" y2="490.88" class="ay"/><line x1="913.07" x2="950.13" y1="448.1" y2="468.88" class="ay"/><line x1="926.27" x2="946.33" y1="445.12" y2="456.37" class="ae"/><ellipse cx="919.43" cy="441.33" class="af" rx="3.6" ry="4.38" transform="translate(-97.48 518.84) rotate(-30)"/><line x1="926.27" x2="946.33" y1="467.26" y2="478.5" class="ae"/><ellipse cx="919.43" cy="463.46" class="af" rx="3.6" ry="4.38" transform="translate(-108.55 521.81) rotate(-30)"/><line x1="926.27" x2="946.33" y1="488.86" y2="500.11" class="ae"/><ellipse cx="919.43" cy="485.07" class="af" rx="3.6" ry="4.38" transform="translate(-119.35 524.7) rotate(-30)"/><line x1="926.27" x2="946.33" y1="510.18" y2="521.42" class="ae"/><ellipse cx="919.43" cy="506.38" class="af" rx="3.6" ry="4.38" transform="translate(-130.01 527.56) rotate(-30)"/><line x1="926.27" x2="946.33" y1="533.04" y2="544.29" class="ae"/><ellipse cx="919.43" cy="529.25" class="af" rx="3.6" ry="4.38" transform="translate(-141.44 530.62) rotate(-30)"/><line x1="926.27" x2="946.33" y1="555.04" y2="566.29" class="ae"/><ellipse cx="919.43" cy="551.25" class="af" rx="3.6" ry="4.38" transform="translate(-152.44 533.57) rotate(-30)"/><line x1="926.27" x2="946.33" y1="576.27" y2="587.52" class="ae"/><ellipse cx="919.43" cy="572.48" class="af" rx="3.6" ry="4.38" transform="translate(-163.06 536.41) rotate(-30)"/><line x1="845.31" x2="882.37" y1="475.99" y2="496.77" class="ay"/><line x1="845.31" x2="882.37" y1="519.99" y2="540.77" class="ay"/><line x1="845.31" x2="882.37" y1="497.99" y2="518.77" class="ay"/><line x1="845.31" x2="882.37" y1="454.21" y2="474.99" class="ay"/><line x1="845.31" x2="882.37" y1="432.21" y2="452.99" class="ay"/><line x1="845.31" x2="882.37" y1="410.21" y2="430.99" class="ay"/><line x1="858.51" x2="878.57" y1="407.23" y2="418.47" class="ae"/><ellipse cx="851.67" cy="403.43" class="af" rx="3.6" ry="4.38" transform="translate(-87.61 479.88) rotate(-30)"/><line x1="858.51" x2="878.57" y1="429.36" y2="440.61" class="ae"/><ellipse cx="851.67" cy="425.57" class="af" rx="3.6" ry="4.38" transform="translate(-98.68 482.85) rotate(-30)"/><line x1="858.51" x2="878.57" y1="450.97" y2="462.21" class="ae"/><ellipse cx="851.67" cy="447.17" class="af" rx="3.6" ry="4.38" transform="translate(-109.48 485.74) rotate(-30)"/><line x1="858.51" x2="878.57" y1="472.28" y2="483.53" class="ae"/><ellipse cx="851.67" cy="468.48" class="af" rx="3.6" ry="4.38" transform="translate(-120.14 488.6) rotate(-30)"/><line x1="858.51" x2="878.57" y1="495.14" y2="506.39" class="ae"/><ellipse cx="851.67" cy="491.35" class="af" rx="3.6" ry="4.38" transform="translate(-131.57 491.66) rotate(-30)"/><line x1="858.51" x2="878.57" y1="517.14" y2="528.39" class="ae"/><ellipse cx="851.67" cy="513.35" class="af" rx="3.6" ry="4.38" transform="translate(-142.57 494.61) rotate(-30)"/><line x1="858.51" x2="878.57" y1="538.38" y2="549.62" class="ae"/><ellipse cx="851.67" cy="534.58" class="af" rx="3.6" ry="4.38" transform="translate(-153.19 497.46) rotate(-30)"/><path d="M956.12,533.71c113.43,0,205.38-51.13,205.38-114.21V577.16c0,63.07-92,114.21-205.38,114.21S750.75,640.23,750.75,577.16V419.5C750.75,482.58,842.7,533.71,956.12,533.71Z" class="az"/><path d="M1080.56,566.47c32.43-13.74,57.29-32.73,70.48-54.69" class="ak"/><path d="M1145.46,463.92c10.38-13.65,16.12-28.67,16.12-44.42" class="h"/><path d="M1020.48,528a283.12,283.12,0,0,0,64.93-19.73" class="h"/><path d="M750.83,419.5c0,45.52,47.89,84.83,117.19,103.18" class="h"/><path d="M956.12,612.54c113.42,0,205.37-51.13,205.37-114.21v78.83c0,63.07-92,114.21-205.37,114.21S750.74,640.23,750.74,577.16V498.33C750.74,561.41,842.69,612.54,956.12,612.54Z" class="ba"/><path d="M1086.06,563.8c19.26-8.77,35.61-19.44,48.12-31.5" class="ak"/><path d="M870.59,579.21A326.1,326.1,0,0,0,912.72,587" class="ak"/><path d="M764.37,516.35c7.68,11.1,18.4,21.37,31.57,30.49" class="ak"/><path d="M797.22,599.34c32.78,22.23,80.36,37.46,134.37,41" class="ak"/><path d="M873.57,657.86a338,338,0,0,0,71.56,11" class="ak"/><path d="M771.14,576.69a124.36,124.36,0,0,0,15.78,15.1" class="ak"/><path d="M1010.81,608.45c86.88-13.32,150.68-57.58,150.68-110.12" class="h"/><path d="M870.59,602.2a335.74,335.74,0,0,0,56.31,9.19" class="h"/><line x1="1189.05" x2="956.04" y1="594.85" y2="180.8" class="bb"/><path d="M1169.46,633.82c11.33-35.13,21.4-48.38,30-34.9" class="bb"/><path d="M744.71,466.82c-11.29-8.7-20.83,3.43-28.07,33.68" class="bc"/><ellipse cx="816.96" cy="636.82" class="ah" rx="8.18" ry="9.96" transform="translate(-201.05 445.49) rotate(-27.29)"/><ellipse cx="845.12" cy="648.81" class="ai" rx="8.18" ry="9.96" transform="translate(-211.18 509.48) rotate(-30)"/><ellipse cx="816.96" cy="558.85" class="ai" rx="8.18" ry="9.96" transform="translate(-169.97 483.35) rotate(-30)"/><ellipse cx="845.12" cy="569.75" class="ag" rx="8.18" ry="9.96" transform="translate(-171.65 498.89) rotate(-30)"/><ellipse cx="792.38" cy="621.95" class="ah" rx="8.18" ry="9.96" transform="translate(-196.97 432.56) rotate(-27.29)"/><ellipse cx="1103.32" cy="643.77" class="ap" rx="5.52" ry="4.3" transform="translate(330.59 1660.94) rotate(-83.04)"/><ellipse cx="1114.83" cy="625.28" class="ao" rx="5.52" ry="4.3" transform="translate(359.06 1656.12) rotate(-83.04)"/><ellipse cx="1087.85" cy="650.98" class="ag" rx="5.52" ry="4.43" transform="translate(294.94 1640.16) rotate(-82.18)"/><ellipse cx="1070.48" cy="640.85" class="ap" rx="5.53" ry="4.58" transform="matrix(0.16, -0.99, 0.99, 0.16, 268.72, 1596.78)"/><ellipse cx="1070.2" cy="658.49" class="ao" rx="5.53" ry="4.58" transform="translate(251.06 1611.36) rotate(-80.92)"/><ellipse cx="1052.65" cy="629.5" class="ag" rx="5.53" ry="4.79" transform="translate(221.91 1531.83) rotate(-78.25)"/><ellipse cx="1053.01" cy="611.83" class="ai" rx="5.53" ry="4.79" transform="translate(239.5 1518.12) rotate(-78.25)"/><ellipse cx="1033.04" cy="617" class="ah" rx="5.55" ry="4.99" transform="translate(150.29 1434.68) rotate(-73.66)"/><polygon points="856.76 383.86 852.34 381.41 888.14 363.47 892.58 365.91 856.76 383.86" class="ah"/><polygon points="865.27 388.55 860.84 386.11 896.65 368.16 901.08 370.61 865.27 388.55" class="ah"/><polygon points="873.78 393.25 869.35 390.8 905.16 372.86 909.59 375.31 873.78 393.25" class="ah"/><polygon points="882.28 397.94 877.85 395.5 913.66 377.56 918.09 380 882.28 397.94" class="ah"/><polygon points="905.21 395.53 900.78 393.08 909.19 388.87 913.62 391.32 905.21 395.53" class="ah"/><polygon points="857.06 379.04 852.34 381.41 856.76 383.86 861.53 381.47 857.06 379.04" class="aw"/><polygon points="924.39 421.31 919.89 418.92 955.03 400.93 959.53 403.32 924.39 421.31" class="ah"/><polygon points="933.03 425.88 928.53 423.5 963.67 405.51 968.17 407.9 933.03 425.88" class="ah"/><polygon points="941.67 430.46 937.17 428.08 972.31 410.09 976.81 412.48 941.67 430.46" class="ah"/><polygon points="950.31 435.04 945.81 432.66 980.95 414.67 985.45 417.06 950.31 435.04" class="ah"/><polygon points="973.11 432.49 968.61 430.11 976.85 425.88 981.35 428.27 973.11 432.49" class="ah"/><polygon points="924.52 416.55 919.89 418.92 924.39 421.31 929.07 418.91 924.52 416.55" class="aw"/><polygon points="992.06 458.43 987.48 456.01 1022.02 437.7 1026.6 440.13 992.06 458.43" class="ah"/><polygon points="1000.86 463.09 996.28 460.67 1030.81 442.36 1035.39 444.79 1000.86 463.09" class="ah"/><polygon points="1009.65 467.75 1005.07 465.32 1039.6 447.02 1044.18 449.45 1009.65 467.75" class="ah"/><polygon points="1018.44 472.41 1013.86 469.99 1048.4 451.68 1052.98 454.11 1018.44 472.41" class="ah"/><polygon points="1041.16 469.82 1036.58 467.39 1044.68 463.09 1049.26 465.52 1041.16 469.82" class="ah"/><polygon points="992.04 453.59 987.48 456.01 992.06 458.43 996.66 456 992.04 453.59" class="aw"/></g></svg>
\ No newline at end of file
diff --git a/website/images/index/heart.svg b/website/images/index/heart.svg
deleted file mode 100644
index 590d8b96ae0..00000000000
--- a/website/images/index/heart.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" fill="none" viewBox="0 0 60 60"><circle cx="30" cy="30" r="30" fill="#FAFAFA"/><path fill="#F14600" d="M36.75 18.5C32.4075 18.5 30 21.635 30 21.635C30 21.635 27.5925 18.5 23.25 18.5C18.693 18.5 15 22.193 15 26.75C15 33.7775 25.884 42.4385 29.109 44.8505C29.64 45.248 30.3585 45.248 30.8895 44.8505C34.116 42.4385 45 33.7775 45 26.75C45 22.193 41.307 18.5 36.75 18.5Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/intro.svg b/website/images/index/intro.svg
deleted file mode 100644
index 85db6c7c2ff..00000000000
--- a/website/images/index/intro.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1280 960"><defs><style>.cls-1,.cls-115,.cls-117,.cls-3{opacity:.8}.cls-1{fill:url(#Безымянный_градиент_16)}.cls-2{opacity:.6;fill:url(#Безымянный_градиент_10)}.cls-3{fill:url(#Безымянный_градиент_10-2)}.cls-112,.cls-118,.cls-4,.cls-5{fill:none;stroke-miterlimit:10}.cls-118,.cls-4,.cls-5{stroke:#fff}.cls-4,.cls-5{stroke-width:2px}.cls-112,.cls-118,.cls-5{stroke-linecap:round}.cls-6{fill:#d61a1a}.cls-7{fill:url(#Безымянный_градиент_52)}.cls-8{fill:url(#Безымянный_градиент_52-2)}.cls-9{fill:url(#Безымянный_градиент_52-3)}.cls-10{fill:url(#Безымянный_градиент_52-4)}.cls-11{fill:url(#Безымянный_градиент_52-5)}.cls-12{fill:url(#Безымянный_градиент_52-6)}.cls-13{fill:url(#Безымянный_градиент_52-7)}.cls-14{fill:url(#Безымянный_градиент_52-8)}.cls-15{fill:url(#Безымянный_градиент_52-9)}.cls-16{fill:url(#Безымянный_градиент_52-10)}.cls-17{fill:url(#Безымянный_градиент_52-11)}.cls-18{fill:url(#Безымянный_градиент_52-12)}.cls-19{fill:url(#Безымянный_градиент_52-13)}.cls-20{fill:url(#Безымянный_градиент_52-14)}.cls-21{fill:url(#Безымянный_градиент_52-15)}.cls-22{fill:url(#Безымянный_градиент_52-16)}.cls-23{fill:url(#Безымянный_градиент_52-17)}.cls-24{fill:url(#Безымянный_градиент_52-18)}.cls-25{fill:url(#Безымянный_градиент_52-19)}.cls-26{fill:url(#Безымянный_градиент_52-20)}.cls-27{fill:url(#Безымянный_градиент_52-21)}.cls-28{fill:url(#Безымянный_градиент_52-22)}.cls-29{fill:url(#Безымянный_градиент_52-23)}.cls-30{fill:url(#Безымянный_градиент_52-24)}.cls-31{fill:url(#Безымянный_градиент_52-25)}.cls-32{fill:url(#Безымянный_градиент_52-26)}.cls-33{fill:url(#Безымянный_градиент_52-27)}.cls-34{fill:url(#Безымянный_градиент_52-28)}.cls-35{fill:url(#Безымянный_градиент_52-29)}.cls-36{fill:url(#Безымянный_градиент_52-30)}.cls-37{fill:url(#Безымянный_градиент_52-31)}.cls-38{fill:url(#Безымянный_градиент_52-32)}.cls-39{fill:url(#Безымянный_градиент_52-33)}.cls-40{fill:url(#Безымянный_градиент_52-34)}.cls-41{fill:url(#Безымянный_градиент_52-35)}.cls-42{fill:url(#Безымянный_градиент_52-36)}.cls-43{fill:url(#Безымянный_градиент_52-37)}.cls-44{fill:url(#Безымянный_градиент_52-38)}.cls-45{fill:url(#Безымянный_градиент_56)}.cls-46{fill:url(#Безымянный_градиент_56-2)}.cls-47{fill:url(#Безымянный_градиент_56-3)}.cls-48{fill:url(#Безымянный_градиент_56-4)}.cls-49{fill:url(#Безымянный_градиент_56-5)}.cls-50{fill:url(#Безымянный_градиент_56-6)}.cls-51{fill:url(#Безымянный_градиент_56-7)}.cls-52{fill:url(#Безымянный_градиент_56-8)}.cls-53{fill:url(#Безымянный_градиент_56-9)}.cls-54{fill:url(#Безымянный_градиент_56-10)}.cls-55{fill:url(#Безымянный_градиент_56-11)}.cls-56{fill:url(#Безымянный_градиент_56-12)}.cls-57{fill:url(#Безымянный_градиент_56-13)}.cls-58{fill:url(#Безымянный_градиент_56-14)}.cls-59{fill:url(#Безымянный_градиент_56-15)}.cls-60{fill:url(#Безымянный_градиент_56-16)}.cls-61{fill:url(#Безымянный_градиент_56-17)}.cls-62{fill:url(#Безымянный_градиент_56-18)}.cls-63{fill:url(#Безымянный_градиент_56-19)}.cls-64{fill:url(#Безымянный_градиент_56-20)}.cls-65{fill:url(#Безымянный_градиент_56-21)}.cls-66{fill:#ff571d}.cls-67{fill:#fddd55}.cls-68{fill:#f14600}.cls-69{fill:url(#Безымянный_градиент_139)}.cls-70{fill:url(#Безымянный_градиент_139-2)}.cls-71{fill:url(#Безымянный_градиент_139-3)}.cls-72{fill:url(#Безымянный_градиент_139-4)}.cls-73{fill:url(#Безымянный_градиент_139-5)}.cls-74{fill:url(#Безымянный_градиент_139-6)}.cls-75{fill:url(#Безымянный_градиент_139-7)}.cls-76{fill:url(#Безымянный_градиент_139-8)}.cls-77{fill:url(#Безымянный_градиент_139-9)}.cls-78{fill:url(#Безымянный_градиент_139-10)}.cls-79{fill:url(#Безымянный_градиент_139-11)}.cls-80{fill:url(#Безымянный_градиент_139-12)}.cls-81{fill:url(#Безымянный_градиент_139-13)}.cls-82{fill:url(#Безымянный_градиент_139-14)}.cls-83{fill:url(#Безымянный_градиент_139-15)}.cls-84{fill:url(#Безымянный_градиент_139-16)}.cls-85{fill:url(#Безымянный_градиент_139-17)}.cls-86{fill:url(#Безымянный_градиент_139-18)}.cls-87{fill:url(#Безымянный_градиент_139-19)}.cls-88{fill:url(#Безымянный_градиент_139-20)}.cls-89{fill:url(#Безымянный_градиент_139-21)}.cls-90{fill:url(#Безымянный_градиент_139-22)}.cls-91{fill:url(#Безымянный_градиент_139-23)}.cls-92{fill:url(#Безымянный_градиент_139-24)}.cls-93{fill:url(#Безымянный_градиент_139-25)}.cls-94{fill:url(#Безымянный_градиент_139-26)}.cls-95{fill:url(#Безымянный_градиент_139-27)}.cls-96{fill:url(#Безымянный_градиент_139-28)}.cls-97{fill:url(#Безымянный_градиент_139-29)}.cls-98{fill:url(#Безымянный_градиент_139-30)}.cls-99{fill:url(#Безымянный_градиент_139-31)}.cls-100{fill:url(#Безымянный_градиент_139-32)}.cls-101{fill:url(#Безымянный_градиент_139-33)}.cls-102{fill:url(#Безымянный_градиент_139-34)}.cls-103{fill:url(#Безымянный_градиент_139-35)}.cls-104{fill:url(#Безымянный_градиент_139-36)}.cls-105{fill:url(#Безымянный_градиент_139-37)}.cls-106{fill:url(#Безымянный_градиент_139-38)}.cls-107,.cls-108,.cls-109,.cls-110{opacity:.3}.cls-107{fill:url(#Безымянный_градиент_48)}.cls-108{fill:url(#Безымянный_градиент_33)}.cls-109{fill:url(#Безымянный_градиент_200)}.cls-110{fill:url(#Безымянный_градиент_200-2)}.cls-111{fill:#c3d5ed;opacity:.4}.cls-112{stroke:#a0c9f5;stroke-width:7px}.cls-113,.cls-114,.cls-115{fill:#257af4}.cls-114,.cls-116{opacity:.5}.cls-116,.cls-117{fill:#444451}.cls-118{stroke-width:4px}.cls-119{fill:url(#Безымянный_градиент_4)}.cls-120{fill:url(#Безымянный_градиент_2)}.cls-121{fill:url(#Безымянный_градиент_135)}.cls-122{fill:url(#Безымянный_градиент_2-2)}.cls-123{fill:url(#Безымянный_градиент_233)}.cls-124{fill:url(#Безымянный_градиент_230)}.cls-125{fill:url(#Безымянный_градиент_93)}.cls-126{fill:url(#Безымянный_градиент_3)}.cls-127{fill:url(#Безымянный_градиент_230-2)}</style><linearGradient id="Безымянный_градиент_16" x1="254.06" x2="1094.09" y1="398.29" y2="412.95" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d3e2f5"/><stop offset="1" stop-color="#e3f1fe"/></linearGradient><linearGradient id="Безымянный_градиент_10" x1="939.05" x2="315.08" y1="715.68" y2="417.19" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d1e1f8"/><stop offset="1" stop-color="#e3f1fe"/></linearGradient><linearGradient id="Безымянный_градиент_10-2" x1="471.89" x2="246.89" y1="602.45" y2="627.45" xlink:href="#Безымянный_градиент_10"/><linearGradient id="Безымянный_градиент_52" x1="938.8" x2="308.8" y1="-35.04" y2="364.96" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fcb644"/><stop offset="1" stop-color="#ff9e1d"/></linearGradient><linearGradient id="Безымянный_градиент_52-2" x1="962.95" x2="332.95" y1="3" y2="403" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-3" x1="988.17" x2="358.17" y1="42.72" y2="442.72" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-4" x1="1014.51" x2="384.51" y1="84.2" y2="484.2" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-5" x1="1042.06" x2="412.06" y1="127.6" y2="527.6" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-6" x1="1070.91" x2="440.91" y1="173.03" y2="573.03" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-7" x1="1101.14" x2="471.14" y1="220.64" y2="620.64" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-8" x1="1132.86" x2="502.86" y1="270.6" y2="670.6" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-9" x1="948.32" x2="318.32" y1="-20.05" y2="379.95" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-10" x1="972.51" x2="342.51" y1="18.06" y2="418.06" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-11" x1="997.76" x2="367.76" y1="57.82" y2="457.82" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-12" x1="1024.13" x2="394.13" y1="99.36" y2="499.36" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-13" x1="1051.7" x2="421.7" y1="142.78" y2="542.78" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-14" x1="1080.56" x2="450.56" y1="188.23" y2="588.23" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-15" x1="1110.79" x2="480.79" y1="235.84" y2="635.84" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-16" x1="1142.5" x2="512.5" y1="285.78" y2="685.78" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-17" x1="1175.79" x2="545.79" y1="338.22" y2="738.22" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-18" x1="957.71" x2="327.71" y1="-5.26" y2="394.74" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-19" x1="981.94" x2="351.94" y1="32.91" y2="432.91" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-20" x1="1007.22" x2="377.22" y1="72.72" y2="472.72" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-21" x1="1033.61" x2="403.61" y1="114.29" y2="514.29" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-22" x1="1061.2" x2="431.2" y1="157.74" y2="557.74" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-23" x1="1090.06" x2="460.06" y1="203.2" y2="603.2" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-24" x1="1120.29" x2="490.29" y1="250.81" y2="650.81" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-25" x1="1151.99" x2="521.99" y1="300.73" y2="700.73" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-26" x1="1185.26" x2="555.26" y1="353.13" y2="753.13" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-27" x1="966.98" x2="336.98" y1="9.34" y2="409.34" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-28" x1="991.24" x2="361.24" y1="47.56" y2="447.56" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-29" x1="1016.55" x2="386.55" y1="87.41" y2="487.41" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-30" x1="1042.96" x2="412.96" y1="129.02" y2="529.02" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-31" x1="1070.56" x2="440.56" y1="172.49" y2="572.49" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-32" x1="1099.43" x2="469.43" y1="217.95" y2="617.95" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-33" x1="1129.65" x2="499.65" y1="265.56" y2="665.56" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-34" x1="1161.33" x2="531.33" y1="315.45" y2="715.45" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-35" x1="1194.57" x2="564.57" y1="367.8" y2="767.8" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-36" x1="1052.18" x2="422.18" y1="143.54" y2="543.54" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-37" x1="1079.79" x2="449.79" y1="187.03" y2="587.03" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_52-38" x1="1108.66" x2="478.66" y1="232.49" y2="632.49" xlink:href="#Безымянный_градиент_52"/><linearGradient id="Безымянный_градиент_56" x1="941.28" x2="552.28" y1="-98.16" y2="241.84" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#feaa30"/><stop offset="1" stop-color="#ff9e1d"/></linearGradient><linearGradient id="Безымянный_градиент_56-2" x1="969.71" x2="580.71" y1="-65.62" y2="274.38" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-3" x1="999.37" x2="610.37" y1="-31.69" y2="308.31" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-4" x1="1030.33" x2="641.33" y1="3.73" y2="343.73" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-5" x1="1062.68" x2="673.68" y1="40.74" y2="380.74" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-6" x1="1096.51" x2="707.51" y1="79.45" y2="419.45" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-7" x1="1131.93" x2="742.93" y1="119.98" y2="459.98" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-8" x1="1169.06" x2="780.06" y1="162.45" y2="502.45" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-9" x1="1208.02" x2="819.02" y1="207.03" y2="547.03" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-10" x1="965.98" x2="576.98" y1="-69.89" y2="270.11" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-11" x1="994.75" x2="605.75" y1="-36.98" y2="303.02" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-12" x1="1024.74" x2="635.74" y1="-2.67" y2="337.33" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-13" x1="1056.03" x2="667.03" y1="33.14" y2="373.14" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-14" x1="1088.73" x2="699.73" y1="70.54" y2="410.54" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-15" x1="1122.91" x2="733.91" y1="109.65" y2="449.65" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-16" x1="1158.69" x2="769.69" y1="150.58" y2="490.58" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-17" x1="1196.17" x2="807.17" y1="193.47" y2="533.47" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-18" x1="1235.49" x2="846.49" y1="238.46" y2="578.46" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-19" x1="1081.39" x2="692.39" y1="62.14" y2="402.14" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-20" x1="1114.41" x2="725.41" y1="99.93" y2="439.93" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_56-21" x1="1148.93" x2="759.93" y1="139.42" y2="479.42" xlink:href="#Безымянный_градиент_56"/><linearGradient id="Безымянный_градиент_139" x1="847.8" x2="615.8" y1="43.12" y2="428.12" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fada79"/><stop offset="1" stop-color="#f8cc46"/></linearGradient><linearGradient id="Безымянный_градиент_139-2" x1="809.39" x2="577.39" y1="19.98" y2="404.98" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-3" x1="772.86" x2="540.86" y1="-2.04" y2="382.96" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-4" x1="738.07" x2="506.07" y1="-23" y2="362" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-5" x1="704.9" x2="472.9" y1="-42.99" y2="342.01" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-6" x1="673.24" x2="441.24" y1="-62.07" y2="322.93" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-7" x1="642.99" x2="410.99" y1="-80.3" y2="304.7" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-8" x1="614.05" x2="382.05" y1="-97.73" y2="287.27" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-9" x1="966.9" x2="734.9" y1="114.89" y2="499.89" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-10" x1="924.78" x2="692.78" y1="89.51" y2="474.51" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-11" x1="884.75" x2="652.75" y1="65.39" y2="450.39" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-12" x1="846.67" x2="614.67" y1="42.44" y2="427.44" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-13" x1="810.39" x2="578.39" y1="20.58" y2="405.58" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-14" x1="775.78" x2="543.78" y1="-.28" y2="384.72" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-15" x1="742.74" x2="510.74" y1="-20.19" y2="364.81" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-16" x1="711.16" x2="479.16" y1="-39.22" y2="345.78" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-17" x1="680.95" x2="448.95" y1="-57.42" y2="327.58" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-18" x1="1044.3" x2="812.3" y1="161.53" y2="546.53" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-19" x1="1000.55" x2="768.55" y1="135.17" y2="520.17" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-20" x1="958.97" x2="726.97" y1="110.11" y2="495.11" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-21" x1="919.38" x2="687.38" y1="86.25" y2="471.25" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-22" x1="881.65" x2="649.65" y1="63.52" y2="448.52" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-23" x1="845.66" x2="613.66" y1="41.83" y2="426.83" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-24" x1="811.28" x2="579.28" y1="21.11" y2="406.11" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-25" x1="778.41" x2="546.41" y1="1.31" y2="386.31" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-26" x1="746.95" x2="514.95" y1="-17.65" y2="367.35" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-27" x1="1120.47" x2="888.47" y1="207.43" y2="592.43" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-28" x1="1075.15" x2="843.15" y1="180.12" y2="565.12" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-29" x1="1032.05" x2="800.05" y1="154.15" y2="539.15" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-30" x1="991.01" x2="759.01" y1="129.42" y2="514.42" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-31" x1="951.89" x2="719.89" y1="105.84" y2="490.84" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-32" x1="914.55" x2="682.55" y1="83.34" y2="468.34" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-33" x1="878.87" x2="646.87" y1="61.84" y2="446.84" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-34" x1="844.75" x2="612.75" y1="41.28" y2="426.28" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-35" x1="812.09" x2="580.09" y1="21.6" y2="406.6" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-36" x1="1061.6" x2="829.6" y1="171.95" y2="556.95" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-37" x1="1021.12" x2="789.12" y1="147.56" y2="532.56" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_139-38" x1="1025.83" x2="648.83" y1="121.19" y2="326.19" xlink:href="#Безымянный_градиент_139"/><linearGradient id="Безымянный_градиент_48" x1="251.97" x2="1085.54" y1="459.11" y2="459.11" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b8cee8" stop-opacity=".5"/><stop offset="1" stop-color="#7a9ac1"/></linearGradient><linearGradient id="Безымянный_градиент_33" x1="203.26" x2="981.23" y1="634.7" y2="634.7" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7a9ac1"/><stop offset="1" stop-color="#b8cee8" stop-opacity=".5"/></linearGradient><linearGradient id="Безымянный_градиент_200" x1="311.31" x2="312.6" y1="187" y2="187" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#277cf4"/><stop offset="1" stop-color="#7aaef9" stop-opacity=".5"/></linearGradient><linearGradient id="Безымянный_градиент_200-2" x1="1086.11" x2="1088.16" y1="511.28" y2="511.28" xlink:href="#Безымянный_градиент_200"/><linearGradient id="Безымянный_градиент_4" x1="123.31" x2="367.31" y1="564.89" y2="852.89" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#f8cc46"/></linearGradient><linearGradient id="Безымянный_градиент_2" x1="265.5" x2="334.5" y1="737.76" y2="878.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f14600" stop-opacity="0"/><stop offset=".39" stop-color="#f14600" stop-opacity=".27"/><stop offset="1" stop-color="#f14600"/></linearGradient><linearGradient id="Безымянный_градиент_135" x1="825.75" x2="1179.75" y1="772.78" y2="624.78" gradientUnits="userSpaceOnUse"><stop offset=".19" stop-color="#fff"/><stop offset="1" stop-color="#f8cc46"/></linearGradient><linearGradient id="Безымянный_градиент_2-2" x1="1002.27" x2="1043.77" y1="707.39" y2="534.39" xlink:href="#Безымянный_градиент_2"/><linearGradient id="Безымянный_градиент_233" x1="1134.69" x2="1144.81" y1="552.23" y2="582.35" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fadb7b"/></linearGradient><linearGradient id="Безымянный_градиент_230" x1="376.94" x2="345.94" y1="838.28" y2="821.44" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fadc81"/></linearGradient><linearGradient id="Безымянный_градиент_93" x1="258.49" x2="203.49" y1="101.39" y2="438.39" gradientUnits="userSpaceOnUse"><stop offset=".15" stop-color="#fff"/><stop offset="1" stop-color="#f8cc46"/></linearGradient><linearGradient id="Безымянный_градиент_3" x1="265.56" x2="320.89" y1="293.19" y2="488.52" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f14600" stop-opacity="0"/><stop offset=".27" stop-color="#f14600" stop-opacity=".16"/><stop offset="1" stop-color="#f14600"/></linearGradient><linearGradient id="Безымянный_градиент_230-2" x1="291.66" x2="247.11" y1="477.54" y2="453.35" xlink:href="#Безымянный_градиент_230"/></defs><title>114</title><g id="Слой_6" data-name="Слой 6"><path d="M981.23,689.07a54.7,54.7,0,0,0,3.05-6.18c30.91-74-107-202.07-308-286s-389-92-420-18a54.65,54.65,0,0,0-2,5.61L310,184.69q.78-2.41,1.75-4.75C345.47,99.18,546.6,106.29,761,195.82s360.83,227.58,327.1,308.34q-1.14,2.74-2.54,5.35Z" class="cls-1"/><path d="M890.67,845.06a47.91,47.91,0,0,0,2.39-4.91c28.09-67.25-102.72-185.91-292.16-265S235.12,486.39,207,553.64a47.92,47.92,0,0,0-1.87,5.35L254.28,384.7a54.65,54.65,0,0,1,2-5.61c30.91-74,218.93-65.95,420,18s338.94,212,308,286a54.7,54.7,0,0,1-3.05,6.18Z" class="cls-2"/><path d="M891.39,843.37a47.91,47.91,0,0,0,2.39-4.91c28.09-67.25-102.72-185.91-292.16-265s-365.78-88.73-393.87-21.48a47.92,47.92,0,0,0-1.87,5.35L255,383a54.65,54.65,0,0,1,2-5.61c30.91-74,218.93-65.95,420,18s338.94,212,308,286a54.7,54.7,0,0,1-3.05,6.18Z" class="cls-3"/><path d="M253.65,385.46a54.74,54.74,0,0,1,2.24-6.47c30.93-74.06,219-66,420.14,18s339.07,212.11,308.14,286.16q-.66,1.57-1.41,3.09" class="cls-4"/><path d="M204,557.65q.54-1.61,1.2-3.18C233.35,487,410.27,496.7,600.34,576.08S921.66,774.48,893.5,841.93l-.21.5" class="cls-5"/></g><g id="Слой_3" data-name="Слой 3"><polygon points="480.95 715.89 513.58 766.29 610.64 718.04 581.82 666.41 480.95 715.89" class="cls-6"/><polygon points="352.89 307.1 370.74 342.05 452.84 303.36 436.67 268.09 352.89 307.1" class="cls-7"/><polygon points="366.38 350.16 386.03 387.45 469.74 347.77 451.97 310.08 366.38 350.16" class="cls-8"/><polygon points="380.49 395.2 401.96 434.75 487.35 394.04 467.97 354 380.49 395.2" class="cls-9"/><polygon points="395.27 442.37 418.57 484.08 505.51 442.37 484.72 399.97 395.27 442.37" class="cls-10"/><polygon points="410.75 491.8 435.9 535.58 524.86 492.62 502.28 448.15 410.75 491.8" class="cls-11"/><polygon points="427 543.67 454.02 589.38 544.87 545.21 520.7 498.69 427 543.67" class="cls-12"/><polygon points="444.07 598.17 472.96 645.65 565.79 600.19 540.04 551.78 444.07 598.17" class="cls-13"/><polygon points="462.04 655.51 492.8 704.55 587.69 657.74 560.39 607.62 462.04 655.51" class="cls-14"/><polygon points="563.68 208.94 577.36 244.69 496.33 282.87 481.03 247.43 563.68 208.94" class="cls-15"/><polygon points="497.29 288.86 514.08 326.76 596.67 287.61 581.7 249.33 497.29 288.86" class="cls-16"/><polygon points="514.29 332.18 532.57 372.47 616.79 332.31 600.54 291.56 514.29 332.18" class="cls-17"/><polygon points="532.08 377.53 551.84 420.14 637.77 378.91 620.25 335.75 532.08 377.53" class="cls-18"/><polygon points="550.72 425.05 571.95 469.87 659.65 427.52 640.9 382.04 550.72 425.05" class="cls-19"/><polygon points="570.28 474.89 592.96 521.82 682.49 478.29 662.56 430.59 570.28 474.89" class="cls-20"/><polygon points="590.82 527.24 614.92 576.13 706.38 531.35 685.3 481.57 590.82 527.24" class="cls-21"/><polygon points="612.42 582.29 637.91 632.97 731.37 586.87 709.21 535.16 612.42 582.29" class="cls-22"/><polygon points="635.16 640.24 661.99 692.52 757.54 645.02 734.38 591.57 635.16 640.24" class="cls-23"/><polygon points="689 150.58 700.25 186.78 620.28 224.47 607.45 188.55 689 150.58" class="cls-24"/><polygon points="709.66 189.41 721.93 228.25 640.42 266.88 626.4 228.4 709.66 189.41" class="cls-25"/><polygon points="731.25 229.98 744.49 271.42 661.4 311.04 646.21 270.04 731.25 229.98" class="cls-26"/><polygon points="753.84 272.44 768.01 316.42 683.27 357.07 666.93 313.63 753.84 272.44" class="cls-27"/><polygon points="777.5 316.9 792.53 363.34 706.07 405.1 688.63 359.27 777.5 316.9" class="cls-28"/><polygon points="802.3 363.51 818.13 412.33 729.89 455.24 711.4 407.14 802.3 363.51" class="cls-29"/><polygon points="828.33 412.43 844.89 463.52 754.78 507.64 735.3 457.4 828.33 412.43" class="cls-30"/><polygon points="855.69 463.84 872.87 517.06 780.82 562.47 760.42 510.23 855.69 463.84" class="cls-31"/><polygon points="884.47 517.93 902.17 573.13 808.09 619.89 786.85 565.82 884.47 517.93" class="cls-32"/><polygon points="812.65 92.99 821.57 129.62 742.62 166.82 732.19 130.46 812.65 92.99" class="cls-33"/><polygon points="835.88 130.29 845.53 169.67 765.1 207.79 753.75 168.76 835.88 130.29" class="cls-34"/><polygon points="860.15 169.27 870.47 211.35 788.5 250.44 776.28 208.77 860.15 169.27" class="cls-35"/><polygon points="885.53 210.03 896.46 254.78 812.88 294.88 799.85 250.63 885.53 210.03" class="cls-36"/><polygon points="912.11 252.7 923.55 300.06 838.31 341.23 824.53 294.46 912.11 252.7" class="cls-37"/><polygon points="939.96 297.42 951.83 347.32 864.85 389.62 850.41 340.41 939.96 297.42" class="cls-38"/><polygon points="969.18 344.34 981.37 396.69 892.58 440.17 877.56 388.63 969.18 344.34" class="cls-39"/><polygon points="999.87 393.63 1012.26 448.3 921.58 493.03 906.09 439.3 999.87 393.63" class="cls-40"/><polygon points="1032.16 445.48 1044.59 502.33 951.95 548.38 936.1 492.6 1032.16 445.48" class="cls-41"/><polygon points="1015.37 148.5 1023.16 193.99 940.72 233.54 930.89 188.53 1015.37 148.5" class="cls-42"/><polygon points="1044.77 189.43 1052.76 237.66 968.69 278.26 958.46 230.59 1044.77 189.43" class="cls-43"/><polygon points="1075.58 232.31 1083.63 283.24 997.88 324.93 987.35 274.67 1075.58 232.31" class="cls-44"/><polygon points="607.45 188.55 620.28 224.47 607.03 196.56 595.03 162.42 607.45 188.55" class="cls-45"/><polygon points="613.42 201.1 626.63 237.84 640.42 266.88 626.4 228.4 613.42 201.1" class="cls-46"/><polygon points="632.64 241.51 647.04 280.8 661.4 311.04 646.21 270.04 632.64 241.51" class="cls-47"/><polygon points="652.73 283.76 668.29 325.55 683.27 357.07 666.93 313.63 652.73 283.76" class="cls-48"/><polygon points="673.76 327.99 690.45 372.21 706.07 405.1 688.63 359.27 673.76 327.99" class="cls-49"/><polygon points="695.79 374.33 713.58 421.3 729.89 455.24 711.4 407.14 695.79 374.33" class="cls-50"/><polygon points="735.3 457.4 754.78 507.64 737.73 471.74 718.91 422.94 735.3 457.4" class="cls-51"/><polygon points="743.19 474 762.98 524.9 780.82 562.47 760.42 510.23 743.19 474" class="cls-52"/><polygon points="786.85 565.82 808.09 619.89 789.4 580.54 768.72 527.69 786.85 565.82" class="cls-53"/><polygon points="732.19 130.46 742.62 166.82 727.84 139.86 718.04 105.34 732.19 130.46" class="cls-54"/><polygon points="738.98 142.53 749.71 179.74 765.1 207.79 753.75 168.76 738.98 142.53" class="cls-55"/><polygon points="776.28 208.77 788.5 250.44 772.48 221.24 760.85 181.36 776.28 208.77" class="cls-56"/><polygon points="783.7 221.95 796.18 264.45 812.88 294.88 799.85 250.63 783.7 221.95" class="cls-57"/><polygon points="807.62 264.42 820.89 309.49 838.31 341.23 824.53 294.46 807.62 264.42" class="cls-58"/><polygon points="832.67 308.92 846.67 356.48 864.85 389.62 850.41 340.41 832.67 308.92" class="cls-59"/><polygon points="858.94 355.57 873.58 405.54 892.58 440.17 877.56 388.63 858.94 355.57" class="cls-60"/><polygon points="886.53 404.56 901.71 456.81 921.58 493.03 906.09 439.3 886.53 404.56" class="cls-61"/><polygon points="915.52 456.04 931.14 510.45 951.95 548.38 936.1 492.6 915.52 456.04" class="cls-62"/><polygon points="930.89 188.53 940.72 233.54 922.35 204.17 912.85 161 930.89 188.53" class="cls-63"/><polygon points="939.57 201.77 949.54 247.64 968.69 278.26 958.46 230.59 939.57 201.77" class="cls-64"/><polygon points="987.35 274.67 997.88 324.93 977.89 292.96 967.55 244.46 987.35 274.67" class="cls-65"/><polygon points="567.12 626.08 594.91 676.71 610.64 718.04 581.82 666.41 567.12 626.08" class="cls-66"/><polygon points="426.63 240.56 441.73 274.15 452.84 303.36 436.67 268.09 426.63 240.56" class="cls-67"/><polygon points="441.49 281.31 458.17 317.37 469.74 347.77 451.97 310.08 441.49 281.31" class="cls-67"/><polygon points="457.01 323.91 475.29 362.36 487.35 394.04 467.97 354 457.01 323.91" class="cls-67"/><polygon points="473.24 368.47 493.13 409.24 505.51 442.37 484.61 399.66 473.24 368.47" class="cls-67"/><polygon points="490.25 415.13 511.74 458.13 524.86 492.62 502.28 448.15 490.25 415.13" class="cls-67"/><polygon points="508.07 464.04 531.16 509.18 544.87 545.21 520.7 498.69 508.07 464.04" class="cls-67"/><polygon points="526.78 515.38 551.46 562.52 565.79 600.19 540.04 551.78 526.78 515.38" class="cls-67"/><polygon points="546.44 569.33 572.69 618.3 587.69 657.74 560.39 607.62 546.44 569.33" class="cls-67"/><polygon points="581.82 666.41 480.95 715.89 467.98 674.47 567.12 626.08 581.82 666.41" class="cls-68"/><polygon points="560.39 607.62 462.04 655.51 449.72 616.19 546.44 569.33 560.39 607.62" class="cls-69"/><polygon points="540.04 551.78 444.07 598.17 432.37 560.8 526.78 515.38 540.04 551.78" class="cls-70"/><polygon points="520.7 498.69 427 543.67 415.86 508.11 508.07 464.04 520.7 498.69" class="cls-71"/><polygon points="502.28 448.15 410.75 491.8 400.14 457.92 490.25 415.13 502.28 448.15" class="cls-72"/><polygon points="484.72 399.97 395.27 442.37 385.14 410.05 473.24 368.47 484.72 399.97" class="cls-73"/><polygon points="467.97 354 380.49 395.2 370.82 364.34 457.01 323.91 467.97 354" class="cls-74"/><polygon points="451.97 310.08 366.38 350.16 357.14 320.66 441.49 281.31 451.97 310.08" class="cls-75"/><polygon points="436.67 268.09 352.89 307.1 344.05 278.87 426.63 240.56 436.67 268.09" class="cls-76"/><polygon points="734.38 591.57 635.16 640.24 619.56 600.49 717.12 552.88 734.38 591.57" class="cls-77"/><polygon points="709.21 535.16 612.42 582.29 597.61 544.53 692.82 498.41 709.21 535.16" class="cls-78"/><polygon points="685.3 481.57 590.82 527.24 576.74 491.35 669.71 446.62 685.3 481.57" class="cls-79"/><polygon points="662.56 430.59 570.28 474.89 556.87 440.72 647.72 397.31 662.56 430.59" class="cls-80"/><polygon points="640.9 382.04 550.72 425.05 537.95 392.48 626.75 350.31 640.9 382.04" class="cls-81"/><polygon points="620.25 335.75 532.08 377.53 519.89 346.45 606.74 305.46 620.25 335.75" class="cls-82"/><polygon points="600.54 291.56 514.29 332.18 502.64 302.5 587.63 262.62 600.54 291.56" class="cls-83"/><polygon points="581.7 249.33 497.29 288.86 486.15 260.48 569.36 221.66 581.7 249.33" class="cls-84"/><polygon points="563.68 208.94 481.03 247.43 470.38 220.26 551.86 182.45 563.68 208.94" class="cls-85"/><polygon points="884.47 517.93 786.85 565.82 768.72 527.69 864.73 480.83 884.47 517.93" class="cls-86"/><polygon points="855.69 463.84 760.42 510.23 743.19 474 836.93 428.58 855.69 463.84" class="cls-87"/><polygon points="828.33 412.43 735.3 457.4 718.91 422.94 810.48 378.89 828.33 412.43" class="cls-88"/><polygon points="802.3 363.51 711.4 407.14 695.79 374.33 785.3 331.56 802.3 363.51" class="cls-89"/><polygon points="777.5 316.9 688.63 359.27 673.76 327.99 761.28 286.43 777.5 316.9" class="cls-90"/><polygon points="753.84 272.44 666.93 313.63 652.73 283.76 738.36 243.35 753.84 272.44" class="cls-91"/><polygon points="731.25 229.98 646.21 270.04 632.64 241.51 716.46 202.18 731.25 229.98" class="cls-92"/><polygon points="709.66 189.41 626.4 228.4 613.42 201.1 695.5 162.81 709.66 189.41" class="cls-93"/><polygon points="689 150.58 607.45 188.55 595.03 162.42 675.44 125.11 689 150.58" class="cls-94"/><polygon points="1032.16 445.48 936.1 492.6 915.52 456.04 1010.02 409.92 1032.16 445.48" class="cls-95"/><polygon points="999.87 393.63 906.09 439.3 886.53 404.56 978.83 359.84 999.87 393.63" class="cls-96"/><polygon points="969.18 344.34 877.56 388.63 858.94 355.57 949.14 312.18 969.18 344.34" class="cls-97"/><polygon points="939.96 297.42 850.41 340.41 832.67 308.92 920.87 266.77 939.96 297.42" class="cls-98"/><polygon points="912.11 252.7 824.53 294.46 807.62 264.42 893.89 223.46 912.11 252.7" class="cls-99"/><polygon points="885.53 210.03 799.85 250.63 783.7 221.95 868.14 182.1 885.53 210.03" class="cls-100"/><polygon points="860.15 169.27 776.28 208.77 760.85 181.36 843.52 142.57 860.15 169.27" class="cls-101"/><polygon points="835.88 130.29 753.75 168.76 738.98 142.53 819.97 104.74 835.88 130.29" class="cls-102"/><polygon points="812.65 92.99 732.19 130.46 718.04 105.34 797.4 68.52 812.65 92.99" class="cls-103"/><polygon points="1075.58 232.31 987.35 274.67 967.55 244.46 1054.46 202.92 1075.58 232.31" class="cls-104"/><polygon points="1044.77 189.43 958.46 230.59 939.57 201.77 1024.62 161.38 1044.77 189.43" class="cls-105"/><polygon points="1015.37 148.5 930.89 188.53 912.85 161 996.12 121.7 1015.37 148.5" class="cls-106"/></g><g id="Слой_5" data-name="Слой 5"><path d="M981.23,689.07c-38.68,67.3-221.66,57.35-416.9-24.19-196-81.87-332-205.68-310-280.41L310,184.69C283.7,266,428.61,400.48,638.84,488.28c209.53,87.51,406.41,96.28,446.7,21.23Z" class="cls-107"/><path d="M890.69,845.06c-34.54,61.82-206.79,50.74-391.48-26.39C314.7,741.61,185.81,627,205.18,559l49.13-174.52c-22,74.73,114,198.54,310,280.41,195.25,81.54,378.22,91.49,416.9,24.19Z" class="cls-108"/><path d="M311.31,189.32l1.29-4.64C312.11,186.21,311.69,187.76,311.31,189.32Z" class="cls-109"/><path d="M1086.11,513.05q1.09-1.74,2.06-3.54Z" class="cls-110"/><path d="M649.82,868c-324.67-133.72-386.55-367.65-397-478.28L205.18,559c-19.37,68,109.52,182.62,294,259.67C551.35,840.45,602.49,857,649.82,868Z" class="cls-111"/><path d="M447.69,464.94C367.29,412,311.23,354.82,293,306.07" class="cls-112"/><path d="M357.84,476.55c-29.17-24.61-52.26-49.22-67.91-72.58" class="cls-112"/><path d="M979,664c-55.58,26.57-162,21.18-283.85-14.66" class="cls-112"/><path d="M474.13,718.74c-54.93-26.92-103.33-56.87-142.38-87.23" class="cls-112"/><path d="M276.83,582.08c-13.46-14.41-24.41-28.58-32.54-42.23" class="cls-112"/><path d="M408.09,631.51A709.33,709.33,0,0,1,346,588.18" class="cls-112"/><path d="M398.59,729.22A756.7,756.7,0,0,1,317.1,675" class="cls-112"/><path d="M330.69,570.82c3-9.37-.62-20.18-8.12-24.14s-16,.42-19.05,9.79.62,20.18,8.12,24.14S327.67,580.19,330.69,570.82Z" class="cls-68"/><path d="M316,613.78c3-9.37-.62-20.18-8.12-24.14s-16,.42-19.05,9.79.62,20.18,8.12,24.14S313,623.15,316,613.78Z" class="cls-113"/><path d="M300.6,657.93c3-9.37-.62-20.18-8.12-24.14s-16,.42-19.05,9.79.62,20.18,8.12,24.14S297.58,667.3,300.6,657.93Z" class="cls-113"/><path d="M857.89,618.2c3-9.37,12.23-16,20.58-14.89s12.67,9.67,9.65,19-12.23,16-20.58,14.89S854.87,627.57,857.89,618.2Z" class="cls-113"/><path d="M778.3,812.58c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S777,816.49,778.3,812.58Z" class="cls-114"/><path d="M788.73,790.74c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S787.47,794.66,788.73,790.74Z" class="cls-115"/><path d="M812.54,813.57c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S811.28,817.49,812.54,813.57Z" class="cls-68"/><path d="M789.84,860.48c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S788.58,864.39,789.84,860.48Z" class="cls-116"/><path d="M823.55,791.56c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S822.29,795.47,823.55,791.56Z" class="cls-113"/><path d="M844,811.32c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S842.78,815.24,844,811.32Z" class="cls-114"/><path d="M742,809.09c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S740.77,813,742,809.09Z" class="cls-114"/><path d="M704.77,803c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S703.51,806.89,704.77,803Z" class="cls-117"/><path d="M714.24,780.63c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S713,784.54,714.24,780.63Z" class="cls-113"/><path d="M723.6,758.28c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S722.34,762.19,723.6,758.28Z" class="cls-68"/><path d="M685.48,749.91c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S684.22,753.82,685.48,749.91Z" class="cls-115"/><path d="M658.85,817.26c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S657.59,821.17,658.85,817.26Z" class="cls-115"/><path d="M649.07,842.2c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S647.81,846.11,649.07,842.2Z" class="cls-117"/><path d="M695.51,825.33c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S694.25,829.24,695.51,825.33Z" class="cls-114"/><path d="M731.42,831.45c1.26-3.91,5.11-6.7,8.6-6.22s5.29,4,4,8-5.11,6.7-8.6,6.22S730.16,835.36,731.42,831.45Z" class="cls-115"/><path d="M963.84,612.43c3-9.37,12.23-16,20.58-14.89s12.67,9.67,9.65,19-12.23,16-20.58,14.89S960.82,621.8,963.84,612.43Z" class="cls-68"/><path d="M914,618.72c3-9.37,12.23-16,20.58-14.89s12.67,9.67,9.65,19-12.23,16-20.58,14.89S911,628.1,914,618.72Z" class="cls-68"/><path d="M416.25,360.52c-83-66-126.13-133.7-106.24-181.31" class="cls-118"/><path d="M808.09,543.31c-19.12-4.38-38.75-9.55-58.77-15.5" class="cls-118"/><path d="M1091.23,505.47C1071,554,989.76,570.64,881.34,556.59" class="cls-118"/><path d="M542.57,655.47C359,574,232.08,456.14,253.33,380.75" class="cls-118"/><path d="M986.83,681.83c-13.26,27.13-45.07,43.31-89.39,49.26" class="cls-118"/></g><g id="Слой_7" data-name="Слой 7"><path d="M346.36,855.08a901.75,901.75,0,0,1-88.25-65.18c-28-23.58-54.43-49.1-77.86-77.41a375.6,375.6,0,0,1-32.15-44.87C138.59,651.79,130.36,635,125,617.1a134.74,134.74,0,0,1-5.35-27.49,99.19,99.19,0,0,1-.25-14,91.68,91.68,0,0,1,1.76-13.91A80.94,80.94,0,0,1,131.33,536a83.31,83.31,0,0,1,17.77-20.34.5.5,0,0,1,.69.72,80.5,80.5,0,0,0-14.39,21.76,74.52,74.52,0,0,0-6.11,24.7,82.58,82.58,0,0,0,.12,12.62,88.37,88.37,0,0,0,1.92,12.45A107.44,107.44,0,0,0,134.76,600c1.38,4,2.92,7.91,4.68,11.75,7,15.4,16.52,29.65,27.2,43a349.8,349.8,0,0,0,35.28,37.34c25.3,23.29,53.24,43.77,82.37,62.26A850.7,850.7,0,0,0,375,804a29.35,29.35,0,1,1-28.46,51.2Z" class="cls-119"/><path d="M346.36,855.08a901.75,901.75,0,0,1-88.25-65.18c-28-23.58-54.43-49.1-77.86-77.41a375.6,375.6,0,0,1-32.15-44.87C138.59,651.79,130.36,635,125,617.1a134.74,134.74,0,0,1-5.35-27.49,99.19,99.19,0,0,1-.25-14,91.68,91.68,0,0,1,1.76-13.91A80.94,80.94,0,0,1,131.33,536a83.31,83.31,0,0,1,17.77-20.34.5.5,0,0,1,.69.72,80.5,80.5,0,0,0-14.39,21.76,74.52,74.52,0,0,0-6.11,24.7,82.58,82.58,0,0,0,.12,12.62,88.37,88.37,0,0,0,1.92,12.45A107.44,107.44,0,0,0,134.76,600c1.38,4,2.92,7.91,4.68,11.75,7,15.4,16.52,29.65,27.2,43a349.8,349.8,0,0,0,35.28,37.34c25.3,23.29,53.24,43.77,82.37,62.26A850.7,850.7,0,0,0,375,804a29.35,29.35,0,1,1-28.46,51.2Z" class="cls-120"/><path d="M1161.33,557.21a255,255,0,0,1,11.22,31.53,191.84,191.84,0,0,1,6.39,33.61,149.72,149.72,0,0,1-.66,35,128.12,128.12,0,0,1-9.7,34.14,126,126,0,0,1-18.69,29.75,141.94,141.94,0,0,1-25.06,23.17A178.81,178.81,0,0,1,1096.32,761l-3.69,1.7c-1.23.57-2.46,1.14-3.71,1.62l-7.48,3c-2.51.94-5,1.78-7.55,2.67-1.26.43-2.51.91-3.78,1.29l-3.81,1.15c-20.28,6.25-40.9,9.78-61.45,12a489.45,489.45,0,0,1-61.52,2.18c-40.84-1-81.19-6.19-120.85-13.91a.5.5,0,0,1,.14-1c40.17,3.78,80.55,4.93,120.39,2a473.57,473.57,0,0,0,59-7.94c19.28-4,38.22-9.28,55.91-16.74l3.32-1.37c1.11-.45,2.17-1,3.26-1.49,2.15-1,4.33-2,6.46-3l6.28-3.28c1.06-.52,2.07-1.12,3.07-1.72l3-1.78a149.41,149.41,0,0,0,22.31-16.08,109.27,109.27,0,0,0,17.44-19.67,90.45,90.45,0,0,0,11.23-22.6c5.21-15.86,5.58-32.88,2.21-49.79s-10.27-33.67-19.08-49.66a24.43,24.43,0,0,1,42.8-23.57q.58,1.05,1,2.14Z" class="cls-121"/><path d="M1161.33,557.21a255,255,0,0,1,11.22,31.53,191.84,191.84,0,0,1,6.39,33.61,149.72,149.72,0,0,1-.66,35,128.12,128.12,0,0,1-9.7,34.14,126,126,0,0,1-18.69,29.75,141.94,141.94,0,0,1-25.06,23.17A178.81,178.81,0,0,1,1096.32,761l-3.69,1.7c-1.23.57-2.46,1.14-3.71,1.62l-7.48,3c-2.51.94-5,1.78-7.55,2.67-1.26.43-2.51.91-3.78,1.29l-3.81,1.15c-20.28,6.25-40.9,9.78-61.45,12a489.45,489.45,0,0,1-61.52,2.18c-40.84-1-81.19-6.19-120.85-13.91a.5.5,0,0,1,.14-1c40.17,3.78,80.55,4.93,120.39,2a473.57,473.57,0,0,0,59-7.94c19.28-4,38.22-9.28,55.91-16.74l3.32-1.37c1.11-.45,2.17-1,3.26-1.49,2.15-1,4.33-2,6.46-3l6.28-3.28c1.06-.52,2.07-1.12,3.07-1.72l3-1.78a149.41,149.41,0,0,0,22.31-16.08,109.27,109.27,0,0,0,17.44-19.67,90.45,90.45,0,0,0,11.23-22.6c5.21-15.86,5.58-32.88,2.21-49.79s-10.27-33.67-19.08-49.66a24.43,24.43,0,0,1,42.8-23.57q.58,1.05,1,2.14Z" class="cls-122"/><circle cx="1139.76" cy="567.31" r="15.78" class="cls-123"/><circle cx="361.64" cy="829.97" r="18.75" class="cls-124"/></g><g id="Слой_8" data-name="Слой 8"><path d="M241.82,491.85a659.92,659.92,0,0,1-45.41-53.68c-1.78-2.34-3.55-4.69-5.27-7.1s-3.47-4.77-5.17-7.18l-5-7.31c-1.69-2.42-3.28-4.95-4.91-7.41-6.46-10-12.65-20.12-18.3-30.71-11.29-21.13-21-43.54-27.08-67.54a200.24,200.24,0,0,1-5.93-37,157.43,157.43,0,0,1,2.15-38.1,130.91,130.91,0,0,1,33.87-67c1-1.16,2.14-2.23,3.24-3.31s2.18-2.17,3.31-3.21c2.3-2,4.53-4.13,6.92-6a162.48,162.48,0,0,1,14.61-10.63,197.08,197.08,0,0,1,31.34-16.09c21.52-8.7,43.77-13.9,66-17.12a445.68,445.68,0,0,1,66.73-4.12.5.5,0,0,1,.06,1,440,440,0,0,0-64.59,13.33c-20.93,6.13-41.21,14.13-59.48,24.77a174.73,174.73,0,0,0-25.42,18A136.39,136.39,0,0,0,192.57,176c-1.74,1.8-3.27,3.76-4.88,5.63-.78,1-1.5,2-2.25,2.93s-1.5,1.94-2.17,3l-2.07,3c-.66,1-1.27,2.07-1.91,3.09l-.95,1.54-.86,1.58-1.72,3.16-1.54,3.23c-.25.54-.53,1.06-.76,1.61l-.68,1.65c-.44,1.1-.93,2.18-1.34,3.29L170.27,213a95.07,95.07,0,0,0-4.95,27.49c-.68,18.65,3.69,37.55,11.18,55.61s18,35.38,30.07,51.75c6,8.2,12.56,16.12,19.32,23.86,1.72,1.92,3.37,3.88,5.14,5.77l5.26,5.68c1.77,1.88,3.6,3.73,5.39,5.59s3.62,3.7,5.47,5.52a589.13,589.13,0,0,0,46.79,41.53A38.36,38.36,0,1,1,242,492.06Z" class="cls-125"/><path d="M241.82,491.85a659.92,659.92,0,0,1-45.41-53.68c-1.78-2.34-3.55-4.69-5.27-7.1s-3.47-4.77-5.17-7.18l-5-7.31c-1.69-2.42-3.28-4.95-4.91-7.41-6.46-10-12.65-20.12-18.3-30.71-11.29-21.13-21-43.54-27.08-67.54a200.24,200.24,0,0,1-5.93-37,157.43,157.43,0,0,1,2.15-38.1,130.91,130.91,0,0,1,33.87-67c1-1.16,2.14-2.23,3.24-3.31s2.18-2.17,3.31-3.21c2.3-2,4.53-4.13,6.92-6a162.48,162.48,0,0,1,14.61-10.63,197.08,197.08,0,0,1,31.34-16.09c21.52-8.7,43.77-13.9,66-17.12a445.68,445.68,0,0,1,66.73-4.12.5.5,0,0,1,.06,1,440,440,0,0,0-64.59,13.33c-20.93,6.13-41.21,14.13-59.48,24.77a174.73,174.73,0,0,0-25.42,18A136.39,136.39,0,0,0,192.57,176c-1.74,1.8-3.27,3.76-4.88,5.63-.78,1-1.5,2-2.25,2.93s-1.5,1.94-2.17,3l-2.07,3c-.66,1-1.27,2.07-1.91,3.09l-.95,1.54-.86,1.58-1.72,3.16-1.54,3.23c-.25.54-.53,1.06-.76,1.61l-.68,1.65c-.44,1.1-.93,2.18-1.34,3.29L170.27,213a95.07,95.07,0,0,0-4.95,27.49c-.68,18.65,3.69,37.55,11.18,55.61s18,35.38,30.07,51.75c6,8.2,12.56,16.12,19.32,23.86,1.72,1.92,3.37,3.88,5.14,5.77l5.26,5.68c1.77,1.88,3.6,3.73,5.39,5.59s3.62,3.7,5.47,5.52a589.13,589.13,0,0,0,46.79,41.53A38.36,38.36,0,1,1,242,492.06Z" class="cls-126"/><circle cx="269.68" cy="465.61" r="26.94" class="cls-127"/></g></svg>
\ No newline at end of file
diff --git a/website/images/index/linearly-scalable.svg b/website/images/index/linearly-scalable.svg
deleted file mode 100644
index b2cd41338ec..00000000000
--- a/website/images/index/linearly-scalable.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" enable-background="new 0 0 1280 960" version="1.1" viewBox="0 0 1280 960" xml:space="preserve"><style type="text/css">.st0{fill:url(#SVGID_1_)}.st1{opacity:.2;fill:url(#SVGID_2_)}.st2{opacity:.1;fill:url(#SVGID_3_)}.st3{opacity:.5;fill:none;stroke:#fff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10}.st4{display:none}.st5{display:inline;fill:none;stroke:#1d1d1b;stroke-miterlimit:10}.st6{opacity:.5;fill:url(#SVGID_4_)}.st7,.st8{opacity:.71;fill:url(#SVGID_5_)}.st8{fill:url(#SVGID_6_)}.st9{fill:#f5faff}.st10{opacity:.6;fill:url(#SVGID_7_)}.st11{fill:none;stroke:#fff;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10}.st12{fill:#f14600}.st13{fill:#257af4}.st14{fill:#f8cc47}.st15{fill:#444451}.st16{opacity:.3;fill:url(#SVGID_8_)}.st17{opacity:.2;fill:url(#SVGID_9_)}.st18,.st19{opacity:.63;fill:none;stroke:#fff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10}.st19{opacity:.54;stroke:#dce6ef}.st20{fill:#dd4a07}.st21{fill:url(#SVGID_10_)}.st22{fill:url(#SVGID_11_)}.st23{fill:url(#SVGID_12_)}.st24{fill:url(#SVGID_13_)}.st25{fill:#f8ce4f}.st26{fill:url(#SVGID_14_)}.st27{fill:url(#SVGID_15_)}.st28{fill:url(#SVGID_16_)}.st29{fill:url(#SVGID_17_)}.st30{opacity:.7}.st31{fill:url(#SVGID_18_)}.st32{fill:url(#SVGID_19_)}.st33{fill:url(#SVGID_20_)}.st34{fill:url(#SVGID_21_)}</style><g id="Слой_13"><linearGradient id="SVGID_1_" x1="768.592" x2="1605.238" y1="362.033" y2="362.033" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#D3E2F5"/><stop offset="1" stop-color="#E3F1FE"/></linearGradient><path d="M632.7,406.3c-231,0-418.3,104.2-418.3,232.6V317.8c0-128.5,187.3-232.6,418.3-232.6S1051,189.3,1051,317.8 v321.1C1051,510.4,863.8,406.3,632.7,406.3z" class="st0"/><linearGradient id="SVGID_2_" x1="768.549" x2="1605.195" y1="362.033" y2="362.033" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#D3E2F5"/><stop offset="1" stop-color="#E3F1FE"/></linearGradient><path d="M632.8,406.3c-231,0-418.3,104.2-418.3,232.6V317.8c0-128.5,187.3-232.6,418.3-232.6s418.3,104.2,418.3,232.6 v321.1C1051.1,510.4,863.8,406.3,632.8,406.3z" class="st1"/><linearGradient id="SVGID_3_" x1="768.603" x2="1605.249" y1="740.451" y2="740.451" gradientTransform="matrix(-1 0 0 -1 1819.6328 1182.8362)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7A9AC1"/><stop offset="1" stop-color="#B8CEE8" stop-opacity=".5"/></linearGradient><path d="M632.7,406.3c231,0,418.3,104.2,418.3,232.6V478.4c0-128.5-187.3-232.6-418.3-232.6S214.4,349.9,214.4,478.4 V639C214.4,510.5,401.7,406.3,632.7,406.3z" class="st2"/><path d="M678.5,247.2c-15-0.9-30.3-1.4-45.7-1.4c-197.9,0-363.6,76.4-407.2,179" class="st3"/><path d="M999.5,366.5c-37.2-37.6-92.6-68.9-159.6-90.2" class="st3"/></g><g id="_x32_22_2_" class="st4"><path d="M778,474.9c15.7,26.1,80.9,16.4,145.9-3" class="st5"/><path d="M486.8,474.9c-15.7,26.1-80.2,16.4-145.2-3" class="st5"/></g><g id="Слой_9"><linearGradient id="SVGID_4_" x1="981.944" x2="1392.696" y1="421.245" y2="421.245" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#87ADDE"/><stop offset="1" stop-color="#9FBEDE"/></linearGradient><path d="M632.3,443c-113.4,0-205.4,51.1-205.4,114.2V399.5c0-63.1,91.9-114.2,205.4-114.2s205.4,51.1,205.4,114.2 v157.7C837.7,494.1,745.7,443,632.3,443z" class="st6"/><linearGradient id="SVGID_5_" x1="981.944" x2="1392.696" y1="535.459" y2="535.459" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#AECDEC" stop-opacity=".656"/><stop offset="1" stop-color="#6B9AC1"/></linearGradient><path d="M632.3,513.7c113.4,0,205.4-51.1,205.4-114.2v157.7c0,63.1-91.9,114.2-205.4,114.2s-205.4-51.1-205.4-114.2 V399.5C426.9,462.6,518.9,513.7,632.3,513.7z" class="st7"/><linearGradient id="SVGID_6_" x1="981.949" x2="1392.701" y1="535.459" y2="535.459" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#AECDEC" stop-opacity=".656"/><stop offset="1" stop-color="#5A86C1"/></linearGradient><path d="M632.3,513.7c113.4,0,205.4-51.1,205.4-114.2v157.7c0,63.1-91.9,114.2-205.4,114.2s-205.4-51.1-205.4-114.2 V399.5C426.9,462.6,518.9,513.7,632.3,513.7z" class="st8"/><ellipse cx="632.5" cy="399.1" class="st9" rx="206.9" ry="115.9"/><linearGradient id="SVGID_7_" x1="981.949" x2="1392.701" y1="574.873" y2="574.873" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7A9AC1" stop-opacity=".8"/><stop offset="1" stop-color="#5574BA" stop-opacity=".2"/></linearGradient><path d="M632.3,592.6c113.4,0,205.4-51.1,205.4-114.2v78.8c0,63.1-91.9,114.2-205.4,114.2s-205.4-51.1-205.4-114.2 v-78.8C426.9,541.4,518.9,592.6,632.3,592.6z" class="st10"/><path d="M687,588.5c87.9-13.3,152.4-57.6,152.4-110.1" class="st11"/><path d="M546.8,582.2c17.6,4.5,36.5,7.6,56.3,9.2" class="st11"/><ellipse cx="493.2" cy="510.9" class="st12" rx="8.2" ry="10" transform="matrix(0.866 -0.5 0.5 0.866 -189.3727 315.0233)"/><ellipse cx="521.3" cy="521.8" class="st13" rx="8.2" ry="10" transform="matrix(0.866 -0.5 0.5 0.866 -191.0516 330.5624)"/><ellipse cx="549.8" cy="639.4" class="st14" rx="8.2" ry="10" transform="matrix(0.866 -0.5 0.5 0.866 -246.0345 360.5734)"/><ellipse cx="582.8" cy="645.5" class="st14" rx="8.2" ry="10" transform="matrix(0.866 -0.5 0.5 0.866 -244.6991 377.8622)"/><path d="M754.8,518.2c32.3-13.7,57.1-32.6,70.2-54.5" class="st3"/><path d="M439.6,472.8c7.7,10.8,18.3,20.7,31.5,29.6" class="st3"/><path d="M472.4,578.2c32.7,22.2,80.1,37.3,133.9,40.9" class="st3"/><path d="M446.4,555.7c4.6,5.3,9.8,10.3,15.7,15" class="st3"/><ellipse cx="724.5" cy="645.8" class="st13" rx="5.4" ry="4.3" transform="matrix(0.136 -0.9907 0.9907 0.136 -13.8764 1275.6659)"/><ellipse cx="706.2" cy="633.9" class="st15" rx="5.4" ry="4.5" transform="matrix(0.1578 -0.9875 0.9875 0.1578 -31.2361 1231.26)"/><ellipse cx="705.9" cy="650.3" class="st13" rx="5.4" ry="4.5" transform="matrix(0.1578 -0.9875 0.9875 0.1578 -47.612 1244.7588)"/><ellipse cx="687.1" cy="619.7" class="st13" rx="5.4" ry="4.7" transform="matrix(0.2037 -0.979 0.979 0.2037 -59.5813 1166.204)"/></g><g id="_x32_22" class="st4"><path d="M486.8,638.9c-11.1,61-99.1,120.4-166.5,154.7" class="st5"/><path d="M778.1,638.9c11.1,61,98.9,120.4,166.3,154.7" class="st5"/></g><g id="Слой_1"><linearGradient id="SVGID_8_" x1="768.592" x2="1605.238" y1="594.671" y2="594.671" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#B8CEE8" stop-opacity=".5"/><stop offset="1" stop-color="#7A9AC1"/></linearGradient><path d="M632.7,550.4c231,0,418.3-104.2,418.3-232.6v321.1c0,128.5-187.3,232.6-418.3,232.6S214.4,767.4,214.4,638.9 V317.8C214.4,446.3,401.7,550.4,632.7,550.4z" class="st16"/><linearGradient id="SVGID_9_" x1="768.603" x2="1605.249" y1="674.953" y2="674.953" gradientTransform="matrix(-1 0 0 1 1819.6328 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7A9AC1"/><stop offset="1" stop-color="#B8CEE8" stop-opacity=".5"/></linearGradient><path d="M632.7,711c231,0,418.3-104.2,418.3-232.6v160.6c0,128.5-187.3,232.6-418.3,232.6S214.4,767.4,214.4,638.9 V478.4C214.4,606.8,401.7,711,632.7,711z" class="st17"/><path d="M242.2,516.4c30.7,44.4,85.1,82.2,154.6,108.6" class="st3"/><path d="M886.2,566.7c34.3-14.6,64.4-32,89.3-51.7" class="st18"/><path d="M464.6,803.3c44.7,12.1,93.9,19.9,145.8,22.4" class="st19"/><ellipse cx="349.3" cy="550.3" class="st12" rx="16.7" ry="20.3" transform="matrix(0.866 -0.5 0.5 0.866 -228.38 248.3683)"/><ellipse cx="406.6" cy="572.6" class="st13" rx="16.7" ry="20.3" transform="matrix(0.866 -0.5 0.5 0.866 -231.7997 280.0193)"/><ellipse cx="464" cy="807.6" class="st14" rx="16.7" ry="20.3" transform="matrix(0.866 -0.5 0.5 0.866 -341.6611 340.1814)"/><ellipse cx="528.8" cy="822.7" class="st14" rx="16.7" ry="20.3" transform="matrix(0.866 -0.5 0.5 0.866 -340.5235 374.6306)"/><g><polygon points="496.7 408.2 475.7 397.1 639.9 313 660.9 324.2" class="st14"/><polygon points="537.1 429.6 516.1 418.5 680.2 334.4 701.3 345.6" class="st14"/><polygon points="577.5 451 556.4 439.9 720.6 355.8 741.6 367" class="st14"/><polygon points="617.8 472.4 596.8 461.3 761 377.2 782 388.4" class="st14"/><polygon points="724.3 460.5 703.3 449.4 741.9 429.6 762.9 440.8" class="st14"/><polygon points="497.4 386 475.7 397.1 496.7 408.2 518.6 397" class="st20"/></g></g><g id="Слой_7"><path d="M886.2,617.1c66.1-28,116.7-66.7,143.6-111.4" class="st3"/><path d="M242.2,471.3c15.6,22.6,37.5,43.5,64.3,62.1" class="st3"/><path d="M309.1,689.1c66.8,45.3,163.7,76.3,273.7,83.6" class="st3"/><path d="M256,643c9.3,10.7,20.1,21,32.1,30.7" class="st3"/><path d="M744.1,702.6c177.8-27.1,308.5-117.3,308.5-224.3" class="st11"/><path d="M353.1,651.9c-86.2-42.6-140.4-104.6-140.4-173.5" class="st11"/><path d="M458.5,689.9c35.8,9.1,74.3,15.5,114.7,18.7" class="st11"/><ellipse cx="850.9" cy="810.1" class="st15" rx="11.2" ry="8.8" transform="matrix(0.1212 -0.9926 0.9926 0.1212 -56.3368 1556.4971)"/><ellipse cx="815.4" cy="821.3" class="st13" rx="11.3" ry="9" transform="matrix(0.136 -0.9907 0.9907 0.136 -109.1847 1517.3595)"/><ellipse cx="777.3" cy="796.5" class="st15" rx="11.3" ry="9.3" transform="matrix(0.1578 -0.9875 0.9875 0.1578 -131.9485 1438.3595)"/><ellipse cx="776.7" cy="830.7" class="st13" rx="11.3" ry="9.3" transform="matrix(0.1578 -0.9875 0.9875 0.1578 -166.1544 1466.5557)"/><ellipse cx="737.4" cy="766.8" class="st13" rx="11.3" ry="9.8" transform="matrix(0.2037 -0.979 0.979 0.2037 -163.5832 1332.571)"/><ellipse cx="737.4" cy="732" class="st12" rx="11.3" ry="9.8" transform="matrix(0.2037 -0.979 0.979 0.2037 -129.4434 1304.8036)"/><ellipse cx="691.1" cy="737.1" class="st14" rx="11.3" ry="10.2" transform="matrix(0.2814 -0.9596 0.9596 0.2814 -210.6724 1192.8893)"/><path d="M342,485.7c-78.7-42.4-127.6-102-127.6-167.9c0-128.9,187.1-233.4,418-233.4s418,104.5,418,233.4 c0,72.5-59.1,137.2-151.9,180" class="st11"/><path d="M1025.8,619.1c-37,57.4-113.1,104.4-210.5,131" class="st3"/></g><g id="_x31_11" class="st4"><line x1="778.1" x2="923.4" y1="316.8" y2="152.6" class="st5"/><line x1="486.8" x2="341.6" y1="316.9" y2="152.7" class="st5"/><line x1="486.8" x2="320.3" y1="481.4" y2="473.1" class="st5"/><line x1="778.1" x2="944.5" y1="481.5" y2="473.1" class="st5"/><line x1="486.8" x2="341.6" y1="474.9" y2="471.9" class="st5"/><line x1="923.9" x2="780.2" y1="471.9" y2="476" class="st5"/><line x1="485.8" x2="320.3" y1="638.9" y2="793.6" class="st5"/><line x1="780.2" x2="944.5" y1="638.4" y2="793.6" class="st5"/></g><g id="_x32_22_1_" class="st4"><path d="M486.8,316.9c-11.1-61.5-77.8-129.5-145.2-164.1" class="st5"/><path d="M778.1,316.9c11.1-61.5,77.8-129.5,145.2-164.1" class="st5"/><path d="M486.8,481.4c-24.1-18.9-103.6-12.4-145.2,2.2" class="st5"/><path d="M778,481.4c15.7-26.1,101.5-27.8,166.5-8.4" class="st5"/></g><g id="Слой_15"><linearGradient id="SVGID_10_" x1="486.607" x2="357.607" y1="295.375" y2="160.375" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FFF"/><stop offset="1" stop-color="#F8CC46"/></linearGradient><path d="M382.4,167.3l20.8-11.9l-61.6-3.2v38.5l24.6-14.1c52.6,39.2,93.4,101.4,102.7,152.9l36.5-19.8 C496,258.1,440,203.9,382.4,167.3z" class="st21"/><linearGradient id="SVGID_11_" x1="791.145" x2="908.145" y1="282.138" y2="159.138" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FFF"/><stop offset="1" stop-color="#F8CC46"/></linearGradient><path d="M882.5,167.3l-20.8-11.9l61.6-3.2v38.5l-24.6-14.1c-52.6,39.2-93.4,101.4-102.7,152.9l-36.5-19.8 C768.9,258.1,824.9,203.9,882.5,167.3z" class="st22"/><linearGradient id="SVGID_12_" x1="383.151" x2="343.151" y1="200.144" y2="168.144" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F14600" stop-opacity="0"/><stop offset=".272" stop-color="#F14600" stop-opacity=".157"/><stop offset="1" stop-color="#F14600"/></linearGradient><path d="M382.4,167.3l20.8-11.9l-61.6-3.2v38.5l24.6-14.1c52.6,39.2,93.4,101.4,102.7,152.9l36.5-19.8 C496,258.1,440,203.9,382.4,167.3z" class="st23"/><linearGradient id="SVGID_13_" x1="879.994" x2="919.494" y1="195.882" y2="159.882" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F14600" stop-opacity="0"/><stop offset=".272" stop-color="#F14600" stop-opacity=".157"/><stop offset="1" stop-color="#F14600"/></linearGradient><path d="M882.5,167.3l-20.8-11.9l61.6-3.2v38.5l-24.6-14.1c-52.6,39.2-93.4,101.4-102.7,152.9l-36.5-19.8 C768.9,258.1,824.9,203.9,882.5,167.3z" class="st24"/><path d="M466.6,468.1c0.5,0.6,0.9,1.2,1.3,1.9l36.5,20.7C496.6,481.8,482.9,473.6,466.6,468.1L466.6,468.1z" class="st25"/><linearGradient id="SVGID_14_" x1="474.891" x2="346.141" y1="462.876" y2="476.376" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FFF"/><stop offset="1" stop-color="#F8CC46"/></linearGradient><path d="M381.4,469.4l20.8,11.9l-61.6,3.2v-38.5l24.6,14.1c39.7-17.9,68.9-14.9,86.7-4.7 c52.8,30.3,52.5,35.3,52.5,35.3C484.3,467.6,424.6,449.8,381.4,469.4z" class="st26"/><linearGradient id="SVGID_15_" x1="402.467" x2="351.717" y1="478.123" y2="502.873" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F14600" stop-opacity="0"/><stop offset=".272" stop-color="#F14600" stop-opacity=".157"/><stop offset="1" stop-color="#F14600"/></linearGradient><path d="M381.4,469.4l20.8,11.9l-61.6,3.2v-38.5l24.6,14.1c39.7-17.9,68.9-14.9,86.7-4.7 c52.8,30.3,52.5,35.3,52.5,35.3C484.3,467.6,424.6,449.8,381.4,469.4z" class="st27"/><path d="M799.6,467.1c-0.5,0.6-0.9,1.2-1.3,1.9l-36.5,20.7C769.5,480.8,783.2,472.6,799.6,467.1L799.6,467.1z" class="st25"/><linearGradient id="SVGID_16_" x1="711.601" x2="582.851" y1="461.876" y2="475.376" gradientTransform="matrix(-1 0 0 1 1502.8495 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FFF"/><stop offset="1" stop-color="#F8CC46"/></linearGradient><path d="M884.8,468.4l-20.8,11.9l61.6,3.2v-38.5l-24.6,14.1c-39.7-17.9-68.9-14.9-86.7-4.7 c-52.8,30.3-52.5,35.3-52.5,35.3C781.8,466.6,841.5,448.8,884.8,468.4z" class="st28"/><linearGradient id="SVGID_17_" x1="639.177" x2="588.427" y1="477.123" y2="501.873" gradientTransform="matrix(-1 0 0 1 1502.8495 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F14600" stop-opacity="0"/><stop offset=".272" stop-color="#F14600" stop-opacity=".157"/><stop offset="1" stop-color="#F14600"/></linearGradient><path d="M884.8,468.4l-20.8,11.9l61.6,3.2v-38.5l-24.6,14.1c-39.7-17.9-68.9-14.9-86.7-4.7 c-52.8,30.3-52.5,35.3-52.5,35.3C781.8,466.6,841.5,448.8,884.8,468.4z" class="st29"/></g><g id="Слой_16"><g class="st30"><linearGradient id="SVGID_18_" x1="478.56" x2="358.56" y1="664.308" y2="799.641" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FFF"/><stop offset="1" stop-color="#F8CC46"/></linearGradient><path d="M382.4,789.8l20.8,11.9l-61.6,3.2v-38.5l24.6,14.1c52.6-39.2,93.4-101.4,102.7-152.9l36.5,19.8 C496,699,440,753.2,382.4,789.8z" class="st31"/><linearGradient id="SVGID_19_" x1="788.791" x2="902.791" y1="671.031" y2="795.031" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FFF"/><stop offset="1" stop-color="#F8CC46"/></linearGradient><path d="M882.5,789.8l-20.8,11.9l61.6,3.2v-38.5l-24.6,14.1c-52.6-39.2-93.4-101.4-102.7-152.9l-36.5,19.8 C768.9,699,824.9,753.2,882.5,789.8z" class="st32"/><linearGradient id="SVGID_20_" x1="387.261" x2="340.761" y1="755.856" y2="795.106" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F14600" stop-opacity="0"/><stop offset=".272" stop-color="#F14600" stop-opacity=".157"/><stop offset="1" stop-color="#F14600"/></linearGradient><path d="M382.4,789.8l20.8,11.9l-61.6,3.2v-38.5l24.6,14.1c52.6-39.2,93.4-101.4,102.7-152.9l36.5,19.8 C496,699,440,753.3,382.4,789.8z" class="st33"/><linearGradient id="SVGID_21_" x1="880.326" x2="923.326" y1="757.345" y2="793.012" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F14600" stop-opacity="0"/><stop offset=".272" stop-color="#F14600" stop-opacity=".157"/><stop offset="1" stop-color="#F14600"/></linearGradient><path d="M882.5,789.8l-20.8,11.9l61.6,3.2v-38.5l-24.6,14.1c-52.6-39.2-93.4-101.4-102.7-152.9l-36.5,19.8 C768.9,699,824.9,753.3,882.5,789.8z" class="st34"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/index/meetup.svg b/website/images/index/meetup.svg
deleted file mode 100644
index 836f00ee9a5..00000000000
--- a/website/images/index/meetup.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1280 960"><defs><style>.cls-1{fill:#313138}.cls-2{fill:#444450}.cls-3{fill:url(#Безымянный_градиент_69)}.cls-4,.cls-51,.cls-52{opacity:.8}.cls-4{fill:url(#Безымянный_градиент_16)}.cls-47,.cls-5,.cls-53{opacity:.5}.cls-5{fill:url(#Безымянный_градиент_33)}.cls-6{fill:url(#Безымянный_градиент_77)}.cls-7{fill:url(#Безымянный_градиент_75)}.cls-8{fill:url(#Безымянный_градиент_30)}.cls-9{fill:#f14600}.cls-10{fill:#cc1a11}.cls-11{fill:url(#Безымянный_градиент_54)}.cls-12,.cls-17,.cls-20,.cls-23,.cls-26,.cls-29,.cls-32,.cls-35,.cls-38{opacity:.3}.cls-12{fill:url(#Безымянный_градиент_104)}.cls-13{fill:url(#Безымянный_градиент_100)}.cls-14{fill:#f8cc46}.cls-15{fill:#ff9312}.cls-16{fill:url(#Безымянный_градиент_103)}.cls-17{fill:url(#Безымянный_градиент_104-2)}.cls-18{fill:url(#Безымянный_градиент_100-2)}.cls-19{fill:url(#Безымянный_градиент_103-2)}.cls-20{fill:url(#Безымянный_градиент_104-3)}.cls-21{fill:url(#Безымянный_градиент_100-3)}.cls-22{fill:url(#Безымянный_градиент_103-3)}.cls-23{fill:url(#Безымянный_градиент_104-4)}.cls-24{fill:url(#Безымянный_градиент_100-4)}.cls-25{fill:url(#Безымянный_градиент_103-4)}.cls-26{fill:url(#Безымянный_градиент_104-5)}.cls-27{fill:url(#Безымянный_градиент_100-5)}.cls-28{fill:url(#Безымянный_градиент_103-5)}.cls-29{fill:url(#Безымянный_градиент_104-6)}.cls-30{fill:url(#Безымянный_градиент_100-6)}.cls-31{fill:url(#Безымянный_градиент_103-6)}.cls-32{fill:url(#Безымянный_градиент_104-7)}.cls-33{fill:url(#Безымянный_градиент_100-7)}.cls-34{fill:url(#Безымянный_градиент_103-7)}.cls-35{fill:url(#Безымянный_градиент_104-8)}.cls-36{fill:url(#Безымянный_градиент_100-8)}.cls-37{fill:url(#Безымянный_градиент_103-8)}.cls-38{fill:url(#Безымянный_градиент_104-9)}.cls-39{fill:url(#Безымянный_градиент_100-9)}.cls-40{fill:url(#Безымянный_градиент_103-9)}.cls-41{fill:url(#Безымянный_градиент_16-2)}.cls-42{fill:#bacde0}.cls-43{fill:#eff4f9}.cls-44,.cls-45,.cls-46,.cls-54,.cls-55{fill:none;stroke-linecap:round;stroke-miterlimit:10}.cls-44,.cls-45{stroke:#313138;stroke-width:4px}.cls-45{stroke:#fff}.cls-46{stroke:#a0c9f5}.cls-46,.cls-54,.cls-55{stroke-width:7px}.cls-47{fill:#b8cce4}.cls-48{fill:url(#Безымянный_градиент_110)}.cls-49{fill:#565968}.cls-50{fill:#717484}.cls-51,.cls-56{fill:#257af4}.cls-52,.cls-53{fill:#444451}.cls-54{stroke:#d4e3f6}.cls-55{stroke:#f8cc46}.cls-57{fill:#fff}.cls-58{fill:#d4e3f6}.cls-59,.cls-60,.cls-61{opacity:.1}.cls-59{fill:url(#Безымянный_градиент_115)}.cls-60{fill:url(#Безымянный_градиент_115-2)}.cls-61{fill:url(#Безымянный_градиент_115-3)}</style><linearGradient id="Безымянный_градиент_69" x1="105.47" x2="765.66" y1="544.41" y2="544.41" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#616172"/><stop offset="1" stop-color="#737686"/></linearGradient><linearGradient id="Безымянный_градиент_16" x1="105.44" x2="765.7" y1="333.65" y2="333.65" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d3e2f5"/><stop offset="1" stop-color="#e3f1fe"/></linearGradient><linearGradient id="Безымянный_градиент_33" x1="105.44" x2="203.56" y1="491.15" y2="491.15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7a9ac1"/><stop offset="1" stop-color="#b8cee8" stop-opacity=".5"/></linearGradient><linearGradient id="Безымянный_градиент_77" x1="464.86" x2="408.31" y1="537.27" y2="517.87" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#444450" stop-opacity=".8"/><stop offset="1" stop-color="#666778" stop-opacity="0"/></linearGradient><linearGradient id="Безымянный_градиент_75" x1="408.82" x2="305.89" y1="504.87" y2="469.56" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#444450"/><stop offset="1" stop-color="#666778" stop-opacity="0"/></linearGradient><linearGradient id="Безымянный_градиент_30" x1="339.5" x2="478.33" y1="471.3" y2="471.3" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d61a1a"/><stop offset="1" stop-color="#f14600"/></linearGradient><linearGradient id="Безымянный_градиент_54" x1="381.73" x2="454.73" y1="405.58" y2="359.08" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e32f0d"/><stop offset=".76" stop-color="#fe561d"/><stop offset="1" stop-color="#ff6443"/></linearGradient><linearGradient id="Безымянный_градиент_104" x1="868.17" x2="802.84" y1="506.94" y2="472.02" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#444450"/><stop offset=".89" stop-color="#666778" stop-opacity="0"/></linearGradient><linearGradient id="Безымянный_градиент_100" x1="808.58" x2="934.34" y1="481.88" y2="481.88" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9e1d"/><stop offset="1" stop-color="#f8cc46"/></linearGradient><linearGradient id="Безымянный_градиент_103" x1="846.83" x2="912.96" y1="422.35" y2="380.23" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fda927"/><stop offset=".76" stop-color="#f8cc46"/><stop offset="1" stop-color="#fddd55"/></linearGradient><linearGradient id="Безымянный_градиент_104-2" x1="1101.52" x2="1033.94" y1="658.34" y2="622.22" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-2" x1="1039.88" x2="1169.96" y1="632.42" y2="632.42" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-2" x1="1079.45" x2="1147.85" y1="570.85" y2="527.27" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-3" x1="646.36" x2="576.07" y1="604.43" y2="566.86" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-3" x1="582.24" x2="717.55" y1="577.47" y2="577.47" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-3" x1="623.4" x2="694.55" y1="513.42" y2="468.1" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-4" x1="597.1" x2="524.84" y1="701.72" y2="663.1" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-4" x1="531.19" x2="670.28" y1="674.01" y2="674.01" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-4" x1="567.5" x2="651.25" y1="598.49" y2="570.74" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-5" x1="792.42" x2="720.16" y1="667.51" y2="628.89" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-5" x1="726.51" x2="865.6" y1="639.8" y2="639.8" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-5" x1="762.82" x2="846.57" y1="564.28" y2="536.53" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-6" x1="923.05" x2="850.79" y1="685.46" y2="646.84" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-6" x1="857.14" x2="996.23" y1="657.74" y2="657.74" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-6" x1="893.45" x2="977.2" y1="582.22" y2="554.47" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-7" x1="962.18" x2="885.71" y1="851.57" y2="810.7" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-7" x1="892.42" x2="1039.62" y1="822.24" y2="822.24" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-7" x1="930.85" x2="1019.48" y1="742.32" y2="712.96" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-8" x1="694.41" x2="616.54" y1="818.3" y2="776.68" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-8" x1="623.38" x2="773.28" y1="788.44" y2="788.44" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-8" x1="662.51" x2="752.77" y1="707.05" y2="677.14" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_104-9" x1="365.41" x2="287.53" y1="761.49" y2="719.87" xlink:href="#Безымянный_градиент_104"/><linearGradient id="Безымянный_градиент_100-9" x1="294.38" x2="444.28" y1="731.63" y2="731.63" xlink:href="#Безымянный_градиент_100"/><linearGradient id="Безымянный_градиент_103-9" x1="333.51" x2="423.77" y1="650.24" y2="620.33" xlink:href="#Безымянный_градиент_103"/><linearGradient id="Безымянный_градиент_16-2" x1="475.99" x2="546.25" y1="489.01" y2="489.01" xlink:href="#Безымянный_градиент_16"/><linearGradient id="Безымянный_градиент_110" x1="216.53" x2="439.53" y1="335.57" y2="108.57" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#313138"/><stop offset="1" stop-color="#444450"/></linearGradient><linearGradient id="Безымянный_градиент_115" x1="359.84" x2="256.84" y1="140.65" y2="316.65" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff" stop-opacity=".5"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="Безымянный_градиент_115-2" x1="615.91" x2="589.41" y1="126.72" y2="180.22" xlink:href="#Безымянный_градиент_115"/><linearGradient id="Безымянный_градиент_115-3" x1="549.02" x2="513.02" y1="214.72" y2="304.22" xlink:href="#Безымянный_градиент_115"/></defs><title>412</title><g id="Слой_2" data-name="Слой 2"><path d="M214.33,626.9,105.47,575.41v22.93h0c3.31,46,40,88.12,98.05,120Z" class="cls-1"/><polygon points="203.53 701.91 203.53 717.97 765.66 464.95 765.66 448.9 203.53 701.91" class="cls-2"/><path d="M484.59,386.9c-209.38,0-379.12,84.4-379.12,188.51,0,48.69,37.12,93.06,98.05,126.51l562.13-253C696.29,410.82,596.06,386.9,484.59,386.9Z" class="cls-3"/><path d="M751.48,146.5C683,112.77,588.64,91.89,484.63,91.89c-209.38,0-379.12,84.4-379.12,188.51,0,45.94-.07,295-.07,295,0-104.11,169.74-188.51,379.12-188.51,82.75,0,159.3,13.18,221.64,35.55v-71s31.29,10.72,59.5,26.47V301.47S725.55,278,664.29,261.94V191.21a441.6,441.6,0,0,1,86.85,32Z" class="cls-4"/><path d="M105.51,280.4c0,48.69,37.12,93.06,98.05,126.51v76.83c-17.47-9.16-34.65-22-34.65-22v70.72a220.57,220.57,0,0,1-22.54-19.23V589.9c23.67,23.17,57.19,41,57.19,41l-.07,71c-60.93-33.45-98.05-77.82-98.05-126.51C105.44,471.3,105.51,280.4,105.51,280.4Z" class="cls-5"/><path d="M476,548.7s-124-5.84-67-31.55c32.15-14.5,103.32,15.2,103.32,15.2Z" class="cls-6"/><path d="M383.3,534.2s-149.68-9.39-97-43C348.33,451.56,500,482,500,482Z" class="cls-7"/><path d="M398,413.15c-32.33,14.47-58.54,57.54-58.54,96.22,0,2,.07,3.91.21,5.79l43.6,19L456.36,463q.2-3,.21-6c0-8.78,27.45-23,20.68-26.27-3-1.48-42.24-18.45-44.2-19.32C423.28,407,411.16,407.28,398,413.15Z" class="cls-8"/><path d="M441.63,432.2c-32.33,14.47-58.54,57.54-58.54,96.22,0,2,.07,3.91.21,5.79L500,482q.2-3,.21-6C500.17,437.35,474,417.73,441.63,432.2Z" class="cls-9"/><path d="M398,413.15c-9.76,4.37-19,11.36-27.06,20,7.93,5,20.84,7.86,35.29,7.24,23.54-1,42.24-11,41.75-22.29,0-.09,0-.17,0-.26l-15-6.5C423.28,407,411.16,407.28,398,413.15Z" class="cls-10"/><circle cx="419.83" cy="381.31" r="47.67" class="cls-11"/><path d="M848.26,538.86s-116.37-14.93-68.62-45.43c56.16-35.86,174.3-1.87,174.3-1.87Z" class="cls-12"/><path d="M861.6,429.21c-29.29,13.11-53,52.13-53,87.16,0,1.79.07,3.54.19,5.24l39.49,17.25,66.19-64.54q.18-2.72.19-5.41c0-8,24.87-20.81,18.73-23.8-2.75-1.34-38.27-16.71-40-17.5C884.48,423.66,873.5,423.89,861.6,429.21Z" class="cls-13"/><path d="M901.1,446.46c-29.29,13.11-53,52.13-53,87.16,0,1.79.07,3.54.19,5.24l105.68-47.29q.18-2.72.19-5.41C954.12,451.13,930.38,433.36,901.1,446.46Z" class="cls-14"/><path d="M861.6,429.21c-8.85,4-17.18,10.29-24.51,18.16,7.19,4.49,18.88,7.12,32,6.56,21.33-.91,38.26-10,37.82-20.19,0-.08,0-.16,0-.23l-13.54-5.89C884.48,423.66,873.5,423.89,861.6,429.21Z" class="cls-15"/><circle cx="881.35" cy="400.37" r="43.18" class="cls-16"/><path d="M1080.92,691.36s-120.37-15.45-71-47c58.1-37.1,180.29-1.93,180.29-1.93Z" class="cls-17"/><path d="M1094.73,577.94c-30.29,13.56-54.85,53.92-54.85,90.16,0,1.86.07,3.66.19,5.42l40.85,17.84,68.46-66.76q.19-2.81.19-5.6c0-8.22,25.73-21.53,19.38-24.62-2.84-1.38-39.58-17.28-41.42-18.1C1118.39,572.2,1107,572.43,1094.73,577.94Z" class="cls-18"/><path d="M1135.58,595.78c-30.29,13.56-54.85,53.92-54.85,90.16,0,1.86.07,3.66.19,5.42l109.31-48.92q.19-2.81.19-5.6C1190.43,600.61,1165.87,582.23,1135.58,595.78Z" class="cls-14"/><path d="M1094.73,577.94c-9.15,4.09-17.77,10.65-25.35,18.78,7.44,4.64,19.53,7.37,33.07,6.79,22.06-.94,39.58-10.3,39.12-20.89,0-.08,0-.16,0-.24l-14-6.09C1118.38,572.2,1107,572.43,1094.73,577.94Z" class="cls-15"/><circle cx="1115.15" cy="548.1" r="44.67" class="cls-19"/><path d="M624.93,638.78s-125.2-16.07-73.83-48.87c60.43-38.59,187.52-2,187.52-2Z" class="cls-20"/><path d="M639.29,520.8c-31.51,14.1-57.05,56.08-57.05,93.78,0,1.93.07,3.81.2,5.64l42.49,18.56,71.21-69.44q.2-2.92.2-5.82c0-8.55,26.76-22.39,20.15-25.6-3-1.44-41.17-18-43.08-18.83C663.9,514.83,652.09,515.08,639.29,520.8Z" class="cls-21"/><path d="M681.78,539.36c-31.51,14.1-57.05,56.08-57.05,93.78,0,1.93.07,3.81.2,5.64l113.7-50.88q.2-2.92.2-5.82C738.83,544.38,713.29,525.26,681.78,539.36Z" class="cls-14"/><path d="M639.29,520.8c-9.52,4.26-18.48,11.07-26.37,19.53,7.73,4.83,20.32,7.66,34.4,7.06,22.95-1,41.16-10.71,40.69-21.73,0-.08,0-.17,0-.25l-14.57-6.34C663.9,514.83,652.09,515.08,639.29,520.8Z" class="cls-15"/><circle cx="660.54" cy="489.77" r="46.46" class="cls-22"/><path d="M575.08,737s-128.71-16.52-75.89-50.24C561.3,647.13,692,684.73,692,684.73Z" class="cls-23"/><path d="M589.84,615.76c-32.39,14.5-58.65,57.66-58.65,96.4,0,2,.07,3.92.21,5.8L575.08,737l73.2-71.38q.2-3,.21-6c0-8.79,27.51-23,20.72-26.32-3-1.48-42.32-18.48-44.29-19.36C615.14,609.62,603,609.87,589.84,615.76Z" class="cls-24"/><path d="M633.52,634.84c-32.39,14.5-58.65,57.66-58.65,96.4,0,2,.07,3.92.21,5.8L692,684.73q.2-3,.21-6C692.17,640,665.91,620.34,633.52,634.84Z" class="cls-14"/><path d="M589.84,615.76c-9.78,4.38-19,11.38-27.11,20.08,8,5,20.88,7.88,35.36,7.26,23.59-1,42.32-11,41.83-22.34,0-.09,0-.17,0-.26l-15-6.51C615.14,609.62,603,609.87,589.84,615.76Z" class="cls-15"/><circle cx="611.68" cy="583.85" r="47.76" class="cls-25"/><path d="M770.4,702.82s-128.71-16.52-75.89-50.24c62.12-39.67,192.78-2.06,192.78-2.06Z" class="cls-26"/><path d="M785.16,581.54c-32.39,14.5-58.65,57.66-58.65,96.4,0,2,.07,3.92.21,5.8l43.68,19.08,73.2-71.38q.2-3,.21-6c0-8.79,27.51-23,20.72-26.32-3-1.48-42.32-18.48-44.29-19.36C810.46,575.4,798.31,575.66,785.16,581.54Z" class="cls-27"/><path d="M828.84,600.62c-32.39,14.5-58.65,57.66-58.65,96.4,0,2,.07,3.92.21,5.8l116.88-52.31q.2-3,.21-6C887.49,605.79,861.23,586.13,828.84,600.62Z" class="cls-14"/><path d="M785.16,581.54c-9.78,4.38-19,11.38-27.11,20.08,8,5,20.88,7.88,35.36,7.26,23.59-1,42.32-11,41.83-22.34,0-.09,0-.17,0-.26l-15-6.51C810.46,575.4,798.31,575.66,785.16,581.54Z" class="cls-15"/><circle cx="807" cy="549.64" r="47.76" class="cls-28"/><path d="M901,720.77s-128.71-16.52-75.89-50.24c62.12-39.67,192.78-2.06,192.78-2.06Z" class="cls-29"/><path d="M915.79,599.49c-32.39,14.5-58.65,57.66-58.65,96.4,0,2,.07,3.92.21,5.8L901,720.77l73.2-71.38q.2-3,.21-6c0-8.79,27.51-23,20.72-26.32-3-1.48-42.32-18.48-44.29-19.36C941.09,593.35,928.94,593.6,915.79,599.49Z" class="cls-30"/><path d="M959.47,618.57c-32.39,14.5-58.65,57.66-58.65,96.4,0,2,.07,3.92.21,5.8l116.88-52.31q.2-3,.21-6C1018.12,623.73,991.86,604.07,959.47,618.57Z" class="cls-14"/><path d="M915.79,599.49c-9.78,4.38-19,11.38-27.11,20.08,8,5,20.88,7.88,35.36,7.26,23.59-1,42.32-11,41.83-22.34,0-.09,0-.17,0-.26l-15-6.51C941.09,593.35,928.94,593.6,915.79,599.49Z" class="cls-15"/><circle cx="937.63" cy="567.59" r="47.76" class="cls-31"/><path d="M938.87,888.94s-136.2-17.48-80.32-53.17c65.74-42,204-2.18,204-2.18Z" class="cls-32"/><path d="M954.49,760.6c-34.28,15.34-62.07,61-62.07,102,0,2.1.08,4.14.22,6.14l46.22,20.19,77.47-75.54q.21-3.18.22-6.33c0-9.31,29.11-24.36,21.93-27.86-3.22-1.57-44.79-19.56-46.87-20.49C981.26,754.1,968.41,754.37,954.49,760.6Z" class="cls-33"/><path d="M1000.71,780.79c-34.28,15.34-62.07,61-62.07,102,0,2.1.08,4.14.22,6.14l123.69-55.35q.21-3.18.22-6.33C1062.78,786.25,1035,765.45,1000.71,780.79Z" class="cls-14"/><path d="M954.49,760.6c-10.35,4.63-20.11,12-28.69,21.25,8.41,5.25,22.1,8.34,37.42,7.68,25-1.07,44.78-11.65,44.27-23.64,0-.09,0-.18,0-.27l-15.85-6.89C981.26,754.1,968.41,754.37,954.49,760.6Z" class="cls-15"/><circle cx="977.6" cy="726.83" r="50.54" class="cls-34"/><path d="M670.68,856.36S532,838.56,588.88,802.21C655.83,759.46,796.64,800,796.64,800Z" class="cls-35"/><path d="M686.59,725.65c-34.91,15.62-63.21,62.14-63.21,103.89,0,2.14.08,4.22.22,6.25l47.07,20.56,78.89-76.93q.22-3.24.22-6.45c0-9.48,29.65-24.81,22.33-28.37-3.28-1.59-45.61-19.92-47.73-20.86C713.85,719,700.76,719.31,686.59,725.65Z" class="cls-36"/><path d="M733.66,746.21c-34.91,15.62-63.21,62.14-63.21,103.89,0,2.14.08,4.22.22,6.25l126-56.37q.22-3.24.22-6.45C796.87,751.78,768.57,730.59,733.66,746.21Z" class="cls-14"/><path d="M686.59,725.65c-10.54,4.72-20.48,12.27-29.22,21.64,8.57,5.35,22.51,8.49,38.11,7.82C720.9,754,741.09,743.25,740.56,731c0-.09,0-.19,0-.28l-16.14-7C713.85,719,700.76,719.31,686.59,725.65Z" class="cls-15"/><circle cx="710.12" cy="691.27" r="51.47" class="cls-37"/><path d="M341.67,799.55S203,781.75,259.88,745.4c66.95-42.75,207.76-2.22,207.76-2.22Z" class="cls-38"/><path d="M357.58,668.84c-34.91,15.62-63.21,62.14-63.21,103.89,0,2.14.08,4.22.22,6.25l47.07,20.56,78.89-76.93q.22-3.24.22-6.45c0-9.48,29.65-24.81,22.33-28.37-3.28-1.59-45.61-19.92-47.73-20.86C384.85,662.23,371.76,662.5,357.58,668.84Z" class="cls-39"/><path d="M404.66,689.41C369.75,705,341.45,751.54,341.45,793.3c0,2.14.08,4.22.22,6.25l126-56.37q.22-3.24.22-6.45C467.86,695,439.57,673.78,404.66,689.41Z" class="cls-14"/><path d="M357.58,668.84c-10.54,4.72-20.48,12.27-29.22,21.64,8.57,5.35,22.51,8.49,38.11,7.82,25.42-1.09,45.61-11.86,45.09-24.07,0-.09,0-.19,0-.28l-16.14-7C384.85,662.23,371.76,662.5,357.58,668.84Z" class="cls-15"/><circle cx="381.12" cy="634.46" r="51.47" class="cls-40"/><polygon points="494.96 452.4 475.99 548.7 512.32 532.35 546.25 429.33 494.96 452.4" class="cls-41"/><polyline points="475.99 548.7 494.96 452.4 450.96 453.9 450.96 537.43 475.99 548.7" class="cls-42"/><polygon points="451.01 453.96 500.75 434.15 546.25 429.33 494.96 452.4 451.01 453.96" class="cls-43"/><rect width="25.62" height="11.55" x="481.84" y="402.48" class="cls-1" rx="5.77" ry="5.77" transform="translate(171.32 -145.65) rotate(20.19)"/><path d="M521.8,440.32v-3.2a26.91,26.91,0,0,0-18.46-25.54h0" class="cls-44"/></g><g id="Слой_9" data-name="Слой 9"><path d="M765.66,230.72c-69.37-38.08-169.6-62-281.07-62-209.38,0-379.12,84.4-379.12,188.51,0,33.47,17.55,64.9,48.31,92.15" class="cls-45"/><path d="M122.08,559.75c16.49,26.74,44.62,50.95,81.45,71.16" class="cls-45"/><path d="M122.08,597.87c12.19,19.77,30.75,38.15,54.47,54.56" class="cls-46"/><path d="M169.68,399.4c-40.55,30-64.21,66.13-64.21,105,0,19.26,5.81,37.84,16.6,55.35" class="cls-45"/><path d="M484.59,315.89c-90.34,0-173.29,15.71-238.42,41.93" class="cls-45"/><path d="M765.66,377.89c-33.59-18.44-74.42-33.56-120.25-44.25" class="cls-45"/><path d="M734.3,191.06a518.15,518.15,0,0,0-88.89-28.91" class="cls-46"/><path d="M707.42,154.76a549.33,549.33,0,0,0-62-18.23" class="cls-46"/><path d="M181.56,374.27c57.41-37.59,142.54-64.14,240.26-72.12a7.4,7.4,0,0,0,6.78-7.38V138a4,4,0,0,0-4.3-4c-100.41,7.86-187.72,35.3-245.62,74.23a7.45,7.45,0,0,0-3.31,6.18V370.94A4,4,0,0,0,181.56,374.27Z" class="cls-47"/><path d="M456.75,304.25a3.32,3.32,0,0,0,3.41,3.32q10.19-.27,20.51-.27a724.59,724.59,0,0,1,140.76,13.44,3.32,3.32,0,0,0,4-3.26v-90.7a3.33,3.33,0,0,0-2.66-3.27,723.85,723.85,0,0,0-142.08-13.7q-10.42,0-20.69.28a3.33,3.33,0,0,0-3.23,3.33Z" class="cls-47"/><path d="M520.07,193.11A699.14,699.14,0,0,1,606,204.48a4,4,0,0,0,4.75-3.89V138.33a4,4,0,0,0-3.18-3.9,697.86,697.86,0,0,0-86.89-11.64,4,4,0,0,0-4.25,4v62.4A4,4,0,0,0,520.07,193.11Z" class="cls-47"/><path d="M188.53,361.14C245.94,323.54,331.07,297,428.79,289a7.4,7.4,0,0,0,6.78-7.38V124.91a4,4,0,0,0-4.3-4c-100.41,7.86-187.72,35.3-245.62,74.23a7.45,7.45,0,0,0-3.31,6.18V357.81A4,4,0,0,0,188.53,361.14Z" class="cls-48"/><path d="M460.67,301.57a3.32,3.32,0,0,0,3.41,3.32q10.19-.27,20.51-.27A724.59,724.59,0,0,1,625.36,318a3.32,3.32,0,0,0,4-3.26V224.1a3.33,3.33,0,0,0-2.66-3.27,723.85,723.85,0,0,0-142.08-13.7q-10.42,0-20.69.28a3.33,3.33,0,0,0-3.23,3.33Z" class="cls-49"/><path d="M538.7,182.2a699.14,699.14,0,0,1,85.88,11.37,4,4,0,0,0,4.75-3.89V127.42a4,4,0,0,0-3.18-3.9,697.86,697.86,0,0,0-86.89-11.64,4,4,0,0,0-4.25,4v62.4A4,4,0,0,0,538.7,182.2Z" class="cls-50"/><ellipse cx="271.3" cy="367.16" class="cls-51" rx="6.74" ry="6.05" transform="translate(-159.3 518.8) rotate(-72.94)"/><ellipse cx="251.42" cy="391.83" class="cls-52" rx="6.74" ry="6.05" transform="translate(-196.93 517.23) rotate(-72.94)"/><ellipse cx="251.42" cy="410.05" class="cls-53" rx="6.74" ry="6.05" transform="translate(-214.35 530.11) rotate(-72.94)"/><ellipse cx="289.96" cy="380.91" class="cls-53" rx="6.74" ry="6.05" transform="matrix(0.29, -0.96, 0.96, 0.29, -159.26, 546.36)"/><ellipse cx="308.95" cy="356.99" class="cls-52" rx="6.74" ry="6.05" transform="translate(-122.97 547.61) rotate(-72.94)"/><ellipse cx="308.95" cy="394.13" class="cls-14" rx="6.74" ry="6.05" transform="translate(-158.48 573.86) rotate(-72.94)"/><ellipse cx="347.28" cy="348.59" class="cls-53" rx="6.74" ry="6.05" transform="translate(-87.85 578.32) rotate(-72.94)"/><ellipse cx="347.28" cy="385.73" class="cls-51" rx="6.74" ry="6.05" transform="translate(-123.36 604.56) rotate(-72.94)"/><polyline points="472.54 285.85 546.56 235.72 572.46 265.97 613.88 236.26" class="cls-54"/><polyline points="473.75 250.87 513.06 224.23 572.67 295.68 614.28 264.94" class="cls-55"/></g><g id="Слой_1" data-name="Слой 1"><path d="M264.35,289.51c-5.41,2.13-8.12,3.24-13.52,5.51L254,194.9c5.4-2.28,8.11-3.38,13.52-5.51Z" class="cls-14"/><path d="M264.35,289.51c-5.41,2.13-8.12,3.24-13.52,5.51l.41-12.75c5.4-2.28,8.11-3.38,13.52-5.51Z" class="cls-9"/><path d="M378.93,220c-5.36.93-8,1.43-13.43,2.51l.81-25.5c5.38-1.07,8.06-1.58,13.43-2.51Z" class="cls-14"/><path d="M292.76,279.11c-5.42,1.83-8.13,2.78-13.54,4.76l3.19-100.12c5.42-2,8.13-2.93,13.54-4.76Z" class="cls-14"/><path d="M321.18,270.28c-5.41,1.53-8.12,2.33-13.54,4l3.19-100.12c5.42-1.68,8.12-2.48,13.54-4Z" class="cls-14"/><path d="M349.53,263c-5.39,1.23-8.09,1.88-13.5,3.26l3.19-100.12c5.4-1.37,8.1-2,13.5-3.26Z" class="cls-14"/></g><g id="Слой_5" data-name="Слой 5"><path d="M685.46,382.9c-.7-9.82-8.06-18.49-16.44-19.37s-14.61,6.38-13.91,16.2,8.06,18.49,16.44,19.37S686.16,392.72,685.46,382.9Z" class="cls-56"/><path d="M606.84,153.09c-1.1-15.4-13.6-28.93-27.92-30.22S553.88,133,555,148.42s13.6,28.93,27.92,30.22S607.94,168.49,606.84,153.09Zm-25.16,8.6c-5.62-.51-10.52-5.81-10.95-11.85s3.77-10.52,9.39-10,10.52,5.81,10.95,11.85S587.3,162.19,581.69,161.69Z" class="cls-57"/><path d="M639.95,367.9c-.7-9.82-8.06-18.49-16.44-19.37s-14.61,6.38-13.91,16.2,8.06,18.49,16.44,19.37S640.65,377.72,639.95,367.9Z" class="cls-47"/><path d="M593.95,359.41c-.7-9.82-8.06-18.49-16.44-19.37s-14.61,6.38-13.91,16.2,8.06,18.49,16.44,19.37S594.65,369.23,593.95,359.41Z" class="cls-47"/><path d="M574.17,141.48a8.41,8.41,0,0,1,6-1.66c.26,0,.52.07.78.11V123.14c-.66-.11-1.32-.21-2-.27a21.48,21.48,0,0,0-15.21,4.21Z" class="cls-9"/><path d="M574.43,158a13.31,13.31,0,0,1-3.69-8.16,9.37,9.37,0,0,1,3.77-8.61l-9.93-14.77c-6.43,4.42-10.29,12.43-9.61,22a34,34,0,0,0,9.41,20.83Z" class="cls-58"/></g><g id="Слой_8" data-name="Слой 8"><path d="M228.82,338.71a459.37,459.37,0,0,1,57.49-22.49c39.88-96.45,87.93-164.56,108.54-191.52-19.22,2.49-37.83,5.71-55.74,9.6C313.92,168.64,266.22,240.72,228.82,338.71Z" class="cls-59"/><path d="M570.55,185.17q16.13,1.86,31.7,4.39c9.65-22.71,19-42.13,27.08-57.77v-4.38a4,4,0,0,0-3.18-3.9q-11.46-2.29-23.28-4.21C594.14,135.16,582.7,157.45,570.55,185.17Z" class="cls-60"/><path d="M536.46,306.38a907.83,907.83,0,0,1,30.93-94.73q-19.69-2.18-40.11-3.32a909.45,909.45,0,0,0-32.06,96.36Q516.15,305,536.46,306.38Z" class="cls-61"/></g></svg>
\ No newline at end of file
diff --git a/website/images/index/reddit.svg b/website/images/index/reddit.svg
deleted file mode 100644
index f991ed9e00e..00000000000
--- a/website/images/index/reddit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14.238 15.348c.085.084.085.221 0 .306-.465.462-1.194.687-2.231.687l-.008-.002-.008.002c-1.036 0-1.766-.225-2.231-.688-.085-.084-.085-.221 0-.305.084-.084.222-.084.307 0 .379.377 1.008.561 1.924.561l.008.002.008-.002c.915 0 1.544-.184 1.924-.561.085-.084.223-.084.307 0zm-3.44-2.418c0-.507-.414-.919-.922-.919-.509 0-.923.412-.923.919 0 .506.414.918.923.918.508.001.922-.411.922-.918zm13.202-.93c0 6.627-5.373 12-12 12s-12-5.373-12-12 5.373-12 12-12 12 5.373 12 12zm-5-.129c0-.851-.695-1.543-1.55-1.543-.417 0-.795.167-1.074.435-1.056-.695-2.485-1.137-4.066-1.194l.865-2.724 2.343.549-.003.034c0 .696.569 1.262 1.268 1.262.699 0 1.267-.566 1.267-1.262s-.568-1.262-1.267-1.262c-.537 0-.994.335-1.179.804l-2.525-.592c-.11-.027-.223.037-.257.145l-.965 3.038c-1.656.02-3.155.466-4.258 1.181-.277-.255-.644-.415-1.05-.415-.854.001-1.549.693-1.549 1.544 0 .566.311 1.056.768 1.325-.03.164-.05.331-.05.5 0 2.281 2.805 4.137 6.253 4.137s6.253-1.856 6.253-4.137c0-.16-.017-.317-.044-.472.486-.261.82-.766.82-1.353zm-4.872.141c-.509 0-.922.412-.922.919 0 .506.414.918.922.918s.922-.412.922-.918c0-.507-.413-.919-.922-.919z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/safe.svg b/website/images/index/safe.svg
deleted file mode 100644
index 9dbdab5fe93..00000000000
--- a/website/images/index/safe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" fill="none" viewBox="0 0 60 60"><circle cx="30" cy="30" r="30" fill="#FAFAFA"/><path fill="#F14600" d="M18 18C16.3455 18 15 19.3455 15 21V39C15 40.6545 16.3455 42 18 42C18 42.828 18.672 43.5 19.5 43.5C20.328 43.5 21 42.828 21 42H39C39 42.828 39.672 43.5 40.5 43.5C41.328 43.5 42 42.828 42 42C43.6545 42 45 40.6545 45 39V21C45 19.3455 43.6545 18 42 18H18ZM39.8818 23.1211C40.2658 23.1211 40.6499 23.2651 40.9424 23.5576C41.5289 24.1441 41.5274 25.0937 40.9424 25.6787L39.6504 26.9707C40.1784 27.8647 40.5 28.89 40.5 30C40.5 31.11 40.1784 32.1368 39.6504 33.0293L41.0742 34.4531C41.6592 35.0381 41.6592 35.9892 41.0742 36.5742C40.4892 37.1607 39.5396 37.1592 38.9531 36.5742L37.5293 35.1504C36.6368 35.6769 35.61 36 34.5 36C33.39 36 32.3632 35.6784 31.4707 35.1504L30.1787 36.4424C29.5937 37.0274 28.6426 37.0274 28.0576 36.4424C27.4726 35.8574 27.4726 34.9063 28.0576 34.3213L29.3496 33.0293C28.8216 32.1368 28.5 31.11 28.5 30C28.5 28.89 28.8216 27.8632 29.3496 26.9707L28.1924 25.8105C27.6074 25.2255 27.6074 24.2774 28.1924 23.6924C28.7774 23.1074 29.7255 23.1074 30.3105 23.6924L31.4707 24.8496C32.3632 24.3216 33.39 24 34.5 24C35.61 24 36.6368 24.3216 37.5293 24.8496L38.8213 23.5576C39.1138 23.2651 39.4978 23.1211 39.8818 23.1211ZM21 25.5C21.828 25.5 22.5 26.172 22.5 27V33C22.5 33.828 21.828 34.5 21 34.5C20.172 34.5 19.5 33.828 19.5 33V27C19.5 26.172 20.172 25.5 21 25.5ZM34.5 27C33.7044 27 32.9413 27.3161 32.3787 27.8787C31.8161 28.4413 31.5 29.2044 31.5 30C31.5 30.7956 31.8161 31.5587 32.3787 32.1213C32.9413 32.6839 33.7044 33 34.5 33C35.2956 33 36.0587 32.6839 36.6213 32.1213C37.1839 31.5587 37.5 30.7956 37.5 30C37.5 29.2044 37.1839 28.4413 36.6213 27.8787C36.0587 27.3161 35.2956 27 34.5 27Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/scale.svg b/website/images/index/scale.svg
deleted file mode 100644
index ab188a58de6..00000000000
--- a/website/images/index/scale.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" fill="none" viewBox="0 0 60 60"><circle cx="30" cy="30" r="30" fill="#FAFAFA"/><path fill="#F14600" d="M19.2015 16.8C19.0425 16.7977 18.8846 16.8271 18.737 16.8864C18.5895 16.9457 18.4551 17.0337 18.3419 17.1454C18.2287 17.257 18.1387 17.3901 18.0774 17.5368C18.016 17.6835 17.9844 17.841 17.9844 18C17.9844 18.159 18.016 18.3165 18.0774 18.4632C18.1387 18.6099 18.2287 18.7429 18.3419 18.8546C18.4551 18.9662 18.5895 19.0543 18.737 19.1136C18.8846 19.1729 19.0425 19.2022 19.2015 19.2H29.9827H40.8015C40.9605 19.2022 41.1184 19.1729 41.2659 19.1136C41.4135 19.0543 41.5478 18.9662 41.661 18.8546C41.7743 18.7429 41.8642 18.6099 41.9256 18.4632C41.9869 18.3165 42.0186 18.159 42.0186 18C42.0186 17.841 41.9869 17.6835 41.9256 17.5368C41.8642 17.3901 41.7743 17.257 41.661 17.1454C41.5478 17.0337 41.4135 16.9457 41.2659 16.8864C41.1184 16.8271 40.9605 16.7977 40.8015 16.8H19.2015ZM29.9827 19.2C29.671 19.205 29.3734 19.331 29.153 19.5515L26.753 21.9515C26.6379 22.0621 26.5459 22.1946 26.4826 22.3411C26.4192 22.4877 26.3858 22.6454 26.3841 22.805C26.3825 22.9647 26.4128 23.1231 26.4731 23.2709C26.5335 23.4187 26.6227 23.553 26.7356 23.6659C26.8485 23.7788 26.9828 23.868 27.1306 23.9283C27.2784 23.9887 27.4368 24.0189 27.5964 24.0173C27.7561 24.0157 27.9138 23.9822 28.0603 23.9189C28.2069 23.8555 28.3393 23.7636 28.4499 23.6484L28.8015 23.2969V36.7031L28.4499 36.3515C28.3381 36.2366 28.2043 36.1452 28.0566 36.0828C27.9089 36.0204 27.7501 35.9883 27.5897 35.9883C27.351 35.9883 27.1177 36.0596 26.9197 36.1929C26.7217 36.3263 26.568 36.5156 26.4781 36.7368C26.3883 36.958 26.3665 37.2009 26.4155 37.4345C26.4644 37.6682 26.582 37.8819 26.753 38.0484L29.153 40.4484C29.2667 40.5621 29.402 40.6518 29.5509 40.7122C29.6999 40.7726 29.8595 40.8024 30.0202 40.8C30.3319 40.795 30.6295 40.6689 30.8499 40.4484L33.2499 38.0484C33.4242 37.8808 33.5438 37.6645 33.593 37.4278C33.6423 37.1911 33.6189 36.9451 33.5259 36.7219C33.4329 36.4987 33.2747 36.3088 33.072 36.177C32.8692 36.0453 32.6315 35.9779 32.3897 35.9836C32.0732 35.9911 31.7725 36.1233 31.553 36.3515L31.2015 36.7031V23.2969L31.553 23.6484C31.6636 23.7636 31.796 23.8555 31.9426 23.9189C32.0892 23.9822 32.2469 24.0157 32.4065 24.0173C32.5662 24.0189 32.7245 23.9887 32.8723 23.9283C33.0202 23.868 33.1544 23.7788 33.2673 23.6659C33.3802 23.553 33.4695 23.4187 33.5298 23.2709C33.5902 23.1231 33.6204 22.9647 33.6188 22.805C33.6172 22.6454 33.5837 22.4877 33.5204 22.3411C33.457 22.1946 33.3651 22.0621 33.2499 21.9515L30.8499 19.5515C30.7363 19.4379 30.601 19.3482 30.452 19.2878C30.303 19.2274 30.1434 19.1975 29.9827 19.2ZM30.0202 40.8H19.2015C19.0425 40.7977 18.8846 40.8271 18.737 40.8864C18.5895 40.9457 18.4551 41.0337 18.3419 41.1454C18.2287 41.257 18.1387 41.3901 18.0774 41.5368C18.016 41.6835 17.9844 41.841 17.9844 42C17.9844 42.159 18.016 42.3165 18.0774 42.4632C18.1387 42.6099 18.2287 42.7429 18.3419 42.8546C18.4551 42.9662 18.5895 43.0543 18.737 43.1136C18.8846 43.1729 19.0425 43.2022 19.2015 43.2H40.8015C40.9605 43.2022 41.1184 43.1729 41.2659 43.1136C41.4135 43.0543 41.5478 42.9662 41.661 42.8546C41.7743 42.7429 41.8642 42.6099 41.9256 42.4632C41.9869 42.3165 42.0186 42.159 42.0186 42C42.0186 41.841 41.9869 41.6835 41.9256 41.5368C41.8642 41.3901 41.7743 41.257 41.661 41.1454C41.5478 41.0337 41.4135 40.9457 41.2659 40.8864C41.1184 40.8271 40.9605 40.7977 40.8015 40.8H30.0202ZM19.2015 21.6C18.8832 21.6 18.578 21.7264 18.3529 21.9515C18.1279 22.1765 18.0015 22.4817 18.0015 22.8C18.0015 23.1182 18.1279 23.4235 18.3529 23.6485C18.578 23.8736 18.8832 24 19.2015 24C19.5197 24 19.825 23.8736 20.05 23.6485C20.275 23.4235 20.4015 23.1182 20.4015 22.8C20.4015 22.4817 20.275 22.1765 20.05 21.9515C19.825 21.7264 19.5197 21.6 19.2015 21.6ZM40.8015 21.6C40.4832 21.6 40.178 21.7264 39.9529 21.9515C39.7279 22.1765 39.6015 22.4817 39.6015 22.8C39.6015 23.1182 39.7279 23.4235 39.9529 23.6485C40.178 23.8736 40.4832 24 40.8015 24C41.1197 24 41.4249 23.8736 41.65 23.6485C41.875 23.4235 42.0015 23.1182 42.0015 22.8C42.0015 22.4817 41.875 22.1765 41.65 21.9515C41.4249 21.7264 41.1197 21.6 40.8015 21.6ZM19.2015 26.4C18.8832 26.4 18.578 26.5264 18.3529 26.7515C18.1279 26.9765 18.0015 27.2817 18.0015 27.6C18.0015 27.9182 18.1279 28.2235 18.3529 28.4485C18.578 28.6736 18.8832 28.8 19.2015 28.8C19.5197 28.8 19.825 28.6736 20.05 28.4485C20.275 28.2235 20.4015 27.9182 20.4015 27.6C20.4015 27.2817 20.275 26.9765 20.05 26.7515C19.825 26.5264 19.5197 26.4 19.2015 26.4ZM40.8015 26.4C40.4832 26.4 40.178 26.5264 39.9529 26.7515C39.7279 26.9765 39.6015 27.2817 39.6015 27.6C39.6015 27.9182 39.7279 28.2235 39.9529 28.4485C40.178 28.6736 40.4832 28.8 40.8015 28.8C41.1197 28.8 41.4249 28.6736 41.65 28.4485C41.875 28.2235 42.0015 27.9182 42.0015 27.6C42.0015 27.2817 41.875 26.9765 41.65 26.7515C41.4249 26.5264 41.1197 26.4 40.8015 26.4ZM19.2015 31.2C18.8832 31.2 18.578 31.3264 18.3529 31.5515C18.1279 31.7765 18.0015 32.0817 18.0015 32.4C18.0015 32.7182 18.1279 33.0235 18.3529 33.2485C18.578 33.4736 18.8832 33.6 19.2015 33.6C19.5197 33.6 19.825 33.4736 20.05 33.2485C20.275 33.0235 20.4015 32.7182 20.4015 32.4C20.4015 32.0817 20.275 31.7765 20.05 31.5515C19.825 31.3264 19.5197 31.2 19.2015 31.2ZM40.8015 31.2C40.4832 31.2 40.178 31.3264 39.9529 31.5515C39.7279 31.7765 39.6015 32.0817 39.6015 32.4C39.6015 32.7182 39.7279 33.0235 39.9529 33.2485C40.178 33.4736 40.4832 33.6 40.8015 33.6C41.1197 33.6 41.4249 33.4736 41.65 33.2485C41.875 33.0235 42.0015 32.7182 42.0015 32.4C42.0015 32.0817 41.875 31.7765 41.65 31.5515C41.4249 31.3264 41.1197 31.2 40.8015 31.2ZM19.2015 36C18.8832 36 18.578 36.1264 18.3529 36.3515C18.1279 36.5765 18.0015 36.8817 18.0015 37.2C18.0015 37.5182 18.1279 37.8235 18.3529 38.0485C18.578 38.2736 18.8832 38.4 19.2015 38.4C19.5197 38.4 19.825 38.2736 20.05 38.0485C20.275 37.8235 20.4015 37.5182 20.4015 37.2C20.4015 36.8817 20.275 36.5765 20.05 36.3515C19.825 36.1264 19.5197 36 19.2015 36ZM40.8015 36C40.4832 36 40.178 36.1264 39.9529 36.3515C39.7279 36.5765 39.6015 36.8817 39.6015 37.2C39.6015 37.5182 39.7279 37.8235 39.9529 38.0485C40.178 38.2736 40.4832 38.4 40.8015 38.4C41.1197 38.4 41.4249 38.2736 41.65 38.0485C41.875 37.8235 42.0015 37.5182 42.0015 37.2C42.0015 36.8817 41.875 36.5765 41.65 36.3515C41.4249 36.1264 41.1197 36 40.8015 36Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/shield.svg b/website/images/index/shield.svg
deleted file mode 100644
index e48b824909f..00000000000
--- a/website/images/index/shield.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36"><circle cx="18" cy="18" r="18" fill="#FAFAFA"/><path d="M17.94 28s8-4 8-10v-7l-8-3-8 3v7c0 6 8 10 8 10z" fill="none" stroke="#f14600" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/website/images/index/slack.svg b/website/images/index/slack.svg
deleted file mode 100644
index d15621d00d7..00000000000
--- a/website/images/index/slack.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 2447.6 2452.5" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><path d="M897.4 0C762.1.1 652.6 109.9 652.7 245.2c-.1 135.3 109.5 245.1 244.8 245.2h244.8V245.3C1142.4 110 1032.8.2 897.4 0c.1 0 .1 0 0 0m0 654H244.8C109.5 654.1-.1 763.9 0 899.2c-.2 135.3 109.4 245.1 244.7 245.3h652.7c135.3-.1 244.9-109.9 244.8-245.2.1-135.4-109.5-245.2-244.8-245.3z" fill="#36c5f0"/><path d="M2447.6 899.2c.1-135.3-109.5-245.1-244.8-245.2-135.3.1-244.9 109.9-244.8 245.2v245.3h244.8c135.3-.1 244.9-109.9 244.8-245.3zm-652.7 0v-654C1795 110 1685.5.2 1550.2 0c-135.3.1-244.9 109.9-244.8 245.2v654c-.2 135.3 109.4 245.1 244.7 245.3 135.3-.1 244.9-109.9 244.8-245.3z" fill="#2eb67d"/><path d="M1550.1 2452.5c135.3-.1 244.9-109.9 244.8-245.2.1-135.3-109.5-245.1-244.8-245.2h-244.8v245.2c-.1 135.2 109.5 245 244.8 245.2zm0-654.1h652.7c135.3-.1 244.9-109.9 244.8-245.2.2-135.3-109.4-245.1-244.7-245.3h-652.7c-135.3.1-244.9 109.9-244.8 245.2-.1 135.4 109.4 245.2 244.7 245.3z" fill="#ecb22e"/><path d="M0 1553.2c-.1 135.3 109.5 245.1 244.8 245.2 135.3-.1 244.9-109.9 244.8-245.2V1308H244.8C109.5 1308.1-.1 1417.9 0 1553.2zm652.7 0v654c-.2 135.3 109.4 245.1 244.7 245.3 135.3-.1 244.9-109.9 244.8-245.2v-653.9c.2-135.3-109.4-245.1-244.7-245.3-135.4 0-244.9 109.8-244.8 245.1 0 0 0 .1 0 0" fill="#e01e5a"/></g></svg>
\ No newline at end of file
diff --git a/website/images/index/stack-overflow.svg b/website/images/index/stack-overflow.svg
deleted file mode 100644
index f5db34bf532..00000000000
--- a/website/images/index/stack-overflow.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#607D8B" d="M9 27H12V41H9V27Z"/><path fill="#607D8B" d="M9 39H35V42H9V39Z"/><path fill="#607D8B" d="M32 27H35V41H32V27ZM15 33H29V36H15V33Z"/><path fill="#A68A6E" d="M15.082 27.2598L29.0017 28.7577L28.6807 31.7404L14.7611 30.2425L15.082 27.2598Z"/><path fill="#EF6C00" d="M36.8706 5L39.004 18.8355L36.0381 19.2928L33.9047 5.45735L36.8706 5Z"/><path fill="#FF9800" d="M28.4688 7.23682L35.2999 19.4548L32.6806 20.9193L25.8494 8.70134L28.4688 7.23682Z"/><path fill="#D38B28" d="M20.5 13.5513L31.9993 21.5331L30.2881 23.9984L18.7888 16.0166L20.5 13.5513Z"/><path fill="#C09553" d="M16.8994 20.2178L30.072 24.9563L29.0562 27.7802L15.8836 23.0416L16.8994 20.2178Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/telegram.svg b/website/images/index/telegram.svg
deleted file mode 100644
index bd7e2b0720b..00000000000
--- a/website/images/index/telegram.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#29B6F6" d="M24 4C18.6957 4 13.6086 6.10714 9.85786 9.85786C6.10714 13.6086 4 18.6957 4 24C4 29.3043 6.10714 34.3914 9.85786 38.1421C13.6086 41.8929 18.6957 44 24 44C29.3043 44 34.3914 41.8929 38.1421 38.1421C41.8929 34.3914 44 29.3043 44 24C44 18.6957 41.8929 13.6086 38.1421 9.85786C34.3914 6.10714 29.3043 4 24 4Z"/><path fill="#fff" d="M33.95 15L30.204 34.126C30.204 34.126 30.043 35 28.959 35C28.383 35 28.086 34.726 28.086 34.726L19.972 27.993L16.002 25.992L10.907 24.637C10.907 24.637 10 24.375 10 23.625C10 23 10.933 22.702 10.933 22.702L32.249 14.234C32.248 14.233 32.9 13.999 33.375 14C33.667 14 34 14.125 34 14.5C34 14.75 33.95 15 33.95 15Z"/><path fill="#B0BEC5" d="M22.9998 30.505L19.5738 33.879C19.5738 33.879 19.4248 33.994 19.2258 33.999C19.1568 34.001 19.0828 33.99 19.0068 33.956L19.9708 27.991L22.9998 30.505Z"/><path fill="#CFD8DC" d="M29.897 18.1959C29.728 17.9759 29.416 17.9359 29.196 18.1029L16 25.9999C16 25.9999 18.106 31.8919 18.427 32.9119C18.749 33.9329 19.007 33.9569 19.007 33.9569L19.971 27.9919L29.803 18.8959C30.023 18.7289 30.064 18.4159 29.897 18.1959Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/twitter.svg b/website/images/index/twitter.svg
deleted file mode 100644
index 3166e01e3bf..00000000000
--- a/website/images/index/twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#03A9F4" d="M42.0001 12.429C40.6771 13.015 39.2541 13.406 37.7531 13.591C39.2791 12.685 40.4531 11.24 41.0041 9.533C39.5761 10.37 37.9941 10.985 36.3111 11.309C34.9671 9.884 33.0501 9 30.9261 9C26.8461 9 23.5391 12.278 23.5391 16.32C23.5391 16.892 23.6061 17.449 23.7321 17.99C17.5941 17.682 12.1501 14.764 8.50807 10.336C7.86807 11.418 7.50807 12.685 7.50807 14.022C7.50807 16.563 8.80907 18.8 10.7931 20.118C9.58207 20.081 8.44207 19.744 7.44407 19.204C7.44407 19.226 7.44407 19.259 7.44407 19.29C7.44407 22.841 9.99107 25.798 13.3671 26.471C12.7501 26.64 12.0981 26.734 11.4261 26.734C10.9491 26.734 10.4841 26.68 10.0341 26.599C10.9741 29.501 13.7011 31.622 16.9321 31.685C14.4041 33.645 11.2201 34.819 7.75807 34.819C7.16007 34.819 6.57507 34.785 5.99707 34.715C9.26807 36.786 13.1521 38 17.3211 38C30.9061 38 38.3381 26.844 38.3381 17.166C38.3381 16.849 38.3281 16.533 38.3131 16.221C39.7631 15.197 41.0131 13.905 42.0001 12.429Z"/></svg>
\ No newline at end of file
diff --git a/website/images/index/youtube.svg b/website/images/index/youtube.svg
deleted file mode 100644
index 46ac9355064..00000000000
--- a/website/images/index/youtube.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#FF3D00" d="M43.2 33.9C42.8 36 41.1 37.6 39 37.9C35.7 38.4 30.2 39 24 39C17.9 39 12.4 38.4 9 37.9C6.9 37.6 5.2 36 4.8 33.9C4.4 31.6 4 28.2 4 24C4 19.8 4.4 16.4 4.8 14.1C5.2 12 6.9 10.4 9 10.1C12.3 9.6 17.8 9 24 9C30.2 9 35.6 9.6 39 10.1C41.1 10.4 42.8 12 43.2 14.1C43.6 16.4 44.1 19.8 44.1 24C44 28.2 43.6 31.6 43.2 33.9Z"/><path fill="#fff" d="M20 31V17L32 24L20 31Z"/></svg>
\ No newline at end of file
diff --git a/website/images/logo-180x180.png b/website/images/logo-180x180.png
deleted file mode 100644
index d89c259e27c..00000000000
Binary files a/website/images/logo-180x180.png and /dev/null differ
diff --git a/website/images/logo-200x120.png b/website/images/logo-200x120.png
deleted file mode 100644
index 01d205bfdba..00000000000
Binary files a/website/images/logo-200x120.png and /dev/null differ
diff --git a/website/images/logo-400x240.png b/website/images/logo-400x240.png
deleted file mode 100644
index 9c39da97a87..00000000000
Binary files a/website/images/logo-400x240.png and /dev/null differ
diff --git a/website/images/logo-clickhouse.svg b/website/images/logo-clickhouse.svg
deleted file mode 100644
index b6bb0cd2d07..00000000000
--- a/website/images/logo-clickhouse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="180" height="28" version="1.1" viewBox="0 0 180 28"><title>ClickHouse Logo</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="ClickHouse-Logo" fill-rule="nonzero" transform="translate(0.000000, 0.500000)"><g id="logo"><polygon id="Path" fill="red" points="0 23.625 3.376 23.625 3.376 27 0 27"/><polygon id="Path" fill="#FC0" points="0 0 3.376 0 3.376 23.625 0 23.625"/><polygon id="Path" fill="#FC0" points="6.751 0 10.127 0 10.127 27 6.751 27"/><polygon id="Path" fill="#FC0" points="13.502 0 16.878 0 16.878 27 13.502 27"/><polygon id="Path" fill="#FC0" points="20.253 0 23.629 0 23.629 27 20.253 27"/><polygon id="Path" fill="#FC0" points="27.004 10.969 30.38 10.969 30.38 16.031 27.004 16.031"/></g><g id="clickhouse-black" fill="#231F20" transform="translate(43.291139, 3.000000)"><path id="Path" d="M9.76370444,20.9560972 C8.43447886,20.9735251 7.11430823,20.7384252 5.875478,20.2636703 C4.72047444,19.8054437 3.67723122,19.1113387 2.81453379,18.2271205 C1.90927726,17.3283139 1.2048111,16.2531042 0.746328237,15.0704684 C-0.248776079,12.2964995 -0.248776079,9.27056268 0.746328237,6.4965938 C1.67159165,4.07354026 3.61800681,2.16434552 6.08229856,1.26266086 C7.35832383,0.792264319 8.71148185,0.557532775 10.0739353,0.570233938 C11.1612577,0.548839362 12.2465336,0.672146838 13.3003359,0.936812899 C14.1575307,1.16603291 14.9890302,1.47989577 15.7821826,1.8736258 L15.0376286,4.17492705 C14.334754,3.70811103 13.5779913,3.32526638 12.7832845,3.03445917 C11.8308864,2.71897047 10.8304102,2.56740693 9.82575061,2.58641822 C7.96245266,2.56886976 6.1853824,3.35817309 4.96546756,4.74516099 C4.30442786,5.50472232 3.79877758,6.38298172 3.47635956,7.33157921 C3.08814385,8.46618422 2.89929764,9.65767851 2.91794407,10.8548103 C2.90195973,12.0219322 3.07653544,13.184001 3.43499545,14.2965795 C3.73382292,15.2302331 4.21899806,16.0957206 4.86205728,16.8422667 C5.46077204,17.5238868 6.21094713,18.0604846 7.05435517,18.41041 C7.95798877,18.7824827 8.9290709,18.969569 9.90847883,18.9602785 C10.8005951,18.9648543 11.68759,18.827308 12.5350999,18.5529685 C13.3447055,18.2769814 14.1214074,17.9150606 14.8514901,17.4735971 L15.575362,19.2046644 C14.8756447,19.7279796 14.0929921,20.1339593 13.2589718,20.4062288 C12.1346344,20.7859604 10.952228,20.9719742 9.76370444,20.9560972 L9.76370444,20.9560972 Z"/><polygon id="Path" points="21.201 0 21.201 20.671 18.74 20.671 18.74 0 21.201 0"/><path id="Shape" d="M26.5161694,4.15456155 C26.0981094,4.18404053 25.6871808,4.03620327 25.3868859,3.74828616 C25.0865909,3.46036905 24.9255529,3.05981554 24.9443332,2.64751471 C24.9293499,2.23543398 25.0776822,1.83376364 25.3579743,1.52741233 C25.9917593,0.922143971 26.9992154,0.922143971 27.6330004,1.52741233 C27.9227354,1.82938962 28.0789406,2.23223687 28.0673236,2.64751471 C28.0795295,3.0508229 27.9224226,3.44126169 27.6330004,3.7268861 C27.3352303,4.0129939 26.9320049,4.16740365 26.5161694,4.15456155 L26.5161694,4.15456155 Z M27.7570927,6.31330432 L27.7570927,20.5691528 L25.3166102,20.5691528 L25.3166102,6.31330432 L27.7777748,6.31330432 L27.7570927,6.31330432 Z"/><path id="Path" d="M38.2015308,20.9561849 C37.2331788,20.9606473 36.2723959,20.7880054 35.3680892,20.4469598 C34.5040176,20.1277138 33.7207114,19.6274001 33.072381,18.9806439 C32.4086321,18.3083453 31.8882536,17.5120269 31.5419089,16.6386117 C30.789066,14.6134632 30.789066,12.3911868 31.5419089,10.3660384 C31.8953146,9.48650873 32.4305899,8.68894988 33.1137451,8.02400613 C33.8006138,7.36063917 34.6265105,6.85322326 35.5335456,6.53732479 C36.4665869,6.19626518 37.4544707,6.0237894 38.4497154,6.02818735 C39.2367736,6.02254268 40.0215928,6.11144966 40.7867877,6.29293882 C41.402916,6.43127907 41.9904819,6.67235105 42.5240804,7.00573124 L41.7381623,9.14410851 C41.2326995,8.76428196 40.6844527,8.44310218 40.1042799,8.18693012 C39.4990142,7.95244732 38.8516533,7.84158602 38.2015308,7.86108215 C37.5775701,7.85677667 36.958946,7.97445444 36.3815099,8.20729561 C35.8033669,8.44328317 35.2871426,8.80537627 34.8717198,9.2663015 C34.4220004,9.77237252 34.0776687,10.3605404 33.8582991,10.9973688 C33.5836299,11.7832018 33.4506403,12.6102801 33.4653401,13.4412285 C33.3646964,14.9221144 33.8543791,16.3832889 34.8303557,17.5143281 C35.8193073,18.4542588 37.1597853,18.9483223 38.5324437,18.8788165 C39.7296588,18.8515966 40.8932941,18.483801 41.8829366,17.8198106 L42.4413521,19.6119744 C41.8863529,20.0201826 41.2635134,20.3302813 40.6006492,20.5284218 C39.8277327,20.7904738 39.0186907,20.9346965 38.2015308,20.9561849 L38.2015308,20.9561849 Z"/><path id="Shape" d="M47.9427789,0 L47.9427789,20.6709803 L45.4402502,20.6709803 L45.4402502,0 L47.9427789,0 Z M54.3542161,20.6709803 L48.2736918,13.0135531 L54.2714879,6.33366982 L56.8360628,6.33366982 L50.9003129,12.7284361 L57.2497039,20.6709803 L54.3542161,20.6709803 L54.3542161,20.6709803 Z"/><polygon id="Path" points="73.113 11.873 62.772 11.873 62.772 20.651 60.104 20.651 60.104 .855 62.772 .855 62.772 9.898 73.113 9.898 73.113 .855 75.781 .855 75.781 20.671 73.113 20.671"/><path id="Shape" d="M86.3079919,20.9560972 C85.38699,20.956828 84.4743522,20.7840259 83.6193247,20.4469598 C82.7801539,20.1243214 82.0191689,19.6317014 81.3856627,19.0010094 C80.7288968,18.3272298 80.2155719,17.5309446 79.8758726,16.6589772 C79.1241518,14.6056391 79.1241518,12.35828 79.8758726,10.3049419 C80.2139667,9.43820628 80.7276537,8.64828849 81.3856627,7.98327514 C82.0210949,7.3549028 82.7815529,6.86262399 83.6193247,6.53732479 C84.4743522,6.20025867 85.38699,6.0274377 86.3079919,6.02818492 C87.235663,6.02783377 88.154999,6.20059422 89.0173412,6.53732479 C89.8608646,6.86326706 90.6279639,7.35528929 91.2716852,7.98327514 C91.9432058,8.64563226 92.4709473,9.43552137 92.8228394,10.3049419 C93.5941835,12.3548594 93.5941835,14.6090597 92.8228394,16.6589772 C92.5001582,17.5252355 92.0083217,18.3208853 91.3750955,19.0010094 C90.7336187,19.6317283 89.9659063,20.1241438 89.1207514,20.4469598 C88.2261198,20.7965781 87.270406,20.9695718 86.3079919,20.9560972 Z M86.3079919,19.1028369 C86.8871906,19.1004754 87.4613802,18.9970483 88.0039204,18.7973545 C88.5665616,18.5933999 89.0704796,18.2579374 89.4723464,17.8198106 C89.93364,17.3107661 90.2854168,16.714971 90.5064492,16.0683778 C90.7858877,15.2345245 90.9187812,14.3598326 90.8994082,13.4819595 C90.921252,12.6039337 90.7882958,11.7288286 90.5064492,10.8955413 C90.2829062,10.2561715 89.9312542,9.66751308 89.4723464,9.16447401 C89.0704796,8.72634722 88.5665616,8.39088465 88.0039204,8.18693012 C87.4613802,7.98723626 86.8871906,7.88380922 86.3079919,7.88144765 C85.7421967,7.88338153 85.1815027,7.98690253 84.6534274,8.18693012 C84.1067964,8.39867016 83.6180769,8.73344525 83.2263656,9.16447401 C82.771108,9.66662382 82.426093,10.2559587 82.2129449,10.8955413 C81.9432303,11.7312023 81.817401,12.6054092 81.8406679,13.4819595 C81.8197008,14.3583785 81.9454766,15.2322137 82.2129449,16.0683778 C82.4234966,16.7151843 82.7686424,17.3116787 83.2263656,17.8198106 C83.6175627,18.2514112 84.1064306,18.586288 84.6534274,18.7973545 C85.1815027,18.9973821 85.7421967,19.1009031 86.3079919,19.1028369 L86.3079919,19.1028369 Z"/><path id="Path" d="M104.218652,20.1211118 C103.261113,20.713834 102.142858,21.0051032 101.012933,20.9560972 C99.7999523,21.0051122 98.6193584,20.5636475 97.7451686,19.7341674 C96.8353108,18.7009502 96.3878256,17.3496664 96.5042453,15.9869158 L96.5042453,6.31330432 L98.9860919,6.31330432 L98.9860919,15.9869158 C98.9742754,16.4701161 99.0441695,16.9518863 99.1929125,17.4125006 C99.3056456,17.7606047 99.5046708,18.0755709 99.77201,18.328948 C100.016574,18.5594167 100.314849,18.7272509 100.640656,18.81772 C100.990271,18.9161408 101.352523,18.9641592 101.716123,18.9602785 C102.655549,19.0038445 103.582007,18.7308795 104.342744,18.1863895 C105.051689,17.6370184 105.630443,16.9420231 106.038673,16.1498398 L106.038673,6.31330432 L108.499837,6.31330432 L108.499837,20.5691528 L106.328222,20.5691528 L106.100719,18.0031001 L106.100719,18.0031001 C105.687922,18.8692089 105.035644,19.6032598 104.218652,20.1211118 L104.218652,20.1211118 Z"/><path id="Path" d="M116.421065,20.9560972 C115.801233,20.9950241 115.179512,20.9950241 114.55968,20.9560972 C114.092617,20.8964402 113.62981,20.8080164 113.173982,20.6913458 C112.813228,20.605003 112.460411,20.4891975 112.119197,20.3451323 C111.834495,20.2200141 111.558175,20.0771664 111.291915,19.9174568 L112.098515,17.8809071 C112.279343,18.026767 112.473161,18.156273 112.677613,18.2678515 C112.976636,18.4329534 113.287727,18.5759069 113.608305,18.695527 C114.017173,18.8537321 114.439319,18.9763932 114.869911,19.0621059 C115.380772,19.1609067 115.900459,19.2086684 116.421065,19.2046644 C117.260254,19.2611102 118.095255,19.0466179 118.799501,18.5936995 C119.330358,18.1920161 119.630919,17.5621502 119.606101,16.9033632 C119.629117,16.3456326 119.383876,15.8098319 118.944275,15.4574128 C118.248621,14.9827695 117.47054,14.6376468 116.648567,14.4391379 L114.869911,13.8485385 C114.332933,13.6600961 113.82489,13.3996834 113.36012,13.0746496 C112.918371,12.7629353 112.551287,12.3597625 112.284654,11.8934507 C111.990937,11.3416153 111.84837,10.7239217 111.871013,10.1012869 C111.7928,8.92823263 112.331666,7.79778562 113.298074,7.10755873 C114.467654,6.39295223 115.832855,6.05154147 117.206983,6.13001484 C118.07528,6.11663174 118.942387,6.19859987 119.79224,6.37440081 C120.389496,6.49652839 120.971868,6.68085438 121.529532,6.92426925 L120.950435,8.96081903 C120.479952,8.73041885 119.996597,8.52643737 119.502691,8.3498541 C118.797193,8.1146398 118.054965,8.00432014 117.310393,8.02400613 C116.535101,7.9880419 115.762277,8.13465573 115.056049,8.45168159 C114.47936,8.75940804 114.145458,9.37689414 114.208085,10.0198249 C114.202,10.3323024 114.296078,10.6387208 114.476951,10.8955413 C114.663996,11.1520366 114.903538,11.3670997 115.180141,11.5268718 C115.506126,11.720303 115.852962,11.8774057 116.214244,11.9952782 L117.455167,12.3618572 L119.130414,12.9117256 C119.664383,13.1015363 120.166356,13.3692768 120.619522,13.70598 C121.602378,14.4140087 122.154912,15.5634667 122.087948,16.7608047 C122.121004,17.4696719 121.956505,18.1739382 121.612261,18.7973545 C121.300726,19.3338382 120.869299,19.7934828 120.350655,20.1414773 C119.804193,20.5059941 119.194247,20.7683295 118.551316,20.9153662 C117.845409,21.0123699 117.130265,21.0260437 116.421065,20.9560972 Z"/><path id="Shape" d="M136.379248,19.4286849 C135.765636,19.9144267 135.063746,20.2807344 134.311043,20.5080563 C133.397586,20.8060079 132.439751,20.9505822 131.477601,20.9357317 C129.484022,21.0457076 127.539179,20.3034303 126.141631,18.899182 C124.819952,17.3656124 124.152831,15.3875844 124.280246,13.3801321 C124.263071,12.3194805 124.438164,11.2643153 124.797297,10.2642109 C125.111353,9.39844373 125.596363,8.60246478 126.224359,7.92217864 C126.799559,7.29363386 127.504769,6.79365416 128.292565,6.4558628 C129.13245,6.11650376 130.03203,5.94349361 130.939868,5.94672536 C131.84844,5.93569173 132.749586,6.10900306 133.587171,6.4558628 C134.355957,6.77570775 135.026242,7.28828126 135.531284,7.94254414 C136.069381,8.66407624 136.423989,9.5021104 136.565387,10.3864039 C136.756685,11.5054228 136.756685,12.6480576 136.565387,13.7670765 L126.720728,13.7670765 C126.831033,17.1749031 128.464915,18.8788165 131.622376,18.8788165 C132.38185,18.8941966 133.138087,18.7769813 133.856038,18.532603 C134.495821,18.304128 135.106567,18.0034291 135.676058,17.6365211 L136.379248,19.4286849 Z M131.022596,7.73888916 C130.017668,7.7293132 129.052936,8.12697327 128.354611,8.83862604 C127.526752,9.75405949 127.031943,10.9148261 126.948231,12.1378367 L134.331725,12.1378367 C134.534684,10.9751452 134.259342,9.78072052 133.566489,8.81826055 C132.931983,8.09270485 131.993938,7.6946933 131.022596,7.73888916 Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/logo.png b/website/images/logo.png
deleted file mode 100644
index 552637796d6..00000000000
Binary files a/website/images/logo.png and /dev/null differ
diff --git a/website/images/logo.svg b/website/images/logo.svg
deleted file mode 100644
index 865b96d98c7..00000000000
--- a/website/images/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="54" height="48" viewBox="0 0 9 8"><style>.o{fill:#fc0}.r{fill:red}</style><path d="M0,7 h1 v1 h-1 z" class="r"/><path d="M0,0 h1 v7 h-1 z" class="o"/><path d="M2,0 h1 v8 h-1 z" class="o"/><path d="M4,0 h1 v8 h-1 z" class="o"/><path d="M6,0 h1 v8 h-1 z" class="o"/><path d="M8,3.25 h1 v1.5 h-1 z" class="o"/></svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-almaz-capital.svg b/website/images/logos/logo-almaz-capital.svg
deleted file mode 100644
index 20cf10bd205..00000000000
--- a/website/images/logos/logo-almaz-capital.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 484.72 95.49"><defs><style>.cls-1{fill:#99b9e2}.cls-2{fill:#e75204}.cls-3{fill:#187ac6}.cls-4{fill:#005cb9}</style></defs><title>AC Logo</title><path d="M215.74,253.56l3.72,55.38a4.92,4.92,0,0,0,7.66,3.76l35.4-23.77a5.3,5.3,0,0,0,.13-8.71l-41.49-29.68A3.43,3.43,0,0,0,215.74,253.56Z" class="cls-1" transform="translate(-178.92 -249.89)"/><path d="M205.9,252.18,180.05,294a7.57,7.57,0,0,0,3.52,11l22.95,9.57a4.83,4.83,0,0,0,6.69-4.74l-3.28-56.55A2.18,2.18,0,0,0,205.9,252.18Z" class="cls-2" transform="translate(-178.92 -249.89)"/><path d="M182.27,309l19.61,7.73a49.54,49.54,0,0,1,20.43,15l9.57,11.89a1.09,1.09,0,0,1-1.47,1.57l-49-34.65A.89.89,0,0,1,182.27,309Z" class="cls-3" transform="translate(-178.92 -249.89)"/><path d="M228.29,317.16l38.24-25a1.2,1.2,0,0,1,1.73,1.54l-23.83,47.46a5.15,5.15,0,0,1-8.68.83l-9.56-12.39A8.61,8.61,0,0,1,228.29,317.16Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M432.5,314.24h-4.58c-2.42,0-4-1.07-5.47-4-1.57,1.63-5,5-12.41,5-8,0-12-4.75-12-8.8,0-3.06,1.23-7.87,7.75-9.12,4.1-.79,16.67.37,16.85-4.56,0-1.08-1.44-5-8.22-5s-9.59,3-9.59,6.33l-4.77.06c0-5.81,4.46-10.75,14.7-10.75,8,0,13.14,3.63,13,8.23v15.41c-.11,2.9,3.45,3.13,4.68,3.13Zm-9.83-15c-.72.46-4.49,1.38-10.83,2s-8.08,1.9-8.08,4.83,2.59,4.56,7.52,4.56c6.63,0,10.44-5.23,10.85-7.17A35.09,35.09,0,0,0,422.67,299.28Z" class="cls-2" transform="translate(-178.92 -249.89)"/><path d="M547.58,314.24h-4.38c-2.42,0-4-1.07-5.47-4-1.57,1.63-5,5-12.41,5-8,0-12-4.75-12-8.8,0-3.06,1.23-7.87,7.75-9.12,4.1-.79,16.67.37,16.85-4.56,0-1.08-1.44-5-8.22-5s-9.59,3-9.59,6.33l-4.77.06c0-5.81,4.46-10.75,14.7-10.75,8,0,13.14,3.63,13,8.23v15.41c-.11,2.9,3.24,3.13,4.48,3.13Zm-9.63-15c-.72.46-4.49,1.38-10.83,2s-8.08,1.9-8.08,4.83,2.59,4.56,7.52,4.56c6.63,0,10.44-5.23,10.85-7.17A35.09,35.09,0,0,0,538,299.28Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M654.46,314.24h-4.59c-2.42,0-4-1.07-5.47-4-1.57,1.63-5,5-12.41,5-8,0-12-4.75-12-8.8,0-3.06,1.23-7.87,7.75-9.12,4.1-.79,16.67.37,16.85-4.56,0-1.08-1.44-5-8.22-5s-9.59,3-9.59,6.33l-4.77.06c0-5.81,4.46-10.75,14.7-10.75,8,0,13.14,3.63,13,8.23v15.41c-.11,2.9,3.45,3.13,4.69,3.13Zm-9.84-15c-.72.46-4.49,1.38-10.83,2s-8.08,1.9-8.08,4.83,2.59,4.56,7.52,4.56c6.63,0,10.44-5.23,10.85-7.17A35.09,35.09,0,0,0,644.62,299.28Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M454.93,289.3H435.06v-4.8H463v4.56l-21.4,20.19h22.35v5H434.1v-5Z" class="cls-2" transform="translate(-178.92 -249.89)"/><path d="M556.83,285.26v3.92H557a8.09,8.09,0,0,1,4.43-3.5,19.39,19.39,0,0,1,6.64-1.09,18.31,18.31,0,0,1,7,1.23,13.76,13.76,0,0,1,8,8.18,16.79,16.79,0,0,1,1,5.83,17.34,17.34,0,0,1-1,5.83,13.1,13.1,0,0,1-3,4.79,13.87,13.87,0,0,1-5,3.22,18.86,18.86,0,0,1-6.94,1.18,20.58,20.58,0,0,1-2.85-.22,18.43,18.43,0,0,1-3.12-.73,13,13,0,0,1-2.92-1.37,8.32,8.32,0,0,1-2.32-2.16h-.13v14.91h-5.7v-40Zm20.5,10.28a10,10,0,0,0-1.95-3.45,9.26,9.26,0,0,0-3.35-2.41,11.88,11.88,0,0,0-4.8-.9,11.39,11.39,0,0,0-4.9,1,9.42,9.42,0,0,0-3.29,2.49,9.66,9.66,0,0,0-1.85,3.5,14.25,14.25,0,0,0,0,8.1,9.21,9.21,0,0,0,5.3,5.94,12.34,12.34,0,0,0,5,.92,11.33,11.33,0,0,0,4.93-1,8.69,8.69,0,0,0,3.19-2.52,10,10,0,0,0,1.74-3.59,16,16,0,0,0,.54-4.15A12.53,12.53,0,0,0,577.32,295.55Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M589,280.05v-5.83h5.48v5.83Zm5.48,5.21v29H589v-29Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M617.88,285v4.26h-8.05v18.61a4.62,4.62,0,0,0,.16,1.36,1.41,1.41,0,0,0,.62.79,3,3,0,0,0,1.27.37q.82.08,2.12.09h4v4.26h-5.7a22.84,22.84,0,0,1-3.69-.26,5.84,5.84,0,0,1-2.48-.94,7.89,7.89,0,0,1-2.12-5.23V289.27h-5.95V285H604v-8.73h5.81V285Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M336.44,273.5v40.74H331V273.5Z" class="cls-2" transform="translate(-178.92 -249.89)"/><path d="M663.64,273.5v40.74h-5.47V273.5Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M594.48,285.26v29H589v-29Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M594.48,274.22v6H589v-6Z" class="cls-4" transform="translate(-178.92 -249.89)"/><path d="M382.21,283.79c-5,0-9,2.57-12.42,5.61v0c-2.53-5.36-8.21-5.64-9.9-5.64-5,0-8.1,1.73-11.39,4.83h-.14v-3.33h-5.5v29h5.84V295.53c0-3,4.31-6.78,9.27-6.71,3.33,0,7.22,1.47,7.22,5.72v19.7H371V295.53c0-3,3.6-6.72,9.27-6.71,3.33,0,6.88,1.47,6.88,5.72v19.7H393V295.53C393,284.63,384.41,283.79,382.21,283.79Z" class="cls-2" transform="translate(-178.92 -249.89)"/><path d="M310,274.22h-7.52l-17.58,40.09h6.31l5.63-12h19l4.83,12h6.93Zm-11.73,23.15,7.42-16.72h1.09l7.18,16.72Z" class="cls-2" transform="translate(-178.92 -249.89)"/><path d="M503.11,298.78a13.48,13.48,0,0,1-1.16,4.58,11,11,0,0,1-2.67,3.66,12.39,12.39,0,0,1-4.06,2.4,15.51,15.51,0,0,1-5.38.86,17.09,17.09,0,0,1-7.09-1.34,13.49,13.49,0,0,1-4.86-3.6,14.55,14.55,0,0,1-2.8-5.3,22.55,22.55,0,0,1-.9-6.45,20.19,20.19,0,0,1,.9-6,14.73,14.73,0,0,1,2.8-5.16,13.55,13.55,0,0,1,4.83-3.6,16.87,16.87,0,0,1,7.05-1.34,15.83,15.83,0,0,1,8.34,2.12,11.57,11.57,0,0,1,4.86,8.7s4.44-.09,6,0a16.6,16.6,0,0,0-2.35-7.94,14.73,14.73,0,0,0-4.19-4,19.64,19.64,0,0,0-5.73-2.46,27,27,0,0,0-6.83-.84,25,25,0,0,0-9.37,1.65,19.34,19.34,0,0,0-6.83,4.49,19,19,0,0,0-4.15,6.67,23.32,23.32,0,0,0-1.42,8.18,24.61,24.61,0,0,0,1.32,8.15,18.09,18.09,0,0,0,4,6.59A18.28,18.28,0,0,0,480,313.1a25.14,25.14,0,0,0,9.34,1.59q8.82,0,13.91-4.19t6-11.72Z" class="cls-4" transform="translate(-178.92 -249.89)"/></svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-altimeter-capital.png b/website/images/logos/logo-altimeter-capital.png
deleted file mode 100644
index 7c0d3b25b8d..00000000000
Binary files a/website/images/logos/logo-altimeter-capital.png and /dev/null differ
diff --git a/website/images/logos/logo-benchmark-capital.png b/website/images/logos/logo-benchmark-capital.png
deleted file mode 100644
index 626599c6b35..00000000000
Binary files a/website/images/logos/logo-benchmark-capital.png and /dev/null differ
diff --git a/website/images/logos/logo-cloudflare.svg b/website/images/logos/logo-cloudflare.svg
deleted file mode 100644
index 9c6b408c388..00000000000
--- a/website/images/logos/logo-cloudflare.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1062" height="155" version="1.1" viewBox="0 0 1062 155"><title>cf-logo-h</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="cf-logo-h" fill-rule="nonzero"><g id="Group" fill="#404041" transform="translate(367.600000, 95.800000)"><polygon id="Path" points="77.1 1.1 92.7 1.1 92.7 43.6 119.8 43.6 119.8 57.2 77.1 57.2"/><path id="Shape" d="M135.9,29.3 L135.9,29.2 C135.9,13.1 148.9,0 166.2,0 C183.5,0 196.3,12.9 196.3,29 L196.3,29.2 C196.3,45.3 183.3,58.4 166,58.4 C148.8,58.3 135.9,45.4 135.9,29.3 M180.5,29.3 L180.5,29.2 C180.5,21.1 174.7,14.1 166.1,14.1 C157.6,14.1 151.9,21 151.9,29.1 L151.9,29.3 C151.9,37.4 157.7,44.4 166.2,44.4 C174.8,44.3 180.5,37.4 180.5,29.3"/><path id="Path" d="M215.4,32.6 L215.4,1.1 L231.2,1.1 L231.2,32.3 C231.2,40.4 235.3,44.2 241.5,44.2 C247.7,44.2 251.8,40.5 251.8,32.7 L251.8,1.1 L267.6,1.1 L267.6,32.2 C267.6,50.3 257.3,58.2 241.3,58.2 C225.4,58.3 215.4,50.2 215.4,32.6"/><path id="Shape" d="M291.4,1.1 L313.1,1.1 C333.1,1.1 344.8,12.6 344.8,28.8 L344.8,29 C344.8,45.2 333,57.2 312.8,57.2 L291.5,57.2 L291.4,1.1 L291.4,1.1 Z M313.3,43.4 C322.6,43.4 328.8,38.3 328.8,29.2 L328.8,29 C328.8,20 322.6,14.8 313.3,14.8 L307,14.8 L307,43.3 L313.3,43.4 L313.3,43.4 Z"/><polygon id="Path" points="367.3 1.1 412.2 1.1 412.2 14.8 382.8 14.8 382.8 24.3 409.4 24.3 409.4 37.2 382.8 37.2 382.8 57.2 367.3 57.2"/><polygon id="Path" points="433.8 1.1 449.3 1.1 449.3 43.6 476.5 43.6 476.5 57.2 433.8 57.2"/><path id="Shape" d="M517.1,0.7 L532.1,0.7 L556,57.2 L539.3,57.2 L535.2,47.2 L513.6,47.2 L509.6,57.2 L493.3,57.2 L517.1,0.7 Z M530.8,35.1 L524.6,19.2 L518.3,35.1 L530.8,35.1 Z"/><path id="Shape" d="M576,1.1 L602.5,1.1 C611.1,1.1 617,3.3 620.8,7.2 C624.1,10.4 625.8,14.7 625.8,20.3 L625.8,20.5 C625.8,29.1 621.2,34.8 614.3,37.7 L627.7,57.3 L609.7,57.3 L598.4,40.3 L591.6,40.3 L591.6,57.3 L576.1,57.3 L576,1.1 L576,1.1 Z M601.8,28.1 C607.1,28.1 610.1,25.5 610.1,21.5 L610.1,21.2 C610.1,16.8 606.9,14.6 601.7,14.6 L591.5,14.6 L591.5,28.1 L601.8,28.1 L601.8,28.1 Z"/><polygon id="Path" points="648.2 1.1 693.3 1.1 693.3 14.4 663.6 14.4 663.6 22.8 690.5 22.8 690.5 35.1 663.6 35.1 663.6 44 693.7 44 693.7 57.2 648.2 57.2"/><path id="Path" d="M43.1,35.9 C40.9,40.8 36.3,44.3 30.3,44.3 C21.8,44.3 16,37.2 16,29.2 L16,29 C16,20.9 21.7,14 30.2,14 C36.6,14 41.5,17.9 43.5,23.3 L59.9,23.3 C57.3,9.9 45.5,0 30.3,0 C13,0 5.68434189e-14,13.1 5.68434189e-14,29.2 L5.68434189e-14,29.4 C5.68434189e-14,45.5 12.8,58.4 30.1,58.4 C44.9,58.4 56.5,48.8 59.5,36 L43.1,35.9 L43.1,35.9 Z"/></g><g id="Group"><polygon id="Path" fill="#FFF" points="312.8 91.6 269.9 67 262.5 63.8 87 65.1 87 154.1 312.8 154.2"/><path id="Path" fill="#F38020" d="M234.7,146 C236.8,138.8 236,132.2 232.5,127.3 C229.3,122.8 223.9,120.2 217.4,119.9 L94.3,118.3 C93.5,118.3 92.8,117.9 92.4,117.3 C92,116.7 91.9,115.9 92.1,115.1 C92.5,113.9 93.7,113 95,112.9 L219.2,111.3 C233.9,110.6 249.9,98.7 255.5,84.1 L262.6,65.6 C262.9,64.8 263,64 262.8,63.2 C254.8,27 222.5,1.42108547e-14 183.9,1.42108547e-14 C148.3,1.42108547e-14 118.1,23 107.3,54.9 C100.3,49.7 91.4,46.9 81.8,47.8 C64.7,49.5 51,63.2 49.3,80.3 C48.9,84.7 49.2,89 50.2,93 C22.3,93.8 1.42108547e-14,116.6 1.42108547e-14,144.7 C1.42108547e-14,147.2 0.2,149.7 0.5,152.2 C0.7,153.4 1.7,154.3 2.9,154.3 L230.1,154.3 C231.4,154.3 232.6,153.4 233,152.1 L234.7,146 Z"/><path id="Path" fill="#FAAE40" d="M273.9,66.9 C272.8,66.9 271.6,66.9 270.5,67 C269.7,67 269,67.6 268.7,68.4 L263.9,85.1 C261.8,92.3 262.6,98.9 266.1,103.8 C269.3,108.3 274.7,110.9 281.2,111.2 L307.4,112.8 C308.2,112.8 308.9,113.2 309.3,113.8 C309.7,114.4 309.8,115.3 309.6,116 C309.2,117.2 308,118.1 306.7,118.2 L279.4,119.8 C264.6,120.5 248.7,132.4 243.1,147 L241.1,152.1 C240.7,153.1 241.4,154.1 242.5,154.1 L336.3,154.1 C337.4,154.1 338.4,153.4 338.7,152.3 C340.3,146.5 341.2,140.4 341.2,134.1 C341.2,97 311.1,66.9 273.9,66.9"/></g></g></g></svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-coatue.png b/website/images/logos/logo-coatue.png
deleted file mode 100644
index c9331141f5a..00000000000
Binary files a/website/images/logos/logo-coatue.png and /dev/null differ
diff --git a/website/images/logos/logo-deutsche-bank.png b/website/images/logos/logo-deutsche-bank.png
deleted file mode 100644
index ba1de3a2873..00000000000
Binary files a/website/images/logos/logo-deutsche-bank.png and /dev/null differ
diff --git a/website/images/logos/logo-ebay.png b/website/images/logos/logo-ebay.png
deleted file mode 100644
index 6234cd2ac22..00000000000
Binary files a/website/images/logos/logo-ebay.png and /dev/null differ
diff --git a/website/images/logos/logo-firstmark.svg b/website/images/logos/logo-firstmark.svg
deleted file mode 100644
index 9f372958295..00000000000
--- a/website/images/logos/logo-firstmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="206" height="15" version="1.1" viewBox="0 0 206 15"><title>logo-firstmark</title><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="logo-firstmark" fill-rule="nonzero" transform="translate(0.000000, 0.650000)"><polyline id="Fill-1" fill="#0F0F0F" points="12.1 2.65 2 2.65 2 5.85 9 5.85 9 7.75 2 7.75 2 13.25 0 13.25 0 .75 12.1 .75 12.1 2.65"/><polygon id="Fill-2" fill="#0F0F0F" points="18.5 13.25 20.5 13.25 20.5 .75 18.5 .75"/><path id="Fill-3" fill="#0F0F0F" d="M37.4,6.65 C38.9,6.65 39.7,6.05 39.7,4.75 C39.7,3.35 38.9,2.65 37.2,2.65 L31,2.65 L31,6.65 L37.4,6.65 L37.4,6.65 Z M41.8,13.25 L39.5,13.25 L36.3,8.45 L31,8.45 L31,13.25 L29,13.25 L29,0.75 L37.7,0.75 C39,0.75 39.9,1.15 40.7,1.85 C41.4,2.55 41.8,3.55 41.8,4.75 C41.8,5.85 41.5,6.65 40.9,7.35 C40.4,7.95 39.6,8.35 38.7,8.45 L41.8,13.25 Z"/><path id="Fill-4" fill="#0F0F0F" d="M59.9,3.75 C58.1,2.75 56.3,2.35 54.5,2.35 C53.3,2.35 52.3,2.55 51.7,2.75 C51,3.05 50.7,3.45 50.7,3.95 C50.7,4.55 51,4.95 51.7,5.15 C52.2,5.35 53,5.55 54.2,5.55 C55.9,5.65 56.9,5.75 57.5,5.85 C59,6.05 60.1,6.45 60.8,7.05 C61.5,7.65 61.9,8.45 61.9,9.45 C61.9,10.75 61.3,11.75 60.2,12.55 C59.1,13.25 57.5,13.65 55.4,13.65 C52.3,13.65 50,12.95 48.3,11.55 L49.4,10.05 C51.3,11.25 53.3,11.85 55.5,11.85 C56.9,11.85 58,11.65 58.8,11.25 C59.5,10.85 59.9,10.35 59.9,9.65 C59.9,8.85 59.4,8.35 58.4,8.05 C57.9,7.95 56.5,7.75 54.3,7.65 C52.3,7.55 50.9,7.25 50.1,6.85 C49.2,6.35 48.7,5.55 48.7,4.45 C48.7,3.25 49.2,2.35 50.3,1.65 C51.4,0.95 52.8,0.65 54.8,0.65 C57.4,0.65 59.5,1.25 61.3,2.45 L59.9,3.75"/><polyline id="Fill-5" fill="#0F0F0F" points="80 2.65 74.3 2.65 74.3 13.25 72.3 13.25 72.3 2.65 66.6 2.65 66.6 .75 80 .75 80 2.65"/><polyline id="Fill-6" fill="#0F0F0F" points="102.7 13.25 100.8 13.25 100.8 3.05 100.7 3.05 94.5 11.25 88.3 3.05 88.3 3.05 88.3 13.25 86.3 13.25 86.3 .75 88.8 .75 94.5 8.35 100.3 .75 102.7 .75 102.7 13.25"/><path id="Fill-7" fill="#0F0F0F" d="M119.8,8.65 L116.7,2.55 L113.6,8.65 L119.8,8.65 Z M124.3,13.25 L122.1,13.25 L120.7,10.45 L112.6,10.45 L111.2,13.25 L109,13.25 L115.3,0.75 L117.8,0.75 L124.3,13.25 Z"/><path id="Fill-8" fill="#0F0F0F" d="M138.3,6.65 C139.8,6.65 140.6,6.05 140.6,4.75 C140.6,3.35 139.8,2.65 138.1,2.65 L132,2.65 L132,6.65 L138.3,6.65 L138.3,6.65 Z M142.8,13.25 L140.5,13.25 L137.3,8.45 L132,8.45 L132,13.25 L130,13.25 L130,0.75 L138.7,0.75 C140,0.75 140.9,1.15 141.7,1.85 C142.4,2.55 142.8,3.55 142.8,4.75 C142.8,5.85 142.5,6.65 141.9,7.35 C141.4,7.95 140.6,8.35 139.7,8.45 L142.8,13.25 Z"/><polyline id="Fill-9" fill="#0F0F0F" points="163.9 13.25 161.3 13.25 155.6 6.75 152 9.45 152 13.25 150 13.25 150 .75 152 .75 152 7.25 160.4 .75 163.2 .75 157.1 5.55 163.9 13.25"/><path id="Fill-10" fill="#F6EB3B" d="M176.1,0.85 C176,0.85 176.1,0.95 176.1,0.85"/><path id="Fill-11" fill="#F6EB3B" d="M181.9,0.85 C181.8,0.85 181.9,0.95 181.9,0.85"/><path id="Fill-12" fill="#F6EB3B" d="M182,0.85 C181.9,0.85 182,0.95 182,0.85"/><path id="Fill-13" fill="#F6EB3B" d="M182,0.85 C182,0.85 182.1,0.95 182,0.85"/><path id="Fill-14" fill="#F6EB3B" d="M175.8,1.15 C175.9,0.75 175.9,1.55 175.8,1.15"/><path id="Fill-15" fill="#F6EB3B" d="M175.9,1.15 C175.9,1.05 175.9,1.15 175.9,1.15"/><path id="Fill-16" fill="#F6EB3B" d="M176,1.15 C176,1.15 176,1.25 176,1.15"/><path id="Fill-18" fill="#F6EB3B" d="M191.6,12.25 C191.7,12.05 191.5,12.05 191.5,12.15 C191.5,12.15 191.6,12.25 191.6,12.25 Z M191.2,11.55 C191,11.55 191,11.55 190.8,11.45 C190.8,11.75 191.2,11.55 191.2,11.55 Z M191.6,11.35 C191.6,11.35 191.6,11.25 191.5,11.25 C191.4,11.45 191.6,11.45 191.6,11.35 Z M190.7,11.15 C190.7,11.15 190.9,11.25 190.9,11.05 C190.8,10.95 190.7,11.05 190.7,11.15 Z M190.6,11.05 C190.5,11.05 190.6,10.85 190.5,10.95 C190.5,11.05 190.6,11.25 190.6,11.05 Z M191.6,10.25 C191.7,10.05 191.5,10.05 191.5,10.15 C191.5,10.25 191.5,10.35 191.6,10.25 Z M194.3,9.95 C194.3,9.95 194.3,10.05 194.3,9.95 C194.4,10.05 194.4,9.95 194.5,9.95 C194.8,9.95 194.4,9.75 194.3,9.95 C194.3,9.95 194.3,9.95 194.3,9.95 C194.2,9.85 194.2,9.95 194.2,10.05 C194.3,10.05 194.3,9.95 194.3,9.95 Z M191.6,10.25 C191.8,10.35 192.5,10.35 192.8,10.05 C192.3,10.05 192,9.85 191.6,10.25 Z M192.6,9.55 C192.6,9.55 192.6,9.55 192.6,9.55 C192.7,9.35 192.5,9.35 192.6,9.55 C192.6,9.45 192.6,9.45 192.6,9.55 Z M191.3,9.55 C191.4,9.55 191.4,9.75 191.5,9.55 C191.5,9.55 191.5,9.45 191.5,9.45 C191.5,9.45 191.6,9.45 191.6,9.35 C191.4,9.35 191.3,9.25 191.3,9.55 Z M190.1,9.45 C190.1,9.55 190.1,9.55 190.1,9.45 C190.2,9.45 190.1,9.35 190.1,9.45 Z M193,9.15 C193,9.45 193.1,9.25 193.2,9.25 C193.3,8.95 193.1,9.05 193,9.15 Z M193.7,9.05 C193.7,9.15 193.7,9.15 193.8,9.15 C193.8,9.15 193.9,8.85 193.8,8.85 C193.8,9.05 193.8,9.05 193.7,9.05 C193.7,8.95 193.6,8.95 193.6,8.95 C193.6,9.15 193.7,9.05 193.7,9.05 Z M193.4,9.05 C193.4,9.05 193.4,9.15 193.4,9.05 C193.4,9.05 193.5,9.05 193.4,9.05 C193.5,9.15 193.5,9.15 193.5,9.15 C193.5,9.15 193.6,9.15 193.6,9.15 C193.6,9.05 193.6,9.05 193.6,8.95 C193.5,9.05 193.4,8.85 193.4,9.05 Z M190.9,9.25 C190.9,9.35 191,9.35 191.1,9.35 C191.1,9.25 191.1,9.15 191.1,9.15 C191.1,9.35 190.9,9.05 190.9,9.25 Z M191.3,9.05 C191.3,9.15 191.3,9.15 191.3,9.05 C191.4,8.95 191.4,9.15 191.5,9.15 C191.5,8.85 191.4,9.05 191.3,8.95 C191.3,8.95 191.3,9.05 191.3,9.05 Z M190.4,9.05 C190.3,9.05 190.2,9.05 190.2,9.25 C190.3,9.15 190.4,9.35 190.4,9.05 C190.4,9.05 190.4,8.95 190.4,9.05 Z M193.6,8.65 C193.5,8.65 193.4,8.65 193.4,8.85 C193.5,8.85 193.7,9.05 193.7,8.75 C193.5,8.85 193.8,8.45 193.6,8.55 C193.6,8.55 193.6,8.65 193.6,8.65 Z M194.1,8.45 C194.2,8.45 194.3,8.45 194.3,8.25 C194.2,8.35 194.1,8.35 194.1,8.45 Z M193.4,8.25 C193.4,8.15 193.5,8.15 193.5,8.05 C193.4,7.95 193.3,8.15 193.4,8.25 Z M194.9,6.65 C194.9,6.65 194.7,6.55 194.7,6.75 C194.8,6.75 194.9,6.85 194.9,6.65 Z M196,6.45 C196.2,6.35 196.4,6.75 196.5,6.35 C196.3,6.55 196.1,6.25 196,6.45 Z M194.6,6.25 C194.7,6.35 194.7,6.25 194.6,6.25 C194.6,6.25 194.6,6.15 194.6,6.15 C194.5,6.15 194.9,6.15 194.9,6.35 C195,6.45 194.5,6.25 194.6,6.25 Z M196.1,6.15 C196.1,5.95 196.1,5.85 196,5.95 C196,6.15 196.1,6.05 196.1,6.15 Z M194.8,6.35 C194.8,6.05 195,6.35 195,5.95 C194.9,6.05 194.9,6.05 194.8,5.95 C194.8,6.15 194.7,6.25 194.8,6.35 Z M172.3,6.85 C172.4,6.75 172.4,6.95 172.5,6.95 C172.5,6.65 172.4,6.65 172.3,6.65 C172.4,6.55 172.3,6.35 172.2,6.25 C172.2,6.45 172.2,6.65 172.3,6.85 Z M194.3,5.25 C194.5,5.55 194.6,5.15 195,5.35 C195,5.15 195,5.05 195.1,5.15 C195.1,5.25 195,5.35 195.1,5.35 C195.3,5.05 195.8,5.35 196.1,5.05 C195.3,4.85 195.1,5.05 194.3,5.25 Z M193.3,4.65 C193.3,4.65 193.1,4.55 193.1,4.75 C193.2,4.75 193.4,4.85 193.3,4.65 Z M191,4.95 C191.1,4.95 191.1,4.75 191.1,4.65 C191,4.65 191,4.65 191,4.75 C191.1,4.75 191.1,4.85 191,4.95 Z M193.5,4.35 C193.4,4.45 193.5,4.45 193.5,4.35 C193.5,4.35 193.5,4.35 193.5,4.35 C193.6,4.55 193.5,4.75 193.4,4.45 C193.4,4.55 193.4,4.65 193.4,4.75 C193.5,4.85 193.5,4.55 193.5,4.75 C193.5,4.75 193.5,4.75 193.5,4.85 C193.6,4.75 193.7,4.65 193.7,4.45 C193.5,4.65 193.6,4.25 193.7,4.15 C193.6,4.25 193.4,4.15 193.5,4.35 Z M196,4.05 C196,3.75 196.2,4.05 196.1,3.75 C196.1,3.75 196,3.75 196,3.75 C196,3.75 195.9,4.05 196,4.05 Z M195.9,4.05 C195.9,4.15 195.9,3.95 195.9,4.05 C195.9,3.95 195.9,3.95 195.9,4.05 C195.9,3.85 195.9,3.85 195.9,4.05 C195.9,3.95 195.9,3.85 195.8,3.85 C195.8,3.85 195.8,4.05 195.9,4.05 Z M196.5,3.65 C196.6,3.65 196.6,3.65 196.5,3.65 C196.7,3.45 196.5,3.45 196.5,3.65 C196.5,3.55 196.5,3.55 196.5,3.65 Z M192.6,3.85 C192.6,3.75 192.5,3.75 192.6,3.85 C192.5,3.85 192.6,3.95 192.6,3.85 Z M195.7,3.45 C195.7,3.65 196.7,3.55 196.6,3.55 C196.6,3.75 195.8,3.65 195.9,3.65 C195.8,3.65 195.7,3.55 195.8,3.35 C195.7,3.35 196.7,3.35 196.7,3.35 C196.7,3.45 195.6,3.45 195.7,3.45 Z M196.6,3.35 C196.6,3.35 196.6,3.45 196.6,3.45 C196.6,3.55 196.7,3.25 196.6,3.35 C196.6,3.25 196.6,3.35 196.6,3.35 Z M192.3,3.45 C192.3,3.45 192.3,3.55 192.3,3.45 C192.3,3.35 192.3,3.35 192.3,3.45 Z M194.7,3.15 C194.7,3.05 194.7,3.05 194.7,3.15 C194.8,3.05 194.8,3.05 194.8,3.05 C194.8,3.05 194.8,3.05 194.7,3.05 C194.7,3.05 194.7,3.05 194.7,3.15 Z M193.2,3.15 C193.2,3.15 193.2,3.15 193.2,3.15 C193.3,3.05 193.3,3.05 193.3,3.05 C193.3,3.05 193.3,3.05 193.2,3.05 C193.2,3.05 193.2,3.15 193.2,3.15 Z M193,3.25 C193.1,3.25 193.1,3.25 193.1,3.05 C193,3.05 193,3.05 193,3.25 Z M192.7,3.25 C192.8,3.25 192.8,3.25 192.7,3.25 C192.8,3.15 192.8,3.15 192.8,3.15 C192.8,3.15 192.8,3.15 192.7,3.15 C192.7,3.15 192.7,3.15 192.7,3.25 Z M193.4,3.05 C193.5,3.05 193.6,3.05 193.6,2.85 C193.5,2.85 193.4,2.85 193.4,3.05 Z M185.5,2.85 C185.4,2.85 185.3,2.75 185.3,2.95 C185.4,2.85 185.5,2.95 185.5,2.85 Z M184.5,2.95 C184.5,3.15 184.7,2.85 184.5,2.95 C184.5,2.85 184.4,2.95 184.5,2.95 Z M172,3.35 C172.1,3.35 172.1,3.35 172.1,3.25 C172.1,3.15 172.1,3.05 172,3.05 C172.1,3.25 172,3.15 172,3.35 Z M185,2.95 C185,2.95 185.2,3.05 185.2,2.85 C185.1,2.75 185,2.75 185,2.95 Z M191.2,2.35 C191.2,2.35 191.1,2.35 191.1,2.45 C191.1,2.55 191.2,2.55 191.2,2.35 Z M191,2.55 C191,2.55 191,2.55 191,2.55 C191.1,2.45 191.1,2.45 191.1,2.45 C191.1,2.45 191.1,2.45 191,2.45 C191,2.45 191,2.45 191,2.55 Z M184.7,2.85 C184.6,2.85 184.6,2.85 184.6,2.75 C184.6,2.95 184.8,2.95 184.7,2.85 Z M171.9,3.05 C172,3.05 172,2.95 172,2.95 C172,2.85 171.9,2.85 171.9,3.05 Z M191.7,2.25 C191.7,2.25 191.6,2.25 191.6,2.35 C191.7,2.35 191.7,2.35 191.7,2.25 Z M191.3,2.35 C191.3,2.45 191.3,2.45 191.3,2.35 C191.6,2.45 191.5,2.15 191.3,2.35 Z M186,2.55 C186,2.55 185.9,2.55 185.9,2.65 C186,2.65 186,2.65 186,2.55 Z M193.2,2.15 C193.1,2.25 193.2,2.25 193.2,2.15 C193.3,2.35 193.3,1.95 193.2,2.15 Z M191.8,2.35 C191.9,2.15 192.1,2.55 192.2,2.15 C192.1,2.15 191.8,2.05 191.8,2.35 Z M192.6,2.05 C192.5,1.95 192.5,2.15 192.4,1.95 C192.4,2.25 192.6,2.25 192.6,2.05 Z M192.2,2.35 C192.2,2.25 192.3,2.25 192.3,2.35 C192.3,2.25 192.3,2.25 192.4,2.15 C192.3,2.15 192.3,2.15 192.3,2.25 C192.3,2.15 192.3,2.15 192.2,2.15 C192.1,2.15 192.1,2.25 192.2,2.35 Z M192.3,2.65 C192.2,2.65 192.1,2.35 192,2.75 C192.2,2.75 192.2,2.95 192.3,2.65 C192.3,2.65 192.3,2.55 192.4,2.55 C192.3,2.85 192.5,3.15 192.3,2.95 C192.4,3.45 192.7,3.15 192.9,3.05 C193,3.05 193,3.15 193.1,3.15 C193.1,2.95 193.1,2.75 193.3,2.75 C193.3,3.15 193.6,2.65 193.7,3.05 C193.8,2.35 194,2.95 194.3,2.95 C194.2,2.65 194.4,2.55 194.2,2.45 C194.1,2.65 193.7,2.45 193.6,2.35 C193.8,2.45 193.9,2.05 194,2.25 C194,2.05 194,1.65 193.9,1.95 C193.9,2.45 193,1.95 193,2.75 C192.9,2.55 192.6,2.95 192.7,2.45 C192.6,2.55 192.3,2.35 192.3,2.65 Z M195.3,1.55 C195.2,1.55 195.1,1.45 195.1,1.65 C195.2,1.55 195.3,1.75 195.3,1.55 Z M195,1.55 C195,1.55 194.9,1.55 194.9,1.65 C195,1.65 195,1.65 195,1.55 Z M194.2,1.85 C194.3,1.85 194.3,1.85 194.3,1.65 C194.3,1.65 194.3,1.65 194.3,1.55 C194.3,1.55 194.3,1.55 194.2,1.55 C194.2,1.75 194.2,1.75 194.2,1.85 Z M194.3,1.65 C194.4,1.95 194.6,1.85 194.6,1.65 C194.5,1.45 194.5,1.55 194.3,1.65 Z M194.1,1.65 C194,1.65 194,1.75 194.1,1.65 C194.1,1.85 194.2,2.15 194.2,1.95 C194.1,1.95 194.1,1.65 194.1,1.65 C194.1,1.65 194.1,1.65 194.1,1.65 C194.1,1.55 194.1,1.55 194.1,1.65 Z M193.4,1.85 C193.2,1.95 192.9,1.95 192.7,2.15 C192.9,2.05 193.3,2.05 193.4,1.95 C193.4,1.95 193.4,1.85 193.4,1.85 C193.6,2.05 193.8,1.85 194,1.75 C194,1.75 193.9,1.75 193.9,1.65 C194,1.65 194.1,1.65 194.1,1.45 C193.8,1.55 193.3,1.55 193.4,1.85 Z M192.6,1.55 C192.6,1.95 192.7,1.15 192.6,1.55 C192.6,1.55 192.5,1.55 192.6,1.55 Z M188.1,2.15 C188.1,2.15 188.2,2.15 188.2,2.15 C188.2,1.95 188.2,1.95 188.1,1.95 C188.1,2.05 188.1,2.05 188.1,2.15 Z M186.1,2.05 C186.1,2.05 186,2.05 186,2.15 C186.1,2.15 186.1,2.15 186.1,2.05 Z M192.9,1.55 C193,1.55 193,1.65 193.1,1.45 C193.1,1.45 193.1,1.35 193,1.35 C193,1.45 192.8,1.45 192.9,1.55 Z M192.2,1.65 C192.3,1.65 192.4,1.55 192.3,1.35 C192.2,1.35 192.1,1.45 192.2,1.65 Z M190,1.75 C190,1.75 190.1,1.75 190.1,1.75 C190.1,1.65 190.1,1.35 190,1.45 C190,1.65 189.9,1.65 190,1.75 Z M188.4,2.15 C188.5,2.25 188.5,1.75 188.4,1.85 C188.4,1.95 188.4,2.05 188.4,2.15 Z M193.2,1.45 C193.3,1.45 193.3,1.35 193.3,1.35 C193.2,1.25 193.2,1.25 193.2,1.45 Z M192.1,1.35 C192.2,1.35 192.2,1.25 192.2,1.25 C192.1,1.15 192,1.15 192.1,1.35 Z M192.4,1.15 C192.4,1.25 192.5,1.25 192.4,1.15 C192.5,1.15 192.4,1.05 192.4,1.15 Z M192.3,1.15 C192.3,1.05 192.2,1.05 192.2,1.15 C192.2,1.35 192.3,1.35 192.3,1.15 Z M192,1.25 C192,1.25 192,1.25 192,1.25 C192.1,1.15 192.1,1.15 192.1,1.15 C192.1,1.15 192.1,1.15 192,1.15 C191.9,1.15 192,1.25 192,1.25 Z M191.7,1.25 C191.8,1.35 191.8,1.15 191.7,1.25 C191.7,1.05 191.7,1.25 191.7,1.25 Z M190.7,1.35 C190.8,1.35 190.9,1.45 190.8,1.25 C190.8,1.25 190.7,1.25 190.7,1.25 C190.7,1.25 190.7,1.25 190.7,1.35 Z M190.6,1.15 C190.6,1.25 190.5,1.05 190.4,1.15 C190.4,1.55 190.7,1.35 190.6,1.15 Z M190.2,1.35 C190.3,1.15 190.1,1.15 190.1,1.25 C190.2,1.25 190.2,1.35 190.2,1.35 Z M189.7,1.35 C189.8,1.15 189.5,1.15 189.5,1.25 C189.6,1.35 189.6,1.45 189.7,1.35 Z M189.7,1.35 C189.6,1.35 189.5,1.35 189.4,1.35 C189.4,1.75 189.7,1.75 189.7,1.35 Z M188.5,1.65 C188.5,1.65 188.5,1.75 188.5,1.65 C188.6,1.75 188.7,1.75 188.7,1.45 C188.6,1.55 188.6,1.35 188.5,1.65 Z M188.4,1.45 C188.2,1.45 188.1,1.45 187.9,1.45 C188,1.95 188.4,1.75 188.4,1.45 Z M187.8,1.45 C187.8,1.45 187.2,1.55 187.2,1.55 C187.2,1.65 187.8,1.55 187.8,1.45 Z M186.2,1.65 C186.1,1.55 186,1.55 185.9,1.55 C185.9,1.95 186.1,1.85 186.2,1.65 Z M185.6,1.85 C185.7,1.85 185.7,1.75 185.7,1.65 C185.7,1.65 185.6,1.65 185.6,1.85 Z M185,1.95 C185.3,2.05 185.3,2.05 185.6,1.75 C185.5,1.65 185,1.55 185,1.95 Z M184.1,1.85 C184.2,1.85 184.3,1.85 184.2,1.65 C184.2,1.65 184.1,1.65 184.1,1.65 C184.1,1.75 184.1,1.85 184.1,1.85 Z M193.4,1.05 C193.3,1.05 193.2,0.95 193.2,1.15 C193,1.05 192.6,0.95 192.5,1.35 C192.7,1.25 192.8,1.25 193,1.35 C193,1.55 193.1,1.55 193.1,1.45 C193,1.45 193,1.35 193,1.35 C193,1.15 193.1,1.45 193.1,1.25 C193.2,1.15 193.3,1.25 193.4,1.05 C193.4,0.95 193.4,0.95 193.4,1.05 Z M172.7,1.25 C172.8,1.25 172.9,1.35 172.8,1.15 C172.7,1.15 172.7,1.15 172.7,1.25 Z M190.5,12.65 C190.5,12.75 190.3,12.75 190.3,12.95 C190.2,12.75 190.1,12.65 190,12.85 C189.8,12.45 189.9,13.05 189.6,12.65 C189.5,12.65 189.6,12.75 189.6,12.85 C189.4,12.75 189,12.95 188.7,13.05 C188.6,13.05 188.3,12.85 188.4,13.25 C188.2,13.05 188.1,13.15 187.9,13.35 C187.8,12.95 187.5,13.55 187.4,13.15 C187.2,13.05 186.6,13.35 186.4,13.35 C186.2,13.35 186,12.95 185.8,13.35 C185.7,12.85 185.5,13.55 185.4,13.05 C185,13.75 184.5,12.85 183.9,13.45 C183.8,13.45 183.8,13.25 183.7,13.25 C183.5,13.65 172.2,13.05 171.9,13.15 C171.6,12.95 171.9,12.15 171.8,11.95 C171.8,11.85 171.8,11.35 171.7,11.05 C171.6,10.45 171.7,10.15 171.7,9.65 C171.5,9.45 171.6,8.85 171.6,8.55 C171.9,8.65 171.9,7.95 172,7.75 C172,7.75 172,7.45 172,7.25 C172,7.15 172.1,7.15 172.1,7.15 C172.2,7.25 172.2,6.45 172.1,6.45 C172.1,5.85 172,4.45 171.9,3.85 C172,3.85 172.1,3.65 171.9,3.75 C172,3.55 172.2,3.75 172.2,3.55 C172.1,3.35 172,3.35 171.9,3.35 C172,3.05 171.9,3.05 171.9,2.75 C172,2.75 172,2.65 172,2.65 C172,2.55 171.9,2.55 171.9,2.55 C171.9,2.45 171.9,2.25 172,2.35 C172,2.15 171.9,2.25 171.9,1.95 C171.9,1.95 172,1.85 172,1.85 C172.1,1.15 172.5,0.85 172.8,1.05 C172.9,1.05 178.5,0.65 178.6,0.75 C178.5,1.05 178.7,0.75 178.7,0.75 C178.7,0.95 178.8,1.05 178.9,1.05 C178.9,1.35 179,1.25 179.1,1.35 C179.2,1.05 183.5,1.25 183.6,0.95 C183.7,0.85 183.9,1.05 183.8,1.25 C183.8,1.25 183.9,1.25 183.9,1.35 C184.2,1.05 184.6,1.55 184.9,1.25 C184.9,1.05 184.8,1.15 184.8,0.95 C184.9,0.85 184.8,0.95 184.9,0.95 C184.9,1.05 184.9,1.15 184.9,1.25 C185.2,1.65 185.8,1.15 186,1.45 C186,1.35 186.1,1.35 186.1,1.15 C186.1,1.15 186.1,1.15 186.1,1.15 C186.5,1.25 187.6,1.45 187.8,1.15 C188,1.25 188,1.35 188.2,1.05 C188.3,1.25 188.5,0.95 188.5,1.25 C188.6,0.95 188.7,1.05 188.8,0.75 C188.9,0.75 188.9,1.05 189,1.15 C189.1,1.05 189.2,1.25 189.2,1.15 C189.3,1.25 189.2,1.35 189.1,1.35 C189.2,1.55 189.3,1.45 189.4,1.35 C189.4,1.25 189.3,1.25 189.3,1.25 C189.4,0.95 189.8,0.95 190,0.95 C190.3,0.95 190.5,1.15 190.7,0.95 C190.7,0.95 190.7,0.85 190.7,0.75 C190.8,0.85 190.8,1.05 190.9,1.05 C192.1,0.55 192.8,1.35 193.6,0.55 C193.7,0.55 193.8,0.55 193.8,0.55 C193.8,0.65 193.8,0.65 193.8,0.65 C193.7,0.85 193.5,0.85 193.3,1.15 C193.4,1.65 193.6,0.75 193.7,1.15 C193.6,1.15 193.6,1.25 193.6,1.25 C193.7,1.25 193.7,1.25 193.7,1.15 C193.7,1.15 193.8,1.15 193.7,1.05 C193.7,0.85 193.8,1.15 193.8,1.25 C194,1.15 194.2,1.45 194.3,1.05 C194.4,1.05 194.3,1.25 194.4,1.25 C194.5,1.15 194.3,0.95 194.4,0.95 C194.5,1.05 194.6,1.05 194.6,1.25 C194.6,1.25 194.7,1.25 194.7,1.15 C194.8,1.15 194.8,1.15 194.8,1.05 C194.8,1.15 194.9,1.15 194.9,1.15 C194.9,1.05 194.9,1.05 194.9,0.95 C194.9,0.95 194.9,0.95 194.9,0.95 C194.9,1.05 194.4,1.15 194.4,1.25 C194.5,1.25 195,0.85 194.9,0.95 C194.9,0.75 194.5,0.85 194.6,0.85 C194.6,1.15 194.5,0.75 194.5,1.05 C194.7,1.15 194.8,1.15 194.9,0.95 C194.9,0.95 195,0.85 195,0.85 C195,1.05 194.9,1.05 194.9,1.25 C195.3,0.95 196.5,1.45 197,1.15 C197,1.25 197,1.35 197,1.35 C197.1,0.95 197.3,0.95 197.5,1.35 C197.3,1.55 197,1.15 197,1.75 C196.9,1.75 197,1.65 197,1.45 C196.8,1.45 196.7,1.55 196.6,1.45 C196.5,1.65 195.2,1.65 195.2,1.65 C195.1,1.65 195.1,1.75 195.2,1.85 C195.1,1.85 195.1,1.65 195,1.75 C195,1.65 195,1.75 195,1.75 C195,1.75 194.9,1.75 194.9,1.85 C194.9,1.85 194.8,1.85 194.8,1.75 C194.9,1.65 194.8,1.45 194.7,1.55 C194.7,1.65 194.8,1.55 194.8,1.75 C194.7,1.75 194.8,1.85 194.7,1.95 C194.6,1.95 194.7,1.65 194.6,1.75 C194.6,1.85 194.5,1.95 194.5,2.15 C194.5,2.15 194.5,2.05 194.5,2.05 C194.5,2.05 194.5,1.95 194.5,2.05 C194.4,2.05 194.9,1.85 194.8,1.95 C194.7,1.75 194.6,2.25 194.4,2.15 C194.4,1.95 194.5,1.95 194.6,1.95 C194.6,1.55 194.3,2.05 194.2,1.85 C194.2,2.15 194.4,2.05 194.2,2.25 C194.3,2.45 194.4,2.25 194.5,2.35 C194.5,2.45 194.5,2.45 194.5,2.55 C194.4,2.55 194.4,2.55 194.3,2.55 C194.2,2.85 194.4,2.55 194.4,2.75 C194.5,2.75 194.5,2.65 194.4,2.55 C194.5,2.45 194.5,2.85 194.6,2.55 C194.6,2.65 194.6,2.65 194.6,2.75 C194.7,2.75 194.7,2.75 194.8,2.75 C194.8,2.65 194.7,2.75 194.7,2.65 C194.8,2.65 194.5,2.35 194.5,2.75 C194.5,2.75 194.5,2.75 194.5,2.75 C194.5,2.65 194.4,2.75 194.4,2.85 C194.2,2.85 194.8,2.95 194.8,3.05 C194.8,3.05 194.8,3.05 194.7,3.05 C194.7,2.95 194.7,3.05 194.7,3.05 C194.7,3.15 194.4,3.15 194.4,3.05 C194.4,3.05 194.5,3.15 194.5,3.15 C194.5,3.15 194.5,3.25 194.5,3.25 C194.6,3.25 194.6,3.05 194.7,3.15 C194.7,3.45 194.5,3.25 194.5,3.55 C194.4,3.45 194.9,3.55 194.8,3.45 C194.8,3.35 194.4,3.45 194.5,3.25 C194.5,3.35 194.5,3.25 194.5,3.25 C194.5,3.25 194.5,3.15 194.5,3.15 C194.4,3.25 194.9,3.35 194.8,3.35 C194.9,3.05 194.5,3.45 194.4,3.25 C194.5,3.45 194.5,3.45 194.3,3.45 C194.3,3.35 194.3,3.25 194.3,3.25 C194.4,3.25 194.4,3.05 194.5,3.15 C194.5,2.95 194.4,3.05 194.4,2.85 C194.3,2.85 194.4,3.15 194.4,3.25 C194.3,3.25 194.4,2.95 194.3,3.05 C194.3,3.15 194.3,3.15 194.3,3.45 C194.2,3.45 194.2,3.45 194.1,3.45 C194.2,3.25 194,3.35 194,3.15 C194,3.15 194,3.05 194,3.05 C194,2.95 194.1,3.05 194.1,2.95 C194.1,2.95 194.1,3.05 194.1,3.15 C194,3.15 194.1,3.25 194.1,3.15 C194.1,3.05 194.2,2.95 194.2,2.95 C194,2.55 193.7,3.35 193.9,3.25 C193.9,3.35 193.9,3.35 193.9,3.35 C193.8,3.45 193.8,3.45 193.7,3.55 C193.8,3.45 193.8,3.35 193.7,3.15 C193.9,3.15 193.6,2.95 193.8,3.05 C193.6,2.85 193.5,3.55 193.3,3.55 C193.1,3.55 193.2,3.65 193,3.65 C193,3.75 193.1,3.85 193.1,3.75 L193.1,3.75 C193.1,3.85 192.9,3.85 192.9,3.65 C192.9,3.75 192.8,3.75 192.8,3.95 C192.8,3.95 192.7,3.85 192.7,3.85 C192.7,3.85 192.7,3.85 192.7,3.75 C192.7,3.75 192.7,3.85 192.7,3.85 C192.7,4.05 192.6,3.75 192.6,3.85 C192.6,4.25 192.7,3.85 192.7,4.15 C192.7,4.15 192.7,4.15 192.7,4.25 C192.7,4.25 192.7,4.25 192.7,4.15 C192.8,4.05 193,4.25 192.9,3.95 C192.9,3.95 192.9,3.95 193,3.95 C193.1,4.15 193.1,4.05 193,4.35 C193.1,4.15 193.3,4.15 193.3,3.95 C193.4,3.95 193.3,4.15 193.4,4.05 C193.4,4.05 193.4,4.05 193.4,4.15 C193.4,4.15 193.4,4.05 193.4,4.05 C193.4,3.85 193.5,3.85 193.4,3.65 C193.2,3.85 193.2,4.05 192.9,3.95 C192.9,3.85 193,3.75 193.1,3.75 C193.1,3.65 193.1,3.65 193,3.65 C193,3.55 193.1,3.55 193.1,3.45 C193.2,3.65 193.2,3.45 193.3,3.45 C193.4,3.45 193.6,3.75 193.5,3.55 C193.6,3.55 193.5,3.85 193.5,3.95 C193.5,3.95 193.4,3.95 193.4,3.85 C193.4,4.35 193.6,3.75 193.5,4.25 C193.6,4.05 193.7,4.05 193.7,3.85 C193.8,3.85 193.8,4.15 193.8,4.25 C193.9,4.25 193.9,3.95 193.9,3.75 C194,3.75 194,3.75 194,3.95 C194,3.95 194,4.05 194,3.95 C194.1,4.05 194.1,3.65 194.2,3.75 C194.2,3.85 194.1,3.85 194.1,3.95 C194,3.95 194,3.95 193.9,4.05 C193.9,4.25 194.1,3.95 194,4.25 C194,4.25 194,4.35 193.9,4.35 C193.8,4.25 193.5,4.35 193.3,4.45 C193.3,4.55 193.5,4.45 193.6,4.55 C193.6,4.55 193.6,4.65 193.6,4.65 C193.4,4.55 193.4,4.75 193.2,4.85 C193.2,5.05 193.3,4.85 193.4,4.95 C193.4,5.15 193.3,5.15 193.2,5.05 C193.4,5.45 193.6,4.95 193.8,4.95 C193.8,5.05 193.8,5.05 193.8,5.15 C193.8,5.05 193.9,4.85 193.9,5.15 C194,5.05 194.2,5.05 194.4,4.95 C194.4,4.95 193.9,5.05 194,5.05 C194,4.95 194.4,4.85 194.4,4.95 C194.1,4.95 194.1,4.65 194.1,4.75 C194.1,4.75 194.1,4.75 194.1,4.85 C194.1,4.85 194.1,4.95 194.1,4.85 C194.1,4.85 194.1,4.85 194.1,4.75 C194.2,4.75 194.2,4.75 194.2,4.65 C194.4,4.85 194.7,4.75 194.9,4.65 C194.9,4.15 194.8,4.35 194.8,4.15 C194.7,4.15 194.7,4.35 194.6,4.35 C194.5,3.95 194.1,4.45 194,4.25 C194.1,4.15 194.2,4.15 194.1,3.85 C194.3,4.35 194.7,3.65 194.9,4.05 C195,4.05 194.9,3.85 195,3.75 C195.1,3.75 195,3.85 195,3.95 C195.1,4.05 195.2,3.95 195.4,3.85 C195.5,4.05 195.5,3.55 195.7,3.65 C195.7,3.75 195.8,3.75 195.8,3.75 C195.8,3.65 195.7,3.65 195.7,3.65 C195.7,3.45 195.9,3.25 196,3.45 C195.8,3.45 196,3.95 196,3.45 C196,3.45 196.1,3.35 196.1,3.35 C196.3,3.35 195.3,3.45 195.5,3.35 C195.5,3.45 195.5,3.45 195.5,3.55 C195.6,3.55 195.7,3.35 195.7,3.65 C195.7,3.65 195.6,3.65 195.6,3.75 C195.6,3.75 195.5,3.75 195.5,3.75 C195.5,3.85 195.7,3.95 195.6,3.75 C195.6,3.75 195.7,3.75 195.7,3.65 C195.7,3.65 195.8,3.65 195.8,3.65 C195.8,3.85 195.7,3.85 195.7,3.95 C195.7,4.05 195.9,4.05 195.9,3.95 C195.9,3.95 195.9,3.75 196,3.75 C196,3.75 196.1,3.75 196.1,3.75 C196.1,3.85 196.1,3.85 196.2,3.85 C196.2,3.75 196.2,3.75 196.1,3.75 C196.1,3.45 196.2,3.75 196.3,3.55 C196.3,3.65 196.3,3.85 196.3,3.95 C196.4,3.85 196.3,3.55 196.5,3.65 C196.5,3.75 196.5,3.75 196.5,3.85 C196.5,3.85 196.4,3.85 196.4,3.85 C196.4,3.95 196.5,3.95 196.5,3.85 C196.6,3.75 196.7,3.95 196.8,3.85 C196.8,3.95 196.8,3.95 196.9,3.95 C196.9,3.85 196.9,3.85 196.8,3.85 C196.7,3.65 196.6,3.85 196.6,3.75 C196.6,3.45 196.8,3.65 196.9,3.75 C197,3.75 196.9,3.65 196.9,3.45 C197,3.55 197.4,3.75 197.4,3.45 C197.4,3.45 197.4,3.35 197.4,3.35 C197.4,3.35 197.4,3.45 197.4,3.55 C197.4,3.55 197.4,3.35 197.4,3.25 C197.3,3.25 197.3,3.25 197.3,3.45 C197.2,3.45 197.2,3.25 197.2,3.15 C197.2,3.15 197.2,3.15 197.2,3.05 C197.3,3.05 197.3,3.25 197.4,3.15 C197.4,3.15 197.4,3.25 197.4,3.25 C197.4,3.25 197.4,3.15 197.4,3.15 C197.4,3.05 197.5,3.05 197.5,3.05 C197.5,3.25 197.4,3.25 197.4,3.35 C197.4,3.35 197.4,3.35 197.3,3.35 C197.3,3.45 197.3,3.55 197.3,3.65 C197.2,3.85 196.9,3.75 196.7,3.85 C196.7,3.85 196.7,3.85 196.7,3.85 C196.7,3.95 196.7,3.85 196.7,3.85 C197,3.85 197.4,4.05 197.6,3.85 C197.8,3.85 197.9,3.95 198,3.85 C198.1,4.05 197.9,4.05 197.8,4.05 C197.3,4.15 196.4,3.85 196.1,4.15 C196,4.05 196,3.95 195.9,3.85 C196,4.15 195.8,4.05 195.8,4.25 C195.8,4.25 195.8,4.25 195.8,4.25 C195.8,4.25 195.8,4.15 195.8,4.15 C195.8,4.15 195.8,4.25 195.8,4.25 C195.8,4.35 195.8,4.25 195.8,4.25 C195.8,4.25 195.9,4.25 195.9,4.25 C195.9,4.35 195.9,4.35 195.8,4.35 C195.8,4.45 195.9,4.35 195.9,4.55 C195.8,4.45 195.7,4.65 195.7,4.35 C195.5,4.35 195.5,4.45 195.4,4.55 C195.3,4.45 195.4,4.45 195.4,4.35 C195.4,4.15 195.2,4.35 195.3,4.15 C195.2,4.05 195.2,4.25 195.2,4.35 C195.2,4.25 196.1,4.25 196,4.25 C196,4.25 196,4.35 196,4.35 C195.9,4.35 195.8,4.55 195.8,4.25 C195.6,4.25 195.5,4.45 195.4,4.65 C195.4,4.45 195.4,4.35 195.3,4.45 C195.3,4.35 195,4.35 195.2,4.25 C195.1,4.05 195,4.35 194.9,4.25 C194.9,4.45 195,4.45 195.1,4.35 C195,4.45 195.1,4.55 195.1,4.65 C195.1,4.65 195,4.65 195,4.65 C195,4.25 194.9,4.95 195,4.65 C195,4.75 195.2,4.75 195.1,4.65 C195.1,4.65 195.1,4.65 195.1,4.65 C195.1,4.75 195.1,4.65 195.1,4.65 C195.1,4.75 195.2,4.75 195.3,4.65 C195.3,4.85 195.5,4.45 195.5,4.75 C195.6,4.65 195.6,4.65 195.8,4.55 C195.8,4.45 195.8,4.45 195.7,4.45 C195.8,4.25 194.9,4.55 195,4.65 C195.1,4.65 195.1,4.45 195.2,4.45 C195.1,4.75 195.3,4.65 195.3,4.55 C195.3,4.55 195.4,4.65 195.4,4.75 C195.6,4.65 195.7,4.75 195.7,4.55 C195.8,4.75 196.3,4.75 196.4,4.35 C196.5,4.45 196.4,4.45 196.4,4.65 C196.5,4.55 196.6,4.75 196.7,4.45 C196.8,4.65 196.9,4.45 197,4.55 C197.1,4.55 197.1,4.05 197.2,4.25 C197.2,4.35 197,4.45 197.2,4.45 C197.5,4.65 198.7,4.65 199,4.55 C199.4,4.75 198.7,4.55 199.3,4.85 C198.3,4.95 198.9,4.95 197.9,4.85 C197.8,4.85 197.9,5.15 197.8,5.05 C197.8,4.95 197.8,4.95 197.8,4.85 C197.7,4.95 197.6,4.75 197.5,4.95 C197.6,5.05 197.6,5.15 197.4,5.05 C197.4,5.15 197.5,5.05 197.5,5.25 C197.4,5.15 197.4,5.35 197.3,5.35 C197.4,5.05 197.2,4.95 197.1,5.05 C197.1,4.95 197.1,4.95 197.2,4.95 C196.9,4.85 196.2,4.65 195.9,5.05 C196,5.15 196.1,5.25 196.3,5.25 C195.8,5.25 196.2,5.65 195.8,5.35 C195.7,5.45 195.6,5.45 195.5,5.35 C194.9,5.85 194.6,5.35 193.8,5.85 C194.2,6.05 194.3,5.75 194.6,5.75 C194.7,5.65 195,5.85 195.1,5.65 C195.1,5.65 195.1,5.75 195.1,5.85 C195.5,5.45 195.1,5.75 195.4,5.45 C195.4,5.45 195.5,5.55 195.5,5.65 C195.6,5.45 196.2,5.75 196.2,5.35 C196.2,5.45 196.2,5.45 196.2,5.55 C196.5,5.55 196.8,5.45 197.1,5.45 C197.2,5.45 197.3,5.65 197.4,5.65 C197.6,5.65 197.9,5.35 198,5.65 C198.5,5.45 198,5.45 198.5,5.65 C198.5,5.95 198.3,5.55 198.4,5.85 C198.4,5.85 198.4,5.75 198.4,5.75 C197.9,5.95 198.6,5.75 198,5.75 C197.7,5.75 197.4,5.95 197.1,5.95 C197,5.95 196.7,5.75 196.8,5.95 C196.7,5.85 196.3,6.05 196.2,5.85 C196,6.05 195.4,6.05 195.1,5.95 C194.9,6.15 195.7,6.05 195.5,6.15 C195.6,6.45 194.8,6.35 195,6.35 C195.1,6.35 195.3,6.25 195.4,6.15 C195.9,6.35 196.5,6.15 197,6.25 C197,6.45 197.2,6.45 197.1,6.25 C197.2,6.45 197.3,6.15 197.4,6.35 C197.4,6.35 197.4,6.35 197.3,6.35 C197.3,6.45 197.4,6.45 197.4,6.35 C197.5,6.05 197.5,6.45 197.6,6.25 C197.6,6.35 197.6,6.35 197.6,6.45 C197.8,6.35 198.2,6.35 198.2,6.45 C198.4,6.25 198.6,6.25 198.8,6.35 C198.7,6.35 198.4,6.65 198.3,6.55 C198.4,6.95 198.8,6.45 198.9,6.75 C199,6.65 199.1,6.55 199.2,6.65 C199.2,6.55 199.1,6.45 199.1,6.55 C199.1,6.45 199.1,6.45 199.1,6.45 C199.1,6.35 199.2,6.35 199.2,6.35 C199.2,6.45 199.2,6.45 199.1,6.45 C199.2,6.65 199.4,6.55 199.5,6.25 C199.9,6.55 198.7,6.35 199.1,6.35 C199.1,6.85 198.6,6.55 198.4,6.55 C198.5,6.55 198.4,6.45 198.4,6.55 C198.2,6.65 199.4,6.55 199.2,6.65 C199.3,6.95 198,6.55 198.1,6.85 C198.1,6.85 198.1,6.95 198.1,6.95 C197.8,6.85 199.1,7.15 198.7,6.95 C197.3,7.25 196.5,6.95 195.2,7.35 C195.4,7.65 194.8,7.25 195.1,7.35 C194.9,7.65 195.4,7.45 195,7.55 C195,7.35 195.1,7.45 195.2,7.35 C195.2,7.15 195.1,7.35 195,7.25 C194.9,7.75 194.5,7.35 194.4,7.55 C194.4,7.75 194.6,7.55 194.5,7.75 C194.4,7.85 194.1,7.65 194,7.95 C194,7.95 194,7.95 194,7.85 C194,7.85 194,7.75 194,7.75 C194,7.55 194.1,7.75 194.2,7.65 C194.2,7.65 194.2,7.55 194.2,7.55 C194.2,7.55 194.3,7.55 194.3,7.45 C194.3,7.45 194.3,7.45 194.4,7.45 C194.4,7.55 194.4,7.45 194.4,7.45 C194.7,7.35 194.4,6.95 194.3,7.45 C194.3,7.45 194.2,7.45 194.2,7.55 C194,7.65 193.9,7.55 193.9,7.75 C193.9,7.75 193.8,7.75 193.8,7.85 C193.7,7.75 194,7.85 194,7.65 C194.1,7.65 193.8,7.75 193.9,7.45 C193.9,7.45 194.1,7.55 193.9,7.45 C193.9,7.45 193.9,7.75 193.8,7.55 C193.8,7.55 193.8,7.45 193.8,7.55 C193.7,7.65 193.8,7.75 193.8,7.95 C193.7,7.95 193.6,7.65 193.6,7.85 C193.6,7.85 193.5,7.85 193.5,7.85 C193.5,8.05 193.5,8.15 193.6,8.05 C193.5,8.15 193.3,8.05 193.2,7.95 C193.2,8.25 192.9,8.15 192.8,8.15 C192.7,8.35 192.2,8.55 192,8.45 C192,8.15 192.4,8.25 192.3,8.15 C192.2,8.35 191.8,8.45 191.6,8.45 C191.6,8.35 192.1,8.25 192.1,8.25 C192,8.25 191.5,8.35 191.5,8.55 C191.5,8.55 191.9,8.45 191.9,8.45 C191.8,8.65 191.1,8.55 191,8.55 C191,8.55 191,8.75 190.9,8.75 C191,8.95 191.1,8.55 191.1,8.85 C191,8.95 191,8.85 190.9,9.05 C190.9,9.15 191,9.15 191,9.15 C191,9.35 190.8,9.15 190.9,9.35 C190.8,9.35 190.8,9.15 190.9,9.05 C190.9,8.85 190.8,9.25 190.7,9.15 C190.7,8.95 190.8,9.05 190.8,8.95 C190.7,8.75 190.4,9.05 190.2,9.15 C190.3,9.25 190.4,9.25 190.4,9.05 C190.5,9.05 190.4,9.25 190.4,9.25 C190.5,9.25 190.5,9.15 190.5,9.05 C190.7,9.05 190.9,9.35 190.8,9.55 C190.9,9.65 190.9,9.45 190.9,9.45 C190.9,9.55 190.9,9.45 190.9,9.45 C191.1,9.35 191.3,8.85 191.6,9.05 C191.6,9.15 191.5,9.15 191.5,9.15 C191.5,9.25 191.5,9.25 191.6,9.25 C191.5,9.45 191.5,9.05 191.3,9.15 C191.2,9.45 191.2,9.25 191.1,9.45 C191.1,9.45 191.3,9.55 191.3,9.75 C191.4,9.55 191.2,9.55 191.3,9.35 C191.4,9.35 191.4,9.55 191.5,9.35 C191.6,9.45 191.4,9.55 191.5,9.75 C191.4,9.75 191.4,9.95 191.3,9.95 C191.4,10.15 191.5,9.95 191.5,9.75 C191.6,9.75 191.7,9.65 191.8,9.55 C191.7,9.45 191.6,9.35 191.7,8.95 C191.7,8.95 191.8,9.05 191.8,9.05 C191.8,9.05 191.8,9.05 191.8,9.15 C191.8,9.15 191.8,9.15 191.8,9.05 C192,9.15 192.1,8.85 192.2,8.85 C192.1,9.25 192,9.05 191.8,9.15 C191.8,9.25 191.8,9.25 191.8,9.35 C191.9,9.35 192,8.95 192,9.35 C192,9.35 191.9,9.45 191.9,9.45 C192,9.45 192.2,9.45 192.2,9.35 C192.2,9.25 192.1,9.25 192.1,8.95 C192.2,9.05 192.2,8.95 192.2,8.75 C192.3,8.75 192.3,8.85 192.4,8.85 C192.4,8.95 192.4,9.05 192.4,9.15 C192.5,9.15 192.5,9.05 192.6,9.05 C192.6,8.85 192.5,8.95 192.5,8.65 C192.4,8.75 192.4,8.85 192.3,8.75 C192.3,8.65 192.4,8.65 192.4,8.65 C192.4,8.45 192.2,8.85 192.2,8.55 C192.3,8.55 192.7,8.45 192.8,8.35 C193,8.45 192.8,8.15 193,8.35 C193.2,8.25 193.7,7.95 193.9,8.05 C193.9,8.15 193.8,8.05 193.8,8.15 C193.7,8.15 193.7,8.25 193.7,8.25 C193.7,8.45 193.9,8.35 193.8,8.15 C194,8.15 193.5,8.05 193.7,7.95 C193.7,8.05 193.7,8.15 193.8,8.05 C193.8,8.15 193.8,8.15 193.8,8.15 C194.1,7.95 194.4,7.85 194.8,7.85 C194.8,7.85 194.8,7.95 194.8,7.95 C194.8,7.95 194.8,8.05 194.8,7.95 C194.8,7.95 194.8,7.85 194.8,7.85 C194.9,7.65 194.8,8.15 194.9,8.15 C195,8.15 195,7.95 195,7.95 C195.1,8.15 195.4,8.05 195.5,7.95 C195.6,8.05 194.8,8.15 194.9,7.95 C195,7.95 194.9,8.15 195,8.05 C194.5,8.25 194.5,8.25 194.1,8.25 C194.1,8.35 194.1,8.45 194,8.55 C193.9,8.55 194,8.35 194,8.25 C193.9,8.15 193.8,8.45 193.8,8.25 C193.8,8.55 193.6,8.35 193.5,8.65 C193.5,8.65 193.4,8.65 193.4,8.75 C193.3,8.75 193.3,8.65 193.4,8.55 C193.2,8.55 193.1,8.55 193,8.65 C193,8.55 193,8.55 193.1,8.45 C193,8.25 193.3,8.65 193.2,8.35 C193.1,8.45 193.2,8.75 193.1,8.75 C193.1,8.65 193.1,8.45 193.2,8.45 C193.1,8.35 193,8.75 192.9,8.65 C192.9,8.75 193.1,8.65 193,8.85 C193.1,8.85 193.2,8.85 193.2,8.95 C193.2,9.15 193.1,8.95 193,9.05 C193,9.15 193.1,9.25 193.1,9.15 C193.1,9.25 193.2,9.25 193.2,9.15 C193.3,9.15 193.3,9.15 193.4,9.15 C193.4,9.15 193.4,9.25 193.4,9.25 C193.8,9.25 193.8,9.15 194.3,9.25 C194.3,9.35 194.4,9.35 194.4,9.45 C194.3,9.35 194,9.55 193.8,9.45 C193.8,9.65 193.8,9.65 193.8,9.85 C193.9,9.75 194,9.85 194,9.65 C194.1,9.65 194,9.85 194.1,9.75 C194.1,9.95 193.9,9.85 193.9,9.95 C193.9,9.95 193.9,9.85 193.8,9.85 C193.8,9.95 193.9,10.05 193.9,9.95 C194,10.25 194.1,9.95 194.2,10.05 C194.4,9.95 194.7,10.05 195.1,9.95 C195.1,10.05 195,10.05 195,10.05 C195,10.05 195,10.05 194.9,10.05 C194.9,10.15 195,10.15 195,10.05 C195,10.05 195.2,10.05 195.1,9.95 C195.3,9.95 194.6,9.95 194.9,9.85 C194.9,9.95 194.9,9.95 194.9,9.95 C195.2,9.85 195.2,9.85 195.4,9.95 C195.4,10.05 195.4,10.05 195.5,10.05 C195.5,9.95 195.5,9.95 195.4,9.95 C195.6,9.75 195.8,9.95 196,9.85 C196.1,9.85 196,10.05 196,10.15 C195.9,10.15 195.9,9.95 195.8,9.95 C195.8,10.05 195.8,10.15 195.9,10.05 C195.4,10.25 195,10.15 194.6,10.15 C194.6,10.15 194.6,10.15 194.6,10.05 C194.6,10.05 194.6,10.15 194.6,10.15 C194.1,10.25 194.5,10.35 194.1,10.25 C194.1,10.25 194.1,10.35 194.1,10.45 C194,10.35 193.9,10.25 193.8,10.35 C193.8,10.45 193.8,10.45 193.9,10.45 C193.3,10.65 193.2,10.35 192.6,10.65 C192.5,10.45 192.3,10.65 192.1,10.65 C191.8,10.65 191.5,10.55 191.2,10.75 C191.1,10.85 191.2,11.05 191.1,11.15 C190.9,10.75 190.5,11.05 190.1,11.15 C190.1,11.35 190.3,11.15 190.2,11.45 C190.4,11.25 190.4,11.85 190.6,11.55 C190.5,11.45 190.5,11.25 190.4,11.35 C190.5,11.25 190.7,11.25 190.9,11.25 C190.9,11.35 190.9,11.35 190.9,11.45 C191,11.55 190.9,11.15 191,11.25 C191,11.45 191.1,11.25 191.1,11.55 C191,11.55 191,11.55 190.9,11.65 C191.9,12.45 190.4,12.55 191.4,11.65 C191.5,11.65 191.5,11.65 191.6,11.65 C191.5,12.25 191.3,12.45 191.1,12.65 C190.8,12.85 190.5,12.65 190,12.55 C190.2,12.75 190.5,13.25 190.7,13.25 L190.5,12.65 Z"/><path id="Fill-20" fill="#F6EB3B" d="M197.9,1.15 C197.8,1.15 198,0.75 197.9,1.15"/><path id="Fill-21" fill="#F6EB3B" d="M189.4,1.55 C189.4,1.25 189.6,1.65 189.4,1.55"/><path id="Fill-22" fill="#F6EB3B" d="M198.2,1.45 C198.2,1.05 198.2,1.85 198.2,1.45"/><path id="Fill-23" fill="#F6EB3B" d="M197.8,1.55 C197.9,1.25 197.9,1.85 197.8,1.55"/><path id="Fill-24" fill="#F6EB3B" d="M198,1.55 C198,1.45 198.1,1.45 198.2,1.45 C198.1,1.55 198,1.55 198,1.55"/><path id="Fill-25" fill="#F6EB3B" d="M198.8,1.55 C198.8,1.55 198.8,1.65 198.8,1.55"/><path id="Fill-26" fill="#F6EB3B" d="M200.8,0.75 C200.7,0.75 200.8,0.65 200.8,0.75 C200.8,0.75 200.8,0.75 200.8,0.75"/><path id="Fill-27" fill="#F6EB3B" d="M197.5,1.25 C197.4,1.45 197.3,1.35 197.2,1.45 C197.2,1.25 197.4,1.25 197.5,1.25"/><path id="Fill-28" fill="#F6EB3B" d="M197.7,1.35 C197.6,1.25 197.7,1.35 197.7,1.35"/><path id="Fill-29" fill="#F6EB3B" d="M200,1.55 C200,1.45 200.1,1.55 200,1.55"/><path id="Fill-30" fill="#F6EB3B" d="M200.8,0.75 C200.8,0.75 200.8,0.85 200.8,0.75 C200.6,0.75 200.7,0.95 200.6,1.05 C200.5,0.75 200.2,0.95 200.2,1.25 C200.1,1.15 200.1,1.15 200,0.95 C199.9,0.95 200,1.15 200,1.15 C199.9,1.45 199.9,0.85 199.8,1.05 C199.8,0.85 199.6,1.15 199.6,0.85 C199.8,1.05 200.3,0.65 200.8,0.75"/><path id="Fill-31" fill="#F6EB3B" d="M200.8,0.75 C200.9,0.85 201.1,0.65 201.1,0.85 C201.1,1.15 200.8,1.15 200.7,1.05 C200.7,0.95 200.8,0.95 200.8,0.85 C200.8,0.85 200.9,0.85 200.8,0.75"/><path id="Fill-32" fill="#F6EB3B" d="M201,0.75 C201.2,0.65 201.1,0.85 201.3,0.85 C201.3,1.05 200.9,1.05 201,0.75"/><path id="Fill-33" fill="#F6EB3B" d="M201.6,0.95 C201.4,0.95 201.6,0.45 201.6,0.95"/><path id="Fill-34" fill="#F6EB3B" d="M199.8,1.55 C199.8,1.55 199.9,1.65 199.8,1.55"/><path id="Fill-35" fill="#F6EB3B" d="M199.9,1.65 C199.9,1.55 200,1.55 200,1.55 C200,1.55 199.9,1.55 199.9,1.65"/><path id="Fill-36" fill="#F6EB3B" d="M198.4,1.65 C198.4,1.55 198.5,1.55 198.4,1.65"/><path id="Fill-37" fill="#F6EB3B" d="M198.6,1.65 C198.6,1.55 198.7,1.55 198.7,1.55 C198.7,1.65 198.6,1.65 198.6,1.65"/><path id="Fill-38" fill="#F6EB3B" d="M198.8,1.75 C198.6,1.85 198.8,1.45 198.8,1.75"/><path id="Fill-39" fill="#F6EB3B" d="M201.3,0.95 C201.4,0.55 201.4,1.35 201.3,0.95"/><path id="Fill-40" fill="#F6EB3B" d="M201.4,0.95 C201.4,0.95 201.5,1.05 201.4,0.95"/><path id="Fill-41" fill="#F6EB3B" d="M201.6,0.85 C201.6,0.85 201.6,1.05 201.6,0.85"/><path id="Fill-42" fill="#F6EB3B" d="M197.2,1.45 C197.2,1.45 197.3,1.45 197.3,1.45 C197.3,1.55 197.3,1.55 197.3,1.65 C197.3,1.65 197.2,1.65 197.2,1.65 C197.2,1.55 197.2,1.55 197.2,1.45"/><path id="Fill-43" fill="#F6EB3B" d="M198.3,1.85 C198.2,1.85 198.2,2.05 198.1,2.05 C198.1,1.95 198.3,1.45 198.3,1.85"/><path id="Fill-44" fill="#F6EB3B" d="M198,1.75 C198,1.65 198.1,1.75 198,1.75"/><path id="Fill-45" fill="#F6EB3B" d="M198.6,1.65 C198.6,1.75 198.5,1.75 198.5,1.95 C198.4,1.85 198.3,2.05 198.1,1.95 C198.1,1.55 198.3,1.75 198.6,1.65"/><path id="Fill-46" fill="#F6EB3B" d="M198.8,1.85 C198.8,1.85 198.8,1.75 198.8,1.85 C198.8,1.75 198.8,1.85 198.8,1.85"/><path id="Fill-47" fill="#F6EB3B" d="M199.5,1.75 C199.5,1.65 199.5,1.75 199.5,1.75"/><path id="Fill-48" fill="#F6EB3B" d="M199.5,1.75 C199.7,1.35 199.6,2.05 199.5,1.75"/><path id="Fill-49" fill="#F6EB3B" d="M199.5,1.15 C199.5,1.05 199.6,1.05 199.6,1.05 C199.6,1.15 199.6,1.15 199.5,1.15"/><path id="Fill-50" fill="#F6EB3B" d="M199.6,1.15 C199.7,0.75 199.6,1.75 199.6,1.15"/><path id="Fill-51" fill="#F6EB3B" d="M199.8,1.05 C199.8,1.15 199.9,1.25 199.9,1.25 C199.9,1.45 199.8,1.35 199.7,1.35 C199.7,1.15 199.7,0.95 199.8,1.05"/><path id="Fill-52" fill="#F6EB3B" d="M198.6,1.75 C198.6,1.65 198.7,1.65 198.7,1.65 C198.7,1.75 198.7,1.75 198.6,1.75"/><path id="Fill-53" fill="#F6EB3B" d="M198.8,1.85 C198.8,2.05 198.6,1.75 198.8,1.85"/><path id="Fill-54" fill="#F6EB3B" d="M200,1.75 C199.9,1.75 199.9,1.65 200,1.75"/><path id="Fill-55" fill="#F6EB3B" d="M197.5,1.65 C197.5,1.65 197.5,1.75 197.5,1.65"/><path id="Fill-56" fill="#F6EB3B" d="M200,1.85 C199.9,1.85 200,1.95 200,1.85"/><path id="Fill-57" fill="#F6EB3B" d="M199.9,1.75 C200,1.75 200,1.85 199.9,1.75"/><path id="Fill-58" fill="#F6EB3B" d="M200,1.85 C200,1.75 200.1,1.85 200,1.85"/><path id="Fill-59" fill="#F6EB3B" d="M201.1,1.55 C201,1.45 200.9,1.55 200.7,1.45 C200.8,1.55 200.8,1.55 201,1.55 C200.5,1.55 200.2,1.65 199.7,1.55 C199.6,1.55 199.6,1.65 199.6,1.75 C199.3,1.45 199.9,1.75 199.5,1.65 C199.5,1.55 199.6,1.55 199.5,1.55 C200.1,1.35 199.7,1.45 200.8,1.25 C200.8,1.15 200.7,1.15 200.6,1.15 C200.8,1.05 201,1.05 201.2,1.15 C201.1,1.35 201.1,1.05 200.9,1.15 C201,1.45 201.2,1.25 201.4,1.25 C201.4,1.55 201.2,1.35 201.1,1.55 Z"/><path id="Fill-60" fill="#F6EB3B" d="M201.2,1.25 C201.2,1.05 201.5,1.05 201.4,1.35 C201.4,1.25 201.2,1.15 201.2,1.25"/><path id="Fill-61" fill="#F6EB3B" d="M199.3,2.05 C199.4,1.65 199.4,2.35 199.3,2.05"/><path id="Fill-62" fill="#F6EB3B" d="M199.4,1.95 C199.4,1.95 199.5,2.05 199.4,1.95"/><path id="Fill-63" fill="#F6EB3B" d="M200.2,1.25 C200.2,1.25 200.3,1.35 200.2,1.25"/><path id="Fill-64" fill="#F6EB3B" d="M201.4,1.25 C201.3,1.15 201.4,1.25 201.4,1.25"/><path id="Fill-65" fill="#F6EB3B" d="M201.5,1.25 C201.5,1.15 201.6,1.25 201.5,1.25"/><path id="Fill-66" fill="#F6EB3B" d="M202.3,1.15 C202.3,1.15 202.4,1.25 202.3,1.15"/><path id="Fill-67" fill="#F6EB3B" d="M204.7,0.95 C204.8,0.95 204.8,1.15 204.9,1.15 C204.9,1.35 204.7,1.25 204.6,1.25 C204.5,0.95 204.7,1.15 204.7,0.95"/><path id="Fill-68" fill="#F6EB3B" d="M198.8,2.05 C198.8,2.05 198.8,2.15 198.8,2.05"/><path id="Fill-69" fill="#F6EB3B" d="M199.5,2.15 C199.5,2.05 199.5,2.05 199.5,2.15"/><path id="Fill-70" fill="#F6EB3B" d="M201.5,1.35 C201.4,1.35 201.5,1.45 201.5,1.35"/><path id="Fill-71" fill="#F6EB3B" d="M201.6,1.45 C201.6,1.25 201.9,1.35 202,1.35 C201.9,1.55 201.7,1.35 201.6,1.45"/><path id="Fill-72" fill="#F6EB3B" d="M202.1,1.35 C202.1,1.15 202.3,1.25 202.4,1.25 C202.4,1.45 202.2,1.35 202.1,1.35"/><path id="Fill-73" fill="#F6EB3B" d="M203.2,1.35 C203.2,1.55 203.1,1.45 203,1.35 C203,1.15 203.1,1.25 203.2,1.35"/><path id="Fill-74" fill="#F6EB3B" d="M201.8,1.55 C201.8,1.15 201.8,1.95 201.8,1.55"/><path id="Fill-79" fill="#F6EB3B" d="M201.1,1.55 C201.2,1.55 201.2,1.55 201.3,1.55 C201.3,1.75 201.2,1.65 201.2,1.85 C201.2,1.75 201.1,1.75 201.1,1.55"/><path id="Fill-80" fill="#F6EB3B" d="M201.3,1.65 C201.3,1.45 201.6,1.45 201.5,1.75 C201.5,1.75 201.4,1.75 201.4,1.75 C201.4,1.65 201.4,1.65 201.3,1.65"/><path id="Fill-81" fill="#F6EB3B" d="M201.5,1.55 C201.4,1.55 201.5,1.65 201.5,1.55"/><path id="Fill-82" fill="#F6EB3B" d="M201.9,1.55 C201.9,1.45 202,1.45 202,1.45 C202,1.55 201.9,1.55 201.9,1.55"/><path id="Fill-83" fill="#F6EB3B" d="M204.5,1.25 C204.5,1.25 204.5,1.45 204.5,1.25"/><path id="Fill-84" fill="#F6EB3B" d="M196.9,2.15 C196.9,2.05 196.9,2.15 196.9,2.15"/><path id="Fill-85" fill="#F6EB3B" d="M200,2.25 C200,2.25 200,2.25 200,2.25 C200,2.35 200,2.35 200,2.25"/><path id="Fill-86" fill="#F6EB3B" d="M201.8,1.55 C201.6,1.85 201.4,1.45 201.8,1.55"/><path id="Fill-87" fill="#F6EB3B" d="M202.5,1.65 C202.5,1.25 202.8,1.65 202.5,1.65"/><path id="Fill-88" fill="#F6EB3B" d="M199.8,1.95 C199.8,1.85 199.9,1.85 200,1.85 C199.9,1.95 199.9,1.85 199.8,1.95"/><path id="Fill-89" fill="#F6EB3B" d="M200,1.85 C200.2,1.65 199.9,2.25 200,1.85"/><path id="Fill-90" fill="#F6EB3B" d="M200.3,1.85 C200.4,1.45 200.4,2.25 200.3,1.85"/><path id="Fill-91" fill="#F6EB3B" d="M200.7,2.15 C200.7,2.15 200.7,2.05 200.7,2.15 C200.6,2.05 200.7,2.15 200.7,2.15 C200.7,2.25 200.6,2.25 200.5,2.25 C200.4,1.85 200.7,2.05 200.7,1.75 C200.8,1.75 200.8,1.95 200.7,2.15 C200.7,2.15 200.7,2.15 200.7,2.15"/><path id="Fill-92" fill="#F6EB3B" d="M202.6,1.55 C202.6,1.75 202.5,1.65 202.6,1.55"/><path id="Fill-93" fill="#F6EB3B" d="M197.9,2.55 C197.9,2.55 197.9,2.65 197.9,2.55"/><path id="Fill-94" fill="#F6EB3B" d="M198.5,2.55 C198.4,2.45 198.5,2.55 198.5,2.55"/><path id="Fill-95" fill="#F6EB3B" d="M198.8,2.55 C198.7,2.45 198.8,2.55 198.8,2.55"/><path id="Fill-96" fill="#F6EB3B" d="M197.9,2.55 C197.7,2.65 197.9,2.25 197.9,2.55"/><path id="Fill-97" fill="#F6EB3B" d="M198.2,2.45 C198.2,2.45 198.2,2.55 198.2,2.45"/><path id="Fill-98" fill="#F6EB3B" d="M200.2,1.95 C200.1,1.95 200.1,1.75 200.2,1.95"/><path id="Fill-99" fill="#F6EB3B" d="M200.9,1.95 C200.9,1.95 200.8,1.95 200.8,2.05 C200.6,1.95 200.9,1.65 200.9,1.95"/><path id="Fill-100" fill="#F6EB3B" d="M201.1,1.85 C201,1.85 201.1,1.95 201.1,1.85"/><path id="Fill-101" fill="#F6EB3B" d="M197.2,2.55 C197.3,2.55 197.3,2.45 197.4,2.45 C197.4,2.55 197.3,2.55 197.4,2.75 C197.2,2.75 197.2,2.65 197.2,2.55"/><path id="Fill-102" fill="#F6EB3B" d="M197.7,2.35 C197.7,2.35 197.7,2.45 197.7,2.35"/><path id="Fill-103" fill="#F6EB3B" d="M198.1,2.35 C198.1,2.35 198.1,2.45 198.1,2.35"/><path id="Fill-104" fill="#F6EB3B" d="M197.9,2.55 C198,2.55 198,2.65 198.1,2.65 C198.1,2.75 197.8,2.75 197.9,2.55"/><path id="Fill-105" fill="#F6EB3B" d="M199.6,2.05 C199.6,1.95 199.6,1.95 199.6,2.05 C199.6,2.05 199.6,2.05 199.6,2.05"/><path id="Fill-106" fill="#F6EB3B" d="M200.2,1.95 C200.3,1.95 200.1,2.35 200.2,1.95"/><path id="Fill-107" fill="#F6EB3B" d="M199.7,1.85 C199.8,1.85 199.8,1.95 199.9,1.95 C199.8,2.15 199.8,2.15 199.8,2.35 C199.7,2.35 199.6,2.35 199.5,2.35 C199.3,2.25 199.6,2.25 199.7,2.25 C199.7,2.15 199.6,2.05 199.5,2.15 C199.5,2.05 199.6,2.05 199.7,2.05 C199.7,2.15 199.8,2.05 199.7,2.05 C199.7,1.95 199.7,1.95 199.7,1.85"/><path id="Fill-108" fill="#F6EB3B" d="M201.6,1.95 C201.6,1.95 201.6,1.75 201.6,1.95"/><path id="Fill-109" fill="#F6EB3B" d="M202.7,1.75 C202.7,1.75 202.8,1.85 202.7,1.75"/><path id="Fill-110" fill="#F6EB3B" d="M175,3.05 C175,3.05 175,2.95 175,3.05"/><path id="Fill-111" fill="#F6EB3B" d="M197.1,2.55 C197.1,2.55 197.1,2.65 197.1,2.55"/><path id="Fill-112" fill="#F6EB3B" d="M198.1,2.35 C198.1,2.35 198.1,2.45 198.1,2.35"/><path id="Fill-113" fill="#F6EB3B" d="M199.6,2.05 C199.6,2.15 199.5,2.05 199.6,2.05"/><path id="Fill-114" fill="#F6EB3B" d="M199.6,2.05 C199.7,2.05 199.7,2.15 199.6,2.05"/><path id="Fill-115" fill="#F6EB3B" d="M199.8,2.45 C199.7,2.45 199.8,2.15 199.7,2.15 C199.8,1.75 199.9,2.25 199.8,2.45"/><path id="Fill-116" fill="#F6EB3B" d="M200.4,1.95 C200.2,2.15 200.1,2.35 199.9,2.45 C200,2.05 200.2,1.95 200.4,1.95"/><path id="Fill-117" fill="#F6EB3B" d="M201.6,1.95 C201.8,2.05 201.5,2.25 201.6,1.95"/><path id="Fill-118" fill="#F6EB3B" d="M197.9,2.35 C198.2,2.25 198.3,2.45 198.6,2.35 C198.9,2.55 199.1,2.45 199.3,2.05 C199.2,2.55 199.4,1.95 199.5,2.45 C198.8,2.55 198.5,2.65 197.9,2.35 C197.9,2.35 197.9,2.35 197.9,2.35"/><path id="Fill-119" fill="#F6EB3B" d="M202.3,1.95 C202.3,1.95 202.3,2.05 202.3,1.95"/><path id="Fill-120" fill="#F6EB3B" d="M197.3,2.55 C197.2,2.85 197.1,2.65 196.8,2.75 C196.8,2.45 197.1,2.55 197.3,2.55"/><path id="Fill-121" fill="#F6EB3B" d="M197.7,2.55 C197.8,2.35 197.5,2.95 197.7,2.55"/><path id="Fill-122" fill="#F6EB3B" d="M198,2.45 C198,2.55 198.1,2.55 198.2,2.55 C198.2,2.75 198.1,2.75 198.1,2.65 C198,2.65 198,2.55 198,2.45"/><path id="Fill-123" fill="#F6EB3B" d="M198.5,2.55 C198.4,2.55 198.4,2.55 198.3,2.55 C198.4,2.65 198.5,2.65 198.5,2.75 C198.7,2.85 198,2.95 198.1,2.65 C198.1,2.45 198.2,2.75 198.3,2.65 C198.3,2.55 198.2,2.45 198.1,2.45 C198.2,2.15 198.3,2.55 198.4,2.25 C198.5,2.45 198.5,2.45 198.5,2.55"/><path id="Fill-124" fill="#F6EB3B" d="M199.9,2.25 C200,1.85 200.1,2.55 199.9,2.25"/><path id="Fill-125" fill="#F6EB3B" d="M202.3,2.05 C202.4,2.15 202.4,2.25 202.5,2.25 C202.5,2.65 202.2,2.25 202.3,2.05"/><path id="Fill-126" fill="#F6EB3B" d="M197.9,2.65 C197.9,2.55 198,2.55 198,2.55 C198,2.65 197.9,2.65 197.9,2.65"/><path id="Fill-127" fill="#F6EB3B" d="M198.1,2.65 C198.1,2.65 198.1,2.75 198.1,2.75 C198,2.75 198,2.75 198,2.95 C197.9,2.75 198.8,2.75 198.7,2.75 C198.7,2.65 198.7,2.55 198.6,2.65 C198.6,2.65 198.6,2.55 198.6,2.55 C198.6,2.55 198.6,2.55 198.6,2.45 C198.6,2.45 198.6,2.55 198.6,2.65 C198.9,2.75 197.9,2.65 198.1,2.65"/><path id="Fill-128" fill="#F6EB3B" d="M200.2,2.25 C200.2,2.25 200.2,2.35 200.2,2.25"/><path id="Fill-129" fill="#F6EB3B" d="M200.7,2.25 C200.6,2.25 200.7,2.35 200.7,2.25"/><path id="Fill-130" fill="#F6EB3B" d="M201.8,2.35 C201.8,2.15 201.9,2.15 202,2.15 C202,2.25 201.9,2.35 201.8,2.35"/><path id="Fill-131" fill="#F6EB3B" d="M202,2.25 C202,2.05 202.1,2.25 202.2,2.25 C202.2,2.45 202.1,2.25 202,2.25"/><path id="Fill-132" fill="#F6EB3B" d="M196.9,2.65 C196.9,2.55 196.9,2.65 196.9,2.65"/><path id="Fill-133" fill="#F6EB3B" d="M197.1,2.65 C197.2,2.25 197.2,3.05 197.1,2.65"/><path id="Fill-134" fill="#F6EB3B" d="M198.6,2.75 C198.5,3.05 198.4,2.65 198.3,2.75 C198.4,2.45 198.5,2.75 198.6,2.75"/><path id="Fill-135" fill="#F6EB3B" d="M201,2.35 C201,2.25 201.1,2.35 201,2.35"/><path id="Fill-136" fill="#F6EB3B" d="M201.4,2.35 C201.4,2.25 201.5,2.25 201.6,2.25 C201.6,2.35 201.5,2.35 201.4,2.35"/><path id="Fill-137" fill="#F6EB3B" d="M200.4,2.45 C200.4,1.95 200.6,2.35 200.4,2.45"/><path id="Fill-138" fill="#F6EB3B" d="M202.5,2.25 C202.5,2.25 202.6,2.35 202.5,2.25"/><path id="Fill-139" fill="#F6EB3B" d="M196.7,2.75 C196.7,2.55 196.9,2.65 197,2.65 C196.8,2.95 196.8,2.95 196.7,2.75"/><path id="Fill-140" fill="#F6EB3B" d="M197,2.65 C197,2.65 197,2.75 197,2.65"/><path id="Fill-141" fill="#F6EB3B" d="M197.2,2.55 C197.3,2.55 197.3,2.55 197.4,2.55 C197.5,2.85 197.3,2.75 197.2,2.75 C197.2,2.75 197.2,2.65 197.2,2.55"/><path id="Fill-142" fill="#F6EB3B" d="M197.4,2.85 C197.5,2.45 197.5,3.15 197.4,2.85"/><path id="Fill-143" fill="#F6EB3B" d="M198.5,2.75 C198.5,2.65 198.6,2.65 198.5,2.75 C198.6,2.75 198.5,2.75 198.5,2.75"/><path id="Fill-144" fill="#F6EB3B" d="M200,2.35 C200,2.35 200.1,2.45 200,2.35"/><path id="Fill-145" fill="#F6EB3B" d="M201.9,2.25 C201.9,2.55 201.6,2.15 201.9,2.25"/><path id="Fill-146" fill="#F6EB3B" d="M196.4,2.75 C196.4,2.85 196.5,2.85 196.5,2.75 C196.7,2.85 196.3,3.15 196.4,2.75"/><path id="Fill-147" fill="#F6EB3B" d="M196.6,2.85 C196.5,2.85 196.6,2.95 196.6,2.85"/><path id="Fill-148" fill="#F6EB3B" d="M197.6,2.75 C197.7,2.95 197.5,3.35 197.8,3.35 C197.8,3.45 197.6,3.45 197.5,3.45 C197.6,3.25 197.5,2.95 197.3,3.05 C197.4,2.85 197.6,3.05 197.6,2.75"/><path id="Fill-149" fill="#F6EB3B" d="M198.7,2.95 C198.7,3.15 198.5,2.95 198.5,3.05 C198.5,3.15 198.3,3.15 198.4,3.35 C198.3,3.35 198.3,3.45 198.2,3.45 C198.2,3.25 198.3,3.25 198.4,3.05 C198.3,2.85 198.2,3.15 198.2,2.95 C198.2,2.55 198.5,3.05 198.7,2.95"/><path id="Fill-150" fill="#F6EB3B" d="M198.6,2.75 C198.7,2.75 198.7,2.85 198.8,2.85 C198.8,2.95 198.7,2.95 198.8,3.15 C198.8,3.15 198.7,3.05 198.7,3.05 C198.6,2.85 198.6,2.75 198.6,2.75"/><path id="Fill-151" fill="#F6EB3B" d="M200.3,2.45 C200.3,2.35 200.3,2.45 200.3,2.45"/><path id="Fill-152" fill="#F6EB3B" d="M200.4,2.35 C200.4,2.45 200.3,2.45 200.4,2.35"/><path id="Fill-153" fill="#F6EB3B" d="M197.1,2.95 C197,2.95 197.1,3.15 197,3.15 C197,3.05 196.9,3.15 197,3.15 C197,3.15 197,3.25 197,3.25 C196.9,3.25 196.9,3.25 196.9,3.15 C196.9,3.15 196.8,3.25 196.8,3.25 C196.8,3.05 196.7,3.35 196.6,3.25 C196.6,3.25 196.6,3.15 196.6,3.15 C196.6,3.15 196.6,3.05 196.7,3.05 C196.8,3.25 196.8,2.85 196.9,2.95 C196.9,3.05 196.9,3.05 196.9,3.05 C197,3.05 197,2.95 197.1,2.95 C197,2.85 196.9,2.85 196.8,2.85 C196.9,2.65 197.1,2.75 197.1,2.95 C197.1,2.85 197.1,2.95 197.1,2.95"/><path id="Fill-154" fill="#F6EB3B" d="M197.9,3.15 C197.9,3.05 197.9,3.05 197.9,2.95 C198,2.75 198.2,2.65 198.3,3.15 C198.1,2.95 198,3.05 197.9,3.15"/><path id="Fill-155" fill="#F6EB3B" d="M198.6,2.85 C198.6,2.75 198.7,2.75 198.8,2.75 C198.7,2.85 198.7,2.85 198.6,2.85"/><path id="Fill-156" fill="#F6EB3B" d="M201.8,2.45 C201.8,2.35 201.8,2.45 201.8,2.45"/><path id="Fill-157" fill="#F6EB3B" d="M196.5,2.95 C196.5,2.95 196.5,3.05 196.5,2.95"/><path id="Fill-158" fill="#F6EB3B" d="M196.6,2.95 C196.6,2.95 196.5,2.95 196.6,2.95 C196.6,2.95 196.6,2.95 196.6,2.95"/><path id="Fill-159" fill="#F6EB3B" d="M196.8,2.95 C196.8,2.85 196.9,2.85 196.8,2.95 C196.9,2.95 196.8,2.95 196.8,2.95"/><path id="Fill-160" fill="#F6EB3B" d="M197.1,2.95 C197.2,2.75 197.3,2.85 197.4,2.85 C197.4,3.05 197.3,2.95 197.2,2.95 C197.2,3.55 197.3,3.25 197.4,3.55 C197.2,3.45 197.1,3.65 196.9,3.55 C196.9,3.35 197,3.45 197.1,3.55 C197.2,3.35 197.3,2.95 197.1,2.95"/><path id="Fill-161" fill="#F6EB3B" d="M198,3.05 C198,3.15 198,3.15 198.1,3.15 C198,3.35 197.9,3.25 197.7,3.35 C197.7,3.15 198,2.95 197.6,3.05 C197.5,2.85 197.8,2.95 197.9,2.85 C197.9,2.95 197.8,3.05 197.9,3.15 C197.9,3.15 198,3.15 198,3.05"/><path id="Fill-162" fill="#F6EB3B" d="M197.9,2.95 C197.8,2.95 197.9,2.85 197.9,2.95"/><path id="Fill-163" fill="#F6EB3B" d="M198.1,2.85 C198.2,3.15 198.6,2.65 198.6,3.15 C198.3,3.15 198.3,3.15 198.1,3.05 C198,2.95 198.1,2.85 198.1,2.85"/><path id="Fill-164" fill="#F6EB3B" d="M199.6,2.85 C199.5,2.65 199.4,2.95 199.3,2.85 C199.3,2.55 199.7,2.35 199.6,2.85"/><path id="Fill-165" fill="#F6EB3B" d="M199.6,2.65 C199.6,2.55 199.7,2.55 199.7,2.55 C199.7,2.65 199.7,2.65 199.6,2.65"/><path id="Fill-166" fill="#F6EB3B" d="M200.2,2.65 C200.1,2.65 200.1,2.75 200,2.75 C200.1,2.95 200.1,2.85 200.2,2.65 C200.2,3.25 199.8,2.95 199.7,2.95 C199.9,2.85 199.9,2.45 200.2,2.65 C200.2,2.55 200.2,2.55 200.2,2.65"/><path id="Fill-167" fill="#F6EB3B" d="M201.2,2.45 C201.2,2.45 201.3,2.55 201.2,2.45"/><path id="Fill-168" fill="#F6EB3B" d="M201.9,2.45 C201.9,2.35 202,2.45 201.9,2.45"/><path id="Fill-169" fill="#F6EB3B" d="M198.7,2.95 C198.7,2.85 198.8,2.85 198.8,2.95 C198.8,3.15 198.8,2.95 198.7,2.95"/><path id="Fill-170" fill="#F6EB3B" d="M198.8,2.95 C198.7,3.05 198.6,2.95 198.4,3.05 C198.5,2.95 198.7,2.75 198.8,2.95"/><path id="Fill-171" fill="#F6EB3B" d="M198.8,2.45 C198.8,2.05 198.7,3.15 198.8,2.45"/><path id="Fill-172" fill="#F6EB3B" d="M198.9,2.45 C198.9,2.35 199,2.35 199,2.35 C199,2.45 199,2.45 198.9,2.45"/><path id="Fill-173" fill="#F6EB3B" d="M200,2.65 C200,2.65 200,2.55 200,2.55 C200,2.55 200.1,2.65 200,2.65"/><path id="Fill-174" fill="#F6EB3B" d="M197,2.95 C197,2.95 197,2.95 197,2.95 C197.1,2.95 197,3.05 197,2.95"/><path id="Fill-176" fill="#F6EB3B" d="M200.1,2.35 C200.3,2.25 200.3,2.65 200.2,2.75 C200.1,2.75 200.1,2.55 200.1,2.35"/><path id="Fill-177" fill="#F6EB3B" d="M200.4,2.45 C200.5,2.05 200.5,2.95 200.4,2.45"/><path id="Fill-178" fill="#F6EB3B" d="M198.5,3.05 C198.6,3.05 198.6,3.25 198.7,3.05 C198.9,3.25 198.6,3.25 198.6,3.45 C198.4,3.45 198.5,3.15 198.5,3.05"/><path id="Fill-179" fill="#F6EB3B" d="M199.1,2.95 C198.9,2.95 199.1,2.65 199,2.65 C199,2.45 199.2,2.55 199.3,2.55 C199.3,2.65 199.2,2.65 199.1,2.65 C199.1,2.75 199.1,2.85 199.1,2.95"/><path id="Fill-180" fill="#F6EB3B" d="M197.1,3.15 C197.3,2.85 197,3.45 197.1,3.15"/><path id="Fill-181" fill="#F6EB3B" d="M198.8,3.15 C198.7,3.15 198.8,3.25 198.8,3.15"/><path id="Fill-182" fill="#F6EB3B" d="M198.6,3.05 C198.6,3.25 198.6,3.35 198.5,3.45 C198.4,3.45 198.4,3.25 198.3,3.25 C198.4,3.15 198.5,3.05 198.6,3.05"/><path id="Fill-183" fill="#F6EB3B" d="M198.6,3.15 C198.6,3.05 198.6,3.15 198.6,3.15"/><path id="Fill-184" fill="#F6EB3B" d="M198.9,3.15 C198.9,3.15 198.9,3.15 198.9,3.15 C198.8,3.15 198.9,3.15 198.9,3.15 C198.9,3.25 198.9,3.35 198.8,3.35 C198.8,3.25 198.7,3.35 198.8,3.35 C198.8,3.55 198.6,3.35 198.5,3.55 C198.5,3.55 198.4,3.55 198.4,3.45 C198.4,3.45 198.4,3.35 198.4,3.35 C198.4,3.35 198.5,3.35 198.5,3.45 C198.6,3.45 198.5,3.35 198.6,3.35 C198.6,3.45 198.7,3.35 198.6,3.35 C198.6,3.35 198.6,3.25 198.6,3.25 C198.7,3.25 198.8,3.25 198.8,3.15 C198.9,3.05 199,3.05 198.9,3.15 C199,3.15 198.9,3.15 198.9,3.15"/><path id="Fill-185" fill="#F6EB3B" d="M198.4,2.75 C198.3,2.75 198.4,2.55 198.4,2.75"/><path id="Fill-186" fill="#F6EB3B" d="M198.6,2.75 C198.6,2.85 198.4,2.85 198.4,2.75 C198.5,2.65 198.5,2.55 198.6,2.75"/><path id="Fill-187" fill="#F6EB3B" d="M201.9,2.45 C202.1,2.35 202,2.55 202.2,2.55 C202.1,2.85 202,2.85 201.9,2.75 C201.9,2.65 201.9,2.65 201.9,2.45"/><path id="Fill-188" fill="#F6EB3B" d="M202.6,2.45 C202.5,2.35 202.6,2.45 202.6,2.45"/><path id="Fill-189" fill="#F6EB3B" d="M197,3.25 C197,3.25 197.1,3.15 197,3.25 C197.1,3.25 197.1,3.25 197,3.25"/><path id="Fill-190" fill="#F6EB3B" d="M198.5,3.15 C198.5,3.25 198.4,3.35 198.5,3.35 C198.5,3.65 198.3,3.05 198.3,3.55 C198.3,3.45 198.1,3.55 198.1,3.25 C198.3,3.35 198.3,3.05 198.5,3.15"/><path id="Fill-191" fill="#F6EB3B" d="M199.3,2.75 C199.2,2.75 199.3,2.55 199.3,2.75"/><path id="Fill-192" fill="#F6EB3B" d="M200.9,2.65 C200.7,3.05 200.7,2.35 200.9,2.65"/><path id="Fill-193" fill="#F6EB3B" d="M202.8,2.45 C202.7,2.85 202.6,2.15 202.8,2.45"/><path id="Fill-194" fill="#F6EB3B" d="M203.2,2.35 C203.4,2.35 203.1,2.85 203.2,2.35"/><path id="Fill-195" fill="#F6EB3B" d="M197.1,3.25 C197.1,3.35 197.1,3.45 197.1,3.55 C197,3.65 196.9,3.75 196.8,3.75 C196.9,3.45 197,3.45 197.1,3.25"/><path id="Fill-196" fill="#F6EB3B" d="M196.7,3.25 C196.7,3.25 196.7,3.25 196.7,3.25 C196.6,3.25 196.6,3.25 196.7,3.25"/><path id="Fill-197" fill="#F6EB3B" d="M196.8,3.25 C196.8,3.25 196.8,3.15 196.8,3.25 C196.8,3.25 196.8,3.35 196.8,3.25"/><path id="Fill-198" fill="#F6EB3B" d="M197.3,3.25 C197.3,2.85 197.3,3.65 197.3,3.25"/><path id="Fill-199" fill="#F6EB3B" d="M198.7,3.35 C198.6,3.65 198.6,3.05 198.7,3.35"/><path id="Fill-200" fill="#F6EB3B" d="M198,3.35 C198,3.25 198.1,3.25 198.1,3.25 C198.1,3.25 198,3.25 198,3.35"/><path id="Fill-201" fill="#F6EB3B" d="M199.1,2.85 C199.2,2.85 199.2,2.75 199.3,2.85 C199.3,2.95 199.1,2.95 199.1,2.85"/><path id="Fill-202" fill="#F6EB3B" d="M200.4,2.75 C200.4,2.65 200.5,2.65 200.5,2.75 C200.5,2.95 200.5,2.75 200.4,2.75"/><path id="Fill-203" fill="#F6EB3B" d="M200.7,2.65 C200.7,2.55 200.8,2.75 200.7,2.65"/><path id="Fill-204" fill="#F6EB3B" d="M200.8,2.65 C200.8,2.55 200.9,2.55 200.9,2.55 C200.9,2.65 200.9,2.65 200.8,2.65"/><path id="Fill-205" fill="#F6EB3B" d="M201.7,2.55 C201.7,2.55 201.7,2.65 201.7,2.55"/><path id="Fill-206" fill="#F6EB3B" d="M196.7,3.35 C196.7,3.25 196.8,3.25 196.7,3.35 C196.8,3.35 196.8,3.35 196.7,3.35"/><path id="Fill-207" fill="#F6EB3B" d="M197.4,3.25 C197.4,3.25 197.5,3.35 197.4,3.25"/><path id="Fill-208" fill="#F6EB3B" d="M197.8,3.45 C197.8,3.35 197.9,3.35 197.9,3.35 C197.9,3.45 197.8,3.45 197.8,3.45"/><path id="Fill-209" fill="#F6EB3B" d="M198.1,3.35 C198.1,3.35 198.1,3.35 198.1,3.35 C198,3.45 198,3.35 198.1,3.35"/><path id="Fill-210" fill="#F6EB3B" d="M198.4,3.35 C198.5,3.25 198.4,3.45 198.4,3.35"/><path id="Fill-211" fill="#F6EB3B" d="M197.8,3.35 C197.8,3.35 197.8,3.45 197.8,3.35"/><path id="Fill-212" fill="#F6EB3B" d="M198.5,2.95 C198.5,2.75 198.6,2.85 198.5,2.95"/><path id="Fill-213" fill="#F6EB3B" d="M198.6,2.95 C198.6,2.85 198.7,2.85 198.7,2.95 C198.7,3.05 198.7,2.95 198.6,2.95"/><path id="Fill-214" fill="#F6EB3B" d="M198.9,2.85 C199.2,2.75 198.9,3.15 198.9,2.85"/><path id="Fill-215" fill="#F6EB3B" d="M199.8,2.85 C199.8,2.75 199.8,2.95 199.8,2.85"/><path id="Fill-216" fill="#F6EB3B" d="M201.4,2.75 C201.4,2.75 201.5,2.85 201.4,2.75"/><path id="Fill-217" fill="#F6EB3B" d="M202.2,2.75 C202.2,2.65 202.2,2.75 202.2,2.75"/><path id="Fill-218" fill="#F6EB3B" d="M198.1,3.35 C198.1,3.35 198.1,3.35 198.1,3.35 C198.2,3.45 198.2,3.45 198.2,3.55 C198.1,3.65 198.2,3.65 198.2,3.55 C198.3,3.35 198.3,3.55 198.4,3.55 C198.3,3.85 198.2,4.05 198.1,3.75 C198,3.65 198,3.55 198.1,3.35"/><path id="Fill-219" fill="#F6EB3B" d="M198.5,2.95 C198.5,3.05 198.4,2.95 198.5,2.95"/><path id="Fill-220" fill="#F6EB3B" d="M200.6,2.95 C200.7,2.75 201.1,2.75 201.1,3.15 C201,2.95 200.8,2.95 200.6,2.95"/><path id="Fill-221" fill="#F6EB3B" d="M198,3.55 C197.9,3.45 198,3.55 198,3.55"/><path id="Fill-222" fill="#F6EB3B" d="M198.3,3.55 C198.5,3.25 198.2,3.85 198.3,3.55"/><path id="Fill-223" fill="#F6EB3B" d="M198.6,3.05 C198.6,2.95 198.6,3.15 198.6,3.05"/><path id="Fill-224" fill="#F6EB3B" d="M199,3.05 C198.9,2.95 199,3.05 199,3.05"/><path id="Fill-225" fill="#F6EB3B" d="M199.6,3.05 C199.7,3.15 199.7,3.15 199.8,2.95 C200,3.05 199.5,3.55 199.6,3.05"/><path id="Fill-226" fill="#F6EB3B" d="M200.2,2.95 C200.2,2.85 200.3,2.85 200.3,2.85 C200.3,2.95 200.2,2.95 200.2,2.95"/><path id="Fill-227" fill="#F6EB3B" d="M201.3,2.95 C201.2,2.85 201.3,2.95 201.3,2.95"/><path id="Fill-228" fill="#F6EB3B" d="M202.2,2.95 C202,3.15 201.9,2.95 201.7,3.05 C201.7,2.75 202.1,2.75 202.2,2.95"/><path id="Fill-229" fill="#F6EB3B" d="M197.7,3.65 C197.6,4.05 197.6,3.15 197.7,3.65"/><path id="Fill-230" fill="#F6EB3B" d="M197.6,3.65 C197.6,3.55 197.7,3.55 197.6,3.65"/><path id="Fill-231" fill="#F6EB3B" d="M199.3,3.05 C199.3,2.95 199.4,2.95 199.4,2.95 C199.4,3.05 199.4,3.05 199.3,3.05"/><path id="Fill-232" fill="#F6EB3B" d="M198.8,3.45 C198.8,3.45 198.8,3.55 198.8,3.45"/><path id="Fill-233" fill="#F6EB3B" d="M198.4,3.15 C198.3,3.05 198.4,3.15 198.4,3.15"/><path id="Fill-234" fill="#F6EB3B" d="M199.1,3.15 C199.1,3.05 199.2,3.05 199.3,3.05 C199.3,3.15 199.2,3.15 199.1,3.15"/><path id="Fill-235" fill="#F6EB3B" d="M201.6,2.95 C201.6,3.05 201.5,3.15 201.4,3.15 C201.4,3.05 201.5,2.95 201.4,2.95 C201.4,2.85 201.5,2.95 201.6,2.95"/><path id="Fill-236" fill="#F6EB3B" d="M201.5,2.95 C201.5,2.85 201.6,2.85 201.6,2.95 C201.6,2.95 201.6,2.95 201.5,2.95"/><path id="Fill-237" fill="#F6EB3B" d="M200.6,2.85 C200.6,2.95 200.6,2.95 200.6,3.05 C200.5,3.05 202.2,3.05 202.2,2.95 C202.2,2.85 200.6,2.85 200.6,2.85"/><path id="Fill-239" fill="#F6EB3B" d="M201.4,3.05 C201.4,2.65 201.7,3.05 201.4,3.05"/><path id="Fill-240" fill="#F6EB3B" d="M202.2,2.85 C202.2,2.85 202.2,2.95 202.2,2.85"/><path id="Fill-241" fill="#F6EB3B" d="M196.9,3.65 C196.8,3.55 196.9,3.65 196.9,3.65"/><path id="Fill-242" fill="#F6EB3B" d="M197.5,3.65 C197.5,3.65 197.5,3.55 197.5,3.65"/><path id="Fill-243" fill="#F6EB3B" d="M197.6,3.65 C197.6,3.75 197.6,3.65 197.6,3.65"/><path id="Fill-244" fill="#F6EB3B" d="M197.8,3.65 C197.9,3.35 197.9,4.05 197.8,3.65"/><path id="Fill-245" fill="#F6EB3B" d="M198.4,3.55 C198.4,3.55 198.5,3.65 198.4,3.55"/><path id="Fill-246" fill="#F6EB3B" d="M200.9,3.05 C201.1,2.85 200.7,3.45 200.9,3.05"/><path id="Fill-247" fill="#F6EB3B" d="M201.6,2.95 C201.7,2.95 201.6,3.15 201.6,2.95"/><path id="Fill-248" fill="#F6EB3B" d="M202.1,3.05 C202.1,2.95 202.2,2.95 202.2,2.95 C202.2,3.05 202.1,3.05 202.1,3.05"/><path id="Fill-249" fill="#F6EB3B" d="M197.5,3.65 C197.6,3.65 197.6,3.85 197.5,3.65"/><path id="Fill-250" fill="#F6EB3B" d="M197.7,3.75 C197.8,3.45 197.8,4.15 197.7,3.75"/><path id="Fill-251" fill="#F6EB3B" d="M197.9,3.75 C197.9,3.65 198,3.65 198.1,3.65 C198,3.75 198,3.75 197.9,3.75"/><path id="Fill-252" fill="#F6EB3B" d="M198.1,3.65 C198.1,4.05 197.9,3.65 198.1,3.65"/><path id="Fill-253" fill="#F6EB3B" d="M200.2,3.25 C200,3.35 199.7,3.35 199.6,3.35 C199.8,3.15 200.1,3.05 200.2,3.25"/><path id="Fill-254" fill="#F6EB3B" d="M201.2,3.15 C201.2,2.95 201.5,2.95 201.4,3.25 C201.4,3.25 201.2,3.15 201.2,3.15"/><path id="Fill-255" fill="#F6EB3B" d="M200.7,2.95 C200.7,2.95 200.7,3.15 200.7,2.95"/><path id="Fill-256" fill="#F6EB3B" d="M201.8,3.05 C201.8,3.05 201.8,2.85 201.8,3.05"/><path id="Fill-257" fill="#F6EB3B" d="M201.9,3.05 C201.9,2.95 201.9,3.05 201.9,3.05"/><path id="Fill-258" fill="#F6EB3B" d="M202.5,2.95 C202.4,2.95 202.5,3.05 202.5,2.95"/><path id="Fill-259" fill="#F6EB3B" d="M202.8,2.85 C202.9,2.85 202.8,3.05 202.9,3.05 C202.9,3.35 202.7,3.15 202.8,2.85"/><path id="Fill-260" fill="#F6EB3B" d="M203.3,2.95 C203.3,2.85 203.4,3.05 203.3,2.95"/><path id="Fill-261" fill="#F6EB3B" d="M197.1,3.75 C197.1,3.75 197.2,3.85 197.1,3.75"/><path id="Fill-262" fill="#F6EB3B" d="M197.3,3.85 C197.3,3.75 197.4,3.75 197.4,3.75 C197.4,3.75 197.3,3.75 197.3,3.85"/><path id="Fill-263" fill="#F6EB3B" d="M197.4,3.75 C197.5,3.45 197.3,4.45 197.4,3.75"/><path id="Fill-264" fill="#F6EB3B" d="M196.9,3.75 C196.9,3.95 196.7,3.75 196.6,3.85 C196.7,3.75 196.9,3.65 196.9,3.75"/><path id="Fill-265" fill="#F6EB3B" d="M196.8,3.75 C196.9,3.45 197.1,3.85 196.8,3.75"/><path id="Fill-266" fill="#F6EB3B" d="M197,3.75 C196.9,3.65 197,3.75 197,3.75"/><path id="Fill-267" fill="#F6EB3B" d="M196.9,3.75 C196.9,3.45 197,4.05 196.9,3.75"/><path id="Fill-268" fill="#F6EB3B" d="M197.1,3.65 C197.1,3.65 197.2,3.75 197.1,3.65"/><path id="Fill-269" fill="#F6EB3B" d="M197.6,3.75 C197.6,3.75 197.7,3.85 197.6,3.75"/><path id="Fill-270" fill="#F6EB3B" d="M200.2,3.25 C200.2,3.05 200.5,3.05 200.4,3.35 C200.4,3.35 200.3,3.35 200.3,3.35 C200.2,3.35 200.2,3.25 200.2,3.25"/><path id="Fill-271" fill="#F6EB3B" d="M200.7,3.25 C200.7,3.15 200.8,3.15 200.8,3.15 C200.8,3.25 200.7,3.25 200.7,3.25"/><path id="Fill-272" fill="#F6EB3B" d="M200.8,3.15 C200.8,2.95 201,3.05 201.1,3.05 C201.1,3.25 200.9,3.15 200.8,3.15"/><path id="Fill-273" fill="#F6EB3B" d="M201.6,3.05 C201.6,3.05 201.6,3.15 201.6,3.05"/><path id="Fill-274" fill="#F6EB3B" d="M201.8,3.05 C202,3.05 201.8,3.45 201.8,3.05"/><path id="Fill-275" fill="#F6EB3B" d="M202,3.15 C202,3.05 202.1,3.05 202.1,3.05 C202.1,3.05 202.1,3.05 202,3.15"/><path id="Fill-276" fill="#F6EB3B" d="M202.3,3.05 C202.3,2.95 202.4,2.95 202.4,2.95 C202.4,3.05 202.3,3.05 202.3,3.05"/><path id="Fill-277" fill="#F6EB3B" d="M202.6,3.05 C202.6,3.05 202.6,3.15 202.6,3.05"/><path id="Fill-278" fill="#F6EB3B" d="M197.8,3.75 C198,3.85 197.9,3.85 198.1,3.75 C198.1,4.15 197.8,4.15 197.8,3.75"/><path id="Fill-279" fill="#F6EB3B" d="M197.8,3.85 C197.8,3.75 197.9,3.75 197.9,3.85 C197.9,3.85 197.8,3.85 197.8,3.85"/><path id="Fill-280" fill="#F6EB3B" d="M200.4,3.35 C200.4,3.25 200.5,3.25 200.6,3.25 C200.6,3.35 200.5,3.35 200.4,3.35"/><path id="Fill-281" fill="#F6EB3B" d="M201.8,3.25 C201.8,3.15 201.9,3.15 201.9,3.15 C201.9,3.25 201.9,3.25 201.8,3.25"/><path id="Fill-282" fill="#F6EB3B" d="M202.3,3.25 C202.3,3.15 202.3,3.25 202.3,3.25"/><path id="Fill-283" fill="#F6EB3B" d="M201.9,3.15 C201.9,3.05 202,3.05 202,3.05 C202,3.15 201.9,3.15 201.9,3.15"/><path id="Fill-284" fill="#F6EB3B" d="M202.5,3.15 C202.5,3.05 202.6,3.15 202.5,3.15"/><path id="Fill-285" fill="#F6EB3B" d="M202.9,3.15 C202.9,3.05 203,3.05 203,3.05 C203,3.15 202.9,3.15 202.9,3.15"/><path id="Fill-286" fill="#F6EB3B" d="M199.9,3.55 C199.7,3.55 199.9,3.05 199.9,3.55"/><path id="Fill-287" fill="#F6EB3B" d="M201.6,3.25 C201.6,3.15 201.7,3.35 201.6,3.25"/><path id="Fill-288" fill="#F6EB3B" d="M202.2,3.25 C202.2,3.15 202.2,3.25 202.2,3.25"/><path id="Fill-289" fill="#F6EB3B" d="M196.4,4.15 C196.4,4.15 196.4,4.15 196.4,4.15 C196.4,4.05 196.4,3.95 196.5,3.95 C196.4,4.05 196.4,4.05 196.4,4.15"/><path id="Fill-290" fill="#F6EB3B" d="M197.1,3.95 C197.1,3.55 197.1,4.25 197.1,3.95"/><path id="Fill-291" fill="#F6EB3B" d="M198.1,3.95 C198.1,3.85 198.1,3.95 198.1,3.95"/><path id="Fill-292" fill="#F6EB3B" d="M198.5,3.95 C198.3,4.05 198.5,3.65 198.5,3.95"/><path id="Fill-293" fill="#F6EB3B" d="M200.2,3.45 C200.2,3.45 200.2,3.55 200.2,3.45"/><path id="Fill-294" fill="#F6EB3B" d="M200.9,3.45 C200.9,3.35 201,3.45 200.9,3.45"/><path id="Fill-295" fill="#F6EB3B" d="M201.5,3.45 C201.8,3.15 202,3.75 201.5,3.45"/><path id="Fill-296" fill="#F6EB3B" d="M200.4,3.45 C200.5,3.45 200.4,3.65 200.5,3.65 C200.5,3.95 200.3,3.65 200.4,3.45"/><path id="Fill-297" fill="#F6EB3B" d="M200.6,3.55 C200.6,3.45 200.6,3.45 200.6,3.55"/><path id="Fill-298" fill="#F6EB3B" d="M200.7,3.55 C200.7,3.45 200.7,3.55 200.7,3.55"/><path id="Fill-299" fill="#F6EB3B" d="M200.8,3.55 C200.8,3.35 200.9,3.45 200.8,3.55"/><path id="Fill-300" fill="#F6EB3B" d="M201.8,3.45 C201.8,3.45 201.9,3.55 201.8,3.45"/><path id="Fill-301" fill="#F6EB3B" d="M201.9,3.45 C201.9,3.45 201.9,3.55 201.9,3.45"/><path id="Fill-302" fill="#F6EB3B" d="M201.2,3.45 C201.2,3.35 201.3,3.35 201.4,3.35 C201.3,3.45 201.2,3.45 201.2,3.45"/><path id="Fill-303" fill="#F6EB3B" d="M201.3,3.35 C201.3,3.35 201.3,3.45 201.3,3.35"/><path id="Fill-304" fill="#F6EB3B" d="M175.3,4.75 C175.4,4.35 175.4,5.05 175.3,4.75"/><path id="Fill-305" fill="#F6EB3B" d="M196.4,4.05 C196.4,4.15 196.3,4.15 196.4,4.05 C196.3,4.05 196.3,4.05 196.4,4.05"/><path id="Fill-306" fill="#F6EB3B" d="M196.5,4.05 C196.7,3.95 196.5,4.25 196.5,4.05"/><path id="Fill-307" fill="#F6EB3B" d="M196.7,4.05 C196.6,4.05 196.7,4.15 196.7,4.05"/><path id="Fill-308" fill="#F6EB3B" d="M200.6,3.55 C200.6,3.75 200.8,3.65 200.9,3.55 C201,3.55 201.2,3.75 201.3,3.65 C201.3,3.95 200.3,3.95 200.6,3.55"/><path id="Fill-309" fill="#F6EB3B" d="M201.8,3.65 C201.8,3.95 201.3,3.85 201.3,3.55 C201.5,3.45 201.7,3.65 201.8,3.65"/><path id="Fill-310" fill="#F6EB3B" d="M200.9,3.65 C200.8,3.15 201.1,3.55 200.9,3.65"/><path id="Fill-311" fill="#F6EB3B" d="M201,3.45 C201,3.45 201,3.55 201,3.45"/><path id="Fill-312" fill="#F6EB3B" d="M201.5,3.35 C201.6,3.35 201.6,3.45 201.5,3.65 C202,3.65 202.2,3.65 202.5,3.65 C202.4,4.05 202.1,3.75 202,3.65 C201.7,3.45 201.2,4.15 201,3.55 C201.2,3.55 201.5,3.85 201.5,3.35"/><path id="Fill-313" fill="#F6EB3B" d="M201.7,3.65 C201.7,3.45 201.9,3.65 202,3.55 C202.2,3.55 201.6,3.75 201.9,3.95 C201.8,4.35 201.8,3.65 201.7,3.65"/><path id="Fill-314" fill="#F6EB3B" d="M202,3.65 C202,3.45 202.5,3.45 202.3,3.85 C202.2,3.65 202.1,3.85 202,3.65"/><path id="Fill-315" fill="#F6EB3B" d="M200.9,3.55 C200.9,3.95 202.3,3.75 202.3,3.75 C202.3,3.35 200.8,3.65 200.9,3.55"/><path id="Fill-316" fill="#F6EB3B" d="M203.1,3.45 C203.3,3.85 202.7,4.05 202.7,3.85 C202.6,3.15 203,4.25 203.1,3.45"/><path id="Fill-317" fill="#F6EB3B" d="M203.2,3.55 C203.2,3.45 203.3,3.45 203.4,3.45 C203.4,3.55 203.3,3.55 203.2,3.55"/><path id="Fill-318" fill="#F6EB3B" d="M198.8,4.15 C199,4.35 198.5,4.55 198.6,4.15 C198.6,4.15 198.7,4.15 198.8,4.15"/><path id="Fill-319" fill="#F6EB3B" d="M199.6,4.15 C199.6,4.15 199.7,4.25 199.6,4.15"/><path id="Fill-320" fill="#F6EB3B" d="M199.8,4.15 C199.8,4.15 199.8,4.25 199.8,4.15"/><path id="Fill-321" fill="#F6EB3B" d="M200,4.15 C199.9,4.15 200,4.25 200,4.15"/><path id="Fill-322" fill="#F6EB3B" d="M199.9,3.75 C199.9,3.75 200,3.75 200,3.75 C200,3.85 200,3.85 200,3.95 C200,3.95 199.9,3.95 199.9,3.95 C199.9,3.85 199.9,3.85 199.9,3.75"/><path id="Fill-323" fill="#F6EB3B" d="M203.5,3.75 C203.5,3.75 203.4,3.75 203.4,3.85 C203.3,3.75 203.5,3.15 203.5,3.75"/><path id="Fill-324" fill="#F6EB3B" d="M197,4.35 C196.9,4.25 197,4.35 197,4.35"/><path id="Fill-325" fill="#F6EB3B" d="M197.4,4.15 C197.3,4.55 197.2,4.15 197.1,4.35 C197.1,4.55 197.3,4.25 197.3,4.65 C197.2,4.55 197.1,4.55 197,4.35 C197,4.15 197.2,4.15 197.4,4.15"/><path id="Fill-326" fill="#F6EB3B" d="M198.7,4.35 C198.7,4.25 198.7,4.25 198.7,4.35 C198.7,4.35 198.7,4.35 198.7,4.35"/><path id="Fill-327" fill="#F6EB3B" d="M198,4.35 C198.2,4.25 197.5,4.35 198,4.35"/><path id="Fill-328" fill="#F6EB3B" d="M200,4.25 C200,4.15 200.1,4.25 200,4.25"/><path id="Fill-329" fill="#F6EB3B" d="M200.4,3.95 C200.5,3.45 200.5,4.25 200.4,3.95"/><path id="Fill-330" fill="#F6EB3B" d="M197.7,4.35 C197.7,4.35 197.7,4.35 197.7,4.35 C197.6,4.45 197.6,4.35 197.7,4.35"/><path id="Fill-331" fill="#F6EB3B" d="M196.9,4.35 C196.9,4.55 196.7,4.25 196.9,4.35"/><path id="Fill-332" fill="#F6EB3B" d="M196.7,4.45 C196.8,4.35 197,4.15 197.1,4.45 C197,4.65 196.8,4.55 196.7,4.45"/><path id="Fill-333" fill="#F6EB3B" d="M197.4,4.35 C197.4,4.25 197.5,4.35 197.4,4.35"/><path id="Fill-334" fill="#F6EB3B" d="M198.6,4.35 C198.6,4.35 198.7,4.35 198.6,4.35 C198.7,4.35 198.6,4.45 198.6,4.35"/><path id="Fill-335" fill="#F6EB3B" d="M198.7,4.35 C198.8,4.35 198.7,4.45 198.7,4.35"/><path id="Fill-336" fill="#F6EB3B" d="M199.2,4.35 C199.3,3.95 199.3,4.75 199.2,4.35"/><path id="Fill-337" fill="#F6EB3B" d="M200.4,4.25 C200.4,4.25 200.5,4.35 200.4,4.25"/><path id="Fill-338" fill="#F6EB3B" d="M200.6,4.25 C200.6,4.15 200.7,4.15 200.7,4.15 C200.7,4.25 200.6,4.25 200.6,4.25"/><path id="Fill-340" fill="#F6EB3B" d="M203.2,3.75 C203.2,3.65 203.3,3.65 203.4,3.65 C203.4,3.75 203.3,3.75 203.2,3.75"/><path id="Fill-341" fill="#F6EB3B" d="M203.5,3.75 C203.5,3.75 203.5,3.65 203.5,3.65 C203.6,3.65 203.6,3.75 203.7,3.85 C203.6,3.85 203.5,3.75 203.5,3.75"/><path id="Fill-342" fill="#F6EB3B" d="M197.8,4.35 C197.8,4.35 197.9,4.35 197.9,4.35 C197.8,4.65 197.5,4.85 197.4,4.55 C197.4,4.35 197.8,4.65 197.8,4.35"/><path id="Fill-343" fill="#F6EB3B" d="M196.7,4.35 C196.7,4.65 196.5,4.35 196.7,4.35"/><path id="Fill-344" fill="#F6EB3B" d="M196.7,4.45 C196.4,4.55 196.6,4.15 196.7,4.45"/><path id="Fill-345" fill="#F6EB3B" d="M198,4.45 C198,4.75 197.9,4.65 197.9,4.45 C197.9,4.45 198,4.45 198,4.45"/><path id="Fill-346" fill="#F6EB3B" d="M198.6,4.45 C198.6,4.65 198.3,4.55 198.2,4.55 C198.2,4.35 198.5,4.35 198.6,4.45"/><path id="Fill-347" fill="#F6EB3B" d="M198.5,4.45 C198.5,4.35 198.6,4.45 198.5,4.45"/><path id="Fill-348" fill="#F6EB3B" d="M198.6,4.45 C198.6,4.25 198.8,4.35 198.9,4.35 C198.8,4.55 198.7,4.35 198.6,4.45"/><path id="Fill-349" fill="#F6EB3B" d="M199,4.45 C199,4.35 199,4.35 199,4.45 C199.1,4.45 199,4.35 199,4.45"/><path id="Fill-350" fill="#F6EB3B" d="M199.1,4.35 C199.1,4.35 199.2,4.45 199.1,4.35"/><path id="Fill-351" fill="#F6EB3B" d="M199.4,4.35 C199.4,4.05 199.4,4.75 199.4,4.35"/><path id="Fill-352" fill="#F6EB3B" d="M199.9,4.35 C199.9,4.35 200,4.35 199.9,4.35"/><path id="Fill-353" fill="#F6EB3B" d="M202.1,4.25 C202.1,4.15 202.1,4.25 202.1,4.25"/><path id="Fill-354" fill="#F6EB3B" d="M203.4,3.75 C203.4,3.75 203.5,3.75 203.4,3.75 C203.5,3.75 203.4,3.85 203.4,3.75"/><path id="Fill-355" fill="#F6EB3B" d="M196.9,4.55 C197.2,4.25 197.3,4.85 196.9,4.55"/><path id="Fill-356" fill="#F6EB3B" d="M196.7,4.45 C196.7,4.45 196.8,4.45 196.8,4.45 C196.8,4.55 196.7,4.55 196.7,4.45"/><path id="Fill-357" fill="#F6EB3B" d="M197.4,4.45 C197.5,4.25 197.3,4.75 197.4,4.45"/><path id="Fill-358" fill="#F6EB3B" d="M198.1,4.55 C198.1,4.45 198.2,4.45 198.1,4.55 C198.2,4.55 198.2,4.45 198.1,4.55"/><path id="Fill-359" fill="#F6EB3B" d="M200.1,4.45 C200.2,4.15 200.4,4.55 200.1,4.45"/><path id="Fill-360" fill="#F6EB3B" d="M200.3,4.35 C200.4,4.45 200.3,4.85 200.2,4.75 C200.2,4.55 200.3,4.55 200.3,4.35"/><path id="Fill-361" fill="#F6EB3B" d="M200.7,4.35 C200.7,4.35 200.8,4.45 200.7,4.35"/><path id="Fill-362" fill="#F6EB3B" d="M203.6,3.75 C203.6,3.75 203.6,3.95 203.6,3.75"/><path id="Fill-363" fill="#F6EB3B" d="M196.8,4.75 C196.8,4.75 196.7,4.75 196.6,4.75 C196.6,4.45 196.8,4.55 197,4.45 C197,4.75 196.8,4.55 196.8,4.75"/><path id="Fill-364" fill="#F6EB3B" d="M197.2,4.55 C197.2,4.45 197.3,4.55 197.2,4.55"/><path id="Fill-365" fill="#F6EB3B" d="M197.9,4.65 C197.9,4.55 197.9,4.55 197.9,4.65 C197.9,4.65 197.9,4.65 197.9,4.65"/><path id="Fill-366" fill="#F6EB3B" d="M199.5,4.45 C199.5,4.45 199.6,4.55 199.5,4.45"/><path id="Fill-367" fill="#F6EB3B" d="M202.1,4.35 C202.2,3.95 202.1,4.85 202.1,4.35"/><path id="Fill-368" fill="#F6EB3B" d="M197.9,4.55 C198,4.65 197.9,4.75 197.9,4.95 C197.8,4.95 197.8,4.85 197.8,4.75 C197.8,4.75 197.8,4.75 197.8,4.85 C197.5,4.65 197.9,4.75 197.9,4.55"/><path id="Fill-369" fill="#F6EB3B" d="M198.6,4.55 C198.4,4.85 198.1,4.45 198.6,4.55"/><path id="Fill-370" fill="#F6EB3B" d="M198.7,4.55 C198.8,4.75 198.8,4.45 199,4.55 C199,4.65 198.7,4.95 198.7,4.55"/><path id="Fill-371" fill="#F6EB3B" d="M199.4,4.55 C199.4,4.55 199.4,4.65 199.4,4.55"/><path id="Fill-372" fill="#F6EB3B" d="M202.2,4.45 C202.1,4.75 202,4.15 202.2,4.45"/><path id="Fill-373" fill="#F6EB3B" d="M202.2,4.45 C202.2,4.35 202.3,4.45 202.2,4.45"/><path id="Fill-374" fill="#F6EB3B" d="M202.3,4.45 C202.3,4.35 202.4,4.45 202.3,4.45"/><path id="Fill-375" fill="#F6EB3B" d="M201.2,4.45 C201.1,4.45 201.1,4.55 201,4.55 C201.1,4.45 201.1,4.35 201.2,4.45 C201.2,4.35 201.2,4.35 201.2,4.45"/><path id="Fill-376" fill="#F6EB3B" d="M201.6,4.45 C201.5,4.45 201.4,4.45 201.4,4.25 C201.4,4.25 201.5,4.25 201.5,4.25 C201.6,4.35 201.6,4.45 201.6,4.45 C201.6,4.45 201.6,4.45 201.6,4.45"/><path id="Fill-377" fill="#F6EB3B" d="M201.6,4.35 C201.9,4.35 201.6,4.85 201.6,4.35"/><path id="Fill-378" fill="#F6EB3B" d="M202,4.55 C202.1,4.55 202.1,4.35 202.1,4.25 C202.2,4.25 202.2,4.45 202.2,4.45 C202.1,4.55 202.1,4.65 202,4.55 C202,4.65 202,4.65 202,4.55"/><path id="Fill-379" fill="#F6EB3B" d="M200.1,4.65 C200.1,4.35 200.3,4.75 200.1,4.65"/><path id="Fill-380" fill="#F6EB3B" d="M201.1,4.45 C201.1,4.75 202.5,4.45 202.4,4.45 C202.4,4.25 201,4.45 201.1,4.45"/><path id="Fill-381" fill="#F6EB3B" d="M201.2,4.35 C201.3,4.45 201.6,4.15 201.6,4.55 C201.4,4.35 201.2,4.95 201.2,4.35"/><path id="Fill-382" fill="#F6EB3B" d="M201.8,4.45 C201.8,4.35 201.9,4.35 201.8,4.45"/><path id="Fill-383" fill="#F6EB3B" d="M202.2,4.55 C202.2,4.15 202.4,4.45 202.2,4.55"/><path id="Fill-384" fill="#F6EB3B" d="M202.7,4.35 C202.8,4.45 202.7,4.55 202.7,4.65 C202.6,4.55 202.7,4.45 202.7,4.35"/><path id="Fill-385" fill="#F6EB3B" d="M202.8,4.45 C202.8,4.35 202.9,4.35 202.9,4.35 C202.9,4.45 202.8,4.35 202.8,4.45"/><path id="Fill-386" fill="#F6EB3B" d="M197.2,4.95 C197.2,4.85 197.2,4.85 197.2,4.75 C197.3,4.75 197.3,4.75 197.4,4.75 C197.4,4.85 197.3,4.85 197.4,5.05 C197.3,5.05 197.3,4.95 197.2,4.95"/><path id="Fill-387" fill="#F6EB3B" d="M197.4,4.85 C197.4,4.75 197.5,4.75 197.5,4.75 C197.5,4.85 197.4,4.85 197.4,4.85"/><path id="Fill-388" fill="#F6EB3B" d="M197.6,4.75 C197.6,4.75 197.6,4.85 197.6,4.75"/><path id="Fill-389" fill="#F6EB3B" d="M196.7,4.65 C196.8,4.65 196.9,4.65 196.9,4.85 C196.8,4.85 196.8,4.85 196.7,4.85 C196.7,4.85 196.7,4.75 196.7,4.65"/><path id="Fill-390" fill="#F6EB3B" d="M196.9,4.75 C196.9,4.75 196.9,4.85 196.9,4.75"/><path id="Fill-391" fill="#F6EB3B" d="M200.7,4.65 C200.7,4.55 200.7,4.55 200.7,4.65 C200.8,4.65 200.7,4.65 200.7,4.65"/><path id="Fill-392" fill="#F6EB3B" d="M201.4,4.55 C201.4,4.65 201.2,4.65 201.1,4.75 C201.1,4.55 201.2,4.55 201.4,4.55"/><path id="Fill-393" fill="#F6EB3B" d="M201.8,4.55 C202,4.25 201.9,4.95 201.8,4.55"/><path id="Fill-394" fill="#F6EB3B" d="M201.6,4.45 C201.6,4.45 201.6,4.55 201.6,4.45"/><path id="Fill-395" fill="#F6EB3B" d="M201.8,4.55 C201.8,4.45 201.8,4.45 201.8,4.55 C201.8,4.45 201.8,4.55 201.8,4.55"/><path id="Fill-396" fill="#F6EB3B" d="M202,4.45 C201.9,4.55 202,4.35 202,4.45"/><path id="Fill-397" fill="#F6EB3B" d="M201.4,4.55 C201.5,4.45 201.4,4.65 201.4,4.55"/><path id="Fill-398" fill="#F6EB3B" d="M201.8,4.45 C201.8,4.65 201.7,4.55 201.8,4.45"/><path id="Fill-399" fill="#F6EB3B" d="M202.3,4.45 C202.3,4.55 202.2,4.55 202.3,4.45"/><path id="Fill-400" fill="#F6EB3B" d="M202.5,4.55 C202.5,4.45 202.6,4.55 202.5,4.55"/><path id="Fill-401" fill="#F6EB3B" d="M201.9,4.75 C201.9,4.35 201.9,5.05 201.9,4.75"/><path id="Fill-402" fill="#F6EB3B" d="M202.2,4.65 C202.3,4.35 202.3,5.05 202.2,4.65"/><path id="Fill-403" fill="#F6EB3B" d="M203.4,4.75 C203.4,4.65 203.5,4.75 203.4,4.75"/><path id="Fill-404" fill="#F6EB3B" d="M203.1,4.85 C203,4.75 203.1,4.85 203.1,4.85"/><path id="Fill-405" fill="#F6EB3B" d="M203.3,4.85 C203.3,4.75 203.3,4.75 203.3,4.85 C203.4,4.85 203.3,4.85 203.3,4.85"/><path id="Fill-406" fill="#F6EB3B" d="M199.6,5.15 C199.7,4.75 199.7,5.55 199.6,5.15"/><path id="Fill-407" fill="#F6EB3B" d="M199.7,5.15 C199.8,4.75 199.8,5.55 199.7,5.15"/><path id="Fill-408" fill="#F6EB3B" d="M199.4,5.25 C199.4,5.15 199.4,5.25 199.4,5.25"/><path id="Fill-409" fill="#F6EB3B" d="M199.8,5.25 C199.8,5.15 199.9,5.15 200,5.15 C200,5.25 199.9,5.25 199.8,5.25"/><path id="Fill-410" fill="#F6EB3B" d="M200.1,5.15 C200.1,5.15 200.1,5.25 200.1,5.15"/><path id="Fill-411" fill="#F6EB3B" d="M200.8,5.15 C200.7,5.15 200.8,5.25 200.8,5.15"/><path id="Fill-412" fill="#F6EB3B" d="M202,4.85 C202.2,5.05 202.3,4.75 202.5,4.85 C202.5,5.05 202.3,4.95 202.4,5.05 C202.4,5.05 202,5.25 202,4.85"/><path id="Fill-413" fill="#F6EB3B" d="M202.5,4.95 C202.5,4.85 202.6,4.95 202.5,4.95"/><path id="Fill-414" fill="#F6EB3B" d="M201.7,5.15 C201.8,4.85 201.8,5.55 201.7,5.15"/><path id="Fill-415" fill="#F6EB3B" d="M201.4,5.05 C201.4,5.05 201.5,5.05 201.5,5.05 C201.5,5.15 201.5,5.15 201.5,5.25 C201.5,5.25 201.4,5.25 201.4,5.25 C201.4,5.15 201.4,5.05 201.4,5.05"/><path id="Fill-416" fill="#F6EB3B" d="M198.5,5.35 C198.5,5.15 198.8,5.25 198.9,5.25 C198.8,5.45 198.6,5.25 198.5,5.35"/><path id="Fill-417" fill="#F6EB3B" d="M199.4,5.25 C199.3,5.25 199.3,5.15 199.4,5.25"/><path id="Fill-418" fill="#F6EB3B" d="M201.5,5.25 C201.5,5.15 201.6,5.25 201.5,5.25"/><path id="Fill-419" fill="#F6EB3B" d="M202.6,5.15 C202.6,5.15 202.7,5.25 202.6,5.15"/><path id="Fill-420" fill="#F6EB3B" d="M197.7,5.55 C197.7,5.25 197.9,5.45 198,5.35 C198,5.75 197.8,5.25 197.7,5.55"/><path id="Fill-421" fill="#F6EB3B" d="M199,5.35 C199,5.25 199.1,5.25 199,5.35 C199.1,5.35 199.1,5.35 199,5.35"/><path id="Fill-422" fill="#F6EB3B" d="M199.3,5.25 C199.4,5.25 199.4,5.25 199.3,5.25 C199.4,5.35 199.3,5.35 199.3,5.25"/><path id="Fill-423" fill="#F6EB3B" d="M202.1,5.25 C201.9,5.35 202,4.95 202.1,5.25"/><path id="Fill-424" fill="#F6EB3B" d="M199,5.45 C198.9,5.35 199,5.45 199,5.45"/><path id="Fill-425" fill="#F6EB3B" d="M199.4,5.35 C199.8,5.15 199.5,5.65 199.4,5.35"/><path id="Fill-426" fill="#F6EB3B" d="M200,5.35 C200,5.35 200.1,5.25 200,5.35 C200.1,5.35 200.1,5.35 200,5.35"/><path id="Fill-427" fill="#F6EB3B" d="M200.1,5.35 C200.2,5.25 200.4,5.45 200.6,5.35 C200.6,5.45 200.5,5.45 200.5,5.65 C200.4,5.25 200.1,5.75 200.1,5.35"/><path id="Fill-428" fill="#F6EB3B" d="M200.8,5.35 C200.8,5.25 200.9,5.25 200.8,5.35"/><path id="Fill-429" fill="#F6EB3B" d="M200.3,5.15 C200.3,5.25 200.3,5.25 200.3,5.15 C200.3,5.25 200.3,5.25 200.3,5.15"/><path id="Fill-430" fill="#F6EB3B" d="M202.4,5.25 C202.4,5.15 202.5,5.15 202.5,5.15 C202.5,5.25 202.5,5.25 202.4,5.25"/><path id="Fill-431" fill="#F6EB3B" d="M198.3,5.45 C198.3,5.45 198.4,5.55 198.3,5.45"/><path id="Fill-432" fill="#F6EB3B" d="M198.4,5.45 C198.4,5.45 198.4,5.55 198.4,5.45"/><path id="Fill-433" fill="#F6EB3B" d="M199.7,5.45 C199.7,5.35 199.7,5.45 199.7,5.45"/><path id="Fill-434" fill="#F6EB3B" d="M199.7,5.45 C199.7,5.35 199.8,5.35 199.8,5.35 C199.8,5.45 199.8,5.45 199.7,5.45"/><path id="Fill-435" fill="#F6EB3B" d="M200.2,5.35 C200.1,5.45 199.9,5.55 199.9,5.45 C199.9,5.25 200.1,5.45 200.2,5.35"/><path id="Fill-436" fill="#F6EB3B" d="M200.5,5.35 C200.4,5.35 200.5,5.45 200.5,5.35"/><path id="Fill-437" fill="#F6EB3B" d="M200.3,5.25 C200.5,5.15 200.3,5.55 200.3,5.25"/><path id="Fill-438" fill="#F6EB3B" d="M199.4,5.45 C199.4,5.35 199.4,5.45 199.4,5.45"/><path id="Fill-439" fill="#F6EB3B" d="M201.6,5.25 C201.7,5.25 201.7,5.45 201.8,5.45 C201.7,5.65 201.5,5.45 201.6,5.25"/><path id="Fill-440" fill="#F6EB3B" d="M195.8,6.15 C195.7,6.25 197.1,5.75 197.2,6.05 L195.8,6.15"/><path id="Fill-441" fill="#F6EB3B" d="M199,5.65 C199,5.55 199.1,5.55 199.1,5.55 C199.2,5.65 199.1,5.65 199,5.65"/><path id="Fill-442" fill="#F6EB3B" d="M200.4,5.55 C200.4,5.45 200.4,5.55 200.4,5.55"/><path id="Fill-443" fill="#F6EB3B" d="M201.2,5.45 C201.1,5.35 201.2,5.45 201.2,5.45"/><path id="Fill-444" fill="#F6EB3B" d="M201.9,5.45 C201.9,5.45 201.9,5.55 201.9,5.45"/><path id="Fill-445" fill="#F6EB3B" d="M202,5.45 C202,5.35 202,5.35 202.1,5.35 C202.1,5.45 202,5.45 202,5.45"/><path id="Fill-446" fill="#F6EB3B" d="M175.1,6.45 C175.1,6.45 175.2,6.55 175.1,6.45"/><path id="Fill-447" fill="#F6EB3B" d="M200.3,5.55 C200.3,5.55 200.3,5.65 200.3,5.55"/><path id="Fill-448" fill="#F6EB3B" d="M201.1,5.55 C201.1,5.55 201.1,5.65 201.1,5.55"/><path id="Fill-449" fill="#F6EB3B" d="M199.9,5.65 C199.9,5.35 200.1,5.65 200.1,5.95 C200,5.95 200,5.65 199.9,5.65"/><path id="Fill-450" fill="#F6EB3B" d="M200.7,5.65 C200.7,5.25 200.7,6.05 200.7,5.65"/><path id="Fill-451" fill="#F6EB3B" d="M200.7,5.65 C200.7,5.55 200.8,5.55 200.8,5.55 C200.8,5.65 200.8,5.65 200.7,5.65"/><path id="Fill-452" fill="#F6EB3B" d="M200.2,5.75 C200,5.85 200.2,5.45 200.2,5.75"/><path id="Fill-453" fill="#F6EB3B" d="M200.1,5.75 C200.2,5.75 200.2,5.55 200.3,5.75 C200.3,5.85 200.1,6.15 200.1,5.75"/><path id="Fill-454" fill="#F6EB3B" d="M175.2,6.65 C175.2,6.65 175.3,6.65 175.4,6.65 C175.5,6.95 175.2,6.75 175.3,7.05 C175.1,6.95 175.2,6.75 175.2,6.65"/><path id="Fill-455" fill="#F6EB3B" d="M200.5,5.75 C200.5,5.95 200.4,5.95 200.3,5.95 C200.3,5.65 200.4,5.75 200.5,5.75"/><path id="Fill-456" fill="#F6EB3B" d="M200.5,5.75 C200.6,5.75 200.7,5.75 200.6,5.95 C200.6,5.95 200.5,5.95 200.5,5.95 C200.5,5.85 200.5,5.75 200.5,5.75"/><path id="Fill-457" fill="#F6EB3B" d="M200.8,5.75 C200.7,5.75 200.7,5.65 200.8,5.75"/><path id="Fill-458" fill="#F6EB3B" d="M201.3,5.85 C201,5.95 201.2,5.45 201.3,5.85"/><path id="Fill-459" fill="#F6EB3B" d="M200.8,5.75 C200.8,5.75 200.8,5.85 200.8,5.75"/><path id="Fill-460" fill="#F6EB3B" d="M200.9,5.85 C200.9,5.75 201,5.75 201,5.75 C201,5.85 200.9,5.85 200.9,5.85"/><path id="Fill-461" fill="#F6EB3B" d="M201,5.85 C201,5.75 201.1,5.75 201.1,5.75 C201.1,5.85 201,5.85 201,5.85"/><path id="Fill-462" fill="#F6EB3B" d="M201.3,5.75 C201.2,5.75 201.3,5.85 201.3,5.75"/><path id="Fill-463" fill="#F6EB3B" d="M198.3,6.05 C198.3,5.95 198.4,5.95 198.4,6.05 C198.4,6.05 198.4,6.05 198.3,6.05"/><path id="Fill-464" fill="#F6EB3B" d="M201.8,5.85 C201.8,5.75 201.9,5.75 201.9,5.85 C201.9,5.95 201.9,5.85 201.8,5.85"/><path id="Fill-465" fill="#F6EB3B" d="M199.1,6.15 C199.1,6.05 199.1,6.15 199.1,6.15"/><path id="Fill-466" fill="#F6EB3B" d="M199.3,6.05 C199.3,6.05 199.4,6.15 199.3,6.05"/><path id="Fill-467" fill="#F6EB3B" d="M199.9,5.95 C199.9,5.95 200,6.05 199.9,5.95"/><path id="Fill-468" fill="#F6EB3B" d="M200.5,6.15 C200.5,6.35 200.3,6.15 200.2,6.25 C200.3,5.95 200.3,6.25 200.5,6.15"/><path id="Fill-469" fill="#F6EB3B" d="M200.5,6.15 C200.5,6.05 200.6,6.15 200.5,6.15"/><path id="Fill-470" fill="#F6EB3B" d="M200.2,6.35 C200.1,6.35 200.2,6.45 200.2,6.35"/><path id="Fill-471" fill="#F6EB3B" d="M200.2,6.35 C200.2,6.35 200.3,6.45 200.2,6.35"/><path id="Fill-472" fill="#F6EB3B" d="M200.7,6.25 C200.7,6.25 200.8,6.25 200.8,6.25 C200.8,6.45 200.7,6.45 200.7,6.45 C200.6,6.35 200.7,6.35 200.7,6.25"/><path id="Fill-473" fill="#F6EB3B" d="M200.8,6.25 C200.8,6.15 200.9,6.15 200.9,6.15 C200.9,6.25 200.8,6.25 200.8,6.25"/><path id="Fill-474" fill="#F6EB3B" d="M201.6,6.25 C201.5,6.25 201.6,6.15 201.6,6.25"/><path id="Fill-475" fill="#F6EB3B" d="M201.6,6.25 C201.7,6.25 201.6,6.35 201.6,6.25"/><path id="Fill-476" fill="#F6EB3B" d="M200.5,6.45 C200.5,6.35 200.5,6.45 200.5,6.45"/><path id="Fill-477" fill="#F6EB3B" d="M199.5,6.65 C199.4,6.15 199.7,6.75 199.5,6.65"/><path id="Fill-478" fill="#F6EB3B" d="M199.6,6.65 C199.6,6.55 199.7,6.55 199.7,6.55 C199.7,6.65 199.6,6.55 199.6,6.65"/><path id="Fill-479" fill="#F6EB3B" d="M199.7,6.65 C199.7,6.65 199.8,6.65 199.7,6.65 C199.8,6.75 199.8,6.75 199.8,6.85 C199.8,6.85 199.7,6.85 199.7,6.85 C199.7,6.75 199.7,6.75 199.7,6.65"/><path id="Fill-480" fill="#F6EB3B" d="M200.8,6.65 C200.8,6.65 200.8,6.75 200.8,6.65"/><path id="Fill-481" fill="#F6EB3B" d="M201.1,6.65 C201.2,6.35 201.2,6.95 201.4,6.75 C201.4,6.95 201.2,6.85 201.1,6.85 C201,6.75 201.1,6.75 201.1,6.65 C201.1,6.65 201.1,6.65 201.1,6.65"/><path id="Fill-482" fill="#F6EB3B" d="M201.3,6.55 C201.5,6.55 201.6,6.65 201.7,6.55 C201.9,6.65 201.7,6.75 201.7,6.95 C201.6,6.85 201.5,6.85 201.3,6.85 C201.3,6.75 201.3,6.65 201.3,6.55"/><path id="Fill-483" fill="#F6EB3B" d="M199.5,6.85 C199.5,6.75 199.6,6.75 199.6,6.75 C199.7,6.75 199.6,6.75 199.5,6.85"/><path id="Fill-484" fill="#F6EB3B" d="M199.9,6.75 C199.9,6.65 200,6.65 200,6.65 C200,6.75 199.9,6.75 199.9,6.75"/><path id="Fill-485" fill="#F6EB3B" d="M200.2,6.75 C200.2,6.75 200.2,6.85 200.2,6.75"/><path id="Fill-486" fill="#F6EB3B" d="M200.4,6.75 C200.4,6.65 200.4,6.75 200.4,6.75"/><path id="Fill-487" fill="#F6EB3B" d="M197.7,6.95 C197.8,6.95 197.7,7.15 197.8,7.25 C197.6,7.15 197.7,7.25 197.5,7.15 C197.5,6.95 197.8,7.25 197.7,6.95"/><path id="Fill-488" fill="#F6EB3B" d="M198.2,7.15 C197.6,7.45 197.4,7.15 196.7,7.25 C197.2,6.85 197.8,7.05 198.2,7.15 C198.2,7.05 198.2,7.15 198.2,7.15"/><path id="Fill-489" fill="#F6EB3B" d="M200.6,6.75 C200.5,6.75 200.6,6.85 200.6,6.75"/><path id="Fill-490" fill="#F6EB3B" d="M200.9,6.75 C200.8,6.75 200.9,6.85 200.9,6.75"/><path id="Fill-491" fill="#F6EB3B" d="M201.6,6.75 C201.6,6.85 201.5,6.75 201.6,6.75"/><path id="Fill-492" fill="#F6EB3B" d="M198.4,7.05 C198.4,7.05 198.4,7.15 198.4,7.05"/><path id="Fill-493" fill="#F6EB3B" d="M200.1,7.15 C199.6,7.35 199.1,7.15 198.5,7.15 C199,6.95 199.5,6.95 200.1,7.15"/><path id="Fill-494" fill="#F6EB3B" d="M198.2,7.15 C198.6,6.95 198.4,7.35 198.2,7.15"/><path id="Fill-495" fill="#F6EB3B" d="M200.1,7.15 C200.2,7.05 200.3,6.95 200.3,7.05 C200.3,7.25 200.2,7.35 200.1,7.15"/><path id="Fill-496" fill="#F6EB3B" d="M201.3,7.15 C201.3,7.05 201.4,7.15 201.3,7.15"/><path id="Fill-497" fill="#F6EB3B" d="M199.7,0.55 C199.7,0.45 199.8,0.45 199.8,0.45 C199.8,0.55 199.7,0.55 199.7,0.55"/><path id="Fill-498" fill="#F6EB3B" d="M199.8,0.55 C199.8,0.45 199.9,0.45 199.9,0.45 C199.9,0.55 199.9,0.55 199.8,0.55"/><path id="Fill-501" fill="#F6EB3B" d="M199.3,0.55 C199.2,0.55 199.2,0.45 199.3,0.55"/><path id="Fill-503" fill="#F6EB3B" d="M197,7.55 C197,7.45 197,7.45 197,7.55 C197.1,7.55 197,7.55 197,7.55"/><path id="Fill-504" fill="#F6EB3B" d="M198.4,1.15 C198.5,1.45 199.2,1.45 199.2,1.35 C199.2,0.85 198.4,1.55 198.4,1.15"/><path id="Fill-505" fill="#F6EB3B" d="M199.4,0.55 C199.4,0.55 199.4,0.65 199.4,0.55"/><path id="Fill-506" fill="#F6EB3B" d="M196.2,7.45 C196.4,7.35 196.2,7.85 196.2,7.45"/><path id="Fill-507" fill="#F6EB3B" d="M196,7.55 C196.1,7.55 196.1,7.65 196.2,7.65 C196.2,7.85 196,7.65 196,7.55 C196,7.55 196,7.55 196,7.55"/><path id="Fill-508" fill="#F6EB3B" d="M196.9,7.55 C196.9,7.15 196.9,7.95 196.9,7.55"/><path id="Fill-509" fill="#F6EB3B" d="M196.5,7.55 C196.5,7.55 196.6,7.55 196.6,7.55 C196.6,7.65 196.6,7.65 196.6,7.75 C196.6,7.75 196.5,7.75 196.5,7.75 C196.6,7.65 196.6,7.65 196.5,7.55"/><path id="Fill-510" fill="#F6EB3B" d="M199.3,0.85 C199.4,0.45 199.4,1.25 199.3,0.85"/><path id="Fill-511" fill="#F6EB3B" d="M196.5,7.75 C196.5,7.35 196.5,8.05 196.5,7.75"/><path id="Fill-512" fill="#F6EB3B" d="M196.7,7.65 C196.6,7.65 196.7,7.75 196.7,7.65"/><path id="Fill-513" fill="#F6EB3B" d="M197,7.75 C196.9,7.75 197,7.85 197,7.75"/><path id="Fill-514" fill="#F6EB3B" d="M199.7,0.85 C199.7,0.55 199.9,0.95 199.7,0.85"/><path id="Fill-515" fill="#F6EB3B" d="M199.9,0.85 C199.9,0.75 199.9,0.85 199.9,0.85"/><path id="Fill-516" fill="#F6EB3B" d="M196.2,7.85 C196.2,7.75 196.4,7.75 196.5,7.65 C196.4,7.95 196.2,7.95 196.2,7.85"/><path id="Fill-517" fill="#F6EB3B" d="M199.1,0.95 C199.1,0.95 199.1,1.05 199.1,0.95"/><path id="Fill-518" fill="#F6EB3B" d="M199.8,0.95 C199.8,0.85 199.9,0.85 199.9,0.85 C199.9,0.95 199.9,0.95 199.8,0.95"/><path id="Fill-519" fill="#F6EB3B" d="M199.8,0.85 C199.8,1.05 199.6,1.05 199.4,1.05 C199.4,0.65 199.7,0.85 199.8,0.85"/><path id="Fill-520" fill="#F6EB3B" d="M200.2,0.95 C200.2,0.95 200.2,0.95 200.2,0.95 C200.2,0.95 200.2,0.95 200.2,0.95 C200.2,1.05 200.1,1.05 200,1.05 C200,0.95 200,0.85 200,0.75 C200.1,0.85 200.3,0.75 200.2,0.95 C200.3,0.95 200.2,0.95 200.2,0.95"/><path id="Fill-521" fill="#F6EB3B" d="M198.7,1.65 C198.6,1.75 198.6,1.55 198.7,1.65"/><path id="Fill-522" fill="#F6EB3B" d="M199.8,0.85 C199.8,0.85 199.9,0.95 199.9,0.95 C199.7,1.35 201,0.95 201.2,1.15 C201.1,1.35 200.8,1.35 200.6,1.35 C200.2,1.35 199.8,1.25 199.5,1.35 C199.6,1.05 199.8,0.95 199.9,1.05 C199.7,1.05 199.8,0.95 199.8,0.85"/><path id="Fill-523" fill="#F6EB3B" d="M200.3,0.95 C200.4,0.55 200.4,1.35 200.3,0.95"/><path id="Fill-524" fill="#F6EB3B" d="M202.1,0.85 C202.1,0.75 202.2,0.85 202.1,0.85"/><path id="Fill-525" fill="#F6EB3B" d="M196.6,7.95 C196.7,8.05 196.7,8.25 196.8,8.25 C196.8,8.45 196,8.15 196,8.45 C195.9,8.15 196.6,8.15 196.6,7.95"/><path id="Fill-526" fill="#F6EB3B" d="M199.3,1.05 C199.3,0.95 199.3,1.05 199.3,1.05"/><path id="Fill-527" fill="#F6EB3B" d="M199.9,1.05 C199.9,0.95 200,0.95 200.1,0.95 C200.1,1.05 200,1.05 199.9,1.05"/><path id="Fill-528" fill="#F6EB3B" d="M200.5,0.95 C200.5,0.95 200.6,1.05 200.5,0.95"/><path id="Fill-529" fill="#F6EB3B" d="M196.4,8.05 C196.4,7.95 196.5,8.05 196.4,8.05"/><path id="Fill-530" fill="#F6EB3B" d="M196.1,8.05 C196.1,8.05 196.1,8.25 196.1,8.05"/><path id="Fill-531" fill="#F6EB3B" d="M196.3,8.15 C196.1,8.25 196.3,7.85 196.3,8.15"/><path id="Fill-532" fill="#F6EB3B" d="M196.5,8.05 C196.5,8.15 196.3,8.65 196.2,8.15 C196.3,8.05 196.4,8.05 196.5,8.05"/><path id="Fill-533" fill="#F6EB3B" d="M201.5,1.15 C201.4,1.15 201.4,1.35 201.4,1.45 C201.2,1.35 201.3,0.95 201.5,0.95 C201.5,1.05 201.5,1.15 201.5,1.15"/><path id="Path_1_" fill="#F6EB3B" d="M202.3,1.15 C202.3,1.15 202.3,1.15 202.3,1.15 C202.3,1.25 202.3,1.25 202.3,1.15 C202.3,1.15 202.3,1.05 202.4,1.05 C202.9,1.35 203.2,1.05 203.5,1.35 C203.5,1.35 203.5,1.25 203.6,1.15 C203.7,1.25 203.7,1.35 203.6,1.45 C203.1,1.35 202.8,1.45 202.4,1.45 C202.4,1.65 202.1,1.45 202.2,1.35 C201.5,1.35 202.5,1.25 201.6,1.35 C201.6,1.15 201.7,1.25 201.7,1.05 C201.8,1.45 202.2,1.25 202.4,1.05 C203,1.25 201.8,1.25 202.3,1.15 C202.2,1.15 202.3,1.15 202.3,1.15 Z"/><path id="Fill-535" fill="#F6EB3B" d="M202,1.05 C202,0.95 202.1,0.95 202,1.05 C202.1,1.05 202.1,1.05 202,1.05"/><path id="Fill-536" fill="#F6EB3B" d="M196.9,8.15 C196.7,8.25 196.9,7.95 196.9,8.15"/><path id="Fill-537" fill="#F6EB3B" d="M195.9,8.15 C195.8,8.35 195.4,8.35 195.3,8.55 C195.2,8.45 195.1,8.55 195.1,8.25 C195.2,8.15 195.8,8.25 195.9,8.15"/><path id="Fill-538" fill="#F6EB3B" d="M199.2,1.25 C199.1,1.25 199.2,1.35 199.2,1.25"/><path id="Fill-539" fill="#F6EB3B" d="M199.2,1.35 C199.3,0.95 199.3,1.65 199.2,1.35"/><path id="Fill-540" fill="#F6EB3B" d="M201.4,1.15 C201.5,1.15 201.5,1.25 201.6,1.25 C201.6,1.35 201.5,1.45 201.4,1.45 C201.4,1.35 201.4,1.25 201.4,1.15"/><path id="Fill-541" fill="#F6EB3B" d="M195.5,8.35 C195.7,7.95 195.6,8.65 195.5,8.35"/><path id="Fill-542" fill="#F6EB3B" d="M199.7,1.45 C199.6,1.25 199.7,1.35 199.7,1.45"/><path id="Fill-543" fill="#F6EB3B" d="M196.4,8.25 C196.4,8.15 196.9,8.15 197,8.15 C196.9,8.25 196.4,8.25 196.4,8.25"/><path id="Fill-544" fill="#F6EB3B" d="M196.5,8.35 C196.5,8.05 196.7,8.45 196.6,8.65 C196.6,8.65 196.5,8.35 196.5,8.35"/><path id="Fill-545" fill="#F6EB3B" d="M199.2,1.45 C199.2,1.45 199.2,1.55 199.2,1.45"/><path id="Fill-546" fill="#F6EB3B" d="M199.4,1.45 C199.4,1.35 199.5,1.35 199.5,1.35 C199.5,1.45 199.4,1.45 199.4,1.45"/><path id="Fill-547" fill="#F6EB3B" d="M199.7,1.35 C199.7,1.55 199.6,1.45 199.7,1.35"/><path id="Fill-548" fill="#F6EB3B" d="M199.5,1.45 C199.4,1.35 199.5,1.45 199.5,1.45"/><path id="Fill-549" fill="#F6EB3B" d="M199.8,1.45 C199.8,1.35 199.9,1.35 199.9,1.35 C200,1.45 199.9,1.45 199.8,1.45"/><path id="Fill-550" fill="#F6EB3B" d="M200.3,1.35 C200.3,1.35 200.4,1.45 200.3,1.35"/><path id="Fill-551" fill="#F6EB3B" d="M196,8.25 C196,8.45 195.9,8.45 195.8,8.45 C195.8,8.15 195.9,8.35 196,8.25"/><path id="Fill-552" fill="#F6EB3B" d="M199.4,1.55 C199.3,1.65 199.2,1.75 199.1,1.75 C199.1,1.65 200.1,1.55 200.1,1.55 C200.1,1.35 199.2,1.55 199.4,1.55"/><path id="Fill-553" fill="#F6EB3B" d="M201,1.45 C201,1.35 201.1,1.35 201,1.45 C201.1,1.45 201,1.45 201,1.45"/><path id="Fill-554" fill="#F6EB3B" d="M195.8,8.45 C195.8,8.35 195.8,8.35 195.8,8.45 C195.9,8.45 195.8,8.45 195.8,8.45"/><path id="Fill-555" fill="#F6EB3B" d="M204,3.55 C204.1,3.15 204.2,3.85 204,3.55"/><path id="Fill-556" fill="#F6EB3B" d="M200,1.55 C200,1.45 200.1,1.55 200,1.55"/><path id="Fill-557" fill="#F6EB3B" d="M201.6,1.45 C201.6,1.35 201.6,1.45 201.6,1.45"/><path id="Fill-558" fill="#F6EB3B" d="M203.7,1.45 C203.7,1.35 203.7,1.25 203.7,1.15 C203.8,1.15 203.8,1.25 203.9,1.25 C203.9,1.45 203.7,1.65 203.7,1.45"/><path id="Fill-559" fill="#F6EB3B" d="M196.1,8.35 C196.1,8.35 196.1,8.35 196.1,8.35 C196.1,8.45 196.1,8.45 196.1,8.35"/><path id="Fill-560" fill="#F6EB3B" d="M200.4,1.55 C200.4,1.55 200.4,1.65 200.4,1.55"/><path id="Fill-561" fill="#F6EB3B" d="M202.4,1.45 C202.3,1.45 202.4,1.55 202.4,1.45"/><path id="Fill-562" fill="#F6EB3B" d="M202.5,1.45 C202.5,1.35 202.6,1.35 202.7,1.35 C202.6,1.45 202.5,1.45 202.5,1.45"/><path id="Fill-563" fill="#F6EB3B" d="M202.8,1.45 C202.7,1.45 202.8,1.55 202.8,1.45"/><path id="Fill-564" fill="#F6EB3B" d="M202.9,1.45 C202.9,1.35 203,1.35 202.9,1.45 C203,1.45 203,1.45 202.9,1.45"/><path id="Fill-565" fill="#F6EB3B" d="M203.9,1.35 C203.8,1.25 203.9,1.35 203.9,1.35"/><path id="Fill-566" fill="#F6EB3B" d="M196,8.45 C196.1,8.45 196,8.55 196,8.45"/><path id="Fill-567" fill="#F6EB3B" d="M203.5,1.45 C203.4,1.45 203.5,1.55 203.5,1.45"/><path id="Fill-568" fill="#F6EB3B" d="M203.6,1.45 C203.6,1.35 203.7,1.35 203.7,1.35 C203.7,1.45 203.6,1.45 203.6,1.45"/><path id="Fill-569" fill="#F6EB3B" d="M204,1.35 C204,1.35 204.1,1.45 204,1.35"/><path id="Fill-570" fill="#F6EB3B" d="M202.4,1.55 C202.4,1.45 202.5,1.45 202.5,1.45 C202.6,1.55 202.5,1.55 202.4,1.55"/><path id="Fill-571" fill="#F6EB3B" d="M203,1.65 C203,1.55 203.1,1.65 203,1.65"/><path id="Fill-572" fill="#F6EB3B" d="M204.1,1.45 C204,1.45 204.1,1.55 204.1,1.45"/><path id="Fill-574" fill="#F6EB3B" d="M191.6,12.95 C191.6,13.05 191.6,13.05 191.6,12.95"/><path id="Fill-575" fill="#F6EB3B" d="M191.4,13.05 C191.4,13.05 191.4,13.15 191.4,13.05"/><path id="Fill-576" fill="#F6EB3B" d="M191.5,13.15 C191.5,13.05 191.6,13.05 191.6,13.05 C191.6,13.15 191.5,13.05 191.5,13.15"/><path id="Fill-577" fill="#F6EB3B" d="M189.3,12.85 C189.5,12.45 189.5,13.05 189.3,12.85"/><path id="Fill-578" fill="#F6EB3B" d="M190.2,12.75 C190.2,12.55 190.2,12.65 190.2,12.85 C190.1,12.85 190.3,12.75 190.2,12.75"/><path id="Fill-579" fill="#F6EB3B" d="M191.3,12.55 C191.4,12.55 191.3,12.75 191.3,12.55"/><path id="Fill-580" fill="#F6EB3B" d="M192,13.15 C191.9,13.05 192,13.15 192,13.15"/><path id="Fill-581" fill="#F6EB3B" d="M189.1,12.85 C189.1,12.85 189.2,12.95 189.1,12.85"/><path id="Fill-582" fill="#F6EB3B" d="M190,12.85 C190,12.45 190,13.25 190,12.85"/><path id="Fill-583" fill="#F6EB3B" d="M188.7,12.95 C188.6,12.85 188.7,12.95 188.7,12.95"/><path id="Fill-584" fill="#F6EB3B" d="M190.4,12.95 C190.3,12.95 190.4,13.05 190.4,12.95"/></g></g></svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-index-ventures.png b/website/images/logos/logo-index-ventures.png
deleted file mode 100644
index 5bf804bc8b7..00000000000
Binary files a/website/images/logos/logo-index-ventures.png and /dev/null differ
diff --git a/website/images/logos/logo-leadedge-capital.png b/website/images/logos/logo-leadedge-capital.png
deleted file mode 100644
index 2c7671bfd67..00000000000
Binary files a/website/images/logos/logo-leadedge-capital.png and /dev/null differ
diff --git a/website/images/logos/logo-lightspeed.png b/website/images/logos/logo-lightspeed.png
deleted file mode 100644
index 6c8a6e5689c..00000000000
Binary files a/website/images/logos/logo-lightspeed.png and /dev/null differ
diff --git a/website/images/logos/logo-redpoint.png b/website/images/logos/logo-redpoint.png
deleted file mode 100644
index baf5a9a7392..00000000000
Binary files a/website/images/logos/logo-redpoint.png and /dev/null differ
diff --git a/website/images/logos/logo-spotify.png b/website/images/logos/logo-spotify.png
deleted file mode 100644
index bc7c102e6ae..00000000000
Binary files a/website/images/logos/logo-spotify.png and /dev/null differ
diff --git a/website/images/logos/logo-uber.png b/website/images/logos/logo-uber.png
deleted file mode 100644
index cb820664636..00000000000
Binary files a/website/images/logos/logo-uber.png and /dev/null differ
diff --git a/website/images/logos/logo-yandex.png b/website/images/logos/logo-yandex.png
deleted file mode 100644
index 02ea52f2c7f..00000000000
Binary files a/website/images/logos/logo-yandex.png and /dev/null differ
diff --git a/website/images/mkdocs/copy.svg b/website/images/mkdocs/copy.svg
deleted file mode 100644
index 2182fe439f6..00000000000
--- a/website/images/mkdocs/copy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="21" fill="none" viewBox="0 0 18 21"><path fill="#C9C9C9" d="M5.80019 0.600098C4.91619 0.600098 4.2002 1.3161 4.2002 2.2001V15.0001C4.2002 15.8841 4.91619 16.6001 5.80019 16.6001H16.2002C17.0842 16.6001 17.8002 15.8841 17.8002 15.0001V5.8001C17.8002 5.5881 17.7162 5.38487 17.5658 5.23447L13.1658 0.834473C13.0154 0.684073 12.8122 0.600098 12.6002 0.600098H5.80019ZM12.2002 2.12354L16.2768 6.2001H13.0002C12.5586 6.2001 12.2002 5.8417 12.2002 5.4001V2.12354ZM1.8002 4.6001C0.916195 4.6001 0.200195 5.3161 0.200195 6.2001V19.0001C0.200195 19.8841 0.916195 20.6001 1.8002 20.6001H12.2002C13.0842 20.6001 13.8002 19.8841 13.8002 19.0001V18.2001H5.80019C4.03539 18.2001 2.6002 16.7649 2.6002 15.0001V4.6001H1.8002Z"/></svg>
\ No newline at end of file
diff --git a/website/images/mkdocs/edit.svg b/website/images/mkdocs/edit.svg
deleted file mode 100644
index e12ba890f2e..00000000000
--- a/website/images/mkdocs/edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="none" viewBox="0 0 12 12"><path fill="#eee" d="M11.6658 3.33622C12.1114 2.89061 12.1114 2.16356 11.6658 1.7414L10.2586 0.334208C9.83644 -0.111403 9.10939 -0.111403 8.66378 0.334208L7.58493 1.41306C7.49112 1.50687 7.49112 1.69449 7.58493 1.81176L10.1882 4.41507C10.3055 4.50888 10.4931 4.50888 10.5869 4.41507L11.6658 3.33622ZM6.67026 2.32773L0.502068 8.49592L0.00955113 11.3338C-0.0608085 11.7325 0.267536 12.0608 0.666241 11.9904L3.50408 11.4979L9.67227 5.32974C9.78954 5.23593 9.78954 5.0483 9.67227 4.93104L7.06896 2.32773C6.9517 2.23392 6.76407 2.23392 6.67026 2.32773ZM2.91775 7.9565C2.77703 7.83923 2.77703 7.62815 2.91775 7.51089L6.52954 3.89909C6.64681 3.75838 6.85789 3.75838 6.97515 3.89909C7.11587 4.01636 7.11587 4.22744 6.97515 4.34471L3.36336 7.9565C3.24609 8.09722 3.03501 8.09722 2.91775 7.9565ZM2.07343 9.92657H3.19919V10.7943L1.67473 11.0523L0.947679 10.3253L1.20566 8.80081H2.07343V9.92657Z"/></svg>
\ No newline at end of file
diff --git a/website/images/mkdocs/multi.svg b/website/images/mkdocs/multi.svg
deleted file mode 100644
index 2ae85a1d227..00000000000
--- a/website/images/mkdocs/multi.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#C4C4C4" d="M3.18138 2.5C2.80526 2.5 2.5 2.80545 2.5 3.18182V5.90909C2.5 6.28545 2.80526 6.59091 3.18138 6.59091H6.58826C6.96438 6.59091 7.26964 6.28545 7.26964 5.90909V3.18182C7.26964 2.80545 6.96438 2.5 6.58826 2.5H3.18138ZM9.99515 3.86364C9.90486 3.86236 9.81521 3.87905 9.73143 3.91274C9.64764 3.94643 9.57138 3.99645 9.50708 4.05989C9.44277 4.12333 9.39172 4.19893 9.35686 4.28228C9.32201 4.36564 9.30407 4.4551 9.30407 4.54545C9.30407 4.63581 9.32201 4.72527 9.35686 4.80863C9.39172 4.89198 9.44277 4.96758 9.50708 5.03102C9.57138 5.09446 9.64764 5.14448 9.73143 5.17817C9.81521 5.21186 9.90486 5.22855 9.99515 5.22727H16.8089C16.8992 5.22855 16.9889 5.21186 17.0726 5.17817C17.1564 5.14448 17.2327 5.09446 17.297 5.03102C17.3613 4.96758 17.4124 4.89198 17.4472 4.80863C17.4821 4.72527 17.5 4.63581 17.5 4.54545C17.5 4.4551 17.4821 4.36564 17.4472 4.28228C17.4124 4.19893 17.3613 4.12333 17.297 4.05989C17.2327 3.99645 17.1564 3.94643 17.0726 3.91274C16.9889 3.87905 16.8992 3.86236 16.8089 3.86364H9.99515ZM3.18138 7.95455C2.80526 7.95455 2.5 8.26 2.5 8.63636V11.3636C2.5 11.74 2.80526 12.0455 3.18138 12.0455H6.58826C6.96438 12.0455 7.26964 11.74 7.26964 11.3636V8.63636C7.26964 8.26 6.96438 7.95455 6.58826 7.95455H3.18138ZM9.99515 9.31818C9.90486 9.3169 9.81521 9.3336 9.73143 9.36729C9.64764 9.40098 9.57138 9.451 9.50708 9.51444C9.44277 9.57788 9.39172 9.65347 9.35686 9.73683C9.32201 9.82018 9.30407 9.90964 9.30407 10C9.30407 10.0904 9.32201 10.1798 9.35686 10.2632C9.39172 10.3465 9.44277 10.4221 9.50708 10.4856C9.57138 10.549 9.64764 10.599 9.73143 10.6327C9.81521 10.6664 9.90486 10.6831 9.99515 10.6818H16.8089C16.8992 10.6831 16.9889 10.6664 17.0726 10.6327C17.1564 10.599 17.2327 10.549 17.297 10.4856C17.3613 10.4221 17.4124 10.3465 17.4472 10.2632C17.4821 10.1798 17.5 10.0904 17.5 10C17.5 9.90964 17.4821 9.82018 17.4472 9.73683C17.4124 9.65347 17.3613 9.57788 17.297 9.51444C17.2327 9.451 17.1564 9.40098 17.0726 9.36729C16.9889 9.3336 16.8992 9.3169 16.8089 9.31818H9.99515ZM3.18138 13.4091C2.80526 13.4091 2.5 13.7145 2.5 14.0909V16.8182C2.5 17.1945 2.80526 17.5 3.18138 17.5H6.58826C6.96438 17.5 7.26964 17.1945 7.26964 16.8182V14.0909C7.26964 13.7145 6.96438 13.4091 6.58826 13.4091H3.18138ZM9.99515 14.7727C9.90486 14.7714 9.81521 14.7881 9.73143 14.8218C9.64764 14.8555 9.57138 14.9055 9.50708 14.969C9.44277 15.0324 9.39172 15.108 9.35686 15.1914C9.32201 15.2747 9.30407 15.3642 9.30407 15.4545C9.30407 15.5449 9.32201 15.6344 9.35686 15.7177C9.39172 15.8011 9.44277 15.8767 9.50708 15.9401C9.57138 16.0035 9.64764 16.0536 9.73143 16.0873C9.81521 16.1209 9.90486 16.1376 9.99515 16.1364H16.8089C16.8992 16.1376 16.9889 16.1209 17.0726 16.0873C17.1564 16.0536 17.2327 16.0035 17.297 15.9401C17.3613 15.8767 17.4124 15.8011 17.4472 15.7177C17.4821 15.6344 17.5 15.5449 17.5 15.4545C17.5 15.3642 17.4821 15.2747 17.4472 15.1914C17.4124 15.108 17.3613 15.0324 17.297 14.969C17.2327 14.9055 17.1564 14.8555 17.0726 14.8218C16.9889 14.7881 16.8992 14.7714 16.8089 14.7727H9.99515Z"/></svg>
\ No newline at end of file
diff --git a/website/images/mkdocs/pdf.svg b/website/images/mkdocs/pdf.svg
deleted file mode 100644
index c85df2f41ca..00000000000
--- a/website/images/mkdocs/pdf.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><path fill="#E8E8E8" d="M5.6 2.40002C4.716 2.40002 4 3.11602 4 4.00002V20.8C4 21.684 4.716 22.4 5.6 22.4H18.4C19.284 22.4 20 21.684 20 20.8V8.40002C20 8.18802 19.916 7.9848 19.7656 7.8344L14.5656 2.6344C14.4152 2.484 14.212 2.40002 14 2.40002H5.6ZM13.6 3.92346L18.4766 8.80002H14.4C13.9584 8.80002 13.6 8.44162 13.6 8.00002V3.92346ZM11.2625 9.84065C11.6969 9.84065 12.0611 10.0242 12.2875 10.3578C12.4699 10.625 12.5578 10.9686 12.5578 11.4094C12.5578 12.1654 12.2194 13.3523 11.6922 14.6235C11.9466 15.2003 12.2434 15.7715 12.5594 16.2906C13.2938 16.2954 14.3034 16.3623 15.1266 16.6391C16.3114 17.0359 16.5609 17.6888 16.5609 18.1672C16.5601 18.856 16.0014 19.6 14.7734 19.6C13.8654 19.6 12.8533 18.6788 11.9797 17.4172C11.3429 17.438 10.738 17.5002 10.1828 17.5938C9.16521 19.2586 8.01201 20.561 7.13281 20.561C6.16641 20.561 5.84063 19.6063 5.84063 19.1703C5.84063 17.7999 7.57386 16.9898 9.48906 16.5938C9.85066 15.977 10.2007 15.3101 10.5031 14.6485C10.0575 13.5437 9.78281 12.4634 9.78281 11.661C9.78281 11.1522 9.88735 10.74 10.0938 10.4328C10.3513 10.0504 10.7673 9.84065 11.2625 9.84065ZM11.2609 10.9594C11.0873 10.9594 11.0483 11.0186 11.0219 11.0578C10.9771 11.1242 10.9016 11.2914 10.9016 11.661C10.9016 12.0706 10.9834 12.5497 11.125 13.0625C11.3346 12.4081 11.4543 11.8126 11.4375 11.3406C11.4247 10.9598 11.3329 10.9594 11.2609 10.9594ZM13.3641 17.4438C13.8785 18.0742 14.3815 18.4797 14.7719 18.4797C15.2327 18.4797 15.4391 18.3224 15.4391 18.1656C15.4399 18.0184 15.1775 17.8353 14.7703 17.6985C14.4007 17.5745 13.9177 17.4886 13.3641 17.4438ZM8.59844 17.9797C7.58644 18.3213 6.95938 18.7656 6.95938 19.1688C6.96018 19.1688 7.00485 19.4406 7.13125 19.4406C7.43525 19.4191 7.98884 18.8389 8.59844 17.9797Z"/></svg>
\ No newline at end of file
diff --git a/website/images/mkdocs/search.svg b/website/images/mkdocs/search.svg
deleted file mode 100644
index 2d678d62213..00000000000
--- a/website/images/mkdocs/search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="15" fill="none" viewBox="0 0 14 15"><path fill="#7E7E84" d="M5.82981 0.727295C2.617 0.727295 0 3.26499 0 6.38045C0 9.4959 2.617 12.0336 5.82981 12.0336C7.22693 12.0336 8.51 11.5525 9.51558 10.7539L12.9964 14.1292C13.0501 14.1835 13.1144 14.2268 13.1856 14.2567C13.2568 14.2865 13.3335 14.3023 13.411 14.303C13.4886 14.3038 13.5655 14.2895 13.6373 14.2611C13.7091 14.2327 13.7744 14.1906 13.8292 14.1375C13.8841 14.0843 13.9274 14.021 13.9567 13.9514C13.9861 13.8817 14.0008 13.8071 14 13.7319C13.9992 13.6567 13.9829 13.5824 13.9522 13.5134C13.9214 13.4443 13.8767 13.3819 13.8208 13.3298L10.3399 9.95452C11.1635 8.97942 11.6596 7.73523 11.6596 6.38045C11.6596 3.26499 9.04262 0.727295 5.82981 0.727295ZM5.82981 1.85793C8.41249 1.85793 10.4937 3.87603 10.4937 6.38045C10.4937 8.88486 8.41249 10.903 5.82981 10.903C3.24713 10.903 1.16596 8.88486 1.16596 6.38045C1.16596 3.87603 3.24713 1.85793 5.82981 1.85793Z"/></svg>
\ No newline at end of file
diff --git a/website/images/mkdocs/single.svg b/website/images/mkdocs/single.svg
deleted file mode 100644
index 077561b8c58..00000000000
--- a/website/images/mkdocs/single.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#C4C4C4" fill-rule="evenodd" d="M3.5 3C3.22386 3 3 3.22386 3 3.5V6.5C3 6.77614 3.22386 7 3.5 7H5V9V10V15.5C5 15.7761 5.22386 16 5.5 16H6H12V17C12 17.2761 12.2239 17.5 12.5 17.5H16.5C16.7761 17.5 17 17.2761 17 17V14C17 13.7239 16.7761 13.5 16.5 13.5H12.5C12.2239 13.5 12 13.7239 12 14V15H6V10L12 10V11C12 11.2761 12.2239 11.5 12.5 11.5H16.5C16.7761 11.5 17 11.2761 17 11V8C17 7.72386 16.7761 7.5 16.5 7.5H12.5C12.2239 7.5 12 7.72386 12 8V9L6 9V7H7.5C7.77614 7 8 6.77614 8 6.5V3.5C8 3.22386 7.77614 3 7.5 3H3.5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/website/images/photos/aaron-katz.jpg b/website/images/photos/aaron-katz.jpg
deleted file mode 100644
index 3e03047a247..00000000000
Binary files a/website/images/photos/aaron-katz.jpg and /dev/null differ
diff --git a/website/images/photos/alexander-sapin.jpg b/website/images/photos/alexander-sapin.jpg
deleted file mode 100644
index 8f132c6f406..00000000000
Binary files a/website/images/photos/alexander-sapin.jpg and /dev/null differ
diff --git a/website/images/photos/alexander-tokmakov.jpg b/website/images/photos/alexander-tokmakov.jpg
deleted file mode 100644
index dcee6b9d551..00000000000
Binary files a/website/images/photos/alexander-tokmakov.jpg and /dev/null differ
diff --git a/website/images/photos/alexey-milovidov.jpg b/website/images/photos/alexey-milovidov.jpg
deleted file mode 100644
index 9b5b5a12e88..00000000000
Binary files a/website/images/photos/alexey-milovidov.jpg and /dev/null differ
diff --git a/website/images/photos/andy-james.jpg b/website/images/photos/andy-james.jpg
deleted file mode 100644
index d1f5b47f39c..00000000000
Binary files a/website/images/photos/andy-james.jpg and /dev/null differ
diff --git a/website/images/photos/anne-carlhoff.jpg b/website/images/photos/anne-carlhoff.jpg
deleted file mode 100644
index 4bbc9265585..00000000000
Binary files a/website/images/photos/anne-carlhoff.jpg and /dev/null differ
diff --git a/website/images/photos/anne-krechmer.jpg b/website/images/photos/anne-krechmer.jpg
deleted file mode 100644
index 1333ec4774b..00000000000
Binary files a/website/images/photos/anne-krechmer.jpg and /dev/null differ
diff --git a/website/images/photos/anton-popov.jpg b/website/images/photos/anton-popov.jpg
deleted file mode 100644
index 86fefbba27a..00000000000
Binary files a/website/images/photos/anton-popov.jpg and /dev/null differ
diff --git a/website/images/photos/arno-van-driel.jpg b/website/images/photos/arno-van-driel.jpg
deleted file mode 100644
index 878ab2c336d..00000000000
Binary files a/website/images/photos/arno-van-driel.jpg and /dev/null differ
diff --git a/website/images/photos/artur-filatenkov.jpg b/website/images/photos/artur-filatenkov.jpg
deleted file mode 100644
index 4fdc7758268..00000000000
Binary files a/website/images/photos/artur-filatenkov.jpg and /dev/null differ
diff --git a/website/images/photos/baird-garrett.jpg b/website/images/photos/baird-garrett.jpg
deleted file mode 100644
index 3400431e379..00000000000
Binary files a/website/images/photos/baird-garrett.jpg and /dev/null differ
diff --git a/website/images/photos/bastian-spanneberg.jpg b/website/images/photos/bastian-spanneberg.jpg
deleted file mode 100644
index 95c9e5b73ac..00000000000
Binary files a/website/images/photos/bastian-spanneberg.jpg and /dev/null differ
diff --git a/website/images/photos/brian-hunter.jpg b/website/images/photos/brian-hunter.jpg
deleted file mode 100644
index d0672bb3cfb..00000000000
Binary files a/website/images/photos/brian-hunter.jpg and /dev/null differ
diff --git a/website/images/photos/caryn-marooney.jpg b/website/images/photos/caryn-marooney.jpg
deleted file mode 100644
index fa0dd29ad1f..00000000000
Binary files a/website/images/photos/caryn-marooney.jpg and /dev/null differ
diff --git a/website/images/photos/christoph-wurm.jpg b/website/images/photos/christoph-wurm.jpg
deleted file mode 100644
index 8a9adac2fb0..00000000000
Binary files a/website/images/photos/christoph-wurm.jpg and /dev/null differ
diff --git a/website/images/photos/claire-lucas.jpg b/website/images/photos/claire-lucas.jpg
deleted file mode 100644
index 4ee45630496..00000000000
Binary files a/website/images/photos/claire-lucas.jpg and /dev/null differ
diff --git a/website/images/photos/dale-mcdiarmid.jpg b/website/images/photos/dale-mcdiarmid.jpg
deleted file mode 100644
index bf590696a87..00000000000
Binary files a/website/images/photos/dale-mcdiarmid.jpg and /dev/null differ
diff --git a/website/images/photos/dmitry-novik.jpg b/website/images/photos/dmitry-novik.jpg
deleted file mode 100644
index d688407e5e4..00000000000
Binary files a/website/images/photos/dmitry-novik.jpg and /dev/null differ
diff --git a/website/images/photos/dorota-szeremeta.jpg b/website/images/photos/dorota-szeremeta.jpg
deleted file mode 100644
index 1e7c0aa2471..00000000000
Binary files a/website/images/photos/dorota-szeremeta.jpg and /dev/null differ
diff --git a/website/images/photos/elissa-weve.jpg b/website/images/photos/elissa-weve.jpg
deleted file mode 100644
index fb65c43c504..00000000000
Binary files a/website/images/photos/elissa-weve.jpg and /dev/null differ
diff --git a/website/images/photos/geoffrey-genz.jpg b/website/images/photos/geoffrey-genz.jpg
deleted file mode 100644
index 6d86aca47f7..00000000000
Binary files a/website/images/photos/geoffrey-genz.jpg and /dev/null differ
diff --git a/website/images/photos/ilya-yatsishin.jpg b/website/images/photos/ilya-yatsishin.jpg
deleted file mode 100644
index 23d10a86c7b..00000000000
Binary files a/website/images/photos/ilya-yatsishin.jpg and /dev/null differ
diff --git a/website/images/photos/ivan-blinkov.jpg b/website/images/photos/ivan-blinkov.jpg
deleted file mode 100644
index b11d4504bde..00000000000
Binary files a/website/images/photos/ivan-blinkov.jpg and /dev/null differ
diff --git a/website/images/photos/jason-chan.jpg b/website/images/photos/jason-chan.jpg
deleted file mode 100644
index 2f69200a0b4..00000000000
Binary files a/website/images/photos/jason-chan.jpg and /dev/null differ
diff --git a/website/images/photos/kevin-wang.jpg b/website/images/photos/kevin-wang.jpg
deleted file mode 100644
index 90eff0a3402..00000000000
Binary files a/website/images/photos/kevin-wang.jpg and /dev/null differ
diff --git a/website/images/photos/kristina-frost.jpg b/website/images/photos/kristina-frost.jpg
deleted file mode 100644
index f15206e51e0..00000000000
Binary files a/website/images/photos/kristina-frost.jpg and /dev/null differ
diff --git a/website/images/photos/kseniia-sumarokova.jpg b/website/images/photos/kseniia-sumarokova.jpg
deleted file mode 100644
index 8125d39869a..00000000000
Binary files a/website/images/photos/kseniia-sumarokova.jpg and /dev/null differ
diff --git a/website/images/photos/maksim-kita.jpg b/website/images/photos/maksim-kita.jpg
deleted file mode 100644
index d740059b71a..00000000000
Binary files a/website/images/photos/maksim-kita.jpg and /dev/null differ
diff --git a/website/images/photos/manas-alekar.jpg b/website/images/photos/manas-alekar.jpg
deleted file mode 100644
index a5463a527a9..00000000000
Binary files a/website/images/photos/manas-alekar.jpg and /dev/null differ
diff --git a/website/images/photos/marcel-birkner.jpg b/website/images/photos/marcel-birkner.jpg
deleted file mode 100644
index 6ec821cfb66..00000000000
Binary files a/website/images/photos/marcel-birkner.jpg and /dev/null differ
diff --git a/website/images/photos/marcelo-rodriguez.jpg b/website/images/photos/marcelo-rodriguez.jpg
deleted file mode 100644
index a25be5309da..00000000000
Binary files a/website/images/photos/marcelo-rodriguez.jpg and /dev/null differ
diff --git a/website/images/photos/mark-zitnik.jpg b/website/images/photos/mark-zitnik.jpg
deleted file mode 100644
index 7ffc5105258..00000000000
Binary files a/website/images/photos/mark-zitnik.jpg and /dev/null differ
diff --git a/website/images/photos/martin-choluj.jpg b/website/images/photos/martin-choluj.jpg
deleted file mode 100644
index 200685ab2fe..00000000000
Binary files a/website/images/photos/martin-choluj.jpg and /dev/null differ
diff --git a/website/images/photos/melvyn-peignon.jpg b/website/images/photos/melvyn-peignon.jpg
deleted file mode 100644
index 3c4d2a212a0..00000000000
Binary files a/website/images/photos/melvyn-peignon.jpg and /dev/null differ
diff --git a/website/images/photos/michael-lex.jpg b/website/images/photos/michael-lex.jpg
deleted file mode 100644
index 0e6de27a14e..00000000000
Binary files a/website/images/photos/michael-lex.jpg and /dev/null differ
diff --git a/website/images/photos/miel-donkers.jpg b/website/images/photos/miel-donkers.jpg
deleted file mode 100644
index 8d67c2440b1..00000000000
Binary files a/website/images/photos/miel-donkers.jpg and /dev/null differ
diff --git a/website/images/photos/mihir-gokhale.jpg b/website/images/photos/mihir-gokhale.jpg
deleted file mode 100644
index bc923da21b8..00000000000
Binary files a/website/images/photos/mihir-gokhale.jpg and /dev/null differ
diff --git a/website/images/photos/mike-hayes.jpg b/website/images/photos/mike-hayes.jpg
deleted file mode 100644
index df0380063fa..00000000000
Binary files a/website/images/photos/mike-hayes.jpg and /dev/null differ
diff --git a/website/images/photos/mike-volpi.jpg b/website/images/photos/mike-volpi.jpg
deleted file mode 100644
index 77756349759..00000000000
Binary files a/website/images/photos/mike-volpi.jpg and /dev/null differ
diff --git a/website/images/photos/mikhail-fursov.jpg b/website/images/photos/mikhail-fursov.jpg
deleted file mode 100644
index 82969fed20e..00000000000
Binary files a/website/images/photos/mikhail-fursov.jpg and /dev/null differ
diff --git a/website/images/photos/mikhail-shiryaev.jpg b/website/images/photos/mikhail-shiryaev.jpg
deleted file mode 100644
index 3f2f2f2334a..00000000000
Binary files a/website/images/photos/mikhail-shiryaev.jpg and /dev/null differ
diff --git a/website/images/photos/niek-lok.jpg b/website/images/photos/niek-lok.jpg
deleted file mode 100644
index bfa2d889565..00000000000
Binary files a/website/images/photos/niek-lok.jpg and /dev/null differ
diff --git a/website/images/photos/nihat-hosgur.jpg b/website/images/photos/nihat-hosgur.jpg
deleted file mode 100644
index fb3dd451713..00000000000
Binary files a/website/images/photos/nihat-hosgur.jpg and /dev/null differ
diff --git a/website/images/photos/nikita-mikhailov.jpg b/website/images/photos/nikita-mikhailov.jpg
deleted file mode 100644
index d956d334798..00000000000
Binary files a/website/images/photos/nikita-mikhailov.jpg and /dev/null differ
diff --git a/website/images/photos/nikolai-kochetov.jpg b/website/images/photos/nikolai-kochetov.jpg
deleted file mode 100644
index 135852aa078..00000000000
Binary files a/website/images/photos/nikolai-kochetov.jpg and /dev/null differ
diff --git a/website/images/photos/nikolay-degterinsky.jpg b/website/images/photos/nikolay-degterinsky.jpg
deleted file mode 100644
index 620c2d83f51..00000000000
Binary files a/website/images/photos/nikolay-degterinsky.jpg and /dev/null differ
diff --git a/website/images/photos/nir-peled.jpg b/website/images/photos/nir-peled.jpg
deleted file mode 100644
index a8952465164..00000000000
Binary files a/website/images/photos/nir-peled.jpg and /dev/null differ
diff --git a/website/images/photos/pascal-van-den-nieuwendijk.jpg b/website/images/photos/pascal-van-den-nieuwendijk.jpg
deleted file mode 100644
index a058206d68e..00000000000
Binary files a/website/images/photos/pascal-van-den-nieuwendijk.jpg and /dev/null differ
diff --git a/website/images/photos/pavel-kruglov.jpg b/website/images/photos/pavel-kruglov.jpg
deleted file mode 100644
index e1699785c9b..00000000000
Binary files a/website/images/photos/pavel-kruglov.jpg and /dev/null differ
diff --git a/website/images/photos/peter-fenton.jpg b/website/images/photos/peter-fenton.jpg
deleted file mode 100644
index b84f25e703e..00000000000
Binary files a/website/images/photos/peter-fenton.jpg and /dev/null differ
diff --git a/website/images/photos/placeholder.png b/website/images/photos/placeholder.png
deleted file mode 100644
index 820802d67a2..00000000000
Binary files a/website/images/photos/placeholder.png and /dev/null differ
diff --git a/website/images/photos/rich-raposa.jpg b/website/images/photos/rich-raposa.jpg
deleted file mode 100644
index 2d155356e1f..00000000000
Binary files a/website/images/photos/rich-raposa.jpg and /dev/null differ
diff --git a/website/images/photos/roopa-tangirala.jpg b/website/images/photos/roopa-tangirala.jpg
deleted file mode 100644
index 2583990a98d..00000000000
Binary files a/website/images/photos/roopa-tangirala.jpg and /dev/null differ
diff --git a/website/images/photos/ryadh-dahimene.jpg b/website/images/photos/ryadh-dahimene.jpg
deleted file mode 100644
index 622ad8a7bee..00000000000
Binary files a/website/images/photos/ryadh-dahimene.jpg and /dev/null differ
diff --git a/website/images/photos/sergei-trifonov.jpg b/website/images/photos/sergei-trifonov.jpg
deleted file mode 100644
index 87ce88a3b1b..00000000000
Binary files a/website/images/photos/sergei-trifonov.jpg and /dev/null differ
diff --git a/website/images/photos/shavoyne-mccowan.jpg b/website/images/photos/shavoyne-mccowan.jpg
deleted file mode 100644
index 6aca20bea50..00000000000
Binary files a/website/images/photos/shavoyne-mccowan.jpg and /dev/null differ
diff --git a/website/images/photos/tanya-bragin.jpg b/website/images/photos/tanya-bragin.jpg
deleted file mode 100644
index 0b5a6972b01..00000000000
Binary files a/website/images/photos/tanya-bragin.jpg and /dev/null differ
diff --git a/website/images/photos/thom-oconnor.jpg b/website/images/photos/thom-oconnor.jpg
deleted file mode 100644
index e44ece64548..00000000000
Binary files a/website/images/photos/thom-oconnor.jpg and /dev/null differ
diff --git a/website/images/photos/tom-schreiber.jpg b/website/images/photos/tom-schreiber.jpg
deleted file mode 100644
index ec227de6122..00000000000
Binary files a/website/images/photos/tom-schreiber.jpg and /dev/null differ
diff --git a/website/images/photos/tyler-hannan.jpg b/website/images/photos/tyler-hannan.jpg
deleted file mode 100644
index e14d9544bfe..00000000000
Binary files a/website/images/photos/tyler-hannan.jpg and /dev/null differ
diff --git a/website/images/photos/vitaly-baranov.jpg b/website/images/photos/vitaly-baranov.jpg
deleted file mode 100644
index 2f0df629d5b..00000000000
Binary files a/website/images/photos/vitaly-baranov.jpg and /dev/null differ
diff --git a/website/images/photos/vladimir-cherkasov.jpg b/website/images/photos/vladimir-cherkasov.jpg
deleted file mode 100644
index 31c2cb42eee..00000000000
Binary files a/website/images/photos/vladimir-cherkasov.jpg and /dev/null differ
diff --git a/website/images/photos/yossi-kahlon.jpg b/website/images/photos/yossi-kahlon.jpg
deleted file mode 100644
index 4a9672f99bc..00000000000
Binary files a/website/images/photos/yossi-kahlon.jpg and /dev/null differ
diff --git a/website/images/photos/yuko-takagi.jpg b/website/images/photos/yuko-takagi.jpg
deleted file mode 100644
index eb44e414256..00000000000
Binary files a/website/images/photos/yuko-takagi.jpg and /dev/null differ
diff --git a/website/images/photos/yury-izrailevsky.jpg b/website/images/photos/yury-izrailevsky.jpg
deleted file mode 100644
index 0115a248e1e..00000000000
Binary files a/website/images/photos/yury-izrailevsky.jpg and /dev/null differ
diff --git a/website/images/placeholder-contact-form.png b/website/images/placeholder-contact-form.png
deleted file mode 100644
index 297d10e3a89..00000000000
Binary files a/website/images/placeholder-contact-form.png and /dev/null differ
diff --git a/website/images/placeholder-newsletter-form.png b/website/images/placeholder-newsletter-form.png
deleted file mode 100644
index dc487941782..00000000000
Binary files a/website/images/placeholder-newsletter-form.png and /dev/null differ
diff --git a/website/images/welcome-home.png b/website/images/welcome-home.png
deleted file mode 100644
index 7bbcc2c612f..00000000000
Binary files a/website/images/welcome-home.png and /dev/null differ
diff --git a/website/images/yandex.png b/website/images/yandex.png
deleted file mode 100644
index ad40dcddfc7..00000000000
Binary files a/website/images/yandex.png and /dev/null differ
diff --git a/website/index.html b/website/index.html
deleted file mode 100644
index ad0b3a8cad2..00000000000
--- a/website/index.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% set prefetch_items = [
-    ('/docs/en/', 'document')
-] %}
-
-{% extends "templates/base.html" %}
-
-{% block extra_meta %}
-{% include "templates/common_fonts.html" %}
-<script type="application/ld+json">{
-"@context": "https://schema.org",
-"@type": "SoftwareApplication",
-"name": "ClickHouse",
-"operatingSystem": ["Linux", "FreeBSD", "Mac OS X"],
-"featureList": ["SQL", "columnar storage", "fault-tolerance", "distributed queries"],
-"softwareHelp": "https://clickhouse.com/docs/en/",
-"license": "https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE",
-"applicationCategory": "https://schema.org/DeveloperApplication",
-"applicationSubCategory": "Database Management System",
-"copyrightHolder": {
-  "@type": "Organization",
-  "name": "ClickHouse, Inc.",
-  "logo": {
-    "@type": "ImageObject",
-    "url": "https://clickhouse.com/images/logo-400x240.png",
-    "width": 400,
-    "height": 240
-  }
-},
-"copyrightYear": 2016,
-"mainEntityOfPage": {
-  "@type": "WebSite",
-  "@id": "https://clickhouse.com"
-},
-"offers": {
-  "@type": "Offer",
-  "price": "0",
-  "priceCurrency": "USD"
-}
-}</script>
-{% endblock %}
-
-{% block banner %}
-
-{% include "templates/global/banner.html" %}
-
-{% endblock %}
-
-{% block nav %}
-
-{% include "templates/global/nav.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-{% include "templates/index/hero.html" %}
-{% include "templates/index/why.html" %}
-{% include "templates/index/success.html" %}
-
-{% if false %}
-    {% include "templates/index/pullquote.html" %}
-{% endif %}
-
-{% include "templates/index/performance.html" %}
-{% include "templates/index/quickstart.html" %}
-{% include "templates/index/community.html" %}
-
-{% include "templates/global/newsletter.html" %}
-{% include "templates/global/github_stars.html" %}
-{% endblock %}
diff --git a/website/js/base.js b/website/js/base.js
deleted file mode 100644
index 1ab8f841dbe..00000000000
--- a/website/js/base.js
+++ /dev/null
@@ -1,100 +0,0 @@
-(function () {
-    Sentry.init({
-        dsn: 'https://2b95b52c943f4ad99baccab7a9048e4d@o388870.ingest.sentry.io/5246103',
-        environment: window.location.hostname === 'clickhouse.com' ? 'prod' : 'test'
-    });
-    $(document).click(function (event) {
-        var target = $(event.target);
-        var target_id = target.attr('id');
-        var selector = target.attr('href');
-        var is_tab = target.attr('role') === 'tab';
-        var is_collapse = target.attr('data-toggle') === 'collapse';
-        var is_rating = target.attr('role') === 'rating';
-        var navbar_toggle = $('#navbar-toggle');
-        navbar_toggle.collapse('hide');
-        $('.algolia-autocomplete .ds-dropdown-menu').hide();
-        if (target_id && target_id.startsWith('logo-')) {
-            selector = '#';
-        }
-    });
-
-    var top_nav = $('#top-nav.sticky-top');
-    if (window.location.hash.length > 1 && top_nav.length) {
-        var hash_destination = $(window.location.hash);
-        if (hash_destination.length) {
-            var offset = hash_destination.offset().top - top_nav.height() * 1.5;
-            $('html, body').animate({
-                scrollTop: offset
-            }, 70);
-        }
-    }
-
-    $('img').each(function() {
-        var src = $(this).attr('data-src');
-        if (src) {
-            $(this).attr('src', src);
-        }
-    });
-
-    if (window.location.hostname.endsWith('clickhouse.com')) {
-        $('a.favicon').each(function () {
-            $(this).css({
-                background: 'url(/favicon/' + this.hostname + ') left center no-repeat',
-                'padding-left': '20px'
-            });
-        });
-
-        function copy_to_clipboard(element) {
-            var temp = $('<textarea></textarea>');
-            $('body').append(temp);
-            temp.val($(element).text());
-            temp.select();
-            document.execCommand('copy');
-            temp.remove();
-        }
-
-        $('pre').each(function(_, element) {
-           $(element).prepend(
-               '<img src="/docs/images/mkdocs/copy.svg" alt="Copy" title="Copy" class="code-copy btn float-right m-0 p-0" />'
-           );
-        });
-
-        $('.code-copy').each(function(_, element) {
-           element = $(element);
-           element.click(function() {
-               copy_to_clipboard(element.parent());
-           })
-        });
-    }
-
-    var is_single_page = $('html').attr('data-single-page') === 'true';
-    if (!is_single_page) {
-        $('head').each(function (_, element) {
-            $(element).append(
-                '<script async src="https://www.googletagmanager.com/gtag/js?id=G-KF1LLRTQ5Q"></script><script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag(\'js\', new Date());gtag(\'config\', \'G-KF1LLRTQ5Q\');</script>'
-            );
-            $(element).append(
-                '<script>!function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.src="https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._loadOptions=e};analytics._writeKey="dZuEnmCPmWqDuSEzCvLUSBBRt8Xrh2el";;analytics.SNIPPET_VERSION="4.15.3";analytics.load("dZuEnmCPmWqDuSEzCvLUSBBRt8Xrh2el");analytics.page();}}();</script>'
-            );
-        });
-    }
-
-    var beforePrint = function() {
-        var details = document.getElementsByTagName("details");
-        for (var i = 0; i < details.length; ++i) {
-            details[i].open = 1;
-        }
-    };
-
-    if (window.matchMedia) {
-        window.matchMedia('print').addListener(function(q) {
-            if (q.matches) {
-                beforePrint();
-            }
-        });
-        if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
-            $.fx.off = true;
-        }
-    }
-    window.onbeforeprint = beforePrint;
-})();
diff --git a/website/js/bootstrap.js b/website/js/bootstrap.js
deleted file mode 100644
index e2c76e94a42..00000000000
--- a/website/js/bootstrap.js
+++ /dev/null
@@ -1,4521 +0,0 @@
-/*!
-  * Bootstrap v4.4.1 (https://getbootstrap.com/)
-  * Copyright 2011-2019 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
-  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
-  */
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('jquery'), require('popper.js')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'jquery', 'popper.js'], factory) :
-  (global = global || self, factory(global.bootstrap = {}, global.jQuery, global.Popper));
-}(this, (function (exports, $, Popper) { 'use strict';
-
-  $ = $ && $.hasOwnProperty('default') ? $['default'] : $;
-  Popper = Popper && Popper.hasOwnProperty('default') ? Popper['default'] : Popper;
-
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
-    }
-  }
-
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-  }
-
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-
-    return obj;
-  }
-
-  function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-
-    if (Object.getOwnPropertySymbols) {
-      var symbols = Object.getOwnPropertySymbols(object);
-      if (enumerableOnly) symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-      keys.push.apply(keys, symbols);
-    }
-
-    return keys;
-  }
-
-  function _objectSpread2(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-
-      if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        });
-      } else if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-      } else {
-        ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-      }
-    }
-
-    return target;
-  }
-
-  function _inheritsLoose(subClass, superClass) {
-    subClass.prototype = Object.create(superClass.prototype);
-    subClass.prototype.constructor = subClass;
-    subClass.__proto__ = superClass;
-  }
-
-  /**
-   * --------------------------------------------------------------------------
-   * Bootstrap (v4.4.1): util.js
-   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
-   * --------------------------------------------------------------------------
-   */
-  /**
-   * ------------------------------------------------------------------------
-   * Private TransitionEnd Helpers
-   * ------------------------------------------------------------------------
-   */
-
-  var TRANSITION_END = 'transitionend';
-  var MAX_UID = 1000000;
-  var MILLISECONDS_MULTIPLIER = 1000; // Shoutout AngusCroll (https://goo.gl/pxwQGp)
-
-  function toType(obj) {
-    return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase();
-  }
-
-  function getSpecialTransitionEndEvent() {
-    return {
-      bindType: TRANSITION_END,
-      delegateType: TRANSITION_END,
-      handle: function handle(event) {
-        if ($(event.target).is(this)) {
-          return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
-        }
-
-        return undefined; // eslint-disable-line no-undefined
-      }
-    };
-  }
-
-  function transitionEndEmulator(duration) {
-    var _this = this;
-
-    var called = false;
-    $(this).one(Util.TRANSITION_END, function () {
-      called = true;
-    });
-    setTimeout(function () {
-      if (!called) {
-        Util.triggerTransitionEnd(_this);
-      }
-    }, duration);
-    return this;
-  }
-
-  function setTransitionEndSupport() {
-    $.fn.emulateTransitionEnd = transitionEndEmulator;
-    $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
-  }
-  /**
-   * --------------------------------------------------------------------------
-   * Public Util Api
-   * --------------------------------------------------------------------------
-   */
-
-
-  var Util = {
-    TRANSITION_END: 'bsTransitionEnd',
-    getUID: function getUID(prefix) {
-      do {
-        // eslint-disable-next-line no-bitwise
-        prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here
-      } while (document.getElementById(prefix));
-
-      return prefix;
-    },
-    getSelectorFromElement: function getSelectorFromElement(element) {
-      var selector = element.getAttribute('data-target');
-
-      if (!selector || selector === '#') {
-        var hrefAttr = element.getAttribute('href');
-        selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
-      }
-
-      try {
-        return document.querySelector(selector) ? selector : null;
-      } catch (err) {
-        return null;
-      }
-    },
-    getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
-      if (!element) {
-        return 0;
-      } // Get transition-duration of the element
-
-
-      var transitionDuration = $(element).css('transition-duration');
-      var transitionDelay = $(element).css('transition-delay');
-      var floatTransitionDuration = parseFloat(transitionDuration);
-      var floatTransitionDelay = parseFloat(transitionDelay); // Return 0 if element or transition duration is not found
-
-      if (!floatTransitionDuration && !floatTransitionDelay) {
-        return 0;
-      } // If multiple durations are defined, take the first
-
-
-      transitionDuration = transitionDuration.split(',')[0];
-      transitionDelay = transitionDelay.split(',')[0];
-      return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER;
-    },
-    reflow: function reflow(element) {
-      return element.offsetHeight;
-    },
-    triggerTransitionEnd: function triggerTransitionEnd(element) {
-      $(element).trigger(TRANSITION_END);
-    },
-    // TODO: Remove in v5
-    supportsTransitionEnd: function supportsTransitionEnd() {
-      return Boolean(TRANSITION_END);
-    },
-    isElement: function isElement(obj) {
-      return (obj[0] || obj).nodeType;
-    },
-    typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) {
-      for (var property in configTypes) {
-        if (Object.prototype.hasOwnProperty.call(configTypes, property)) {
-          var expectedTypes = configTypes[property];
-          var value = config[property];
-          var valueType = value && Util.isElement(value) ? 'element' : toType(value);
-
-          if (!new RegExp(expectedTypes).test(valueType)) {
-            throw new Error(componentName.toUpperCase() + ": " + ("Option \"" + property + "\" provided type \"" + valueType + "\" ") + ("but expected type \"" + expectedTypes + "\"."));
-          }
-        }
-      }
-    },
-    findShadowRoot: function findShadowRoot(element) {
-      if (!document.documentElement.attachShadow) {
-        return null;
-      } // Can find the shadow root otherwise it'll return the document
-
-
-      if (typeof element.getRootNode === 'function') {
-        var root = element.getRootNode();
-        return root instanceof ShadowRoot ? root : null;
-      }
-
-      if (element instanceof ShadowRoot) {
-        return element;
-      } // when we don't find a shadow root
-
-
-      if (!element.parentNode) {
-        return null;
-      }
-
-      return Util.findShadowRoot(element.parentNode);
-    },
-    jQueryDetection: function jQueryDetection() {
-      if (typeof $ === 'undefined') {
-        throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.');
-      }
-
-      var version = $.fn.jquery.split(' ')[0].split('.');
-      var minMajor = 1;
-      var ltMajor = 2;
-      var minMinor = 9;
-      var minPatch = 1;
-      var maxMajor = 4;
-
-      if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
-        throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0');
-      }
-    }
-  };
-  Util.jQueryDetection();
-  setTransitionEndSupport();
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME = 'alert';
-  var VERSION = '4.4.1';
-  var DATA_KEY = 'bs.alert';
-  var EVENT_KEY = "." + DATA_KEY;
-  var DATA_API_KEY = '.data-api';
-  var JQUERY_NO_CONFLICT = $.fn[NAME];
-  var Selector = {
-    DISMISS: '[data-dismiss="alert"]'
-  };
-  var Event = {
-    CLOSE: "close" + EVENT_KEY,
-    CLOSED: "closed" + EVENT_KEY,
-    CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY
-  };
-  var ClassName = {
-    ALERT: 'alert',
-    FADE: 'fade',
-    SHOW: 'show'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Alert =
-  /*#__PURE__*/
-  function () {
-    function Alert(element) {
-      this._element = element;
-    } // Getters
-
-
-    var _proto = Alert.prototype;
-
-    // Public
-    _proto.close = function close(element) {
-      var rootElement = this._element;
-
-      if (element) {
-        rootElement = this._getRootElement(element);
-      }
-
-      var customEvent = this._triggerCloseEvent(rootElement);
-
-      if (customEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      this._removeElement(rootElement);
-    };
-
-    _proto.dispose = function dispose() {
-      $.removeData(this._element, DATA_KEY);
-      this._element = null;
-    } // Private
-    ;
-
-    _proto._getRootElement = function _getRootElement(element) {
-      var selector = Util.getSelectorFromElement(element);
-      var parent = false;
-
-      if (selector) {
-        parent = document.querySelector(selector);
-      }
-
-      if (!parent) {
-        parent = $(element).closest("." + ClassName.ALERT)[0];
-      }
-
-      return parent;
-    };
-
-    _proto._triggerCloseEvent = function _triggerCloseEvent(element) {
-      var closeEvent = $.Event(Event.CLOSE);
-      $(element).trigger(closeEvent);
-      return closeEvent;
-    };
-
-    _proto._removeElement = function _removeElement(element) {
-      var _this = this;
-
-      $(element).removeClass(ClassName.SHOW);
-
-      if (!$(element).hasClass(ClassName.FADE)) {
-        this._destroyElement(element);
-
-        return;
-      }
-
-      var transitionDuration = Util.getTransitionDurationFromElement(element);
-      $(element).one(Util.TRANSITION_END, function (event) {
-        return _this._destroyElement(element, event);
-      }).emulateTransitionEnd(transitionDuration);
-    };
-
-    _proto._destroyElement = function _destroyElement(element) {
-      $(element).detach().trigger(Event.CLOSED).remove();
-    } // Static
-    ;
-
-    Alert._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var $element = $(this);
-        var data = $element.data(DATA_KEY);
-
-        if (!data) {
-          data = new Alert(this);
-          $element.data(DATA_KEY, data);
-        }
-
-        if (config === 'close') {
-          data[config](this);
-        }
-      });
-    };
-
-    Alert._handleDismiss = function _handleDismiss(alertInstance) {
-      return function (event) {
-        if (event) {
-          event.preventDefault();
-        }
-
-        alertInstance.close(this);
-      };
-    };
-
-    _createClass(Alert, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION;
-      }
-    }]);
-
-    return Alert;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()));
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME] = Alert._jQueryInterface;
-  $.fn[NAME].Constructor = Alert;
-
-  $.fn[NAME].noConflict = function () {
-    $.fn[NAME] = JQUERY_NO_CONFLICT;
-    return Alert._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$1 = 'button';
-  var VERSION$1 = '4.4.1';
-  var DATA_KEY$1 = 'bs.button';
-  var EVENT_KEY$1 = "." + DATA_KEY$1;
-  var DATA_API_KEY$1 = '.data-api';
-  var JQUERY_NO_CONFLICT$1 = $.fn[NAME$1];
-  var ClassName$1 = {
-    ACTIVE: 'active',
-    BUTTON: 'btn',
-    FOCUS: 'focus'
-  };
-  var Selector$1 = {
-    DATA_TOGGLE_CARROT: '[data-toggle^="button"]',
-    DATA_TOGGLES: '[data-toggle="buttons"]',
-    DATA_TOGGLE: '[data-toggle="button"]',
-    DATA_TOGGLES_BUTTONS: '[data-toggle="buttons"] .btn',
-    INPUT: 'input:not([type="hidden"])',
-    ACTIVE: '.active',
-    BUTTON: '.btn'
-  };
-  var Event$1 = {
-    CLICK_DATA_API: "click" + EVENT_KEY$1 + DATA_API_KEY$1,
-    FOCUS_BLUR_DATA_API: "focus" + EVENT_KEY$1 + DATA_API_KEY$1 + " " + ("blur" + EVENT_KEY$1 + DATA_API_KEY$1),
-    LOAD_DATA_API: "load" + EVENT_KEY$1 + DATA_API_KEY$1
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Button =
-  /*#__PURE__*/
-  function () {
-    function Button(element) {
-      this._element = element;
-    } // Getters
-
-
-    var _proto = Button.prototype;
-
-    // Public
-    _proto.toggle = function toggle() {
-      var triggerChangeEvent = true;
-      var addAriaPressed = true;
-      var rootElement = $(this._element).closest(Selector$1.DATA_TOGGLES)[0];
-
-      if (rootElement) {
-        var input = this._element.querySelector(Selector$1.INPUT);
-
-        if (input) {
-          if (input.type === 'radio') {
-            if (input.checked && this._element.classList.contains(ClassName$1.ACTIVE)) {
-              triggerChangeEvent = false;
-            } else {
-              var activeElement = rootElement.querySelector(Selector$1.ACTIVE);
-
-              if (activeElement) {
-                $(activeElement).removeClass(ClassName$1.ACTIVE);
-              }
-            }
-          } else if (input.type === 'checkbox') {
-            if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName$1.ACTIVE)) {
-              triggerChangeEvent = false;
-            }
-          } else {
-            // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input
-            triggerChangeEvent = false;
-          }
-
-          if (triggerChangeEvent) {
-            input.checked = !this._element.classList.contains(ClassName$1.ACTIVE);
-            $(input).trigger('change');
-          }
-
-          input.focus();
-          addAriaPressed = false;
-        }
-      }
-
-      if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {
-        if (addAriaPressed) {
-          this._element.setAttribute('aria-pressed', !this._element.classList.contains(ClassName$1.ACTIVE));
-        }
-
-        if (triggerChangeEvent) {
-          $(this._element).toggleClass(ClassName$1.ACTIVE);
-        }
-      }
-    };
-
-    _proto.dispose = function dispose() {
-      $.removeData(this._element, DATA_KEY$1);
-      this._element = null;
-    } // Static
-    ;
-
-    Button._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$1);
-
-        if (!data) {
-          data = new Button(this);
-          $(this).data(DATA_KEY$1, data);
-        }
-
-        if (config === 'toggle') {
-          data[config]();
-        }
-      });
-    };
-
-    _createClass(Button, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$1;
-      }
-    }]);
-
-    return Button;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event$1.CLICK_DATA_API, Selector$1.DATA_TOGGLE_CARROT, function (event) {
-    var button = event.target;
-
-    if (!$(button).hasClass(ClassName$1.BUTTON)) {
-      button = $(button).closest(Selector$1.BUTTON)[0];
-    }
-
-    if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {
-      event.preventDefault(); // work around Firefox bug #1540995
-    } else {
-      var inputBtn = button.querySelector(Selector$1.INPUT);
-
-      if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {
-        event.preventDefault(); // work around Firefox bug #1540995
-
-        return;
-      }
-
-      Button._jQueryInterface.call($(button), 'toggle');
-    }
-  }).on(Event$1.FOCUS_BLUR_DATA_API, Selector$1.DATA_TOGGLE_CARROT, function (event) {
-    var button = $(event.target).closest(Selector$1.BUTTON)[0];
-    $(button).toggleClass(ClassName$1.FOCUS, /^focus(in)?$/.test(event.type));
-  });
-  $(window).on(Event$1.LOAD_DATA_API, function () {
-    // ensure correct active class is set to match the controls' actual values/states
-    // find all checkboxes/readio buttons inside data-toggle groups
-    var buttons = [].slice.call(document.querySelectorAll(Selector$1.DATA_TOGGLES_BUTTONS));
-
-    for (var i = 0, len = buttons.length; i < len; i++) {
-      var button = buttons[i];
-      var input = button.querySelector(Selector$1.INPUT);
-
-      if (input.checked || input.hasAttribute('checked')) {
-        button.classList.add(ClassName$1.ACTIVE);
-      } else {
-        button.classList.remove(ClassName$1.ACTIVE);
-      }
-    } // find all button toggles
-
-
-    buttons = [].slice.call(document.querySelectorAll(Selector$1.DATA_TOGGLE));
-
-    for (var _i = 0, _len = buttons.length; _i < _len; _i++) {
-      var _button = buttons[_i];
-
-      if (_button.getAttribute('aria-pressed') === 'true') {
-        _button.classList.add(ClassName$1.ACTIVE);
-      } else {
-        _button.classList.remove(ClassName$1.ACTIVE);
-      }
-    }
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$1] = Button._jQueryInterface;
-  $.fn[NAME$1].Constructor = Button;
-
-  $.fn[NAME$1].noConflict = function () {
-    $.fn[NAME$1] = JQUERY_NO_CONFLICT$1;
-    return Button._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$2 = 'carousel';
-  var VERSION$2 = '4.4.1';
-  var DATA_KEY$2 = 'bs.carousel';
-  var EVENT_KEY$2 = "." + DATA_KEY$2;
-  var DATA_API_KEY$2 = '.data-api';
-  var JQUERY_NO_CONFLICT$2 = $.fn[NAME$2];
-  var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
-
-  var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
-
-  var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
-
-  var SWIPE_THRESHOLD = 40;
-  var Default = {
-    interval: 5000,
-    keyboard: true,
-    slide: false,
-    pause: 'hover',
-    wrap: true,
-    touch: true
-  };
-  var DefaultType = {
-    interval: '(number|boolean)',
-    keyboard: 'boolean',
-    slide: '(boolean|string)',
-    pause: '(string|boolean)',
-    wrap: 'boolean',
-    touch: 'boolean'
-  };
-  var Direction = {
-    NEXT: 'next',
-    PREV: 'prev',
-    LEFT: 'left',
-    RIGHT: 'right'
-  };
-  var Event$2 = {
-    SLIDE: "slide" + EVENT_KEY$2,
-    SLID: "slid" + EVENT_KEY$2,
-    KEYDOWN: "keydown" + EVENT_KEY$2,
-    MOUSEENTER: "mouseenter" + EVENT_KEY$2,
-    MOUSELEAVE: "mouseleave" + EVENT_KEY$2,
-    TOUCHSTART: "touchstart" + EVENT_KEY$2,
-    TOUCHMOVE: "touchmove" + EVENT_KEY$2,
-    TOUCHEND: "touchend" + EVENT_KEY$2,
-    POINTERDOWN: "pointerdown" + EVENT_KEY$2,
-    POINTERUP: "pointerup" + EVENT_KEY$2,
-    DRAG_START: "dragstart" + EVENT_KEY$2,
-    LOAD_DATA_API: "load" + EVENT_KEY$2 + DATA_API_KEY$2,
-    CLICK_DATA_API: "click" + EVENT_KEY$2 + DATA_API_KEY$2
-  };
-  var ClassName$2 = {
-    CAROUSEL: 'carousel',
-    ACTIVE: 'active',
-    SLIDE: 'slide',
-    RIGHT: 'carousel-item-right',
-    LEFT: 'carousel-item-left',
-    NEXT: 'carousel-item-next',
-    PREV: 'carousel-item-prev',
-    ITEM: 'carousel-item',
-    POINTER_EVENT: 'pointer-event'
-  };
-  var Selector$2 = {
-    ACTIVE: '.active',
-    ACTIVE_ITEM: '.active.carousel-item',
-    ITEM: '.carousel-item',
-    ITEM_IMG: '.carousel-item img',
-    NEXT_PREV: '.carousel-item-next, .carousel-item-prev',
-    INDICATORS: '.carousel-indicators',
-    DATA_SLIDE: '[data-slide], [data-slide-to]',
-    DATA_RIDE: '[data-ride="carousel"]'
-  };
-  var PointerType = {
-    TOUCH: 'touch',
-    PEN: 'pen'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Carousel =
-  /*#__PURE__*/
-  function () {
-    function Carousel(element, config) {
-      this._items = null;
-      this._interval = null;
-      this._activeElement = null;
-      this._isPaused = false;
-      this._isSliding = false;
-      this.touchTimeout = null;
-      this.touchStartX = 0;
-      this.touchDeltaX = 0;
-      this._config = this._getConfig(config);
-      this._element = element;
-      this._indicatorsElement = this._element.querySelector(Selector$2.INDICATORS);
-      this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0;
-      this._pointerEvent = Boolean(window.PointerEvent || window.MSPointerEvent);
-
-      this._addEventListeners();
-    } // Getters
-
-
-    var _proto = Carousel.prototype;
-
-    // Public
-    _proto.next = function next() {
-      if (!this._isSliding) {
-        this._slide(Direction.NEXT);
-      }
-    };
-
-    _proto.nextWhenVisible = function nextWhenVisible() {
-      // Don't call next when the page isn't visible
-      // or the carousel or its parent isn't visible
-      if (!document.hidden && $(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden') {
-        this.next();
-      }
-    };
-
-    _proto.prev = function prev() {
-      if (!this._isSliding) {
-        this._slide(Direction.PREV);
-      }
-    };
-
-    _proto.pause = function pause(event) {
-      if (!event) {
-        this._isPaused = true;
-      }
-
-      if (this._element.querySelector(Selector$2.NEXT_PREV)) {
-        Util.triggerTransitionEnd(this._element);
-        this.cycle(true);
-      }
-
-      clearInterval(this._interval);
-      this._interval = null;
-    };
-
-    _proto.cycle = function cycle(event) {
-      if (!event) {
-        this._isPaused = false;
-      }
-
-      if (this._interval) {
-        clearInterval(this._interval);
-        this._interval = null;
-      }
-
-      if (this._config.interval && !this._isPaused) {
-        this._interval = setInterval((document.visibilityState ? this.nextWhenVisible : this.next).bind(this), this._config.interval);
-      }
-    };
-
-    _proto.to = function to(index) {
-      var _this = this;
-
-      this._activeElement = this._element.querySelector(Selector$2.ACTIVE_ITEM);
-
-      var activeIndex = this._getItemIndex(this._activeElement);
-
-      if (index > this._items.length - 1 || index < 0) {
-        return;
-      }
-
-      if (this._isSliding) {
-        $(this._element).one(Event$2.SLID, function () {
-          return _this.to(index);
-        });
-        return;
-      }
-
-      if (activeIndex === index) {
-        this.pause();
-        this.cycle();
-        return;
-      }
-
-      var direction = index > activeIndex ? Direction.NEXT : Direction.PREV;
-
-      this._slide(direction, this._items[index]);
-    };
-
-    _proto.dispose = function dispose() {
-      $(this._element).off(EVENT_KEY$2);
-      $.removeData(this._element, DATA_KEY$2);
-      this._items = null;
-      this._config = null;
-      this._element = null;
-      this._interval = null;
-      this._isPaused = null;
-      this._isSliding = null;
-      this._activeElement = null;
-      this._indicatorsElement = null;
-    } // Private
-    ;
-
-    _proto._getConfig = function _getConfig(config) {
-      config = _objectSpread2({}, Default, {}, config);
-      Util.typeCheckConfig(NAME$2, config, DefaultType);
-      return config;
-    };
-
-    _proto._handleSwipe = function _handleSwipe() {
-      var absDeltax = Math.abs(this.touchDeltaX);
-
-      if (absDeltax <= SWIPE_THRESHOLD) {
-        return;
-      }
-
-      var direction = absDeltax / this.touchDeltaX;
-      this.touchDeltaX = 0; // swipe left
-
-      if (direction > 0) {
-        this.prev();
-      } // swipe right
-
-
-      if (direction < 0) {
-        this.next();
-      }
-    };
-
-    _proto._addEventListeners = function _addEventListeners() {
-      var _this2 = this;
-
-      if (this._config.keyboard) {
-        $(this._element).on(Event$2.KEYDOWN, function (event) {
-          return _this2._keydown(event);
-        });
-      }
-
-      if (this._config.pause === 'hover') {
-        $(this._element).on(Event$2.MOUSEENTER, function (event) {
-          return _this2.pause(event);
-        }).on(Event$2.MOUSELEAVE, function (event) {
-          return _this2.cycle(event);
-        });
-      }
-
-      if (this._config.touch) {
-        this._addTouchEventListeners();
-      }
-    };
-
-    _proto._addTouchEventListeners = function _addTouchEventListeners() {
-      var _this3 = this;
-
-      if (!this._touchSupported) {
-        return;
-      }
-
-      var start = function start(event) {
-        if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
-          _this3.touchStartX = event.originalEvent.clientX;
-        } else if (!_this3._pointerEvent) {
-          _this3.touchStartX = event.originalEvent.touches[0].clientX;
-        }
-      };
-
-      var move = function move(event) {
-        // ensure swiping with one touch and not pinching
-        if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
-          _this3.touchDeltaX = 0;
-        } else {
-          _this3.touchDeltaX = event.originalEvent.touches[0].clientX - _this3.touchStartX;
-        }
-      };
-
-      var end = function end(event) {
-        if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
-          _this3.touchDeltaX = event.originalEvent.clientX - _this3.touchStartX;
-        }
-
-        _this3._handleSwipe();
-
-        if (_this3._config.pause === 'hover') {
-          // If it's a touch-enabled device, mouseenter/leave are fired as
-          // part of the mouse compatibility events on first tap - the carousel
-          // would stop cycling until user tapped out of it;
-          // here, we listen for touchend, explicitly pause the carousel
-          // (as if it's the second time we tap on it, mouseenter compat event
-          // is NOT fired) and after a timeout (to allow for mouse compatibility
-          // events to fire) we explicitly restart cycling
-          _this3.pause();
-
-          if (_this3.touchTimeout) {
-            clearTimeout(_this3.touchTimeout);
-          }
-
-          _this3.touchTimeout = setTimeout(function (event) {
-            return _this3.cycle(event);
-          }, TOUCHEVENT_COMPAT_WAIT + _this3._config.interval);
-        }
-      };
-
-      $(this._element.querySelectorAll(Selector$2.ITEM_IMG)).on(Event$2.DRAG_START, function (e) {
-        return e.preventDefault();
-      });
-
-      if (this._pointerEvent) {
-        $(this._element).on(Event$2.POINTERDOWN, function (event) {
-          return start(event);
-        });
-        $(this._element).on(Event$2.POINTERUP, function (event) {
-          return end(event);
-        });
-
-        this._element.classList.add(ClassName$2.POINTER_EVENT);
-      } else {
-        $(this._element).on(Event$2.TOUCHSTART, function (event) {
-          return start(event);
-        });
-        $(this._element).on(Event$2.TOUCHMOVE, function (event) {
-          return move(event);
-        });
-        $(this._element).on(Event$2.TOUCHEND, function (event) {
-          return end(event);
-        });
-      }
-    };
-
-    _proto._keydown = function _keydown(event) {
-      if (/input|textarea/i.test(event.target.tagName)) {
-        return;
-      }
-
-      switch (event.which) {
-        case ARROW_LEFT_KEYCODE:
-          event.preventDefault();
-          this.prev();
-          break;
-
-        case ARROW_RIGHT_KEYCODE:
-          event.preventDefault();
-          this.next();
-          break;
-      }
-    };
-
-    _proto._getItemIndex = function _getItemIndex(element) {
-      this._items = element && element.parentNode ? [].slice.call(element.parentNode.querySelectorAll(Selector$2.ITEM)) : [];
-      return this._items.indexOf(element);
-    };
-
-    _proto._getItemByDirection = function _getItemByDirection(direction, activeElement) {
-      var isNextDirection = direction === Direction.NEXT;
-      var isPrevDirection = direction === Direction.PREV;
-
-      var activeIndex = this._getItemIndex(activeElement);
-
-      var lastItemIndex = this._items.length - 1;
-      var isGoingToWrap = isPrevDirection && activeIndex === 0 || isNextDirection && activeIndex === lastItemIndex;
-
-      if (isGoingToWrap && !this._config.wrap) {
-        return activeElement;
-      }
-
-      var delta = direction === Direction.PREV ? -1 : 1;
-      var itemIndex = (activeIndex + delta) % this._items.length;
-      return itemIndex === -1 ? this._items[this._items.length - 1] : this._items[itemIndex];
-    };
-
-    _proto._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
-      var targetIndex = this._getItemIndex(relatedTarget);
-
-      var fromIndex = this._getItemIndex(this._element.querySelector(Selector$2.ACTIVE_ITEM));
-
-      var slideEvent = $.Event(Event$2.SLIDE, {
-        relatedTarget: relatedTarget,
-        direction: eventDirectionName,
-        from: fromIndex,
-        to: targetIndex
-      });
-      $(this._element).trigger(slideEvent);
-      return slideEvent;
-    };
-
-    _proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) {
-      if (this._indicatorsElement) {
-        var indicators = [].slice.call(this._indicatorsElement.querySelectorAll(Selector$2.ACTIVE));
-        $(indicators).removeClass(ClassName$2.ACTIVE);
-
-        var nextIndicator = this._indicatorsElement.children[this._getItemIndex(element)];
-
-        if (nextIndicator) {
-          $(nextIndicator).addClass(ClassName$2.ACTIVE);
-        }
-      }
-    };
-
-    _proto._slide = function _slide(direction, element) {
-      var _this4 = this;
-
-      var activeElement = this._element.querySelector(Selector$2.ACTIVE_ITEM);
-
-      var activeElementIndex = this._getItemIndex(activeElement);
-
-      var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
-
-      var nextElementIndex = this._getItemIndex(nextElement);
-
-      var isCycling = Boolean(this._interval);
-      var directionalClassName;
-      var orderClassName;
-      var eventDirectionName;
-
-      if (direction === Direction.NEXT) {
-        directionalClassName = ClassName$2.LEFT;
-        orderClassName = ClassName$2.NEXT;
-        eventDirectionName = Direction.LEFT;
-      } else {
-        directionalClassName = ClassName$2.RIGHT;
-        orderClassName = ClassName$2.PREV;
-        eventDirectionName = Direction.RIGHT;
-      }
-
-      if (nextElement && $(nextElement).hasClass(ClassName$2.ACTIVE)) {
-        this._isSliding = false;
-        return;
-      }
-
-      var slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName);
-
-      if (slideEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      if (!activeElement || !nextElement) {
-        // Some weirdness is happening, so we bail
-        return;
-      }
-
-      this._isSliding = true;
-
-      if (isCycling) {
-        this.pause();
-      }
-
-      this._setActiveIndicatorElement(nextElement);
-
-      var slidEvent = $.Event(Event$2.SLID, {
-        relatedTarget: nextElement,
-        direction: eventDirectionName,
-        from: activeElementIndex,
-        to: nextElementIndex
-      });
-
-      if ($(this._element).hasClass(ClassName$2.SLIDE)) {
-        $(nextElement).addClass(orderClassName);
-        Util.reflow(nextElement);
-        $(activeElement).addClass(directionalClassName);
-        $(nextElement).addClass(directionalClassName);
-        var nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10);
-
-        if (nextElementInterval) {
-          this._config.defaultInterval = this._config.defaultInterval || this._config.interval;
-          this._config.interval = nextElementInterval;
-        } else {
-          this._config.interval = this._config.defaultInterval || this._config.interval;
-        }
-
-        var transitionDuration = Util.getTransitionDurationFromElement(activeElement);
-        $(activeElement).one(Util.TRANSITION_END, function () {
-          $(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(ClassName$2.ACTIVE);
-          $(activeElement).removeClass(ClassName$2.ACTIVE + " " + orderClassName + " " + directionalClassName);
-          _this4._isSliding = false;
-          setTimeout(function () {
-            return $(_this4._element).trigger(slidEvent);
-          }, 0);
-        }).emulateTransitionEnd(transitionDuration);
-      } else {
-        $(activeElement).removeClass(ClassName$2.ACTIVE);
-        $(nextElement).addClass(ClassName$2.ACTIVE);
-        this._isSliding = false;
-        $(this._element).trigger(slidEvent);
-      }
-
-      if (isCycling) {
-        this.cycle();
-      }
-    } // Static
-    ;
-
-    Carousel._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$2);
-
-        var _config = _objectSpread2({}, Default, {}, $(this).data());
-
-        if (typeof config === 'object') {
-          _config = _objectSpread2({}, _config, {}, config);
-        }
-
-        var action = typeof config === 'string' ? config : _config.slide;
-
-        if (!data) {
-          data = new Carousel(this, _config);
-          $(this).data(DATA_KEY$2, data);
-        }
-
-        if (typeof config === 'number') {
-          data.to(config);
-        } else if (typeof action === 'string') {
-          if (typeof data[action] === 'undefined') {
-            throw new TypeError("No method named \"" + action + "\"");
-          }
-
-          data[action]();
-        } else if (_config.interval && _config.ride) {
-          data.pause();
-          data.cycle();
-        }
-      });
-    };
-
-    Carousel._dataApiClickHandler = function _dataApiClickHandler(event) {
-      var selector = Util.getSelectorFromElement(this);
-
-      if (!selector) {
-        return;
-      }
-
-      var target = $(selector)[0];
-
-      if (!target || !$(target).hasClass(ClassName$2.CAROUSEL)) {
-        return;
-      }
-
-      var config = _objectSpread2({}, $(target).data(), {}, $(this).data());
-
-      var slideIndex = this.getAttribute('data-slide-to');
-
-      if (slideIndex) {
-        config.interval = false;
-      }
-
-      Carousel._jQueryInterface.call($(target), config);
-
-      if (slideIndex) {
-        $(target).data(DATA_KEY$2).to(slideIndex);
-      }
-
-      event.preventDefault();
-    };
-
-    _createClass(Carousel, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$2;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default;
-      }
-    }]);
-
-    return Carousel;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event$2.CLICK_DATA_API, Selector$2.DATA_SLIDE, Carousel._dataApiClickHandler);
-  $(window).on(Event$2.LOAD_DATA_API, function () {
-    var carousels = [].slice.call(document.querySelectorAll(Selector$2.DATA_RIDE));
-
-    for (var i = 0, len = carousels.length; i < len; i++) {
-      var $carousel = $(carousels[i]);
-
-      Carousel._jQueryInterface.call($carousel, $carousel.data());
-    }
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$2] = Carousel._jQueryInterface;
-  $.fn[NAME$2].Constructor = Carousel;
-
-  $.fn[NAME$2].noConflict = function () {
-    $.fn[NAME$2] = JQUERY_NO_CONFLICT$2;
-    return Carousel._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$3 = 'collapse';
-  var VERSION$3 = '4.4.1';
-  var DATA_KEY$3 = 'bs.collapse';
-  var EVENT_KEY$3 = "." + DATA_KEY$3;
-  var DATA_API_KEY$3 = '.data-api';
-  var JQUERY_NO_CONFLICT$3 = $.fn[NAME$3];
-  var Default$1 = {
-    toggle: true,
-    parent: ''
-  };
-  var DefaultType$1 = {
-    toggle: 'boolean',
-    parent: '(string|element)'
-  };
-  var Event$3 = {
-    SHOW: "show" + EVENT_KEY$3,
-    SHOWN: "shown" + EVENT_KEY$3,
-    HIDE: "hide" + EVENT_KEY$3,
-    HIDDEN: "hidden" + EVENT_KEY$3,
-    CLICK_DATA_API: "click" + EVENT_KEY$3 + DATA_API_KEY$3
-  };
-  var ClassName$3 = {
-    SHOW: 'show',
-    COLLAPSE: 'collapse',
-    COLLAPSING: 'collapsing',
-    COLLAPSED: 'collapsed'
-  };
-  var Dimension = {
-    WIDTH: 'width',
-    HEIGHT: 'height'
-  };
-  var Selector$3 = {
-    ACTIVES: '.show, .collapsing',
-    DATA_TOGGLE: '[data-toggle="collapse"]'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Collapse =
-  /*#__PURE__*/
-  function () {
-    function Collapse(element, config) {
-      this._isTransitioning = false;
-      this._element = element;
-      this._config = this._getConfig(config);
-      this._triggerArray = [].slice.call(document.querySelectorAll("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]")));
-      var toggleList = [].slice.call(document.querySelectorAll(Selector$3.DATA_TOGGLE));
-
-      for (var i = 0, len = toggleList.length; i < len; i++) {
-        var elem = toggleList[i];
-        var selector = Util.getSelectorFromElement(elem);
-        var filterElement = [].slice.call(document.querySelectorAll(selector)).filter(function (foundElem) {
-          return foundElem === element;
-        });
-
-        if (selector !== null && filterElement.length > 0) {
-          this._selector = selector;
-
-          this._triggerArray.push(elem);
-        }
-      }
-
-      this._parent = this._config.parent ? this._getParent() : null;
-
-      if (!this._config.parent) {
-        this._addAriaAndCollapsedClass(this._element, this._triggerArray);
-      }
-
-      if (this._config.toggle) {
-        this.toggle();
-      }
-    } // Getters
-
-
-    var _proto = Collapse.prototype;
-
-    // Public
-    _proto.toggle = function toggle() {
-      if ($(this._element).hasClass(ClassName$3.SHOW)) {
-        this.hide();
-      } else {
-        this.show();
-      }
-    };
-
-    _proto.show = function show() {
-      var _this = this;
-
-      if (this._isTransitioning || $(this._element).hasClass(ClassName$3.SHOW)) {
-        return;
-      }
-
-      var actives;
-      var activesData;
-
-      if (this._parent) {
-        actives = [].slice.call(this._parent.querySelectorAll(Selector$3.ACTIVES)).filter(function (elem) {
-          if (typeof _this._config.parent === 'string') {
-            return elem.getAttribute('data-parent') === _this._config.parent;
-          }
-
-          return elem.classList.contains(ClassName$3.COLLAPSE);
-        });
-
-        if (actives.length === 0) {
-          actives = null;
-        }
-      }
-
-      if (actives) {
-        activesData = $(actives).not(this._selector).data(DATA_KEY$3);
-
-        if (activesData && activesData._isTransitioning) {
-          return;
-        }
-      }
-
-      var startEvent = $.Event(Event$3.SHOW);
-      $(this._element).trigger(startEvent);
-
-      if (startEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      if (actives) {
-        Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide');
-
-        if (!activesData) {
-          $(actives).data(DATA_KEY$3, null);
-        }
-      }
-
-      var dimension = this._getDimension();
-
-      $(this._element).removeClass(ClassName$3.COLLAPSE).addClass(ClassName$3.COLLAPSING);
-      this._element.style[dimension] = 0;
-
-      if (this._triggerArray.length) {
-        $(this._triggerArray).removeClass(ClassName$3.COLLAPSED).attr('aria-expanded', true);
-      }
-
-      this.setTransitioning(true);
-
-      var complete = function complete() {
-        $(_this._element).removeClass(ClassName$3.COLLAPSING).addClass(ClassName$3.COLLAPSE).addClass(ClassName$3.SHOW);
-        _this._element.style[dimension] = '';
-
-        _this.setTransitioning(false);
-
-        $(_this._element).trigger(Event$3.SHOWN);
-      };
-
-      var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
-      var scrollSize = "scroll" + capitalizedDimension;
-      var transitionDuration = Util.getTransitionDurationFromElement(this._element);
-      $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-      this._element.style[dimension] = this._element[scrollSize] + "px";
-    };
-
-    _proto.hide = function hide() {
-      var _this2 = this;
-
-      if (this._isTransitioning || !$(this._element).hasClass(ClassName$3.SHOW)) {
-        return;
-      }
-
-      var startEvent = $.Event(Event$3.HIDE);
-      $(this._element).trigger(startEvent);
-
-      if (startEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      var dimension = this._getDimension();
-
-      this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + "px";
-      Util.reflow(this._element);
-      $(this._element).addClass(ClassName$3.COLLAPSING).removeClass(ClassName$3.COLLAPSE).removeClass(ClassName$3.SHOW);
-      var triggerArrayLength = this._triggerArray.length;
-
-      if (triggerArrayLength > 0) {
-        for (var i = 0; i < triggerArrayLength; i++) {
-          var trigger = this._triggerArray[i];
-          var selector = Util.getSelectorFromElement(trigger);
-
-          if (selector !== null) {
-            var $elem = $([].slice.call(document.querySelectorAll(selector)));
-
-            if (!$elem.hasClass(ClassName$3.SHOW)) {
-              $(trigger).addClass(ClassName$3.COLLAPSED).attr('aria-expanded', false);
-            }
-          }
-        }
-      }
-
-      this.setTransitioning(true);
-
-      var complete = function complete() {
-        _this2.setTransitioning(false);
-
-        $(_this2._element).removeClass(ClassName$3.COLLAPSING).addClass(ClassName$3.COLLAPSE).trigger(Event$3.HIDDEN);
-      };
-
-      this._element.style[dimension] = '';
-      var transitionDuration = Util.getTransitionDurationFromElement(this._element);
-      $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-    };
-
-    _proto.setTransitioning = function setTransitioning(isTransitioning) {
-      this._isTransitioning = isTransitioning;
-    };
-
-    _proto.dispose = function dispose() {
-      $.removeData(this._element, DATA_KEY$3);
-      this._config = null;
-      this._parent = null;
-      this._element = null;
-      this._triggerArray = null;
-      this._isTransitioning = null;
-    } // Private
-    ;
-
-    _proto._getConfig = function _getConfig(config) {
-      config = _objectSpread2({}, Default$1, {}, config);
-      config.toggle = Boolean(config.toggle); // Coerce string values
-
-      Util.typeCheckConfig(NAME$3, config, DefaultType$1);
-      return config;
-    };
-
-    _proto._getDimension = function _getDimension() {
-      var hasWidth = $(this._element).hasClass(Dimension.WIDTH);
-      return hasWidth ? Dimension.WIDTH : Dimension.HEIGHT;
-    };
-
-    _proto._getParent = function _getParent() {
-      var _this3 = this;
-
-      var parent;
-
-      if (Util.isElement(this._config.parent)) {
-        parent = this._config.parent; // It's a jQuery object
-
-        if (typeof this._config.parent.jquery !== 'undefined') {
-          parent = this._config.parent[0];
-        }
-      } else {
-        parent = document.querySelector(this._config.parent);
-      }
-
-      var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]";
-      var children = [].slice.call(parent.querySelectorAll(selector));
-      $(children).each(function (i, element) {
-        _this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]);
-      });
-      return parent;
-    };
-
-    _proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
-      var isOpen = $(element).hasClass(ClassName$3.SHOW);
-
-      if (triggerArray.length) {
-        $(triggerArray).toggleClass(ClassName$3.COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
-      }
-    } // Static
-    ;
-
-    Collapse._getTargetFromElement = function _getTargetFromElement(element) {
-      var selector = Util.getSelectorFromElement(element);
-      return selector ? document.querySelector(selector) : null;
-    };
-
-    Collapse._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var $this = $(this);
-        var data = $this.data(DATA_KEY$3);
-
-        var _config = _objectSpread2({}, Default$1, {}, $this.data(), {}, typeof config === 'object' && config ? config : {});
-
-        if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {
-          _config.toggle = false;
-        }
-
-        if (!data) {
-          data = new Collapse(this, _config);
-          $this.data(DATA_KEY$3, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config]();
-        }
-      });
-    };
-
-    _createClass(Collapse, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$3;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$1;
-      }
-    }]);
-
-    return Collapse;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event$3.CLICK_DATA_API, Selector$3.DATA_TOGGLE, function (event) {
-    // preventDefault only for <a> elements (which change the URL) not inside the collapsible element
-    if (event.currentTarget.tagName === 'A') {
-      event.preventDefault();
-    }
-
-    var $trigger = $(this);
-    var selector = Util.getSelectorFromElement(this);
-    var selectors = [].slice.call(document.querySelectorAll(selector));
-    $(selectors).each(function () {
-      var $target = $(this);
-      var data = $target.data(DATA_KEY$3);
-      var config = data ? 'toggle' : $trigger.data();
-
-      Collapse._jQueryInterface.call($target, config);
-    });
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$3] = Collapse._jQueryInterface;
-  $.fn[NAME$3].Constructor = Collapse;
-
-  $.fn[NAME$3].noConflict = function () {
-    $.fn[NAME$3] = JQUERY_NO_CONFLICT$3;
-    return Collapse._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$4 = 'dropdown';
-  var VERSION$4 = '4.4.1';
-  var DATA_KEY$4 = 'bs.dropdown';
-  var EVENT_KEY$4 = "." + DATA_KEY$4;
-  var DATA_API_KEY$4 = '.data-api';
-  var JQUERY_NO_CONFLICT$4 = $.fn[NAME$4];
-  var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key
-
-  var SPACE_KEYCODE = 32; // KeyboardEvent.which value for space key
-
-  var TAB_KEYCODE = 9; // KeyboardEvent.which value for tab key
-
-  var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key
-
-  var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key
-
-  var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse)
-
-  var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + "|" + ARROW_DOWN_KEYCODE + "|" + ESCAPE_KEYCODE);
-  var Event$4 = {
-    HIDE: "hide" + EVENT_KEY$4,
-    HIDDEN: "hidden" + EVENT_KEY$4,
-    SHOW: "show" + EVENT_KEY$4,
-    SHOWN: "shown" + EVENT_KEY$4,
-    CLICK: "click" + EVENT_KEY$4,
-    CLICK_DATA_API: "click" + EVENT_KEY$4 + DATA_API_KEY$4,
-    KEYDOWN_DATA_API: "keydown" + EVENT_KEY$4 + DATA_API_KEY$4,
-    KEYUP_DATA_API: "keyup" + EVENT_KEY$4 + DATA_API_KEY$4
-  };
-  var ClassName$4 = {
-    DISABLED: 'disabled',
-    SHOW: 'show',
-    DROPUP: 'dropup',
-    DROPRIGHT: 'dropright',
-    DROPLEFT: 'dropleft',
-    MENURIGHT: 'dropdown-menu-right',
-    MENULEFT: 'dropdown-menu-left',
-    POSITION_STATIC: 'position-static'
-  };
-  var Selector$4 = {
-    DATA_TOGGLE: '[data-toggle="dropdown"]',
-    FORM_CHILD: '.dropdown form',
-    MENU: '.dropdown-menu',
-    NAVBAR_NAV: '.navbar-nav',
-    VISIBLE_ITEMS: '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)'
-  };
-  var AttachmentMap = {
-    TOP: 'top-start',
-    TOPEND: 'top-end',
-    BOTTOM: 'bottom-start',
-    BOTTOMEND: 'bottom-end',
-    RIGHT: 'right-start',
-    RIGHTEND: 'right-end',
-    LEFT: 'left-start',
-    LEFTEND: 'left-end'
-  };
-  var Default$2 = {
-    offset: 0,
-    flip: true,
-    boundary: 'scrollParent',
-    reference: 'toggle',
-    display: 'dynamic',
-    popperConfig: null
-  };
-  var DefaultType$2 = {
-    offset: '(number|string|function)',
-    flip: 'boolean',
-    boundary: '(string|element)',
-    reference: '(string|element)',
-    display: 'string',
-    popperConfig: '(null|object)'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Dropdown =
-  /*#__PURE__*/
-  function () {
-    function Dropdown(element, config) {
-      this._element = element;
-      this._popper = null;
-      this._config = this._getConfig(config);
-      this._menu = this._getMenuElement();
-      this._inNavbar = this._detectNavbar();
-
-      this._addEventListeners();
-    } // Getters
-
-
-    var _proto = Dropdown.prototype;
-
-    // Public
-    _proto.toggle = function toggle() {
-      if (this._element.disabled || $(this._element).hasClass(ClassName$4.DISABLED)) {
-        return;
-      }
-
-      var isActive = $(this._menu).hasClass(ClassName$4.SHOW);
-
-      Dropdown._clearMenus();
-
-      if (isActive) {
-        return;
-      }
-
-      this.show(true);
-    };
-
-    _proto.show = function show(usePopper) {
-      if (usePopper === void 0) {
-        usePopper = false;
-      }
-
-      if (this._element.disabled || $(this._element).hasClass(ClassName$4.DISABLED) || $(this._menu).hasClass(ClassName$4.SHOW)) {
-        return;
-      }
-
-      var relatedTarget = {
-        relatedTarget: this._element
-      };
-      var showEvent = $.Event(Event$4.SHOW, relatedTarget);
-
-      var parent = Dropdown._getParentFromElement(this._element);
-
-      $(parent).trigger(showEvent);
-
-      if (showEvent.isDefaultPrevented()) {
-        return;
-      } // Disable totally Popper.js for Dropdown in Navbar
-
-
-      if (!this._inNavbar && usePopper) {
-        /**
-         * Check for Popper dependency
-         * Popper - https://popper.js.org
-         */
-        if (typeof Popper === 'undefined') {
-          throw new TypeError('Bootstrap\'s dropdowns require Popper.js (https://popper.js.org/)');
-        }
-
-        var referenceElement = this._element;
-
-        if (this._config.reference === 'parent') {
-          referenceElement = parent;
-        } else if (Util.isElement(this._config.reference)) {
-          referenceElement = this._config.reference; // Check if it's jQuery element
-
-          if (typeof this._config.reference.jquery !== 'undefined') {
-            referenceElement = this._config.reference[0];
-          }
-        } // If boundary is not `scrollParent`, then set position to `static`
-        // to allow the menu to "escape" the scroll parent's boundaries
-        // https://github.com/twbs/bootstrap/issues/24251
-
-
-        if (this._config.boundary !== 'scrollParent') {
-          $(parent).addClass(ClassName$4.POSITION_STATIC);
-        }
-
-        this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig());
-      } // If this is a touch-enabled device we add extra
-      // empty mouseover listeners to the body's immediate children;
-      // only needed because of broken event delegation on iOS
-      // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
-
-
-      if ('ontouchstart' in document.documentElement && $(parent).closest(Selector$4.NAVBAR_NAV).length === 0) {
-        $(document.body).children().on('mouseover', null, $.noop);
-      }
-
-      this._element.focus();
-
-      this._element.setAttribute('aria-expanded', true);
-
-      $(this._menu).toggleClass(ClassName$4.SHOW);
-      $(parent).toggleClass(ClassName$4.SHOW).trigger($.Event(Event$4.SHOWN, relatedTarget));
-    };
-
-    _proto.hide = function hide() {
-      if (this._element.disabled || $(this._element).hasClass(ClassName$4.DISABLED) || !$(this._menu).hasClass(ClassName$4.SHOW)) {
-        return;
-      }
-
-      var relatedTarget = {
-        relatedTarget: this._element
-      };
-      var hideEvent = $.Event(Event$4.HIDE, relatedTarget);
-
-      var parent = Dropdown._getParentFromElement(this._element);
-
-      $(parent).trigger(hideEvent);
-
-      if (hideEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      if (this._popper) {
-        this._popper.destroy();
-      }
-
-      $(this._menu).toggleClass(ClassName$4.SHOW);
-      $(parent).toggleClass(ClassName$4.SHOW).trigger($.Event(Event$4.HIDDEN, relatedTarget));
-    };
-
-    _proto.dispose = function dispose() {
-      $.removeData(this._element, DATA_KEY$4);
-      $(this._element).off(EVENT_KEY$4);
-      this._element = null;
-      this._menu = null;
-
-      if (this._popper !== null) {
-        this._popper.destroy();
-
-        this._popper = null;
-      }
-    };
-
-    _proto.update = function update() {
-      this._inNavbar = this._detectNavbar();
-
-      if (this._popper !== null) {
-        this._popper.scheduleUpdate();
-      }
-    } // Private
-    ;
-
-    _proto._addEventListeners = function _addEventListeners() {
-      var _this = this;
-
-      $(this._element).on(Event$4.CLICK, function (event) {
-        event.preventDefault();
-        event.stopPropagation();
-
-        _this.toggle();
-      });
-    };
-
-    _proto._getConfig = function _getConfig(config) {
-      config = _objectSpread2({}, this.constructor.Default, {}, $(this._element).data(), {}, config);
-      Util.typeCheckConfig(NAME$4, config, this.constructor.DefaultType);
-      return config;
-    };
-
-    _proto._getMenuElement = function _getMenuElement() {
-      if (!this._menu) {
-        var parent = Dropdown._getParentFromElement(this._element);
-
-        if (parent) {
-          this._menu = parent.querySelector(Selector$4.MENU);
-        }
-      }
-
-      return this._menu;
-    };
-
-    _proto._getPlacement = function _getPlacement() {
-      var $parentDropdown = $(this._element.parentNode);
-      var placement = AttachmentMap.BOTTOM; // Handle dropup
-
-      if ($parentDropdown.hasClass(ClassName$4.DROPUP)) {
-        placement = AttachmentMap.TOP;
-
-        if ($(this._menu).hasClass(ClassName$4.MENURIGHT)) {
-          placement = AttachmentMap.TOPEND;
-        }
-      } else if ($parentDropdown.hasClass(ClassName$4.DROPRIGHT)) {
-        placement = AttachmentMap.RIGHT;
-      } else if ($parentDropdown.hasClass(ClassName$4.DROPLEFT)) {
-        placement = AttachmentMap.LEFT;
-      } else if ($(this._menu).hasClass(ClassName$4.MENURIGHT)) {
-        placement = AttachmentMap.BOTTOMEND;
-      }
-
-      return placement;
-    };
-
-    _proto._detectNavbar = function _detectNavbar() {
-      return $(this._element).closest('.navbar').length > 0;
-    };
-
-    _proto._getOffset = function _getOffset() {
-      var _this2 = this;
-
-      var offset = {};
-
-      if (typeof this._config.offset === 'function') {
-        offset.fn = function (data) {
-          data.offsets = _objectSpread2({}, data.offsets, {}, _this2._config.offset(data.offsets, _this2._element) || {});
-          return data;
-        };
-      } else {
-        offset.offset = this._config.offset;
-      }
-
-      return offset;
-    };
-
-    _proto._getPopperConfig = function _getPopperConfig() {
-      var popperConfig = {
-        placement: this._getPlacement(),
-        modifiers: {
-          offset: this._getOffset(),
-          flip: {
-            enabled: this._config.flip
-          },
-          preventOverflow: {
-            boundariesElement: this._config.boundary
-          }
-        }
-      }; // Disable Popper.js if we have a static display
-
-      if (this._config.display === 'static') {
-        popperConfig.modifiers.applyStyle = {
-          enabled: false
-        };
-      }
-
-      return _objectSpread2({}, popperConfig, {}, this._config.popperConfig);
-    } // Static
-    ;
-
-    Dropdown._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$4);
-
-        var _config = typeof config === 'object' ? config : null;
-
-        if (!data) {
-          data = new Dropdown(this, _config);
-          $(this).data(DATA_KEY$4, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config]();
-        }
-      });
-    };
-
-    Dropdown._clearMenus = function _clearMenus(event) {
-      if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH || event.type === 'keyup' && event.which !== TAB_KEYCODE)) {
-        return;
-      }
-
-      var toggles = [].slice.call(document.querySelectorAll(Selector$4.DATA_TOGGLE));
-
-      for (var i = 0, len = toggles.length; i < len; i++) {
-        var parent = Dropdown._getParentFromElement(toggles[i]);
-
-        var context = $(toggles[i]).data(DATA_KEY$4);
-        var relatedTarget = {
-          relatedTarget: toggles[i]
-        };
-
-        if (event && event.type === 'click') {
-          relatedTarget.clickEvent = event;
-        }
-
-        if (!context) {
-          continue;
-        }
-
-        var dropdownMenu = context._menu;
-
-        if (!$(parent).hasClass(ClassName$4.SHOW)) {
-          continue;
-        }
-
-        if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) && $.contains(parent, event.target)) {
-          continue;
-        }
-
-        var hideEvent = $.Event(Event$4.HIDE, relatedTarget);
-        $(parent).trigger(hideEvent);
-
-        if (hideEvent.isDefaultPrevented()) {
-          continue;
-        } // If this is a touch-enabled device we remove the extra
-        // empty mouseover listeners we added for iOS support
-
-
-        if ('ontouchstart' in document.documentElement) {
-          $(document.body).children().off('mouseover', null, $.noop);
-        }
-
-        toggles[i].setAttribute('aria-expanded', 'false');
-
-        if (context._popper) {
-          context._popper.destroy();
-        }
-
-        $(dropdownMenu).removeClass(ClassName$4.SHOW);
-        $(parent).removeClass(ClassName$4.SHOW).trigger($.Event(Event$4.HIDDEN, relatedTarget));
-      }
-    };
-
-    Dropdown._getParentFromElement = function _getParentFromElement(element) {
-      var parent;
-      var selector = Util.getSelectorFromElement(element);
-
-      if (selector) {
-        parent = document.querySelector(selector);
-      }
-
-      return parent || element.parentNode;
-    } // eslint-disable-next-line complexity
-    ;
-
-    Dropdown._dataApiKeydownHandler = function _dataApiKeydownHandler(event) {
-      // If not input/textarea:
-      //  - And not a key in REGEXP_KEYDOWN => not a dropdown command
-      // If input/textarea:
-      //  - If space key => not a dropdown command
-      //  - If key is other than escape
-      //    - If key is not up or down => not a dropdown command
-      //    - If trigger inside the menu => not a dropdown command
-      if (/input|textarea/i.test(event.target.tagName) ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || $(event.target).closest(Selector$4.MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {
-        return;
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-
-      if (this.disabled || $(this).hasClass(ClassName$4.DISABLED)) {
-        return;
-      }
-
-      var parent = Dropdown._getParentFromElement(this);
-
-      var isActive = $(parent).hasClass(ClassName$4.SHOW);
-
-      if (!isActive && event.which === ESCAPE_KEYCODE) {
-        return;
-      }
-
-      if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
-        if (event.which === ESCAPE_KEYCODE) {
-          var toggle = parent.querySelector(Selector$4.DATA_TOGGLE);
-          $(toggle).trigger('focus');
-        }
-
-        $(this).trigger('click');
-        return;
-      }
-
-      var items = [].slice.call(parent.querySelectorAll(Selector$4.VISIBLE_ITEMS)).filter(function (item) {
-        return $(item).is(':visible');
-      });
-
-      if (items.length === 0) {
-        return;
-      }
-
-      var index = items.indexOf(event.target);
-
-      if (event.which === ARROW_UP_KEYCODE && index > 0) {
-        // Up
-        index--;
-      }
-
-      if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) {
-        // Down
-        index++;
-      }
-
-      if (index < 0) {
-        index = 0;
-      }
-
-      items[index].focus();
-    };
-
-    _createClass(Dropdown, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$4;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$2;
-      }
-    }, {
-      key: "DefaultType",
-      get: function get() {
-        return DefaultType$2;
-      }
-    }]);
-
-    return Dropdown;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event$4.KEYDOWN_DATA_API, Selector$4.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event$4.KEYDOWN_DATA_API, Selector$4.MENU, Dropdown._dataApiKeydownHandler).on(Event$4.CLICK_DATA_API + " " + Event$4.KEYUP_DATA_API, Dropdown._clearMenus).on(Event$4.CLICK_DATA_API, Selector$4.DATA_TOGGLE, function (event) {
-    event.preventDefault();
-    event.stopPropagation();
-
-    Dropdown._jQueryInterface.call($(this), 'toggle');
-  }).on(Event$4.CLICK_DATA_API, Selector$4.FORM_CHILD, function (e) {
-    e.stopPropagation();
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$4] = Dropdown._jQueryInterface;
-  $.fn[NAME$4].Constructor = Dropdown;
-
-  $.fn[NAME$4].noConflict = function () {
-    $.fn[NAME$4] = JQUERY_NO_CONFLICT$4;
-    return Dropdown._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$5 = 'modal';
-  var VERSION$5 = '4.4.1';
-  var DATA_KEY$5 = 'bs.modal';
-  var EVENT_KEY$5 = "." + DATA_KEY$5;
-  var DATA_API_KEY$5 = '.data-api';
-  var JQUERY_NO_CONFLICT$5 = $.fn[NAME$5];
-  var ESCAPE_KEYCODE$1 = 27; // KeyboardEvent.which value for Escape (Esc) key
-
-  var Default$3 = {
-    backdrop: true,
-    keyboard: true,
-    focus: true,
-    show: true
-  };
-  var DefaultType$3 = {
-    backdrop: '(boolean|string)',
-    keyboard: 'boolean',
-    focus: 'boolean',
-    show: 'boolean'
-  };
-  var Event$5 = {
-    HIDE: "hide" + EVENT_KEY$5,
-    HIDE_PREVENTED: "hidePrevented" + EVENT_KEY$5,
-    HIDDEN: "hidden" + EVENT_KEY$5,
-    SHOW: "show" + EVENT_KEY$5,
-    SHOWN: "shown" + EVENT_KEY$5,
-    FOCUSIN: "focusin" + EVENT_KEY$5,
-    RESIZE: "resize" + EVENT_KEY$5,
-    CLICK_DISMISS: "click.dismiss" + EVENT_KEY$5,
-    KEYDOWN_DISMISS: "keydown.dismiss" + EVENT_KEY$5,
-    MOUSEUP_DISMISS: "mouseup.dismiss" + EVENT_KEY$5,
-    MOUSEDOWN_DISMISS: "mousedown.dismiss" + EVENT_KEY$5,
-    CLICK_DATA_API: "click" + EVENT_KEY$5 + DATA_API_KEY$5
-  };
-  var ClassName$5 = {
-    SCROLLABLE: 'modal-dialog-scrollable',
-    SCROLLBAR_MEASURER: 'modal-scrollbar-measure',
-    BACKDROP: 'modal-backdrop',
-    OPEN: 'modal-open',
-    FADE: 'fade',
-    SHOW: 'show',
-    STATIC: 'modal-static'
-  };
-  var Selector$5 = {
-    DIALOG: '.modal-dialog',
-    MODAL_BODY: '.modal-body',
-    DATA_TOGGLE: '[data-toggle="modal"]',
-    DATA_DISMISS: '[data-dismiss="modal"]',
-    FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
-    STICKY_CONTENT: '.sticky-top'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Modal =
-  /*#__PURE__*/
-  function () {
-    function Modal(element, config) {
-      this._config = this._getConfig(config);
-      this._element = element;
-      this._dialog = element.querySelector(Selector$5.DIALOG);
-      this._backdrop = null;
-      this._isShown = false;
-      this._isBodyOverflowing = false;
-      this._ignoreBackdropClick = false;
-      this._isTransitioning = false;
-      this._scrollbarWidth = 0;
-    } // Getters
-
-
-    var _proto = Modal.prototype;
-
-    // Public
-    _proto.toggle = function toggle(relatedTarget) {
-      return this._isShown ? this.hide() : this.show(relatedTarget);
-    };
-
-    _proto.show = function show(relatedTarget) {
-      var _this = this;
-
-      if (this._isShown || this._isTransitioning) {
-        return;
-      }
-
-      if ($(this._element).hasClass(ClassName$5.FADE)) {
-        this._isTransitioning = true;
-      }
-
-      var showEvent = $.Event(Event$5.SHOW, {
-        relatedTarget: relatedTarget
-      });
-      $(this._element).trigger(showEvent);
-
-      if (this._isShown || showEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      this._isShown = true;
-
-      this._checkScrollbar();
-
-      this._setScrollbar();
-
-      this._adjustDialog();
-
-      this._setEscapeEvent();
-
-      this._setResizeEvent();
-
-      $(this._element).on(Event$5.CLICK_DISMISS, Selector$5.DATA_DISMISS, function (event) {
-        return _this.hide(event);
-      });
-      $(this._dialog).on(Event$5.MOUSEDOWN_DISMISS, function () {
-        $(_this._element).one(Event$5.MOUSEUP_DISMISS, function (event) {
-          if ($(event.target).is(_this._element)) {
-            _this._ignoreBackdropClick = true;
-          }
-        });
-      });
-
-      this._showBackdrop(function () {
-        return _this._showElement(relatedTarget);
-      });
-    };
-
-    _proto.hide = function hide(event) {
-      var _this2 = this;
-
-      if (event) {
-        event.preventDefault();
-      }
-
-      if (!this._isShown || this._isTransitioning) {
-        return;
-      }
-
-      var hideEvent = $.Event(Event$5.HIDE);
-      $(this._element).trigger(hideEvent);
-
-      if (!this._isShown || hideEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      this._isShown = false;
-      var transition = $(this._element).hasClass(ClassName$5.FADE);
-
-      if (transition) {
-        this._isTransitioning = true;
-      }
-
-      this._setEscapeEvent();
-
-      this._setResizeEvent();
-
-      $(document).off(Event$5.FOCUSIN);
-      $(this._element).removeClass(ClassName$5.SHOW);
-      $(this._element).off(Event$5.CLICK_DISMISS);
-      $(this._dialog).off(Event$5.MOUSEDOWN_DISMISS);
-
-      if (transition) {
-        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
-        $(this._element).one(Util.TRANSITION_END, function (event) {
-          return _this2._hideModal(event);
-        }).emulateTransitionEnd(transitionDuration);
-      } else {
-        this._hideModal();
-      }
-    };
-
-    _proto.dispose = function dispose() {
-      [window, this._element, this._dialog].forEach(function (htmlElement) {
-        return $(htmlElement).off(EVENT_KEY$5);
-      });
-      /**
-       * `document` has 2 events `Event.FOCUSIN` and `Event.CLICK_DATA_API`
-       * Do not move `document` in `htmlElements` array
-       * It will remove `Event.CLICK_DATA_API` event that should remain
-       */
-
-      $(document).off(Event$5.FOCUSIN);
-      $.removeData(this._element, DATA_KEY$5);
-      this._config = null;
-      this._element = null;
-      this._dialog = null;
-      this._backdrop = null;
-      this._isShown = null;
-      this._isBodyOverflowing = null;
-      this._ignoreBackdropClick = null;
-      this._isTransitioning = null;
-      this._scrollbarWidth = null;
-    };
-
-    _proto.handleUpdate = function handleUpdate() {
-      this._adjustDialog();
-    } // Private
-    ;
-
-    _proto._getConfig = function _getConfig(config) {
-      config = _objectSpread2({}, Default$3, {}, config);
-      Util.typeCheckConfig(NAME$5, config, DefaultType$3);
-      return config;
-    };
-
-    _proto._triggerBackdropTransition = function _triggerBackdropTransition() {
-      var _this3 = this;
-
-      if (this._config.backdrop === 'static') {
-        var hideEventPrevented = $.Event(Event$5.HIDE_PREVENTED);
-        $(this._element).trigger(hideEventPrevented);
-
-        if (hideEventPrevented.defaultPrevented) {
-          return;
-        }
-
-        this._element.classList.add(ClassName$5.STATIC);
-
-        var modalTransitionDuration = Util.getTransitionDurationFromElement(this._element);
-        $(this._element).one(Util.TRANSITION_END, function () {
-          _this3._element.classList.remove(ClassName$5.STATIC);
-        }).emulateTransitionEnd(modalTransitionDuration);
-
-        this._element.focus();
-      } else {
-        this.hide();
-      }
-    };
-
-    _proto._showElement = function _showElement(relatedTarget) {
-      var _this4 = this;
-
-      var transition = $(this._element).hasClass(ClassName$5.FADE);
-      var modalBody = this._dialog ? this._dialog.querySelector(Selector$5.MODAL_BODY) : null;
-
-      if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
-        // Don't move modal's DOM position
-        document.body.appendChild(this._element);
-      }
-
-      this._element.style.display = 'block';
-
-      this._element.removeAttribute('aria-hidden');
-
-      this._element.setAttribute('aria-modal', true);
-
-      if ($(this._dialog).hasClass(ClassName$5.SCROLLABLE) && modalBody) {
-        modalBody.scrollTop = 0;
-      } else {
-        this._element.scrollTop = 0;
-      }
-
-      if (transition) {
-        Util.reflow(this._element);
-      }
-
-      $(this._element).addClass(ClassName$5.SHOW);
-
-      if (this._config.focus) {
-        this._enforceFocus();
-      }
-
-      var shownEvent = $.Event(Event$5.SHOWN, {
-        relatedTarget: relatedTarget
-      });
-
-      var transitionComplete = function transitionComplete() {
-        if (_this4._config.focus) {
-          _this4._element.focus();
-        }
-
-        _this4._isTransitioning = false;
-        $(_this4._element).trigger(shownEvent);
-      };
-
-      if (transition) {
-        var transitionDuration = Util.getTransitionDurationFromElement(this._dialog);
-        $(this._dialog).one(Util.TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration);
-      } else {
-        transitionComplete();
-      }
-    };
-
-    _proto._enforceFocus = function _enforceFocus() {
-      var _this5 = this;
-
-      $(document).off(Event$5.FOCUSIN) // Guard against infinite focus loop
-      .on(Event$5.FOCUSIN, function (event) {
-        if (document !== event.target && _this5._element !== event.target && $(_this5._element).has(event.target).length === 0) {
-          _this5._element.focus();
-        }
-      });
-    };
-
-    _proto._setEscapeEvent = function _setEscapeEvent() {
-      var _this6 = this;
-
-      if (this._isShown && this._config.keyboard) {
-        $(this._element).on(Event$5.KEYDOWN_DISMISS, function (event) {
-          if (event.which === ESCAPE_KEYCODE$1) {
-            _this6._triggerBackdropTransition();
-          }
-        });
-      } else if (!this._isShown) {
-        $(this._element).off(Event$5.KEYDOWN_DISMISS);
-      }
-    };
-
-    _proto._setResizeEvent = function _setResizeEvent() {
-      var _this7 = this;
-
-      if (this._isShown) {
-        $(window).on(Event$5.RESIZE, function (event) {
-          return _this7.handleUpdate(event);
-        });
-      } else {
-        $(window).off(Event$5.RESIZE);
-      }
-    };
-
-    _proto._hideModal = function _hideModal() {
-      var _this8 = this;
-
-      this._element.style.display = 'none';
-
-      this._element.setAttribute('aria-hidden', true);
-
-      this._element.removeAttribute('aria-modal');
-
-      this._isTransitioning = false;
-
-      this._showBackdrop(function () {
-        $(document.body).removeClass(ClassName$5.OPEN);
-
-        _this8._resetAdjustments();
-
-        _this8._resetScrollbar();
-
-        $(_this8._element).trigger(Event$5.HIDDEN);
-      });
-    };
-
-    _proto._removeBackdrop = function _removeBackdrop() {
-      if (this._backdrop) {
-        $(this._backdrop).remove();
-        this._backdrop = null;
-      }
-    };
-
-    _proto._showBackdrop = function _showBackdrop(callback) {
-      var _this9 = this;
-
-      var animate = $(this._element).hasClass(ClassName$5.FADE) ? ClassName$5.FADE : '';
-
-      if (this._isShown && this._config.backdrop) {
-        this._backdrop = document.createElement('div');
-        this._backdrop.className = ClassName$5.BACKDROP;
-
-        if (animate) {
-          this._backdrop.classList.add(animate);
-        }
-
-        $(this._backdrop).appendTo(document.body);
-        $(this._element).on(Event$5.CLICK_DISMISS, function (event) {
-          if (_this9._ignoreBackdropClick) {
-            _this9._ignoreBackdropClick = false;
-            return;
-          }
-
-          if (event.target !== event.currentTarget) {
-            return;
-          }
-
-          _this9._triggerBackdropTransition();
-        });
-
-        if (animate) {
-          Util.reflow(this._backdrop);
-        }
-
-        $(this._backdrop).addClass(ClassName$5.SHOW);
-
-        if (!callback) {
-          return;
-        }
-
-        if (!animate) {
-          callback();
-          return;
-        }
-
-        var backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
-        $(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration);
-      } else if (!this._isShown && this._backdrop) {
-        $(this._backdrop).removeClass(ClassName$5.SHOW);
-
-        var callbackRemove = function callbackRemove() {
-          _this9._removeBackdrop();
-
-          if (callback) {
-            callback();
-          }
-        };
-
-        if ($(this._element).hasClass(ClassName$5.FADE)) {
-          var _backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
-
-          $(this._backdrop).one(Util.TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration);
-        } else {
-          callbackRemove();
-        }
-      } else if (callback) {
-        callback();
-      }
-    } // ----------------------------------------------------------------------
-    // the following methods are used to handle overflowing modals
-    // todo (fat): these should probably be refactored out of modal.js
-    // ----------------------------------------------------------------------
-    ;
-
-    _proto._adjustDialog = function _adjustDialog() {
-      var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;
-
-      if (!this._isBodyOverflowing && isModalOverflowing) {
-        this._element.style.paddingLeft = this._scrollbarWidth + "px";
-      }
-
-      if (this._isBodyOverflowing && !isModalOverflowing) {
-        this._element.style.paddingRight = this._scrollbarWidth + "px";
-      }
-    };
-
-    _proto._resetAdjustments = function _resetAdjustments() {
-      this._element.style.paddingLeft = '';
-      this._element.style.paddingRight = '';
-    };
-
-    _proto._checkScrollbar = function _checkScrollbar() {
-      var rect = document.body.getBoundingClientRect();
-      this._isBodyOverflowing = rect.left + rect.right < window.innerWidth;
-      this._scrollbarWidth = this._getScrollbarWidth();
-    };
-
-    _proto._setScrollbar = function _setScrollbar() {
-      var _this10 = this;
-
-      if (this._isBodyOverflowing) {
-        // Note: DOMNode.style.paddingRight returns the actual value or '' if not set
-        //   while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set
-        var fixedContent = [].slice.call(document.querySelectorAll(Selector$5.FIXED_CONTENT));
-        var stickyContent = [].slice.call(document.querySelectorAll(Selector$5.STICKY_CONTENT)); // Adjust fixed content padding
-
-        $(fixedContent).each(function (index, element) {
-          var actualPadding = element.style.paddingRight;
-          var calculatedPadding = $(element).css('padding-right');
-          $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this10._scrollbarWidth + "px");
-        }); // Adjust sticky content margin
-
-        $(stickyContent).each(function (index, element) {
-          var actualMargin = element.style.marginRight;
-          var calculatedMargin = $(element).css('margin-right');
-          $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this10._scrollbarWidth + "px");
-        }); // Adjust body padding
-
-        var actualPadding = document.body.style.paddingRight;
-        var calculatedPadding = $(document.body).css('padding-right');
-        $(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
-      }
-
-      $(document.body).addClass(ClassName$5.OPEN);
-    };
-
-    _proto._resetScrollbar = function _resetScrollbar() {
-      // Restore fixed content padding
-      var fixedContent = [].slice.call(document.querySelectorAll(Selector$5.FIXED_CONTENT));
-      $(fixedContent).each(function (index, element) {
-        var padding = $(element).data('padding-right');
-        $(element).removeData('padding-right');
-        element.style.paddingRight = padding ? padding : '';
-      }); // Restore sticky content
-
-      var elements = [].slice.call(document.querySelectorAll("" + Selector$5.STICKY_CONTENT));
-      $(elements).each(function (index, element) {
-        var margin = $(element).data('margin-right');
-
-        if (typeof margin !== 'undefined') {
-          $(element).css('margin-right', margin).removeData('margin-right');
-        }
-      }); // Restore body padding
-
-      var padding = $(document.body).data('padding-right');
-      $(document.body).removeData('padding-right');
-      document.body.style.paddingRight = padding ? padding : '';
-    };
-
-    _proto._getScrollbarWidth = function _getScrollbarWidth() {
-      // thx d.walsh
-      var scrollDiv = document.createElement('div');
-      scrollDiv.className = ClassName$5.SCROLLBAR_MEASURER;
-      document.body.appendChild(scrollDiv);
-      var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth;
-      document.body.removeChild(scrollDiv);
-      return scrollbarWidth;
-    } // Static
-    ;
-
-    Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$5);
-
-        var _config = _objectSpread2({}, Default$3, {}, $(this).data(), {}, typeof config === 'object' && config ? config : {});
-
-        if (!data) {
-          data = new Modal(this, _config);
-          $(this).data(DATA_KEY$5, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config](relatedTarget);
-        } else if (_config.show) {
-          data.show(relatedTarget);
-        }
-      });
-    };
-
-    _createClass(Modal, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$5;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$3;
-      }
-    }]);
-
-    return Modal;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event$5.CLICK_DATA_API, Selector$5.DATA_TOGGLE, function (event) {
-    var _this11 = this;
-
-    var target;
-    var selector = Util.getSelectorFromElement(this);
-
-    if (selector) {
-      target = document.querySelector(selector);
-    }
-
-    var config = $(target).data(DATA_KEY$5) ? 'toggle' : _objectSpread2({}, $(target).data(), {}, $(this).data());
-
-    if (this.tagName === 'A' || this.tagName === 'AREA') {
-      event.preventDefault();
-    }
-
-    var $target = $(target).one(Event$5.SHOW, function (showEvent) {
-      if (showEvent.isDefaultPrevented()) {
-        // Only register focus restorer if modal will actually get shown
-        return;
-      }
-
-      $target.one(Event$5.HIDDEN, function () {
-        if ($(_this11).is(':visible')) {
-          _this11.focus();
-        }
-      });
-    });
-
-    Modal._jQueryInterface.call($(target), config, this);
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$5] = Modal._jQueryInterface;
-  $.fn[NAME$5].Constructor = Modal;
-
-  $.fn[NAME$5].noConflict = function () {
-    $.fn[NAME$5] = JQUERY_NO_CONFLICT$5;
-    return Modal._jQueryInterface;
-  };
-
-  /**
-   * --------------------------------------------------------------------------
-   * Bootstrap (v4.4.1): tools/sanitizer.js
-   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
-   * --------------------------------------------------------------------------
-   */
-  var uriAttrs = ['background', 'cite', 'href', 'itemtype', 'longdesc', 'poster', 'src', 'xlink:href'];
-  var ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i;
-  var DefaultWhitelist = {
-    // Global attributes allowed on any supplied element below.
-    '*': ['class', 'dir', 'id', 'lang', 'role', ARIA_ATTRIBUTE_PATTERN],
-    a: ['target', 'href', 'title', 'rel'],
-    area: [],
-    b: [],
-    br: [],
-    col: [],
-    code: [],
-    div: [],
-    em: [],
-    hr: [],
-    h1: [],
-    h2: [],
-    h3: [],
-    h4: [],
-    h5: [],
-    h6: [],
-    i: [],
-    img: ['src', 'alt', 'title', 'width', 'height'],
-    li: [],
-    ol: [],
-    p: [],
-    pre: [],
-    s: [],
-    small: [],
-    span: [],
-    sub: [],
-    sup: [],
-    strong: [],
-    u: [],
-    ul: []
-  };
-  /**
-   * A pattern that recognizes a commonly useful subset of URLs that are safe.
-   *
-   * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
-   */
-
-  var SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi;
-  /**
-   * A pattern that matches safe data URLs. Only matches image, video and audio types.
-   *
-   * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
-   */
-
-  var DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;
-
-  function allowedAttribute(attr, allowedAttributeList) {
-    var attrName = attr.nodeName.toLowerCase();
-
-    if (allowedAttributeList.indexOf(attrName) !== -1) {
-      if (uriAttrs.indexOf(attrName) !== -1) {
-        return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN));
-      }
-
-      return true;
-    }
-
-    var regExp = allowedAttributeList.filter(function (attrRegex) {
-      return attrRegex instanceof RegExp;
-    }); // Check if a regular expression validates the attribute.
-
-    for (var i = 0, l = regExp.length; i < l; i++) {
-      if (attrName.match(regExp[i])) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) {
-    if (unsafeHtml.length === 0) {
-      return unsafeHtml;
-    }
-
-    if (sanitizeFn && typeof sanitizeFn === 'function') {
-      return sanitizeFn(unsafeHtml);
-    }
-
-    var domParser = new window.DOMParser();
-    var createdDocument = domParser.parseFromString(unsafeHtml, 'text/html');
-    var whitelistKeys = Object.keys(whiteList);
-    var elements = [].slice.call(createdDocument.body.querySelectorAll('*'));
-
-    var _loop = function _loop(i, len) {
-      var el = elements[i];
-      var elName = el.nodeName.toLowerCase();
-
-      if (whitelistKeys.indexOf(el.nodeName.toLowerCase()) === -1) {
-        el.parentNode.removeChild(el);
-        return "continue";
-      }
-
-      var attributeList = [].slice.call(el.attributes);
-      var whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || []);
-      attributeList.forEach(function (attr) {
-        if (!allowedAttribute(attr, whitelistedAttributes)) {
-          el.removeAttribute(attr.nodeName);
-        }
-      });
-    };
-
-    for (var i = 0, len = elements.length; i < len; i++) {
-      var _ret = _loop(i);
-
-      if (_ret === "continue") continue;
-    }
-
-    return createdDocument.body.innerHTML;
-  }
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$6 = 'tooltip';
-  var VERSION$6 = '4.4.1';
-  var DATA_KEY$6 = 'bs.tooltip';
-  var EVENT_KEY$6 = "." + DATA_KEY$6;
-  var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
-  var CLASS_PREFIX = 'bs-tooltip';
-  var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g');
-  var DISALLOWED_ATTRIBUTES = ['sanitize', 'whiteList', 'sanitizeFn'];
-  var DefaultType$4 = {
-    animation: 'boolean',
-    template: 'string',
-    title: '(string|element|function)',
-    trigger: 'string',
-    delay: '(number|object)',
-    html: 'boolean',
-    selector: '(string|boolean)',
-    placement: '(string|function)',
-    offset: '(number|string|function)',
-    container: '(string|element|boolean)',
-    fallbackPlacement: '(string|array)',
-    boundary: '(string|element)',
-    sanitize: 'boolean',
-    sanitizeFn: '(null|function)',
-    whiteList: 'object',
-    popperConfig: '(null|object)'
-  };
-  var AttachmentMap$1 = {
-    AUTO: 'auto',
-    TOP: 'top',
-    RIGHT: 'right',
-    BOTTOM: 'bottom',
-    LEFT: 'left'
-  };
-  var Default$4 = {
-    animation: true,
-    template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    selector: false,
-    placement: 'top',
-    offset: 0,
-    container: false,
-    fallbackPlacement: 'flip',
-    boundary: 'scrollParent',
-    sanitize: true,
-    sanitizeFn: null,
-    whiteList: DefaultWhitelist,
-    popperConfig: null
-  };
-  var HoverState = {
-    SHOW: 'show',
-    OUT: 'out'
-  };
-  var Event$6 = {
-    HIDE: "hide" + EVENT_KEY$6,
-    HIDDEN: "hidden" + EVENT_KEY$6,
-    SHOW: "show" + EVENT_KEY$6,
-    SHOWN: "shown" + EVENT_KEY$6,
-    INSERTED: "inserted" + EVENT_KEY$6,
-    CLICK: "click" + EVENT_KEY$6,
-    FOCUSIN: "focusin" + EVENT_KEY$6,
-    FOCUSOUT: "focusout" + EVENT_KEY$6,
-    MOUSEENTER: "mouseenter" + EVENT_KEY$6,
-    MOUSELEAVE: "mouseleave" + EVENT_KEY$6
-  };
-  var ClassName$6 = {
-    FADE: 'fade',
-    SHOW: 'show'
-  };
-  var Selector$6 = {
-    TOOLTIP: '.tooltip',
-    TOOLTIP_INNER: '.tooltip-inner',
-    ARROW: '.arrow'
-  };
-  var Trigger = {
-    HOVER: 'hover',
-    FOCUS: 'focus',
-    CLICK: 'click',
-    MANUAL: 'manual'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Tooltip =
-  /*#__PURE__*/
-  function () {
-    function Tooltip(element, config) {
-      if (typeof Popper === 'undefined') {
-        throw new TypeError('Bootstrap\'s tooltips require Popper.js (https://popper.js.org/)');
-      } // private
-
-
-      this._isEnabled = true;
-      this._timeout = 0;
-      this._hoverState = '';
-      this._activeTrigger = {};
-      this._popper = null; // Protected
-
-      this.element = element;
-      this.config = this._getConfig(config);
-      this.tip = null;
-
-      this._setListeners();
-    } // Getters
-
-
-    var _proto = Tooltip.prototype;
-
-    // Public
-    _proto.enable = function enable() {
-      this._isEnabled = true;
-    };
-
-    _proto.disable = function disable() {
-      this._isEnabled = false;
-    };
-
-    _proto.toggleEnabled = function toggleEnabled() {
-      this._isEnabled = !this._isEnabled;
-    };
-
-    _proto.toggle = function toggle(event) {
-      if (!this._isEnabled) {
-        return;
-      }
-
-      if (event) {
-        var dataKey = this.constructor.DATA_KEY;
-        var context = $(event.currentTarget).data(dataKey);
-
-        if (!context) {
-          context = new this.constructor(event.currentTarget, this._getDelegateConfig());
-          $(event.currentTarget).data(dataKey, context);
-        }
-
-        context._activeTrigger.click = !context._activeTrigger.click;
-
-        if (context._isWithActiveTrigger()) {
-          context._enter(null, context);
-        } else {
-          context._leave(null, context);
-        }
-      } else {
-        if ($(this.getTipElement()).hasClass(ClassName$6.SHOW)) {
-          this._leave(null, this);
-
-          return;
-        }
-
-        this._enter(null, this);
-      }
-    };
-
-    _proto.dispose = function dispose() {
-      clearTimeout(this._timeout);
-      $.removeData(this.element, this.constructor.DATA_KEY);
-      $(this.element).off(this.constructor.EVENT_KEY);
-      $(this.element).closest('.modal').off('hide.bs.modal', this._hideModalHandler);
-
-      if (this.tip) {
-        $(this.tip).remove();
-      }
-
-      this._isEnabled = null;
-      this._timeout = null;
-      this._hoverState = null;
-      this._activeTrigger = null;
-
-      if (this._popper) {
-        this._popper.destroy();
-      }
-
-      this._popper = null;
-      this.element = null;
-      this.config = null;
-      this.tip = null;
-    };
-
-    _proto.show = function show() {
-      var _this = this;
-
-      if ($(this.element).css('display') === 'none') {
-        throw new Error('Please use show on visible elements');
-      }
-
-      var showEvent = $.Event(this.constructor.Event.SHOW);
-
-      if (this.isWithContent() && this._isEnabled) {
-        $(this.element).trigger(showEvent);
-        var shadowRoot = Util.findShadowRoot(this.element);
-        var isInTheDom = $.contains(shadowRoot !== null ? shadowRoot : this.element.ownerDocument.documentElement, this.element);
-
-        if (showEvent.isDefaultPrevented() || !isInTheDom) {
-          return;
-        }
-
-        var tip = this.getTipElement();
-        var tipId = Util.getUID(this.constructor.NAME);
-        tip.setAttribute('id', tipId);
-        this.element.setAttribute('aria-describedby', tipId);
-        this.setContent();
-
-        if (this.config.animation) {
-          $(tip).addClass(ClassName$6.FADE);
-        }
-
-        var placement = typeof this.config.placement === 'function' ? this.config.placement.call(this, tip, this.element) : this.config.placement;
-
-        var attachment = this._getAttachment(placement);
-
-        this.addAttachmentClass(attachment);
-
-        var container = this._getContainer();
-
-        $(tip).data(this.constructor.DATA_KEY, this);
-
-        if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {
-          $(tip).appendTo(container);
-        }
-
-        $(this.element).trigger(this.constructor.Event.INSERTED);
-        this._popper = new Popper(this.element, tip, this._getPopperConfig(attachment));
-        $(tip).addClass(ClassName$6.SHOW); // If this is a touch-enabled device we add extra
-        // empty mouseover listeners to the body's immediate children;
-        // only needed because of broken event delegation on iOS
-        // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
-
-        if ('ontouchstart' in document.documentElement) {
-          $(document.body).children().on('mouseover', null, $.noop);
-        }
-
-        var complete = function complete() {
-          if (_this.config.animation) {
-            _this._fixTransition();
-          }
-
-          var prevHoverState = _this._hoverState;
-          _this._hoverState = null;
-          $(_this.element).trigger(_this.constructor.Event.SHOWN);
-
-          if (prevHoverState === HoverState.OUT) {
-            _this._leave(null, _this);
-          }
-        };
-
-        if ($(this.tip).hasClass(ClassName$6.FADE)) {
-          var transitionDuration = Util.getTransitionDurationFromElement(this.tip);
-          $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-        } else {
-          complete();
-        }
-      }
-    };
-
-    _proto.hide = function hide(callback) {
-      var _this2 = this;
-
-      var tip = this.getTipElement();
-      var hideEvent = $.Event(this.constructor.Event.HIDE);
-
-      var complete = function complete() {
-        if (_this2._hoverState !== HoverState.SHOW && tip.parentNode) {
-          tip.parentNode.removeChild(tip);
-        }
-
-        _this2._cleanTipClass();
-
-        _this2.element.removeAttribute('aria-describedby');
-
-        $(_this2.element).trigger(_this2.constructor.Event.HIDDEN);
-
-        if (_this2._popper !== null) {
-          _this2._popper.destroy();
-        }
-
-        if (callback) {
-          callback();
-        }
-      };
-
-      $(this.element).trigger(hideEvent);
-
-      if (hideEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      $(tip).removeClass(ClassName$6.SHOW); // If this is a touch-enabled device we remove the extra
-      // empty mouseover listeners we added for iOS support
-
-      if ('ontouchstart' in document.documentElement) {
-        $(document.body).children().off('mouseover', null, $.noop);
-      }
-
-      this._activeTrigger[Trigger.CLICK] = false;
-      this._activeTrigger[Trigger.FOCUS] = false;
-      this._activeTrigger[Trigger.HOVER] = false;
-
-      if ($(this.tip).hasClass(ClassName$6.FADE)) {
-        var transitionDuration = Util.getTransitionDurationFromElement(tip);
-        $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-      } else {
-        complete();
-      }
-
-      this._hoverState = '';
-    };
-
-    _proto.update = function update() {
-      if (this._popper !== null) {
-        this._popper.scheduleUpdate();
-      }
-    } // Protected
-    ;
-
-    _proto.isWithContent = function isWithContent() {
-      return Boolean(this.getTitle());
-    };
-
-    _proto.addAttachmentClass = function addAttachmentClass(attachment) {
-      $(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment);
-    };
-
-    _proto.getTipElement = function getTipElement() {
-      this.tip = this.tip || $(this.config.template)[0];
-      return this.tip;
-    };
-
-    _proto.setContent = function setContent() {
-      var tip = this.getTipElement();
-      this.setElementContent($(tip.querySelectorAll(Selector$6.TOOLTIP_INNER)), this.getTitle());
-      $(tip).removeClass(ClassName$6.FADE + " " + ClassName$6.SHOW);
-    };
-
-    _proto.setElementContent = function setElementContent($element, content) {
-      if (typeof content === 'object' && (content.nodeType || content.jquery)) {
-        // Content is a DOM node or a jQuery
-        if (this.config.html) {
-          if (!$(content).parent().is($element)) {
-            $element.empty().append(content);
-          }
-        } else {
-          $element.text($(content).text());
-        }
-
-        return;
-      }
-
-      if (this.config.html) {
-        if (this.config.sanitize) {
-          content = sanitizeHtml(content, this.config.whiteList, this.config.sanitizeFn);
-        }
-
-        $element.html(content);
-      } else {
-        $element.text(content);
-      }
-    };
-
-    _proto.getTitle = function getTitle() {
-      var title = this.element.getAttribute('data-original-title');
-
-      if (!title) {
-        title = typeof this.config.title === 'function' ? this.config.title.call(this.element) : this.config.title;
-      }
-
-      return title;
-    } // Private
-    ;
-
-    _proto._getPopperConfig = function _getPopperConfig(attachment) {
-      var _this3 = this;
-
-      var defaultBsConfig = {
-        placement: attachment,
-        modifiers: {
-          offset: this._getOffset(),
-          flip: {
-            behavior: this.config.fallbackPlacement
-          },
-          arrow: {
-            element: Selector$6.ARROW
-          },
-          preventOverflow: {
-            boundariesElement: this.config.boundary
-          }
-        },
-        onCreate: function onCreate(data) {
-          if (data.originalPlacement !== data.placement) {
-            _this3._handlePopperPlacementChange(data);
-          }
-        },
-        onUpdate: function onUpdate(data) {
-          return _this3._handlePopperPlacementChange(data);
-        }
-      };
-      return _objectSpread2({}, defaultBsConfig, {}, this.config.popperConfig);
-    };
-
-    _proto._getOffset = function _getOffset() {
-      var _this4 = this;
-
-      var offset = {};
-
-      if (typeof this.config.offset === 'function') {
-        offset.fn = function (data) {
-          data.offsets = _objectSpread2({}, data.offsets, {}, _this4.config.offset(data.offsets, _this4.element) || {});
-          return data;
-        };
-      } else {
-        offset.offset = this.config.offset;
-      }
-
-      return offset;
-    };
-
-    _proto._getContainer = function _getContainer() {
-      if (this.config.container === false) {
-        return document.body;
-      }
-
-      if (Util.isElement(this.config.container)) {
-        return $(this.config.container);
-      }
-
-      return $(document).find(this.config.container);
-    };
-
-    _proto._getAttachment = function _getAttachment(placement) {
-      return AttachmentMap$1[placement.toUpperCase()];
-    };
-
-    _proto._setListeners = function _setListeners() {
-      var _this5 = this;
-
-      var triggers = this.config.trigger.split(' ');
-      triggers.forEach(function (trigger) {
-        if (trigger === 'click') {
-          $(_this5.element).on(_this5.constructor.Event.CLICK, _this5.config.selector, function (event) {
-            return _this5.toggle(event);
-          });
-        } else if (trigger !== Trigger.MANUAL) {
-          var eventIn = trigger === Trigger.HOVER ? _this5.constructor.Event.MOUSEENTER : _this5.constructor.Event.FOCUSIN;
-          var eventOut = trigger === Trigger.HOVER ? _this5.constructor.Event.MOUSELEAVE : _this5.constructor.Event.FOCUSOUT;
-          $(_this5.element).on(eventIn, _this5.config.selector, function (event) {
-            return _this5._enter(event);
-          }).on(eventOut, _this5.config.selector, function (event) {
-            return _this5._leave(event);
-          });
-        }
-      });
-
-      this._hideModalHandler = function () {
-        if (_this5.element) {
-          _this5.hide();
-        }
-      };
-
-      $(this.element).closest('.modal').on('hide.bs.modal', this._hideModalHandler);
-
-      if (this.config.selector) {
-        this.config = _objectSpread2({}, this.config, {
-          trigger: 'manual',
-          selector: ''
-        });
-      } else {
-        this._fixTitle();
-      }
-    };
-
-    _proto._fixTitle = function _fixTitle() {
-      var titleType = typeof this.element.getAttribute('data-original-title');
-
-      if (this.element.getAttribute('title') || titleType !== 'string') {
-        this.element.setAttribute('data-original-title', this.element.getAttribute('title') || '');
-        this.element.setAttribute('title', '');
-      }
-    };
-
-    _proto._enter = function _enter(event, context) {
-      var dataKey = this.constructor.DATA_KEY;
-      context = context || $(event.currentTarget).data(dataKey);
-
-      if (!context) {
-        context = new this.constructor(event.currentTarget, this._getDelegateConfig());
-        $(event.currentTarget).data(dataKey, context);
-      }
-
-      if (event) {
-        context._activeTrigger[event.type === 'focusin' ? Trigger.FOCUS : Trigger.HOVER] = true;
-      }
-
-      if ($(context.getTipElement()).hasClass(ClassName$6.SHOW) || context._hoverState === HoverState.SHOW) {
-        context._hoverState = HoverState.SHOW;
-        return;
-      }
-
-      clearTimeout(context._timeout);
-      context._hoverState = HoverState.SHOW;
-
-      if (!context.config.delay || !context.config.delay.show) {
-        context.show();
-        return;
-      }
-
-      context._timeout = setTimeout(function () {
-        if (context._hoverState === HoverState.SHOW) {
-          context.show();
-        }
-      }, context.config.delay.show);
-    };
-
-    _proto._leave = function _leave(event, context) {
-      var dataKey = this.constructor.DATA_KEY;
-      context = context || $(event.currentTarget).data(dataKey);
-
-      if (!context) {
-        context = new this.constructor(event.currentTarget, this._getDelegateConfig());
-        $(event.currentTarget).data(dataKey, context);
-      }
-
-      if (event) {
-        context._activeTrigger[event.type === 'focusout' ? Trigger.FOCUS : Trigger.HOVER] = false;
-      }
-
-      if (context._isWithActiveTrigger()) {
-        return;
-      }
-
-      clearTimeout(context._timeout);
-      context._hoverState = HoverState.OUT;
-
-      if (!context.config.delay || !context.config.delay.hide) {
-        context.hide();
-        return;
-      }
-
-      context._timeout = setTimeout(function () {
-        if (context._hoverState === HoverState.OUT) {
-          context.hide();
-        }
-      }, context.config.delay.hide);
-    };
-
-    _proto._isWithActiveTrigger = function _isWithActiveTrigger() {
-      for (var trigger in this._activeTrigger) {
-        if (this._activeTrigger[trigger]) {
-          return true;
-        }
-      }
-
-      return false;
-    };
-
-    _proto._getConfig = function _getConfig(config) {
-      var dataAttributes = $(this.element).data();
-      Object.keys(dataAttributes).forEach(function (dataAttr) {
-        if (DISALLOWED_ATTRIBUTES.indexOf(dataAttr) !== -1) {
-          delete dataAttributes[dataAttr];
-        }
-      });
-      config = _objectSpread2({}, this.constructor.Default, {}, dataAttributes, {}, typeof config === 'object' && config ? config : {});
-
-      if (typeof config.delay === 'number') {
-        config.delay = {
-          show: config.delay,
-          hide: config.delay
-        };
-      }
-
-      if (typeof config.title === 'number') {
-        config.title = config.title.toString();
-      }
-
-      if (typeof config.content === 'number') {
-        config.content = config.content.toString();
-      }
-
-      Util.typeCheckConfig(NAME$6, config, this.constructor.DefaultType);
-
-      if (config.sanitize) {
-        config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn);
-      }
-
-      return config;
-    };
-
-    _proto._getDelegateConfig = function _getDelegateConfig() {
-      var config = {};
-
-      if (this.config) {
-        for (var key in this.config) {
-          if (this.constructor.Default[key] !== this.config[key]) {
-            config[key] = this.config[key];
-          }
-        }
-      }
-
-      return config;
-    };
-
-    _proto._cleanTipClass = function _cleanTipClass() {
-      var $tip = $(this.getTipElement());
-      var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX);
-
-      if (tabClass !== null && tabClass.length) {
-        $tip.removeClass(tabClass.join(''));
-      }
-    };
-
-    _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(popperData) {
-      var popperInstance = popperData.instance;
-      this.tip = popperInstance.popper;
-
-      this._cleanTipClass();
-
-      this.addAttachmentClass(this._getAttachment(popperData.placement));
-    };
-
-    _proto._fixTransition = function _fixTransition() {
-      var tip = this.getTipElement();
-      var initConfigAnimation = this.config.animation;
-
-      if (tip.getAttribute('x-placement') !== null) {
-        return;
-      }
-
-      $(tip).removeClass(ClassName$6.FADE);
-      this.config.animation = false;
-      this.hide();
-      this.show();
-      this.config.animation = initConfigAnimation;
-    } // Static
-    ;
-
-    Tooltip._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$6);
-
-        var _config = typeof config === 'object' && config;
-
-        if (!data && /dispose|hide/.test(config)) {
-          return;
-        }
-
-        if (!data) {
-          data = new Tooltip(this, _config);
-          $(this).data(DATA_KEY$6, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config]();
-        }
-      });
-    };
-
-    _createClass(Tooltip, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$6;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$4;
-      }
-    }, {
-      key: "NAME",
-      get: function get() {
-        return NAME$6;
-      }
-    }, {
-      key: "DATA_KEY",
-      get: function get() {
-        return DATA_KEY$6;
-      }
-    }, {
-      key: "Event",
-      get: function get() {
-        return Event$6;
-      }
-    }, {
-      key: "EVENT_KEY",
-      get: function get() {
-        return EVENT_KEY$6;
-      }
-    }, {
-      key: "DefaultType",
-      get: function get() {
-        return DefaultType$4;
-      }
-    }]);
-
-    return Tooltip;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-
-  $.fn[NAME$6] = Tooltip._jQueryInterface;
-  $.fn[NAME$6].Constructor = Tooltip;
-
-  $.fn[NAME$6].noConflict = function () {
-    $.fn[NAME$6] = JQUERY_NO_CONFLICT$6;
-    return Tooltip._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$7 = 'popover';
-  var VERSION$7 = '4.4.1';
-  var DATA_KEY$7 = 'bs.popover';
-  var EVENT_KEY$7 = "." + DATA_KEY$7;
-  var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
-  var CLASS_PREFIX$1 = 'bs-popover';
-  var BSCLS_PREFIX_REGEX$1 = new RegExp("(^|\\s)" + CLASS_PREFIX$1 + "\\S+", 'g');
-
-  var Default$5 = _objectSpread2({}, Tooltip.Default, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div></div>'
-  });
-
-  var DefaultType$5 = _objectSpread2({}, Tooltip.DefaultType, {
-    content: '(string|element|function)'
-  });
-
-  var ClassName$7 = {
-    FADE: 'fade',
-    SHOW: 'show'
-  };
-  var Selector$7 = {
-    TITLE: '.popover-header',
-    CONTENT: '.popover-body'
-  };
-  var Event$7 = {
-    HIDE: "hide" + EVENT_KEY$7,
-    HIDDEN: "hidden" + EVENT_KEY$7,
-    SHOW: "show" + EVENT_KEY$7,
-    SHOWN: "shown" + EVENT_KEY$7,
-    INSERTED: "inserted" + EVENT_KEY$7,
-    CLICK: "click" + EVENT_KEY$7,
-    FOCUSIN: "focusin" + EVENT_KEY$7,
-    FOCUSOUT: "focusout" + EVENT_KEY$7,
-    MOUSEENTER: "mouseenter" + EVENT_KEY$7,
-    MOUSELEAVE: "mouseleave" + EVENT_KEY$7
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Popover =
-  /*#__PURE__*/
-  function (_Tooltip) {
-    _inheritsLoose(Popover, _Tooltip);
-
-    function Popover() {
-      return _Tooltip.apply(this, arguments) || this;
-    }
-
-    var _proto = Popover.prototype;
-
-    // Overrides
-    _proto.isWithContent = function isWithContent() {
-      return this.getTitle() || this._getContent();
-    };
-
-    _proto.addAttachmentClass = function addAttachmentClass(attachment) {
-      $(this.getTipElement()).addClass(CLASS_PREFIX$1 + "-" + attachment);
-    };
-
-    _proto.getTipElement = function getTipElement() {
-      this.tip = this.tip || $(this.config.template)[0];
-      return this.tip;
-    };
-
-    _proto.setContent = function setContent() {
-      var $tip = $(this.getTipElement()); // We use append for html objects to maintain js events
-
-      this.setElementContent($tip.find(Selector$7.TITLE), this.getTitle());
-
-      var content = this._getContent();
-
-      if (typeof content === 'function') {
-        content = content.call(this.element);
-      }
-
-      this.setElementContent($tip.find(Selector$7.CONTENT), content);
-      $tip.removeClass(ClassName$7.FADE + " " + ClassName$7.SHOW);
-    } // Private
-    ;
-
-    _proto._getContent = function _getContent() {
-      return this.element.getAttribute('data-content') || this.config.content;
-    };
-
-    _proto._cleanTipClass = function _cleanTipClass() {
-      var $tip = $(this.getTipElement());
-      var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX$1);
-
-      if (tabClass !== null && tabClass.length > 0) {
-        $tip.removeClass(tabClass.join(''));
-      }
-    } // Static
-    ;
-
-    Popover._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$7);
-
-        var _config = typeof config === 'object' ? config : null;
-
-        if (!data && /dispose|hide/.test(config)) {
-          return;
-        }
-
-        if (!data) {
-          data = new Popover(this, _config);
-          $(this).data(DATA_KEY$7, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config]();
-        }
-      });
-    };
-
-    _createClass(Popover, null, [{
-      key: "VERSION",
-      // Getters
-      get: function get() {
-        return VERSION$7;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$5;
-      }
-    }, {
-      key: "NAME",
-      get: function get() {
-        return NAME$7;
-      }
-    }, {
-      key: "DATA_KEY",
-      get: function get() {
-        return DATA_KEY$7;
-      }
-    }, {
-      key: "Event",
-      get: function get() {
-        return Event$7;
-      }
-    }, {
-      key: "EVENT_KEY",
-      get: function get() {
-        return EVENT_KEY$7;
-      }
-    }, {
-      key: "DefaultType",
-      get: function get() {
-        return DefaultType$5;
-      }
-    }]);
-
-    return Popover;
-  }(Tooltip);
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-
-  $.fn[NAME$7] = Popover._jQueryInterface;
-  $.fn[NAME$7].Constructor = Popover;
-
-  $.fn[NAME$7].noConflict = function () {
-    $.fn[NAME$7] = JQUERY_NO_CONFLICT$7;
-    return Popover._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$8 = 'scrollspy';
-  var VERSION$8 = '4.4.1';
-  var DATA_KEY$8 = 'bs.scrollspy';
-  var EVENT_KEY$8 = "." + DATA_KEY$8;
-  var DATA_API_KEY$6 = '.data-api';
-  var JQUERY_NO_CONFLICT$8 = $.fn[NAME$8];
-  var Default$6 = {
-    offset: 10,
-    method: 'auto',
-    target: ''
-  };
-  var DefaultType$6 = {
-    offset: 'number',
-    method: 'string',
-    target: '(string|element)'
-  };
-  var Event$8 = {
-    ACTIVATE: "activate" + EVENT_KEY$8,
-    SCROLL: "scroll" + EVENT_KEY$8,
-    LOAD_DATA_API: "load" + EVENT_KEY$8 + DATA_API_KEY$6
-  };
-  var ClassName$8 = {
-    DROPDOWN_ITEM: 'dropdown-item',
-    DROPDOWN_MENU: 'dropdown-menu',
-    ACTIVE: 'active'
-  };
-  var Selector$8 = {
-    DATA_SPY: '[data-spy="scroll"]',
-    ACTIVE: '.active',
-    NAV_LIST_GROUP: '.nav, .list-group',
-    NAV_LINKS: '.nav-link',
-    NAV_ITEMS: '.nav-item',
-    LIST_ITEMS: '.list-group-item',
-    DROPDOWN: '.dropdown',
-    DROPDOWN_ITEMS: '.dropdown-item',
-    DROPDOWN_TOGGLE: '.dropdown-toggle'
-  };
-  var OffsetMethod = {
-    OFFSET: 'offset',
-    POSITION: 'position'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var ScrollSpy =
-  /*#__PURE__*/
-  function () {
-    function ScrollSpy(element, config) {
-      var _this = this;
-
-      this._element = element;
-      this._scrollElement = element.tagName === 'BODY' ? window : element;
-      this._config = this._getConfig(config);
-      this._selector = this._config.target + " " + Selector$8.NAV_LINKS + "," + (this._config.target + " " + Selector$8.LIST_ITEMS + ",") + (this._config.target + " " + Selector$8.DROPDOWN_ITEMS);
-      this._offsets = [];
-      this._targets = [];
-      this._activeTarget = null;
-      this._scrollHeight = 0;
-      $(this._scrollElement).on(Event$8.SCROLL, function (event) {
-        return _this._process(event);
-      });
-      this.refresh();
-
-      this._process();
-    } // Getters
-
-
-    var _proto = ScrollSpy.prototype;
-
-    // Public
-    _proto.refresh = function refresh() {
-      var _this2 = this;
-
-      var autoMethod = this._scrollElement === this._scrollElement.window ? OffsetMethod.OFFSET : OffsetMethod.POSITION;
-      var offsetMethod = this._config.method === 'auto' ? autoMethod : this._config.method;
-      var offsetBase = offsetMethod === OffsetMethod.POSITION ? this._getScrollTop() : 0;
-      this._offsets = [];
-      this._targets = [];
-      this._scrollHeight = this._getScrollHeight();
-      var targets = [].slice.call(document.querySelectorAll(this._selector));
-      targets.map(function (element) {
-        var target;
-        var targetSelector = Util.getSelectorFromElement(element);
-
-        if (targetSelector) {
-          target = document.querySelector(targetSelector);
-        }
-
-        if (target) {
-          var targetBCR = target.getBoundingClientRect();
-
-          if (targetBCR.width || targetBCR.height) {
-            // TODO (fat): remove sketch reliance on jQuery position/offset
-            return [$(target)[offsetMethod]().top + offsetBase, targetSelector];
-          }
-        }
-
-        return null;
-      }).filter(function (item) {
-        return item;
-      }).sort(function (a, b) {
-        return a[0] - b[0];
-      }).forEach(function (item) {
-        _this2._offsets.push(item[0]);
-
-        _this2._targets.push(item[1]);
-      });
-    };
-
-    _proto.dispose = function dispose() {
-      $.removeData(this._element, DATA_KEY$8);
-      $(this._scrollElement).off(EVENT_KEY$8);
-      this._element = null;
-      this._scrollElement = null;
-      this._config = null;
-      this._selector = null;
-      this._offsets = null;
-      this._targets = null;
-      this._activeTarget = null;
-      this._scrollHeight = null;
-    } // Private
-    ;
-
-    _proto._getConfig = function _getConfig(config) {
-      config = _objectSpread2({}, Default$6, {}, typeof config === 'object' && config ? config : {});
-
-      if (typeof config.target !== 'string') {
-        var id = $(config.target).attr('id');
-
-        if (!id) {
-          id = Util.getUID(NAME$8);
-          $(config.target).attr('id', id);
-        }
-
-        config.target = "#" + id;
-      }
-
-      Util.typeCheckConfig(NAME$8, config, DefaultType$6);
-      return config;
-    };
-
-    _proto._getScrollTop = function _getScrollTop() {
-      return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop;
-    };
-
-    _proto._getScrollHeight = function _getScrollHeight() {
-      return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);
-    };
-
-    _proto._getOffsetHeight = function _getOffsetHeight() {
-      return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height;
-    };
-
-    _proto._process = function _process() {
-      var scrollTop = this._getScrollTop() + this._config.offset;
-
-      var scrollHeight = this._getScrollHeight();
-
-      var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight();
-
-      if (this._scrollHeight !== scrollHeight) {
-        this.refresh();
-      }
-
-      if (scrollTop >= maxScroll) {
-        var target = this._targets[this._targets.length - 1];
-
-        if (this._activeTarget !== target) {
-          this._activate(target);
-        }
-
-        return;
-      }
-
-      if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) {
-        this._activeTarget = null;
-
-        this._clear();
-
-        return;
-      }
-
-      var offsetLength = this._offsets.length;
-
-      for (var i = offsetLength; i--;) {
-        var isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]);
-
-        if (isActiveTarget) {
-          this._activate(this._targets[i]);
-        }
-      }
-    };
-
-    _proto._activate = function _activate(target) {
-      this._activeTarget = target;
-
-      this._clear();
-
-      var queries = this._selector.split(',').map(function (selector) {
-        return selector + "[data-target=\"" + target + "\"]," + selector + "[href=\"" + target + "\"]";
-      });
-
-      var $link = $([].slice.call(document.querySelectorAll(queries.join(','))));
-
-      if ($link.hasClass(ClassName$8.DROPDOWN_ITEM)) {
-        $link.closest(Selector$8.DROPDOWN).find(Selector$8.DROPDOWN_TOGGLE).addClass(ClassName$8.ACTIVE);
-        $link.addClass(ClassName$8.ACTIVE);
-      } else {
-        // Set triggered link as active
-        $link.addClass(ClassName$8.ACTIVE); // Set triggered links parents as active
-        // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
-
-        $link.parents(Selector$8.NAV_LIST_GROUP).prev(Selector$8.NAV_LINKS + ", " + Selector$8.LIST_ITEMS).addClass(ClassName$8.ACTIVE); // Handle special case when .nav-link is inside .nav-item
-
-        $link.parents(Selector$8.NAV_LIST_GROUP).prev(Selector$8.NAV_ITEMS).children(Selector$8.NAV_LINKS).addClass(ClassName$8.ACTIVE);
-      }
-
-      $(this._scrollElement).trigger(Event$8.ACTIVATE, {
-        relatedTarget: target
-      });
-    };
-
-    _proto._clear = function _clear() {
-      [].slice.call(document.querySelectorAll(this._selector)).filter(function (node) {
-        return node.classList.contains(ClassName$8.ACTIVE);
-      }).forEach(function (node) {
-        return node.classList.remove(ClassName$8.ACTIVE);
-      });
-    } // Static
-    ;
-
-    ScrollSpy._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var data = $(this).data(DATA_KEY$8);
-
-        var _config = typeof config === 'object' && config;
-
-        if (!data) {
-          data = new ScrollSpy(this, _config);
-          $(this).data(DATA_KEY$8, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config]();
-        }
-      });
-    };
-
-    _createClass(ScrollSpy, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$8;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$6;
-      }
-    }]);
-
-    return ScrollSpy;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(window).on(Event$8.LOAD_DATA_API, function () {
-    var scrollSpys = [].slice.call(document.querySelectorAll(Selector$8.DATA_SPY));
-    var scrollSpysLength = scrollSpys.length;
-
-    for (var i = scrollSpysLength; i--;) {
-      var $spy = $(scrollSpys[i]);
-
-      ScrollSpy._jQueryInterface.call($spy, $spy.data());
-    }
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$8] = ScrollSpy._jQueryInterface;
-  $.fn[NAME$8].Constructor = ScrollSpy;
-
-  $.fn[NAME$8].noConflict = function () {
-    $.fn[NAME$8] = JQUERY_NO_CONFLICT$8;
-    return ScrollSpy._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$9 = 'tab';
-  var VERSION$9 = '4.4.1';
-  var DATA_KEY$9 = 'bs.tab';
-  var EVENT_KEY$9 = "." + DATA_KEY$9;
-  var DATA_API_KEY$7 = '.data-api';
-  var JQUERY_NO_CONFLICT$9 = $.fn[NAME$9];
-  var Event$9 = {
-    HIDE: "hide" + EVENT_KEY$9,
-    HIDDEN: "hidden" + EVENT_KEY$9,
-    SHOW: "show" + EVENT_KEY$9,
-    SHOWN: "shown" + EVENT_KEY$9,
-    CLICK_DATA_API: "click" + EVENT_KEY$9 + DATA_API_KEY$7
-  };
-  var ClassName$9 = {
-    DROPDOWN_MENU: 'dropdown-menu',
-    ACTIVE: 'active',
-    DISABLED: 'disabled',
-    FADE: 'fade',
-    SHOW: 'show'
-  };
-  var Selector$9 = {
-    DROPDOWN: '.dropdown',
-    NAV_LIST_GROUP: '.nav, .list-group',
-    ACTIVE: '.active',
-    ACTIVE_UL: '> li > .active',
-    DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
-    DROPDOWN_TOGGLE: '.dropdown-toggle',
-    DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Tab =
-  /*#__PURE__*/
-  function () {
-    function Tab(element) {
-      this._element = element;
-    } // Getters
-
-
-    var _proto = Tab.prototype;
-
-    // Public
-    _proto.show = function show() {
-      var _this = this;
-
-      if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(ClassName$9.ACTIVE) || $(this._element).hasClass(ClassName$9.DISABLED)) {
-        return;
-      }
-
-      var target;
-      var previous;
-      var listElement = $(this._element).closest(Selector$9.NAV_LIST_GROUP)[0];
-      var selector = Util.getSelectorFromElement(this._element);
-
-      if (listElement) {
-        var itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? Selector$9.ACTIVE_UL : Selector$9.ACTIVE;
-        previous = $.makeArray($(listElement).find(itemSelector));
-        previous = previous[previous.length - 1];
-      }
-
-      var hideEvent = $.Event(Event$9.HIDE, {
-        relatedTarget: this._element
-      });
-      var showEvent = $.Event(Event$9.SHOW, {
-        relatedTarget: previous
-      });
-
-      if (previous) {
-        $(previous).trigger(hideEvent);
-      }
-
-      $(this._element).trigger(showEvent);
-
-      if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      if (selector) {
-        target = document.querySelector(selector);
-      }
-
-      this._activate(this._element, listElement);
-
-      var complete = function complete() {
-        var hiddenEvent = $.Event(Event$9.HIDDEN, {
-          relatedTarget: _this._element
-        });
-        var shownEvent = $.Event(Event$9.SHOWN, {
-          relatedTarget: previous
-        });
-        $(previous).trigger(hiddenEvent);
-        $(_this._element).trigger(shownEvent);
-      };
-
-      if (target) {
-        this._activate(target, target.parentNode, complete);
-      } else {
-        complete();
-      }
-    };
-
-    _proto.dispose = function dispose() {
-      $.removeData(this._element, DATA_KEY$9);
-      this._element = null;
-    } // Private
-    ;
-
-    _proto._activate = function _activate(element, container, callback) {
-      var _this2 = this;
-
-      var activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL') ? $(container).find(Selector$9.ACTIVE_UL) : $(container).children(Selector$9.ACTIVE);
-      var active = activeElements[0];
-      var isTransitioning = callback && active && $(active).hasClass(ClassName$9.FADE);
-
-      var complete = function complete() {
-        return _this2._transitionComplete(element, active, callback);
-      };
-
-      if (active && isTransitioning) {
-        var transitionDuration = Util.getTransitionDurationFromElement(active);
-        $(active).removeClass(ClassName$9.SHOW).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-      } else {
-        complete();
-      }
-    };
-
-    _proto._transitionComplete = function _transitionComplete(element, active, callback) {
-      if (active) {
-        $(active).removeClass(ClassName$9.ACTIVE);
-        var dropdownChild = $(active.parentNode).find(Selector$9.DROPDOWN_ACTIVE_CHILD)[0];
-
-        if (dropdownChild) {
-          $(dropdownChild).removeClass(ClassName$9.ACTIVE);
-        }
-
-        if (active.getAttribute('role') === 'tab') {
-          active.setAttribute('aria-selected', false);
-        }
-      }
-
-      $(element).addClass(ClassName$9.ACTIVE);
-
-      if (element.getAttribute('role') === 'tab') {
-        element.setAttribute('aria-selected', true);
-      }
-
-      Util.reflow(element);
-
-      if (element.classList.contains(ClassName$9.FADE)) {
-        element.classList.add(ClassName$9.SHOW);
-      }
-
-      if (element.parentNode && $(element.parentNode).hasClass(ClassName$9.DROPDOWN_MENU)) {
-        var dropdownElement = $(element).closest(Selector$9.DROPDOWN)[0];
-
-        if (dropdownElement) {
-          var dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(Selector$9.DROPDOWN_TOGGLE));
-          $(dropdownToggleList).addClass(ClassName$9.ACTIVE);
-        }
-
-        element.setAttribute('aria-expanded', true);
-      }
-
-      if (callback) {
-        callback();
-      }
-    } // Static
-    ;
-
-    Tab._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var $this = $(this);
-        var data = $this.data(DATA_KEY$9);
-
-        if (!data) {
-          data = new Tab(this);
-          $this.data(DATA_KEY$9, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config]();
-        }
-      });
-    };
-
-    _createClass(Tab, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$9;
-      }
-    }]);
-
-    return Tab;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * Data Api implementation
-   * ------------------------------------------------------------------------
-   */
-
-
-  $(document).on(Event$9.CLICK_DATA_API, Selector$9.DATA_TOGGLE, function (event) {
-    event.preventDefault();
-
-    Tab._jQueryInterface.call($(this), 'show');
-  });
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-  $.fn[NAME$9] = Tab._jQueryInterface;
-  $.fn[NAME$9].Constructor = Tab;
-
-  $.fn[NAME$9].noConflict = function () {
-    $.fn[NAME$9] = JQUERY_NO_CONFLICT$9;
-    return Tab._jQueryInterface;
-  };
-
-  /**
-   * ------------------------------------------------------------------------
-   * Constants
-   * ------------------------------------------------------------------------
-   */
-
-  var NAME$a = 'toast';
-  var VERSION$a = '4.4.1';
-  var DATA_KEY$a = 'bs.toast';
-  var EVENT_KEY$a = "." + DATA_KEY$a;
-  var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
-  var Event$a = {
-    CLICK_DISMISS: "click.dismiss" + EVENT_KEY$a,
-    HIDE: "hide" + EVENT_KEY$a,
-    HIDDEN: "hidden" + EVENT_KEY$a,
-    SHOW: "show" + EVENT_KEY$a,
-    SHOWN: "shown" + EVENT_KEY$a
-  };
-  var ClassName$a = {
-    FADE: 'fade',
-    HIDE: 'hide',
-    SHOW: 'show',
-    SHOWING: 'showing'
-  };
-  var DefaultType$7 = {
-    animation: 'boolean',
-    autohide: 'boolean',
-    delay: 'number'
-  };
-  var Default$7 = {
-    animation: true,
-    autohide: true,
-    delay: 500
-  };
-  var Selector$a = {
-    DATA_DISMISS: '[data-dismiss="toast"]'
-  };
-  /**
-   * ------------------------------------------------------------------------
-   * Class Definition
-   * ------------------------------------------------------------------------
-   */
-
-  var Toast =
-  /*#__PURE__*/
-  function () {
-    function Toast(element, config) {
-      this._element = element;
-      this._config = this._getConfig(config);
-      this._timeout = null;
-
-      this._setListeners();
-    } // Getters
-
-
-    var _proto = Toast.prototype;
-
-    // Public
-    _proto.show = function show() {
-      var _this = this;
-
-      var showEvent = $.Event(Event$a.SHOW);
-      $(this._element).trigger(showEvent);
-
-      if (showEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      if (this._config.animation) {
-        this._element.classList.add(ClassName$a.FADE);
-      }
-
-      var complete = function complete() {
-        _this._element.classList.remove(ClassName$a.SHOWING);
-
-        _this._element.classList.add(ClassName$a.SHOW);
-
-        $(_this._element).trigger(Event$a.SHOWN);
-
-        if (_this._config.autohide) {
-          _this._timeout = setTimeout(function () {
-            _this.hide();
-          }, _this._config.delay);
-        }
-      };
-
-      this._element.classList.remove(ClassName$a.HIDE);
-
-      Util.reflow(this._element);
-
-      this._element.classList.add(ClassName$a.SHOWING);
-
-      if (this._config.animation) {
-        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
-        $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-      } else {
-        complete();
-      }
-    };
-
-    _proto.hide = function hide() {
-      if (!this._element.classList.contains(ClassName$a.SHOW)) {
-        return;
-      }
-
-      var hideEvent = $.Event(Event$a.HIDE);
-      $(this._element).trigger(hideEvent);
-
-      if (hideEvent.isDefaultPrevented()) {
-        return;
-      }
-
-      this._close();
-    };
-
-    _proto.dispose = function dispose() {
-      clearTimeout(this._timeout);
-      this._timeout = null;
-
-      if (this._element.classList.contains(ClassName$a.SHOW)) {
-        this._element.classList.remove(ClassName$a.SHOW);
-      }
-
-      $(this._element).off(Event$a.CLICK_DISMISS);
-      $.removeData(this._element, DATA_KEY$a);
-      this._element = null;
-      this._config = null;
-    } // Private
-    ;
-
-    _proto._getConfig = function _getConfig(config) {
-      config = _objectSpread2({}, Default$7, {}, $(this._element).data(), {}, typeof config === 'object' && config ? config : {});
-      Util.typeCheckConfig(NAME$a, config, this.constructor.DefaultType);
-      return config;
-    };
-
-    _proto._setListeners = function _setListeners() {
-      var _this2 = this;
-
-      $(this._element).on(Event$a.CLICK_DISMISS, Selector$a.DATA_DISMISS, function () {
-        return _this2.hide();
-      });
-    };
-
-    _proto._close = function _close() {
-      var _this3 = this;
-
-      var complete = function complete() {
-        _this3._element.classList.add(ClassName$a.HIDE);
-
-        $(_this3._element).trigger(Event$a.HIDDEN);
-      };
-
-      this._element.classList.remove(ClassName$a.SHOW);
-
-      if (this._config.animation) {
-        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
-        $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
-      } else {
-        complete();
-      }
-    } // Static
-    ;
-
-    Toast._jQueryInterface = function _jQueryInterface(config) {
-      return this.each(function () {
-        var $element = $(this);
-        var data = $element.data(DATA_KEY$a);
-
-        var _config = typeof config === 'object' && config;
-
-        if (!data) {
-          data = new Toast(this, _config);
-          $element.data(DATA_KEY$a, data);
-        }
-
-        if (typeof config === 'string') {
-          if (typeof data[config] === 'undefined') {
-            throw new TypeError("No method named \"" + config + "\"");
-          }
-
-          data[config](this);
-        }
-      });
-    };
-
-    _createClass(Toast, null, [{
-      key: "VERSION",
-      get: function get() {
-        return VERSION$a;
-      }
-    }, {
-      key: "DefaultType",
-      get: function get() {
-        return DefaultType$7;
-      }
-    }, {
-      key: "Default",
-      get: function get() {
-        return Default$7;
-      }
-    }]);
-
-    return Toast;
-  }();
-  /**
-   * ------------------------------------------------------------------------
-   * jQuery
-   * ------------------------------------------------------------------------
-   */
-
-
-  $.fn[NAME$a] = Toast._jQueryInterface;
-  $.fn[NAME$a].Constructor = Toast;
-
-  $.fn[NAME$a].noConflict = function () {
-    $.fn[NAME$a] = JQUERY_NO_CONFLICT$a;
-    return Toast._jQueryInterface;
-  };
-
-  exports.Alert = Alert;
-  exports.Button = Button;
-  exports.Carousel = Carousel;
-  exports.Collapse = Collapse;
-  exports.Dropdown = Dropdown;
-  exports.Modal = Modal;
-  exports.Popover = Popover;
-  exports.Scrollspy = ScrollSpy;
-  exports.Tab = Tab;
-  exports.Toast = Toast;
-  exports.Tooltip = Tooltip;
-  exports.Util = Util;
-
-  Object.defineProperty(exports, '__esModule', { value: true });
-
-})));
-//# sourceMappingURL=bootstrap.js.map
diff --git a/website/js/docs.js b/website/js/docs.js
deleted file mode 100644
index 15552fece85..00000000000
--- a/website/js/docs.js
+++ /dev/null
@@ -1,173 +0,0 @@
-function onResize() {
-    var window_height = $(window).height();
-    var window_width = $(window).width();
-    var is_wide = window_width >= 768;
-    var docs_top_nav = $('#top-nav.bg-dark-alt');
-
-    $('body').attr('data-offset', window_height.toString());
-    var sidebar = $('#sidebar');
-    var languages = $('#languages-dropdown')
-    var edit = $('#edit-link');
-    var single_page_switch = $('#single-page-switch');
-    if ((sidebar.width() - single_page_switch.width() - sidebar.find('.dropdown-toggle').width()) >= 36) {
-        single_page_switch.addClass('float-right');
-    } else {
-        single_page_switch.removeClass('float-right');
-    }
-    if (is_wide) {
-        sidebar.removeClass('collapse');
-        edit.detach().appendTo($('#edit-wrapper'));
-        languages.detach().appendTo($('#languages-wrapper'));
-    } else {
-        sidebar.addClass('collapse');
-        edit.detach().insertBefore(single_page_switch);
-        edit.addClass('float-right');
-        languages.detach().insertBefore(edit);
-        languages.addClass('float-right');
-        single_page_switch.removeClass('float-right');
-    }
-    if (window_height < 800 && is_wide) {
-        docs_top_nav.removeClass('fixed-top');
-        $('#sidebar, #toc.toc-right').css({
-            'height': window_height,
-            'position': 'sticky',
-            'top': 0
-        });
-    } else {
-        var top_nav_height = docs_top_nav.height();
-        docs_top_nav.addClass('fixed-top');
-        $('#sidebar, #toc.toc-right').css({
-            'height': (window_height - top_nav_height) + 'px',
-            'position': 'fixed',
-            'top': top_nav_height + 16
-        });
-    }
-}
-
-$(document).ready(function () {
-    onResize();
-    $('#sidebar .nav-link.active').parents('.collapse').each(function() {
-        var current = $(this);
-        if (current.attr('id') !== 'sidebar') {
-            current.collapse('show');
-        }
-    });
-    $(window).resize(onResize);
-    $(window).on('activate.bs.scrollspy', function () {
-        var maxActiveOffset = 0;
-        $('#toc .nav-link.active').each(function() {
-            if (maxActiveOffset < $(this).offset().top) {
-                maxActiveOffset = $(this).offset().top;
-            }
-        });
-        $('#toc .nav-link').each(function() {
-            if (maxActiveOffset >= $(this).offset().top) {
-                $(this).addClass('toc-muted');
-            } else {
-                $(this).removeClass('toc-muted');
-            }
-        });
-    });
-    $('#sidebar').on('shown.bs.collapse', function () {
-        onResize();
-        $('body').on('touchmove', function (e) {
-            e.preventDefault();
-        });
-    });
-    $('#sidebar').on('hidden.bs.collapse', function () {
-        $('body').on('touchmove', function () {});
-    });
-
-    var headers = $('#content h1, #content h2, #content h3, #content h4, #content h5, #content h6');
-    headers.mouseenter(function() {
-        $(this).find('.headerlink').html('¶');
-    });
-    headers.mouseleave(function() {
-        $(this).find('.headerlink').html('&nbsp;');
-    });
-
-    if ($('#docsearch-input').length) {
-        docsearch({
-            apiKey: 'e239649803024433599de47a53b2d416',
-            indexName: 'yandex_clickhouse',
-            inputSelector: '#docsearch-input',
-            algoliaOptions: {
-                advancedSyntax: true,
-                clickAnalytics: true,
-                hitsPerPage: 25,
-                'facetFilters': [
-                    'lang:' + $('html').attr('lang'),
-                    'version:' + $('html').attr('data-version')
-                ]
-            },
-            debug: false
-        });
-    }
-
-    var rating_stars = $('#rating-stars');
-    if (rating_stars.length) {
-        var key = '';
-        var stars_text = rating_stars.text().replace(/^\s+|\s+$/g, '');
-        var url_match = window.location.pathname.match(/^\/docs(?:\/v[0-9]+\.[0-9]+)?(?:\/[a-z]{2})(.*)/);
-        if (url_match && url_match.length > 1) {
-            key = url_match[1];
-            if (key.length > 2) {
-                key = key.replace(/^\/|\/$/g, '');
-            }
-            key = 'rating_' + key;
-            var local_stars = localStorage.getItem(key);
-            if (local_stars) {
-                stars_text = local_stars;
-                rating_stars.addClass('text-orange');
-            }
-        }
-        var titles = JSON.parse(rating_stars.attr('data-titles').replace(/'/g, '"'));
-        var documentation = rating_stars.attr('data-documentation');
-        var replacement = '';
-        for (var i = 0; i < 5; i++) {
-            var star = stars_text.charAt(i);
-            replacement += '<a href="#" title="' + titles[i] + ' ' + documentation +
-              '" data-toggle="tooltip" data-placement="bottom" role="rating" ' +
-              'class="rating-star text-reset text-decoration-none">' + star + '</a>';
-        }
-        rating_stars.html(replacement);
-        $('[data-toggle="tooltip"]').tooltip({
-            trigger: 'hover'
-        });
-        var rating_star_item = $('.rating-star');
-        rating_star_item.hover(function() {
-            var current = $(this);
-            current.text('★');
-            current.prevAll().text('★');
-            current.nextAll().text('☆');
-        });
-        rating_stars.mouseleave(function() {
-            for (var i = 0; i < 5; i++) {
-                rating_stars.children().eq(i).text(stars_text[i]);
-            }
-        });
-        rating_star_item.click(function(e) {
-            e.preventDefault();
-            rating_stars.addClass('text-orange');
-            stars_text = rating_stars.text();
-            localStorage.setItem(key, stars_text);
-            $.ajax({
-                url: window.location.pathname + 'rate/',
-                type: 'POST',
-                dataType: 'json',
-                data: JSON.stringify({rating: $(this).prevAll().length + 1}),
-                success: function () {
-                    try {
-                        window.yaCounter18343495.reachGoal('docs_feedback');
-                    } catch (e) {
-                        Sentry.captureException(e);
-                    }
-                },
-                error: function () {
-                    rating_stars.removeClass('text-orange');
-                    localStorage.removeItem(key);
-                }
-            });
-        });
-    }
-});
diff --git a/website/js/docsearch.js b/website/js/docsearch.js
deleted file mode 100644
index 19c9f24a43a..00000000000
--- a/website/js/docsearch.js
+++ /dev/null
@@ -1,10137 +0,0 @@
-/*! docsearch 2.6.3 | © Algolia | github.com/algolia/docsearch */
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory();
-	else if(typeof define === 'function' && define.amd)
-		define([], factory);
-	else if(typeof exports === 'object')
-		exports["docsearch"] = factory();
-	else
-		root["docsearch"] = factory();
-})(typeof self !== 'undefined' ? self : this, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 22);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var DOM = __webpack_require__(1);
-
-function escapeRegExp(str) {
-  return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
-}
-
-module.exports = {
-  // those methods are implemented differently
-  // depending on which build it is, using
-  // $... or angular... or Zepto... or require(...)
-  isArray: null,
-  isFunction: null,
-  isObject: null,
-  bind: null,
-  each: null,
-  map: null,
-  mixin: null,
-
-  isMsie: function(agentString) {
-    if (agentString === undefined) { agentString = navigator.userAgent; }
-    // from https://github.com/ded/bowser/blob/master/bowser.js
-    if ((/(msie|trident)/i).test(agentString)) {
-      var match = agentString.match(/(msie |rv:)(\d+(.\d+)?)/i);
-      if (match) { return match[2]; }
-    }
-    return false;
-  },
-
-  // http://stackoverflow.com/a/6969486
-  escapeRegExChars: function(str) {
-    return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
-  },
-
-  isNumber: function(obj) { return typeof obj === 'number'; },
-
-  toStr: function toStr(s) {
-    return s === undefined || s === null ? '' : s + '';
-  },
-
-  cloneDeep: function cloneDeep(obj) {
-    var clone = this.mixin({}, obj);
-    var self = this;
-    this.each(clone, function(value, key) {
-      if (value) {
-        if (self.isArray(value)) {
-          clone[key] = [].concat(value);
-        } else if (self.isObject(value)) {
-          clone[key] = self.cloneDeep(value);
-        }
-      }
-    });
-    return clone;
-  },
-
-  error: function(msg) {
-    throw new Error(msg);
-  },
-
-  every: function(obj, test) {
-    var result = true;
-    if (!obj) {
-      return result;
-    }
-    this.each(obj, function(val, key) {
-      if (result) {
-        result = test.call(null, val, key, obj) && result;
-      }
-    });
-    return !!result;
-  },
-
-  any: function(obj, test) {
-    var found = false;
-    if (!obj) {
-      return found;
-    }
-    this.each(obj, function(val, key) {
-      if (test.call(null, val, key, obj)) {
-        found = true;
-        return false;
-      }
-    });
-    return found;
-  },
-
-  getUniqueId: (function() {
-    var counter = 0;
-    return function() { return counter++; };
-  })(),
-
-  templatify: function templatify(obj) {
-    if (this.isFunction(obj)) {
-      return obj;
-    }
-    var $template = DOM.element(obj);
-    if ($template.prop('tagName') === 'SCRIPT') {
-      return function template() { return $template.text(); };
-    }
-    return function template() { return String(obj); };
-  },
-
-  defer: function(fn) { setTimeout(fn, 0); },
-
-  noop: function() {},
-
-  formatPrefix: function(prefix, noPrefix) {
-    return noPrefix ? '' : prefix + '-';
-  },
-
-  className: function(prefix, clazz, skipDot) {
-    return (skipDot ? '' : '.') + prefix + clazz;
-  },
-
-  escapeHighlightedString: function(str, highlightPreTag, highlightPostTag) {
-    highlightPreTag = highlightPreTag || '<em>';
-    var pre = document.createElement('div');
-    pre.appendChild(document.createTextNode(highlightPreTag));
-
-    highlightPostTag = highlightPostTag || '</em>';
-    var post = document.createElement('div');
-    post.appendChild(document.createTextNode(highlightPostTag));
-
-    var div = document.createElement('div');
-    div.appendChild(document.createTextNode(str));
-    return div.innerHTML
-      .replace(RegExp(escapeRegExp(pre.innerHTML), 'g'), highlightPreTag)
-      .replace(RegExp(escapeRegExp(post.innerHTML), 'g'), highlightPostTag);
-  }
-};
-
-
-/***/ }),
-/* 1 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = {
-  element: null
-};
-
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
-
-
-var hasOwn = Object.prototype.hasOwnProperty;
-var toString = Object.prototype.toString;
-
-module.exports = function forEach (obj, fn, ctx) {
-    if (toString.call(fn) !== '[object Function]') {
-        throw new TypeError('iterator must be a function');
-    }
-    var l = obj.length;
-    if (l === +l) {
-        for (var i = 0; i < l; i++) {
-            fn.call(ctx, obj[i], i, obj);
-        }
-    } else {
-        for (var k in obj) {
-            if (hasOwn.call(obj, k)) {
-                fn.call(ctx, obj[k], k, obj);
-            }
-        }
-    }
-};
-
-
-
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
-
-module.exports = function clone(obj) {
-  return JSON.parse(JSON.stringify(obj));
-};
-
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports) {
-
-var g;
-
-// This works in non-strict mode
-g = (function() {
-	return this;
-})();
-
-try {
-	// This works if eval is allowed (see CSP)
-	g = g || Function("return this")() || (1,eval)("this");
-} catch(e) {
-	// This works if the window reference is available
-	if(typeof window === "object")
-		g = window;
-}
-
-// g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
-
-module.exports = g;
-
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// This file hosts our error definitions
-// We use custom error "types" so that we can act on them when we need it
-// e.g.: if error instanceof errors.UnparsableJSON then..
-
-var inherits = __webpack_require__(12);
-
-function AlgoliaSearchError(message, extraProperties) {
-  var forEach = __webpack_require__(2);
-
-  var error = this;
-
-  // try to get a stacktrace
-  if (typeof Error.captureStackTrace === 'function') {
-    Error.captureStackTrace(this, this.constructor);
-  } else {
-    error.stack = (new Error()).stack || 'Cannot get a stacktrace, browser is too old';
-  }
-
-  this.name = 'AlgoliaSearchError';
-  this.message = message || 'Unknown error';
-
-  if (extraProperties) {
-    forEach(extraProperties, function addToErrorObject(value, key) {
-      error[key] = value;
-    });
-  }
-}
-
-inherits(AlgoliaSearchError, Error);
-
-function createCustomError(name, message) {
-  function AlgoliaSearchCustomError() {
-    var args = Array.prototype.slice.call(arguments, 0);
-
-    // custom message not set, use default
-    if (typeof args[0] !== 'string') {
-      args.unshift(message);
-    }
-
-    AlgoliaSearchError.apply(this, args);
-    this.name = 'AlgoliaSearch' + name + 'Error';
-  }
-
-  inherits(AlgoliaSearchCustomError, AlgoliaSearchError);
-
-  return AlgoliaSearchCustomError;
-}
-
-// late exports to let various fn defs and inherits take place
-module.exports = {
-  AlgoliaSearchError: AlgoliaSearchError,
-  UnparsableJSON: createCustomError(
-    'UnparsableJSON',
-    'Could not parse the incoming response as JSON, see err.more for details'
-  ),
-  RequestTimeout: createCustomError(
-    'RequestTimeout',
-    'Request timedout before getting a response'
-  ),
-  Network: createCustomError(
-    'Network',
-    'Network issue, see err.more for details'
-  ),
-  JSONPScriptFail: createCustomError(
-    'JSONPScriptFail',
-    '<script> was loaded but did not call our provided callback'
-  ),
-  JSONPScriptError: createCustomError(
-    'JSONPScriptError',
-    '<script> unable to load due to an `error` event on it'
-  ),
-  Unknown: createCustomError(
-    'Unknown',
-    'Unknown error occured'
-  )
-};
-
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports) {
-
-var toString = {}.toString;
-
-module.exports = Array.isArray || function (arr) {
-  return toString.call(arr) == '[object Array]';
-};
-
-
-/***/ }),
-/* 7 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var foreach = __webpack_require__(2);
-
-module.exports = function map(arr, fn) {
-  var newArr = [];
-  foreach(arr, function(item, itemIndex) {
-    newArr.push(fn(item, itemIndex, arr));
-  });
-  return newArr;
-};
-
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(process) {/**
- * This is the web browser implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = __webpack_require__(39);
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-exports.storage = 'undefined' != typeof chrome
-               && 'undefined' != typeof chrome.storage
-                  ? chrome.storage.local
-                  : localstorage();
-
-/**
- * Colors.
- */
-
-exports.colors = [
-  'lightseagreen',
-  'forestgreen',
-  'goldenrod',
-  'dodgerblue',
-  'darkorchid',
-  'crimson'
-];
-
-/**
- * Currently only WebKit-based Web Inspectors, Firefox >= v31,
- * and the Firebug extension (any Firefox version) are known
- * to support "%c" CSS customizations.
- *
- * TODO: add a `localStorage` variable to explicitly enable/disable colors
- */
-
-function useColors() {
-  // NB: In an Electron preload script, document will be defined but not fully
-  // initialized. Since we know we're in Chrome, we'll just detect this case
-  // explicitly
-  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
-    return true;
-  }
-
-  // is webkit? http://stackoverflow.com/a/16459606/376773
-  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
-  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
-    // is firebug? http://stackoverflow.com/a/398120/376773
-    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
-    // is firefox >= v31?
-    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
-    // double check webkit in userAgent just in case we are in a worker
-    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
-}
-
-/**
- * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
- */
-
-exports.formatters.j = function(v) {
-  try {
-    return JSON.stringify(v);
-  } catch (err) {
-    return '[UnexpectedJSONParseError]: ' + err.message;
-  }
-};
-
-
-/**
- * Colorize log arguments if enabled.
- *
- * @api public
- */
-
-function formatArgs(args) {
-  var useColors = this.useColors;
-
-  args[0] = (useColors ? '%c' : '')
-    + this.namespace
-    + (useColors ? ' %c' : ' ')
-    + args[0]
-    + (useColors ? '%c ' : ' ')
-    + '+' + exports.humanize(this.diff);
-
-  if (!useColors) return;
-
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit')
-
-  // the final "%c" is somewhat tricky, because there could be other
-  // arguments passed either before or after the %c, so we need to
-  // figure out the correct index to insert the CSS into
-  var index = 0;
-  var lastC = 0;
-  args[0].replace(/%[a-zA-Z%]/g, function(match) {
-    if ('%%' === match) return;
-    index++;
-    if ('%c' === match) {
-      // we only are interested in the *last* %c
-      // (the user may have provided their own)
-      lastC = index;
-    }
-  });
-
-  args.splice(lastC, 0, c);
-}
-
-/**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
- */
-
-function log() {
-  // this hackery is required for IE8/9, where
-  // the `console.log` function doesn't have 'apply'
-  return 'object' === typeof console
-    && console.log
-    && Function.prototype.apply.call(console.log, console, arguments);
-}
-
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
-    } else {
-      exports.storage.debug = namespaces;
-    }
-  } catch(e) {}
-}
-
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-function load() {
-  var r;
-  try {
-    r = exports.storage.debug;
-  } catch(e) {}
-
-  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
-  if (!r && typeof process !== 'undefined' && 'env' in process) {
-    r = Object({"NODE_ENV":"production"}).DEBUG;
-  }
-
-  return r;
-}
-
-/**
- * Enable namespaces listed in `localStorage.debug` initially.
- */
-
-exports.enable(load());
-
-/**
- * Localstorage attempts to return the localstorage.
- *
- * This is necessary because safari throws
- * when a user disables cookies/localstorage
- * and you attempt to access it.
- *
- * @return {LocalStorage}
- * @api private
- */
-
-function localstorage() {
-  try {
-    return window.localStorage;
-  } catch (e) {}
-}
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(9)))
-
-/***/ }),
-/* 9 */
-/***/ (function(module, exports) {
-
-// shim for using process in browser
-var process = module.exports = {};
-
-// cached from whatever global is present so that test runners that stub it
-// don't break things.  But we need to wrap it in a try catch in case it is
-// wrapped in strict mode code which doesn't define any globals.  It's inside a
-// function because try/catches deoptimize in certain engines.
-
-var cachedSetTimeout;
-var cachedClearTimeout;
-
-function defaultSetTimout() {
-    throw new Error('setTimeout has not been defined');
-}
-function defaultClearTimeout () {
-    throw new Error('clearTimeout has not been defined');
-}
-(function () {
-    try {
-        if (typeof setTimeout === 'function') {
-            cachedSetTimeout = setTimeout;
-        } else {
-            cachedSetTimeout = defaultSetTimout;
-        }
-    } catch (e) {
-        cachedSetTimeout = defaultSetTimout;
-    }
-    try {
-        if (typeof clearTimeout === 'function') {
-            cachedClearTimeout = clearTimeout;
-        } else {
-            cachedClearTimeout = defaultClearTimeout;
-        }
-    } catch (e) {
-        cachedClearTimeout = defaultClearTimeout;
-    }
-} ())
-function runTimeout(fun) {
-    if (cachedSetTimeout === setTimeout) {
-        //normal enviroments in sane situations
-        return setTimeout(fun, 0);
-    }
-    // if setTimeout wasn't available but was latter defined
-    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
-        cachedSetTimeout = setTimeout;
-        return setTimeout(fun, 0);
-    }
-    try {
-        // when when somebody has screwed with setTimeout but no I.E. maddness
-        return cachedSetTimeout(fun, 0);
-    } catch(e){
-        try {
-            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
-            return cachedSetTimeout.call(null, fun, 0);
-        } catch(e){
-            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
-            return cachedSetTimeout.call(this, fun, 0);
-        }
-    }
-
-
-}
-function runClearTimeout(marker) {
-    if (cachedClearTimeout === clearTimeout) {
-        //normal enviroments in sane situations
-        return clearTimeout(marker);
-    }
-    // if clearTimeout wasn't available but was latter defined
-    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
-        cachedClearTimeout = clearTimeout;
-        return clearTimeout(marker);
-    }
-    try {
-        // when when somebody has screwed with setTimeout but no I.E. maddness
-        return cachedClearTimeout(marker);
-    } catch (e){
-        try {
-            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
-            return cachedClearTimeout.call(null, marker);
-        } catch (e){
-            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
-            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
-            return cachedClearTimeout.call(this, marker);
-        }
-    }
-
-
-
-}
-var queue = [];
-var draining = false;
-var currentQueue;
-var queueIndex = -1;
-
-function cleanUpNextTick() {
-    if (!draining || !currentQueue) {
-        return;
-    }
-    draining = false;
-    if (currentQueue.length) {
-        queue = currentQueue.concat(queue);
-    } else {
-        queueIndex = -1;
-    }
-    if (queue.length) {
-        drainQueue();
-    }
-}
-
-function drainQueue() {
-    if (draining) {
-        return;
-    }
-    var timeout = runTimeout(cleanUpNextTick);
-    draining = true;
-
-    var len = queue.length;
-    while(len) {
-        currentQueue = queue;
-        queue = [];
-        while (++queueIndex < len) {
-            if (currentQueue) {
-                currentQueue[queueIndex].run();
-            }
-        }
-        queueIndex = -1;
-        len = queue.length;
-    }
-    currentQueue = null;
-    draining = false;
-    runClearTimeout(timeout);
-}
-
-process.nextTick = function (fun) {
-    var args = new Array(arguments.length - 1);
-    if (arguments.length > 1) {
-        for (var i = 1; i < arguments.length; i++) {
-            args[i - 1] = arguments[i];
-        }
-    }
-    queue.push(new Item(fun, args));
-    if (queue.length === 1 && !draining) {
-        runTimeout(drainQueue);
-    }
-};
-
-// v8 likes predictible objects
-function Item(fun, array) {
-    this.fun = fun;
-    this.array = array;
-}
-Item.prototype.run = function () {
-    this.fun.apply(null, this.array);
-};
-process.title = 'browser';
-process.browser = true;
-process.env = {};
-process.argv = [];
-process.version = ''; // empty string to avoid regexp issues
-process.versions = {};
-
-function noop() {}
-
-process.on = noop;
-process.addListener = noop;
-process.once = noop;
-process.off = noop;
-process.removeListener = noop;
-process.removeAllListeners = noop;
-process.emit = noop;
-process.prependListener = noop;
-process.prependOnceListener = noop;
-
-process.listeners = function (name) { return [] }
-
-process.binding = function (name) {
-    throw new Error('process.binding is not supported');
-};
-
-process.cwd = function () { return '/' };
-process.chdir = function (dir) {
-    throw new Error('process.chdir is not supported');
-};
-process.umask = function() { return 0; };
-
-
-/***/ }),
-/* 10 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var immediate = __webpack_require__(53);
-var splitter = /\s+/;
-
-module.exports = {
-  onSync: onSync,
-  onAsync: onAsync,
-  off: off,
-  trigger: trigger
-};
-
-function on(method, types, cb, context) {
-  var type;
-
-  if (!cb) {
-    return this;
-  }
-
-  types = types.split(splitter);
-  cb = context ? bindContext(cb, context) : cb;
-
-  this._callbacks = this._callbacks || {};
-
-  while (type = types.shift()) {
-    this._callbacks[type] = this._callbacks[type] || {sync: [], async: []};
-    this._callbacks[type][method].push(cb);
-  }
-
-  return this;
-}
-
-function onAsync(types, cb, context) {
-  return on.call(this, 'async', types, cb, context);
-}
-
-function onSync(types, cb, context) {
-  return on.call(this, 'sync', types, cb, context);
-}
-
-function off(types) {
-  var type;
-
-  if (!this._callbacks) {
-    return this;
-  }
-
-  types = types.split(splitter);
-
-  while (type = types.shift()) {
-    delete this._callbacks[type];
-  }
-
-  return this;
-}
-
-function trigger(types) {
-  var type;
-  var callbacks;
-  var args;
-  var syncFlush;
-  var asyncFlush;
-
-  if (!this._callbacks) {
-    return this;
-  }
-
-  types = types.split(splitter);
-  args = [].slice.call(arguments, 1);
-
-  while ((type = types.shift()) && (callbacks = this._callbacks[type])) { // eslint-disable-line
-    syncFlush = getFlush(callbacks.sync, this, [type].concat(args));
-    asyncFlush = getFlush(callbacks.async, this, [type].concat(args));
-
-    if (syncFlush()) {
-      immediate(asyncFlush);
-    }
-  }
-
-  return this;
-}
-
-function getFlush(callbacks, context, args) {
-  return flush;
-
-  function flush() {
-    var cancelled;
-
-    for (var i = 0, len = callbacks.length; !cancelled && i < len; i += 1) {
-      // only cancel if the callback explicitly returns false
-      cancelled = callbacks[i].apply(context, args) === false;
-    }
-
-    return !cancelled;
-  }
-}
-
-function bindContext(fn, context) {
-  return fn.bind ?
-    fn.bind(context) :
-    function() { fn.apply(context, [].slice.call(arguments, 0)); };
-}
-
-
-/***/ }),
-/* 11 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _ = __webpack_require__(0);
-
-var css = {
-  wrapper: {
-    position: 'relative',
-    display: 'inline-block'
-  },
-  hint: {
-    position: 'absolute',
-    top: '0',
-    left: '0',
-    borderColor: 'transparent',
-    boxShadow: 'none',
-    // #741: fix hint opacity issue on iOS
-    opacity: '1'
-  },
-  input: {
-    position: 'relative',
-    verticalAlign: 'top',
-    backgroundColor: 'transparent'
-  },
-  inputWithNoHint: {
-    position: 'relative',
-    verticalAlign: 'top'
-  },
-  dropdown: {
-    position: 'absolute',
-    top: '100%',
-    left: '0',
-    zIndex: '100',
-    display: 'none'
-  },
-  suggestions: {
-    display: 'block'
-  },
-  suggestion: {
-    whiteSpace: 'nowrap',
-    cursor: 'pointer'
-  },
-  suggestionChild: {
-    whiteSpace: 'normal'
-  },
-  ltr: {
-    left: '0',
-    right: 'auto'
-  },
-  rtl: {
-    left: 'auto',
-    right: '0'
-  },
-  defaultClasses: {
-    root: 'algolia-autocomplete',
-    prefix: 'aa',
-    noPrefix: false,
-    dropdownMenu: 'dropdown-menu',
-    input: 'input',
-    hint: 'hint',
-    suggestions: 'suggestions',
-    suggestion: 'suggestion',
-    cursor: 'cursor',
-    dataset: 'dataset',
-    empty: 'empty'
-  },
-  // will be merged with the default ones if appendTo is used
-  appendTo: {
-    wrapper: {
-      position: 'absolute',
-      zIndex: '100',
-      display: 'none'
-    },
-    input: {},
-    inputWithNoHint: {},
-    dropdown: {
-      display: 'block'
-    }
-  }
-};
-
-// ie specific styling
-if (_.isMsie()) {
-  // ie6-8 (and 9?) doesn't fire hover and click events for elements with
-  // transparent backgrounds, for a workaround, use 1x1 transparent gif
-  _.mixin(css.input, {
-    backgroundImage: 'url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)'
-  });
-}
-
-// ie7 and under specific styling
-if (_.isMsie() && _.isMsie() <= 7) {
-  // if someone can tell me why this is necessary to align
-  // the hint with the query in ie7, i'll send you $5 - @JakeHarding
-  _.mixin(css.input, {marginTop: '-1px'});
-}
-
-module.exports = css;
-
-
-/***/ }),
-/* 12 */
-/***/ (function(module, exports) {
-
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    });
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    var TempCtor = function () {}
-    TempCtor.prototype = superCtor.prototype
-    ctor.prototype = new TempCtor()
-    ctor.prototype.constructor = ctor
-  }
-}
-
-
-/***/ }),
-/* 13 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = buildSearchMethod;
-
-var errors = __webpack_require__(5);
-
-/**
- * Creates a search method to be used in clients
- * @param {string} queryParam the name of the attribute used for the query
- * @param {string} url the url
- * @return {function} the search method
- */
-function buildSearchMethod(queryParam, url) {
-  /**
-   * The search method. Prepares the data and send the query to Algolia.
-   * @param {string} query the string used for query search
-   * @param {object} args additional parameters to send with the search
-   * @param {function} [callback] the callback to be called with the client gets the answer
-   * @return {undefined|Promise} If the callback is not provided then this methods returns a Promise
-   */
-  return function search(query, args, callback) {
-    // warn V2 users on how to search
-    if (typeof query === 'function' && typeof args === 'object' ||
-      typeof callback === 'object') {
-      // .search(query, params, cb)
-      // .search(cb, params)
-      throw new errors.AlgoliaSearchError('index.search usage is index.search(query, params, cb)');
-    }
-
-    // Normalizing the function signature
-    if (arguments.length === 0 || typeof query === 'function') {
-      // Usage : .search(), .search(cb)
-      callback = query;
-      query = '';
-    } else if (arguments.length === 1 || typeof args === 'function') {
-      // Usage : .search(query/args), .search(query, cb)
-      callback = args;
-      args = undefined;
-    }
-    // At this point we have 3 arguments with values
-
-    // Usage : .search(args) // careful: typeof null === 'object'
-    if (typeof query === 'object' && query !== null) {
-      args = query;
-      query = undefined;
-    } else if (query === undefined || query === null) { // .search(undefined/null)
-      query = '';
-    }
-
-    var params = '';
-
-    if (query !== undefined) {
-      params += queryParam + '=' + encodeURIComponent(query);
-    }
-
-    var additionalUA;
-    if (args !== undefined) {
-      if (args.additionalUA) {
-        additionalUA = args.additionalUA;
-        delete args.additionalUA;
-      }
-      // `_getSearchParams` will augment params, do not be fooled by the = versus += from previous if
-      params = this.as._getSearchParams(args, params);
-    }
-
-
-    return this._search(params, url, callback, additionalUA);
-  };
-}
-
-
-/***/ }),
-/* 14 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = function omit(obj, test) {
-  var keys = __webpack_require__(36);
-  var foreach = __webpack_require__(2);
-
-  var filtered = {};
-
-  foreach(keys(obj), function doFilter(keyName) {
-    if (test(keyName) !== true) {
-      filtered[keyName] = obj[keyName];
-    }
-  });
-
-  return filtered;
-};
-
-
-/***/ }),
-/* 15 */
-/***/ (function(module, exports) {
-
-/* istanbul ignore next */
-/* Zepto v1.2.0 - zepto event assets data - zeptojs.com/license */
-(function(global, factory) {
-  module.exports = factory(global);
-}(/* this ##### UPDATED: here we want to use window/global instead of this which is the current file context ##### */ window, function(window) {
-  var Zepto = (function() {
-  var undefined, key, $, classList, emptyArray = [], concat = emptyArray.concat, filter = emptyArray.filter, slice = emptyArray.slice,
-    document = window.document,
-    elementDisplay = {}, classCache = {},
-    cssNumber = { 'column-count': 1, 'columns': 1, 'font-weight': 1, 'line-height': 1,'opacity': 1, 'z-index': 1, 'zoom': 1 },
-    fragmentRE = /^\s*<(\w+|!)[^>]*>/,
-    singleTagRE = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-    tagExpanderRE = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-    rootNodeRE = /^(?:body|html)$/i,
-    capitalRE = /([A-Z])/g,
-
-    // special attributes that should be get/set via method calls
-    methodAttributes = ['val', 'css', 'html', 'text', 'data', 'width', 'height', 'offset'],
-
-    adjacencyOperators = [ 'after', 'prepend', 'before', 'append' ],
-    table = document.createElement('table'),
-    tableRow = document.createElement('tr'),
-    containers = {
-      'tr': document.createElement('tbody'),
-      'tbody': table, 'thead': table, 'tfoot': table,
-      'td': tableRow, 'th': tableRow,
-      '*': document.createElement('div')
-    },
-    readyRE = /complete|loaded|interactive/,
-    simpleSelectorRE = /^[\w-]*$/,
-    class2type = {},
-    toString = class2type.toString,
-    zepto = {},
-    camelize, uniq,
-    tempParent = document.createElement('div'),
-    propMap = {
-      'tabindex': 'tabIndex',
-      'readonly': 'readOnly',
-      'for': 'htmlFor',
-      'class': 'className',
-      'maxlength': 'maxLength',
-      'cellspacing': 'cellSpacing',
-      'cellpadding': 'cellPadding',
-      'rowspan': 'rowSpan',
-      'colspan': 'colSpan',
-      'usemap': 'useMap',
-      'frameborder': 'frameBorder',
-      'contenteditable': 'contentEditable'
-    },
-    isArray = Array.isArray ||
-      function(object){ return object instanceof Array }
-
-  zepto.matches = function(element, selector) {
-    if (!selector || !element || element.nodeType !== 1) return false
-    var matchesSelector = element.matches || element.webkitMatchesSelector ||
-                          element.mozMatchesSelector || element.oMatchesSelector ||
-                          element.matchesSelector
-    if (matchesSelector) return matchesSelector.call(element, selector)
-    // fall back to performing a selector:
-    var match, parent = element.parentNode, temp = !parent
-    if (temp) (parent = tempParent).appendChild(element)
-    match = ~zepto.qsa(parent, selector).indexOf(element)
-    temp && tempParent.removeChild(element)
-    return match
-  }
-
-  function type(obj) {
-    return obj == null ? String(obj) :
-      class2type[toString.call(obj)] || "object"
-  }
-
-  function isFunction(value) { return type(value) == "function" }
-  function isWindow(obj)     { return obj != null && obj == obj.window }
-  function isDocument(obj)   { return obj != null && obj.nodeType == obj.DOCUMENT_NODE }
-  function isObject(obj)     { return type(obj) == "object" }
-  function isPlainObject(obj) {
-    return isObject(obj) && !isWindow(obj) && Object.getPrototypeOf(obj) == Object.prototype
-  }
-
-  function likeArray(obj) {
-    var length = !!obj && 'length' in obj && obj.length,
-      type = $.type(obj)
-
-    return 'function' != type && !isWindow(obj) && (
-      'array' == type || length === 0 ||
-        (typeof length == 'number' && length > 0 && (length - 1) in obj)
-    )
-  }
-
-  function compact(array) { return filter.call(array, function(item){ return item != null }) }
-  function flatten(array) { return array.length > 0 ? $.fn.concat.apply([], array) : array }
-  camelize = function(str){ return str.replace(/-+(.)?/g, function(match, chr){ return chr ? chr.toUpperCase() : '' }) }
-  function dasherize(str) {
-    return str.replace(/::/g, '/')
-           .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
-           .replace(/([a-z\d])([A-Z])/g, '$1_$2')
-           .replace(/_/g, '-')
-           .toLowerCase()
-  }
-  uniq = function(array){ return filter.call(array, function(item, idx){ return array.indexOf(item) == idx }) }
-
-  function classRE(name) {
-    return name in classCache ?
-      classCache[name] : (classCache[name] = new RegExp('(^|\\s)' + name + '(\\s|$)'))
-  }
-
-  function maybeAddPx(name, value) {
-    return (typeof value == "number" && !cssNumber[dasherize(name)]) ? value + "px" : value
-  }
-
-  function defaultDisplay(nodeName) {
-    var element, display
-    if (!elementDisplay[nodeName]) {
-      element = document.createElement(nodeName)
-      document.body.appendChild(element)
-      display = getComputedStyle(element, '').getPropertyValue("display")
-      element.parentNode.removeChild(element)
-      display == "none" && (display = "block")
-      elementDisplay[nodeName] = display
-    }
-    return elementDisplay[nodeName]
-  }
-
-  function children(element) {
-    return 'children' in element ?
-      slice.call(element.children) :
-      $.map(element.childNodes, function(node){ if (node.nodeType == 1) return node })
-  }
-
-  function Z(dom, selector) {
-    var i, len = dom ? dom.length : 0
-    for (i = 0; i < len; i++) this[i] = dom[i]
-    this.length = len
-    this.selector = selector || ''
-  }
-
-  // `$.zepto.fragment` takes a html string and an optional tag name
-  // to generate DOM nodes from the given html string.
-  // The generated DOM nodes are returned as an array.
-  // This function can be overridden in plugins for example to make
-  // it compatible with browsers that don't support the DOM fully.
-  zepto.fragment = function(html, name, properties) {
-    var dom, nodes, container
-
-    // A special case optimization for a single tag
-    if (singleTagRE.test(html)) dom = $(document.createElement(RegExp.$1))
-
-    if (!dom) {
-      if (html.replace) html = html.replace(tagExpanderRE, "<$1></$2>")
-      if (name === undefined) name = fragmentRE.test(html) && RegExp.$1
-      if (!(name in containers)) name = '*'
-
-      container = containers[name]
-      container.innerHTML = '' + html
-      dom = $.each(slice.call(container.childNodes), function(){
-        container.removeChild(this)
-      })
-    }
-
-    if (isPlainObject(properties)) {
-      nodes = $(dom)
-      $.each(properties, function(key, value) {
-        if (methodAttributes.indexOf(key) > -1) nodes[key](value)
-        else nodes.attr(key, value)
-      })
-    }
-
-    return dom
-  }
-
-  // `$.zepto.Z` swaps out the prototype of the given `dom` array
-  // of nodes with `$.fn` and thus supplying all the Zepto functions
-  // to the array. This method can be overridden in plugins.
-  zepto.Z = function(dom, selector) {
-    return new Z(dom, selector)
-  }
-
-  // `$.zepto.isZ` should return `true` if the given object is a Zepto
-  // collection. This method can be overridden in plugins.
-  zepto.isZ = function(object) {
-    return object instanceof zepto.Z
-  }
-
-  // `$.zepto.init` is Zepto's counterpart to jQuery's `$.fn.init` and
-  // takes a CSS selector and an optional context (and handles various
-  // special cases).
-  // This method can be overridden in plugins.
-  zepto.init = function(selector, context) {
-    var dom
-    // If nothing given, return an empty Zepto collection
-    if (!selector) return zepto.Z()
-    // Optimize for string selectors
-    else if (typeof selector == 'string') {
-      selector = selector.trim()
-      // If it's a html fragment, create nodes from it
-      // Note: In both Chrome 21 and Firefox 15, DOM error 12
-      // is thrown if the fragment doesn't begin with <
-      if (selector[0] == '<' && fragmentRE.test(selector))
-        dom = zepto.fragment(selector, RegExp.$1, context), selector = null
-      // If there's a context, create a collection on that context first, and select
-      // nodes from there
-      else if (context !== undefined) return $(context).find(selector)
-      // If it's a CSS selector, use it to select nodes.
-      else dom = zepto.qsa(document, selector)
-    }
-    // If a function is given, call it when the DOM is ready
-    else if (isFunction(selector)) return $(document).ready(selector)
-    // If a Zepto collection is given, just return it
-    else if (zepto.isZ(selector)) return selector
-    else {
-      // normalize array if an array of nodes is given
-      if (isArray(selector)) dom = compact(selector)
-      // Wrap DOM nodes.
-      else if (isObject(selector))
-        dom = [selector], selector = null
-      // If it's a html fragment, create nodes from it
-      else if (fragmentRE.test(selector))
-        dom = zepto.fragment(selector.trim(), RegExp.$1, context), selector = null
-      // If there's a context, create a collection on that context first, and select
-      // nodes from there
-      else if (context !== undefined) return $(context).find(selector)
-      // And last but no least, if it's a CSS selector, use it to select nodes.
-      else dom = zepto.qsa(document, selector)
-    }
-    // create a new Zepto collection from the nodes found
-    return zepto.Z(dom, selector)
-  }
-
-  // `$` will be the base `Zepto` object. When calling this
-  // function just call `$.zepto.init, which makes the implementation
-  // details of selecting nodes and creating Zepto collections
-  // patchable in plugins.
-  $ = function(selector, context){
-    return zepto.init(selector, context)
-  }
-
-  function extend(target, source, deep) {
-    for (key in source)
-      if (deep && (isPlainObject(source[key]) || isArray(source[key]))) {
-        if (isPlainObject(source[key]) && !isPlainObject(target[key]))
-          target[key] = {}
-        if (isArray(source[key]) && !isArray(target[key]))
-          target[key] = []
-        extend(target[key], source[key], deep)
-      }
-      else if (source[key] !== undefined) target[key] = source[key]
-  }
-
-  // Copy all but undefined properties from one or more
-  // objects to the `target` object.
-  $.extend = function(target){
-    var deep, args = slice.call(arguments, 1)
-    if (typeof target == 'boolean') {
-      deep = target
-      target = args.shift()
-    }
-    args.forEach(function(arg){ extend(target, arg, deep) })
-    return target
-  }
-
-  // `$.zepto.qsa` is Zepto's CSS selector implementation which
-  // uses `document.querySelectorAll` and optimizes for some special cases, like `#id`.
-  // This method can be overridden in plugins.
-  zepto.qsa = function(element, selector){
-    var found,
-        maybeID = selector[0] == '#',
-        maybeClass = !maybeID && selector[0] == '.',
-        nameOnly = maybeID || maybeClass ? selector.slice(1) : selector, // Ensure that a 1 char tag name still gets checked
-        isSimple = simpleSelectorRE.test(nameOnly)
-    return (element.getElementById && isSimple && maybeID) ? // Safari DocumentFragment doesn't have getElementById
-      ( (found = element.getElementById(nameOnly)) ? [found] : [] ) :
-      (element.nodeType !== 1 && element.nodeType !== 9 && element.nodeType !== 11) ? [] :
-      slice.call(
-        isSimple && !maybeID && element.getElementsByClassName ? // DocumentFragment doesn't have getElementsByClassName/TagName
-          maybeClass ? element.getElementsByClassName(nameOnly) : // If it's simple, it could be a class
-          element.getElementsByTagName(selector) : // Or a tag
-          element.querySelectorAll(selector) // Or it's not simple, and we need to query all
-      )
-  }
-
-  function filtered(nodes, selector) {
-    return selector == null ? $(nodes) : $(nodes).filter(selector)
-  }
-
-  $.contains = document.documentElement.contains ?
-    function(parent, node) {
-      return parent !== node && parent.contains(node)
-    } :
-    function(parent, node) {
-      while (node && (node = node.parentNode))
-        if (node === parent) return true
-      return false
-    }
-
-  function funcArg(context, arg, idx, payload) {
-    return isFunction(arg) ? arg.call(context, idx, payload) : arg
-  }
-
-  function setAttribute(node, name, value) {
-    value == null ? node.removeAttribute(name) : node.setAttribute(name, value)
-  }
-
-  // access className property while respecting SVGAnimatedString
-  function className(node, value){
-    var klass = node.className || '',
-        svg   = klass && klass.baseVal !== undefined
-
-    if (value === undefined) return svg ? klass.baseVal : klass
-    svg ? (klass.baseVal = value) : (node.className = value)
-  }
-
-  // "true"  => true
-  // "false" => false
-  // "null"  => null
-  // "42"    => 42
-  // "42.5"  => 42.5
-  // "08"    => "08"
-  // JSON    => parse if valid
-  // String  => self
-  function deserializeValue(value) {
-    try {
-      return value ?
-        value == "true" ||
-        ( value == "false" ? false :
-          value == "null" ? null :
-          +value + "" == value ? +value :
-          /^[\[\{]/.test(value) ? $.parseJSON(value) :
-          value )
-        : value
-    } catch(e) {
-      return value
-    }
-  }
-
-  $.type = type
-  $.isFunction = isFunction
-  $.isWindow = isWindow
-  $.isArray = isArray
-  $.isPlainObject = isPlainObject
-
-  $.isEmptyObject = function(obj) {
-    var name
-    for (name in obj) return false
-    return true
-  }
-
-  $.isNumeric = function(val) {
-    var num = Number(val), type = typeof val
-    return val != null && type != 'boolean' &&
-      (type != 'string' || val.length) &&
-      !isNaN(num) && isFinite(num) || false
-  }
-
-  $.inArray = function(elem, array, i){
-    return emptyArray.indexOf.call(array, elem, i)
-  }
-
-  $.camelCase = camelize
-  $.trim = function(str) {
-    return str == null ? "" : String.prototype.trim.call(str)
-  }
-
-  // plugin compatibility
-  $.uuid = 0
-  $.support = { }
-  $.expr = { }
-  $.noop = function() {}
-
-  $.map = function(elements, callback){
-    var value, values = [], i, key
-    if (likeArray(elements))
-      for (i = 0; i < elements.length; i++) {
-        value = callback(elements[i], i)
-        if (value != null) values.push(value)
-      }
-    else
-      for (key in elements) {
-        value = callback(elements[key], key)
-        if (value != null) values.push(value)
-      }
-    return flatten(values)
-  }
-
-  $.each = function(elements, callback){
-    var i, key
-    if (likeArray(elements)) {
-      for (i = 0; i < elements.length; i++)
-        if (callback.call(elements[i], i, elements[i]) === false) return elements
-    } else {
-      for (key in elements)
-        if (callback.call(elements[key], key, elements[key]) === false) return elements
-    }
-
-    return elements
-  }
-
-  $.grep = function(elements, callback){
-    return filter.call(elements, callback)
-  }
-
-  if (window.JSON) $.parseJSON = JSON.parse
-
-  // Populate the class2type map
-  $.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-    class2type[ "[object " + name + "]" ] = name.toLowerCase()
-  })
-
-  // Define methods that will be available on all
-  // Zepto collections
-  $.fn = {
-    constructor: zepto.Z,
-    length: 0,
-
-    // Because a collection acts like an array
-    // copy over these useful array functions.
-    forEach: emptyArray.forEach,
-    reduce: emptyArray.reduce,
-    push: emptyArray.push,
-    sort: emptyArray.sort,
-    splice: emptyArray.splice,
-    indexOf: emptyArray.indexOf,
-    concat: function(){
-      var i, value, args = []
-      for (i = 0; i < arguments.length; i++) {
-        value = arguments[i]
-        args[i] = zepto.isZ(value) ? value.toArray() : value
-      }
-      return concat.apply(zepto.isZ(this) ? this.toArray() : this, args)
-    },
-
-    // `map` and `slice` in the jQuery API work differently
-    // from their array counterparts
-    map: function(fn){
-      return $($.map(this, function(el, i){ return fn.call(el, i, el) }))
-    },
-    slice: function(){
-      return $(slice.apply(this, arguments))
-    },
-
-    ready: function(callback){
-      // need to check if document.body exists for IE as that browser reports
-      // document ready when it hasn't yet created the body element
-      if (readyRE.test(document.readyState) && document.body) callback($)
-      else document.addEventListener('DOMContentLoaded', function(){ callback($) }, false)
-      return this
-    },
-    get: function(idx){
-      return idx === undefined ? slice.call(this) : this[idx >= 0 ? idx : idx + this.length]
-    },
-    toArray: function(){ return this.get() },
-    size: function(){
-      return this.length
-    },
-    remove: function(){
-      return this.each(function(){
-        if (this.parentNode != null)
-          this.parentNode.removeChild(this)
-      })
-    },
-    each: function(callback){
-      emptyArray.every.call(this, function(el, idx){
-        return callback.call(el, idx, el) !== false
-      })
-      return this
-    },
-    filter: function(selector){
-      if (isFunction(selector)) return this.not(this.not(selector))
-      return $(filter.call(this, function(element){
-        return zepto.matches(element, selector)
-      }))
-    },
-    add: function(selector,context){
-      return $(uniq(this.concat($(selector,context))))
-    },
-    is: function(selector){
-      return this.length > 0 && zepto.matches(this[0], selector)
-    },
-    not: function(selector){
-      var nodes=[]
-      if (isFunction(selector) && selector.call !== undefined)
-        this.each(function(idx){
-          if (!selector.call(this,idx)) nodes.push(this)
-        })
-      else {
-        var excludes = typeof selector == 'string' ? this.filter(selector) :
-          (likeArray(selector) && isFunction(selector.item)) ? slice.call(selector) : $(selector)
-        this.forEach(function(el){
-          if (excludes.indexOf(el) < 0) nodes.push(el)
-        })
-      }
-      return $(nodes)
-    },
-    has: function(selector){
-      return this.filter(function(){
-        return isObject(selector) ?
-          $.contains(this, selector) :
-          $(this).find(selector).size()
-      })
-    },
-    eq: function(idx){
-      return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1)
-    },
-    first: function(){
-      var el = this[0]
-      return el && !isObject(el) ? el : $(el)
-    },
-    last: function(){
-      var el = this[this.length - 1]
-      return el && !isObject(el) ? el : $(el)
-    },
-    find: function(selector){
-      var result, $this = this
-      if (!selector) result = $()
-      else if (typeof selector == 'object')
-        result = $(selector).filter(function(){
-          var node = this
-          return emptyArray.some.call($this, function(parent){
-            return $.contains(parent, node)
-          })
-        })
-      else if (this.length == 1) result = $(zepto.qsa(this[0], selector))
-      else result = this.map(function(){ return zepto.qsa(this, selector) })
-      return result
-    },
-    closest: function(selector, context){
-      var nodes = [], collection = typeof selector == 'object' && $(selector)
-      this.each(function(_, node){
-        while (node && !(collection ? collection.indexOf(node) >= 0 : zepto.matches(node, selector)))
-          node = node !== context && !isDocument(node) && node.parentNode
-        if (node && nodes.indexOf(node) < 0) nodes.push(node)
-      })
-      return $(nodes)
-    },
-    parents: function(selector){
-      var ancestors = [], nodes = this
-      while (nodes.length > 0)
-        nodes = $.map(nodes, function(node){
-          if ((node = node.parentNode) && !isDocument(node) && ancestors.indexOf(node) < 0) {
-            ancestors.push(node)
-            return node
-          }
-        })
-      return filtered(ancestors, selector)
-    },
-    parent: function(selector){
-      return filtered(uniq(this.pluck('parentNode')), selector)
-    },
-    children: function(selector){
-      return filtered(this.map(function(){ return children(this) }), selector)
-    },
-    contents: function() {
-      return this.map(function() { return this.contentDocument || slice.call(this.childNodes) })
-    },
-    siblings: function(selector){
-      return filtered(this.map(function(i, el){
-        return filter.call(children(el.parentNode), function(child){ return child!==el })
-      }), selector)
-    },
-    empty: function(){
-      return this.each(function(){ this.innerHTML = '' })
-    },
-    // `pluck` is borrowed from Prototype.js
-    pluck: function(property){
-      return $.map(this, function(el){ return el[property] })
-    },
-    show: function(){
-      return this.each(function(){
-        this.style.display == "none" && (this.style.display = '')
-        if (getComputedStyle(this, '').getPropertyValue("display") == "none")
-          this.style.display = defaultDisplay(this.nodeName)
-      })
-    },
-    replaceWith: function(newContent){
-      return this.before(newContent).remove()
-    },
-    wrap: function(structure){
-      var func = isFunction(structure)
-      if (this[0] && !func)
-        var dom   = $(structure).get(0),
-            clone = dom.parentNode || this.length > 1
-
-      return this.each(function(index){
-        $(this).wrapAll(
-          func ? structure.call(this, index) :
-            clone ? dom.cloneNode(true) : dom
-        )
-      })
-    },
-    wrapAll: function(structure){
-      if (this[0]) {
-        $(this[0]).before(structure = $(structure))
-        var children
-        // drill down to the inmost element
-        while ((children = structure.children()).length) structure = children.first()
-        $(structure).append(this)
-      }
-      return this
-    },
-    wrapInner: function(structure){
-      var func = isFunction(structure)
-      return this.each(function(index){
-        var self = $(this), contents = self.contents(),
-            dom  = func ? structure.call(this, index) : structure
-        contents.length ? contents.wrapAll(dom) : self.append(dom)
-      })
-    },
-    unwrap: function(){
-      this.parent().each(function(){
-        $(this).replaceWith($(this).children())
-      })
-      return this
-    },
-    clone: function(){
-      return this.map(function(){ return this.cloneNode(true) })
-    },
-    hide: function(){
-      return this.css("display", "none")
-    },
-    toggle: function(setting){
-      return this.each(function(){
-        var el = $(this)
-        ;(setting === undefined ? el.css("display") == "none" : setting) ? el.show() : el.hide()
-      })
-    },
-    prev: function(selector){ return $(this.pluck('previousElementSibling')).filter(selector || '*') },
-    next: function(selector){ return $(this.pluck('nextElementSibling')).filter(selector || '*') },
-    html: function(html){
-      return 0 in arguments ?
-        this.each(function(idx){
-          var originHtml = this.innerHTML
-          $(this).empty().append( funcArg(this, html, idx, originHtml) )
-        }) :
-        (0 in this ? this[0].innerHTML : null)
-    },
-    text: function(text){
-      return 0 in arguments ?
-        this.each(function(idx){
-          var newText = funcArg(this, text, idx, this.textContent)
-          this.textContent = newText == null ? '' : ''+newText
-        }) :
-        (0 in this ? this.pluck('textContent').join("") : null)
-    },
-    attr: function(name, value){
-      var result
-      return (typeof name == 'string' && !(1 in arguments)) ?
-        (0 in this && this[0].nodeType == 1 && (result = this[0].getAttribute(name)) != null ? result : undefined) :
-        this.each(function(idx){
-          if (this.nodeType !== 1) return
-          if (isObject(name)) for (key in name) setAttribute(this, key, name[key])
-          else setAttribute(this, name, funcArg(this, value, idx, this.getAttribute(name)))
-        })
-    },
-    removeAttr: function(name){
-      return this.each(function(){ this.nodeType === 1 && name.split(' ').forEach(function(attribute){
-        setAttribute(this, attribute)
-      }, this)})
-    },
-    prop: function(name, value){
-      name = propMap[name] || name
-      return (1 in arguments) ?
-        this.each(function(idx){
-          this[name] = funcArg(this, value, idx, this[name])
-        }) :
-        (this[0] && this[0][name])
-    },
-    removeProp: function(name){
-      name = propMap[name] || name
-      return this.each(function(){ delete this[name] })
-    },
-    data: function(name, value){
-      var attrName = 'data-' + name.replace(capitalRE, '-$1').toLowerCase()
-
-      var data = (1 in arguments) ?
-        this.attr(attrName, value) :
-        this.attr(attrName)
-
-      return data !== null ? deserializeValue(data) : undefined
-    },
-    val: function(value){
-      if (0 in arguments) {
-        if (value == null) value = ""
-        return this.each(function(idx){
-          this.value = funcArg(this, value, idx, this.value)
-        })
-      } else {
-        return this[0] && (this[0].multiple ?
-           $(this[0]).find('option').filter(function(){ return this.selected }).pluck('value') :
-           this[0].value)
-      }
-    },
-    offset: function(coordinates){
-      if (coordinates) return this.each(function(index){
-        var $this = $(this),
-            coords = funcArg(this, coordinates, index, $this.offset()),
-            parentOffset = $this.offsetParent().offset(),
-            props = {
-              top:  coords.top  - parentOffset.top,
-              left: coords.left - parentOffset.left
-            }
-
-        if ($this.css('position') == 'static') props['position'] = 'relative'
-        $this.css(props)
-      })
-      if (!this.length) return null
-      if (document.documentElement !== this[0] && !$.contains(document.documentElement, this[0]))
-        return {top: 0, left: 0}
-      var obj = this[0].getBoundingClientRect()
-      return {
-        left: obj.left + window.pageXOffset,
-        top: obj.top + window.pageYOffset,
-        width: Math.round(obj.width),
-        height: Math.round(obj.height)
-      }
-    },
-    css: function(property, value){
-      if (arguments.length < 2) {
-        var element = this[0]
-        if (typeof property == 'string') {
-          if (!element) return
-          return element.style[camelize(property)] || getComputedStyle(element, '').getPropertyValue(property)
-        } else if (isArray(property)) {
-          if (!element) return
-          var props = {}
-          var computedStyle = getComputedStyle(element, '')
-          $.each(property, function(_, prop){
-            props[prop] = (element.style[camelize(prop)] || computedStyle.getPropertyValue(prop))
-          })
-          return props
-        }
-      }
-
-      var css = ''
-      if (type(property) == 'string') {
-        if (!value && value !== 0)
-          this.each(function(){ this.style.removeProperty(dasherize(property)) })
-        else
-          css = dasherize(property) + ":" + maybeAddPx(property, value)
-      } else {
-        for (key in property)
-          if (!property[key] && property[key] !== 0)
-            this.each(function(){ this.style.removeProperty(dasherize(key)) })
-          else
-            css += dasherize(key) + ':' + maybeAddPx(key, property[key]) + ';'
-      }
-
-      return this.each(function(){ this.style.cssText += ';' + css })
-    },
-    index: function(element){
-      return element ? this.indexOf($(element)[0]) : this.parent().children().indexOf(this[0])
-    },
-    hasClass: function(name){
-      if (!name) return false
-      return emptyArray.some.call(this, function(el){
-        return this.test(className(el))
-      }, classRE(name))
-    },
-    addClass: function(name){
-      if (!name) return this
-      return this.each(function(idx){
-        if (!('className' in this)) return
-        classList = []
-        var cls = className(this), newName = funcArg(this, name, idx, cls)
-        newName.split(/\s+/g).forEach(function(klass){
-          if (!$(this).hasClass(klass)) classList.push(klass)
-        }, this)
-        classList.length && className(this, cls + (cls ? " " : "") + classList.join(" "))
-      })
-    },
-    removeClass: function(name){
-      return this.each(function(idx){
-        if (!('className' in this)) return
-        if (name === undefined) return className(this, '')
-        classList = className(this)
-        funcArg(this, name, idx, classList).split(/\s+/g).forEach(function(klass){
-          classList = classList.replace(classRE(klass), " ")
-        })
-        className(this, classList.trim())
-      })
-    },
-    toggleClass: function(name, when){
-      if (!name) return this
-      return this.each(function(idx){
-        var $this = $(this), names = funcArg(this, name, idx, className(this))
-        names.split(/\s+/g).forEach(function(klass){
-          (when === undefined ? !$this.hasClass(klass) : when) ?
-            $this.addClass(klass) : $this.removeClass(klass)
-        })
-      })
-    },
-    scrollTop: function(value){
-      if (!this.length) return
-      var hasScrollTop = 'scrollTop' in this[0]
-      if (value === undefined) return hasScrollTop ? this[0].scrollTop : this[0].pageYOffset
-      return this.each(hasScrollTop ?
-        function(){ this.scrollTop = value } :
-        function(){ this.scrollTo(this.scrollX, value) })
-    },
-    scrollLeft: function(value){
-      if (!this.length) return
-      var hasScrollLeft = 'scrollLeft' in this[0]
-      if (value === undefined) return hasScrollLeft ? this[0].scrollLeft : this[0].pageXOffset
-      return this.each(hasScrollLeft ?
-        function(){ this.scrollLeft = value } :
-        function(){ this.scrollTo(value, this.scrollY) })
-    },
-    position: function() {
-      if (!this.length) return
-
-      var elem = this[0],
-        // Get *real* offsetParent
-        offsetParent = this.offsetParent(),
-        // Get correct offsets
-        offset       = this.offset(),
-        parentOffset = rootNodeRE.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset()
-
-      // Subtract element margins
-      // note: when an element has margin: auto the offsetLeft and marginLeft
-      // are the same in Safari causing offset.left to incorrectly be 0
-      offset.top  -= parseFloat( $(elem).css('margin-top') ) || 0
-      offset.left -= parseFloat( $(elem).css('margin-left') ) || 0
-
-      // Add offsetParent borders
-      parentOffset.top  += parseFloat( $(offsetParent[0]).css('border-top-width') ) || 0
-      parentOffset.left += parseFloat( $(offsetParent[0]).css('border-left-width') ) || 0
-
-      // Subtract the two offsets
-      return {
-        top:  offset.top  - parentOffset.top,
-        left: offset.left - parentOffset.left
-      }
-    },
-    offsetParent: function() {
-      return this.map(function(){
-        var parent = this.offsetParent || document.body
-        while (parent && !rootNodeRE.test(parent.nodeName) && $(parent).css("position") == "static")
-          parent = parent.offsetParent
-        return parent
-      })
-    }
-  }
-
-  // for now
-  $.fn.detach = $.fn.remove
-
-  // Generate the `width` and `height` functions
-  ;['width', 'height'].forEach(function(dimension){
-    var dimensionProperty =
-      dimension.replace(/./, function(m){ return m[0].toUpperCase() })
-
-    $.fn[dimension] = function(value){
-      var offset, el = this[0]
-      if (value === undefined) return isWindow(el) ? el['inner' + dimensionProperty] :
-        isDocument(el) ? el.documentElement['scroll' + dimensionProperty] :
-        (offset = this.offset()) && offset[dimension]
-      else return this.each(function(idx){
-        el = $(this)
-        el.css(dimension, funcArg(this, value, idx, el[dimension]()))
-      })
-    }
-  })
-
-  function traverseNode(node, fun) {
-    fun(node)
-    for (var i = 0, len = node.childNodes.length; i < len; i++)
-      traverseNode(node.childNodes[i], fun)
-  }
-
-  // Generate the `after`, `prepend`, `before`, `append`,
-  // `insertAfter`, `insertBefore`, `appendTo`, and `prependTo` methods.
-  adjacencyOperators.forEach(function(operator, operatorIndex) {
-    var inside = operatorIndex % 2 //=> prepend, append
-
-    $.fn[operator] = function(){
-      // arguments can be nodes, arrays of nodes, Zepto objects and HTML strings
-      var argType, nodes = $.map(arguments, function(arg) {
-            var arr = []
-            argType = type(arg)
-            if (argType == "array") {
-              arg.forEach(function(el) {
-                if (el.nodeType !== undefined) return arr.push(el)
-                else if ($.zepto.isZ(el)) return arr = arr.concat(el.get())
-                arr = arr.concat(zepto.fragment(el))
-              })
-              return arr
-            }
-            return argType == "object" || arg == null ?
-              arg : zepto.fragment(arg)
-          }),
-          parent, copyByClone = this.length > 1
-      if (nodes.length < 1) return this
-
-      return this.each(function(_, target){
-        parent = inside ? target : target.parentNode
-
-        // convert all methods to a "before" operation
-        target = operatorIndex == 0 ? target.nextSibling :
-                 operatorIndex == 1 ? target.firstChild :
-                 operatorIndex == 2 ? target :
-                 null
-
-        var parentInDocument = $.contains(document.documentElement, parent)
-
-        nodes.forEach(function(node){
-          if (copyByClone) node = node.cloneNode(true)
-          else if (!parent) return $(node).remove()
-
-          parent.insertBefore(node, target)
-          if (parentInDocument) traverseNode(node, function(el){
-            if (el.nodeName != null && el.nodeName.toUpperCase() === 'SCRIPT' &&
-               (!el.type || el.type === 'text/javascript') && !el.src){
-              var target = el.ownerDocument ? el.ownerDocument.defaultView : window
-              target['eval'].call(target, el.innerHTML)
-            }
-          })
-        })
-      })
-    }
-
-    // after    => insertAfter
-    // prepend  => prependTo
-    // before   => insertBefore
-    // append   => appendTo
-    $.fn[inside ? operator+'To' : 'insert'+(operatorIndex ? 'Before' : 'After')] = function(html){
-      $(html)[operator](this)
-      return this
-    }
-  })
-
-  zepto.Z.prototype = Z.prototype = $.fn
-
-  // Export internal API functions in the `$.zepto` namespace
-  zepto.uniq = uniq
-  zepto.deserializeValue = deserializeValue
-  $.zepto = zepto
-
-  return $
-})()
-
-;(function($){
-  var _zid = 1, undefined,
-      slice = Array.prototype.slice,
-      isFunction = $.isFunction,
-      isString = function(obj){ return typeof obj == 'string' },
-      handlers = {},
-      specialEvents={},
-      focusinSupported = 'onfocusin' in window,
-      focus = { focus: 'focusin', blur: 'focusout' },
-      hover = { mouseenter: 'mouseover', mouseleave: 'mouseout' }
-
-  specialEvents.click = specialEvents.mousedown = specialEvents.mouseup = specialEvents.mousemove = 'MouseEvents'
-
-  function zid(element) {
-    return element._zid || (element._zid = _zid++)
-  }
-  function findHandlers(element, event, fn, selector) {
-    event = parse(event)
-    if (event.ns) var matcher = matcherFor(event.ns)
-    return (handlers[zid(element)] || []).filter(function(handler) {
-      return handler
-        && (!event.e  || handler.e == event.e)
-        && (!event.ns || matcher.test(handler.ns))
-        && (!fn       || zid(handler.fn) === zid(fn))
-        && (!selector || handler.sel == selector)
-    })
-  }
-  function parse(event) {
-    var parts = ('' + event).split('.')
-    return {e: parts[0], ns: parts.slice(1).sort().join(' ')}
-  }
-  function matcherFor(ns) {
-    return new RegExp('(?:^| )' + ns.replace(' ', ' .* ?') + '(?: |$)')
-  }
-
-  function eventCapture(handler, captureSetting) {
-    return handler.del &&
-      (!focusinSupported && (handler.e in focus)) ||
-      !!captureSetting
-  }
-
-  function realEvent(type) {
-    return hover[type] || (focusinSupported && focus[type]) || type
-  }
-
-  function add(element, events, fn, data, selector, delegator, capture){
-    var id = zid(element), set = (handlers[id] || (handlers[id] = []))
-    events.split(/\s/).forEach(function(event){
-      if (event == 'ready') return $(document).ready(fn)
-      var handler   = parse(event)
-      handler.fn    = fn
-      handler.sel   = selector
-      // emulate mouseenter, mouseleave
-      if (handler.e in hover) fn = function(e){
-        var related = e.relatedTarget
-        if (!related || (related !== this && !$.contains(this, related)))
-          return handler.fn.apply(this, arguments)
-      }
-      handler.del   = delegator
-      var callback  = delegator || fn
-      handler.proxy = function(e){
-        e = compatible(e)
-        if (e.isImmediatePropagationStopped()) return
-        try {
-          var dataPropDescriptor = Object.getOwnPropertyDescriptor(e, 'data')
-          if (!dataPropDescriptor || dataPropDescriptor.writable)
-            e.data = data
-        } catch (e) {} // when using strict mode dataPropDescriptor will be undefined when e is InputEvent (even though data property exists). So we surround with try/catch
-        var result = callback.apply(element, e._args == undefined ? [e] : [e].concat(e._args))
-        if (result === false) e.preventDefault(), e.stopPropagation()
-        return result
-      }
-      handler.i = set.length
-      set.push(handler)
-      if ('addEventListener' in element)
-        element.addEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
-    })
-  }
-  function remove(element, events, fn, selector, capture){
-    var id = zid(element)
-    ;(events || '').split(/\s/).forEach(function(event){
-      findHandlers(element, event, fn, selector).forEach(function(handler){
-        delete handlers[id][handler.i]
-      if ('removeEventListener' in element)
-        element.removeEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture))
-      })
-    })
-  }
-
-  $.event = { add: add, remove: remove }
-
-  $.proxy = function(fn, context) {
-    var args = (2 in arguments) && slice.call(arguments, 2)
-    if (isFunction(fn)) {
-      var proxyFn = function(){ return fn.apply(context, args ? args.concat(slice.call(arguments)) : arguments) }
-      proxyFn._zid = zid(fn)
-      return proxyFn
-    } else if (isString(context)) {
-      if (args) {
-        args.unshift(fn[context], fn)
-        return $.proxy.apply(null, args)
-      } else {
-        return $.proxy(fn[context], fn)
-      }
-    } else {
-      throw new TypeError("expected function")
-    }
-  }
-
-  $.fn.bind = function(event, data, callback){
-    return this.on(event, data, callback)
-  }
-  $.fn.unbind = function(event, callback){
-    return this.off(event, callback)
-  }
-  $.fn.one = function(event, selector, data, callback){
-    return this.on(event, selector, data, callback, 1)
-  }
-
-  var returnTrue = function(){return true},
-      returnFalse = function(){return false},
-      ignoreProperties = /^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,
-      eventMethods = {
-        preventDefault: 'isDefaultPrevented',
-        stopImmediatePropagation: 'isImmediatePropagationStopped',
-        stopPropagation: 'isPropagationStopped'
-      }
-
-  function compatible(event, source) {
-    if (source || !event.isDefaultPrevented) {
-      source || (source = event)
-
-      $.each(eventMethods, function(name, predicate) {
-        var sourceMethod = source[name]
-        event[name] = function(){
-          this[predicate] = returnTrue
-          return sourceMethod && sourceMethod.apply(source, arguments)
-        }
-        event[predicate] = returnFalse
-      })
-
-      event.timeStamp || (event.timeStamp = Date.now())
-
-      if (source.defaultPrevented !== undefined ? source.defaultPrevented :
-          'returnValue' in source ? source.returnValue === false :
-          source.getPreventDefault && source.getPreventDefault())
-        event.isDefaultPrevented = returnTrue
-    }
-    return event
-  }
-
-  function createProxy(event) {
-    var key, proxy = { originalEvent: event }
-    for (key in event)
-      if (!ignoreProperties.test(key) && event[key] !== undefined) proxy[key] = event[key]
-
-    return compatible(proxy, event)
-  }
-
-  $.fn.delegate = function(selector, event, callback){
-    return this.on(event, selector, callback)
-  }
-  $.fn.undelegate = function(selector, event, callback){
-    return this.off(event, selector, callback)
-  }
-
-  $.fn.live = function(event, callback){
-    $(document.body).delegate(this.selector, event, callback)
-    return this
-  }
-  $.fn.die = function(event, callback){
-    $(document.body).undelegate(this.selector, event, callback)
-    return this
-  }
-
-  $.fn.on = function(event, selector, data, callback, one){
-    var autoRemove, delegator, $this = this
-    if (event && !isString(event)) {
-      $.each(event, function(type, fn){
-        $this.on(type, selector, data, fn, one)
-      })
-      return $this
-    }
-
-    if (!isString(selector) && !isFunction(callback) && callback !== false)
-      callback = data, data = selector, selector = undefined
-    if (callback === undefined || data === false)
-      callback = data, data = undefined
-
-    if (callback === false) callback = returnFalse
-
-    return $this.each(function(_, element){
-      if (one) autoRemove = function(e){
-        remove(element, e.type, callback)
-        return callback.apply(this, arguments)
-      }
-
-      if (selector) delegator = function(e){
-        var evt, match = $(e.target).closest(selector, element).get(0)
-        if (match && match !== element) {
-          evt = $.extend(createProxy(e), {currentTarget: match, liveFired: element})
-          return (autoRemove || callback).apply(match, [evt].concat(slice.call(arguments, 1)))
-        }
-      }
-
-      add(element, event, callback, data, selector, delegator || autoRemove)
-    })
-  }
-  $.fn.off = function(event, selector, callback){
-    var $this = this
-    if (event && !isString(event)) {
-      $.each(event, function(type, fn){
-        $this.off(type, selector, fn)
-      })
-      return $this
-    }
-
-    if (!isString(selector) && !isFunction(callback) && callback !== false)
-      callback = selector, selector = undefined
-
-    if (callback === false) callback = returnFalse
-
-    return $this.each(function(){
-      remove(this, event, callback, selector)
-    })
-  }
-
-  $.fn.trigger = function(event, args){
-    event = (isString(event) || $.isPlainObject(event)) ? $.Event(event) : compatible(event)
-    event._args = args
-    return this.each(function(){
-      // handle focus(), blur() by calling them directly
-      if (event.type in focus && typeof this[event.type] == "function") this[event.type]()
-      // items in the collection might not be DOM elements
-      else if ('dispatchEvent' in this) this.dispatchEvent(event)
-      else $(this).triggerHandler(event, args)
-    })
-  }
-
-  // triggers event handlers on current element just as if an event occurred,
-  // doesn't trigger an actual event, doesn't bubble
-  $.fn.triggerHandler = function(event, args){
-    var e, result
-    this.each(function(i, element){
-      e = createProxy(isString(event) ? $.Event(event) : event)
-      e._args = args
-      e.target = element
-      $.each(findHandlers(element, event.type || event), function(i, handler){
-        result = handler.proxy(e)
-        if (e.isImmediatePropagationStopped()) return false
-      })
-    })
-    return result
-  }
-
-  // shortcut methods for `.bind(event, fn)` for each event type
-  ;('focusin focusout focus blur load resize scroll unload click dblclick '+
-  'mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave '+
-  'change select keydown keypress keyup error').split(' ').forEach(function(event) {
-    $.fn[event] = function(callback) {
-      return (0 in arguments) ?
-        this.bind(event, callback) :
-        this.trigger(event)
-    }
-  })
-
-  $.Event = function(type, props) {
-    if (!isString(type)) props = type, type = props.type
-    var event = document.createEvent(specialEvents[type] || 'Events'), bubbles = true
-    if (props) for (var name in props) (name == 'bubbles') ? (bubbles = !!props[name]) : (event[name] = props[name])
-    event.initEvent(type, bubbles, true)
-    return compatible(event)
-  }
-
-})(Zepto)
-
-;(function($){
-  var cache = [], timeout
-
-  $.fn.remove = function(){
-    return this.each(function(){
-      if(this.parentNode){
-        if(this.tagName === 'IMG'){
-          cache.push(this)
-          this.src = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
-          if (timeout) clearTimeout(timeout)
-          timeout = setTimeout(function(){ cache = [] }, 60000)
-        }
-        this.parentNode.removeChild(this)
-      }
-    })
-  }
-})(Zepto)
-
-;(function($){
-  var data = {}, dataAttr = $.fn.data, camelize = $.camelCase,
-    exp = $.expando = 'Zepto' + (+new Date()), emptyArray = []
-
-  // Get value from node:
-  // 1. first try key as given,
-  // 2. then try camelized key,
-  // 3. fall back to reading "data-*" attribute.
-  function getData(node, name) {
-    var id = node[exp], store = id && data[id]
-    if (name === undefined) return store || setData(node)
-    else {
-      if (store) {
-        if (name in store) return store[name]
-        var camelName = camelize(name)
-        if (camelName in store) return store[camelName]
-      }
-      return dataAttr.call($(node), name)
-    }
-  }
-
-  // Store value under camelized key on node
-  function setData(node, name, value) {
-    var id = node[exp] || (node[exp] = ++$.uuid),
-      store = data[id] || (data[id] = attributeData(node))
-    if (name !== undefined) store[camelize(name)] = value
-    return store
-  }
-
-  // Read all "data-*" attributes from a node
-  function attributeData(node) {
-    var store = {}
-    $.each(node.attributes || emptyArray, function(i, attr){
-      if (attr.name.indexOf('data-') == 0)
-        store[camelize(attr.name.replace('data-', ''))] =
-          $.zepto.deserializeValue(attr.value)
-    })
-    return store
-  }
-
-  $.fn.data = function(name, value) {
-    return value === undefined ?
-      // set multiple values via object
-      $.isPlainObject(name) ?
-        this.each(function(i, node){
-          $.each(name, function(key, value){ setData(node, key, value) })
-        }) :
-        // get value from first element
-        (0 in this ? getData(this[0], name) : undefined) :
-      // set value on all elements
-      this.each(function(){ setData(this, name, value) })
-  }
-
-  $.data = function(elem, name, value) {
-    return $(elem).data(name, value)
-  }
-
-  $.hasData = function(elem) {
-    var id = elem[exp], store = id && data[id]
-    return store ? !$.isEmptyObject(store) : false
-  }
-
-  $.fn.removeData = function(names) {
-    if (typeof names == 'string') names = names.split(/\s+/)
-    return this.each(function(){
-      var id = this[exp], store = id && data[id]
-      if (store) $.each(names || store, function(key){
-        delete store[names ? camelize(this) : key]
-      })
-    })
-  }
-
-  // Generate extended `remove` and `empty` functions
-  ;['remove', 'empty'].forEach(function(methodName){
-    var origFn = $.fn[methodName]
-    $.fn[methodName] = function() {
-      var elements = this.find('*')
-      if (methodName === 'remove') elements = elements.add(this)
-      elements.removeData()
-      return origFn.call(this)
-    }
-  })
-})(Zepto)
-  return Zepto
-}))
-
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var namespace = 'autocomplete:';
-
-var _ = __webpack_require__(0);
-var DOM = __webpack_require__(1);
-
-// constructor
-// -----------
-
-function EventBus(o) {
-  if (!o || !o.el) {
-    _.error('EventBus initialized without el');
-  }
-
-  this.$el = DOM.element(o.el);
-}
-
-// instance methods
-// ----------------
-
-_.mixin(EventBus.prototype, {
-
-  // ### public
-
-  trigger: function(type, suggestion, dataset, context) {
-    var event = _.Event(namespace + type);
-    this.$el.trigger(event, [suggestion, dataset, context]);
-    return event;
-  }
-});
-
-module.exports = EventBus;
-
-
-/***/ }),
-/* 17 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = {
-  wrapper: '<span class="%ROOT%"></span>',
-  dropdown: '<span class="%PREFIX%%DROPDOWN_MENU%"></span>',
-  dataset: '<div class="%PREFIX%%DATASET%-%CLASS%"></div>',
-  suggestions: '<span class="%PREFIX%%SUGGESTIONS%"></span>',
-  suggestion: '<div class="%PREFIX%%SUGGESTION%"></div>'
-};
-
-
-/***/ }),
-/* 18 */
-/***/ (function(module, exports) {
-
-module.exports = "0.36.0";
-
-
-/***/ }),
-/* 19 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function parseAlgoliaClientVersion(agent) {
-  var parsed = agent.match(/Algolia for vanilla JavaScript (\d+\.)(\d+\.)(\d+)/);
-  if (parsed) return [parsed[1], parsed[2], parsed[3]];
-  return undefined;
-};
-
-
-/***/ }),
-/* 20 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _zepto = __webpack_require__(15);
-
-var _zepto2 = _interopRequireDefault(_zepto);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = _zepto2.default;
-
-/***/ }),
-/* 21 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = '2.6.3';
-
-/***/ }),
-/* 22 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _main = __webpack_require__(23);
-
-var _main2 = _interopRequireDefault(_main);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-module.exports = _main2.default; /* eslint-disable import/no-commonjs */
-
-/***/ }),
-/* 23 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _toFactory = __webpack_require__(24);
-
-var _toFactory2 = _interopRequireDefault(_toFactory);
-
-var _DocSearch = __webpack_require__(25);
-
-var _DocSearch2 = _interopRequireDefault(_DocSearch);
-
-var _version = __webpack_require__(21);
-
-var _version2 = _interopRequireDefault(_version);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var docsearch = (0, _toFactory2.default)(_DocSearch2.default);
-docsearch.version = _version2.default;
-
-exports.default = docsearch;
-
-/***/ }),
-/* 24 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _bind = Function.prototype.bind;
-function toFactory(Class) {
-  var Factory = function Factory() {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    return new (_bind.apply(Class, [null].concat(args)))();
-  };
-  Factory.__proto__ = Class;
-  Factory.prototype = Class.prototype;
-  return Factory;
-}
-
-module.exports = toFactory;
-
-
-
-/***/ }),
-/* 25 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _hogan = __webpack_require__(26);
-
-var _hogan2 = _interopRequireDefault(_hogan);
-
-var _lite = __webpack_require__(29);
-
-var _lite2 = _interopRequireDefault(_lite);
-
-var _autocomplete = __webpack_require__(49);
-
-var _autocomplete2 = _interopRequireDefault(_autocomplete);
-
-var _templates = __webpack_require__(64);
-
-var _templates2 = _interopRequireDefault(_templates);
-
-var _utils = __webpack_require__(65);
-
-var _utils2 = _interopRequireDefault(_utils);
-
-var _version = __webpack_require__(21);
-
-var _version2 = _interopRequireDefault(_version);
-
-var _zepto = __webpack_require__(20);
-
-var _zepto2 = _interopRequireDefault(_zepto);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-/**
- * Adds an autocomplete dropdown to an input field
- * @function DocSearch
- * @param  {string} options.apiKey         Read-only API key
- * @param  {string} options.indexName      Name of the index to target
- * @param  {string} options.inputSelector  CSS selector that targets the input
- * @param  {string} [options.appId]  Lets you override the applicationId used.
- * If using the default Algolia Crawler, you should not have to change this
- * value.
- * @param  {Object} [options.algoliaOptions] Options to pass the underlying Algolia client
- * @param  {Object} [options.autocompleteOptions] Options to pass to the underlying autocomplete instance
- * @return {Object}
- */
-var usage = 'Usage:\n  documentationSearch({\n  apiKey,\n  indexName,\n  inputSelector,\n  [ appId ],\n  [ algoliaOptions.{hitsPerPage} ]\n  [ autocompleteOptions.{hint,debug} ]\n})';
-
-var DocSearch = function () {
-  function DocSearch(_ref) {
-    var apiKey = _ref.apiKey,
-        indexName = _ref.indexName,
-        inputSelector = _ref.inputSelector,
-        _ref$appId = _ref.appId,
-        appId = _ref$appId === undefined ? 'BH4D9OD16A' : _ref$appId,
-        _ref$debug = _ref.debug,
-        debug = _ref$debug === undefined ? false : _ref$debug,
-        _ref$algoliaOptions = _ref.algoliaOptions,
-        algoliaOptions = _ref$algoliaOptions === undefined ? {} : _ref$algoliaOptions,
-        _ref$queryDataCallbac = _ref.queryDataCallback,
-        queryDataCallback = _ref$queryDataCallbac === undefined ? null : _ref$queryDataCallbac,
-        _ref$autocompleteOpti = _ref.autocompleteOptions,
-        autocompleteOptions = _ref$autocompleteOpti === undefined ? {
-      debug: false,
-      hint: false,
-      autoselect: true
-    } : _ref$autocompleteOpti,
-        _ref$transformData = _ref.transformData,
-        transformData = _ref$transformData === undefined ? false : _ref$transformData,
-        _ref$queryHook = _ref.queryHook,
-        queryHook = _ref$queryHook === undefined ? false : _ref$queryHook,
-        _ref$handleSelected = _ref.handleSelected,
-        handleSelected = _ref$handleSelected === undefined ? false : _ref$handleSelected,
-        _ref$enhancedSearchIn = _ref.enhancedSearchInput,
-        enhancedSearchInput = _ref$enhancedSearchIn === undefined ? false : _ref$enhancedSearchIn,
-        _ref$layout = _ref.layout,
-        layout = _ref$layout === undefined ? 'collumns' : _ref$layout;
-
-    _classCallCheck(this, DocSearch);
-
-    DocSearch.checkArguments({
-      apiKey: apiKey,
-      indexName: indexName,
-      inputSelector: inputSelector,
-      debug: debug,
-      algoliaOptions: algoliaOptions,
-      queryDataCallback: queryDataCallback,
-      autocompleteOptions: autocompleteOptions,
-      transformData: transformData,
-      queryHook: queryHook,
-      handleSelected: handleSelected,
-      enhancedSearchInput: enhancedSearchInput,
-      layout: layout
-    });
-
-    this.apiKey = apiKey;
-    this.appId = appId;
-    this.indexName = indexName;
-    this.input = DocSearch.getInputFromSelector(inputSelector);
-    this.algoliaOptions = _extends({ hitsPerPage: 5 }, algoliaOptions);
-    this.queryDataCallback = queryDataCallback || null;
-    var autocompleteOptionsDebug = autocompleteOptions && autocompleteOptions.debug ? autocompleteOptions.debug : false;
-    // eslint-disable-next-line no-param-reassign
-    autocompleteOptions.debug = debug || autocompleteOptionsDebug;
-    this.autocompleteOptions = autocompleteOptions;
-    this.autocompleteOptions.cssClasses = this.autocompleteOptions.cssClasses || {};
-    this.autocompleteOptions.cssClasses.prefix = this.autocompleteOptions.cssClasses.prefix || 'ds';
-    var inputAriaLabel = this.input && typeof this.input.attr === 'function' && this.input.attr('aria-label');
-    this.autocompleteOptions.ariaLabel = this.autocompleteOptions.ariaLabel || inputAriaLabel || "search input";
-
-    this.isSimpleLayout = layout === 'simple';
-
-    this.client = (0, _lite2.default)(this.appId, this.apiKey);
-    this.client.addAlgoliaAgent('docsearch.js ' + _version2.default);
-
-    if (enhancedSearchInput) {
-      this.input = DocSearch.injectSearchBox(this.input);
-    }
-
-    this.autocomplete = (0, _autocomplete2.default)(this.input, autocompleteOptions, [{
-      source: this.getAutocompleteSource(transformData, queryHook),
-      templates: {
-        suggestion: DocSearch.getSuggestionTemplate(this.isSimpleLayout),
-        footer: _templates2.default.footer,
-        empty: DocSearch.getEmptyTemplate()
-      }
-    }]);
-
-    var customHandleSelected = handleSelected;
-    this.handleSelected = customHandleSelected || this.handleSelected;
-
-    // We prevent default link clicking if a custom handleSelected is defined
-    if (customHandleSelected) {
-      (0, _zepto2.default)('.algolia-autocomplete').on('click', '.ds-suggestions a', function (event) {
-        event.preventDefault();
-      });
-    }
-
-    this.autocomplete.on('autocomplete:selected', this.handleSelected.bind(null, this.autocomplete.autocomplete));
-
-    this.autocomplete.on('autocomplete:shown', this.handleShown.bind(null, this.input));
-
-    if (enhancedSearchInput) {
-      DocSearch.bindSearchBoxEvent();
-    }
-  }
-
-  /**
-   * Checks that the passed arguments are valid. Will throw errors otherwise
-   * @function checkArguments
-   * @param  {object} args Arguments as an option object
-   * @returns {void}
-   */
-
-
-  _createClass(DocSearch, [{
-    key: 'getAutocompleteSource',
-
-
-    /**
-     * Returns the `source` method to be passed to autocomplete.js. It will query
-     * the Algolia index and call the callbacks with the formatted hits.
-     * @function getAutocompleteSource
-     * @param  {function} transformData An optional function to transform the hits
-     * @param {function} queryHook An optional function to transform the query
-     * @returns {function} Method to be passed as the `source` option of
-     * autocomplete
-     */
-    value: function getAutocompleteSource(transformData, queryHook) {
-      var _this = this;
-
-      return function (query, callback) {
-        if (queryHook) {
-          // eslint-disable-next-line no-param-reassign
-          query = queryHook(query) || query;
-        }
-
-        _this.client.search([{
-          indexName: _this.indexName,
-          query: query,
-          params: _this.algoliaOptions
-        }]).then(function (data) {
-          if (_this.queryDataCallback && typeof _this.queryDataCallback == "function") {
-            _this.queryDataCallback(data);
-          }
-          var hits = data.results[0].hits;
-          if (transformData) {
-            hits = transformData(hits) || hits;
-          }
-          callback(DocSearch.formatHits(hits));
-        });
-      };
-    }
-
-    // Given a list of hits returned by the API, will reformat them to be used in
-    // a Hogan template
-
-  }, {
-    key: 'handleSelected',
-    value: function handleSelected(input, event, suggestion, datasetNumber) {
-      var context = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
-
-      // Do nothing if click on the suggestion, as it's already a <a href>, the
-      // browser will take care of it. This allow Ctrl-Clicking on results and not
-      // having the main window being redirected as well
-      if (context.selectionMethod === 'click') {
-        return;
-      }
-
-      input.setVal('');
-      window.location.assign(suggestion.url);
-    }
-  }, {
-    key: 'handleShown',
-    value: function handleShown(input) {
-      var middleOfInput = input.offset().left + input.width() / 2;
-      var middleOfWindow = (0, _zepto2.default)(document).width() / 2;
-
-      if (isNaN(middleOfWindow)) {
-        middleOfWindow = 900;
-      }
-
-      var alignClass = middleOfInput - middleOfWindow >= 0 ? 'algolia-autocomplete-right' : 'algolia-autocomplete-left';
-      var otherAlignClass = middleOfInput - middleOfWindow < 0 ? 'algolia-autocomplete-right' : 'algolia-autocomplete-left';
-      var autocompleteWrapper = (0, _zepto2.default)('.algolia-autocomplete');
-      if (!autocompleteWrapper.hasClass(alignClass)) {
-        autocompleteWrapper.addClass(alignClass);
-      }
-
-      if (autocompleteWrapper.hasClass(otherAlignClass)) {
-        autocompleteWrapper.removeClass(otherAlignClass);
-      }
-    }
-  }], [{
-    key: 'checkArguments',
-    value: function checkArguments(args) {
-      if (!args.apiKey || !args.indexName) {
-        throw new Error(usage);
-      }
-
-      if (typeof args.inputSelector !== 'string') {
-        throw new Error('Error: inputSelector:' + args.inputSelector + '  must be a string. Each selector must match only one element and separated by \',\'');
-      }
-
-      if (!DocSearch.getInputFromSelector(args.inputSelector)) {
-        throw new Error('Error: No input element in the page matches ' + args.inputSelector);
-      }
-    }
-  }, {
-    key: 'injectSearchBox',
-    value: function injectSearchBox(input) {
-      input.before(_templates2.default.searchBox);
-      var newInput = input.prev().prev().find('input');
-      input.remove();
-      return newInput;
-    }
-  }, {
-    key: 'bindSearchBoxEvent',
-    value: function bindSearchBoxEvent() {
-      (0, _zepto2.default)('.searchbox [type="reset"]').on('click', function () {
-        (0, _zepto2.default)('input#docsearch').focus();
-        (0, _zepto2.default)(this).addClass('hide');
-        _autocomplete2.default.autocomplete.setVal('');
-      });
-
-      (0, _zepto2.default)('input#docsearch').on('keyup', function () {
-        var searchbox = document.querySelector('input#docsearch');
-        var reset = document.querySelector('.searchbox [type="reset"]');
-        reset.className = 'searchbox__reset';
-        if (searchbox.value.length === 0) {
-          reset.className += ' hide';
-        }
-      });
-    }
-
-    /**
-     * Returns the matching input from a CSS selector, null if none matches
-     * @function getInputFromSelector
-     * @param  {string} selector CSS selector that matches the search
-     * input of the page
-     * @returns {void}
-     */
-
-  }, {
-    key: 'getInputFromSelector',
-    value: function getInputFromSelector(selector) {
-      var input = (0, _zepto2.default)(selector).filter('input');
-      return input.length ? (0, _zepto2.default)(input[0]) : null;
-    }
-  }, {
-    key: 'formatHits',
-    value: function formatHits(receivedHits) {
-      var clonedHits = _utils2.default.deepClone(receivedHits);
-      var hits = clonedHits.map(function (hit) {
-        if (hit._highlightResult) {
-          // eslint-disable-next-line no-param-reassign
-          hit._highlightResult = _utils2.default.mergeKeyWithParent(hit._highlightResult, 'hierarchy');
-        }
-        return _utils2.default.mergeKeyWithParent(hit, 'hierarchy');
-      });
-
-      // Group hits by category / subcategory
-      var groupedHits = _utils2.default.groupBy(hits, 'lvl0');
-      _zepto2.default.each(groupedHits, function (level, collection) {
-        var groupedHitsByLvl1 = _utils2.default.groupBy(collection, 'lvl1');
-        var flattenedHits = _utils2.default.flattenAndFlagFirst(groupedHitsByLvl1, 'isSubCategoryHeader');
-        groupedHits[level] = flattenedHits;
-      });
-      groupedHits = _utils2.default.flattenAndFlagFirst(groupedHits, 'isCategoryHeader');
-
-      // Translate hits into smaller objects to be send to the template
-      return groupedHits.map(function (hit) {
-        var url = DocSearch.formatURL(hit);
-        var category = _utils2.default.getHighlightedValue(hit, 'lvl0');
-        var subcategory = _utils2.default.getHighlightedValue(hit, 'lvl1') || category;
-        var displayTitle = _utils2.default.compact([_utils2.default.getHighlightedValue(hit, 'lvl2') || subcategory, _utils2.default.getHighlightedValue(hit, 'lvl3'), _utils2.default.getHighlightedValue(hit, 'lvl4'), _utils2.default.getHighlightedValue(hit, 'lvl5'), _utils2.default.getHighlightedValue(hit, 'lvl6')]).join('<span class="aa-suggestion-title-separator" aria-hidden="true"> › </span>');
-        var text = _utils2.default.getSnippetedValue(hit, 'content');
-        var isTextOrSubcategoryNonEmpty = subcategory && subcategory !== '' || displayTitle && displayTitle !== '';
-        var isLvl1EmptyOrDuplicate = !subcategory || subcategory === '' || subcategory === category;
-        var isLvl2 = displayTitle && displayTitle !== '' && displayTitle !== subcategory;
-        var isLvl1 = !isLvl2 && subcategory && subcategory !== '' && subcategory !== category;
-        var isLvl0 = !isLvl1 && !isLvl2;
-
-        return {
-          isLvl0: isLvl0,
-          isLvl1: isLvl1,
-          isLvl2: isLvl2,
-          isLvl1EmptyOrDuplicate: isLvl1EmptyOrDuplicate,
-          isCategoryHeader: hit.isCategoryHeader,
-          isSubCategoryHeader: hit.isSubCategoryHeader,
-          isTextOrSubcategoryNonEmpty: isTextOrSubcategoryNonEmpty,
-          category: category,
-          subcategory: subcategory,
-          title: displayTitle,
-          text: text,
-          url: url
-        };
-      });
-    }
-  }, {
-    key: 'formatURL',
-    value: function formatURL(hit) {
-      var url = hit.url,
-          anchor = hit.anchor;
-
-      if (url) {
-        var containsAnchor = url.indexOf('#') !== -1;
-        if (containsAnchor) return url;else if (anchor) return hit.url + '#' + hit.anchor;
-        return url;
-      } else if (anchor) return '#' + hit.anchor;
-      /* eslint-disable */
-      console.warn('no anchor nor url for : ', JSON.stringify(hit));
-      /* eslint-enable */
-      return null;
-    }
-  }, {
-    key: 'getEmptyTemplate',
-    value: function getEmptyTemplate() {
-      return function (args) {
-        return _hogan2.default.compile(_templates2.default.empty).render(args);
-      };
-    }
-  }, {
-    key: 'getSuggestionTemplate',
-    value: function getSuggestionTemplate(isSimpleLayout) {
-      var stringTemplate = isSimpleLayout ? _templates2.default.suggestionSimple : _templates2.default.suggestion;
-      var template = _hogan2.default.compile(stringTemplate);
-      return function (suggestion) {
-        return template.render(suggestion);
-      };
-    }
-  }]);
-
-  return DocSearch;
-}();
-
-exports.default = DocSearch;
-
-/***/ }),
-/* 26 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- *  Copyright 2011 Twitter, Inc.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  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.
- */
-
-// This file is for use with Node.js. See dist/ for browser files.
-
-var Hogan = __webpack_require__(27);
-Hogan.Template = __webpack_require__(28).Template;
-Hogan.template = Hogan.Template;
-module.exports = Hogan;
-
-
-/***/ }),
-/* 27 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- *  Copyright 2011 Twitter, Inc.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  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.
- */
-
-(function (Hogan) {
-  // Setup regex  assignments
-  // remove whitespace according to Mustache spec
-  var rIsWhitespace = /\S/,
-      rQuot = /\"/g,
-      rNewline =  /\n/g,
-      rCr = /\r/g,
-      rSlash = /\\/g,
-      rLineSep = /\u2028/,
-      rParagraphSep = /\u2029/;
-
-  Hogan.tags = {
-    '#': 1, '^': 2, '<': 3, '$': 4,
-    '/': 5, '!': 6, '>': 7, '=': 8, '_v': 9,
-    '{': 10, '&': 11, '_t': 12
-  };
-
-  Hogan.scan = function scan(text, delimiters) {
-    var len = text.length,
-        IN_TEXT = 0,
-        IN_TAG_TYPE = 1,
-        IN_TAG = 2,
-        state = IN_TEXT,
-        tagType = null,
-        tag = null,
-        buf = '',
-        tokens = [],
-        seenTag = false,
-        i = 0,
-        lineStart = 0,
-        otag = '{{',
-        ctag = '}}';
-
-    function addBuf() {
-      if (buf.length > 0) {
-        tokens.push({tag: '_t', text: new String(buf)});
-        buf = '';
-      }
-    }
-
-    function lineIsWhitespace() {
-      var isAllWhitespace = true;
-      for (var j = lineStart; j < tokens.length; j++) {
-        isAllWhitespace =
-          (Hogan.tags[tokens[j].tag] < Hogan.tags['_v']) ||
-          (tokens[j].tag == '_t' && tokens[j].text.match(rIsWhitespace) === null);
-        if (!isAllWhitespace) {
-          return false;
-        }
-      }
-
-      return isAllWhitespace;
-    }
-
-    function filterLine(haveSeenTag, noNewLine) {
-      addBuf();
-
-      if (haveSeenTag && lineIsWhitespace()) {
-        for (var j = lineStart, next; j < tokens.length; j++) {
-          if (tokens[j].text) {
-            if ((next = tokens[j+1]) && next.tag == '>') {
-              // set indent to token value
-              next.indent = tokens[j].text.toString()
-            }
-            tokens.splice(j, 1);
-          }
-        }
-      } else if (!noNewLine) {
-        tokens.push({tag:'\n'});
-      }
-
-      seenTag = false;
-      lineStart = tokens.length;
-    }
-
-    function changeDelimiters(text, index) {
-      var close = '=' + ctag,
-          closeIndex = text.indexOf(close, index),
-          delimiters = trim(
-            text.substring(text.indexOf('=', index) + 1, closeIndex)
-          ).split(' ');
-
-      otag = delimiters[0];
-      ctag = delimiters[delimiters.length - 1];
-
-      return closeIndex + close.length - 1;
-    }
-
-    if (delimiters) {
-      delimiters = delimiters.split(' ');
-      otag = delimiters[0];
-      ctag = delimiters[1];
-    }
-
-    for (i = 0; i < len; i++) {
-      if (state == IN_TEXT) {
-        if (tagChange(otag, text, i)) {
-          --i;
-          addBuf();
-          state = IN_TAG_TYPE;
-        } else {
-          if (text.charAt(i) == '\n') {
-            filterLine(seenTag);
-          } else {
-            buf += text.charAt(i);
-          }
-        }
-      } else if (state == IN_TAG_TYPE) {
-        i += otag.length - 1;
-        tag = Hogan.tags[text.charAt(i + 1)];
-        tagType = tag ? text.charAt(i + 1) : '_v';
-        if (tagType == '=') {
-          i = changeDelimiters(text, i);
-          state = IN_TEXT;
-        } else {
-          if (tag) {
-            i++;
-          }
-          state = IN_TAG;
-        }
-        seenTag = i;
-      } else {
-        if (tagChange(ctag, text, i)) {
-          tokens.push({tag: tagType, n: trim(buf), otag: otag, ctag: ctag,
-                       i: (tagType == '/') ? seenTag - otag.length : i + ctag.length});
-          buf = '';
-          i += ctag.length - 1;
-          state = IN_TEXT;
-          if (tagType == '{') {
-            if (ctag == '}}') {
-              i++;
-            } else {
-              cleanTripleStache(tokens[tokens.length - 1]);
-            }
-          }
-        } else {
-          buf += text.charAt(i);
-        }
-      }
-    }
-
-    filterLine(seenTag, true);
-
-    return tokens;
-  }
-
-  function cleanTripleStache(token) {
-    if (token.n.substr(token.n.length - 1) === '}') {
-      token.n = token.n.substring(0, token.n.length - 1);
-    }
-  }
-
-  function trim(s) {
-    if (s.trim) {
-      return s.trim();
-    }
-
-    return s.replace(/^\s*|\s*$/g, '');
-  }
-
-  function tagChange(tag, text, index) {
-    if (text.charAt(index) != tag.charAt(0)) {
-      return false;
-    }
-
-    for (var i = 1, l = tag.length; i < l; i++) {
-      if (text.charAt(index + i) != tag.charAt(i)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  // the tags allowed inside super templates
-  var allowedInSuper = {'_t': true, '\n': true, '$': true, '/': true};
-
-  function buildTree(tokens, kind, stack, customTags) {
-    var instructions = [],
-        opener = null,
-        tail = null,
-        token = null;
-
-    tail = stack[stack.length - 1];
-
-    while (tokens.length > 0) {
-      token = tokens.shift();
-
-      if (tail && tail.tag == '<' && !(token.tag in allowedInSuper)) {
-        throw new Error('Illegal content in < super tag.');
-      }
-
-      if (Hogan.tags[token.tag] <= Hogan.tags['$'] || isOpener(token, customTags)) {
-        stack.push(token);
-        token.nodes = buildTree(tokens, token.tag, stack, customTags);
-      } else if (token.tag == '/') {
-        if (stack.length === 0) {
-          throw new Error('Closing tag without opener: /' + token.n);
-        }
-        opener = stack.pop();
-        if (token.n != opener.n && !isCloser(token.n, opener.n, customTags)) {
-          throw new Error('Nesting error: ' + opener.n + ' vs. ' + token.n);
-        }
-        opener.end = token.i;
-        return instructions;
-      } else if (token.tag == '\n') {
-        token.last = (tokens.length == 0) || (tokens[0].tag == '\n');
-      }
-
-      instructions.push(token);
-    }
-
-    if (stack.length > 0) {
-      throw new Error('missing closing tag: ' + stack.pop().n);
-    }
-
-    return instructions;
-  }
-
-  function isOpener(token, tags) {
-    for (var i = 0, l = tags.length; i < l; i++) {
-      if (tags[i].o == token.n) {
-        token.tag = '#';
-        return true;
-      }
-    }
-  }
-
-  function isCloser(close, open, tags) {
-    for (var i = 0, l = tags.length; i < l; i++) {
-      if (tags[i].c == close && tags[i].o == open) {
-        return true;
-      }
-    }
-  }
-
-  function stringifySubstitutions(obj) {
-    var items = [];
-    for (var key in obj) {
-      items.push('"' + esc(key) + '": function(c,p,t,i) {' + obj[key] + '}');
-    }
-    return "{ " + items.join(",") + " }";
-  }
-
-  function stringifyPartials(codeObj) {
-    var partials = [];
-    for (var key in codeObj.partials) {
-      partials.push('"' + esc(key) + '":{name:"' + esc(codeObj.partials[key].name) + '", ' + stringifyPartials(codeObj.partials[key]) + "}");
-    }
-    return "partials: {" + partials.join(",") + "}, subs: " + stringifySubstitutions(codeObj.subs);
-  }
-
-  Hogan.stringify = function(codeObj, text, options) {
-    return "{code: function (c,p,i) { " + Hogan.wrapMain(codeObj.code) + " }," + stringifyPartials(codeObj) +  "}";
-  }
-
-  var serialNo = 0;
-  Hogan.generate = function(tree, text, options) {
-    serialNo = 0;
-    var context = { code: '', subs: {}, partials: {} };
-    Hogan.walk(tree, context);
-
-    if (options.asString) {
-      return this.stringify(context, text, options);
-    }
-
-    return this.makeTemplate(context, text, options);
-  }
-
-  Hogan.wrapMain = function(code) {
-    return 'var t=this;t.b(i=i||"");' + code + 'return t.fl();';
-  }
-
-  Hogan.template = Hogan.Template;
-
-  Hogan.makeTemplate = function(codeObj, text, options) {
-    var template = this.makePartials(codeObj);
-    template.code = new Function('c', 'p', 'i', this.wrapMain(codeObj.code));
-    return new this.template(template, text, this, options);
-  }
-
-  Hogan.makePartials = function(codeObj) {
-    var key, template = {subs: {}, partials: codeObj.partials, name: codeObj.name};
-    for (key in template.partials) {
-      template.partials[key] = this.makePartials(template.partials[key]);
-    }
-    for (key in codeObj.subs) {
-      template.subs[key] = new Function('c', 'p', 't', 'i', codeObj.subs[key]);
-    }
-    return template;
-  }
-
-  function esc(s) {
-    return s.replace(rSlash, '\\\\')
-            .replace(rQuot, '\\\"')
-            .replace(rNewline, '\\n')
-            .replace(rCr, '\\r')
-            .replace(rLineSep, '\\u2028')
-            .replace(rParagraphSep, '\\u2029');
-  }
-
-  function chooseMethod(s) {
-    return (~s.indexOf('.')) ? 'd' : 'f';
-  }
-
-  function createPartial(node, context) {
-    var prefix = "<" + (context.prefix || "");
-    var sym = prefix + node.n + serialNo++;
-    context.partials[sym] = {name: node.n, partials: {}};
-    context.code += 't.b(t.rp("' +  esc(sym) + '",c,p,"' + (node.indent || '') + '"));';
-    return sym;
-  }
-
-  Hogan.codegen = {
-    '#': function(node, context) {
-      context.code += 'if(t.s(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,1),' +
-                      'c,p,0,' + node.i + ',' + node.end + ',"' + node.otag + " " + node.ctag + '")){' +
-                      't.rs(c,p,' + 'function(c,p,t){';
-      Hogan.walk(node.nodes, context);
-      context.code += '});c.pop();}';
-    },
-
-    '^': function(node, context) {
-      context.code += 'if(!t.s(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,1),c,p,1,0,0,"")){';
-      Hogan.walk(node.nodes, context);
-      context.code += '};';
-    },
-
-    '>': createPartial,
-    '<': function(node, context) {
-      var ctx = {partials: {}, code: '', subs: {}, inPartial: true};
-      Hogan.walk(node.nodes, ctx);
-      var template = context.partials[createPartial(node, context)];
-      template.subs = ctx.subs;
-      template.partials = ctx.partials;
-    },
-
-    '$': function(node, context) {
-      var ctx = {subs: {}, code: '', partials: context.partials, prefix: node.n};
-      Hogan.walk(node.nodes, ctx);
-      context.subs[node.n] = ctx.code;
-      if (!context.inPartial) {
-        context.code += 't.sub("' + esc(node.n) + '",c,p,i);';
-      }
-    },
-
-    '\n': function(node, context) {
-      context.code += write('"\\n"' + (node.last ? '' : ' + i'));
-    },
-
-    '_v': function(node, context) {
-      context.code += 't.b(t.v(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,0)));';
-    },
-
-    '_t': function(node, context) {
-      context.code += write('"' + esc(node.text) + '"');
-    },
-
-    '{': tripleStache,
-
-    '&': tripleStache
-  }
-
-  function tripleStache(node, context) {
-    context.code += 't.b(t.t(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,0)));';
-  }
-
-  function write(s) {
-    return 't.b(' + s + ');';
-  }
-
-  Hogan.walk = function(nodelist, context) {
-    var func;
-    for (var i = 0, l = nodelist.length; i < l; i++) {
-      func = Hogan.codegen[nodelist[i].tag];
-      func && func(nodelist[i], context);
-    }
-    return context;
-  }
-
-  Hogan.parse = function(tokens, text, options) {
-    options = options || {};
-    return buildTree(tokens, '', [], options.sectionTags || []);
-  }
-
-  Hogan.cache = {};
-
-  Hogan.cacheKey = function(text, options) {
-    return [text, !!options.asString, !!options.disableLambda, options.delimiters, !!options.modelGet].join('||');
-  }
-
-  Hogan.compile = function(text, options) {
-    options = options || {};
-    var key = Hogan.cacheKey(text, options);
-    var template = this.cache[key];
-
-    if (template) {
-      var partials = template.partials;
-      for (var name in partials) {
-        delete partials[name].instance;
-      }
-      return template;
-    }
-
-    template = this.generate(this.parse(this.scan(text, options.delimiters), text, options), text, options);
-    return this.cache[key] = template;
-  }
-})( exports );
-
-
-/***/ }),
-/* 28 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- *  Copyright 2011 Twitter, Inc.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  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.
- */
-
-var Hogan = {};
-
-(function (Hogan) {
-  Hogan.Template = function (codeObj, text, compiler, options) {
-    codeObj = codeObj || {};
-    this.r = codeObj.code || this.r;
-    this.c = compiler;
-    this.options = options || {};
-    this.text = text || '';
-    this.partials = codeObj.partials || {};
-    this.subs = codeObj.subs || {};
-    this.buf = '';
-  }
-
-  Hogan.Template.prototype = {
-    // render: replaced by generated code.
-    r: function (context, partials, indent) { return ''; },
-
-    // variable escaping
-    v: hoganEscape,
-
-    // triple stache
-    t: coerceToString,
-
-    render: function render(context, partials, indent) {
-      return this.ri([context], partials || {}, indent);
-    },
-
-    // render internal -- a hook for overrides that catches partials too
-    ri: function (context, partials, indent) {
-      return this.r(context, partials, indent);
-    },
-
-    // ensurePartial
-    ep: function(symbol, partials) {
-      var partial = this.partials[symbol];
-
-      // check to see that if we've instantiated this partial before
-      var template = partials[partial.name];
-      if (partial.instance && partial.base == template) {
-        return partial.instance;
-      }
-
-      if (typeof template == 'string') {
-        if (!this.c) {
-          throw new Error("No compiler available.");
-        }
-        template = this.c.compile(template, this.options);
-      }
-
-      if (!template) {
-        return null;
-      }
-
-      // We use this to check whether the partials dictionary has changed
-      this.partials[symbol].base = template;
-
-      if (partial.subs) {
-        // Make sure we consider parent template now
-        if (!partials.stackText) partials.stackText = {};
-        for (var key in partial.subs) {
-          if (!partials.stackText[key]) {
-            partials.stackText[key] = (this.activeSub !== undefined && partials.stackText[this.activeSub]) ? partials.stackText[this.activeSub] : this.text;
-          }
-        }
-        template = createSpecializedPartial(template, partial.subs, partial.partials,
-          this.stackSubs, this.stackPartials, partials.stackText);
-      }
-      this.partials[symbol].instance = template;
-
-      return template;
-    },
-
-    // tries to find a partial in the current scope and render it
-    rp: function(symbol, context, partials, indent) {
-      var partial = this.ep(symbol, partials);
-      if (!partial) {
-        return '';
-      }
-
-      return partial.ri(context, partials, indent);
-    },
-
-    // render a section
-    rs: function(context, partials, section) {
-      var tail = context[context.length - 1];
-
-      if (!isArray(tail)) {
-        section(context, partials, this);
-        return;
-      }
-
-      for (var i = 0; i < tail.length; i++) {
-        context.push(tail[i]);
-        section(context, partials, this);
-        context.pop();
-      }
-    },
-
-    // maybe start a section
-    s: function(val, ctx, partials, inverted, start, end, tags) {
-      var pass;
-
-      if (isArray(val) && val.length === 0) {
-        return false;
-      }
-
-      if (typeof val == 'function') {
-        val = this.ms(val, ctx, partials, inverted, start, end, tags);
-      }
-
-      pass = !!val;
-
-      if (!inverted && pass && ctx) {
-        ctx.push((typeof val == 'object') ? val : ctx[ctx.length - 1]);
-      }
-
-      return pass;
-    },
-
-    // find values with dotted names
-    d: function(key, ctx, partials, returnFound) {
-      var found,
-          names = key.split('.'),
-          val = this.f(names[0], ctx, partials, returnFound),
-          doModelGet = this.options.modelGet,
-          cx = null;
-
-      if (key === '.' && isArray(ctx[ctx.length - 2])) {
-        val = ctx[ctx.length - 1];
-      } else {
-        for (var i = 1; i < names.length; i++) {
-          found = findInScope(names[i], val, doModelGet);
-          if (found !== undefined) {
-            cx = val;
-            val = found;
-          } else {
-            val = '';
-          }
-        }
-      }
-
-      if (returnFound && !val) {
-        return false;
-      }
-
-      if (!returnFound && typeof val == 'function') {
-        ctx.push(cx);
-        val = this.mv(val, ctx, partials);
-        ctx.pop();
-      }
-
-      return val;
-    },
-
-    // find values with normal names
-    f: function(key, ctx, partials, returnFound) {
-      var val = false,
-          v = null,
-          found = false,
-          doModelGet = this.options.modelGet;
-
-      for (var i = ctx.length - 1; i >= 0; i--) {
-        v = ctx[i];
-        val = findInScope(key, v, doModelGet);
-        if (val !== undefined) {
-          found = true;
-          break;
-        }
-      }
-
-      if (!found) {
-        return (returnFound) ? false : "";
-      }
-
-      if (!returnFound && typeof val == 'function') {
-        val = this.mv(val, ctx, partials);
-      }
-
-      return val;
-    },
-
-    // higher order templates
-    ls: function(func, cx, partials, text, tags) {
-      var oldTags = this.options.delimiters;
-
-      this.options.delimiters = tags;
-      this.b(this.ct(coerceToString(func.call(cx, text)), cx, partials));
-      this.options.delimiters = oldTags;
-
-      return false;
-    },
-
-    // compile text
-    ct: function(text, cx, partials) {
-      if (this.options.disableLambda) {
-        throw new Error('Lambda features disabled.');
-      }
-      return this.c.compile(text, this.options).render(cx, partials);
-    },
-
-    // template result buffering
-    b: function(s) { this.buf += s; },
-
-    fl: function() { var r = this.buf; this.buf = ''; return r; },
-
-    // method replace section
-    ms: function(func, ctx, partials, inverted, start, end, tags) {
-      var textSource,
-          cx = ctx[ctx.length - 1],
-          result = func.call(cx);
-
-      if (typeof result == 'function') {
-        if (inverted) {
-          return true;
-        } else {
-          textSource = (this.activeSub && this.subsText && this.subsText[this.activeSub]) ? this.subsText[this.activeSub] : this.text;
-          return this.ls(result, cx, partials, textSource.substring(start, end), tags);
-        }
-      }
-
-      return result;
-    },
-
-    // method replace variable
-    mv: function(func, ctx, partials) {
-      var cx = ctx[ctx.length - 1];
-      var result = func.call(cx);
-
-      if (typeof result == 'function') {
-        return this.ct(coerceToString(result.call(cx)), cx, partials);
-      }
-
-      return result;
-    },
-
-    sub: function(name, context, partials, indent) {
-      var f = this.subs[name];
-      if (f) {
-        this.activeSub = name;
-        f(context, partials, this, indent);
-        this.activeSub = false;
-      }
-    }
-
-  };
-
-  //Find a key in an object
-  function findInScope(key, scope, doModelGet) {
-    var val;
-
-    if (scope && typeof scope == 'object') {
-
-      if (scope[key] !== undefined) {
-        val = scope[key];
-
-      // try lookup with get for backbone or similar model data
-      } else if (doModelGet && scope.get && typeof scope.get == 'function') {
-        val = scope.get(key);
-      }
-    }
-
-    return val;
-  }
-
-  function createSpecializedPartial(instance, subs, partials, stackSubs, stackPartials, stackText) {
-    function PartialTemplate() {};
-    PartialTemplate.prototype = instance;
-    function Substitutions() {};
-    Substitutions.prototype = instance.subs;
-    var key;
-    var partial = new PartialTemplate();
-    partial.subs = new Substitutions();
-    partial.subsText = {};  //hehe. substext.
-    partial.buf = '';
-
-    stackSubs = stackSubs || {};
-    partial.stackSubs = stackSubs;
-    partial.subsText = stackText;
-    for (key in subs) {
-      if (!stackSubs[key]) stackSubs[key] = subs[key];
-    }
-    for (key in stackSubs) {
-      partial.subs[key] = stackSubs[key];
-    }
-
-    stackPartials = stackPartials || {};
-    partial.stackPartials = stackPartials;
-    for (key in partials) {
-      if (!stackPartials[key]) stackPartials[key] = partials[key];
-    }
-    for (key in stackPartials) {
-      partial.partials[key] = stackPartials[key];
-    }
-
-    return partial;
-  }
-
-  var rAmp = /&/g,
-      rLt = /</g,
-      rGt = />/g,
-      rApos = /\'/g,
-      rQuot = /\"/g,
-      hChars = /[&<>\"\']/;
-
-  function coerceToString(val) {
-    return String((val === null || val === undefined) ? '' : val);
-  }
-
-  function hoganEscape(str) {
-    str = coerceToString(str);
-    return hChars.test(str) ?
-      str
-        .replace(rAmp, '&amp;')
-        .replace(rLt, '&lt;')
-        .replace(rGt, '&gt;')
-        .replace(rApos, '&#39;')
-        .replace(rQuot, '&quot;') :
-      str;
-  }
-
-  var isArray = Array.isArray || function(a) {
-    return Object.prototype.toString.call(a) === '[object Array]';
-  };
-
-})( true ? exports : Hogan);
-
-
-/***/ }),
-/* 29 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var AlgoliaSearchCore = __webpack_require__(30);
-var createAlgoliasearch = __webpack_require__(41);
-
-module.exports = createAlgoliasearch(AlgoliaSearchCore, '(lite) ');
-
-
-/***/ }),
-/* 30 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = AlgoliaSearchCore;
-
-var errors = __webpack_require__(5);
-var exitPromise = __webpack_require__(31);
-var IndexCore = __webpack_require__(32);
-var store = __webpack_require__(38);
-
-// We will always put the API KEY in the JSON body in case of too long API KEY,
-// to avoid query string being too long and failing in various conditions (our server limit, browser limit,
-// proxies limit)
-var MAX_API_KEY_LENGTH = 500;
-var RESET_APP_DATA_TIMER =
-  Object({"NODE_ENV":"production"}).RESET_APP_DATA_TIMER && parseInt(Object({"NODE_ENV":"production"}).RESET_APP_DATA_TIMER, 10) ||
-  60 * 2 * 1000; // after 2 minutes reset to first host
-
-/*
- * Algolia Search library initialization
- * https://www.algolia.com/
- *
- * @param {string} applicationID - Your applicationID, found in your dashboard
- * @param {string} apiKey - Your API key, found in your dashboard
- * @param {Object} [opts]
- * @param {number} [opts.timeout=2000] - The request timeout set in milliseconds,
- * another request will be issued after this timeout
- * @param {string} [opts.protocol='https:'] - The protocol used to query Algolia Search API.
- *                                        Set to 'http:' to force using http.
- * @param {Object|Array} [opts.hosts={
- *           read: [this.applicationID + '-dsn.algolia.net'].concat([
- *             this.applicationID + '-1.algolianet.com',
- *             this.applicationID + '-2.algolianet.com',
- *             this.applicationID + '-3.algolianet.com']
- *           ]),
- *           write: [this.applicationID + '.algolia.net'].concat([
- *             this.applicationID + '-1.algolianet.com',
- *             this.applicationID + '-2.algolianet.com',
- *             this.applicationID + '-3.algolianet.com']
- *           ]) - The hosts to use for Algolia Search API.
- *           If you provide them, you will less benefit from our HA implementation
- */
-function AlgoliaSearchCore(applicationID, apiKey, opts) {
-  var debug = __webpack_require__(8)('algoliasearch');
-
-  var clone = __webpack_require__(3);
-  var isArray = __webpack_require__(6);
-  var map = __webpack_require__(7);
-
-  var usage = 'Usage: algoliasearch(applicationID, apiKey, opts)';
-
-  if (opts._allowEmptyCredentials !== true && !applicationID) {
-    throw new errors.AlgoliaSearchError('Please provide an application ID. ' + usage);
-  }
-
-  if (opts._allowEmptyCredentials !== true && !apiKey) {
-    throw new errors.AlgoliaSearchError('Please provide an API key. ' + usage);
-  }
-
-  this.applicationID = applicationID;
-  this.apiKey = apiKey;
-
-  this.hosts = {
-    read: [],
-    write: []
-  };
-
-  opts = opts || {};
-
-  this._timeouts = opts.timeouts || {
-    connect: 1 * 1000, // 500ms connect is GPRS latency
-    read: 2 * 1000,
-    write: 30 * 1000
-  };
-
-  // backward compat, if opts.timeout is passed, we use it to configure all timeouts like before
-  if (opts.timeout) {
-    this._timeouts.connect = this._timeouts.read = this._timeouts.write = opts.timeout;
-  }
-
-  var protocol = opts.protocol || 'https:';
-  // while we advocate for colon-at-the-end values: 'http:' for `opts.protocol`
-  // we also accept `http` and `https`. It's a common error.
-  if (!/:$/.test(protocol)) {
-    protocol = protocol + ':';
-  }
-
-  if (protocol !== 'http:' && protocol !== 'https:') {
-    throw new errors.AlgoliaSearchError('protocol must be `http:` or `https:` (was `' + opts.protocol + '`)');
-  }
-
-  this._checkAppIdData();
-
-  if (!opts.hosts) {
-    var defaultHosts = map(this._shuffleResult, function(hostNumber) {
-      return applicationID + '-' + hostNumber + '.algolianet.com';
-    });
-
-    // no hosts given, compute defaults
-    var mainSuffix = (opts.dsn === false ? '' : '-dsn') + '.algolia.net';
-    this.hosts.read = [this.applicationID + mainSuffix].concat(defaultHosts);
-    this.hosts.write = [this.applicationID + '.algolia.net'].concat(defaultHosts);
-  } else if (isArray(opts.hosts)) {
-    // when passing custom hosts, we need to have a different host index if the number
-    // of write/read hosts are different.
-    this.hosts.read = clone(opts.hosts);
-    this.hosts.write = clone(opts.hosts);
-  } else {
-    this.hosts.read = clone(opts.hosts.read);
-    this.hosts.write = clone(opts.hosts.write);
-  }
-
-  // add protocol and lowercase hosts
-  this.hosts.read = map(this.hosts.read, prepareHost(protocol));
-  this.hosts.write = map(this.hosts.write, prepareHost(protocol));
-
-  this.extraHeaders = {};
-
-  // In some situations you might want to warm the cache
-  this.cache = opts._cache || {};
-
-  this._ua = opts._ua;
-  this._useCache = opts._useCache === undefined || opts._cache ? true : opts._useCache;
-  this._useRequestCache = this._useCache && opts._useRequestCache;
-  this._useFallback = opts.useFallback === undefined ? true : opts.useFallback;
-
-  this._setTimeout = opts._setTimeout;
-
-  debug('init done, %j', this);
-}
-
-/*
- * Get the index object initialized
- *
- * @param indexName the name of index
- * @param callback the result callback with one argument (the Index instance)
- */
-AlgoliaSearchCore.prototype.initIndex = function(indexName) {
-  return new IndexCore(this, indexName);
-};
-
-/**
-* Add an extra field to the HTTP request
-*
-* @param name the header field name
-* @param value the header field value
-*/
-AlgoliaSearchCore.prototype.setExtraHeader = function(name, value) {
-  this.extraHeaders[name.toLowerCase()] = value;
-};
-
-/**
-* Get the value of an extra HTTP header
-*
-* @param name the header field name
-*/
-AlgoliaSearchCore.prototype.getExtraHeader = function(name) {
-  return this.extraHeaders[name.toLowerCase()];
-};
-
-/**
-* Remove an extra field from the HTTP request
-*
-* @param name the header field name
-*/
-AlgoliaSearchCore.prototype.unsetExtraHeader = function(name) {
-  delete this.extraHeaders[name.toLowerCase()];
-};
-
-/**
-* Augment sent x-algolia-agent with more data, each agent part
-* is automatically separated from the others by a semicolon;
-*
-* @param algoliaAgent the agent to add
-*/
-AlgoliaSearchCore.prototype.addAlgoliaAgent = function(algoliaAgent) {
-  if (this._ua.indexOf(';' + algoliaAgent) === -1) {
-    this._ua += ';' + algoliaAgent;
-  }
-};
-
-/*
- * Wrapper that try all hosts to maximize the quality of service
- */
-AlgoliaSearchCore.prototype._jsonRequest = function(initialOpts) {
-  this._checkAppIdData();
-
-  var requestDebug = __webpack_require__(8)('algoliasearch:' + initialOpts.url);
-
-
-  var body;
-  var cacheID;
-  var additionalUA = initialOpts.additionalUA || '';
-  var cache = initialOpts.cache;
-  var client = this;
-  var tries = 0;
-  var usingFallback = false;
-  var hasFallback = client._useFallback && client._request.fallback && initialOpts.fallback;
-  var headers;
-
-  if (
-    this.apiKey.length > MAX_API_KEY_LENGTH &&
-    initialOpts.body !== undefined &&
-    (initialOpts.body.params !== undefined || // index.search()
-    initialOpts.body.requests !== undefined) // client.search()
-  ) {
-    initialOpts.body.apiKey = this.apiKey;
-    headers = this._computeRequestHeaders({
-      additionalUA: additionalUA,
-      withApiKey: false,
-      headers: initialOpts.headers
-    });
-  } else {
-    headers = this._computeRequestHeaders({
-      additionalUA: additionalUA,
-      headers: initialOpts.headers
-    });
-  }
-
-  if (initialOpts.body !== undefined) {
-    body = safeJSONStringify(initialOpts.body);
-  }
-
-  requestDebug('request start');
-  var debugData = [];
-
-
-  function doRequest(requester, reqOpts) {
-    client._checkAppIdData();
-
-    var startTime = new Date();
-
-    if (client._useCache && !client._useRequestCache) {
-      cacheID = initialOpts.url;
-    }
-
-    // as we sometime use POST requests to pass parameters (like query='aa'),
-    // the cacheID must also include the body to be different between calls
-    if (client._useCache && !client._useRequestCache && body) {
-      cacheID += '_body_' + reqOpts.body;
-    }
-
-    // handle cache existence
-    if (isCacheValidWithCurrentID(!client._useRequestCache, cache, cacheID)) {
-      requestDebug('serving response from cache');
-
-      var responseText = cache[cacheID];
-
-      // Cache response must match the type of the original one
-      return client._promise.resolve({
-        body: JSON.parse(responseText),
-        responseText: responseText
-      });
-    }
-
-    // if we reached max tries
-    if (tries >= client.hosts[initialOpts.hostType].length) {
-      if (!hasFallback || usingFallback) {
-        requestDebug('could not get any response');
-        // then stop
-        return client._promise.reject(new errors.AlgoliaSearchError(
-          'Cannot connect to the AlgoliaSearch API.' +
-          ' Send an email to support@algolia.com to report and resolve the issue.' +
-          ' Application id was: ' + client.applicationID, {debugData: debugData}
-        ));
-      }
-
-      requestDebug('switching to fallback');
-
-      // let's try the fallback starting from here
-      tries = 0;
-
-      // method, url and body are fallback dependent
-      reqOpts.method = initialOpts.fallback.method;
-      reqOpts.url = initialOpts.fallback.url;
-      reqOpts.jsonBody = initialOpts.fallback.body;
-      if (reqOpts.jsonBody) {
-        reqOpts.body = safeJSONStringify(reqOpts.jsonBody);
-      }
-      // re-compute headers, they could be omitting the API KEY
-      headers = client._computeRequestHeaders({
-        additionalUA: additionalUA,
-        headers: initialOpts.headers
-      });
-
-      reqOpts.timeouts = client._getTimeoutsForRequest(initialOpts.hostType);
-      client._setHostIndexByType(0, initialOpts.hostType);
-      usingFallback = true; // the current request is now using fallback
-      return doRequest(client._request.fallback, reqOpts);
-    }
-
-    var currentHost = client._getHostByType(initialOpts.hostType);
-
-    var url = currentHost + reqOpts.url;
-    var options = {
-      body: reqOpts.body,
-      jsonBody: reqOpts.jsonBody,
-      method: reqOpts.method,
-      headers: headers,
-      timeouts: reqOpts.timeouts,
-      debug: requestDebug,
-      forceAuthHeaders: reqOpts.forceAuthHeaders
-    };
-
-    requestDebug('method: %s, url: %s, headers: %j, timeouts: %d',
-      options.method, url, options.headers, options.timeouts);
-
-    if (requester === client._request.fallback) {
-      requestDebug('using fallback');
-    }
-
-    // `requester` is any of this._request or this._request.fallback
-    // thus it needs to be called using the client as context
-    return requester.call(client, url, options).then(success, tryFallback);
-
-    function success(httpResponse) {
-      // compute the status of the response,
-      //
-      // When in browser mode, using XDR or JSONP, we have no statusCode available
-      // So we rely on our API response `status` property.
-      // But `waitTask` can set a `status` property which is not the statusCode (it's the task status)
-      // So we check if there's a `message` along `status` and it means it's an error
-      //
-      // That's the only case where we have a response.status that's not the http statusCode
-      var status = httpResponse && httpResponse.body && httpResponse.body.message && httpResponse.body.status ||
-
-        // this is important to check the request statusCode AFTER the body eventual
-        // statusCode because some implementations (jQuery XDomainRequest transport) may
-        // send statusCode 200 while we had an error
-        httpResponse.statusCode ||
-
-        // When in browser mode, using XDR or JSONP
-        // we default to success when no error (no response.status && response.message)
-        // If there was a JSON.parse() error then body is null and it fails
-        httpResponse && httpResponse.body && 200;
-
-      requestDebug('received response: statusCode: %s, computed statusCode: %d, headers: %j',
-        httpResponse.statusCode, status, httpResponse.headers);
-
-      var httpResponseOk = Math.floor(status / 100) === 2;
-
-      var endTime = new Date();
-      debugData.push({
-        currentHost: currentHost,
-        headers: removeCredentials(headers),
-        content: body || null,
-        contentLength: body !== undefined ? body.length : null,
-        method: reqOpts.method,
-        timeouts: reqOpts.timeouts,
-        url: reqOpts.url,
-        startTime: startTime,
-        endTime: endTime,
-        duration: endTime - startTime,
-        statusCode: status
-      });
-
-      if (httpResponseOk) {
-        if (client._useCache && !client._useRequestCache && cache) {
-          cache[cacheID] = httpResponse.responseText;
-        }
-
-        return {
-          responseText: httpResponse.responseText,
-          body: httpResponse.body
-        };
-      }
-
-      var shouldRetry = Math.floor(status / 100) !== 4;
-
-      if (shouldRetry) {
-        tries += 1;
-        return retryRequest();
-      }
-
-      requestDebug('unrecoverable error');
-
-      // no success and no retry => fail
-      var unrecoverableError = new errors.AlgoliaSearchError(
-        httpResponse.body && httpResponse.body.message, {debugData: debugData, statusCode: status}
-      );
-
-      return client._promise.reject(unrecoverableError);
-    }
-
-    function tryFallback(err) {
-      // error cases:
-      //  While not in fallback mode:
-      //    - CORS not supported
-      //    - network error
-      //  While in fallback mode:
-      //    - timeout
-      //    - network error
-      //    - badly formatted JSONP (script loaded, did not call our callback)
-      //  In both cases:
-      //    - uncaught exception occurs (TypeError)
-      requestDebug('error: %s, stack: %s', err.message, err.stack);
-
-      var endTime = new Date();
-      debugData.push({
-        currentHost: currentHost,
-        headers: removeCredentials(headers),
-        content: body || null,
-        contentLength: body !== undefined ? body.length : null,
-        method: reqOpts.method,
-        timeouts: reqOpts.timeouts,
-        url: reqOpts.url,
-        startTime: startTime,
-        endTime: endTime,
-        duration: endTime - startTime
-      });
-
-      if (!(err instanceof errors.AlgoliaSearchError)) {
-        err = new errors.Unknown(err && err.message, err);
-      }
-
-      tries += 1;
-
-      // stop the request implementation when:
-      if (
-        // we did not generate this error,
-        // it comes from a throw in some other piece of code
-        err instanceof errors.Unknown ||
-
-        // server sent unparsable JSON
-        err instanceof errors.UnparsableJSON ||
-
-        // max tries and already using fallback or no fallback
-        tries >= client.hosts[initialOpts.hostType].length &&
-        (usingFallback || !hasFallback)) {
-        // stop request implementation for this command
-        err.debugData = debugData;
-        return client._promise.reject(err);
-      }
-
-      // When a timeout occured, retry by raising timeout
-      if (err instanceof errors.RequestTimeout) {
-        return retryRequestWithHigherTimeout();
-      }
-
-      return retryRequest();
-    }
-
-    function retryRequest() {
-      requestDebug('retrying request');
-      client._incrementHostIndex(initialOpts.hostType);
-      return doRequest(requester, reqOpts);
-    }
-
-    function retryRequestWithHigherTimeout() {
-      requestDebug('retrying request with higher timeout');
-      client._incrementHostIndex(initialOpts.hostType);
-      client._incrementTimeoutMultipler();
-      reqOpts.timeouts = client._getTimeoutsForRequest(initialOpts.hostType);
-      return doRequest(requester, reqOpts);
-    }
-  }
-
-  function isCacheValidWithCurrentID(
-    useRequestCache,
-    currentCache,
-    currentCacheID
-  ) {
-    return (
-      client._useCache &&
-      useRequestCache &&
-      currentCache &&
-      currentCache[currentCacheID] !== undefined
-    );
-  }
-
-
-  function interopCallbackReturn(request, callback) {
-    if (isCacheValidWithCurrentID(client._useRequestCache, cache, cacheID)) {
-      request.catch(function() {
-        // Release the cache on error
-        delete cache[cacheID];
-      });
-    }
-
-    if (typeof initialOpts.callback === 'function') {
-      // either we have a callback
-      request.then(function okCb(content) {
-        exitPromise(function() {
-          initialOpts.callback(null, callback(content));
-        }, client._setTimeout || setTimeout);
-      }, function nookCb(err) {
-        exitPromise(function() {
-          initialOpts.callback(err);
-        }, client._setTimeout || setTimeout);
-      });
-    } else {
-      // either we are using promises
-      return request.then(callback);
-    }
-  }
-
-  if (client._useCache && client._useRequestCache) {
-    cacheID = initialOpts.url;
-  }
-
-  // as we sometime use POST requests to pass parameters (like query='aa'),
-  // the cacheID must also include the body to be different between calls
-  if (client._useCache && client._useRequestCache && body) {
-    cacheID += '_body_' + body;
-  }
-
-  if (isCacheValidWithCurrentID(client._useRequestCache, cache, cacheID)) {
-    requestDebug('serving request from cache');
-
-    var maybePromiseForCache = cache[cacheID];
-
-    // In case the cache is warmup with value that is not a promise
-    var promiseForCache = typeof maybePromiseForCache.then !== 'function'
-      ? client._promise.resolve({responseText: maybePromiseForCache})
-      : maybePromiseForCache;
-
-    return interopCallbackReturn(promiseForCache, function(content) {
-      // In case of the cache request, return the original value
-      return JSON.parse(content.responseText);
-    });
-  }
-
-  var request = doRequest(
-    client._request, {
-      url: initialOpts.url,
-      method: initialOpts.method,
-      body: body,
-      jsonBody: initialOpts.body,
-      timeouts: client._getTimeoutsForRequest(initialOpts.hostType),
-      forceAuthHeaders: initialOpts.forceAuthHeaders
-    }
-  );
-
-  if (client._useCache && client._useRequestCache && cache) {
-    cache[cacheID] = request;
-  }
-
-  return interopCallbackReturn(request, function(content) {
-    // In case of the first request, return the JSON value
-    return content.body;
-  });
-};
-
-/*
-* Transform search param object in query string
-* @param {object} args arguments to add to the current query string
-* @param {string} params current query string
-* @return {string} the final query string
-*/
-AlgoliaSearchCore.prototype._getSearchParams = function(args, params) {
-  if (args === undefined || args === null) {
-    return params;
-  }
-  for (var key in args) {
-    if (key !== null && args[key] !== undefined && args.hasOwnProperty(key)) {
-      params += params === '' ? '' : '&';
-      params += key + '=' + encodeURIComponent(Object.prototype.toString.call(args[key]) === '[object Array]' ? safeJSONStringify(args[key]) : args[key]);
-    }
-  }
-  return params;
-};
-
-/**
- * Compute the headers for a request
- *
- * @param [string] options.additionalUA semi-colon separated string with other user agents to add
- * @param [boolean=true] options.withApiKey Send the api key as a header
- * @param [Object] options.headers Extra headers to send
- */
-AlgoliaSearchCore.prototype._computeRequestHeaders = function(options) {
-  var forEach = __webpack_require__(2);
-
-  var ua = options.additionalUA ?
-    this._ua + ';' + options.additionalUA :
-    this._ua;
-
-  var requestHeaders = {
-    'x-algolia-agent': ua,
-    'x-algolia-application-id': this.applicationID
-  };
-
-  // browser will inline headers in the url, node.js will use http headers
-  // but in some situations, the API KEY will be too long (big secured API keys)
-  // so if the request is a POST and the KEY is very long, we will be asked to not put
-  // it into headers but in the JSON body
-  if (options.withApiKey !== false) {
-    requestHeaders['x-algolia-api-key'] = this.apiKey;
-  }
-
-  if (this.userToken) {
-    requestHeaders['x-algolia-usertoken'] = this.userToken;
-  }
-
-  if (this.securityTags) {
-    requestHeaders['x-algolia-tagfilters'] = this.securityTags;
-  }
-
-  forEach(this.extraHeaders, function addToRequestHeaders(value, key) {
-    requestHeaders[key] = value;
-  });
-
-  if (options.headers) {
-    forEach(options.headers, function addToRequestHeaders(value, key) {
-      requestHeaders[key] = value;
-    });
-  }
-
-  return requestHeaders;
-};
-
-/**
- * Search through multiple indices at the same time
- * @param  {Object[]}   queries  An array of queries you want to run.
- * @param {string} queries[].indexName The index name you want to target
- * @param {string} [queries[].query] The query to issue on this index. Can also be passed into `params`
- * @param {Object} queries[].params Any search param like hitsPerPage, ..
- * @param  {Function} callback Callback to be called
- * @return {Promise|undefined} Returns a promise if no callback given
- */
-AlgoliaSearchCore.prototype.search = function(queries, opts, callback) {
-  var isArray = __webpack_require__(6);
-  var map = __webpack_require__(7);
-
-  var usage = 'Usage: client.search(arrayOfQueries[, callback])';
-
-  if (!isArray(queries)) {
-    throw new Error(usage);
-  }
-
-  if (typeof opts === 'function') {
-    callback = opts;
-    opts = {};
-  } else if (opts === undefined) {
-    opts = {};
-  }
-
-  var client = this;
-
-  var postObj = {
-    requests: map(queries, function prepareRequest(query) {
-      var params = '';
-
-      // allow query.query
-      // so we are mimicing the index.search(query, params) method
-      // {indexName:, query:, params:}
-      if (query.query !== undefined) {
-        params += 'query=' + encodeURIComponent(query.query);
-      }
-
-      return {
-        indexName: query.indexName,
-        params: client._getSearchParams(query.params, params)
-      };
-    })
-  };
-
-  var JSONPParams = map(postObj.requests, function prepareJSONPParams(request, requestId) {
-    return requestId + '=' +
-      encodeURIComponent(
-        '/1/indexes/' + encodeURIComponent(request.indexName) + '?' +
-        request.params
-      );
-  }).join('&');
-
-  var url = '/1/indexes/*/queries';
-
-  if (opts.strategy !== undefined) {
-    postObj.strategy = opts.strategy;
-  }
-
-  return this._jsonRequest({
-    cache: this.cache,
-    method: 'POST',
-    url: url,
-    body: postObj,
-    hostType: 'read',
-    fallback: {
-      method: 'GET',
-      url: '/1/indexes/*',
-      body: {
-        params: JSONPParams
-      }
-    },
-    callback: callback
-  });
-};
-
-/**
-* Search for facet values
-* https://www.algolia.com/doc/rest-api/search#search-for-facet-values
-* This is the top-level API for SFFV.
-*
-* @param {object[]} queries An array of queries to run.
-* @param {string} queries[].indexName Index name, name of the index to search.
-* @param {object} queries[].params Query parameters.
-* @param {string} queries[].params.facetName Facet name, name of the attribute to search for values in.
-* Must be declared as a facet
-* @param {string} queries[].params.facetQuery Query for the facet search
-* @param {string} [queries[].params.*] Any search parameter of Algolia,
-* see https://www.algolia.com/doc/api-client/javascript/search#search-parameters
-* Pagination is not supported. The page and hitsPerPage parameters will be ignored.
-*/
-AlgoliaSearchCore.prototype.searchForFacetValues = function(queries) {
-  var isArray = __webpack_require__(6);
-  var map = __webpack_require__(7);
-
-  var usage = 'Usage: client.searchForFacetValues([{indexName, params: {facetName, facetQuery, ...params}}, ...queries])'; // eslint-disable-line max-len
-
-  if (!isArray(queries)) {
-    throw new Error(usage);
-  }
-
-  var client = this;
-
-  return client._promise.all(map(queries, function performQuery(query) {
-    if (
-      !query ||
-      query.indexName === undefined ||
-      query.params.facetName === undefined ||
-      query.params.facetQuery === undefined
-    ) {
-      throw new Error(usage);
-    }
-
-    var clone = __webpack_require__(3);
-    var omit = __webpack_require__(14);
-
-    var indexName = query.indexName;
-    var params = query.params;
-
-    var facetName = params.facetName;
-    var filteredParams = omit(clone(params), function(keyName) {
-      return keyName === 'facetName';
-    });
-    var searchParameters = client._getSearchParams(filteredParams, '');
-
-    return client._jsonRequest({
-      cache: client.cache,
-      method: 'POST',
-      url:
-        '/1/indexes/' +
-        encodeURIComponent(indexName) +
-        '/facets/' +
-        encodeURIComponent(facetName) +
-        '/query',
-      hostType: 'read',
-      body: {params: searchParameters}
-    });
-  }));
-};
-
-/**
- * Set the extra security tagFilters header
- * @param {string|array} tags The list of tags defining the current security filters
- */
-AlgoliaSearchCore.prototype.setSecurityTags = function(tags) {
-  if (Object.prototype.toString.call(tags) === '[object Array]') {
-    var strTags = [];
-    for (var i = 0; i < tags.length; ++i) {
-      if (Object.prototype.toString.call(tags[i]) === '[object Array]') {
-        var oredTags = [];
-        for (var j = 0; j < tags[i].length; ++j) {
-          oredTags.push(tags[i][j]);
-        }
-        strTags.push('(' + oredTags.join(',') + ')');
-      } else {
-        strTags.push(tags[i]);
-      }
-    }
-    tags = strTags.join(',');
-  }
-
-  this.securityTags = tags;
-};
-
-/**
- * Set the extra user token header
- * @param {string} userToken The token identifying a uniq user (used to apply rate limits)
- */
-AlgoliaSearchCore.prototype.setUserToken = function(userToken) {
-  this.userToken = userToken;
-};
-
-/**
- * Clear all queries in client's cache
- * @return undefined
- */
-AlgoliaSearchCore.prototype.clearCache = function() {
-  this.cache = {};
-};
-
-/**
-* Set the number of milliseconds a request can take before automatically being terminated.
-* @deprecated
-* @param {Number} milliseconds
-*/
-AlgoliaSearchCore.prototype.setRequestTimeout = function(milliseconds) {
-  if (milliseconds) {
-    this._timeouts.connect = this._timeouts.read = this._timeouts.write = milliseconds;
-  }
-};
-
-/**
-* Set the three different (connect, read, write) timeouts to be used when requesting
-* @param {Object} timeouts
-*/
-AlgoliaSearchCore.prototype.setTimeouts = function(timeouts) {
-  this._timeouts = timeouts;
-};
-
-/**
-* Get the three different (connect, read, write) timeouts to be used when requesting
-* @param {Object} timeouts
-*/
-AlgoliaSearchCore.prototype.getTimeouts = function() {
-  return this._timeouts;
-};
-
-AlgoliaSearchCore.prototype._getAppIdData = function() {
-  var data = store.get(this.applicationID);
-  if (data !== null) this._cacheAppIdData(data);
-  return data;
-};
-
-AlgoliaSearchCore.prototype._setAppIdData = function(data) {
-  data.lastChange = (new Date()).getTime();
-  this._cacheAppIdData(data);
-  return store.set(this.applicationID, data);
-};
-
-AlgoliaSearchCore.prototype._checkAppIdData = function() {
-  var data = this._getAppIdData();
-  var now = (new Date()).getTime();
-  if (data === null || now - data.lastChange > RESET_APP_DATA_TIMER) {
-    return this._resetInitialAppIdData(data);
-  }
-
-  return data;
-};
-
-AlgoliaSearchCore.prototype._resetInitialAppIdData = function(data) {
-  var newData = data || {};
-  newData.hostIndexes = {read: 0, write: 0};
-  newData.timeoutMultiplier = 1;
-  newData.shuffleResult = newData.shuffleResult || shuffle([1, 2, 3]);
-  return this._setAppIdData(newData);
-};
-
-AlgoliaSearchCore.prototype._cacheAppIdData = function(data) {
-  this._hostIndexes = data.hostIndexes;
-  this._timeoutMultiplier = data.timeoutMultiplier;
-  this._shuffleResult = data.shuffleResult;
-};
-
-AlgoliaSearchCore.prototype._partialAppIdDataUpdate = function(newData) {
-  var foreach = __webpack_require__(2);
-  var currentData = this._getAppIdData();
-  foreach(newData, function(value, key) {
-    currentData[key] = value;
-  });
-
-  return this._setAppIdData(currentData);
-};
-
-AlgoliaSearchCore.prototype._getHostByType = function(hostType) {
-  return this.hosts[hostType][this._getHostIndexByType(hostType)];
-};
-
-AlgoliaSearchCore.prototype._getTimeoutMultiplier = function() {
-  return this._timeoutMultiplier;
-};
-
-AlgoliaSearchCore.prototype._getHostIndexByType = function(hostType) {
-  return this._hostIndexes[hostType];
-};
-
-AlgoliaSearchCore.prototype._setHostIndexByType = function(hostIndex, hostType) {
-  var clone = __webpack_require__(3);
-  var newHostIndexes = clone(this._hostIndexes);
-  newHostIndexes[hostType] = hostIndex;
-  this._partialAppIdDataUpdate({hostIndexes: newHostIndexes});
-  return hostIndex;
-};
-
-AlgoliaSearchCore.prototype._incrementHostIndex = function(hostType) {
-  return this._setHostIndexByType(
-    (this._getHostIndexByType(hostType) + 1) % this.hosts[hostType].length, hostType
-  );
-};
-
-AlgoliaSearchCore.prototype._incrementTimeoutMultipler = function() {
-  var timeoutMultiplier = Math.max(this._timeoutMultiplier + 1, 4);
-  return this._partialAppIdDataUpdate({timeoutMultiplier: timeoutMultiplier});
-};
-
-AlgoliaSearchCore.prototype._getTimeoutsForRequest = function(hostType) {
-  return {
-    connect: this._timeouts.connect * this._timeoutMultiplier,
-    complete: this._timeouts[hostType] * this._timeoutMultiplier
-  };
-};
-
-function prepareHost(protocol) {
-  return function prepare(host) {
-    return protocol + '//' + host.toLowerCase();
-  };
-}
-
-// Prototype.js < 1.7, a widely used library, defines a weird
-// Array.prototype.toJSON function that will fail to stringify our content
-// appropriately
-// refs:
-//   - https://groups.google.com/forum/#!topic/prototype-core/E-SAVvV_V9Q
-//   - https://github.com/sstephenson/prototype/commit/038a2985a70593c1a86c230fadbdfe2e4898a48c
-//   - http://stackoverflow.com/a/3148441/147079
-function safeJSONStringify(obj) {
-  /* eslint no-extend-native:0 */
-
-  if (Array.prototype.toJSON === undefined) {
-    return JSON.stringify(obj);
-  }
-
-  var toJSON = Array.prototype.toJSON;
-  delete Array.prototype.toJSON;
-  var out = JSON.stringify(obj);
-  Array.prototype.toJSON = toJSON;
-
-  return out;
-}
-
-function shuffle(array) {
-  var currentIndex = array.length;
-  var temporaryValue;
-  var randomIndex;
-
-  // While there remain elements to shuffle...
-  while (currentIndex !== 0) {
-    // Pick a remaining element...
-    randomIndex = Math.floor(Math.random() * currentIndex);
-    currentIndex -= 1;
-
-    // And swap it with the current element.
-    temporaryValue = array[currentIndex];
-    array[currentIndex] = array[randomIndex];
-    array[randomIndex] = temporaryValue;
-  }
-
-  return array;
-}
-
-function removeCredentials(headers) {
-  var newHeaders = {};
-
-  for (var headerName in headers) {
-    if (Object.prototype.hasOwnProperty.call(headers, headerName)) {
-      var value;
-
-      if (headerName === 'x-algolia-api-key' || headerName === 'x-algolia-application-id') {
-        value = '**hidden for security purposes**';
-      } else {
-        value = headers[headerName];
-      }
-
-      newHeaders[headerName] = value;
-    }
-  }
-
-  return newHeaders;
-}
-
-
-/***/ }),
-/* 31 */
-/***/ (function(module, exports) {
-
-// Parse cloud does not supports setTimeout
-// We do not store a setTimeout reference in the client everytime
-// We only fallback to a fake setTimeout when not available
-// setTimeout cannot be override globally sadly
-module.exports = function exitPromise(fn, _setTimeout) {
-  _setTimeout(fn, 0);
-};
-
-
-/***/ }),
-/* 32 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var buildSearchMethod = __webpack_require__(13);
-var deprecate = __webpack_require__(33);
-var deprecatedMessage = __webpack_require__(34);
-
-module.exports = IndexCore;
-
-/*
-* Index class constructor.
-* You should not use this method directly but use initIndex() function
-*/
-function IndexCore(algoliasearch, indexName) {
-  this.indexName = indexName;
-  this.as = algoliasearch;
-  this.typeAheadArgs = null;
-  this.typeAheadValueOption = null;
-
-  // make sure every index instance has it's own cache
-  this.cache = {};
-}
-
-/*
-* Clear all queries in cache
-*/
-IndexCore.prototype.clearCache = function() {
-  this.cache = {};
-};
-
-/*
-* Search inside the index using XMLHttpRequest request (Using a POST query to
-* minimize number of OPTIONS queries: Cross-Origin Resource Sharing).
-*
-* @param {string} [query] the full text query
-* @param {object} [args] (optional) if set, contains an object with query parameters:
-* - page: (integer) Pagination parameter used to select the page to retrieve.
-*                   Page is zero-based and defaults to 0. Thus,
-*                   to retrieve the 10th page you need to set page=9
-* - hitsPerPage: (integer) Pagination parameter used to select the number of hits per page. Defaults to 20.
-* - attributesToRetrieve: a string that contains the list of object attributes
-* you want to retrieve (let you minimize the answer size).
-*   Attributes are separated with a comma (for example "name,address").
-*   You can also use an array (for example ["name","address"]).
-*   By default, all attributes are retrieved. You can also use '*' to retrieve all
-*   values when an attributesToRetrieve setting is specified for your index.
-* - attributesToHighlight: a string that contains the list of attributes you
-*   want to highlight according to the query.
-*   Attributes are separated by a comma. You can also use an array (for example ["name","address"]).
-*   If an attribute has no match for the query, the raw value is returned.
-*   By default all indexed text attributes are highlighted.
-*   You can use `*` if you want to highlight all textual attributes.
-*   Numerical attributes are not highlighted.
-*   A matchLevel is returned for each highlighted attribute and can contain:
-*      - full: if all the query terms were found in the attribute,
-*      - partial: if only some of the query terms were found,
-*      - none: if none of the query terms were found.
-* - attributesToSnippet: a string that contains the list of attributes to snippet alongside
-* the number of words to return (syntax is `attributeName:nbWords`).
-*    Attributes are separated by a comma (Example: attributesToSnippet=name:10,content:10).
-*    You can also use an array (Example: attributesToSnippet: ['name:10','content:10']).
-*    By default no snippet is computed.
-* - minWordSizefor1Typo: the minimum number of characters in a query word to accept one typo in this word.
-* Defaults to 3.
-* - minWordSizefor2Typos: the minimum number of characters in a query word
-* to accept two typos in this word. Defaults to 7.
-* - getRankingInfo: if set to 1, the result hits will contain ranking
-* information in _rankingInfo attribute.
-* - aroundLatLng: search for entries around a given
-* latitude/longitude (specified as two floats separated by a comma).
-*   For example aroundLatLng=47.316669,5.016670).
-*   You can specify the maximum distance in meters with the aroundRadius parameter (in meters)
-*   and the precision for ranking with aroundPrecision
-*   (for example if you set aroundPrecision=100, two objects that are distant of
-*   less than 100m will be considered as identical for "geo" ranking parameter).
-*   At indexing, you should specify geoloc of an object with the _geoloc attribute
-*   (in the form {"_geoloc":{"lat":48.853409, "lng":2.348800}})
-* - insideBoundingBox: search entries inside a given area defined by the two extreme points
-* of a rectangle (defined by 4 floats: p1Lat,p1Lng,p2Lat,p2Lng).
-*   For example insideBoundingBox=47.3165,4.9665,47.3424,5.0201).
-*   At indexing, you should specify geoloc of an object with the _geoloc attribute
-*   (in the form {"_geoloc":{"lat":48.853409, "lng":2.348800}})
-* - numericFilters: a string that contains the list of numeric filters you want to
-* apply separated by a comma.
-*   The syntax of one filter is `attributeName` followed by `operand` followed by `value`.
-*   Supported operands are `<`, `<=`, `=`, `>` and `>=`.
-*   You can have multiple conditions on one attribute like for example numericFilters=price>100,price<1000.
-*   You can also use an array (for example numericFilters: ["price>100","price<1000"]).
-* - tagFilters: filter the query by a set of tags. You can AND tags by separating them by commas.
-*   To OR tags, you must add parentheses. For example, tags=tag1,(tag2,tag3) means tag1 AND (tag2 OR tag3).
-*   You can also use an array, for example tagFilters: ["tag1",["tag2","tag3"]]
-*   means tag1 AND (tag2 OR tag3).
-*   At indexing, tags should be added in the _tags** attribute
-*   of objects (for example {"_tags":["tag1","tag2"]}).
-* - facetFilters: filter the query by a list of facets.
-*   Facets are separated by commas and each facet is encoded as `attributeName:value`.
-*   For example: `facetFilters=category:Book,author:John%20Doe`.
-*   You can also use an array (for example `["category:Book","author:John%20Doe"]`).
-* - facets: List of object attributes that you want to use for faceting.
-*   Comma separated list: `"category,author"` or array `['category','author']`
-*   Only attributes that have been added in **attributesForFaceting** index setting
-*   can be used in this parameter.
-*   You can also use `*` to perform faceting on all attributes specified in **attributesForFaceting**.
-* - queryType: select how the query words are interpreted, it can be one of the following value:
-*    - prefixAll: all query words are interpreted as prefixes,
-*    - prefixLast: only the last word is interpreted as a prefix (default behavior),
-*    - prefixNone: no query word is interpreted as a prefix. This option is not recommended.
-* - optionalWords: a string that contains the list of words that should
-* be considered as optional when found in the query.
-*   Comma separated and array are accepted.
-* - distinct: If set to 1, enable the distinct feature (disabled by default)
-* if the attributeForDistinct index setting is set.
-*   This feature is similar to the SQL "distinct" keyword: when enabled
-*   in a query with the distinct=1 parameter,
-*   all hits containing a duplicate value for the attributeForDistinct attribute are removed from results.
-*   For example, if the chosen attribute is show_name and several hits have
-*   the same value for show_name, then only the best
-*   one is kept and others are removed.
-* - restrictSearchableAttributes: List of attributes you want to use for
-* textual search (must be a subset of the attributesToIndex index setting)
-* either comma separated or as an array
-* @param {function} [callback] the result callback called with two arguments:
-*  error: null or Error('message'). If false, the content contains the error.
-*  content: the server answer that contains the list of results.
-*/
-IndexCore.prototype.search = buildSearchMethod('query');
-
-/*
-* -- BETA --
-* Search a record similar to the query inside the index using XMLHttpRequest request (Using a POST query to
-* minimize number of OPTIONS queries: Cross-Origin Resource Sharing).
-*
-* @param {string} [query] the similar query
-* @param {object} [args] (optional) if set, contains an object with query parameters.
-*   All search parameters are supported (see search function), restrictSearchableAttributes and facetFilters
-*   are the two most useful to restrict the similar results and get more relevant content
-*/
-IndexCore.prototype.similarSearch = buildSearchMethod('similarQuery');
-
-/*
-* Browse index content. The response content will have a `cursor` property that you can use
-* to browse subsequent pages for this query. Use `index.browseFrom(cursor)` when you want.
-*
-* @param {string} query - The full text query
-* @param {Object} [queryParameters] - Any search query parameter
-* @param {Function} [callback] - The result callback called with two arguments
-*   error: null or Error('message')
-*   content: the server answer with the browse result
-* @return {Promise|undefined} Returns a promise if no callback given
-* @example
-* index.browse('cool songs', {
-*   tagFilters: 'public,comments',
-*   hitsPerPage: 500
-* }, callback);
-* @see {@link https://www.algolia.com/doc/rest_api#Browse|Algolia REST API Documentation}
-*/
-IndexCore.prototype.browse = function(query, queryParameters, callback) {
-  var merge = __webpack_require__(35);
-
-  var indexObj = this;
-
-  var page;
-  var hitsPerPage;
-
-  // we check variadic calls that are not the one defined
-  // .browse()/.browse(fn)
-  // => page = 0
-  if (arguments.length === 0 || arguments.length === 1 && typeof arguments[0] === 'function') {
-    page = 0;
-    callback = arguments[0];
-    query = undefined;
-  } else if (typeof arguments[0] === 'number') {
-    // .browse(2)/.browse(2, 10)/.browse(2, fn)/.browse(2, 10, fn)
-    page = arguments[0];
-    if (typeof arguments[1] === 'number') {
-      hitsPerPage = arguments[1];
-    } else if (typeof arguments[1] === 'function') {
-      callback = arguments[1];
-      hitsPerPage = undefined;
-    }
-    query = undefined;
-    queryParameters = undefined;
-  } else if (typeof arguments[0] === 'object') {
-    // .browse(queryParameters)/.browse(queryParameters, cb)
-    if (typeof arguments[1] === 'function') {
-      callback = arguments[1];
-    }
-    queryParameters = arguments[0];
-    query = undefined;
-  } else if (typeof arguments[0] === 'string' && typeof arguments[1] === 'function') {
-    // .browse(query, cb)
-    callback = arguments[1];
-    queryParameters = undefined;
-  }
-
-  // otherwise it's a .browse(query)/.browse(query, queryParameters)/.browse(query, queryParameters, cb)
-
-  // get search query parameters combining various possible calls
-  // to .browse();
-  queryParameters = merge({}, queryParameters || {}, {
-    page: page,
-    hitsPerPage: hitsPerPage,
-    query: query
-  });
-
-  var params = this.as._getSearchParams(queryParameters, '');
-
-  return this.as._jsonRequest({
-    method: 'POST',
-    url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/browse',
-    body: {params: params},
-    hostType: 'read',
-    callback: callback
-  });
-};
-
-/*
-* Continue browsing from a previous position (cursor), obtained via a call to `.browse()`.
-*
-* @param {string} query - The full text query
-* @param {Object} [queryParameters] - Any search query parameter
-* @param {Function} [callback] - The result callback called with two arguments
-*   error: null or Error('message')
-*   content: the server answer with the browse result
-* @return {Promise|undefined} Returns a promise if no callback given
-* @example
-* index.browseFrom('14lkfsakl32', callback);
-* @see {@link https://www.algolia.com/doc/rest_api#Browse|Algolia REST API Documentation}
-*/
-IndexCore.prototype.browseFrom = function(cursor, callback) {
-  return this.as._jsonRequest({
-    method: 'POST',
-    url: '/1/indexes/' + encodeURIComponent(this.indexName) + '/browse',
-    body: {cursor: cursor},
-    hostType: 'read',
-    callback: callback
-  });
-};
-
-/*
-* Search for facet values
-* https://www.algolia.com/doc/rest-api/search#search-for-facet-values
-*
-* @param {string} params.facetName Facet name, name of the attribute to search for values in.
-* Must be declared as a facet
-* @param {string} params.facetQuery Query for the facet search
-* @param {string} [params.*] Any search parameter of Algolia,
-* see https://www.algolia.com/doc/api-client/javascript/search#search-parameters
-* Pagination is not supported. The page and hitsPerPage parameters will be ignored.
-* @param callback (optional)
-*/
-IndexCore.prototype.searchForFacetValues = function(params, callback) {
-  var clone = __webpack_require__(3);
-  var omit = __webpack_require__(14);
-  var usage = 'Usage: index.searchForFacetValues({facetName, facetQuery, ...params}[, callback])';
-
-  if (params.facetName === undefined || params.facetQuery === undefined) {
-    throw new Error(usage);
-  }
-
-  var facetName = params.facetName;
-  var filteredParams = omit(clone(params), function(keyName) {
-    return keyName === 'facetName';
-  });
-  var searchParameters = this.as._getSearchParams(filteredParams, '');
-
-  return this.as._jsonRequest({
-    method: 'POST',
-    url: '/1/indexes/' +
-      encodeURIComponent(this.indexName) + '/facets/' + encodeURIComponent(facetName) + '/query',
-    hostType: 'read',
-    body: {params: searchParameters},
-    callback: callback
-  });
-};
-
-IndexCore.prototype.searchFacet = deprecate(function(params, callback) {
-  return this.searchForFacetValues(params, callback);
-}, deprecatedMessage(
-  'index.searchFacet(params[, callback])',
-  'index.searchForFacetValues(params[, callback])'
-));
-
-IndexCore.prototype._search = function(params, url, callback, additionalUA) {
-  return this.as._jsonRequest({
-    cache: this.cache,
-    method: 'POST',
-    url: url || '/1/indexes/' + encodeURIComponent(this.indexName) + '/query',
-    body: {params: params},
-    hostType: 'read',
-    fallback: {
-      method: 'GET',
-      url: '/1/indexes/' + encodeURIComponent(this.indexName),
-      body: {params: params}
-    },
-    callback: callback,
-    additionalUA: additionalUA
-  });
-};
-
-/*
-* Get an object from this index
-*
-* @param objectID the unique identifier of the object to retrieve
-* @param attrs (optional) if set, contains the array of attribute names to retrieve
-* @param callback (optional) the result callback called with two arguments
-*  error: null or Error('message')
-*  content: the object to retrieve or the error message if a failure occured
-*/
-IndexCore.prototype.getObject = function(objectID, attrs, callback) {
-  var indexObj = this;
-
-  if (arguments.length === 1 || typeof attrs === 'function') {
-    callback = attrs;
-    attrs = undefined;
-  }
-
-  var params = '';
-  if (attrs !== undefined) {
-    params = '?attributes=';
-    for (var i = 0; i < attrs.length; ++i) {
-      if (i !== 0) {
-        params += ',';
-      }
-      params += attrs[i];
-    }
-  }
-
-  return this.as._jsonRequest({
-    method: 'GET',
-    url: '/1/indexes/' + encodeURIComponent(indexObj.indexName) + '/' + encodeURIComponent(objectID) + params,
-    hostType: 'read',
-    callback: callback
-  });
-};
-
-/*
-* Get several objects from this index
-*
-* @param objectIDs the array of unique identifier of objects to retrieve
-*/
-IndexCore.prototype.getObjects = function(objectIDs, attributesToRetrieve, callback) {
-  var isArray = __webpack_require__(6);
-  var map = __webpack_require__(7);
-
-  var usage = 'Usage: index.getObjects(arrayOfObjectIDs[, callback])';
-
-  if (!isArray(objectIDs)) {
-    throw new Error(usage);
-  }
-
-  var indexObj = this;
-
-  if (arguments.length === 1 || typeof attributesToRetrieve === 'function') {
-    callback = attributesToRetrieve;
-    attributesToRetrieve = undefined;
-  }
-
-  var body = {
-    requests: map(objectIDs, function prepareRequest(objectID) {
-      var request = {
-        indexName: indexObj.indexName,
-        objectID: objectID
-      };
-
-      if (attributesToRetrieve) {
-        request.attributesToRetrieve = attributesToRetrieve.join(',');
-      }
-
-      return request;
-    })
-  };
-
-  return this.as._jsonRequest({
-    method: 'POST',
-    url: '/1/indexes/*/objects',
-    hostType: 'read',
-    body: body,
-    callback: callback
-  });
-};
-
-IndexCore.prototype.as = null;
-IndexCore.prototype.indexName = null;
-IndexCore.prototype.typeAheadArgs = null;
-IndexCore.prototype.typeAheadValueOption = null;
-
-
-/***/ }),
-/* 33 */
-/***/ (function(module, exports) {
-
-module.exports = function deprecate(fn, message) {
-  var warned = false;
-
-  function deprecated() {
-    if (!warned) {
-      /* eslint no-console:0 */
-      console.warn(message);
-      warned = true;
-    }
-
-    return fn.apply(this, arguments);
-  }
-
-  return deprecated;
-};
-
-
-/***/ }),
-/* 34 */
-/***/ (function(module, exports) {
-
-module.exports = function deprecatedMessage(previousUsage, newUsage) {
-  var githubAnchorLink = previousUsage.toLowerCase()
-    .replace(/[\.\(\)]/g, '');
-
-  return 'algoliasearch: `' + previousUsage + '` was replaced by `' + newUsage +
-    '`. Please see https://github.com/algolia/algoliasearch-client-javascript/wiki/Deprecated#' + githubAnchorLink;
-};
-
-
-/***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var foreach = __webpack_require__(2);
-
-module.exports = function merge(destination/* , sources */) {
-  var sources = Array.prototype.slice.call(arguments);
-
-  foreach(sources, function(source) {
-    for (var keyName in source) {
-      if (source.hasOwnProperty(keyName)) {
-        if (typeof destination[keyName] === 'object' && typeof source[keyName] === 'object') {
-          destination[keyName] = merge({}, destination[keyName], source[keyName]);
-        } else if (source[keyName] !== undefined) {
-          destination[keyName] = source[keyName];
-        }
-      }
-    }
-  });
-
-  return destination;
-};
-
-
-/***/ }),
-/* 36 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// modified from https://github.com/es-shims/es5-shim
-var has = Object.prototype.hasOwnProperty;
-var toStr = Object.prototype.toString;
-var slice = Array.prototype.slice;
-var isArgs = __webpack_require__(37);
-var isEnumerable = Object.prototype.propertyIsEnumerable;
-var hasDontEnumBug = !isEnumerable.call({ toString: null }, 'toString');
-var hasProtoEnumBug = isEnumerable.call(function () {}, 'prototype');
-var dontEnums = [
-	'toString',
-	'toLocaleString',
-	'valueOf',
-	'hasOwnProperty',
-	'isPrototypeOf',
-	'propertyIsEnumerable',
-	'constructor'
-];
-var equalsConstructorPrototype = function (o) {
-	var ctor = o.constructor;
-	return ctor && ctor.prototype === o;
-};
-var excludedKeys = {
-	$applicationCache: true,
-	$console: true,
-	$external: true,
-	$frame: true,
-	$frameElement: true,
-	$frames: true,
-	$innerHeight: true,
-	$innerWidth: true,
-	$outerHeight: true,
-	$outerWidth: true,
-	$pageXOffset: true,
-	$pageYOffset: true,
-	$parent: true,
-	$scrollLeft: true,
-	$scrollTop: true,
-	$scrollX: true,
-	$scrollY: true,
-	$self: true,
-	$webkitIndexedDB: true,
-	$webkitStorageInfo: true,
-	$window: true
-};
-var hasAutomationEqualityBug = (function () {
-	/* global window */
-	if (typeof window === 'undefined') { return false; }
-	for (var k in window) {
-		try {
-			if (!excludedKeys['$' + k] && has.call(window, k) && window[k] !== null && typeof window[k] === 'object') {
-				try {
-					equalsConstructorPrototype(window[k]);
-				} catch (e) {
-					return true;
-				}
-			}
-		} catch (e) {
-			return true;
-		}
-	}
-	return false;
-}());
-var equalsConstructorPrototypeIfNotBuggy = function (o) {
-	/* global window */
-	if (typeof window === 'undefined' || !hasAutomationEqualityBug) {
-		return equalsConstructorPrototype(o);
-	}
-	try {
-		return equalsConstructorPrototype(o);
-	} catch (e) {
-		return false;
-	}
-};
-
-var keysShim = function keys(object) {
-	var isObject = object !== null && typeof object === 'object';
-	var isFunction = toStr.call(object) === '[object Function]';
-	var isArguments = isArgs(object);
-	var isString = isObject && toStr.call(object) === '[object String]';
-	var theKeys = [];
-
-	if (!isObject && !isFunction && !isArguments) {
-		throw new TypeError('Object.keys called on a non-object');
-	}
-
-	var skipProto = hasProtoEnumBug && isFunction;
-	if (isString && object.length > 0 && !has.call(object, 0)) {
-		for (var i = 0; i < object.length; ++i) {
-			theKeys.push(String(i));
-		}
-	}
-
-	if (isArguments && object.length > 0) {
-		for (var j = 0; j < object.length; ++j) {
-			theKeys.push(String(j));
-		}
-	} else {
-		for (var name in object) {
-			if (!(skipProto && name === 'prototype') && has.call(object, name)) {
-				theKeys.push(String(name));
-			}
-		}
-	}
-
-	if (hasDontEnumBug) {
-		var skipConstructor = equalsConstructorPrototypeIfNotBuggy(object);
-
-		for (var k = 0; k < dontEnums.length; ++k) {
-			if (!(skipConstructor && dontEnums[k] === 'constructor') && has.call(object, dontEnums[k])) {
-				theKeys.push(dontEnums[k]);
-			}
-		}
-	}
-	return theKeys;
-};
-
-keysShim.shim = function shimObjectKeys() {
-	if (Object.keys) {
-		var keysWorksWithArguments = (function () {
-			// Safari 5.0 bug
-			return (Object.keys(arguments) || '').length === 2;
-		}(1, 2));
-		if (!keysWorksWithArguments) {
-			var originalKeys = Object.keys;
-			Object.keys = function keys(object) { // eslint-disable-line func-name-matching
-				if (isArgs(object)) {
-					return originalKeys(slice.call(object));
-				} else {
-					return originalKeys(object);
-				}
-			};
-		}
-	} else {
-		Object.keys = keysShim;
-	}
-	return Object.keys || keysShim;
-};
-
-module.exports = keysShim;
-
-
-/***/ }),
-/* 37 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var toStr = Object.prototype.toString;
-
-module.exports = function isArguments(value) {
-	var str = toStr.call(value);
-	var isArgs = str === '[object Arguments]';
-	if (!isArgs) {
-		isArgs = str !== '[object Array]' &&
-			value !== null &&
-			typeof value === 'object' &&
-			typeof value.length === 'number' &&
-			value.length >= 0 &&
-			toStr.call(value.callee) === '[object Function]';
-	}
-	return isArgs;
-};
-
-
-/***/ }),
-/* 38 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(global) {var debug = __webpack_require__(8)('algoliasearch:src/hostIndexState.js');
-var localStorageNamespace = 'algoliasearch-client-js';
-
-var store;
-var moduleStore = {
-  state: {},
-  set: function(key, data) {
-    this.state[key] = data;
-    return this.state[key];
-  },
-  get: function(key) {
-    return this.state[key] || null;
-  }
-};
-
-var localStorageStore = {
-  set: function(key, data) {
-    moduleStore.set(key, data); // always replicate localStorageStore to moduleStore in case of failure
-
-    try {
-      var namespace = JSON.parse(global.localStorage[localStorageNamespace]);
-      namespace[key] = data;
-      global.localStorage[localStorageNamespace] = JSON.stringify(namespace);
-      return namespace[key];
-    } catch (e) {
-      return localStorageFailure(key, e);
-    }
-  },
-  get: function(key) {
-    try {
-      return JSON.parse(global.localStorage[localStorageNamespace])[key] || null;
-    } catch (e) {
-      return localStorageFailure(key, e);
-    }
-  }
-};
-
-function localStorageFailure(key, e) {
-  debug('localStorage failed with', e);
-  cleanup();
-  store = moduleStore;
-  return store.get(key);
-}
-
-store = supportsLocalStorage() ? localStorageStore : moduleStore;
-
-module.exports = {
-  get: getOrSet,
-  set: getOrSet,
-  supportsLocalStorage: supportsLocalStorage
-};
-
-function getOrSet(key, data) {
-  if (arguments.length === 1) {
-    return store.get(key);
-  }
-
-  return store.set(key, data);
-}
-
-function supportsLocalStorage() {
-  try {
-    if ('localStorage' in global &&
-      global.localStorage !== null) {
-      if (!global.localStorage[localStorageNamespace]) {
-        // actual creation of the namespace
-        global.localStorage.setItem(localStorageNamespace, JSON.stringify({}));
-      }
-      return true;
-    }
-
-    return false;
-  } catch (_) {
-    return false;
-  }
-}
-
-// In case of any error on localStorage, we clean our own namespace, this should handle
-// quota errors when a lot of keys + data are used
-function cleanup() {
-  try {
-    global.localStorage.removeItem(localStorageNamespace);
-  } catch (_) {
-    // nothing to do
-  }
-}
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(4)))
-
-/***/ }),
-/* 39 */
-/***/ (function(module, exports, __webpack_require__) {
-
-
-/**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
-exports.coerce = coerce;
-exports.disable = disable;
-exports.enable = enable;
-exports.enabled = enabled;
-exports.humanize = __webpack_require__(40);
-
-/**
- * The currently active debug mode names, and names to skip.
- */
-
-exports.names = [];
-exports.skips = [];
-
-/**
- * Map of special "%n" handling functions, for the debug "format" argument.
- *
- * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
- */
-
-exports.formatters = {};
-
-/**
- * Previous log timestamp.
- */
-
-var prevTime;
-
-/**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
- */
-
-function selectColor(namespace) {
-  var hash = 0, i;
-
-  for (i in namespace) {
-    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
-    hash |= 0; // Convert to 32bit integer
-  }
-
-  return exports.colors[Math.abs(hash) % exports.colors.length];
-}
-
-/**
- * Create a debugger with the given `namespace`.
- *
- * @param {String} namespace
- * @return {Function}
- * @api public
- */
-
-function createDebug(namespace) {
-
-  function debug() {
-    // disabled?
-    if (!debug.enabled) return;
-
-    var self = debug;
-
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
-
-    // turn the `arguments` into a proper Array
-    var args = new Array(arguments.length);
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i];
-    }
-
-    args[0] = exports.coerce(args[0]);
-
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %O
-      args.unshift('%O');
-    }
-
-    // apply any `formatters` transformations
-    var index = 0;
-    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
-      // if we encounter an escaped % then don't increase the array index
-      if (match === '%%') return match;
-      index++;
-      var formatter = exports.formatters[format];
-      if ('function' === typeof formatter) {
-        var val = args[index];
-        match = formatter.call(self, val);
-
-        // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
-      }
-      return match;
-    });
-
-    // apply env-specific formatting (colors, etc.)
-    exports.formatArgs.call(self, args);
-
-    var logFn = debug.log || exports.log || console.log.bind(console);
-    logFn.apply(self, args);
-  }
-
-  debug.namespace = namespace;
-  debug.enabled = exports.enabled(namespace);
-  debug.useColors = exports.useColors();
-  debug.color = selectColor(namespace);
-
-  // env-specific initialization logic for debug instances
-  if ('function' === typeof exports.init) {
-    exports.init(debug);
-  }
-
-  return debug;
-}
-
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
-
-function enable(namespaces) {
-  exports.save(namespaces);
-
-  exports.names = [];
-  exports.skips = [];
-
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
-
-  for (var i = 0; i < len; i++) {
-    if (!split[i]) continue; // ignore empty strings
-    namespaces = split[i].replace(/\*/g, '.*?');
-    if (namespaces[0] === '-') {
-      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
-    } else {
-      exports.names.push(new RegExp('^' + namespaces + '$'));
-    }
-  }
-}
-
-/**
- * Disable debug output.
- *
- * @api public
- */
-
-function disable() {
-  exports.enable('');
-}
-
-/**
- * Returns true if the given mode name is enabled, false otherwise.
- *
- * @param {String} name
- * @return {Boolean}
- * @api public
- */
-
-function enabled(name) {
-  var i, len;
-  for (i = 0, len = exports.skips.length; i < len; i++) {
-    if (exports.skips[i].test(name)) {
-      return false;
-    }
-  }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
-
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
-
-
-/***/ }),
-/* 40 */
-/***/ (function(module, exports) {
-
-/**
- * Helpers.
- */
-
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
-
-/**
- * Parse or format the given `val`.
- *
- * Options:
- *
- *  - `long` verbose formatting [false]
- *
- * @param {String|Number} val
- * @param {Object} [options]
- * @throws {Error} throw an error if val is not a non-empty string or a number
- * @return {String|Number}
- * @api public
- */
-
-module.exports = function(val, options) {
-  options = options || {};
-  var type = typeof val;
-  if (type === 'string' && val.length > 0) {
-    return parse(val);
-  } else if (type === 'number' && isNaN(val) === false) {
-    return options.long ? fmtLong(val) : fmtShort(val);
-  }
-  throw new Error(
-    'val is not a non-empty string or a valid number. val=' +
-      JSON.stringify(val)
-  );
-};
-
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
-
-function parse(str) {
-  str = String(str);
-  if (str.length > 100) {
-    return;
-  }
-  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
-    str
-  );
-  if (!match) {
-    return;
-  }
-  var n = parseFloat(match[1]);
-  var type = (match[2] || 'ms').toLowerCase();
-  switch (type) {
-    case 'years':
-    case 'year':
-    case 'yrs':
-    case 'yr':
-    case 'y':
-      return n * y;
-    case 'days':
-    case 'day':
-    case 'd':
-      return n * d;
-    case 'hours':
-    case 'hour':
-    case 'hrs':
-    case 'hr':
-    case 'h':
-      return n * h;
-    case 'minutes':
-    case 'minute':
-    case 'mins':
-    case 'min':
-    case 'm':
-      return n * m;
-    case 'seconds':
-    case 'second':
-    case 'secs':
-    case 'sec':
-    case 's':
-      return n * s;
-    case 'milliseconds':
-    case 'millisecond':
-    case 'msecs':
-    case 'msec':
-    case 'ms':
-      return n;
-    default:
-      return undefined;
-  }
-}
-
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtShort(ms) {
-  if (ms >= d) {
-    return Math.round(ms / d) + 'd';
-  }
-  if (ms >= h) {
-    return Math.round(ms / h) + 'h';
-  }
-  if (ms >= m) {
-    return Math.round(ms / m) + 'm';
-  }
-  if (ms >= s) {
-    return Math.round(ms / s) + 's';
-  }
-  return ms + 'ms';
-}
-
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtLong(ms) {
-  return plural(ms, d, 'day') ||
-    plural(ms, h, 'hour') ||
-    plural(ms, m, 'minute') ||
-    plural(ms, s, 'second') ||
-    ms + ' ms';
-}
-
-/**
- * Pluralization helper.
- */
-
-function plural(ms, n, name) {
-  if (ms < n) {
-    return;
-  }
-  if (ms < n * 1.5) {
-    return Math.floor(ms / n) + ' ' + name;
-  }
-  return Math.ceil(ms / n) + ' ' + name + 's';
-}
-
-
-/***/ }),
-/* 41 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var global = __webpack_require__(42);
-var Promise = global.Promise || __webpack_require__(43).Promise;
-
-// This is the standalone browser build entry point
-// Browser implementation of the Algolia Search JavaScript client,
-// using XMLHttpRequest, XDomainRequest and JSONP as fallback
-module.exports = function createAlgoliasearch(AlgoliaSearch, uaSuffix) {
-  var inherits = __webpack_require__(12);
-  var errors = __webpack_require__(5);
-  var inlineHeaders = __webpack_require__(44);
-  var jsonpRequest = __webpack_require__(46);
-  var places = __webpack_require__(47);
-  uaSuffix = uaSuffix || '';
-
-  if (false) {
-    require('debug').enable('algoliasearch*');
-  }
-
-  function algoliasearch(applicationID, apiKey, opts) {
-    var cloneDeep = __webpack_require__(3);
-
-    opts = cloneDeep(opts || {});
-
-    opts._ua = opts._ua || algoliasearch.ua;
-
-    return new AlgoliaSearchBrowser(applicationID, apiKey, opts);
-  }
-
-  algoliasearch.version = __webpack_require__(48);
-  algoliasearch.ua = 'Algolia for vanilla JavaScript ' + uaSuffix + algoliasearch.version;
-  algoliasearch.initPlaces = places(algoliasearch);
-
-  // we expose into window no matter how we are used, this will allow
-  // us to easily debug any website running algolia
-  global.__algolia = {
-    debug: __webpack_require__(8),
-    algoliasearch: algoliasearch
-  };
-
-  var support = {
-    hasXMLHttpRequest: 'XMLHttpRequest' in global,
-    hasXDomainRequest: 'XDomainRequest' in global
-  };
-
-  if (support.hasXMLHttpRequest) {
-    support.cors = 'withCredentials' in new XMLHttpRequest();
-  }
-
-  function AlgoliaSearchBrowser() {
-    // call AlgoliaSearch constructor
-    AlgoliaSearch.apply(this, arguments);
-  }
-
-  inherits(AlgoliaSearchBrowser, AlgoliaSearch);
-
-  AlgoliaSearchBrowser.prototype._request = function request(url, opts) {
-    return new Promise(function wrapRequest(resolve, reject) {
-      // no cors or XDomainRequest, no request
-      if (!support.cors && !support.hasXDomainRequest) {
-        // very old browser, not supported
-        reject(new errors.Network('CORS not supported'));
-        return;
-      }
-
-      url = inlineHeaders(url, opts.headers);
-
-      var body = opts.body;
-      var req = support.cors ? new XMLHttpRequest() : new XDomainRequest();
-      var reqTimeout;
-      var timedOut;
-      var connected = false;
-
-      reqTimeout = setTimeout(onTimeout, opts.timeouts.connect);
-      // we set an empty onprogress listener
-      // so that XDomainRequest on IE9 is not aborted
-      // refs:
-      //  - https://github.com/algolia/algoliasearch-client-js/issues/76
-      //  - https://social.msdn.microsoft.com/Forums/ie/en-US/30ef3add-767c-4436-b8a9-f1ca19b4812e/ie9-rtm-xdomainrequest-issued-requests-may-abort-if-all-event-handlers-not-specified?forum=iewebdevelopment
-      req.onprogress = onProgress;
-      if ('onreadystatechange' in req) req.onreadystatechange = onReadyStateChange;
-      req.onload = onLoad;
-      req.onerror = onError;
-
-      // do not rely on default XHR async flag, as some analytics code like hotjar
-      // breaks it and set it to false by default
-      if (req instanceof XMLHttpRequest) {
-        req.open(opts.method, url, true);
-
-        // The Analytics API never accepts Auth headers as query string
-        // this option exists specifically for them.
-        if (opts.forceAuthHeaders) {
-          req.setRequestHeader(
-            'x-algolia-application-id',
-            opts.headers['x-algolia-application-id']
-          );
-          req.setRequestHeader(
-            'x-algolia-api-key',
-            opts.headers['x-algolia-api-key']
-          );
-        }
-      } else {
-        req.open(opts.method, url);
-      }
-
-      // headers are meant to be sent after open
-      if (support.cors) {
-        if (body) {
-          if (opts.method === 'POST') {
-            // https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS#Simple_requests
-            req.setRequestHeader('content-type', 'application/x-www-form-urlencoded');
-          } else {
-            req.setRequestHeader('content-type', 'application/json');
-          }
-        }
-        req.setRequestHeader('accept', 'application/json');
-      }
-
-      if (body) {
-        req.send(body);
-      } else {
-        req.send();
-      }
-
-      // event object not received in IE8, at least
-      // but we do not use it, still important to note
-      function onLoad(/* event */) {
-        // When browser does not supports req.timeout, we can
-        // have both a load and timeout event, since handled by a dumb setTimeout
-        if (timedOut) {
-          return;
-        }
-
-        clearTimeout(reqTimeout);
-
-        var out;
-
-        try {
-          out = {
-            body: JSON.parse(req.responseText),
-            responseText: req.responseText,
-            statusCode: req.status,
-            // XDomainRequest does not have any response headers
-            headers: req.getAllResponseHeaders && req.getAllResponseHeaders() || {}
-          };
-        } catch (e) {
-          out = new errors.UnparsableJSON({
-            more: req.responseText
-          });
-        }
-
-        if (out instanceof errors.UnparsableJSON) {
-          reject(out);
-        } else {
-          resolve(out);
-        }
-      }
-
-      function onError(event) {
-        if (timedOut) {
-          return;
-        }
-
-        clearTimeout(reqTimeout);
-
-        // error event is trigerred both with XDR/XHR on:
-        //   - DNS error
-        //   - unallowed cross domain request
-        reject(
-          new errors.Network({
-            more: event
-          })
-        );
-      }
-
-      function onTimeout() {
-        timedOut = true;
-        req.abort();
-
-        reject(new errors.RequestTimeout());
-      }
-
-      function onConnect() {
-        connected = true;
-        clearTimeout(reqTimeout);
-        reqTimeout = setTimeout(onTimeout, opts.timeouts.complete);
-      }
-
-      function onProgress() {
-        if (!connected) onConnect();
-      }
-
-      function onReadyStateChange() {
-        if (!connected && req.readyState > 1) onConnect();
-      }
-    });
-  };
-
-  AlgoliaSearchBrowser.prototype._request.fallback = function requestFallback(url, opts) {
-    url = inlineHeaders(url, opts.headers);
-
-    return new Promise(function wrapJsonpRequest(resolve, reject) {
-      jsonpRequest(url, opts, function jsonpRequestDone(err, content) {
-        if (err) {
-          reject(err);
-          return;
-        }
-
-        resolve(content);
-      });
-    });
-  };
-
-  AlgoliaSearchBrowser.prototype._promise = {
-    reject: function rejectPromise(val) {
-      return Promise.reject(val);
-    },
-    resolve: function resolvePromise(val) {
-      return Promise.resolve(val);
-    },
-    delay: function delayPromise(ms) {
-      return new Promise(function resolveOnTimeout(resolve/* , reject*/) {
-        setTimeout(resolve, ms);
-      });
-    },
-    all: function all(promises) {
-      return Promise.all(promises);
-    }
-  };
-
-  return algoliasearch;
-};
-
-
-/***/ }),
-/* 42 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(global) {var win;
-
-if (typeof window !== "undefined") {
-    win = window;
-} else if (typeof global !== "undefined") {
-    win = global;
-} else if (typeof self !== "undefined"){
-    win = self;
-} else {
-    win = {};
-}
-
-module.exports = win;
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(4)))
-
-/***/ }),
-/* 43 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(process, global) {/*!
- * @overview es6-promise - a tiny implementation of Promises/A+.
- * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
- * @license   Licensed under MIT license
- *            See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
- * @version   v4.2.4+314e4831
- */
-
-(function (global, factory) {
-	 true ? module.exports = factory() :
-	typeof define === 'function' && define.amd ? define(factory) :
-	(global.ES6Promise = factory());
-}(this, (function () { 'use strict';
-
-function objectOrFunction(x) {
-  var type = typeof x;
-  return x !== null && (type === 'object' || type === 'function');
-}
-
-function isFunction(x) {
-  return typeof x === 'function';
-}
-
-
-
-var _isArray = void 0;
-if (Array.isArray) {
-  _isArray = Array.isArray;
-} else {
-  _isArray = function (x) {
-    return Object.prototype.toString.call(x) === '[object Array]';
-  };
-}
-
-var isArray = _isArray;
-
-var len = 0;
-var vertxNext = void 0;
-var customSchedulerFn = void 0;
-
-var asap = function asap(callback, arg) {
-  queue[len] = callback;
-  queue[len + 1] = arg;
-  len += 2;
-  if (len === 2) {
-    // If len is 2, that means that we need to schedule an async flush.
-    // If additional callbacks are queued before the queue is flushed, they
-    // will be processed by this flush that we are scheduling.
-    if (customSchedulerFn) {
-      customSchedulerFn(flush);
-    } else {
-      scheduleFlush();
-    }
-  }
-};
-
-function setScheduler(scheduleFn) {
-  customSchedulerFn = scheduleFn;
-}
-
-function setAsap(asapFn) {
-  asap = asapFn;
-}
-
-var browserWindow = typeof window !== 'undefined' ? window : undefined;
-var browserGlobal = browserWindow || {};
-var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
-var isNode = typeof self === 'undefined' && typeof process !== 'undefined' && {}.toString.call(process) === '[object process]';
-
-// test for web worker but not in IE10
-var isWorker = typeof Uint8ClampedArray !== 'undefined' && typeof importScripts !== 'undefined' && typeof MessageChannel !== 'undefined';
-
-// node
-function useNextTick() {
-  // node version 0.10.x displays a deprecation warning when nextTick is used recursively
-  // see https://github.com/cujojs/when/issues/410 for details
-  return function () {
-    return process.nextTick(flush);
-  };
-}
-
-// vertx
-function useVertxTimer() {
-  if (typeof vertxNext !== 'undefined') {
-    return function () {
-      vertxNext(flush);
-    };
-  }
-
-  return useSetTimeout();
-}
-
-function useMutationObserver() {
-  var iterations = 0;
-  var observer = new BrowserMutationObserver(flush);
-  var node = document.createTextNode('');
-  observer.observe(node, { characterData: true });
-
-  return function () {
-    node.data = iterations = ++iterations % 2;
-  };
-}
-
-// web worker
-function useMessageChannel() {
-  var channel = new MessageChannel();
-  channel.port1.onmessage = flush;
-  return function () {
-    return channel.port2.postMessage(0);
-  };
-}
-
-function useSetTimeout() {
-  // Store setTimeout reference so es6-promise will be unaffected by
-  // other code modifying setTimeout (like sinon.useFakeTimers())
-  var globalSetTimeout = setTimeout;
-  return function () {
-    return globalSetTimeout(flush, 1);
-  };
-}
-
-var queue = new Array(1000);
-function flush() {
-  for (var i = 0; i < len; i += 2) {
-    var callback = queue[i];
-    var arg = queue[i + 1];
-
-    callback(arg);
-
-    queue[i] = undefined;
-    queue[i + 1] = undefined;
-  }
-
-  len = 0;
-}
-
-function attemptVertx() {
-  try {
-    var vertx = Function('return this')().require('vertx');
-    vertxNext = vertx.runOnLoop || vertx.runOnContext;
-    return useVertxTimer();
-  } catch (e) {
-    return useSetTimeout();
-  }
-}
-
-var scheduleFlush = void 0;
-// Decide what async method to use to triggering processing of queued callbacks:
-if (isNode) {
-  scheduleFlush = useNextTick();
-} else if (BrowserMutationObserver) {
-  scheduleFlush = useMutationObserver();
-} else if (isWorker) {
-  scheduleFlush = useMessageChannel();
-} else if (browserWindow === undefined && "function" === 'function') {
-  scheduleFlush = attemptVertx();
-} else {
-  scheduleFlush = useSetTimeout();
-}
-
-function then(onFulfillment, onRejection) {
-  var parent = this;
-
-  var child = new this.constructor(noop);
-
-  if (child[PROMISE_ID] === undefined) {
-    makePromise(child);
-  }
-
-  var _state = parent._state;
-
-
-  if (_state) {
-    var callback = arguments[_state - 1];
-    asap(function () {
-      return invokeCallback(_state, child, callback, parent._result);
-    });
-  } else {
-    subscribe(parent, child, onFulfillment, onRejection);
-  }
-
-  return child;
-}
-
-/**
-  `Promise.resolve` returns a promise that will become resolved with the
-  passed `value`. It is shorthand for the following:
-
-  ```javascript
-  let promise = new Promise(function(resolve, reject){
-    resolve(1);
-  });
-
-  promise.then(function(value){
-    // value === 1
-  });
-  ```
-
-  Instead of writing the above, your code now simply becomes the following:
-
-  ```javascript
-  let promise = Promise.resolve(1);
-
-  promise.then(function(value){
-    // value === 1
-  });
-  ```
-
-  @method resolve
-  @static
-  @param {Any} value value that the returned promise will be resolved with
-  Useful for tooling.
-  @return {Promise} a promise that will become fulfilled with the given
-  `value`
-*/
-function resolve$1(object) {
-  /*jshint validthis:true */
-  var Constructor = this;
-
-  if (object && typeof object === 'object' && object.constructor === Constructor) {
-    return object;
-  }
-
-  var promise = new Constructor(noop);
-  resolve(promise, object);
-  return promise;
-}
-
-var PROMISE_ID = Math.random().toString(36).substring(2);
-
-function noop() {}
-
-var PENDING = void 0;
-var FULFILLED = 1;
-var REJECTED = 2;
-
-var TRY_CATCH_ERROR = { error: null };
-
-function selfFulfillment() {
-  return new TypeError("You cannot resolve a promise with itself");
-}
-
-function cannotReturnOwn() {
-  return new TypeError('A promises callback cannot return that same promise.');
-}
-
-function getThen(promise) {
-  try {
-    return promise.then;
-  } catch (error) {
-    TRY_CATCH_ERROR.error = error;
-    return TRY_CATCH_ERROR;
-  }
-}
-
-function tryThen(then$$1, value, fulfillmentHandler, rejectionHandler) {
-  try {
-    then$$1.call(value, fulfillmentHandler, rejectionHandler);
-  } catch (e) {
-    return e;
-  }
-}
-
-function handleForeignThenable(promise, thenable, then$$1) {
-  asap(function (promise) {
-    var sealed = false;
-    var error = tryThen(then$$1, thenable, function (value) {
-      if (sealed) {
-        return;
-      }
-      sealed = true;
-      if (thenable !== value) {
-        resolve(promise, value);
-      } else {
-        fulfill(promise, value);
-      }
-    }, function (reason) {
-      if (sealed) {
-        return;
-      }
-      sealed = true;
-
-      reject(promise, reason);
-    }, 'Settle: ' + (promise._label || ' unknown promise'));
-
-    if (!sealed && error) {
-      sealed = true;
-      reject(promise, error);
-    }
-  }, promise);
-}
-
-function handleOwnThenable(promise, thenable) {
-  if (thenable._state === FULFILLED) {
-    fulfill(promise, thenable._result);
-  } else if (thenable._state === REJECTED) {
-    reject(promise, thenable._result);
-  } else {
-    subscribe(thenable, undefined, function (value) {
-      return resolve(promise, value);
-    }, function (reason) {
-      return reject(promise, reason);
-    });
-  }
-}
-
-function handleMaybeThenable(promise, maybeThenable, then$$1) {
-  if (maybeThenable.constructor === promise.constructor && then$$1 === then && maybeThenable.constructor.resolve === resolve$1) {
-    handleOwnThenable(promise, maybeThenable);
-  } else {
-    if (then$$1 === TRY_CATCH_ERROR) {
-      reject(promise, TRY_CATCH_ERROR.error);
-      TRY_CATCH_ERROR.error = null;
-    } else if (then$$1 === undefined) {
-      fulfill(promise, maybeThenable);
-    } else if (isFunction(then$$1)) {
-      handleForeignThenable(promise, maybeThenable, then$$1);
-    } else {
-      fulfill(promise, maybeThenable);
-    }
-  }
-}
-
-function resolve(promise, value) {
-  if (promise === value) {
-    reject(promise, selfFulfillment());
-  } else if (objectOrFunction(value)) {
-    handleMaybeThenable(promise, value, getThen(value));
-  } else {
-    fulfill(promise, value);
-  }
-}
-
-function publishRejection(promise) {
-  if (promise._onerror) {
-    promise._onerror(promise._result);
-  }
-
-  publish(promise);
-}
-
-function fulfill(promise, value) {
-  if (promise._state !== PENDING) {
-    return;
-  }
-
-  promise._result = value;
-  promise._state = FULFILLED;
-
-  if (promise._subscribers.length !== 0) {
-    asap(publish, promise);
-  }
-}
-
-function reject(promise, reason) {
-  if (promise._state !== PENDING) {
-    return;
-  }
-  promise._state = REJECTED;
-  promise._result = reason;
-
-  asap(publishRejection, promise);
-}
-
-function subscribe(parent, child, onFulfillment, onRejection) {
-  var _subscribers = parent._subscribers;
-  var length = _subscribers.length;
-
-
-  parent._onerror = null;
-
-  _subscribers[length] = child;
-  _subscribers[length + FULFILLED] = onFulfillment;
-  _subscribers[length + REJECTED] = onRejection;
-
-  if (length === 0 && parent._state) {
-    asap(publish, parent);
-  }
-}
-
-function publish(promise) {
-  var subscribers = promise._subscribers;
-  var settled = promise._state;
-
-  if (subscribers.length === 0) {
-    return;
-  }
-
-  var child = void 0,
-      callback = void 0,
-      detail = promise._result;
-
-  for (var i = 0; i < subscribers.length; i += 3) {
-    child = subscribers[i];
-    callback = subscribers[i + settled];
-
-    if (child) {
-      invokeCallback(settled, child, callback, detail);
-    } else {
-      callback(detail);
-    }
-  }
-
-  promise._subscribers.length = 0;
-}
-
-function tryCatch(callback, detail) {
-  try {
-    return callback(detail);
-  } catch (e) {
-    TRY_CATCH_ERROR.error = e;
-    return TRY_CATCH_ERROR;
-  }
-}
-
-function invokeCallback(settled, promise, callback, detail) {
-  var hasCallback = isFunction(callback),
-      value = void 0,
-      error = void 0,
-      succeeded = void 0,
-      failed = void 0;
-
-  if (hasCallback) {
-    value = tryCatch(callback, detail);
-
-    if (value === TRY_CATCH_ERROR) {
-      failed = true;
-      error = value.error;
-      value.error = null;
-    } else {
-      succeeded = true;
-    }
-
-    if (promise === value) {
-      reject(promise, cannotReturnOwn());
-      return;
-    }
-  } else {
-    value = detail;
-    succeeded = true;
-  }
-
-  if (promise._state !== PENDING) {
-    // noop
-  } else if (hasCallback && succeeded) {
-    resolve(promise, value);
-  } else if (failed) {
-    reject(promise, error);
-  } else if (settled === FULFILLED) {
-    fulfill(promise, value);
-  } else if (settled === REJECTED) {
-    reject(promise, value);
-  }
-}
-
-function initializePromise(promise, resolver) {
-  try {
-    resolver(function resolvePromise(value) {
-      resolve(promise, value);
-    }, function rejectPromise(reason) {
-      reject(promise, reason);
-    });
-  } catch (e) {
-    reject(promise, e);
-  }
-}
-
-var id = 0;
-function nextId() {
-  return id++;
-}
-
-function makePromise(promise) {
-  promise[PROMISE_ID] = id++;
-  promise._state = undefined;
-  promise._result = undefined;
-  promise._subscribers = [];
-}
-
-function validationError() {
-  return new Error('Array Methods must be provided an Array');
-}
-
-var Enumerator = function () {
-  function Enumerator(Constructor, input) {
-    this._instanceConstructor = Constructor;
-    this.promise = new Constructor(noop);
-
-    if (!this.promise[PROMISE_ID]) {
-      makePromise(this.promise);
-    }
-
-    if (isArray(input)) {
-      this.length = input.length;
-      this._remaining = input.length;
-
-      this._result = new Array(this.length);
-
-      if (this.length === 0) {
-        fulfill(this.promise, this._result);
-      } else {
-        this.length = this.length || 0;
-        this._enumerate(input);
-        if (this._remaining === 0) {
-          fulfill(this.promise, this._result);
-        }
-      }
-    } else {
-      reject(this.promise, validationError());
-    }
-  }
-
-  Enumerator.prototype._enumerate = function _enumerate(input) {
-    for (var i = 0; this._state === PENDING && i < input.length; i++) {
-      this._eachEntry(input[i], i);
-    }
-  };
-
-  Enumerator.prototype._eachEntry = function _eachEntry(entry, i) {
-    var c = this._instanceConstructor;
-    var resolve$$1 = c.resolve;
-
-
-    if (resolve$$1 === resolve$1) {
-      var _then = getThen(entry);
-
-      if (_then === then && entry._state !== PENDING) {
-        this._settledAt(entry._state, i, entry._result);
-      } else if (typeof _then !== 'function') {
-        this._remaining--;
-        this._result[i] = entry;
-      } else if (c === Promise$1) {
-        var promise = new c(noop);
-        handleMaybeThenable(promise, entry, _then);
-        this._willSettleAt(promise, i);
-      } else {
-        this._willSettleAt(new c(function (resolve$$1) {
-          return resolve$$1(entry);
-        }), i);
-      }
-    } else {
-      this._willSettleAt(resolve$$1(entry), i);
-    }
-  };
-
-  Enumerator.prototype._settledAt = function _settledAt(state, i, value) {
-    var promise = this.promise;
-
-
-    if (promise._state === PENDING) {
-      this._remaining--;
-
-      if (state === REJECTED) {
-        reject(promise, value);
-      } else {
-        this._result[i] = value;
-      }
-    }
-
-    if (this._remaining === 0) {
-      fulfill(promise, this._result);
-    }
-  };
-
-  Enumerator.prototype._willSettleAt = function _willSettleAt(promise, i) {
-    var enumerator = this;
-
-    subscribe(promise, undefined, function (value) {
-      return enumerator._settledAt(FULFILLED, i, value);
-    }, function (reason) {
-      return enumerator._settledAt(REJECTED, i, reason);
-    });
-  };
-
-  return Enumerator;
-}();
-
-/**
-  `Promise.all` accepts an array of promises, and returns a new promise which
-  is fulfilled with an array of fulfillment values for the passed promises, or
-  rejected with the reason of the first passed promise to be rejected. It casts all
-  elements of the passed iterable to promises as it runs this algorithm.
-
-  Example:
-
-  ```javascript
-  let promise1 = resolve(1);
-  let promise2 = resolve(2);
-  let promise3 = resolve(3);
-  let promises = [ promise1, promise2, promise3 ];
-
-  Promise.all(promises).then(function(array){
-    // The array here would be [ 1, 2, 3 ];
-  });
-  ```
-
-  If any of the `promises` given to `all` are rejected, the first promise
-  that is rejected will be given as an argument to the returned promises's
-  rejection handler. For example:
-
-  Example:
-
-  ```javascript
-  let promise1 = resolve(1);
-  let promise2 = reject(new Error("2"));
-  let promise3 = reject(new Error("3"));
-  let promises = [ promise1, promise2, promise3 ];
-
-  Promise.all(promises).then(function(array){
-    // Code here never runs because there are rejected promises!
-  }, function(error) {
-    // error.message === "2"
-  });
-  ```
-
-  @method all
-  @static
-  @param {Array} entries array of promises
-  @param {String} label optional string for labeling the promise.
-  Useful for tooling.
-  @return {Promise} promise that is fulfilled when all `promises` have been
-  fulfilled, or rejected if any of them become rejected.
-  @static
-*/
-function all(entries) {
-  return new Enumerator(this, entries).promise;
-}
-
-/**
-  `Promise.race` returns a new promise which is settled in the same way as the
-  first passed promise to settle.
-
-  Example:
-
-  ```javascript
-  let promise1 = new Promise(function(resolve, reject){
-    setTimeout(function(){
-      resolve('promise 1');
-    }, 200);
-  });
-
-  let promise2 = new Promise(function(resolve, reject){
-    setTimeout(function(){
-      resolve('promise 2');
-    }, 100);
-  });
-
-  Promise.race([promise1, promise2]).then(function(result){
-    // result === 'promise 2' because it was resolved before promise1
-    // was resolved.
-  });
-  ```
-
-  `Promise.race` is deterministic in that only the state of the first
-  settled promise matters. For example, even if other promises given to the
-  `promises` array argument are resolved, but the first settled promise has
-  become rejected before the other promises became fulfilled, the returned
-  promise will become rejected:
-
-  ```javascript
-  let promise1 = new Promise(function(resolve, reject){
-    setTimeout(function(){
-      resolve('promise 1');
-    }, 200);
-  });
-
-  let promise2 = new Promise(function(resolve, reject){
-    setTimeout(function(){
-      reject(new Error('promise 2'));
-    }, 100);
-  });
-
-  Promise.race([promise1, promise2]).then(function(result){
-    // Code here never runs
-  }, function(reason){
-    // reason.message === 'promise 2' because promise 2 became rejected before
-    // promise 1 became fulfilled
-  });
-  ```
-
-  An example real-world use case is implementing timeouts:
-
-  ```javascript
-  Promise.race([ajax('foo.json'), timeout(5000)])
-  ```
-
-  @method race
-  @static
-  @param {Array} promises array of promises to observe
-  Useful for tooling.
-  @return {Promise} a promise which settles in the same way as the first passed
-  promise to settle.
-*/
-function race(entries) {
-  /*jshint validthis:true */
-  var Constructor = this;
-
-  if (!isArray(entries)) {
-    return new Constructor(function (_, reject) {
-      return reject(new TypeError('You must pass an array to race.'));
-    });
-  } else {
-    return new Constructor(function (resolve, reject) {
-      var length = entries.length;
-      for (var i = 0; i < length; i++) {
-        Constructor.resolve(entries[i]).then(resolve, reject);
-      }
-    });
-  }
-}
-
-/**
-  `Promise.reject` returns a promise rejected with the passed `reason`.
-  It is shorthand for the following:
-
-  ```javascript
-  let promise = new Promise(function(resolve, reject){
-    reject(new Error('WHOOPS'));
-  });
-
-  promise.then(function(value){
-    // Code here doesn't run because the promise is rejected!
-  }, function(reason){
-    // reason.message === 'WHOOPS'
-  });
-  ```
-
-  Instead of writing the above, your code now simply becomes the following:
-
-  ```javascript
-  let promise = Promise.reject(new Error('WHOOPS'));
-
-  promise.then(function(value){
-    // Code here doesn't run because the promise is rejected!
-  }, function(reason){
-    // reason.message === 'WHOOPS'
-  });
-  ```
-
-  @method reject
-  @static
-  @param {Any} reason value that the returned promise will be rejected with.
-  Useful for tooling.
-  @return {Promise} a promise rejected with the given `reason`.
-*/
-function reject$1(reason) {
-  /*jshint validthis:true */
-  var Constructor = this;
-  var promise = new Constructor(noop);
-  reject(promise, reason);
-  return promise;
-}
-
-function needsResolver() {
-  throw new TypeError('You must pass a resolver function as the first argument to the promise constructor');
-}
-
-function needsNew() {
-  throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");
-}
-
-/**
-  Promise objects represent the eventual result of an asynchronous operation. The
-  primary way of interacting with a promise is through its `then` method, which
-  registers callbacks to receive either a promise's eventual value or the reason
-  why the promise cannot be fulfilled.
-
-  Terminology
-  -----------
-
-  - `promise` is an object or function with a `then` method whose behavior conforms to this specification.
-  - `thenable` is an object or function that defines a `then` method.
-  - `value` is any legal JavaScript value (including undefined, a thenable, or a promise).
-  - `exception` is a value that is thrown using the throw statement.
-  - `reason` is a value that indicates why a promise was rejected.
-  - `settled` the final resting state of a promise, fulfilled or rejected.
-
-  A promise can be in one of three states: pending, fulfilled, or rejected.
-
-  Promises that are fulfilled have a fulfillment value and are in the fulfilled
-  state.  Promises that are rejected have a rejection reason and are in the
-  rejected state.  A fulfillment value is never a thenable.
-
-  Promises can also be said to *resolve* a value.  If this value is also a
-  promise, then the original promise's settled state will match the value's
-  settled state.  So a promise that *resolves* a promise that rejects will
-  itself reject, and a promise that *resolves* a promise that fulfills will
-  itself fulfill.
-
-
-  Basic Usage:
-  ------------
-
-  ```js
-  let promise = new Promise(function(resolve, reject) {
-    // on success
-    resolve(value);
-
-    // on failure
-    reject(reason);
-  });
-
-  promise.then(function(value) {
-    // on fulfillment
-  }, function(reason) {
-    // on rejection
-  });
-  ```
-
-  Advanced Usage:
-  ---------------
-
-  Promises shine when abstracting away asynchronous interactions such as
-  `XMLHttpRequest`s.
-
-  ```js
-  function getJSON(url) {
-    return new Promise(function(resolve, reject){
-      let xhr = new XMLHttpRequest();
-
-      xhr.open('GET', url);
-      xhr.onreadystatechange = handler;
-      xhr.responseType = 'json';
-      xhr.setRequestHeader('Accept', 'application/json');
-      xhr.send();
-
-      function handler() {
-        if (this.readyState === this.DONE) {
-          if (this.status === 200) {
-            resolve(this.response);
-          } else {
-            reject(new Error('getJSON: `' + url + '` failed with status: [' + this.status + ']'));
-          }
-        }
-      };
-    });
-  }
-
-  getJSON('/posts.json').then(function(json) {
-    // on fulfillment
-  }, function(reason) {
-    // on rejection
-  });
-  ```
-
-  Unlike callbacks, promises are great composable primitives.
-
-  ```js
-  Promise.all([
-    getJSON('/posts'),
-    getJSON('/comments')
-  ]).then(function(values){
-    values[0] // => postsJSON
-    values[1] // => commentsJSON
-
-    return values;
-  });
-  ```
-
-  @class Promise
-  @param {Function} resolver
-  Useful for tooling.
-  @constructor
-*/
-
-var Promise$1 = function () {
-  function Promise(resolver) {
-    this[PROMISE_ID] = nextId();
-    this._result = this._state = undefined;
-    this._subscribers = [];
-
-    if (noop !== resolver) {
-      typeof resolver !== 'function' && needsResolver();
-      this instanceof Promise ? initializePromise(this, resolver) : needsNew();
-    }
-  }
-
-  /**
-  The primary way of interacting with a promise is through its `then` method,
-  which registers callbacks to receive either a promise's eventual value or the
-  reason why the promise cannot be fulfilled.
-   ```js
-  findUser().then(function(user){
-    // user is available
-  }, function(reason){
-    // user is unavailable, and you are given the reason why
-  });
-  ```
-   Chaining
-  --------
-   The return value of `then` is itself a promise.  This second, 'downstream'
-  promise is resolved with the return value of the first promise's fulfillment
-  or rejection handler, or rejected if the handler throws an exception.
-   ```js
-  findUser().then(function (user) {
-    return user.name;
-  }, function (reason) {
-    return 'default name';
-  }).then(function (userName) {
-    // If `findUser` fulfilled, `userName` will be the user's name, otherwise it
-    // will be `'default name'`
-  });
-   findUser().then(function (user) {
-    throw new Error('Found user, but still unhappy');
-  }, function (reason) {
-    throw new Error('`findUser` rejected and we're unhappy');
-  }).then(function (value) {
-    // never reached
-  }, function (reason) {
-    // if `findUser` fulfilled, `reason` will be 'Found user, but still unhappy'.
-    // If `findUser` rejected, `reason` will be '`findUser` rejected and we're unhappy'.
-  });
-  ```
-  If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream.
-   ```js
-  findUser().then(function (user) {
-    throw new PedagogicalException('Upstream error');
-  }).then(function (value) {
-    // never reached
-  }).then(function (value) {
-    // never reached
-  }, function (reason) {
-    // The `PedgagocialException` is propagated all the way down to here
-  });
-  ```
-   Assimilation
-  ------------
-   Sometimes the value you want to propagate to a downstream promise can only be
-  retrieved asynchronously. This can be achieved by returning a promise in the
-  fulfillment or rejection handler. The downstream promise will then be pending
-  until the returned promise is settled. This is called *assimilation*.
-   ```js
-  findUser().then(function (user) {
-    return findCommentsByAuthor(user);
-  }).then(function (comments) {
-    // The user's comments are now available
-  });
-  ```
-   If the assimliated promise rejects, then the downstream promise will also reject.
-   ```js
-  findUser().then(function (user) {
-    return findCommentsByAuthor(user);
-  }).then(function (comments) {
-    // If `findCommentsByAuthor` fulfills, we'll have the value here
-  }, function (reason) {
-    // If `findCommentsByAuthor` rejects, we'll have the reason here
-  });
-  ```
-   Simple Example
-  --------------
-   Synchronous Example
-   ```javascript
-  let result;
-   try {
-    result = findResult();
-    // success
-  } catch(reason) {
-    // failure
-  }
-  ```
-   Errback Example
-   ```js
-  findResult(function(result, err){
-    if (err) {
-      // failure
-    } else {
-      // success
-    }
-  });
-  ```
-   Promise Example;
-   ```javascript
-  findResult().then(function(result){
-    // success
-  }, function(reason){
-    // failure
-  });
-  ```
-   Advanced Example
-  --------------
-   Synchronous Example
-   ```javascript
-  let author, books;
-   try {
-    author = findAuthor();
-    books  = findBooksByAuthor(author);
-    // success
-  } catch(reason) {
-    // failure
-  }
-  ```
-   Errback Example
-   ```js
-   function foundBooks(books) {
-   }
-   function failure(reason) {
-   }
-   findAuthor(function(author, err){
-    if (err) {
-      failure(err);
-      // failure
-    } else {
-      try {
-        findBoooksByAuthor(author, function(books, err) {
-          if (err) {
-            failure(err);
-          } else {
-            try {
-              foundBooks(books);
-            } catch(reason) {
-              failure(reason);
-            }
-          }
-        });
-      } catch(error) {
-        failure(err);
-      }
-      // success
-    }
-  });
-  ```
-   Promise Example;
-   ```javascript
-  findAuthor().
-    then(findBooksByAuthor).
-    then(function(books){
-      // found books
-  }).catch(function(reason){
-    // something went wrong
-  });
-  ```
-   @method then
-  @param {Function} onFulfilled
-  @param {Function} onRejected
-  Useful for tooling.
-  @return {Promise}
-  */
-
-  /**
-  `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
-  as the catch block of a try/catch statement.
-  ```js
-  function findAuthor(){
-  throw new Error('couldn't find that author');
-  }
-  // synchronous
-  try {
-  findAuthor();
-  } catch(reason) {
-  // something went wrong
-  }
-  // async with promises
-  findAuthor().catch(function(reason){
-  // something went wrong
-  });
-  ```
-  @method catch
-  @param {Function} onRejection
-  Useful for tooling.
-  @return {Promise}
-  */
-
-
-  Promise.prototype.catch = function _catch(onRejection) {
-    return this.then(null, onRejection);
-  };
-
-  /**
-    `finally` will be invoked regardless of the promise's fate just as native
-    try/catch/finally behaves
-  
-    Synchronous example:
-  
-    ```js
-    findAuthor() {
-      if (Math.random() > 0.5) {
-        throw new Error();
-      }
-      return new Author();
-    }
-  
-    try {
-      return findAuthor(); // succeed or fail
-    } catch(error) {
-      return findOtherAuther();
-    } finally {
-      // always runs
-      // doesn't affect the return value
-    }
-    ```
-  
-    Asynchronous example:
-  
-    ```js
-    findAuthor().catch(function(reason){
-      return findOtherAuther();
-    }).finally(function(){
-      // author was either found, or not
-    });
-    ```
-  
-    @method finally
-    @param {Function} callback
-    @return {Promise}
-  */
-
-
-  Promise.prototype.finally = function _finally(callback) {
-    var promise = this;
-    var constructor = promise.constructor;
-
-    return promise.then(function (value) {
-      return constructor.resolve(callback()).then(function () {
-        return value;
-      });
-    }, function (reason) {
-      return constructor.resolve(callback()).then(function () {
-        throw reason;
-      });
-    });
-  };
-
-  return Promise;
-}();
-
-Promise$1.prototype.then = then;
-Promise$1.all = all;
-Promise$1.race = race;
-Promise$1.resolve = resolve$1;
-Promise$1.reject = reject$1;
-Promise$1._setScheduler = setScheduler;
-Promise$1._setAsap = setAsap;
-Promise$1._asap = asap;
-
-/*global self*/
-function polyfill() {
-  var local = void 0;
-
-  if (typeof global !== 'undefined') {
-    local = global;
-  } else if (typeof self !== 'undefined') {
-    local = self;
-  } else {
-    try {
-      local = Function('return this')();
-    } catch (e) {
-      throw new Error('polyfill failed because global object is unavailable in this environment');
-    }
-  }
-
-  var P = local.Promise;
-
-  if (P) {
-    var promiseToString = null;
-    try {
-      promiseToString = Object.prototype.toString.call(P.resolve());
-    } catch (e) {
-      // silently ignored
-    }
-
-    if (promiseToString === '[object Promise]' && !P.cast) {
-      return;
-    }
-  }
-
-  local.Promise = Promise$1;
-}
-
-// Strange compat..
-Promise$1.polyfill = polyfill;
-Promise$1.Promise = Promise$1;
-
-return Promise$1;
-
-})));
-
-
-
-//# sourceMappingURL=es6-promise.map
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(9), __webpack_require__(4)))
-
-/***/ }),
-/* 44 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = inlineHeaders;
-
-var encode = __webpack_require__(45);
-
-function inlineHeaders(url, headers) {
-  if (/\?/.test(url)) {
-    url += '&';
-  } else {
-    url += '?';
-  }
-
-  return url + encode(headers);
-}
-
-
-/***/ }),
-/* 45 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-var stringifyPrimitive = function(v) {
-  switch (typeof v) {
-    case 'string':
-      return v;
-
-    case 'boolean':
-      return v ? 'true' : 'false';
-
-    case 'number':
-      return isFinite(v) ? v : '';
-
-    default:
-      return '';
-  }
-};
-
-module.exports = function(obj, sep, eq, name) {
-  sep = sep || '&';
-  eq = eq || '=';
-  if (obj === null) {
-    obj = undefined;
-  }
-
-  if (typeof obj === 'object') {
-    return map(objectKeys(obj), function(k) {
-      var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
-      if (isArray(obj[k])) {
-        return map(obj[k], function(v) {
-          return ks + encodeURIComponent(stringifyPrimitive(v));
-        }).join(sep);
-      } else {
-        return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
-      }
-    }).join(sep);
-
-  }
-
-  if (!name) return '';
-  return encodeURIComponent(stringifyPrimitive(name)) + eq +
-         encodeURIComponent(stringifyPrimitive(obj));
-};
-
-var isArray = Array.isArray || function (xs) {
-  return Object.prototype.toString.call(xs) === '[object Array]';
-};
-
-function map (xs, f) {
-  if (xs.map) return xs.map(f);
-  var res = [];
-  for (var i = 0; i < xs.length; i++) {
-    res.push(f(xs[i], i));
-  }
-  return res;
-}
-
-var objectKeys = Object.keys || function (obj) {
-  var res = [];
-  for (var key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) res.push(key);
-  }
-  return res;
-};
-
-
-/***/ }),
-/* 46 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = jsonpRequest;
-
-var errors = __webpack_require__(5);
-
-var JSONPCounter = 0;
-
-function jsonpRequest(url, opts, cb) {
-  if (opts.method !== 'GET') {
-    cb(new Error('Method ' + opts.method + ' ' + url + ' is not supported by JSONP.'));
-    return;
-  }
-
-  opts.debug('JSONP: start');
-
-  var cbCalled = false;
-  var timedOut = false;
-
-  JSONPCounter += 1;
-  var head = document.getElementsByTagName('head')[0];
-  var script = document.createElement('script');
-  var cbName = 'algoliaJSONP_' + JSONPCounter;
-  var done = false;
-
-  window[cbName] = function(data) {
-    removeGlobals();
-
-    if (timedOut) {
-      opts.debug('JSONP: Late answer, ignoring');
-      return;
-    }
-
-    cbCalled = true;
-
-    clean();
-
-    cb(null, {
-      body: data,
-      responseText: JSON.stringify(data)/* ,
-      // We do not send the statusCode, there's no statusCode in JSONP, it will be
-      // computed using data.status && data.message like with XDR
-      statusCode*/
-    });
-  };
-
-  // add callback by hand
-  url += '&callback=' + cbName;
-
-  // add body params manually
-  if (opts.jsonBody && opts.jsonBody.params) {
-    url += '&' + opts.jsonBody.params;
-  }
-
-  var ontimeout = setTimeout(timeout, opts.timeouts.complete);
-
-  // script onreadystatechange needed only for
-  // <= IE8
-  // https://github.com/angular/angular.js/issues/4523
-  script.onreadystatechange = readystatechange;
-  script.onload = success;
-  script.onerror = error;
-
-  script.async = true;
-  script.defer = true;
-  script.src = url;
-  head.appendChild(script);
-
-  function success() {
-    opts.debug('JSONP: success');
-
-    if (done || timedOut) {
-      return;
-    }
-
-    done = true;
-
-    // script loaded but did not call the fn => script loading error
-    if (!cbCalled) {
-      opts.debug('JSONP: Fail. Script loaded but did not call the callback');
-      clean();
-      cb(new errors.JSONPScriptFail());
-    }
-  }
-
-  function readystatechange() {
-    if (this.readyState === 'loaded' || this.readyState === 'complete') {
-      success();
-    }
-  }
-
-  function clean() {
-    clearTimeout(ontimeout);
-    script.onload = null;
-    script.onreadystatechange = null;
-    script.onerror = null;
-    head.removeChild(script);
-  }
-
-  function removeGlobals() {
-    try {
-      delete window[cbName];
-      delete window[cbName + '_loaded'];
-    } catch (e) {
-      window[cbName] = window[cbName + '_loaded'] = undefined;
-    }
-  }
-
-  function timeout() {
-    opts.debug('JSONP: Script timeout');
-    timedOut = true;
-    clean();
-    cb(new errors.RequestTimeout());
-  }
-
-  function error() {
-    opts.debug('JSONP: Script error');
-
-    if (done || timedOut) {
-      return;
-    }
-
-    clean();
-    cb(new errors.JSONPScriptError());
-  }
-}
-
-
-/***/ }),
-/* 47 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = createPlacesClient;
-
-var buildSearchMethod = __webpack_require__(13);
-
-function createPlacesClient(algoliasearch) {
-  return function places(appID, apiKey, opts) {
-    var cloneDeep = __webpack_require__(3);
-
-    opts = opts && cloneDeep(opts) || {};
-    opts.hosts = opts.hosts || [
-      'places-dsn.algolia.net',
-      'places-1.algolianet.com',
-      'places-2.algolianet.com',
-      'places-3.algolianet.com'
-    ];
-
-    // allow initPlaces() no arguments => community rate limited
-    if (arguments.length === 0 || typeof appID === 'object' || appID === undefined) {
-      appID = '';
-      apiKey = '';
-      opts._allowEmptyCredentials = true;
-    }
-
-    var client = algoliasearch(appID, apiKey, opts);
-    var index = client.initIndex('places');
-    index.search = buildSearchMethod('query', '/1/places/query');
-    index.getObject = function(objectID, callback) {
-      return this.as._jsonRequest({
-        method: 'GET',
-        url: '/1/places/' + encodeURIComponent(objectID),
-        hostType: 'read',
-        callback: callback
-      });
-    };
-    return index;
-  };
-}
-
-
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = '3.30.0';
-
-
-/***/ }),
-/* 49 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = __webpack_require__(50);
-
-
-/***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// this will inject Zepto in window, unfortunately no easy commonJS zepto build
-var zepto = __webpack_require__(15);
-
-// setup DOM element
-var DOM = __webpack_require__(1);
-DOM.element = zepto;
-
-// setup utils functions
-var _ = __webpack_require__(0);
-_.isArray = zepto.isArray;
-_.isFunction = zepto.isFunction;
-_.isObject = zepto.isPlainObject;
-_.bind = zepto.proxy;
-_.each = function(collection, cb) {
-  // stupid argument order for jQuery.each
-  zepto.each(collection, reverseArgs);
-  function reverseArgs(index, value) {
-    return cb(value, index);
-  }
-};
-_.map = zepto.map;
-_.mixin = zepto.extend;
-_.Event = zepto.Event;
-
-var typeaheadKey = 'aaAutocomplete';
-var Typeahead = __webpack_require__(51);
-var EventBus = __webpack_require__(16);
-
-function autocomplete(selector, options, datasets, typeaheadObject) {
-  datasets = _.isArray(datasets) ? datasets : [].slice.call(arguments, 2);
-
-  var inputs = zepto(selector).each(function(i, input) {
-    var $input = zepto(input);
-    var eventBus = new EventBus({el: $input});
-    var typeahead = typeaheadObject || new Typeahead({
-      input: $input,
-      eventBus: eventBus,
-      dropdownMenuContainer: options.dropdownMenuContainer,
-      hint: options.hint === undefined ? true : !!options.hint,
-      minLength: options.minLength,
-      autoselect: options.autoselect,
-      autoselectOnBlur: options.autoselectOnBlur,
-      tabAutocomplete: options.tabAutocomplete,
-      openOnFocus: options.openOnFocus,
-      templates: options.templates,
-      debug: options.debug,
-      clearOnSelected: options.clearOnSelected,
-      cssClasses: options.cssClasses,
-      datasets: datasets,
-      keyboardShortcuts: options.keyboardShortcuts,
-      appendTo: options.appendTo,
-      autoWidth: options.autoWidth,
-      ariaLabel: options.ariaLabel || input.getAttribute('aria-label')
-    });
-    $input.data(typeaheadKey, typeahead);
-  });
-
-  // expose all methods in the `autocomplete` attribute
-  inputs.autocomplete = {};
-  _.each(['open', 'close', 'getVal', 'setVal', 'destroy', 'getWrapper'], function(method) {
-    inputs.autocomplete[method] = function() {
-      var methodArguments = arguments;
-      var result;
-      inputs.each(function(j, input) {
-        var typeahead = zepto(input).data(typeaheadKey);
-        result = typeahead[method].apply(typeahead, methodArguments);
-      });
-      return result;
-    };
-  });
-
-  return inputs;
-}
-
-autocomplete.sources = Typeahead.sources;
-autocomplete.escapeHighlightedString = _.escapeHighlightedString;
-
-var wasAutocompleteSet = 'autocomplete' in window;
-var oldAutocomplete = window.autocomplete;
-autocomplete.noConflict = function noConflict() {
-  if (wasAutocompleteSet) {
-    window.autocomplete = oldAutocomplete;
-  } else {
-    delete window.autocomplete;
-  }
-  return autocomplete;
-};
-
-module.exports = autocomplete;
-
-
-/***/ }),
-/* 51 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var attrsKey = 'aaAttrs';
-
-var _ = __webpack_require__(0);
-var DOM = __webpack_require__(1);
-var EventBus = __webpack_require__(16);
-var Input = __webpack_require__(52);
-var Dropdown = __webpack_require__(59);
-var html = __webpack_require__(17);
-var css = __webpack_require__(11);
-
-// constructor
-// -----------
-
-// THOUGHT: what if datasets could dynamically be added/removed?
-function Typeahead(o) {
-  var $menu;
-  var $hint;
-
-  o = o || {};
-
-  if (!o.input) {
-    _.error('missing input');
-  }
-
-  this.isActivated = false;
-  this.debug = !!o.debug;
-  this.autoselect = !!o.autoselect;
-  this.autoselectOnBlur = !!o.autoselectOnBlur;
-  this.openOnFocus = !!o.openOnFocus;
-  this.minLength = _.isNumber(o.minLength) ? o.minLength : 1;
-  this.autoWidth = (o.autoWidth === undefined) ? true : !!o.autoWidth;
-  this.clearOnSelected = !!o.clearOnSelected;
-  this.tabAutocomplete = (o.tabAutocomplete === undefined) ? true : !!o.tabAutocomplete;
-
-  o.hint = !!o.hint;
-
-  if (o.hint && o.appendTo) {
-    throw new Error('[autocomplete.js] hint and appendTo options can\'t be used at the same time');
-  }
-
-  this.css = o.css = _.mixin({}, css, o.appendTo ? css.appendTo : {});
-  this.cssClasses = o.cssClasses = _.mixin({}, css.defaultClasses, o.cssClasses || {});
-  this.cssClasses.prefix =
-    o.cssClasses.formattedPrefix = _.formatPrefix(this.cssClasses.prefix, this.cssClasses.noPrefix);
-  this.listboxId = o.listboxId = [this.cssClasses.root, 'listbox', _.getUniqueId()].join('-');
-
-  var domElts = buildDom(o);
-
-  this.$node = domElts.wrapper;
-  var $input = this.$input = domElts.input;
-  $menu = domElts.menu;
-  $hint = domElts.hint;
-
-  if (o.dropdownMenuContainer) {
-    DOM.element(o.dropdownMenuContainer)
-      .css('position', 'relative') // ensure the container has a relative position
-      .append($menu.css('top', '0')); // override the top: 100%
-  }
-
-  // #705: if there's scrollable overflow, ie doesn't support
-  // blur cancellations when the scrollbar is clicked
-  //
-  // #351: preventDefault won't cancel blurs in ie <= 8
-  $input.on('blur.aa', function($e) {
-    var active = document.activeElement;
-    if (_.isMsie() && ($menu[0] === active || $menu[0].contains(active))) {
-      $e.preventDefault();
-      // stop immediate in order to prevent Input#_onBlur from
-      // getting exectued
-      $e.stopImmediatePropagation();
-      _.defer(function() { $input.focus(); });
-    }
-  });
-
-  // #351: prevents input blur due to clicks within dropdown menu
-  $menu.on('mousedown.aa', function($e) { $e.preventDefault(); });
-
-  this.eventBus = o.eventBus || new EventBus({el: $input});
-
-  this.dropdown = new Typeahead.Dropdown({
-    appendTo: o.appendTo,
-    wrapper: this.$node,
-    menu: $menu,
-    datasets: o.datasets,
-    templates: o.templates,
-    cssClasses: o.cssClasses,
-    minLength: this.minLength
-  })
-    .onSync('suggestionClicked', this._onSuggestionClicked, this)
-    .onSync('cursorMoved', this._onCursorMoved, this)
-    .onSync('cursorRemoved', this._onCursorRemoved, this)
-    .onSync('opened', this._onOpened, this)
-    .onSync('closed', this._onClosed, this)
-    .onSync('shown', this._onShown, this)
-    .onSync('empty', this._onEmpty, this)
-    .onSync('redrawn', this._onRedrawn, this)
-    .onAsync('datasetRendered', this._onDatasetRendered, this);
-
-  this.input = new Typeahead.Input({input: $input, hint: $hint})
-    .onSync('focused', this._onFocused, this)
-    .onSync('blurred', this._onBlurred, this)
-    .onSync('enterKeyed', this._onEnterKeyed, this)
-    .onSync('tabKeyed', this._onTabKeyed, this)
-    .onSync('escKeyed', this._onEscKeyed, this)
-    .onSync('upKeyed', this._onUpKeyed, this)
-    .onSync('downKeyed', this._onDownKeyed, this)
-    .onSync('leftKeyed', this._onLeftKeyed, this)
-    .onSync('rightKeyed', this._onRightKeyed, this)
-    .onSync('queryChanged', this._onQueryChanged, this)
-    .onSync('whitespaceChanged', this._onWhitespaceChanged, this);
-
-  this._bindKeyboardShortcuts(o);
-
-  this._setLanguageDirection();
-}
-
-// instance methods
-// ----------------
-
-_.mixin(Typeahead.prototype, {
-  // ### private
-
-  _bindKeyboardShortcuts: function(options) {
-    if (!options.keyboardShortcuts) {
-      return;
-    }
-    var $input = this.$input;
-    var keyboardShortcuts = [];
-    _.each(options.keyboardShortcuts, function(key) {
-      if (typeof key === 'string') {
-        key = key.toUpperCase().charCodeAt(0);
-      }
-      keyboardShortcuts.push(key);
-    });
-    DOM.element(document).keydown(function(event) {
-      var elt = (event.target || event.srcElement);
-      var tagName = elt.tagName;
-      if (elt.isContentEditable || tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA') {
-        // already in an input
-        return;
-      }
-
-      var which = event.which || event.keyCode;
-      if (keyboardShortcuts.indexOf(which) === -1) {
-        // not the right shortcut
-        return;
-      }
-
-      $input.focus();
-      event.stopPropagation();
-      event.preventDefault();
-    });
-  },
-
-  _onSuggestionClicked: function onSuggestionClicked(type, $el) {
-    var datum;
-    var context = {selectionMethod: 'click'};
-
-    if (datum = this.dropdown.getDatumForSuggestion($el)) {
-      this._select(datum, context);
-    }
-  },
-
-  _onCursorMoved: function onCursorMoved(event, updateInput) {
-    var datum = this.dropdown.getDatumForCursor();
-    var currentCursorId = this.dropdown.getCurrentCursor().attr('id');
-    this.input.setActiveDescendant(currentCursorId);
-
-    if (datum) {
-      if (updateInput) {
-        this.input.setInputValue(datum.value, true);
-      }
-
-      this.eventBus.trigger('cursorchanged', datum.raw, datum.datasetName);
-    }
-  },
-
-  _onCursorRemoved: function onCursorRemoved() {
-    this.input.resetInputValue();
-    this._updateHint();
-    this.eventBus.trigger('cursorremoved');
-  },
-
-  _onDatasetRendered: function onDatasetRendered() {
-    this._updateHint();
-
-    this.eventBus.trigger('updated');
-  },
-
-  _onOpened: function onOpened() {
-    this._updateHint();
-    this.input.expand();
-
-    this.eventBus.trigger('opened');
-  },
-
-  _onEmpty: function onEmpty() {
-    this.eventBus.trigger('empty');
-  },
-
-  _onRedrawn: function onRedrawn() {
-    this.$node.css('top', 0 + 'px');
-    this.$node.css('left', 0 + 'px');
-
-    var inputRect = this.$input[0].getBoundingClientRect();
-
-    if (this.autoWidth) {
-      this.$node.css('width', inputRect.width + 'px');
-    }
-
-    var wrapperRect = this.$node[0].getBoundingClientRect();
-
-    var top = inputRect.bottom - wrapperRect.top;
-    this.$node.css('top', top + 'px');
-    var left = inputRect.left - wrapperRect.left;
-    this.$node.css('left', left + 'px');
-
-    this.eventBus.trigger('redrawn');
-  },
-
-  _onShown: function onShown() {
-    this.eventBus.trigger('shown');
-    if (this.autoselect) {
-      this.dropdown.cursorTopSuggestion();
-    }
-  },
-
-  _onClosed: function onClosed() {
-    this.input.clearHint();
-    this.input.removeActiveDescendant();
-    this.input.collapse();
-
-    this.eventBus.trigger('closed');
-  },
-
-  _onFocused: function onFocused() {
-    this.isActivated = true;
-
-    if (this.openOnFocus) {
-      var query = this.input.getQuery();
-      if (query.length >= this.minLength) {
-        this.dropdown.update(query);
-      } else {
-        this.dropdown.empty();
-      }
-
-      this.dropdown.open();
-    }
-  },
-
-  _onBlurred: function onBlurred() {
-    var cursorDatum;
-    var topSuggestionDatum;
-
-    cursorDatum = this.dropdown.getDatumForCursor();
-    topSuggestionDatum = this.dropdown.getDatumForTopSuggestion();
-    var context = {selectionMethod: 'blur'};
-
-    if (!this.debug) {
-      if (this.autoselectOnBlur && cursorDatum) {
-        this._select(cursorDatum, context);
-      } else if (this.autoselectOnBlur && topSuggestionDatum) {
-        this._select(topSuggestionDatum, context);
-      } else {
-        this.isActivated = false;
-        this.dropdown.empty();
-        this.dropdown.close();
-      }
-    }
-  },
-
-  _onEnterKeyed: function onEnterKeyed(type, $e) {
-    var cursorDatum;
-    var topSuggestionDatum;
-
-    cursorDatum = this.dropdown.getDatumForCursor();
-    topSuggestionDatum = this.dropdown.getDatumForTopSuggestion();
-    var context = {selectionMethod: 'enterKey'};
-
-    if (cursorDatum) {
-      this._select(cursorDatum, context);
-      $e.preventDefault();
-    } else if (this.autoselect && topSuggestionDatum) {
-      this._select(topSuggestionDatum, context);
-      $e.preventDefault();
-    }
-  },
-
-  _onTabKeyed: function onTabKeyed(type, $e) {
-    if (!this.tabAutocomplete) {
-      // Closing the dropdown enables further tabbing
-      this.dropdown.close();
-      return;
-    }
-
-    var datum;
-    var context = {selectionMethod: 'tabKey'};
-
-    if (datum = this.dropdown.getDatumForCursor()) {
-      this._select(datum, context);
-      $e.preventDefault();
-    } else {
-      this._autocomplete(true);
-    }
-  },
-
-  _onEscKeyed: function onEscKeyed() {
-    this.dropdown.close();
-    this.input.resetInputValue();
-  },
-
-  _onUpKeyed: function onUpKeyed() {
-    var query = this.input.getQuery();
-
-    if (this.dropdown.isEmpty && query.length >= this.minLength) {
-      this.dropdown.update(query);
-    } else {
-      this.dropdown.moveCursorUp();
-    }
-
-    this.dropdown.open();
-  },
-
-  _onDownKeyed: function onDownKeyed() {
-    var query = this.input.getQuery();
-
-    if (this.dropdown.isEmpty && query.length >= this.minLength) {
-      this.dropdown.update(query);
-    } else {
-      this.dropdown.moveCursorDown();
-    }
-
-    this.dropdown.open();
-  },
-
-  _onLeftKeyed: function onLeftKeyed() {
-    if (this.dir === 'rtl') {
-      this._autocomplete();
-    }
-  },
-
-  _onRightKeyed: function onRightKeyed() {
-    if (this.dir === 'ltr') {
-      this._autocomplete();
-    }
-  },
-
-  _onQueryChanged: function onQueryChanged(e, query) {
-    this.input.clearHintIfInvalid();
-
-    if (query.length >= this.minLength) {
-      this.dropdown.update(query);
-    } else {
-      this.dropdown.empty();
-    }
-
-    this.dropdown.open();
-    this._setLanguageDirection();
-  },
-
-  _onWhitespaceChanged: function onWhitespaceChanged() {
-    this._updateHint();
-    this.dropdown.open();
-  },
-
-  _setLanguageDirection: function setLanguageDirection() {
-    var dir = this.input.getLanguageDirection();
-
-    if (this.dir !== dir) {
-      this.dir = dir;
-      this.$node.css('direction', dir);
-      this.dropdown.setLanguageDirection(dir);
-    }
-  },
-
-  _updateHint: function updateHint() {
-    var datum;
-    var val;
-    var query;
-    var escapedQuery;
-    var frontMatchRegEx;
-    var match;
-
-    datum = this.dropdown.getDatumForTopSuggestion();
-
-    if (datum && this.dropdown.isVisible() && !this.input.hasOverflow()) {
-      val = this.input.getInputValue();
-      query = Input.normalizeQuery(val);
-      escapedQuery = _.escapeRegExChars(query);
-
-      // match input value, then capture trailing text
-      frontMatchRegEx = new RegExp('^(?:' + escapedQuery + ')(.+$)', 'i');
-      match = frontMatchRegEx.exec(datum.value);
-
-      // clear hint if there's no trailing text
-      if (match) {
-        this.input.setHint(val + match[1]);
-      } else {
-        this.input.clearHint();
-      }
-    } else {
-      this.input.clearHint();
-    }
-  },
-
-  _autocomplete: function autocomplete(laxCursor) {
-    var hint;
-    var query;
-    var isCursorAtEnd;
-    var datum;
-
-    hint = this.input.getHint();
-    query = this.input.getQuery();
-    isCursorAtEnd = laxCursor || this.input.isCursorAtEnd();
-
-    if (hint && query !== hint && isCursorAtEnd) {
-      datum = this.dropdown.getDatumForTopSuggestion();
-      if (datum) {
-        this.input.setInputValue(datum.value);
-      }
-
-      this.eventBus.trigger('autocompleted', datum.raw, datum.datasetName);
-    }
-  },
-
-  _select: function select(datum, context) {
-    if (typeof datum.value !== 'undefined') {
-      this.input.setQuery(datum.value);
-    }
-    if (this.clearOnSelected) {
-      this.setVal('');
-    } else {
-      this.input.setInputValue(datum.value, true);
-    }
-
-    this._setLanguageDirection();
-
-    var event = this.eventBus.trigger('selected', datum.raw, datum.datasetName, context);
-    if (event.isDefaultPrevented() === false) {
-      this.dropdown.close();
-
-      // #118: allow click event to bubble up to the body before removing
-      // the suggestions otherwise we break event delegation
-      _.defer(_.bind(this.dropdown.empty, this.dropdown));
-    }
-  },
-
-  // ### public
-
-  open: function open() {
-    // if the menu is not activated yet, we need to update
-    // the underlying dropdown menu to trigger the search
-    // otherwise we're not gonna see anything
-    if (!this.isActivated) {
-      var query = this.input.getInputValue();
-      if (query.length >= this.minLength) {
-        this.dropdown.update(query);
-      } else {
-        this.dropdown.empty();
-      }
-    }
-    this.dropdown.open();
-  },
-
-  close: function close() {
-    this.dropdown.close();
-  },
-
-  setVal: function setVal(val) {
-    // expect val to be a string, so be safe, and coerce
-    val = _.toStr(val);
-
-    if (this.isActivated) {
-      this.input.setInputValue(val);
-    } else {
-      this.input.setQuery(val);
-      this.input.setInputValue(val, true);
-    }
-
-    this._setLanguageDirection();
-  },
-
-  getVal: function getVal() {
-    return this.input.getQuery();
-  },
-
-  destroy: function destroy() {
-    this.input.destroy();
-    this.dropdown.destroy();
-
-    destroyDomStructure(this.$node, this.cssClasses);
-
-    this.$node = null;
-  },
-
-  getWrapper: function getWrapper() {
-    return this.dropdown.$container[0];
-  }
-});
-
-function buildDom(options) {
-  var $input;
-  var $wrapper;
-  var $dropdown;
-  var $hint;
-
-  $input = DOM.element(options.input);
-  $wrapper = DOM
-    .element(html.wrapper.replace('%ROOT%', options.cssClasses.root))
-    .css(options.css.wrapper);
-
-  // override the display property with the table-cell value
-  // if the parent element is a table and the original input was a block
-  //  -> https://github.com/algolia/autocomplete.js/issues/16
-  if (!options.appendTo && $input.css('display') === 'block' && $input.parent().css('display') === 'table') {
-    $wrapper.css('display', 'table-cell');
-  }
-  var dropdownHtml = html.dropdown.
-    replace('%PREFIX%', options.cssClasses.prefix).
-    replace('%DROPDOWN_MENU%', options.cssClasses.dropdownMenu);
-  $dropdown = DOM.element(dropdownHtml)
-    .css(options.css.dropdown)
-    .attr({
-      role: 'listbox',
-      id: options.listboxId
-    });
-  if (options.templates && options.templates.dropdownMenu) {
-    $dropdown.html(_.templatify(options.templates.dropdownMenu)());
-  }
-  $hint = $input.clone().css(options.css.hint).css(getBackgroundStyles($input));
-
-  $hint
-    .val('')
-    .addClass(_.className(options.cssClasses.prefix, options.cssClasses.hint, true))
-    .removeAttr('id name placeholder required')
-    .prop('readonly', true)
-    .attr({
-      'aria-hidden': 'true',
-      autocomplete: 'off',
-      spellcheck: 'false',
-      tabindex: -1
-    });
-  if ($hint.removeData) {
-    $hint.removeData();
-  }
-
-  // store the original values of the attrs that get modified
-  // so modifications can be reverted on destroy
-  $input.data(attrsKey, {
-    'aria-autocomplete': $input.attr('aria-autocomplete'),
-    'aria-expanded': $input.attr('aria-expanded'),
-    'aria-owns': $input.attr('aria-owns'),
-    autocomplete: $input.attr('autocomplete'),
-    dir: $input.attr('dir'),
-    role: $input.attr('role'),
-    spellcheck: $input.attr('spellcheck'),
-    style: $input.attr('style'),
-    type: $input.attr('type')
-  });
-
-  $input
-    .addClass(_.className(options.cssClasses.prefix, options.cssClasses.input, true))
-    .attr({
-      autocomplete: 'off',
-      spellcheck: false,
-
-      // Accessibility features
-      // Give the field a presentation of a "select".
-      // Combobox is the combined presentation of a single line textfield
-      // with a listbox popup.
-      // https://www.w3.org/WAI/PF/aria/roles#combobox
-      role: 'combobox',
-      // Let the screen reader know the field has an autocomplete
-      // feature to it.
-      'aria-autocomplete': (options.datasets &&
-        options.datasets[0] && options.datasets[0].displayKey ? 'both' : 'list'),
-      // Indicates whether the dropdown it controls is currently expanded or collapsed
-      'aria-expanded': 'false',
-      'aria-label': options.ariaLabel,
-      // Explicitly point to the listbox,
-      // which is a list of suggestions (aka options)
-      'aria-owns': options.listboxId
-    })
-    .css(options.hint ? options.css.input : options.css.inputWithNoHint);
-
-  // ie7 does not like it when dir is set to auto
-  try {
-    if (!$input.attr('dir')) {
-      $input.attr('dir', 'auto');
-    }
-  } catch (e) {
-    // ignore
-  }
-
-  $wrapper = options.appendTo
-    ? $wrapper.appendTo(DOM.element(options.appendTo).eq(0)).eq(0)
-    : $input.wrap($wrapper).parent();
-
-  $wrapper
-    .prepend(options.hint ? $hint : null)
-    .append($dropdown);
-
-  return {
-    wrapper: $wrapper,
-    input: $input,
-    hint: $hint,
-    menu: $dropdown
-  };
-}
-
-function getBackgroundStyles($el) {
-  return {
-    backgroundAttachment: $el.css('background-attachment'),
-    backgroundClip: $el.css('background-clip'),
-    backgroundColor: $el.css('background-color'),
-    backgroundImage: $el.css('background-image'),
-    backgroundOrigin: $el.css('background-origin'),
-    backgroundPosition: $el.css('background-position'),
-    backgroundRepeat: $el.css('background-repeat'),
-    backgroundSize: $el.css('background-size')
-  };
-}
-
-function destroyDomStructure($node, cssClasses) {
-  var $input = $node.find(_.className(cssClasses.prefix, cssClasses.input));
-
-  // need to remove attrs that weren't previously defined and
-  // revert attrs that originally had a value
-  _.each($input.data(attrsKey), function(val, key) {
-    if (val === undefined) {
-      $input.removeAttr(key);
-    } else {
-      $input.attr(key, val);
-    }
-  });
-
-  $input
-    .detach()
-    .removeClass(_.className(cssClasses.prefix, cssClasses.input, true))
-    .insertAfter($node);
-  if ($input.removeData) {
-    $input.removeData(attrsKey);
-  }
-
-  $node.remove();
-}
-
-Typeahead.Dropdown = Dropdown;
-Typeahead.Input = Input;
-Typeahead.sources = __webpack_require__(61);
-
-module.exports = Typeahead;
-
-
-/***/ }),
-/* 52 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var specialKeyCodeMap;
-
-specialKeyCodeMap = {
-  9: 'tab',
-  27: 'esc',
-  37: 'left',
-  39: 'right',
-  13: 'enter',
-  38: 'up',
-  40: 'down'
-};
-
-var _ = __webpack_require__(0);
-var DOM = __webpack_require__(1);
-var EventEmitter = __webpack_require__(10);
-
-// constructor
-// -----------
-
-function Input(o) {
-  var that = this;
-  var onBlur;
-  var onFocus;
-  var onKeydown;
-  var onInput;
-
-  o = o || {};
-
-  if (!o.input) {
-    _.error('input is missing');
-  }
-
-  // bound functions
-  onBlur = _.bind(this._onBlur, this);
-  onFocus = _.bind(this._onFocus, this);
-  onKeydown = _.bind(this._onKeydown, this);
-  onInput = _.bind(this._onInput, this);
-
-  this.$hint = DOM.element(o.hint);
-  this.$input = DOM.element(o.input)
-    .on('blur.aa', onBlur)
-    .on('focus.aa', onFocus)
-    .on('keydown.aa', onKeydown);
-
-  // if no hint, noop all the hint related functions
-  if (this.$hint.length === 0) {
-    this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop;
-  }
-
-  // ie7 and ie8 don't support the input event
-  // ie9 doesn't fire the input event when characters are removed
-  // not sure if ie10 is compatible
-  if (!_.isMsie()) {
-    this.$input.on('input.aa', onInput);
-  } else {
-    this.$input.on('keydown.aa keypress.aa cut.aa paste.aa', function($e) {
-      // if a special key triggered this, ignore it
-      if (specialKeyCodeMap[$e.which || $e.keyCode]) {
-        return;
-      }
-
-      // give the browser a chance to update the value of the input
-      // before checking to see if the query changed
-      _.defer(_.bind(that._onInput, that, $e));
-    });
-  }
-
-  // the query defaults to whatever the value of the input is
-  // on initialization, it'll most likely be an empty string
-  this.query = this.$input.val();
-
-  // helps with calculating the width of the input's value
-  this.$overflowHelper = buildOverflowHelper(this.$input);
-}
-
-// static methods
-// --------------
-
-Input.normalizeQuery = function(str) {
-  // strips leading whitespace and condenses all whitespace
-  return (str || '').replace(/^\s*/g, '').replace(/\s{2,}/g, ' ');
-};
-
-// instance methods
-// ----------------
-
-_.mixin(Input.prototype, EventEmitter, {
-
-  // ### private
-
-  _onBlur: function onBlur() {
-    this.resetInputValue();
-    this.$input.removeAttr('aria-activedescendant');
-    this.trigger('blurred');
-  },
-
-  _onFocus: function onFocus() {
-    this.trigger('focused');
-  },
-
-  _onKeydown: function onKeydown($e) {
-    // which is normalized and consistent (but not for ie)
-    var keyName = specialKeyCodeMap[$e.which || $e.keyCode];
-
-    this._managePreventDefault(keyName, $e);
-    if (keyName && this._shouldTrigger(keyName, $e)) {
-      this.trigger(keyName + 'Keyed', $e);
-    }
-  },
-
-  _onInput: function onInput() {
-    this._checkInputValue();
-  },
-
-  _managePreventDefault: function managePreventDefault(keyName, $e) {
-    var preventDefault;
-    var hintValue;
-    var inputValue;
-
-    switch (keyName) {
-    case 'tab':
-      hintValue = this.getHint();
-      inputValue = this.getInputValue();
-
-      preventDefault = hintValue &&
-        hintValue !== inputValue &&
-        !withModifier($e);
-      break;
-
-    case 'up':
-    case 'down':
-      preventDefault = !withModifier($e);
-      break;
-
-    default:
-      preventDefault = false;
-    }
-
-    if (preventDefault) {
-      $e.preventDefault();
-    }
-  },
-
-  _shouldTrigger: function shouldTrigger(keyName, $e) {
-    var trigger;
-
-    switch (keyName) {
-    case 'tab':
-      trigger = !withModifier($e);
-      break;
-
-    default:
-      trigger = true;
-    }
-
-    return trigger;
-  },
-
-  _checkInputValue: function checkInputValue() {
-    var inputValue;
-    var areEquivalent;
-    var hasDifferentWhitespace;
-
-    inputValue = this.getInputValue();
-    areEquivalent = areQueriesEquivalent(inputValue, this.query);
-    hasDifferentWhitespace = areEquivalent && this.query ?
-      this.query.length !== inputValue.length : false;
-
-    this.query = inputValue;
-
-    if (!areEquivalent) {
-      this.trigger('queryChanged', this.query);
-    } else if (hasDifferentWhitespace) {
-      this.trigger('whitespaceChanged', this.query);
-    }
-  },
-
-  // ### public
-
-  focus: function focus() {
-    this.$input.focus();
-  },
-
-  blur: function blur() {
-    this.$input.blur();
-  },
-
-  getQuery: function getQuery() {
-    return this.query;
-  },
-
-  setQuery: function setQuery(query) {
-    this.query = query;
-  },
-
-  getInputValue: function getInputValue() {
-    return this.$input.val();
-  },
-
-  setInputValue: function setInputValue(value, silent) {
-    if (typeof value === 'undefined') {
-      value = this.query;
-    }
-    this.$input.val(value);
-
-    // silent prevents any additional events from being triggered
-    if (silent) {
-      this.clearHint();
-    } else {
-      this._checkInputValue();
-    }
-  },
-
-  expand: function expand() {
-    this.$input.attr('aria-expanded', 'true');
-  },
-
-  collapse: function collapse() {
-    this.$input.attr('aria-expanded', 'false');
-  },
-
-  setActiveDescendant: function setActiveDescendant(activedescendantId) {
-    this.$input.attr('aria-activedescendant', activedescendantId);
-  },
-
-  removeActiveDescendant: function removeActiveDescendant() {
-    this.$input.removeAttr('aria-activedescendant');
-  },
-
-  resetInputValue: function resetInputValue() {
-    this.setInputValue(this.query, true);
-  },
-
-  getHint: function getHint() {
-    return this.$hint.val();
-  },
-
-  setHint: function setHint(value) {
-    this.$hint.val(value);
-  },
-
-  clearHint: function clearHint() {
-    this.setHint('');
-  },
-
-  clearHintIfInvalid: function clearHintIfInvalid() {
-    var val;
-    var hint;
-    var valIsPrefixOfHint;
-    var isValid;
-
-    val = this.getInputValue();
-    hint = this.getHint();
-    valIsPrefixOfHint = val !== hint && hint.indexOf(val) === 0;
-    isValid = val !== '' && valIsPrefixOfHint && !this.hasOverflow();
-
-    if (!isValid) {
-      this.clearHint();
-    }
-  },
-
-  getLanguageDirection: function getLanguageDirection() {
-    return (this.$input.css('direction') || 'ltr').toLowerCase();
-  },
-
-  hasOverflow: function hasOverflow() {
-    // 2 is arbitrary, just picking a small number to handle edge cases
-    var constraint = this.$input.width() - 2;
-
-    this.$overflowHelper.text(this.getInputValue());
-
-    return this.$overflowHelper.width() >= constraint;
-  },
-
-  isCursorAtEnd: function() {
-    var valueLength;
-    var selectionStart;
-    var range;
-
-    valueLength = this.$input.val().length;
-    selectionStart = this.$input[0].selectionStart;
-
-    if (_.isNumber(selectionStart)) {
-      return selectionStart === valueLength;
-    } else if (document.selection) {
-      // NOTE: this won't work unless the input has focus, the good news
-      // is this code should only get called when the input has focus
-      range = document.selection.createRange();
-      range.moveStart('character', -valueLength);
-
-      return valueLength === range.text.length;
-    }
-
-    return true;
-  },
-
-  destroy: function destroy() {
-    this.$hint.off('.aa');
-    this.$input.off('.aa');
-
-    this.$hint = this.$input = this.$overflowHelper = null;
-  }
-});
-
-// helper functions
-// ----------------
-
-function buildOverflowHelper($input) {
-  return DOM.element('<pre aria-hidden="true"></pre>')
-    .css({
-      // position helper off-screen
-      position: 'absolute',
-      visibility: 'hidden',
-      // avoid line breaks and whitespace collapsing
-      whiteSpace: 'pre',
-      // use same font css as input to calculate accurate width
-      fontFamily: $input.css('font-family'),
-      fontSize: $input.css('font-size'),
-      fontStyle: $input.css('font-style'),
-      fontVariant: $input.css('font-variant'),
-      fontWeight: $input.css('font-weight'),
-      wordSpacing: $input.css('word-spacing'),
-      letterSpacing: $input.css('letter-spacing'),
-      textIndent: $input.css('text-indent'),
-      textRendering: $input.css('text-rendering'),
-      textTransform: $input.css('text-transform')
-    })
-    .insertAfter($input);
-}
-
-function areQueriesEquivalent(a, b) {
-  return Input.normalizeQuery(a) === Input.normalizeQuery(b);
-}
-
-function withModifier($e) {
-  return $e.altKey || $e.ctrlKey || $e.metaKey || $e.shiftKey;
-}
-
-module.exports = Input;
-
-
-/***/ }),
-/* 53 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var types = [
-  __webpack_require__(54),
-  __webpack_require__(55),
-  __webpack_require__(56),
-  __webpack_require__(57),
-  __webpack_require__(58)
-];
-var draining;
-var currentQueue;
-var queueIndex = -1;
-var queue = [];
-var scheduled = false;
-function cleanUpNextTick() {
-  if (!draining || !currentQueue) {
-    return;
-  }
-  draining = false;
-  if (currentQueue.length) {
-    queue = currentQueue.concat(queue);
-  } else {
-    queueIndex = -1;
-  }
-  if (queue.length) {
-    nextTick();
-  }
-}
-
-//named nextTick for less confusing stack traces
-function nextTick() {
-  if (draining) {
-    return;
-  }
-  scheduled = false;
-  draining = true;
-  var len = queue.length;
-  var timeout = setTimeout(cleanUpNextTick);
-  while (len) {
-    currentQueue = queue;
-    queue = [];
-    while (currentQueue && ++queueIndex < len) {
-      currentQueue[queueIndex].run();
-    }
-    queueIndex = -1;
-    len = queue.length;
-  }
-  currentQueue = null;
-  queueIndex = -1;
-  draining = false;
-  clearTimeout(timeout);
-}
-var scheduleDrain;
-var i = -1;
-var len = types.length;
-while (++i < len) {
-  if (types[i] && types[i].test && types[i].test()) {
-    scheduleDrain = types[i].install(nextTick);
-    break;
-  }
-}
-// v8 likes predictible objects
-function Item(fun, array) {
-  this.fun = fun;
-  this.array = array;
-}
-Item.prototype.run = function () {
-  var fun = this.fun;
-  var array = this.array;
-  switch (array.length) {
-  case 0:
-    return fun();
-  case 1:
-    return fun(array[0]);
-  case 2:
-    return fun(array[0], array[1]);
-  case 3:
-    return fun(array[0], array[1], array[2]);
-  default:
-    return fun.apply(null, array);
-  }
-
-};
-module.exports = immediate;
-function immediate(task) {
-  var args = new Array(arguments.length - 1);
-  if (arguments.length > 1) {
-    for (var i = 1; i < arguments.length; i++) {
-      args[i - 1] = arguments[i];
-    }
-  }
-  queue.push(new Item(task, args));
-  if (!scheduled && !draining) {
-    scheduled = true;
-    scheduleDrain();
-  }
-}
-
-
-/***/ }),
-/* 54 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(process) {
-exports.test = function () {
-  // Don't get fooled by e.g. browserify environments.
-  return (typeof process !== 'undefined') && !process.browser;
-};
-
-exports.install = function (func) {
-  return function () {
-    process.nextTick(func);
-  };
-};
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(9)))
-
-/***/ }),
-/* 55 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(global) {
-//based off rsvp https://github.com/tildeio/rsvp.js
-//license https://github.com/tildeio/rsvp.js/blob/master/LICENSE
-//https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/asap.js
-
-var Mutation = global.MutationObserver || global.WebKitMutationObserver;
-
-exports.test = function () {
-  return Mutation;
-};
-
-exports.install = function (handle) {
-  var called = 0;
-  var observer = new Mutation(handle);
-  var element = global.document.createTextNode('');
-  observer.observe(element, {
-    characterData: true
-  });
-  return function () {
-    element.data = (called = ++called % 2);
-  };
-};
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(4)))
-
-/***/ }),
-/* 56 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(global) {
-
-exports.test = function () {
-  if (global.setImmediate) {
-    // we can only get here in IE10
-    // which doesn't handel postMessage well
-    return false;
-  }
-  return typeof global.MessageChannel !== 'undefined';
-};
-
-exports.install = function (func) {
-  var channel = new global.MessageChannel();
-  channel.port1.onmessage = func;
-  return function () {
-    channel.port2.postMessage(0);
-  };
-};
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(4)))
-
-/***/ }),
-/* 57 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(global) {
-
-exports.test = function () {
-  return 'document' in global && 'onreadystatechange' in global.document.createElement('script');
-};
-
-exports.install = function (handle) {
-  return function () {
-
-    // Create a <script> element; its readystatechange event will be fired asynchronously once it is inserted
-    // into the document. Do so, thus queuing up the task. Remember to clean up once it's been called.
-    var scriptEl = global.document.createElement('script');
-    scriptEl.onreadystatechange = function () {
-      handle();
-
-      scriptEl.onreadystatechange = null;
-      scriptEl.parentNode.removeChild(scriptEl);
-      scriptEl = null;
-    };
-    global.document.documentElement.appendChild(scriptEl);
-
-    return handle;
-  };
-};
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(4)))
-
-/***/ }),
-/* 58 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-exports.test = function () {
-  return true;
-};
-
-exports.install = function (t) {
-  return function () {
-    setTimeout(t, 0);
-  };
-};
-
-/***/ }),
-/* 59 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _ = __webpack_require__(0);
-var DOM = __webpack_require__(1);
-var EventEmitter = __webpack_require__(10);
-var Dataset = __webpack_require__(60);
-var css = __webpack_require__(11);
-
-// constructor
-// -----------
-
-function Dropdown(o) {
-  var that = this;
-  var onSuggestionClick;
-  var onSuggestionMouseEnter;
-  var onSuggestionMouseLeave;
-
-  o = o || {};
-
-  if (!o.menu) {
-    _.error('menu is required');
-  }
-
-  if (!_.isArray(o.datasets) && !_.isObject(o.datasets)) {
-    _.error('1 or more datasets required');
-  }
-  if (!o.datasets) {
-    _.error('datasets is required');
-  }
-
-  this.isOpen = false;
-  this.isEmpty = true;
-  this.minLength = o.minLength || 0;
-  this.templates = {};
-  this.appendTo = o.appendTo || false;
-  this.css = _.mixin({}, css, o.appendTo ? css.appendTo : {});
-  this.cssClasses = o.cssClasses = _.mixin({}, css.defaultClasses, o.cssClasses || {});
-  this.cssClasses.prefix =
-    o.cssClasses.formattedPrefix || _.formatPrefix(this.cssClasses.prefix, this.cssClasses.noPrefix);
-
-  // bound functions
-  onSuggestionClick = _.bind(this._onSuggestionClick, this);
-  onSuggestionMouseEnter = _.bind(this._onSuggestionMouseEnter, this);
-  onSuggestionMouseLeave = _.bind(this._onSuggestionMouseLeave, this);
-
-  var cssClass = _.className(this.cssClasses.prefix, this.cssClasses.suggestion);
-  this.$menu = DOM.element(o.menu)
-    .on('mouseenter.aa', cssClass, onSuggestionMouseEnter)
-    .on('mouseleave.aa', cssClass, onSuggestionMouseLeave)
-    .on('click.aa', cssClass, onSuggestionClick);
-
-  this.$container = o.appendTo ? o.wrapper : this.$menu;
-
-  if (o.templates && o.templates.header) {
-    this.templates.header = _.templatify(o.templates.header);
-    this.$menu.prepend(this.templates.header());
-  }
-
-  if (o.templates && o.templates.empty) {
-    this.templates.empty = _.templatify(o.templates.empty);
-    this.$empty = DOM.element('<div class="' +
-      _.className(this.cssClasses.prefix, this.cssClasses.empty, true) + '">' +
-      '</div>');
-    this.$menu.append(this.$empty);
-    this.$empty.hide();
-  }
-
-  this.datasets = _.map(o.datasets, function(oDataset) {
-    return initializeDataset(that.$menu, oDataset, o.cssClasses);
-  });
-  _.each(this.datasets, function(dataset) {
-    var root = dataset.getRoot();
-    if (root && root.parent().length === 0) {
-      that.$menu.append(root);
-    }
-    dataset.onSync('rendered', that._onRendered, that);
-  });
-
-  if (o.templates && o.templates.footer) {
-    this.templates.footer = _.templatify(o.templates.footer);
-    this.$menu.append(this.templates.footer());
-  }
-
-  var self = this;
-  DOM.element(window).resize(function() {
-    self._redraw();
-  });
-}
-
-// instance methods
-// ----------------
-
-_.mixin(Dropdown.prototype, EventEmitter, {
-
-  // ### private
-
-  _onSuggestionClick: function onSuggestionClick($e) {
-    this.trigger('suggestionClicked', DOM.element($e.currentTarget));
-  },
-
-  _onSuggestionMouseEnter: function onSuggestionMouseEnter($e) {
-    var elt = DOM.element($e.currentTarget);
-    if (elt.hasClass(_.className(this.cssClasses.prefix, this.cssClasses.cursor, true))) {
-      // we're already on the cursor
-      // => we're probably entering it again after leaving it for a nested div
-      return;
-    }
-    this._removeCursor();
-
-    // Fixes iOS double tap behaviour, by modifying the DOM right before the
-    // native href clicks happens, iOS will requires another tap to follow
-    // a suggestion that has an <a href> element inside
-    // https://www.google.com/search?q=ios+double+tap+bug+href
-    var suggestion = this;
-    setTimeout(function() {
-      // this exact line, when inside the main loop, will trigger a double tap bug
-      // on iOS devices
-      suggestion._setCursor(elt, false);
-    }, 0);
-  },
-
-  _onSuggestionMouseLeave: function onSuggestionMouseLeave($e) {
-    // $e.relatedTarget is the `EventTarget` the pointing device entered to
-    if ($e.relatedTarget) {
-      var elt = DOM.element($e.relatedTarget);
-      if (elt.closest('.' + _.className(this.cssClasses.prefix, this.cssClasses.cursor, true)).length > 0) {
-        // our father is a cursor
-        // => it means we're just leaving the suggestion for a nested div
-        return;
-      }
-    }
-    this._removeCursor();
-    this.trigger('cursorRemoved');
-  },
-
-  _onRendered: function onRendered(e, query) {
-    this.isEmpty = _.every(this.datasets, isDatasetEmpty);
-
-    if (this.isEmpty) {
-      if (query.length >= this.minLength) {
-        this.trigger('empty');
-      }
-
-      if (this.$empty) {
-        if (query.length < this.minLength) {
-          this._hide();
-        } else {
-          var html = this.templates.empty({
-            query: this.datasets[0] && this.datasets[0].query
-          });
-          this.$empty.html(html);
-          this.$empty.show();
-          this._show();
-        }
-      } else if (_.any(this.datasets, hasEmptyTemplate)) {
-        if (query.length < this.minLength) {
-          this._hide();
-        } else {
-          this._show();
-        }
-      } else {
-        this._hide();
-      }
-    } else if (this.isOpen) {
-      if (this.$empty) {
-        this.$empty.empty();
-        this.$empty.hide();
-      }
-
-      if (query.length >= this.minLength) {
-        this._show();
-      } else {
-        this._hide();
-      }
-    }
-
-    this.trigger('datasetRendered');
-
-    function isDatasetEmpty(dataset) {
-      return dataset.isEmpty();
-    }
-
-    function hasEmptyTemplate(dataset) {
-      return dataset.templates && dataset.templates.empty;
-    }
-  },
-
-  _hide: function() {
-    this.$container.hide();
-  },
-
-  _show: function() {
-    // can't use jQuery#show because $menu is a span element we want
-    // display: block; not dislay: inline;
-    this.$container.css('display', 'block');
-
-    this._redraw();
-
-    this.trigger('shown');
-  },
-
-  _redraw: function redraw() {
-    if (!this.isOpen || !this.appendTo) return;
-
-    this.trigger('redrawn');
-  },
-
-  _getSuggestions: function getSuggestions() {
-    return this.$menu.find(_.className(this.cssClasses.prefix, this.cssClasses.suggestion));
-  },
-
-  _getCursor: function getCursor() {
-    return this.$menu.find(_.className(this.cssClasses.prefix, this.cssClasses.cursor)).first();
-  },
-
-  _setCursor: function setCursor($el, updateInput) {
-    $el.first()
-      .addClass(_.className(this.cssClasses.prefix, this.cssClasses.cursor, true))
-      .attr('aria-selected', 'true');
-    this.trigger('cursorMoved', updateInput);
-  },
-
-  _removeCursor: function removeCursor() {
-    this._getCursor()
-      .removeClass(_.className(this.cssClasses.prefix, this.cssClasses.cursor, true))
-      .removeAttr('aria-selected');
-  },
-
-  _moveCursor: function moveCursor(increment) {
-    var $suggestions;
-    var $oldCursor;
-    var newCursorIndex;
-    var $newCursor;
-
-    if (!this.isOpen) {
-      return;
-    }
-
-    $oldCursor = this._getCursor();
-    $suggestions = this._getSuggestions();
-
-    this._removeCursor();
-
-    // shifting before and after modulo to deal with -1 index
-    newCursorIndex = $suggestions.index($oldCursor) + increment;
-    newCursorIndex = (newCursorIndex + 1) % ($suggestions.length + 1) - 1;
-
-    if (newCursorIndex === -1) {
-      this.trigger('cursorRemoved');
-
-      return;
-    } else if (newCursorIndex < -1) {
-      newCursorIndex = $suggestions.length - 1;
-    }
-
-    this._setCursor($newCursor = $suggestions.eq(newCursorIndex), true);
-
-    // in the case of scrollable overflow
-    // make sure the cursor is visible in the menu
-    this._ensureVisible($newCursor);
-  },
-
-  _ensureVisible: function ensureVisible($el) {
-    var elTop;
-    var elBottom;
-    var menuScrollTop;
-    var menuHeight;
-
-    elTop = $el.position().top;
-    elBottom = elTop + $el.height() +
-      parseInt($el.css('margin-top'), 10) +
-      parseInt($el.css('margin-bottom'), 10);
-    menuScrollTop = this.$menu.scrollTop();
-    menuHeight = this.$menu.height() +
-      parseInt(this.$menu.css('padding-top'), 10) +
-      parseInt(this.$menu.css('padding-bottom'), 10);
-
-    if (elTop < 0) {
-      this.$menu.scrollTop(menuScrollTop + elTop);
-    } else if (menuHeight < elBottom) {
-      this.$menu.scrollTop(menuScrollTop + (elBottom - menuHeight));
-    }
-  },
-
-  // ### public
-
-  close: function close() {
-    if (this.isOpen) {
-      this.isOpen = false;
-
-      this._removeCursor();
-      this._hide();
-
-      this.trigger('closed');
-    }
-  },
-
-  open: function open() {
-    if (!this.isOpen) {
-      this.isOpen = true;
-
-      if (!this.isEmpty) {
-        this._show();
-      }
-
-      this.trigger('opened');
-    }
-  },
-
-  setLanguageDirection: function setLanguageDirection(dir) {
-    this.$menu.css(dir === 'ltr' ? this.css.ltr : this.css.rtl);
-  },
-
-  moveCursorUp: function moveCursorUp() {
-    this._moveCursor(-1);
-  },
-
-  moveCursorDown: function moveCursorDown() {
-    this._moveCursor(+1);
-  },
-
-  getDatumForSuggestion: function getDatumForSuggestion($el) {
-    var datum = null;
-
-    if ($el.length) {
-      datum = {
-        raw: Dataset.extractDatum($el),
-        value: Dataset.extractValue($el),
-        datasetName: Dataset.extractDatasetName($el)
-      };
-    }
-
-    return datum;
-  },
-
-  getCurrentCursor: function getCurrentCursor() {
-    return this._getCursor().first();
-  },
-
-  getDatumForCursor: function getDatumForCursor() {
-    return this.getDatumForSuggestion(this._getCursor().first());
-  },
-
-  getDatumForTopSuggestion: function getDatumForTopSuggestion() {
-    return this.getDatumForSuggestion(this._getSuggestions().first());
-  },
-
-  cursorTopSuggestion: function cursorTopSuggestion() {
-    this._setCursor(this._getSuggestions().first(), false);
-  },
-
-  update: function update(query) {
-    _.each(this.datasets, updateDataset);
-
-    function updateDataset(dataset) {
-      dataset.update(query);
-    }
-  },
-
-  empty: function empty() {
-    _.each(this.datasets, clearDataset);
-    this.isEmpty = true;
-
-    function clearDataset(dataset) {
-      dataset.clear();
-    }
-  },
-
-  isVisible: function isVisible() {
-    return this.isOpen && !this.isEmpty;
-  },
-
-  destroy: function destroy() {
-    this.$menu.off('.aa');
-
-    this.$menu = null;
-
-    _.each(this.datasets, destroyDataset);
-
-    function destroyDataset(dataset) {
-      dataset.destroy();
-    }
-  }
-});
-
-// helper functions
-// ----------------
-Dropdown.Dataset = Dataset;
-
-function initializeDataset($menu, oDataset, cssClasses) {
-  return new Dropdown.Dataset(_.mixin({$menu: $menu, cssClasses: cssClasses}, oDataset));
-}
-
-module.exports = Dropdown;
-
-
-/***/ }),
-/* 60 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var datasetKey = 'aaDataset';
-var valueKey = 'aaValue';
-var datumKey = 'aaDatum';
-
-var _ = __webpack_require__(0);
-var DOM = __webpack_require__(1);
-var html = __webpack_require__(17);
-var css = __webpack_require__(11);
-var EventEmitter = __webpack_require__(10);
-
-// constructor
-// -----------
-
-function Dataset(o) {
-  o = o || {};
-  o.templates = o.templates || {};
-
-  if (!o.source) {
-    _.error('missing source');
-  }
-
-  if (o.name && !isValidName(o.name)) {
-    _.error('invalid dataset name: ' + o.name);
-  }
-
-  // tracks the last query the dataset was updated for
-  this.query = null;
-  this._isEmpty = true;
-
-  this.highlight = !!o.highlight;
-  this.name = typeof o.name === 'undefined' || o.name === null ? _.getUniqueId() : o.name;
-
-  this.source = o.source;
-  this.displayFn = getDisplayFn(o.display || o.displayKey);
-
-  this.debounce = o.debounce;
-
-  this.cache = o.cache !== false;
-
-  this.templates = getTemplates(o.templates, this.displayFn);
-
-  this.css = _.mixin({}, css, o.appendTo ? css.appendTo : {});
-  this.cssClasses = o.cssClasses = _.mixin({}, css.defaultClasses, o.cssClasses || {});
-  this.cssClasses.prefix =
-    o.cssClasses.formattedPrefix || _.formatPrefix(this.cssClasses.prefix, this.cssClasses.noPrefix);
-
-  var clazz = _.className(this.cssClasses.prefix, this.cssClasses.dataset);
-  this.$el = o.$menu && o.$menu.find(clazz + '-' + this.name).length > 0 ?
-    DOM.element(o.$menu.find(clazz + '-' + this.name)[0]) :
-    DOM.element(
-      html.dataset.replace('%CLASS%', this.name)
-        .replace('%PREFIX%', this.cssClasses.prefix)
-        .replace('%DATASET%', this.cssClasses.dataset)
-    );
-
-  this.$menu = o.$menu;
-  this.clearCachedSuggestions();
-}
-
-// static methods
-// --------------
-
-Dataset.extractDatasetName = function extractDatasetName(el) {
-  return DOM.element(el).data(datasetKey);
-};
-
-Dataset.extractValue = function extractValue(el) {
-  return DOM.element(el).data(valueKey);
-};
-
-Dataset.extractDatum = function extractDatum(el) {
-  var datum = DOM.element(el).data(datumKey);
-  if (typeof datum === 'string') {
-    // Zepto has an automatic deserialization of the
-    // JSON encoded data attribute
-    datum = JSON.parse(datum);
-  }
-  return datum;
-};
-
-// instance methods
-// ----------------
-
-_.mixin(Dataset.prototype, EventEmitter, {
-
-  // ### private
-
-  _render: function render(query, suggestions) {
-    if (!this.$el) {
-      return;
-    }
-    var that = this;
-
-    var hasSuggestions;
-    var renderArgs = [].slice.call(arguments, 2);
-    this.$el.empty();
-
-    hasSuggestions = suggestions && suggestions.length;
-    this._isEmpty = !hasSuggestions;
-
-    if (!hasSuggestions && this.templates.empty) {
-      this.$el
-        .html(getEmptyHtml.apply(this, renderArgs))
-        .prepend(that.templates.header ? getHeaderHtml.apply(this, renderArgs) : null)
-        .append(that.templates.footer ? getFooterHtml.apply(this, renderArgs) : null);
-    } else if (hasSuggestions) {
-      this.$el
-        .html(getSuggestionsHtml.apply(this, renderArgs))
-        .prepend(that.templates.header ? getHeaderHtml.apply(this, renderArgs) : null)
-        .append(that.templates.footer ? getFooterHtml.apply(this, renderArgs) : null);
-    } else if (suggestions && !Array.isArray(suggestions)) {
-      throw new TypeError('suggestions must be an array');
-    }
-
-    if (this.$menu) {
-      this.$menu.addClass(
-        this.cssClasses.prefix + (hasSuggestions ? 'with' : 'without') + '-' + this.name
-      ).removeClass(
-        this.cssClasses.prefix + (hasSuggestions ? 'without' : 'with') + '-' + this.name
-      );
-    }
-
-    this.trigger('rendered', query);
-
-    function getEmptyHtml() {
-      var args = [].slice.call(arguments, 0);
-      args = [{query: query, isEmpty: true}].concat(args);
-      return that.templates.empty.apply(this, args);
-    }
-
-    function getSuggestionsHtml() {
-      var args = [].slice.call(arguments, 0);
-      var $suggestions;
-      var nodes;
-      var self = this;
-
-      var suggestionsHtml = html.suggestions.
-        replace('%PREFIX%', this.cssClasses.prefix).
-        replace('%SUGGESTIONS%', this.cssClasses.suggestions);
-      $suggestions = DOM
-        .element(suggestionsHtml)
-        .css(this.css.suggestions);
-
-      // jQuery#append doesn't support arrays as the first argument
-      // until version 1.8, see http://bugs.jquery.com/ticket/11231
-      nodes = _.map(suggestions, getSuggestionNode);
-      $suggestions.append.apply($suggestions, nodes);
-
-      return $suggestions;
-
-      function getSuggestionNode(suggestion) {
-        var $el;
-
-        var suggestionHtml = html.suggestion.
-          replace('%PREFIX%', self.cssClasses.prefix).
-          replace('%SUGGESTION%', self.cssClasses.suggestion);
-        $el = DOM.element(suggestionHtml)
-          .attr({
-            role: 'option',
-            id: ['option', Math.floor(Math.random() * 100000000)].join('-')
-          })
-          .append(that.templates.suggestion.apply(this, [suggestion].concat(args)));
-
-        $el.data(datasetKey, that.name);
-        $el.data(valueKey, that.displayFn(suggestion) || undefined); // this led to undefined return value
-        $el.data(datumKey, JSON.stringify(suggestion));
-        $el.children().each(function() { DOM.element(this).css(self.css.suggestionChild); });
-
-        return $el;
-      }
-    }
-
-    function getHeaderHtml() {
-      var args = [].slice.call(arguments, 0);
-      args = [{query: query, isEmpty: !hasSuggestions}].concat(args);
-      return that.templates.header.apply(this, args);
-    }
-
-    function getFooterHtml() {
-      var args = [].slice.call(arguments, 0);
-      args = [{query: query, isEmpty: !hasSuggestions}].concat(args);
-      return that.templates.footer.apply(this, args);
-    }
-  },
-
-  // ### public
-
-  getRoot: function getRoot() {
-    return this.$el;
-  },
-
-  update: function update(query) {
-    function handleSuggestions(suggestions) {
-      // if the update has been canceled or if the query has changed
-      // do not render the suggestions as they've become outdated
-      if (!this.canceled && query === this.query) {
-        // concat all the other arguments that could have been passed
-        // to the render function, and forward them to _render
-        var extraArgs = [].slice.call(arguments, 1);
-        this.cacheSuggestions(query, suggestions, extraArgs);
-        this._render.apply(this, [query, suggestions].concat(extraArgs));
-      }
-    }
-
-    this.query = query;
-    this.canceled = false;
-
-    if (this.shouldFetchFromCache(query)) {
-      handleSuggestions.apply(this, [this.cachedSuggestions].concat(this.cachedRenderExtraArgs));
-    } else {
-      var that = this;
-      var execSource = function() {
-        // When the call is debounced the condition avoid to do a useless
-        // request with the last character when the input has been cleared
-        if (!that.canceled) {
-          that.source(query, handleSuggestions.bind(that));
-        }
-      };
-
-      if (this.debounce) {
-        var later = function() {
-          that.debounceTimeout = null;
-          execSource();
-        };
-        clearTimeout(this.debounceTimeout);
-        this.debounceTimeout = setTimeout(later, this.debounce);
-      } else {
-        execSource();
-      }
-    }
-  },
-
-  cacheSuggestions: function cacheSuggestions(query, suggestions, extraArgs) {
-    this.cachedQuery = query;
-    this.cachedSuggestions = suggestions;
-    this.cachedRenderExtraArgs = extraArgs;
-  },
-
-  shouldFetchFromCache: function shouldFetchFromCache(query) {
-    return this.cache &&
-      this.cachedQuery === query &&
-      this.cachedSuggestions &&
-      this.cachedSuggestions.length;
-  },
-
-  clearCachedSuggestions: function clearCachedSuggestions() {
-    delete this.cachedQuery;
-    delete this.cachedSuggestions;
-    delete this.cachedRenderExtraArgs;
-  },
-
-  cancel: function cancel() {
-    this.canceled = true;
-  },
-
-  clear: function clear() {
-    this.cancel();
-    this.$el.empty();
-    this.trigger('rendered', '');
-  },
-
-  isEmpty: function isEmpty() {
-    return this._isEmpty;
-  },
-
-  destroy: function destroy() {
-    this.clearCachedSuggestions();
-    this.$el = null;
-  }
-});
-
-// helper functions
-// ----------------
-
-function getDisplayFn(display) {
-  display = display || 'value';
-
-  return _.isFunction(display) ? display : displayFn;
-
-  function displayFn(obj) {
-    return obj[display];
-  }
-}
-
-function getTemplates(templates, displayFn) {
-  return {
-    empty: templates.empty && _.templatify(templates.empty),
-    header: templates.header && _.templatify(templates.header),
-    footer: templates.footer && _.templatify(templates.footer),
-    suggestion: templates.suggestion || suggestionTemplate
-  };
-
-  function suggestionTemplate(context) {
-    return '<p>' + displayFn(context) + '</p>';
-  }
-}
-
-function isValidName(str) {
-  // dashes, underscores, letters, and numbers
-  return (/^[_a-zA-Z0-9-]+$/).test(str);
-}
-
-module.exports = Dataset;
-
-
-/***/ }),
-/* 61 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-module.exports = {
-  hits: __webpack_require__(62),
-  popularIn: __webpack_require__(63)
-};
-
-
-/***/ }),
-/* 62 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _ = __webpack_require__(0);
-var version = __webpack_require__(18);
-var parseAlgoliaClientVersion = __webpack_require__(19);
-
-module.exports = function search(index, params) {
-  var algoliaVersion = parseAlgoliaClientVersion(index.as._ua);
-  if (algoliaVersion && algoliaVersion[0] >= 3 && algoliaVersion[1] > 20) {
-    params = params || {};
-    params.additionalUA = 'autocomplete.js ' + version;
-  }
-  return sourceFn;
-
-  function sourceFn(query, cb) {
-    index.search(query, params, function(error, content) {
-      if (error) {
-        _.error(error.message);
-        return;
-      }
-      cb(content.hits, content);
-    });
-  }
-};
-
-
-/***/ }),
-/* 63 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _ = __webpack_require__(0);
-var version = __webpack_require__(18);
-var parseAlgoliaClientVersion = __webpack_require__(19);
-
-module.exports = function popularIn(index, params, details, options) {
-  var algoliaVersion = parseAlgoliaClientVersion(index.as._ua);
-  if (algoliaVersion && algoliaVersion[0] >= 3 && algoliaVersion[1] > 20) {
-    params = params || {};
-    params.additionalUA = 'autocomplete.js ' + version;
-  }
-  if (!details.source) {
-    return _.error("Missing 'source' key");
-  }
-  var source = _.isFunction(details.source) ? details.source : function(hit) { return hit[details.source]; };
-
-  if (!details.index) {
-    return _.error("Missing 'index' key");
-  }
-  var detailsIndex = details.index;
-
-  options = options || {};
-
-  return sourceFn;
-
-  function sourceFn(query, cb) {
-    index.search(query, params, function(error, content) {
-      if (error) {
-        _.error(error.message);
-        return;
-      }
-
-      if (content.hits.length > 0) {
-        var first = content.hits[0];
-
-        var detailsParams = _.mixin({hitsPerPage: 0}, details);
-        delete detailsParams.source; // not a query parameter
-        delete detailsParams.index; // not a query parameter
-
-        var detailsAlgoliaVersion = parseAlgoliaClientVersion(detailsIndex.as._ua);
-        if (detailsAlgoliaVersion && detailsAlgoliaVersion[0] >= 3 && detailsAlgoliaVersion[1] > 20) {
-          params.additionalUA = 'autocomplete.js ' + version;
-        }
-
-        detailsIndex.search(source(first), detailsParams, function(error2, content2) {
-          if (error2) {
-            _.error(error2.message);
-            return;
-          }
-
-          var suggestions = [];
-
-          // add the 'all department' entry before others
-          if (options.includeAll) {
-            var label = options.allTitle || 'All departments';
-            suggestions.push(_.mixin({
-              facet: {value: label, count: content2.nbHits}
-            }, _.cloneDeep(first)));
-          }
-
-          // enrich the first hit iterating over the facets
-          _.each(content2.facets, function(values, facet) {
-            _.each(values, function(count, value) {
-              suggestions.push(_.mixin({
-                facet: {facet: facet, value: value, count: count}
-              }, _.cloneDeep(first)));
-            });
-          });
-
-          // append all other hits
-          for (var i = 1; i < content.hits.length; ++i) {
-            suggestions.push(content.hits[i]);
-          }
-
-          cb(suggestions, content);
-        });
-
-        return;
-      }
-
-      cb([]);
-    });
-  }
-};
-
-
-/***/ }),
-/* 64 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var prefix = 'algolia-docsearch';
-var suggestionPrefix = prefix + '-suggestion';
-var footerPrefix = prefix + '-footer';
-
-/* eslint-disable max-len */
-
-var templates = {
-  suggestion: '\n  <a class="' + suggestionPrefix + '\n    {{#isCategoryHeader}}' + suggestionPrefix + '__main{{/isCategoryHeader}}\n    {{#isSubCategoryHeader}}' + suggestionPrefix + '__secondary{{/isSubCategoryHeader}}\n    "\n    aria-label="Link to the result"\n    href="{{{url}}}"\n    >\n    <div class="' + suggestionPrefix + '--category-header">\n        <span class="' + suggestionPrefix + '--category-header-lvl0">{{{category}}}</span>\n    </div>\n    <div class="' + suggestionPrefix + '--wrapper">\n      <div class="' + suggestionPrefix + '--subcategory-column">\n        <span class="' + suggestionPrefix + '--subcategory-column-text">{{{subcategory}}}</span>\n      </div>\n      {{#isTextOrSubcategoryNonEmpty}}\n      <div class="' + suggestionPrefix + '--content">\n        <div class="' + suggestionPrefix + '--subcategory-inline">{{{subcategory}}}</div>\n        <div class="' + suggestionPrefix + '--title">{{{title}}}</div>\n        {{#text}}<div class="' + suggestionPrefix + '--text">{{{text}}}</div>{{/text}}\n      </div>\n      {{/isTextOrSubcategoryNonEmpty}}\n    </div>\n  </a>\n  ',
-  suggestionSimple: '\n  <div class="' + suggestionPrefix + '\n    {{#isCategoryHeader}}' + suggestionPrefix + '__main{{/isCategoryHeader}}\n    {{#isSubCategoryHeader}}' + suggestionPrefix + '__secondary{{/isSubCategoryHeader}}\n    suggestion-layout-simple\n  ">\n    <div class="' + suggestionPrefix + '--category-header">\n        {{^isLvl0}}\n        <span class="' + suggestionPrefix + '--category-header-lvl0 ' + suggestionPrefix + '--category-header-item">{{{category}}}</span>\n          {{^isLvl1}}\n          {{^isLvl1EmptyOrDuplicate}}\n          <span class="' + suggestionPrefix + '--category-header-lvl1 ' + suggestionPrefix + '--category-header-item">\n              {{{subcategory}}}\n          </span>\n          {{/isLvl1EmptyOrDuplicate}}\n          {{/isLvl1}}\n        {{/isLvl0}}\n        <div class="' + suggestionPrefix + '--title ' + suggestionPrefix + '--category-header-item">\n            {{#isLvl2}}\n                {{{title}}}\n            {{/isLvl2}}\n            {{#isLvl1}}\n                {{{subcategory}}}\n            {{/isLvl1}}\n            {{#isLvl0}}\n                {{{category}}}\n            {{/isLvl0}}\n        </div>\n    </div>\n    <div class="' + suggestionPrefix + '--wrapper">\n      {{#text}}\n      <div class="' + suggestionPrefix + '--content">\n        <div class="' + suggestionPrefix + '--text">{{{text}}}</div>\n      </div>\n      {{/text}}\n    </div>\n  </div>\n  ',
-  footer: '\n    <div class="' + footerPrefix + '">\n      Search by <a class="' + footerPrefix + '--logo" href="https://www.algolia.com/docsearch">Algolia</a>\n    </div>\n  ',
-  empty: '\n  <div class="' + suggestionPrefix + '">\n    <div class="' + suggestionPrefix + '--wrapper">\n        <div class="' + suggestionPrefix + '--content ' + suggestionPrefix + '--no-results">\n            <div class="' + suggestionPrefix + '--title">\n                <div class="' + suggestionPrefix + '--text">\n                    No results found for query <b>"{{query}}"</b>\n                </div>\n            </div>\n        </div>\n    </div>\n  </div>\n  ',
-  searchBox: '\n  <form novalidate="novalidate" onsubmit="return false;" class="searchbox">\n    <div role="search" class="searchbox__wrapper">\n      <input id="docsearch" type="search" name="search" placeholder="Search the docs" autocomplete="off" required="required" class="searchbox__input"/>\n      <button type="submit" title="Submit your search query." class="searchbox__submit" >\n        <svg width=12 height=12 role="img" aria-label="Search">\n          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#sbx-icon-search-13"></use>\n        </svg>\n      </button>\n      <button type="reset" title="Clear the search query." class="searchbox__reset hide">\n        <svg width=12 height=12 role="img" aria-label="Reset">\n          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#sbx-icon-clear-3"></use>\n        </svg>\n      </button>\n    </div>\n</form>\n\n<div class="svg-icons" style="height: 0; width: 0; position: absolute; visibility: hidden">\n  <svg xmlns="http://www.w3.org/2000/svg">\n    <symbol id="sbx-icon-clear-3" viewBox="0 0 40 40"><path d="M16.228 20L1.886 5.657 0 3.772 3.772 0l1.885 1.886L20 16.228 34.343 1.886 36.228 0 40 3.772l-1.886 1.885L23.772 20l14.342 14.343L40 36.228 36.228 40l-1.885-1.886L20 23.772 5.657 38.114 3.772 40 0 36.228l1.886-1.885L16.228 20z" fill-rule="evenodd"></symbol>\n    <symbol id="sbx-icon-search-13" viewBox="0 0 40 40"><path d="M26.806 29.012a16.312 16.312 0 0 1-10.427 3.746C7.332 32.758 0 25.425 0 16.378 0 7.334 7.333 0 16.38 0c9.045 0 16.378 7.333 16.378 16.38 0 3.96-1.406 7.593-3.746 10.426L39.547 37.34c.607.608.61 1.59-.004 2.203a1.56 1.56 0 0 1-2.202.004L26.807 29.012zm-10.427.627c7.322 0 13.26-5.938 13.26-13.26 0-7.324-5.938-13.26-13.26-13.26-7.324 0-13.26 5.936-13.26 13.26 0 7.322 5.936 13.26 13.26 13.26z" fill-rule="evenodd"></symbol>\n  </svg>\n</div>\n  '
-};
-
-exports.default = templates;
-
-/***/ }),
-/* 65 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _zepto = __webpack_require__(20);
-
-var _zepto2 = _interopRequireDefault(_zepto);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var utils = {
-  /*
-  * Move the content of an object key one level higher.
-  * eg.
-  * {
-  *   name: 'My name',
-  *   hierarchy: {
-  *     lvl0: 'Foo',
-  *     lvl1: 'Bar'
-  *   }
-  * }
-  * Will be converted to
-  * {
-  *   name: 'My name',
-  *   lvl0: 'Foo',
-  *   lvl1: 'Bar'
-  * }
-  * @param {Object} object Main object
-  * @param {String} property Main object key to move up
-  * @return {Object}
-  * @throws Error when key is not an attribute of Object or is not an object itself
-  */
-  mergeKeyWithParent: function mergeKeyWithParent(object, property) {
-    if (object[property] === undefined) {
-      return object;
-    }
-    if (_typeof(object[property]) !== 'object') {
-      return object;
-    }
-    var newObject = _zepto2.default.extend({}, object, object[property]);
-    delete newObject[property];
-    return newObject;
-  },
-
-  /*
-  * Group all objects of a collection by the value of the specified attribute
-  * If the attribute is a string, use the lowercase form.
-  *
-  * eg.
-  * groupBy([
-  *   {name: 'Tim', category: 'dev'},
-  *   {name: 'Vincent', category: 'dev'},
-  *   {name: 'Ben', category: 'sales'},
-  *   {name: 'Jeremy', category: 'sales'},
-  *   {name: 'AlexS', category: 'dev'},
-  *   {name: 'AlexK', category: 'sales'}
-  * ], 'category');
-  * =>
-  * {
-  *   'devs': [
-  *     {name: 'Tim', category: 'dev'},
-  *     {name: 'Vincent', category: 'dev'},
-  *     {name: 'AlexS', category: 'dev'}
-  *   ],
-  *   'sales': [
-  *     {name: 'Ben', category: 'sales'},
-  *     {name: 'Jeremy', category: 'sales'},
-  *     {name: 'AlexK', category: 'sales'}
-  *   ]
-  * }
-  * @param {array} collection Array of objects to group
-  * @param {String} property The attribute on which apply the grouping
-  * @return {array}
-  * @throws Error when one of the element does not have the specified property
-  */
-  groupBy: function groupBy(collection, property) {
-    var newCollection = {};
-    _zepto2.default.each(collection, function (index, item) {
-      if (item[property] === undefined) {
-        throw new Error('[groupBy]: Object has no key ' + property);
-      }
-      var key = item[property];
-      if (typeof key === 'string') {
-        key = key.toLowerCase();
-      }
-      // fix #171 the given data type of docsearch hits might be conflict with the properties of the native Object,
-      // such as the constructor, so we need to do this check.
-      if (!Object.prototype.hasOwnProperty.call(newCollection, key)) {
-        newCollection[key] = [];
-      }
-      newCollection[key].push(item);
-    });
-    return newCollection;
-  },
-
-  /*
-  * Return an array of all the values of the specified object
-  * eg.
-  * values({
-  *   foo: 42,
-  *   bar: true,
-  *   baz: 'yep'
-  * })
-  * =>
-  * [42, true, yep]
-  * @param {object} object Object to extract values from
-  * @return {array}
-  */
-  values: function values(object) {
-    return Object.keys(object).map(function (key) {
-      return object[key];
-    });
-  },
-
-  /*
-  * Flattens an array
-  * eg.
-  * flatten([1, 2, [3, 4], [5, 6]])
-  * =>
-  * [1, 2, 3, 4, 5, 6]
-  * @param {array} array Array to flatten
-  * @return {array}
-  */
-  flatten: function flatten(array) {
-    var results = [];
-    array.forEach(function (value) {
-      if (!Array.isArray(value)) {
-        results.push(value);
-        return;
-      }
-      value.forEach(function (subvalue) {
-        results.push(subvalue);
-      });
-    });
-    return results;
-  },
-
-  /*
-  * Flatten all values of an object into an array, marking each first element of
-  * each group with a specific flag
-  * eg.
-  * flattenAndFlagFirst({
-  *   'devs': [
-  *     {name: 'Tim', category: 'dev'},
-  *     {name: 'Vincent', category: 'dev'},
-  *     {name: 'AlexS', category: 'dev'}
-  *   ],
-  *   'sales': [
-  *     {name: 'Ben', category: 'sales'},
-  *     {name: 'Jeremy', category: 'sales'},
-  *     {name: 'AlexK', category: 'sales'}
-  *   ]
-  * , 'isTop');
-  * =>
-  * [
-  *     {name: 'Tim', category: 'dev', isTop: true},
-  *     {name: 'Vincent', category: 'dev', isTop: false},
-  *     {name: 'AlexS', category: 'dev', isTop: false},
-  *     {name: 'Ben', category: 'sales', isTop: true},
-  *     {name: 'Jeremy', category: 'sales', isTop: false},
-  *     {name: 'AlexK', category: 'sales', isTop: false}
-  * ]
-  * @param {object} object Object to flatten
-  * @param {string} flag Flag to set to true on first element of each group
-  * @return {array}
-  */
-  flattenAndFlagFirst: function flattenAndFlagFirst(object, flag) {
-    var values = this.values(object).map(function (collection) {
-      return collection.map(function (item, index) {
-        // eslint-disable-next-line no-param-reassign
-        item[flag] = index === 0;
-        return item;
-      });
-    });
-    return this.flatten(values);
-  },
-
-  /*
-  * Removes all empty strings, null, false and undefined elements array
-  * eg.
-  * compact([42, false, null, undefined, '', [], 'foo']);
-  * =>
-  * [42, [], 'foo']
-  * @param {array} array Array to compact
-  * @return {array}
-  */
-  compact: function compact(array) {
-    var results = [];
-    array.forEach(function (value) {
-      if (!value) {
-        return;
-      }
-      results.push(value);
-    });
-    return results;
-  },
-
-  /*
-   * Returns the highlighted value of the specified key in the specified object.
-   * If no highlighted value is available, will return the key value directly
-   * eg.
-   * getHighlightedValue({
-   *    _highlightResult: {
-   *      text: {
-   *        value: '<mark>foo</mark>'
-   *      }
-   *    },
-   *    text: 'foo'
-   * }, 'text');
-   * =>
-   * '<mark>foo</mark>'
-   * @param {object} object Hit object returned by the Algolia API
-   * @param {string} property Object key to look for
-   * @return {string}
-   **/
-  getHighlightedValue: function getHighlightedValue(object, property) {
-    if (object._highlightResult && object._highlightResult.hierarchy_camel && object._highlightResult.hierarchy_camel[property] && object._highlightResult.hierarchy_camel[property].matchLevel && object._highlightResult.hierarchy_camel[property].matchLevel !== 'none' && object._highlightResult.hierarchy_camel[property].value) {
-      return object._highlightResult.hierarchy_camel[property].value;
-    }
-    if (object._highlightResult && object._highlightResult && object._highlightResult[property] && object._highlightResult[property].value) {
-      return object._highlightResult[property].value;
-    }
-    return object[property];
-  },
-
-  /*
-   * Returns the snippeted value of the specified key in the specified object.
-   * If no highlighted value is available, will return the key value directly.
-   * Will add starting and ending ellipsis (…) if we detect that a sentence is
-   * incomplete
-   * eg.
-   * getSnippetedValue({
-   *    _snippetResult: {
-   *      text: {
-   *        value: '<mark>This is an unfinished sentence</mark>'
-   *      }
-   *    },
-   *    text: 'This is an unfinished sentence'
-   * }, 'text');
-   * =>
-   * '<mark>This is an unfinished sentence</mark>…'
-   * @param {object} object Hit object returned by the Algolia API
-   * @param {string} property Object key to look for
-   * @return {string}
-   **/
-  getSnippetedValue: function getSnippetedValue(object, property) {
-    if (!object._snippetResult || !object._snippetResult[property] || !object._snippetResult[property].value) {
-      return object[property];
-    }
-    var snippet = object._snippetResult[property].value;
-
-    if (snippet[0] !== snippet[0].toUpperCase()) {
-      snippet = '\u2026' + snippet;
-    }
-    if (['.', '!', '?'].indexOf(snippet[snippet.length - 1]) === -1) {
-      snippet = snippet + '\u2026';
-    }
-    return snippet;
-  },
-
-  /*
-  * Deep clone an object.
-  * Note: This will not clone functions and dates
-  * @param {object} object Object to clone
-  * @return {object}
-  */
-  deepClone: function deepClone(object) {
-    return JSON.parse(JSON.stringify(object));
-  }
-};
-
-exports.default = utils;
-
-/***/ })
-/******/ ]);
-});
-//# sourceMappingURL=docsearch.js.map
diff --git a/website/js/externs.js b/website/js/externs.js
deleted file mode 100644
index 36cdbeb1327..00000000000
--- a/website/js/externs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var Ya;
-var global;
-var needsContext;
-var matchExpr;
-function require() {};
-function docsearch() {};
diff --git a/website/js/index.js b/website/js/index.js
deleted file mode 100644
index 1ce692fb696..00000000000
--- a/website/js/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function serializeForm(form){
-    var result = {};
-    $.map(form.serializeArray(), function(n, i){
-        result[n['name']] = n['value'];
-    });
-    return result;
-};
-
-$(document).ready(function () {
-    var meetup_form = $('#meetup-form');
-    $("#meetup-form-send").on('click', function(e) {
-        e.preventDefault();
-        var valid = true;
-        var required_fields = $('#meetup-form input[required="true"]');
-        $.each(required_fields, function(idx) {
-            var input = $(required_fields[idx]);
-            if (!input.val()) {
-                valid = false;
-                input.addClass('border-danger');
-            } else {
-                input.removeClass('border-danger');
-            }
-        });
-        if (valid) {
-            var data = JSON.stringify(serializeForm(meetup_form));
-            $.ajax({
-                url: '/meet-form/',
-                type: 'POST',
-                dataType: 'json',
-                data: data,
-                success: function () {
-                    meetup_form.html('<div class="alert alert-success mt-3"><h2>Thanks!</h2><p class="lead">We\'ll be in touch soon.</p></div>');
-                    $('#meetup-form-error').html('');
-                },
-                error: function () {
-                    $('#meetup-form-error').html('<div class="alert alert-danger mt-3"><strong>Error!</strong> Unfortunately it didn\'t work for some reason, please try again or use the email address below.</div>');
-                }
-            });
-        }
-        return false;
-    });
-});
diff --git a/website/js/jquery.js b/website/js/jquery.js
deleted file mode 100644
index 21707563986..00000000000
--- a/website/js/jquery.js
+++ /dev/null
@@ -1,10872 +0,0 @@
-/*!
- * jQuery JavaScript Library v3.5.0
- * https://jquery.com/
- *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2020-04-10T15:07Z
- */
-( function( global, factory ) {
-
-	"use strict";
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
-// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
-// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
-// enough that all such attempts are guarded in a try block.
-"use strict";
-
-var arr = [];
-
-var getProto = Object.getPrototypeOf;
-
-var slice = arr.slice;
-
-var flat = arr.flat ? function( array ) {
-	return arr.flat.call( array );
-} : function( array ) {
-	return arr.concat.apply( [], array );
-};
-
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var fnToString = hasOwn.toString;
-
-var ObjectFunctionString = fnToString.call( Object );
-
-var support = {};
-
-var isFunction = function isFunction( obj ) {
-
-      // Support: Chrome <=57, Firefox <=52
-      // In some browsers, typeof returns "function" for HTML <object> elements
-      // (i.e., `typeof document.createElement( "object" ) === "function"`).
-      // We don't want to classify *any* DOM node as a function.
-      return typeof obj === "function" && typeof obj.nodeType !== "number";
-  };
-
-
-var isWindow = function isWindow( obj ) {
-		return obj != null && obj === obj.window;
-	};
-
-
-var document = window.document;
-
-
-
-	var preservedScriptAttributes = {
-		type: true,
-		src: true,
-		nonce: true,
-		noModule: true
-	};
-
-	function DOMEval( code, node, doc ) {
-		doc = doc || document;
-
-		var i, val,
-			script = doc.createElement( "script" );
-
-		script.text = code;
-		if ( node ) {
-			for ( i in preservedScriptAttributes ) {
-
-				// Support: Firefox 64+, Edge 18+
-				// Some browsers don't support the "nonce" property on scripts.
-				// On the other hand, just using `getAttribute` is not enough as
-				// the `nonce` attribute is reset to an empty string whenever it
-				// becomes browsing-context connected.
-				// See https://github.com/whatwg/html/issues/2369
-				// See https://html.spec.whatwg.org/#nonce-attributes
-				// The `node.getAttribute` check was added for the sake of
-				// `jQuery.globalEval` so that it can fake a nonce-containing node
-				// via an object.
-				val = node[ i ] || node.getAttribute && node.getAttribute( i );
-				if ( val ) {
-					script.setAttribute( i, val );
-				}
-			}
-		}
-		doc.head.appendChild( script ).parentNode.removeChild( script );
-	}
-
-
-function toType( obj ) {
-	if ( obj == null ) {
-		return obj + "";
-	}
-
-	// Support: Android <=2.3 only (functionish RegExp)
-	return typeof obj === "object" || typeof obj === "function" ?
-		class2type[ toString.call( obj ) ] || "object" :
-		typeof obj;
-}
-/* global Symbol */
-// Defining this global in .eslintrc.json would create a danger of using the global
-// unguarded in another place, it seems safer to define global only for this module
-
-
-
-var
-	version = "3.5.0",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	};
-
-jQuery.fn = jQuery.prototype = {
-
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-
-		// Return all the elements in a clean array
-		if ( num == null ) {
-			return slice.call( this );
-		}
-
-		// Return just the one element from the set
-		return num < 0 ? this[ num + this.length ] : this[ num ];
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	each: function( callback ) {
-		return jQuery.each( this, callback );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map( this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		} ) );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	even: function() {
-		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
-			return ( i + 1 ) % 2;
-		} ) );
-	},
-
-	odd: function() {
-		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
-			return i % 2;
-		} ) );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor();
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[ 0 ] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// Skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !isFunction( target ) ) {
-		target = {};
-	}
-
-	// Extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-
-		// Only deal with non-null/undefined values
-		if ( ( options = arguments[ i ] ) != null ) {
-
-			// Extend the base object
-			for ( name in options ) {
-				copy = options[ name ];
-
-				// Prevent Object.prototype pollution
-				// Prevent never-ending loop
-				if ( name === "__proto__" || target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
-					( copyIsArray = Array.isArray( copy ) ) ) ) {
-					src = target[ name ];
-
-					// Ensure proper type for the source value
-					if ( copyIsArray && !Array.isArray( src ) ) {
-						clone = [];
-					} else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) {
-						clone = {};
-					} else {
-						clone = src;
-					}
-					copyIsArray = false;
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend( {
-
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	isPlainObject: function( obj ) {
-		var proto, Ctor;
-
-		// Detect obvious negatives
-		// Use toString instead of jQuery.type to catch host objects
-		if ( !obj || toString.call( obj ) !== "[object Object]" ) {
-			return false;
-		}
-
-		proto = getProto( obj );
-
-		// Objects with no prototype (e.g., `Object.create( null )`) are plain
-		if ( !proto ) {
-			return true;
-		}
-
-		// Objects with prototype are plain iff they were constructed by a global Object function
-		Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
-		return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	// Evaluates a script in a provided context; falls back to the global one
-	// if not specified.
-	globalEval: function( code, options, doc ) {
-		DOMEval( code, { nonce: options && options.nonce }, doc );
-	},
-
-	each: function( obj, callback ) {
-		var length, i = 0;
-
-		if ( isArrayLike( obj ) ) {
-			length = obj.length;
-			for ( ; i < length; i++ ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		} else {
-			for ( i in obj ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArrayLike( Object( arr ) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	// Support: Android <=4.0 only, PhantomJS 1 only
-	// push.apply(_, arraylike) throws on ancient WebKit
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var length, value,
-			i = 0,
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArrayLike( elems ) ) {
-			length = elems.length;
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return flat( ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-} );
-
-if ( typeof Symbol === "function" ) {
-	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
-}
-
-// Populate the class2type map
-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( _i, name ) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
-
-function isArrayLike( obj ) {
-
-	// Support: real iOS 8.2 only (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = !!obj && "length" in obj && obj.length,
-		type = toType( obj );
-
-	if ( isFunction( obj ) || isWindow( obj ) ) {
-		return false;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.3.5
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://js.foundation/
- *
- * Date: 2020-03-14
- */
-( function( window ) {
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	nonnativeSelectorCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// Instance methods
-	hasOwn = ( {} ).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	pushNative = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-
-	// Use a stripped-down indexOf as it's faster than native
-	// https://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[ i ] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
-		"ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-
-	// https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
-	identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
-		"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
-
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-
-		// "Attribute values must be CSS identifiers [capture 5]
-		// or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
-		whitespace + "*\\]",
-
-	pseudos = ":(" + identifier + ")(?:\\((" +
-
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
-		whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
-		"*" ),
-	rdescend = new RegExp( whitespace + "|>" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + identifier + ")" ),
-		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
-		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
-			whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
-			whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace +
-			"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
-			"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rhtml = /HTML$/i,
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-
-	// CSS escapes
-	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
-	funescape = function( escape, nonHex ) {
-		var high = "0x" + escape.slice( 1 ) - 0x10000;
-
-		return nonHex ?
-
-			// Strip the backslash prefix from a non-hex escape sequence
-			nonHex :
-
-			// Replace a hexadecimal escape sequence with the encoded Unicode code point
-			// Support: IE <=11+
-			// For values outside the Basic Multilingual Plane (BMP), manually construct a
-			// surrogate pair
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// CSS string/identifier serialization
-	// https://drafts.csswg.org/cssom/#common-serializing-idioms
-	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
-	fcssescape = function( ch, asCodePoint ) {
-		if ( asCodePoint ) {
-
-			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-			if ( ch === "\0" ) {
-				return "\uFFFD";
-			}
-
-			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" +
-				ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
-		}
-
-		// Other potentially-special ASCII characters get backslash-escaped
-		return "\\" + ch;
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	},
-
-	inDisabledFieldset = addCombinator(
-		function( elem ) {
-			return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset";
-		},
-		{ dir: "parentNode", next: "legend" }
-	);
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		( arr = slice.call( preferredDoc.childNodes ) ),
-		preferredDoc.childNodes
-	);
-
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	// eslint-disable-next-line no-unused-expressions
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			pushNative.apply( target, slice.call( els ) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-
-			// Can't trust NodeList.length
-			while ( ( target[ j++ ] = els[ i++ ] ) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var m, i, elem, nid, match, groups, newSelector,
-		newContext = context && context.ownerDocument,
-
-		// nodeType defaults to 9, since context defaults to document
-		nodeType = context ? context.nodeType : 9;
-
-	results = results || [];
-
-	// Return early from calls with invalid selector or context
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	// Try to shortcut find operations (as opposed to filters) in HTML documents
-	if ( !seed ) {
-		setDocument( context );
-		context = context || document;
-
-		if ( documentIsHTML ) {
-
-			// If the selector is sufficiently simple, try using a "get*By*" DOM method
-			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) {
-
-				// ID selector
-				if ( ( m = match[ 1 ] ) ) {
-
-					// Document context
-					if ( nodeType === 9 ) {
-						if ( ( elem = context.getElementById( m ) ) ) {
-
-							// Support: IE, Opera, Webkit
-							// TODO: identify versions
-							// getElementById can match elements by name instead of ID
-							if ( elem.id === m ) {
-								results.push( elem );
-								return results;
-							}
-						} else {
-							return results;
-						}
-
-					// Element context
-					} else {
-
-						// Support: IE, Opera, Webkit
-						// TODO: identify versions
-						// getElementById can match elements by name instead of ID
-						if ( newContext && ( elem = newContext.getElementById( m ) ) &&
-							contains( context, elem ) &&
-							elem.id === m ) {
-
-							results.push( elem );
-							return results;
-						}
-					}
-
-				// Type selector
-				} else if ( match[ 2 ] ) {
-					push.apply( results, context.getElementsByTagName( selector ) );
-					return results;
-
-				// Class selector
-				} else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
-					context.getElementsByClassName ) {
-
-					push.apply( results, context.getElementsByClassName( m ) );
-					return results;
-				}
-			}
-
-			// Take advantage of querySelectorAll
-			if ( support.qsa &&
-				!nonnativeSelectorCache[ selector + " " ] &&
-				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
-
-				// Support: IE 8 only
-				// Exclude object elements
-				( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
-
-				newSelector = selector;
-				newContext = context;
-
-				// qSA considers elements outside a scoping root when evaluating child or
-				// descendant combinators, which is not what we want.
-				// In such cases, we work around the behavior by prefixing every selector in the
-				// list with an ID selector referencing the scope context.
-				// The technique has to be used as well when a leading combinator is used
-				// as such selectors are not recognized by querySelectorAll.
-				// Thanks to Andrew Dupont for this technique.
-				if ( nodeType === 1 &&
-					( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
-
-					// We can use :scope instead of the ID hack if the browser
-					// supports it & if we're not changing the context.
-					if ( newContext !== context || !support.scope ) {
-
-						// Capture the context ID, setting it first if necessary
-						if ( ( nid = context.getAttribute( "id" ) ) ) {
-							nid = nid.replace( rcssescape, fcssescape );
-						} else {
-							context.setAttribute( "id", ( nid = expando ) );
-						}
-					}
-
-					// Prefix every selector in the list
-					groups = tokenize( selector );
-					i = groups.length;
-					while ( i-- ) {
-						groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " +
-							toSelector( groups[ i ] );
-					}
-					newSelector = groups.join( "," );
-				}
-
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch ( qsaError ) {
-					nonnativeSelectorCache( selector, true );
-				} finally {
-					if ( nid === expando ) {
-						context.removeAttribute( "id" );
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {function(string, object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return ( cache[ key + " " ] = value );
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created element and returns a boolean result
- */
-function assert( fn ) {
-	var el = document.createElement( "fieldset" );
-
-	try {
-		return !!fn( el );
-	} catch ( e ) {
-		return false;
-	} finally {
-
-		// Remove from its parent by default
-		if ( el.parentNode ) {
-			el.parentNode.removeChild( el );
-		}
-
-		// release memory in IE
-		el = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split( "|" ),
-		i = arr.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[ i ] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			a.sourceIndex - b.sourceIndex;
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( ( cur = cur.nextSibling ) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return ( name === "input" || name === "button" ) && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for :enabled/:disabled
- * @param {Boolean} disabled true for :disabled; false for :enabled
- */
-function createDisabledPseudo( disabled ) {
-
-	// Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
-	return function( elem ) {
-
-		// Only certain elements can match :enabled or :disabled
-		// https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
-		// https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
-		if ( "form" in elem ) {
-
-			// Check for inherited disabledness on relevant non-disabled elements:
-			// * listed form-associated elements in a disabled fieldset
-			//   https://html.spec.whatwg.org/multipage/forms.html#category-listed
-			//   https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
-			// * option elements in a disabled optgroup
-			//   https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
-			// All such elements have a "form" property.
-			if ( elem.parentNode && elem.disabled === false ) {
-
-				// Option elements defer to a parent optgroup if present
-				if ( "label" in elem ) {
-					if ( "label" in elem.parentNode ) {
-						return elem.parentNode.disabled === disabled;
-					} else {
-						return elem.disabled === disabled;
-					}
-				}
-
-				// Support: IE 6 - 11
-				// Use the isDisabled shortcut property to check for disabled fieldset ancestors
-				return elem.isDisabled === disabled ||
-
-					// Where there is no isDisabled, check manually
-					/* jshint -W018 */
-					elem.isDisabled !== !disabled &&
-					inDisabledFieldset( elem ) === disabled;
-			}
-
-			return elem.disabled === disabled;
-
-		// Try to winnow out elements that can't be disabled before trusting the disabled property.
-		// Some victims get caught in our net (label, legend, menu, track), but it shouldn't
-		// even exist on them, let alone have a boolean value.
-		} else if ( "label" in elem ) {
-			return elem.disabled === disabled;
-		}
-
-		// Remaining elements are neither :enabled nor :disabled
-		return false;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction( function( argument ) {
-		argument = +argument;
-		return markFunction( function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ ( j = matchIndexes[ i ] ) ] ) {
-					seed[ j ] = !( matches[ j ] = seed[ j ] );
-				}
-			}
-		} );
-	} );
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	var namespace = elem.namespaceURI,
-		docElem = ( elem.ownerDocument || elem ).documentElement;
-
-	// Support: IE <=8
-	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
-	// https://bugs.jquery.com/ticket/4833
-	return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" );
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, subWindow,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// Return early if doc is invalid or already selected
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Update global variables
-	document = doc;
-	docElem = document.documentElement;
-	documentIsHTML = !isXML( document );
-
-	// Support: IE 9 - 11+, Edge 12 - 18+
-	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( preferredDoc != document &&
-		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
-
-		// Support: IE 11, Edge
-		if ( subWindow.addEventListener ) {
-			subWindow.addEventListener( "unload", unloadHandler, false );
-
-		// Support: IE 9 - 10 only
-		} else if ( subWindow.attachEvent ) {
-			subWindow.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	// Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
-	// Safari 4 - 5 only, Opera <=11.6 - 12.x only
-	// IE/Edge & older browsers don't support the :scope pseudo-class.
-	// Support: Safari 6.0 only
-	// Safari 6.0 supports :scope but it's an alias of :root there.
-	support.scope = assert( function( el ) {
-		docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
-		return typeof el.querySelectorAll !== "undefined" &&
-			!el.querySelectorAll( ":scope fieldset div" ).length;
-	} );
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert( function( el ) {
-		el.className = "i";
-		return !el.getAttribute( "className" );
-	} );
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert( function( el ) {
-		el.appendChild( document.createComment( "" ) );
-		return !el.getElementsByTagName( "*" ).length;
-	} );
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programmatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert( function( el ) {
-		docElem.appendChild( el ).id = expando;
-		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	} );
-
-	// ID filter and find
-	if ( support.getById ) {
-		Expr.filter[ "ID" ] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute( "id" ) === attrId;
-			};
-		};
-		Expr.find[ "ID" ] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var elem = context.getElementById( id );
-				return elem ? [ elem ] : [];
-			}
-		};
-	} else {
-		Expr.filter[ "ID" ] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode( "id" );
-				return node && node.value === attrId;
-			};
-		};
-
-		// Support: IE 6 - 7 only
-		// getElementById is not reliable as a find shortcut
-		Expr.find[ "ID" ] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var node, i, elems,
-					elem = context.getElementById( id );
-
-				if ( elem ) {
-
-					// Verify the id attribute
-					node = elem.getAttributeNode( "id" );
-					if ( node && node.value === id ) {
-						return [ elem ];
-					}
-
-					// Fall back on getElementsByName
-					elems = context.getElementsByName( id );
-					i = 0;
-					while ( ( elem = elems[ i++ ] ) ) {
-						node = elem.getAttributeNode( "id" );
-						if ( node && node.value === id ) {
-							return [ elem ];
-						}
-					}
-				}
-
-				return [];
-			}
-		};
-	}
-
-	// Tag
-	Expr.find[ "TAG" ] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( ( elem = results[ i++ ] ) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See https://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
-
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert( function( el ) {
-
-			var input;
-
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// https://bugs.jquery.com/ticket/12359
-			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !el.querySelectorAll( "[selected]" ).length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push( "~=" );
-			}
-
-			// Support: IE 11+, Edge 15 - 18+
-			// IE 11/Edge don't find elements on a `[name='']` query in some cases.
-			// Adding a temporary attribute to the document before the selection works
-			// around the issue.
-			// Interestingly, IE 10 & older don't seem to have the issue.
-			input = document.createElement( "input" );
-			input.setAttribute( "name", "" );
-			el.appendChild( input );
-			if ( !el.querySelectorAll( "[name='']" ).length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
-					whitespace + "*(?:''|\"\")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !el.querySelectorAll( ":checked" ).length ) {
-				rbuggyQSA.push( ":checked" );
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibling-combinator selector` fails
-			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push( ".#.+[+~]" );
-			}
-
-			// Support: Firefox <=3.6 - 5 only
-			// Old Firefox doesn't throw on a badly-escaped identifier.
-			el.querySelectorAll( "\\\f" );
-			rbuggyQSA.push( "[\\r\\n\\f]" );
-		} );
-
-		assert( function( el ) {
-			el.innerHTML = "<a href='' disabled='disabled'></a>" +
-				"<select disabled='disabled'><option/></select>";
-
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement( "input" );
-			input.setAttribute( "type", "hidden" );
-			el.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( el.querySelectorAll( "[name=d]" ).length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Support: IE9-11+
-			// IE's :disabled selector does not pick up the children of disabled fieldsets
-			docElem.appendChild( el ).disabled = true;
-			if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Support: Opera 10 - 11 only
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			el.querySelectorAll( "*,:x" );
-			rbuggyQSA.push( ",.*:" );
-		} );
-	}
-
-	if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector ) ) ) ) {
-
-		assert( function( el ) {
-
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( el, "*" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( el, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		} );
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully self-exclusive
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			) );
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( ( b = b.parentNode ) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		// Support: IE 11+, Edge 17 - 18+
-		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-		// two documents; shallow comparisons work.
-		// eslint-disable-next-line eqeqeq
-		compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) {
-
-			// Choose the first element that is related to our preferred document
-			// Support: IE 11+, Edge 17 - 18+
-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-			// two documents; shallow comparisons work.
-			// eslint-disable-next-line eqeqeq
-			if ( a == document || a.ownerDocument == preferredDoc &&
-				contains( preferredDoc, a ) ) {
-				return -1;
-			}
-
-			// Support: IE 11+, Edge 17 - 18+
-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-			// two documents; shallow comparisons work.
-			// eslint-disable-next-line eqeqeq
-			if ( b == document || b.ownerDocument == preferredDoc &&
-				contains( preferredDoc, b ) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-
-			// Support: IE 11+, Edge 17 - 18+
-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-			// two documents; shallow comparisons work.
-			/* eslint-disable eqeqeq */
-			return a == document ? -1 :
-				b == document ? 1 :
-				/* eslint-enable eqeqeq */
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( ( cur = cur.parentNode ) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( ( cur = cur.parentNode ) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[ i ] === bp[ i ] ) {
-			i++;
-		}
-
-		return i ?
-
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[ i ], bp[ i ] ) :
-
-			// Otherwise nodes in our document sort first
-			// Support: IE 11+, Edge 17 - 18+
-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-			// two documents; shallow comparisons work.
-			/* eslint-disable eqeqeq */
-			ap[ i ] == preferredDoc ? -1 :
-			bp[ i ] == preferredDoc ? 1 :
-			/* eslint-enable eqeqeq */
-			0;
-	};
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	setDocument( elem );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		!nonnativeSelectorCache[ expr + " " ] &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-
-				// As well, disconnected nodes are said to be in a document
-				// fragment in IE 9
-				elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch ( e ) {
-			nonnativeSelectorCache( expr, true );
-		}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-
-	// Set document vars if needed
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( ( context.ownerDocument || context ) != document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-
-	// Set document vars if needed
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( ( elem.ownerDocument || elem ) != document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			( val = elem.getAttributeNode( name ) ) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.escape = function( sel ) {
-	return ( sel + "" ).replace( rcssescape, fcssescape );
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( ( elem = results[ i++ ] ) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-
-		// If no nodeType, this is expected to be an array
-		while ( ( node = elem[ i++ ] ) ) {
-
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[ 1 ] = match[ 1 ].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
-				match[ 5 ] || "" ).replace( runescape, funescape );
-
-			if ( match[ 2 ] === "~=" ) {
-				match[ 3 ] = " " + match[ 3 ] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[ 1 ] = match[ 1 ].toLowerCase();
-
-			if ( match[ 1 ].slice( 0, 3 ) === "nth" ) {
-
-				// nth-* requires argument
-				if ( !match[ 3 ] ) {
-					Sizzle.error( match[ 0 ] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[ 4 ] = +( match[ 4 ] ?
-					match[ 5 ] + ( match[ 6 ] || 1 ) :
-					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
-				match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
-
-				// other types prohibit arguments
-			} else if ( match[ 3 ] ) {
-				Sizzle.error( match[ 0 ] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[ 6 ] && match[ 2 ];
-
-			if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[ 3 ] ) {
-				match[ 2 ] = match[ 4 ] || match[ 5 ] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-
-				// Get excess from tokenize (recursively)
-				( excess = tokenize( unquoted, true ) ) &&
-
-				// advance to the next closing parenthesis
-				( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) {
-
-				// excess is a negative index
-				match[ 0 ] = match[ 0 ].slice( 0, excess );
-				match[ 2 ] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() {
-					return true;
-				} :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				( pattern = new RegExp( "(^|" + whitespace +
-					")" + className + "(" + whitespace + "|$)" ) ) && classCache(
-						className, function( elem ) {
-							return pattern.test(
-								typeof elem.className === "string" && elem.className ||
-								typeof elem.getAttribute !== "undefined" &&
-									elem.getAttribute( "class" ) ||
-								""
-							);
-				} );
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				/* eslint-disable max-len */
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-				/* eslint-enable max-len */
-
-			};
-		},
-
-		"CHILD": function( type, what, _argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, _context, xml ) {
-					var cache, uniqueCache, outerCache, node, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType,
-						diff = false;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( ( node = node[ dir ] ) ) {
-									if ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) {
-
-										return false;
-									}
-								}
-
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-
-							// Seek `elem` from a previously-cached index
-
-							// ...in a gzip-friendly way
-							node = parent;
-							outerCache = node[ expando ] || ( node[ expando ] = {} );
-
-							// Support: IE <9 only
-							// Defend against cloned attroperties (jQuery gh-1709)
-							uniqueCache = outerCache[ node.uniqueID ] ||
-								( outerCache[ node.uniqueID ] = {} );
-
-							cache = uniqueCache[ type ] || [];
-							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-							diff = nodeIndex && cache[ 2 ];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( ( node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								( diff = nodeIndex = 0 ) || start.pop() ) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						} else {
-
-							// Use previously-cached element index if available
-							if ( useCache ) {
-
-								// ...in a gzip-friendly way
-								node = elem;
-								outerCache = node[ expando ] || ( node[ expando ] = {} );
-
-								// Support: IE <9 only
-								// Defend against cloned attroperties (jQuery gh-1709)
-								uniqueCache = outerCache[ node.uniqueID ] ||
-									( outerCache[ node.uniqueID ] = {} );
-
-								cache = uniqueCache[ type ] || [];
-								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-								diff = nodeIndex;
-							}
-
-							// xml :nth-child(...)
-							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
-							if ( diff === false ) {
-
-								// Use the same loop as above to seek `elem` from the start
-								while ( ( node = ++nodeIndex && node && node[ dir ] ||
-									( diff = nodeIndex = 0 ) || start.pop() ) ) {
-
-									if ( ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) &&
-										++diff ) {
-
-										// Cache the index of each encountered element
-										if ( useCache ) {
-											outerCache = node[ expando ] ||
-												( node[ expando ] = {} );
-
-											// Support: IE <9 only
-											// Defend against cloned attroperties (jQuery gh-1709)
-											uniqueCache = outerCache[ node.uniqueID ] ||
-												( outerCache[ node.uniqueID ] = {} );
-
-											uniqueCache[ type ] = [ dirruns, diff ];
-										}
-
-										if ( node === elem ) {
-											break;
-										}
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction( function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[ i ] );
-							seed[ idx ] = !( matches[ idx ] = matched[ i ] );
-						}
-					} ) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-
-		// Potentially complex pseudos
-		"not": markFunction( function( selector ) {
-
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction( function( seed, matches, _context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( ( elem = unmatched[ i ] ) ) {
-							seed[ i ] = !( matches[ i ] = elem );
-						}
-					}
-				} ) :
-				function( elem, _context, xml ) {
-					input[ 0 ] = elem;
-					matcher( input, null, xml, results );
-
-					// Don't keep the element (issue #299)
-					input[ 0 ] = null;
-					return !results.pop();
-				};
-		} ),
-
-		"has": markFunction( function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		} ),
-
-		"contains": markFunction( function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
-			};
-		} ),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-
-			// lang value must be a valid identifier
-			if ( !ridentifier.test( lang || "" ) ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( ( elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( ( elem = elem.parentNode ) && elem.nodeType === 1 );
-				return false;
-			};
-		} ),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement &&
-				( !document.hasFocus || document.hasFocus() ) &&
-				!!( elem.type || elem.href || ~elem.tabIndex );
-		},
-
-		// Boolean properties
-		"enabled": createDisabledPseudo( false ),
-		"disabled": createDisabledPseudo( true ),
-
-		"checked": function( elem ) {
-
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return ( nodeName === "input" && !!elem.checked ) ||
-				( nodeName === "option" && !!elem.selected );
-		},
-
-		"selected": function( elem ) {
-
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				// eslint-disable-next-line no-unused-expressions
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos[ "empty" ]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( ( attr = elem.getAttribute( "type" ) ) == null ||
-					attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo( function() {
-			return [ 0 ];
-		} ),
-
-		"last": createPositionalPseudo( function( _matchIndexes, length ) {
-			return [ length - 1 ];
-		} ),
-
-		"eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		} ),
-
-		"even": createPositionalPseudo( function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		} ),
-
-		"odd": createPositionalPseudo( function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		} ),
-
-		"lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
-			var i = argument < 0 ?
-				argument + length :
-				argument > length ?
-					length :
-					argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		} ),
-
-		"gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		} )
-	}
-};
-
-Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || ( match = rcomma.exec( soFar ) ) ) {
-			if ( match ) {
-
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[ 0 ].length ) || soFar;
-			}
-			groups.push( ( tokens = [] ) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( ( match = rcombinators.exec( soFar ) ) ) {
-			matched = match.shift();
-			tokens.push( {
-				value: matched,
-
-				// Cast descendant combinators to space
-				type: match[ 0 ].replace( rtrim, " " )
-			} );
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] ||
-				( match = preFilters[ type ]( match ) ) ) ) {
-				matched = match.shift();
-				tokens.push( {
-					value: matched,
-					type: type,
-					matches: match
-				} );
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[ i ].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		skip = combinator.next,
-		key = skip || dir,
-		checkNonElements = base && key === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( ( elem = elem[ dir ] ) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-			return false;
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, uniqueCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
-			if ( xml ) {
-				while ( ( elem = elem[ dir ] ) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( ( elem = elem[ dir ] ) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || ( elem[ expando ] = {} );
-
-						// Support: IE <9 only
-						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] ||
-							( outerCache[ elem.uniqueID ] = {} );
-
-						if ( skip && skip === elem.nodeName.toLowerCase() ) {
-							elem = elem[ dir ] || elem;
-						} else if ( ( oldCache = uniqueCache[ key ] ) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return ( newCache[ 2 ] = oldCache[ 2 ] );
-						} else {
-
-							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ key ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-			return false;
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[ i ]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[ 0 ];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[ i ], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( ( elem = unmatched[ i ] ) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction( function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts(
-				selector || "*",
-				context.nodeType ? [ context ] : context,
-				[]
-			),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( ( elem = temp[ i ] ) ) {
-					matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem );
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( ( elem = matcherOut[ i ] ) ) {
-
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( ( matcherIn[ i ] = elem ) );
-						}
-					}
-					postFinder( null, ( matcherOut = [] ), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( ( elem = matcherOut[ i ] ) &&
-						( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
-
-						seed[ temp ] = !( results[ temp ] = elem );
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	} );
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[ 0 ].type ],
-		implicitRelative = leadingRelative || Expr.relative[ " " ],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				( checkContext = context ).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) {
-			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
-		} else {
-			matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[ j ].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-
-					// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-					tokens
-						.slice( 0, i - 1 )
-						.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
-
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
-				len = elems.length;
-
-			if ( outermost ) {
-
-				// Support: IE 11+, Edge 17 - 18+
-				// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-				// two documents; shallow comparisons work.
-				// eslint-disable-next-line eqeqeq
-				outermostContext = context == document || context || outermost;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-
-					// Support: IE 11+, Edge 17 - 18+
-					// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-					// two documents; shallow comparisons work.
-					// eslint-disable-next-line eqeqeq
-					if ( !context && elem.ownerDocument != document ) {
-						setDocument( elem );
-						xml = !documentIsHTML;
-					}
-					while ( ( matcher = elementMatchers[ j++ ] ) ) {
-						if ( matcher( elem, context || document, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-
-					// They will have gone through all possible matchers
-					if ( ( elem = !matcher && elem ) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// `i` is now the count of elements visited above, and adding it to `matchedCount`
-			// makes the latter nonnegative.
-			matchedCount += i;
-
-			// Apply set filters to unmatched elements
-			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
-			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
-			// no element matchers and no seed.
-			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
-			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
-			// numerically zero.
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( ( matcher = setMatchers[ j++ ] ) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !( unmatched[ i ] || setMatched[ i ] ) ) {
-								setMatched[ i ] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[ i ] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache(
-			selector,
-			matcherFromGroupMatchers( elementMatchers, setMatchers )
-		);
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( ( selector = compiled.selector || selector ) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is only one selector in the list and no seed
-	// (the latter of which guarantees us context)
-	if ( match.length === 1 ) {
-
-		// Reduce context if the leading compound selector is an ID
-		tokens = match[ 0 ] = match[ 0 ].slice( 0 );
-		if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
-			context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
-
-			context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
-				.replace( runescape, funescape ), context ) || [] )[ 0 ];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[ i ];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ ( type = token.type ) ] ) {
-				break;
-			}
-			if ( ( find = Expr.find[ type ] ) ) {
-
-				// Search, expanding context for leading sibling combinators
-				if ( ( seed = find(
-					token.matches[ 0 ].replace( runescape, funescape ),
-					rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
-						context
-				) ) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert( function( el ) {
-
-	// Should return 1, but returns 4 (following)
-	return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
-} );
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert( function( el ) {
-	el.innerHTML = "<a href='#'></a>";
-	return el.firstChild.getAttribute( "href" ) === "#";
-} ) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	} );
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert( function( el ) {
-	el.innerHTML = "<input/>";
-	el.firstChild.setAttribute( "value", "" );
-	return el.firstChild.getAttribute( "value" ) === "";
-} ) ) {
-	addHandle( "value", function( elem, _name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	} );
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert( function( el ) {
-	return el.getAttribute( "disabled" ) == null;
-} ) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-				( val = elem.getAttributeNode( name ) ) && val.specified ?
-					val.value :
-					null;
-		}
-	} );
-}
-
-return Sizzle;
-
-} )( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-
-// Deprecated
-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-jQuery.escapeSelector = Sizzle.escape;
-
-
-
-
-var dir = function( elem, dir, until ) {
-	var matched = [],
-		truncate = until !== undefined;
-
-	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
-		if ( elem.nodeType === 1 ) {
-			if ( truncate && jQuery( elem ).is( until ) ) {
-				break;
-			}
-			matched.push( elem );
-		}
-	}
-	return matched;
-};
-
-
-var siblings = function( n, elem ) {
-	var matched = [];
-
-	for ( ; n; n = n.nextSibling ) {
-		if ( n.nodeType === 1 && n !== elem ) {
-			matched.push( n );
-		}
-	}
-
-	return matched;
-};
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-
-
-function nodeName( elem, name ) {
-
-  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-
-};
-var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
-
-
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) !== not;
-		} );
-	}
-
-	// Single element
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		} );
-	}
-
-	// Arraylike of elements (jQuery, arguments, Array)
-	if ( typeof qualifier !== "string" ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
-		} );
-	}
-
-	// Filtered directly for both simple and complex selectors
-	return jQuery.filter( qualifier, elements, not );
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	if ( elems.length === 1 && elem.nodeType === 1 ) {
-		return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
-	}
-
-	return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-		return elem.nodeType === 1;
-	} ) );
-};
-
-jQuery.fn.extend( {
-	find: function( selector ) {
-		var i, ret,
-			len = this.length,
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter( function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			} ) );
-		}
-
-		ret = this.pushStack( [] );
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		return len > 1 ? jQuery.uniqueSort( ret ) : ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], false ) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], true ) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-} );
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	// Shortcut simple #id case for speed
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
-
-	init = jQuery.fn.init = function( selector, context, root ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Method init() accepts an alternate rootjQuery
-		// so migrate can support jQuery.sub (gh-2101)
-		root = root || rootjQuery;
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[ 0 ] === "<" &&
-				selector[ selector.length - 1 ] === ">" &&
-				selector.length >= 3 ) {
-
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && ( match[ 1 ] || !context ) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[ 1 ] ) {
-					context = context instanceof jQuery ? context[ 0 ] : context;
-
-					// Option to run scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[ 1 ],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-
-							// Properties of context are called as methods if possible
-							if ( isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[ 2 ] );
-
-					if ( elem ) {
-
-						// Inject the element directly into the jQuery object
-						this[ 0 ] = elem;
-						this.length = 1;
-					}
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || root ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this[ 0 ] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( isFunction( selector ) ) {
-			return root.ready !== undefined ?
-				root.ready( selector ) :
-
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-
-	// Methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend( {
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter( function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[ i ] ) ) {
-					return true;
-				}
-			}
-		} );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			targets = typeof selectors !== "string" && jQuery( selectors );
-
-		// Positional selectors never match, since there's no _selection_ context
-		if ( !rneedsContext.test( selectors ) ) {
-			for ( ; i < l; i++ ) {
-				for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
-
-					// Always skip document fragments
-					if ( cur.nodeType < 11 && ( targets ?
-						targets.index( cur ) > -1 :
-
-						// Don't pass non-elements to Sizzle
-						cur.nodeType === 1 &&
-							jQuery.find.matchesSelector( cur, selectors ) ) ) {
-
-						matched.push( cur );
-						break;
-					}
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
-	},
-
-	// Determine the position of an element within the set
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// Index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.uniqueSort(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	}
-} );
-
-function sibling( cur, dir ) {
-	while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each( {
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, _i, until ) {
-		return dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, _i, until ) {
-		return dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, _i, until ) {
-		return dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return siblings( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return siblings( elem.firstChild );
-	},
-	contents: function( elem ) {
-		if ( elem.contentDocument != null &&
-
-			// Support: IE 11+
-			// <object> elements with no `data` attribute has an object
-			// `contentDocument` with a `null` prototype.
-			getProto( elem.contentDocument ) ) {
-
-			return elem.contentDocument;
-		}
-
-		// Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
-		// Treat the template element as a regular one in browsers that
-		// don't support it.
-		if ( nodeName( elem, "template" ) ) {
-			elem = elem.content || elem;
-		}
-
-		return jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.uniqueSort( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-} );
-var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
-
-
-
-// Convert String-formatted options into Object-formatted ones
-function createOptions( options ) {
-	var object = {};
-	jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	} );
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		createOptions( options ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-
-		// Last fire value for non-forgettable lists
-		memory,
-
-		// Flag to know if list was already fired
-		fired,
-
-		// Flag to prevent firing
-		locked,
-
-		// Actual callback list
-		list = [],
-
-		// Queue of execution data for repeatable lists
-		queue = [],
-
-		// Index of currently firing callback (modified by add/remove as needed)
-		firingIndex = -1,
-
-		// Fire callbacks
-		fire = function() {
-
-			// Enforce single-firing
-			locked = locked || options.once;
-
-			// Execute callbacks for all pending executions,
-			// respecting firingIndex overrides and runtime changes
-			fired = firing = true;
-			for ( ; queue.length; firingIndex = -1 ) {
-				memory = queue.shift();
-				while ( ++firingIndex < list.length ) {
-
-					// Run callback and check for early termination
-					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
-						options.stopOnFalse ) {
-
-						// Jump to end and forget the data so .add doesn't re-fire
-						firingIndex = list.length;
-						memory = false;
-					}
-				}
-			}
-
-			// Forget the data if we're done with it
-			if ( !options.memory ) {
-				memory = false;
-			}
-
-			firing = false;
-
-			// Clean up if we're done firing for good
-			if ( locked ) {
-
-				// Keep an empty list if we have data for future add calls
-				if ( memory ) {
-					list = [];
-
-				// Otherwise, this object is spent
-				} else {
-					list = "";
-				}
-			}
-		},
-
-		// Actual Callbacks object
-		self = {
-
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-
-					// If we have memory from a past run, we should fire after adding
-					if ( memory && !firing ) {
-						firingIndex = list.length - 1;
-						queue.push( memory );
-					}
-
-					( function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							if ( isFunction( arg ) ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && toType( arg ) !== "string" ) {
-
-								// Inspect recursively
-								add( arg );
-							}
-						} );
-					} )( arguments );
-
-					if ( memory && !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Remove a callback from the list
-			remove: function() {
-				jQuery.each( arguments, function( _, arg ) {
-					var index;
-					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-						list.splice( index, 1 );
-
-						// Handle firing indexes
-						if ( index <= firingIndex ) {
-							firingIndex--;
-						}
-					}
-				} );
-				return this;
-			},
-
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ?
-					jQuery.inArray( fn, list ) > -1 :
-					list.length > 0;
-			},
-
-			// Remove all callbacks from the list
-			empty: function() {
-				if ( list ) {
-					list = [];
-				}
-				return this;
-			},
-
-			// Disable .fire and .add
-			// Abort any current/pending executions
-			// Clear all callbacks and values
-			disable: function() {
-				locked = queue = [];
-				list = memory = "";
-				return this;
-			},
-			disabled: function() {
-				return !list;
-			},
-
-			// Disable .fire
-			// Also disable .add unless we have memory (since it would have no effect)
-			// Abort any pending executions
-			lock: function() {
-				locked = queue = [];
-				if ( !memory && !firing ) {
-					list = memory = "";
-				}
-				return this;
-			},
-			locked: function() {
-				return !!locked;
-			},
-
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( !locked ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					queue.push( args );
-					if ( !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-function Identity( v ) {
-	return v;
-}
-function Thrower( ex ) {
-	throw ex;
-}
-
-function adoptValue( value, resolve, reject, noValue ) {
-	var method;
-
-	try {
-
-		// Check for promise aspect first to privilege synchronous behavior
-		if ( value && isFunction( ( method = value.promise ) ) ) {
-			method.call( value ).done( resolve ).fail( reject );
-
-		// Other thenables
-		} else if ( value && isFunction( ( method = value.then ) ) ) {
-			method.call( value, resolve, reject );
-
-		// Other non-thenables
-		} else {
-
-			// Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer:
-			// * false: [ value ].slice( 0 ) => resolve( value )
-			// * true: [ value ].slice( 1 ) => resolve()
-			resolve.apply( undefined, [ value ].slice( noValue ) );
-		}
-
-	// For Promises/A+, convert exceptions into rejections
-	// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
-	// Deferred#then to conditionally suppress rejection.
-	} catch ( value ) {
-
-		// Support: Android 4.0 only
-		// Strict mode functions invoked without .call/.apply get global-object context
-		reject.apply( undefined, [ value ] );
-	}
-}
-
-jQuery.extend( {
-
-	Deferred: function( func ) {
-		var tuples = [
-
-				// action, add listener, callbacks,
-				// ... .then handlers, argument index, [final state]
-				[ "notify", "progress", jQuery.Callbacks( "memory" ),
-					jQuery.Callbacks( "memory" ), 2 ],
-				[ "resolve", "done", jQuery.Callbacks( "once memory" ),
-					jQuery.Callbacks( "once memory" ), 0, "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks( "once memory" ),
-					jQuery.Callbacks( "once memory" ), 1, "rejected" ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				"catch": function( fn ) {
-					return promise.then( null, fn );
-				},
-
-				// Keep pipe for back-compat
-				pipe: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-
-					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( _i, tuple ) {
-
-							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
-							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
-
-							// deferred.progress(function() { bind to newDefer or newDefer.notify })
-							// deferred.done(function() { bind to newDefer or newDefer.resolve })
-							// deferred.fail(function() { bind to newDefer or newDefer.reject })
-							deferred[ tuple[ 1 ] ]( function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && isFunction( returned.promise ) ) {
-									returned.promise()
-										.progress( newDefer.notify )
-										.done( newDefer.resolve )
-										.fail( newDefer.reject );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ](
-										this,
-										fn ? [ returned ] : arguments
-									);
-								}
-							} );
-						} );
-						fns = null;
-					} ).promise();
-				},
-				then: function( onFulfilled, onRejected, onProgress ) {
-					var maxDepth = 0;
-					function resolve( depth, deferred, handler, special ) {
-						return function() {
-							var that = this,
-								args = arguments,
-								mightThrow = function() {
-									var returned, then;
-
-									// Support: Promises/A+ section 2.3.3.3.3
-									// https://promisesaplus.com/#point-59
-									// Ignore double-resolution attempts
-									if ( depth < maxDepth ) {
-										return;
-									}
-
-									returned = handler.apply( that, args );
-
-									// Support: Promises/A+ section 2.3.1
-									// https://promisesaplus.com/#point-48
-									if ( returned === deferred.promise() ) {
-										throw new TypeError( "Thenable self-resolution" );
-									}
-
-									// Support: Promises/A+ sections 2.3.3.1, 3.5
-									// https://promisesaplus.com/#point-54
-									// https://promisesaplus.com/#point-75
-									// Retrieve `then` only once
-									then = returned &&
-
-										// Support: Promises/A+ section 2.3.4
-										// https://promisesaplus.com/#point-64
-										// Only check objects and functions for thenability
-										( typeof returned === "object" ||
-											typeof returned === "function" ) &&
-										returned.then;
-
-									// Handle a returned thenable
-									if ( isFunction( then ) ) {
-
-										// Special processors (notify) just wait for resolution
-										if ( special ) {
-											then.call(
-												returned,
-												resolve( maxDepth, deferred, Identity, special ),
-												resolve( maxDepth, deferred, Thrower, special )
-											);
-
-										// Normal processors (resolve) also hook into progress
-										} else {
-
-											// ...and disregard older resolution values
-											maxDepth++;
-
-											then.call(
-												returned,
-												resolve( maxDepth, deferred, Identity, special ),
-												resolve( maxDepth, deferred, Thrower, special ),
-												resolve( maxDepth, deferred, Identity,
-													deferred.notifyWith )
-											);
-										}
-
-									// Handle all other returned values
-									} else {
-
-										// Only substitute handlers pass on context
-										// and multiple values (non-spec behavior)
-										if ( handler !== Identity ) {
-											that = undefined;
-											args = [ returned ];
-										}
-
-										// Process the value(s)
-										// Default process is resolve
-										( special || deferred.resolveWith )( that, args );
-									}
-								},
-
-								// Only normal processors (resolve) catch and reject exceptions
-								process = special ?
-									mightThrow :
-									function() {
-										try {
-											mightThrow();
-										} catch ( e ) {
-
-											if ( jQuery.Deferred.exceptionHook ) {
-												jQuery.Deferred.exceptionHook( e,
-													process.stackTrace );
-											}
-
-											// Support: Promises/A+ section 2.3.3.3.4.1
-											// https://promisesaplus.com/#point-61
-											// Ignore post-resolution exceptions
-											if ( depth + 1 >= maxDepth ) {
-
-												// Only substitute handlers pass on context
-												// and multiple values (non-spec behavior)
-												if ( handler !== Thrower ) {
-													that = undefined;
-													args = [ e ];
-												}
-
-												deferred.rejectWith( that, args );
-											}
-										}
-									};
-
-							// Support: Promises/A+ section 2.3.3.3.1
-							// https://promisesaplus.com/#point-57
-							// Re-resolve promises immediately to dodge false rejection from
-							// subsequent errors
-							if ( depth ) {
-								process();
-							} else {
-
-								// Call an optional hook to record the stack, in case of exception
-								// since it's otherwise lost when execution goes async
-								if ( jQuery.Deferred.getStackHook ) {
-									process.stackTrace = jQuery.Deferred.getStackHook();
-								}
-								window.setTimeout( process );
-							}
-						};
-					}
-
-					return jQuery.Deferred( function( newDefer ) {
-
-						// progress_handlers.add( ... )
-						tuples[ 0 ][ 3 ].add(
-							resolve(
-								0,
-								newDefer,
-								isFunction( onProgress ) ?
-									onProgress :
-									Identity,
-								newDefer.notifyWith
-							)
-						);
-
-						// fulfilled_handlers.add( ... )
-						tuples[ 1 ][ 3 ].add(
-							resolve(
-								0,
-								newDefer,
-								isFunction( onFulfilled ) ?
-									onFulfilled :
-									Identity
-							)
-						);
-
-						// rejected_handlers.add( ... )
-						tuples[ 2 ][ 3 ].add(
-							resolve(
-								0,
-								newDefer,
-								isFunction( onRejected ) ?
-									onRejected :
-									Thrower
-							)
-						);
-					} ).promise();
-				},
-
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 5 ];
-
-			// promise.progress = list.add
-			// promise.done = list.add
-			// promise.fail = list.add
-			promise[ tuple[ 1 ] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(
-					function() {
-
-						// state = "resolved" (i.e., fulfilled)
-						// state = "rejected"
-						state = stateString;
-					},
-
-					// rejected_callbacks.disable
-					// fulfilled_callbacks.disable
-					tuples[ 3 - i ][ 2 ].disable,
-
-					// rejected_handlers.disable
-					// fulfilled_handlers.disable
-					tuples[ 3 - i ][ 3 ].disable,
-
-					// progress_callbacks.lock
-					tuples[ 0 ][ 2 ].lock,
-
-					// progress_handlers.lock
-					tuples[ 0 ][ 3 ].lock
-				);
-			}
-
-			// progress_handlers.fire
-			// fulfilled_handlers.fire
-			// rejected_handlers.fire
-			list.add( tuple[ 3 ].fire );
-
-			// deferred.notify = function() { deferred.notifyWith(...) }
-			// deferred.resolve = function() { deferred.resolveWith(...) }
-			// deferred.reject = function() { deferred.rejectWith(...) }
-			deferred[ tuple[ 0 ] ] = function() {
-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
-				return this;
-			};
-
-			// deferred.notifyWith = list.fireWith
-			// deferred.resolveWith = list.fireWith
-			// deferred.rejectWith = list.fireWith
-			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
-		} );
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( singleValue ) {
-		var
-
-			// count of uncompleted subordinates
-			remaining = arguments.length,
-
-			// count of unprocessed arguments
-			i = remaining,
-
-			// subordinate fulfillment data
-			resolveContexts = Array( i ),
-			resolveValues = slice.call( arguments ),
-
-			// the master Deferred
-			master = jQuery.Deferred(),
-
-			// subordinate callback factory
-			updateFunc = function( i ) {
-				return function( value ) {
-					resolveContexts[ i ] = this;
-					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( !( --remaining ) ) {
-						master.resolveWith( resolveContexts, resolveValues );
-					}
-				};
-			};
-
-		// Single- and empty arguments are adopted like Promise.resolve
-		if ( remaining <= 1 ) {
-			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
-				!remaining );
-
-			// Use .then() to unwrap secondary thenables (cf. gh-3000)
-			if ( master.state() === "pending" ||
-				isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
-
-				return master.then();
-			}
-		}
-
-		// Multiple arguments are aggregated like Promise.all array elements
-		while ( i-- ) {
-			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
-		}
-
-		return master.promise();
-	}
-} );
-
-
-// These usually indicate a programmer mistake during development,
-// warn about them ASAP rather than swallowing them by default.
-var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
-
-jQuery.Deferred.exceptionHook = function( error, stack ) {
-
-	// Support: IE 8 - 9 only
-	// Console exists when dev tools are open, which can happen at any time
-	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
-		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
-	}
-};
-
-
-
-
-jQuery.readyException = function( error ) {
-	window.setTimeout( function() {
-		throw error;
-	} );
-};
-
-
-
-
-// The deferred used on DOM ready
-var readyList = jQuery.Deferred();
-
-jQuery.fn.ready = function( fn ) {
-
-	readyList
-		.then( fn )
-
-		// Wrap jQuery.readyException in a function so that the lookup
-		// happens at the time of error handling instead of callback
-		// registration.
-		.catch( function( error ) {
-			jQuery.readyException( error );
-		} );
-
-	return this;
-};
-
-jQuery.extend( {
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-	}
-} );
-
-jQuery.ready.then = readyList.then;
-
-// The ready event handler and self cleanup method
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed );
-	window.removeEventListener( "load", completed );
-	jQuery.ready();
-}
-
-// Catch cases where $(document).ready() is called
-// after the browser event has already occurred.
-// Support: IE <=9 - 10 only
-// Older IE sometimes signals "interactive" too soon
-if ( document.readyState === "complete" ||
-	( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
-
-	// Handle it asynchronously to allow scripts the opportunity to delay ready
-	window.setTimeout( jQuery.ready );
-
-} else {
-
-	// Use the handy event callback
-	document.addEventListener( "DOMContentLoaded", completed );
-
-	// A fallback to window.onload, that will always work
-	window.addEventListener( "load", completed );
-}
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( toType( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			access( elems, fn, i, key[ i ], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, _key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn(
-					elems[ i ], key, raw ?
-					value :
-					value.call( elems[ i ], i, fn( elems[ i ], key ) )
-				);
-			}
-		}
-	}
-
-	if ( chainable ) {
-		return elems;
-	}
-
-	// Gets
-	if ( bulk ) {
-		return fn.call( elems );
-	}
-
-	return len ? fn( elems[ 0 ], key ) : emptyGet;
-};
-
-
-// Matches dashed string for camelizing
-var rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([a-z])/g;
-
-// Used by camelCase as callback to replace()
-function fcamelCase( _all, letter ) {
-	return letter.toUpperCase();
-}
-
-// Convert dashed to camelCase; used by the css and data modules
-// Support: IE <=9 - 11, Edge 12 - 15
-// Microsoft forgot to hump their vendor prefix (#9572)
-function camelCase( string ) {
-	return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-}
-var acceptData = function( owner ) {
-
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-
-
-function Data() {
-	this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-
-Data.prototype = {
-
-	cache: function( owner ) {
-
-		// Check if the owner object already has a cache
-		var value = owner[ this.expando ];
-
-		// If not, create one
-		if ( !value ) {
-			value = Object.create( null );
-
-			// We can accept data for non-element nodes in modern browsers,
-			// but we should not, see #8335.
-			// Always return an empty object.
-			if ( acceptData( owner ) ) {
-
-				// If it is a node unlikely to be stringify-ed or looped over
-				// use plain assignment
-				if ( owner.nodeType ) {
-					owner[ this.expando ] = value;
-
-				// Otherwise secure it in a non-enumerable property
-				// configurable must be true to allow the property to be
-				// deleted when data is removed
-				} else {
-					Object.defineProperty( owner, this.expando, {
-						value: value,
-						configurable: true
-					} );
-				}
-			}
-		}
-
-		return value;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			cache = this.cache( owner );
-
-		// Handle: [ owner, key, value ] args
-		// Always use camelCase key (gh-2257)
-		if ( typeof data === "string" ) {
-			cache[ camelCase( data ) ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-
-			// Copy the properties one-by-one to the cache object
-			for ( prop in data ) {
-				cache[ camelCase( prop ) ] = data[ prop ];
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		return key === undefined ?
-			this.cache( owner ) :
-
-			// Always use camelCase key (gh-2257)
-			owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ];
-	},
-	access: function( owner, key, value ) {
-
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				( ( key && typeof key === "string" ) && value === undefined ) ) {
-
-			return this.get( owner, key );
-		}
-
-		// When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i,
-			cache = owner[ this.expando ];
-
-		if ( cache === undefined ) {
-			return;
-		}
-
-		if ( key !== undefined ) {
-
-			// Support array or space separated string of keys
-			if ( Array.isArray( key ) ) {
-
-				// If key is an array of keys...
-				// We always set camelCase keys, so remove that.
-				key = key.map( camelCase );
-			} else {
-				key = camelCase( key );
-
-				// If a key with the spaces exists, use it.
-				// Otherwise, create an array by matching non-whitespace
-				key = key in cache ?
-					[ key ] :
-					( key.match( rnothtmlwhite ) || [] );
-			}
-
-			i = key.length;
-
-			while ( i-- ) {
-				delete cache[ key[ i ] ];
-			}
-		}
-
-		// Remove the expando if there's no more data
-		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
-
-			// Support: Chrome <=35 - 45
-			// Webkit & Blink performance suffers when deleting properties
-			// from DOM nodes, so set to undefined instead
-			// https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
-			if ( owner.nodeType ) {
-				owner[ this.expando ] = undefined;
-			} else {
-				delete owner[ this.expando ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		var cache = owner[ this.expando ];
-		return cache !== undefined && !jQuery.isEmptyObject( cache );
-	}
-};
-var dataPriv = new Data();
-
-var dataUser = new Data();
-
-
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /[A-Z]/g;
-
-function getData( data ) {
-	if ( data === "true" ) {
-		return true;
-	}
-
-	if ( data === "false" ) {
-		return false;
-	}
-
-	if ( data === "null" ) {
-		return null;
-	}
-
-	// Only convert to a number if it doesn't change the string
-	if ( data === +data + "" ) {
-		return +data;
-	}
-
-	if ( rbrace.test( data ) ) {
-		return JSON.parse( data );
-	}
-
-	return data;
-}
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = getData( data );
-			} catch ( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			dataUser.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend( {
-	hasData: function( elem ) {
-		return dataUser.hasData( elem ) || dataPriv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return dataUser.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		dataUser.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to dataPriv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return dataPriv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		dataPriv.remove( elem, name );
-	}
-} );
-
-jQuery.fn.extend( {
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = dataUser.get( elem );
-
-				if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE 11 only
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = camelCase( name.slice( 5 ) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					dataPriv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each( function() {
-				dataUser.set( this, key );
-			} );
-		}
-
-		return access( this, function( value ) {
-			var data;
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-
-				// Attempt to get data from the cache
-				// The key will always be camelCased in Data
-				data = dataUser.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each( function() {
-
-				// We always store the camelCased key
-				dataUser.set( this, key, value );
-			} );
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each( function() {
-			dataUser.remove( this, key );
-		} );
-	}
-} );
-
-
-jQuery.extend( {
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = dataPriv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || Array.isArray( data ) ) {
-					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// Clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// Not public - generate a queueHooks object, or return the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
-			empty: jQuery.Callbacks( "once memory" ).add( function() {
-				dataPriv.remove( elem, [ type + "queue", key ] );
-			} )
-		} );
-	}
-} );
-
-jQuery.fn.extend( {
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[ 0 ], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each( function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// Ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			} );
-	},
-	dequeue: function( type ) {
-		return this.each( function() {
-			jQuery.dequeue( this, type );
-		} );
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-} );
-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
-
-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
-
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var documentElement = document.documentElement;
-
-
-
-	var isAttached = function( elem ) {
-			return jQuery.contains( elem.ownerDocument, elem );
-		},
-		composed = { composed: true };
-
-	// Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
-	// Check attachment across shadow DOM boundaries when possible (gh-3504)
-	// Support: iOS 10.0-10.2 only
-	// Early iOS 10 versions support `attachShadow` but not `getRootNode`,
-	// leading to errors. We need to check for `getRootNode`.
-	if ( documentElement.getRootNode ) {
-		isAttached = function( elem ) {
-			return jQuery.contains( elem.ownerDocument, elem ) ||
-				elem.getRootNode( composed ) === elem.ownerDocument;
-		};
-	}
-var isHiddenWithinTree = function( elem, el ) {
-
-		// isHiddenWithinTree might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-
-		// Inline style trumps all
-		return elem.style.display === "none" ||
-			elem.style.display === "" &&
-
-			// Otherwise, check computed style
-			// Support: Firefox <=43 - 45
-			// Disconnected elements can have computed display: none, so first confirm that elem is
-			// in the document.
-			isAttached( elem ) &&
-
-			jQuery.css( elem, "display" ) === "none";
-	};
-
-
-
-function adjustCSS( elem, prop, valueParts, tween ) {
-	var adjusted, scale,
-		maxIterations = 20,
-		currentValue = tween ?
-			function() {
-				return tween.cur();
-			} :
-			function() {
-				return jQuery.css( elem, prop, "" );
-			},
-		initial = currentValue(),
-		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-		// Starting value computation is required for potential unit mismatches
-		initialInUnit = elem.nodeType &&
-			( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
-			rcssNum.exec( jQuery.css( elem, prop ) );
-
-	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
-
-		// Support: Firefox <=54
-		// Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144)
-		initial = initial / 2;
-
-		// Trust units reported by jQuery.css
-		unit = unit || initialInUnit[ 3 ];
-
-		// Iteratively approximate from a nonzero starting point
-		initialInUnit = +initial || 1;
-
-		while ( maxIterations-- ) {
-
-			// Evaluate and update our best guess (doubling guesses that zero out).
-			// Finish if the scale equals or crosses 1 (making the old*new product non-positive).
-			jQuery.style( elem, prop, initialInUnit + unit );
-			if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) {
-				maxIterations = 0;
-			}
-			initialInUnit = initialInUnit / scale;
-
-		}
-
-		initialInUnit = initialInUnit * 2;
-		jQuery.style( elem, prop, initialInUnit + unit );
-
-		// Make sure we update the tween properties later on
-		valueParts = valueParts || [];
-	}
-
-	if ( valueParts ) {
-		initialInUnit = +initialInUnit || +initial || 0;
-
-		// Apply relative offset (+=/-=) if specified
-		adjusted = valueParts[ 1 ] ?
-			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
-			+valueParts[ 2 ];
-		if ( tween ) {
-			tween.unit = unit;
-			tween.start = initialInUnit;
-			tween.end = adjusted;
-		}
-	}
-	return adjusted;
-}
-
-
-var defaultDisplayMap = {};
-
-function getDefaultDisplay( elem ) {
-	var temp,
-		doc = elem.ownerDocument,
-		nodeName = elem.nodeName,
-		display = defaultDisplayMap[ nodeName ];
-
-	if ( display ) {
-		return display;
-	}
-
-	temp = doc.body.appendChild( doc.createElement( nodeName ) );
-	display = jQuery.css( temp, "display" );
-
-	temp.parentNode.removeChild( temp );
-
-	if ( display === "none" ) {
-		display = "block";
-	}
-	defaultDisplayMap[ nodeName ] = display;
-
-	return display;
-}
-
-function showHide( elements, show ) {
-	var display, elem,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	// Determine new display value for elements that need to change
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		display = elem.style.display;
-		if ( show ) {
-
-			// Since we force visibility upon cascade-hidden elements, an immediate (and slow)
-			// check is required in this first loop unless we have a nonempty display value (either
-			// inline or about-to-be-restored)
-			if ( display === "none" ) {
-				values[ index ] = dataPriv.get( elem, "display" ) || null;
-				if ( !values[ index ] ) {
-					elem.style.display = "";
-				}
-			}
-			if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
-				values[ index ] = getDefaultDisplay( elem );
-			}
-		} else {
-			if ( display !== "none" ) {
-				values[ index ] = "none";
-
-				// Remember what we're overwriting
-				dataPriv.set( elem, "display", display );
-			}
-		}
-	}
-
-	// Set the display of the elements in a second loop to avoid constant reflow
-	for ( index = 0; index < length; index++ ) {
-		if ( values[ index ] != null ) {
-			elements[ index ].style.display = values[ index ];
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend( {
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each( function() {
-			if ( isHiddenWithinTree( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		} );
-	}
-} );
-var rcheckableType = ( /^(?:checkbox|radio)$/i );
-
-var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]*)/i );
-
-var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
-
-
-
-( function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Android 4.0 - 4.3 only
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Android <=4.1 only
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE <=11 only
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-
-	// Support: IE <=9 only
-	// IE <=9 replaces <option> tags with their contents when inserted outside of
-	// the select element.
-	div.innerHTML = "<option></option>";
-	support.option = !!div.lastChild;
-} )();
-
-
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
-
-	// XHTML parsers do not magically insert elements in the
-	// same way that tag soup parsers do. So we cannot shorten
-	// this by omitting <tbody> or other required elements.
-	thead: [ 1, "<table>", "</table>" ],
-	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-	_default: [ 0, "", "" ]
-};
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// Support: IE <=9 only
-if ( !support.option ) {
-	wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
-}
-
-
-function getAll( context, tag ) {
-
-	// Support: IE <=9 - 11 only
-	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
-	var ret;
-
-	if ( typeof context.getElementsByTagName !== "undefined" ) {
-		ret = context.getElementsByTagName( tag || "*" );
-
-	} else if ( typeof context.querySelectorAll !== "undefined" ) {
-		ret = context.querySelectorAll( tag || "*" );
-
-	} else {
-		ret = [];
-	}
-
-	if ( tag === undefined || tag && nodeName( context, tag ) ) {
-		return jQuery.merge( [ context ], ret );
-	}
-
-	return ret;
-}
-
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		dataPriv.set(
-			elems[ i ],
-			"globalEval",
-			!refElements || dataPriv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-
-var rhtml = /<|&#?\w+;/;
-
-function buildFragment( elems, context, scripts, selection, ignored ) {
-	var elem, tmp, tag, wrap, attached, j,
-		fragment = context.createDocumentFragment(),
-		nodes = [],
-		i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		elem = elems[ i ];
-
-		if ( elem || elem === 0 ) {
-
-			// Add nodes directly
-			if ( toType( elem ) === "object" ) {
-
-				// Support: Android <=4.0 only, PhantomJS 1 only
-				// push.apply(_, arraylike) throws on ancient WebKit
-				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-			// Convert non-html into a text node
-			} else if ( !rhtml.test( elem ) ) {
-				nodes.push( context.createTextNode( elem ) );
-
-			// Convert html into DOM nodes
-			} else {
-				tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
-
-				// Deserialize a standard representation
-				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-				wrap = wrapMap[ tag ] || wrapMap._default;
-				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
-
-				// Descend through wrappers to the right content
-				j = wrap[ 0 ];
-				while ( j-- ) {
-					tmp = tmp.lastChild;
-				}
-
-				// Support: Android <=4.0 only, PhantomJS 1 only
-				// push.apply(_, arraylike) throws on ancient WebKit
-				jQuery.merge( nodes, tmp.childNodes );
-
-				// Remember the top-level container
-				tmp = fragment.firstChild;
-
-				// Ensure the created nodes are orphaned (#12392)
-				tmp.textContent = "";
-			}
-		}
-	}
-
-	// Remove wrapper from fragment
-	fragment.textContent = "";
-
-	i = 0;
-	while ( ( elem = nodes[ i++ ] ) ) {
-
-		// Skip elements already in the context collection (trac-4087)
-		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
-			if ( ignored ) {
-				ignored.push( elem );
-			}
-			continue;
-		}
-
-		attached = isAttached( elem );
-
-		// Append to fragment
-		tmp = getAll( fragment.appendChild( elem ), "script" );
-
-		// Preserve script evaluation history
-		if ( attached ) {
-			setGlobalEval( tmp );
-		}
-
-		// Capture executables
-		if ( scripts ) {
-			j = 0;
-			while ( ( elem = tmp[ j++ ] ) ) {
-				if ( rscriptType.test( elem.type || "" ) ) {
-					scripts.push( elem );
-				}
-			}
-		}
-	}
-
-	return fragment;
-}
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-// Support: IE <=9 - 11+
-// focus() and blur() are asynchronous, except when they are no-op.
-// So expect focus to be synchronous when the element is already active,
-// and blur to be synchronous when the element is not already active.
-// (focus and blur are always synchronous in other supported browsers,
-// this just defines when we can count on it).
-function expectSync( elem, type ) {
-	return ( elem === safeActiveElement() ) === ( type === "focus" );
-}
-
-// Support: IE <=9 only
-// Accessing document.activeElement can throw unexpectedly
-// https://bugs.jquery.com/ticket/13393
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-function on( elem, types, selector, data, fn, one ) {
-	var origFn, type;
-
-	// Types can be a map of types/handlers
-	if ( typeof types === "object" ) {
-
-		// ( types-Object, selector, data )
-		if ( typeof selector !== "string" ) {
-
-			// ( types-Object, data )
-			data = data || selector;
-			selector = undefined;
-		}
-		for ( type in types ) {
-			on( elem, type, selector, data, types[ type ], one );
-		}
-		return elem;
-	}
-
-	if ( data == null && fn == null ) {
-
-		// ( types, fn )
-		fn = selector;
-		data = selector = undefined;
-	} else if ( fn == null ) {
-		if ( typeof selector === "string" ) {
-
-			// ( types, selector, fn )
-			fn = data;
-			data = undefined;
-		} else {
-
-			// ( types, data, fn )
-			fn = data;
-			data = selector;
-			selector = undefined;
-		}
-	}
-	if ( fn === false ) {
-		fn = returnFalse;
-	} else if ( !fn ) {
-		return elem;
-	}
-
-	if ( one === 1 ) {
-		origFn = fn;
-		fn = function( event ) {
-
-			// Can use an empty set, since event contains the info
-			jQuery().off( event );
-			return origFn.apply( this, arguments );
-		};
-
-		// Use same guid so caller can remove using origFn
-		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-	}
-	return elem.each( function() {
-		jQuery.event.add( this, types, fn, data, selector );
-	} );
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.get( elem );
-
-		// Only attach events to objects that accept data
-		if ( !acceptData( elem ) ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Ensure that invalid selectors throw exceptions at attach time
-		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
-		if ( selector ) {
-			jQuery.find.matchesSelector( documentElement, selector );
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !( events = elemData.events ) ) {
-			events = elemData.events = Object.create( null );
-		}
-		if ( !( eventHandle = elemData.handle ) ) {
-			eventHandle = elemData.handle = function( e ) {
-
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend( {
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join( "." )
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !( handlers = events[ type ] ) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup ||
-					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
-
-		if ( !elemData || !( events = elemData.events ) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[ 2 ] &&
-				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector ||
-						selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown ||
-					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove data and the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			dataPriv.remove( elem, "handle events" );
-		}
-	},
-
-	dispatch: function( nativeEvent ) {
-
-		var i, j, ret, matched, handleObj, handlerQueue,
-			args = new Array( arguments.length ),
-
-			// Make a writable jQuery.Event from the native event object
-			event = jQuery.event.fix( nativeEvent ),
-
-			handlers = (
-					dataPriv.get( this, "events" ) || Object.create( null )
-				)[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[ 0 ] = event;
-
-		for ( i = 1; i < arguments.length; i++ ) {
-			args[ i ] = arguments[ i ];
-		}
-
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
-				!event.isImmediatePropagationStopped() ) {
-
-				// If the event is namespaced, then each handler is only invoked if it is
-				// specially universal or its namespaces are a superset of the event's.
-				if ( !event.rnamespace || handleObj.namespace === false ||
-					event.rnamespace.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
-						handleObj.handler ).apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( ( event.result = ret ) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, handleObj, sel, matchedHandlers, matchedSelectors,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		if ( delegateCount &&
-
-			// Support: IE <=9
-			// Black-hole SVG <use> instance trees (trac-13180)
-			cur.nodeType &&
-
-			// Support: Firefox <=42
-			// Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
-			// https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
-			// Support: IE 11 only
-			// ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
-			!( event.type === "click" && event.button >= 1 ) ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
-					matchedHandlers = [];
-					matchedSelectors = {};
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matchedSelectors[ sel ] === undefined ) {
-							matchedSelectors[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) > -1 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matchedSelectors[ sel ] ) {
-							matchedHandlers.push( handleObj );
-						}
-					}
-					if ( matchedHandlers.length ) {
-						handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		cur = this;
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
-		}
-
-		return handlerQueue;
-	},
-
-	addProp: function( name, hook ) {
-		Object.defineProperty( jQuery.Event.prototype, name, {
-			enumerable: true,
-			configurable: true,
-
-			get: isFunction( hook ) ?
-				function() {
-					if ( this.originalEvent ) {
-							return hook( this.originalEvent );
-					}
-				} :
-				function() {
-					if ( this.originalEvent ) {
-							return this.originalEvent[ name ];
-					}
-				},
-
-			set: function( value ) {
-				Object.defineProperty( this, name, {
-					enumerable: true,
-					configurable: true,
-					writable: true,
-					value: value
-				} );
-			}
-		} );
-	},
-
-	fix: function( originalEvent ) {
-		return originalEvent[ jQuery.expando ] ?
-			originalEvent :
-			new jQuery.Event( originalEvent );
-	},
-
-	special: {
-		load: {
-
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		click: {
-
-			// Utilize native event to ensure correct state for checkable inputs
-			setup: function( data ) {
-
-				// For mutual compressibility with _default, replace `this` access with a local var.
-				// `|| data` is dead code meant only to preserve the variable through minification.
-				var el = this || data;
-
-				// Claim the first handler
-				if ( rcheckableType.test( el.type ) &&
-					el.click && nodeName( el, "input" ) ) {
-
-					// dataPriv.set( el, "click", ... )
-					leverageNative( el, "click", returnTrue );
-				}
-
-				// Return false to allow normal processing in the caller
-				return false;
-			},
-			trigger: function( data ) {
-
-				// For mutual compressibility with _default, replace `this` access with a local var.
-				// `|| data` is dead code meant only to preserve the variable through minification.
-				var el = this || data;
-
-				// Force setup before triggering a click
-				if ( rcheckableType.test( el.type ) &&
-					el.click && nodeName( el, "input" ) ) {
-
-					leverageNative( el, "click" );
-				}
-
-				// Return non-false to allow normal event-path propagation
-				return true;
-			},
-
-			// For cross-browser consistency, suppress native .click() on links
-			// Also prevent it if we're currently inside a leveraged native-event stack
-			_default: function( event ) {
-				var target = event.target;
-				return rcheckableType.test( target.type ) &&
-					target.click && nodeName( target, "input" ) &&
-					dataPriv.get( target, "click" ) ||
-					nodeName( target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	}
-};
-
-// Ensure the presence of an event listener that handles manually-triggered
-// synthetic events by interrupting progress until reinvoked in response to
-// *native* events that it fires directly, ensuring that state changes have
-// already occurred before other listeners are invoked.
-function leverageNative( el, type, expectSync ) {
-
-	// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
-	if ( !expectSync ) {
-		if ( dataPriv.get( el, type ) === undefined ) {
-			jQuery.event.add( el, type, returnTrue );
-		}
-		return;
-	}
-
-	// Register the controller as a special universal handler for all event namespaces
-	dataPriv.set( el, type, false );
-	jQuery.event.add( el, type, {
-		namespace: false,
-		handler: function( event ) {
-			var notAsync, result,
-				saved = dataPriv.get( this, type );
-
-			if ( ( event.isTrigger & 1 ) && this[ type ] ) {
-
-				// Interrupt processing of the outer synthetic .trigger()ed event
-				// Saved data should be false in such cases, but might be a leftover capture object
-				// from an async native handler (gh-4350)
-				if ( !saved.length ) {
-
-					// Store arguments for use when handling the inner native event
-					// There will always be at least one argument (an event object), so this array
-					// will not be confused with a leftover capture object.
-					saved = slice.call( arguments );
-					dataPriv.set( this, type, saved );
-
-					// Trigger the native event and capture its result
-					// Support: IE <=9 - 11+
-					// focus() and blur() are asynchronous
-					notAsync = expectSync( this, type );
-					this[ type ]();
-					result = dataPriv.get( this, type );
-					if ( saved !== result || notAsync ) {
-						dataPriv.set( this, type, false );
-					} else {
-						result = {};
-					}
-					if ( saved !== result ) {
-
-						// Cancel the outer synthetic event
-						event.stopImmediatePropagation();
-						event.preventDefault();
-						return result.value;
-					}
-
-				// If this is an inner synthetic event for an event with a bubbling surrogate
-				// (focus or blur), assume that the surrogate already propagated from triggering the
-				// native event and prevent that from happening again here.
-				// This technically gets the ordering wrong w.r.t. to `.trigger()` (in which the
-				// bubbling surrogate propagates *after* the non-bubbling base), but that seems
-				// less bad than duplication.
-				} else if ( ( jQuery.event.special[ type ] || {} ).delegateType ) {
-					event.stopPropagation();
-				}
-
-			// If this is a native event triggered above, everything is now in order
-			// Fire an inner synthetic event with the original arguments
-			} else if ( saved.length ) {
-
-				// ...and capture the result
-				dataPriv.set( this, type, {
-					value: jQuery.event.trigger(
-
-						// Support: IE <=9 - 11+
-						// Extend with the prototype to reset the above stopImmediatePropagation()
-						jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
-						saved.slice( 1 ),
-						this
-					)
-				} );
-
-				// Abort handling of the native event
-				event.stopImmediatePropagation();
-			}
-		}
-	} );
-}
-
-jQuery.removeEvent = function( elem, type, handle ) {
-
-	// This "if" is needed for plain objects
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-
-	// Allow instantiation without the 'new' keyword
-	if ( !( this instanceof jQuery.Event ) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-
-				// Support: Android <=2.3 only
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-		// Create target properties
-		// Support: Safari <=6 - 7 only
-		// Target should not be a text node (#504, #13143)
-		this.target = ( src.target && src.target.nodeType === 3 ) ?
-			src.target.parentNode :
-			src.target;
-
-		this.currentTarget = src.currentTarget;
-		this.relatedTarget = src.relatedTarget;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || Date.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	constructor: jQuery.Event,
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-	isSimulated: false,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Includes all common event props including KeyEvent and MouseEvent specific props
-jQuery.each( {
-	altKey: true,
-	bubbles: true,
-	cancelable: true,
-	changedTouches: true,
-	ctrlKey: true,
-	detail: true,
-	eventPhase: true,
-	metaKey: true,
-	pageX: true,
-	pageY: true,
-	shiftKey: true,
-	view: true,
-	"char": true,
-	code: true,
-	charCode: true,
-	key: true,
-	keyCode: true,
-	button: true,
-	buttons: true,
-	clientX: true,
-	clientY: true,
-	offsetX: true,
-	offsetY: true,
-	pointerId: true,
-	pointerType: true,
-	screenX: true,
-	screenY: true,
-	targetTouches: true,
-	toElement: true,
-	touches: true,
-
-	which: function( event ) {
-		var button = event.button;
-
-		// Add which for key events
-		if ( event.which == null && rkeyEvent.test( event.type ) ) {
-			return event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
-			if ( button & 1 ) {
-				return 1;
-			}
-
-			if ( button & 2 ) {
-				return 3;
-			}
-
-			if ( button & 4 ) {
-				return 2;
-			}
-
-			return 0;
-		}
-
-		return event.which;
-	}
-}, jQuery.event.addProp );
-
-jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
-	jQuery.event.special[ type ] = {
-
-		// Utilize native event if possible so blur/focus sequence is correct
-		setup: function() {
-
-			// Claim the first handler
-			// dataPriv.set( this, "focus", ... )
-			// dataPriv.set( this, "blur", ... )
-			leverageNative( this, type, expectSync );
-
-			// Return false to allow normal processing in the caller
-			return false;
-		},
-		trigger: function() {
-
-			// Force setup before trigger
-			leverageNative( this, type );
-
-			// Return non-false to allow normal event-path propagation
-			return true;
-		},
-
-		delegateType: delegateType
-	};
-} );
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
-//
-// Support: Safari 7 only
-// Safari sends mouseenter too often; see:
-// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
-// for the description of the bug (it existed in older Chrome versions as well).
-jQuery.each( {
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mouseenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-} );
-
-jQuery.fn.extend( {
-
-	on: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn );
-	},
-	one: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ?
-					handleObj.origType + "." + handleObj.namespace :
-					handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each( function() {
-			jQuery.event.remove( this, types, fn, selector );
-		} );
-	}
-} );
-
-
-var
-
-	// Support: IE <=10 - 11, Edge 12 - 13 only
-	// In IE/Edge using regex groups here causes severe slowdowns.
-	// See https://connect.microsoft.com/IE/feedback/details/1736512/
-	rnoInnerhtml = /<script|<style|<link/i,
-
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
-
-// Prefer a tbody over its parent table for containing new rows
-function manipulationTarget( elem, content ) {
-	if ( nodeName( elem, "table" ) &&
-		nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
-
-		return jQuery( elem ).children( "tbody" )[ 0 ] || elem;
-	}
-
-	return elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) {
-		elem.type = elem.type.slice( 5 );
-	} else {
-		elem.removeAttribute( "type" );
-	}
-
-	return elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.get( src );
-		events = pdataOld.events;
-
-		if ( events ) {
-			dataPriv.remove( dest, "handle events" );
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( dataUser.hasData( src ) ) {
-		udataOld = dataUser.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		dataUser.set( dest, udataCur );
-	}
-}
-
-// Fix IE bugs, see support tests
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-function domManip( collection, args, callback, ignored ) {
-
-	// Flatten any nested arrays
-	args = flat( args );
-
-	var fragment, first, scripts, hasScripts, node, doc,
-		i = 0,
-		l = collection.length,
-		iNoClone = l - 1,
-		value = args[ 0 ],
-		valueIsFunction = isFunction( value );
-
-	// We can't cloneNode fragments that contain checked, in WebKit
-	if ( valueIsFunction ||
-			( l > 1 && typeof value === "string" &&
-				!support.checkClone && rchecked.test( value ) ) ) {
-		return collection.each( function( index ) {
-			var self = collection.eq( index );
-			if ( valueIsFunction ) {
-				args[ 0 ] = value.call( this, index, self.html() );
-			}
-			domManip( self, args, callback, ignored );
-		} );
-	}
-
-	if ( l ) {
-		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
-		first = fragment.firstChild;
-
-		if ( fragment.childNodes.length === 1 ) {
-			fragment = first;
-		}
-
-		// Require either new content or an interest in ignored elements to invoke the callback
-		if ( first || ignored ) {
-			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-			hasScripts = scripts.length;
-
-			// Use the original fragment for the last item
-			// instead of the first because it can end up
-			// being emptied incorrectly in certain situations (#8070).
-			for ( ; i < l; i++ ) {
-				node = fragment;
-
-				if ( i !== iNoClone ) {
-					node = jQuery.clone( node, true, true );
-
-					// Keep references to cloned scripts for later restoration
-					if ( hasScripts ) {
-
-						// Support: Android <=4.0 only, PhantomJS 1 only
-						// push.apply(_, arraylike) throws on ancient WebKit
-						jQuery.merge( scripts, getAll( node, "script" ) );
-					}
-				}
-
-				callback.call( collection[ i ], node, i );
-			}
-
-			if ( hasScripts ) {
-				doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-				// Reenable scripts
-				jQuery.map( scripts, restoreScript );
-
-				// Evaluate executable scripts on first document insertion
-				for ( i = 0; i < hasScripts; i++ ) {
-					node = scripts[ i ];
-					if ( rscriptType.test( node.type || "" ) &&
-						!dataPriv.access( node, "globalEval" ) &&
-						jQuery.contains( doc, node ) ) {
-
-						if ( node.src && ( node.type || "" ).toLowerCase()  !== "module" ) {
-
-							// Optional AJAX dependency, but won't run scripts if not present
-							if ( jQuery._evalUrl && !node.noModule ) {
-								jQuery._evalUrl( node.src, {
-									nonce: node.nonce || node.getAttribute( "nonce" )
-								}, doc );
-							}
-						} else {
-							DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return collection;
-}
-
-function remove( elem, selector, keepData ) {
-	var node,
-		nodes = selector ? jQuery.filter( selector, elem ) : elem,
-		i = 0;
-
-	for ( ; ( node = nodes[ i ] ) != null; i++ ) {
-		if ( !keepData && node.nodeType === 1 ) {
-			jQuery.cleanData( getAll( node ) );
-		}
-
-		if ( node.parentNode ) {
-			if ( keepData && isAttached( node ) ) {
-				setGlobalEval( getAll( node, "script" ) );
-			}
-			node.parentNode.removeChild( node );
-		}
-	}
-
-	return elem;
-}
-
-jQuery.extend( {
-	htmlPrefilter: function( html ) {
-		return html;
-	},
-
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = isAttached( elem );
-
-		// Fix IE cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
-			if ( acceptData( elem ) ) {
-				if ( ( data = elem[ dataPriv.expando ] ) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Support: Chrome <=35 - 45+
-					// Assign undefined instead of using delete, see Data#remove
-					elem[ dataPriv.expando ] = undefined;
-				}
-				if ( elem[ dataUser.expando ] ) {
-
-					// Support: Chrome <=35 - 45+
-					// Assign undefined instead of using delete, see Data#remove
-					elem[ dataUser.expando ] = undefined;
-				}
-			}
-		}
-	}
-} );
-
-jQuery.fn.extend( {
-	detach: function( selector ) {
-		return remove( this, selector, true );
-	},
-
-	remove: function( selector ) {
-		return remove( this, selector );
-	},
-
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each( function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				} );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		} );
-	},
-
-	prepend: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		} );
-	},
-
-	before: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		} );
-	},
-
-	after: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		} );
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; ( elem = this[ i ] ) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		} );
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = jQuery.htmlPrefilter( value );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch ( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var ignored = [];
-
-		// Make the changes, replacing each non-ignored context element with the new content
-		return domManip( this, arguments, function( elem ) {
-			var parent = this.parentNode;
-
-			if ( jQuery.inArray( this, ignored ) < 0 ) {
-				jQuery.cleanData( getAll( this ) );
-				if ( parent ) {
-					parent.replaceChild( elem, this );
-				}
-			}
-
-		// Force callback invocation
-		}, ignored );
-	}
-} );
-
-jQuery.each( {
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: Android <=4.0 only, PhantomJS 1 only
-			// .get() because push.apply(_, arraylike) throws on ancient WebKit
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-} );
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-var getStyles = function( elem ) {
-
-		// Support: IE <=11 only, Firefox <=30 (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		var view = elem.ownerDocument.defaultView;
-
-		if ( !view || !view.opener ) {
-			view = window;
-		}
-
-		return view.getComputedStyle( elem );
-	};
-
-var swap = function( elem, options, callback ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.call( elem );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
-
-
-
-( function() {
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computeStyleTests() {
-
-		// This is a singleton, we need to execute it only once
-		if ( !div ) {
-			return;
-		}
-
-		container.style.cssText = "position:absolute;left:-11111px;width:60px;" +
-			"margin-top:1px;padding:0;border:0";
-		div.style.cssText =
-			"position:relative;display:block;box-sizing:border-box;overflow:scroll;" +
-			"margin:auto;border:1px;padding:1px;" +
-			"width:60%;top:1%";
-		documentElement.appendChild( container ).appendChild( div );
-
-		var divStyle = window.getComputedStyle( div );
-		pixelPositionVal = divStyle.top !== "1%";
-
-		// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
-		reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12;
-
-		// Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3
-		// Some styles come back with percentage values, even though they shouldn't
-		div.style.right = "60%";
-		pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36;
-
-		// Support: IE 9 - 11 only
-		// Detect misreporting of content dimensions for box-sizing:border-box elements
-		boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36;
-
-		// Support: IE 9 only
-		// Detect overflow:scroll screwiness (gh-3699)
-		// Support: Chrome <=64
-		// Don't get tricked when zoom affects offsetWidth (gh-4029)
-		div.style.position = "absolute";
-		scrollboxSizeVal = roundPixelMeasures( div.offsetWidth / 3 ) === 12;
-
-		documentElement.removeChild( container );
-
-		// Nullify the div so it wouldn't be stored in the memory and
-		// it will also be a sign that checks already performed
-		div = null;
-	}
-
-	function roundPixelMeasures( measure ) {
-		return Math.round( parseFloat( measure ) );
-	}
-
-	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
-		reliableTrDimensionsVal, reliableMarginLeftVal,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	// Finish early in limited (non-browser) environments
-	if ( !div.style ) {
-		return;
-	}
-
-	// Support: IE <=9 - 11 only
-	// Style of cloned element affects source element cloned (#8908)
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	jQuery.extend( support, {
-		boxSizingReliable: function() {
-			computeStyleTests();
-			return boxSizingReliableVal;
-		},
-		pixelBoxStyles: function() {
-			computeStyleTests();
-			return pixelBoxStylesVal;
-		},
-		pixelPosition: function() {
-			computeStyleTests();
-			return pixelPositionVal;
-		},
-		reliableMarginLeft: function() {
-			computeStyleTests();
-			return reliableMarginLeftVal;
-		},
-		scrollboxSize: function() {
-			computeStyleTests();
-			return scrollboxSizeVal;
-		},
-
-		// Support: IE 9 - 11+, Edge 15 - 18+
-		// IE/Edge misreport `getComputedStyle` of table rows with width/height
-		// set in CSS while `offset*` properties report correct values.
-		// Behavior in IE 9 is more subtle than in newer versions & it passes
-		// some versions of this test; make sure not to make it pass there!
-		reliableTrDimensions: function() {
-			var table, tr, trChild, trStyle;
-			if ( reliableTrDimensionsVal == null ) {
-				table = document.createElement( "table" );
-				tr = document.createElement( "tr" );
-				trChild = document.createElement( "div" );
-
-				table.style.cssText = "position:absolute;left:-11111px";
-				tr.style.height = "1px";
-				trChild.style.height = "9px";
-
-				documentElement
-					.appendChild( table )
-					.appendChild( tr )
-					.appendChild( trChild );
-
-				trStyle = window.getComputedStyle( tr );
-				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
-
-				documentElement.removeChild( table );
-			}
-			return reliableTrDimensionsVal;
-		}
-	} );
-} )();
-
-
-function curCSS( elem, name, computed ) {
-	var width, minWidth, maxWidth, ret,
-
-		// Support: Firefox 51+
-		// Retrieving style before computed somehow
-		// fixes an issue with getting wrong values
-		// on detached elements
-		style = elem.style;
-
-	computed = computed || getStyles( elem );
-
-	// getPropertyValue is needed for:
-	//   .css('filter') (IE 9 only, #12537)
-	//   .css('--customProperty) (#3144)
-	if ( computed ) {
-		ret = computed.getPropertyValue( name ) || computed[ name ];
-
-		if ( ret === "" && !isAttached( elem ) ) {
-			ret = jQuery.style( elem, name );
-		}
-
-		// A tribute to the "awesome hack by Dean Edwards"
-		// Android Browser returns percentage for some values,
-		// but width seems to be reliably pixels.
-		// This is against the CSSOM draft spec:
-		// https://drafts.csswg.org/cssom/#resolved-values
-		if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) {
-
-			// Remember the original values
-			width = style.width;
-			minWidth = style.minWidth;
-			maxWidth = style.maxWidth;
-
-			// Put in the new values to get a computed value out
-			style.minWidth = style.maxWidth = style.width = ret;
-			ret = computed.width;
-
-			// Revert the changed values
-			style.width = width;
-			style.minWidth = minWidth;
-			style.maxWidth = maxWidth;
-		}
-	}
-
-	return ret !== undefined ?
-
-		// Support: IE <=9 - 11 only
-		// IE returns zIndex value as an integer.
-		ret + "" :
-		ret;
-}
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return ( this.get = hookFn ).apply( this, arguments );
-		}
-	};
-}
-
-
-var cssPrefixes = [ "Webkit", "Moz", "ms" ],
-	emptyStyle = document.createElement( "div" ).style,
-	vendorProps = {};
-
-// Return a vendor-prefixed property or undefined
-function vendorPropName( name ) {
-
-	// Check for vendor prefixed names
-	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in emptyStyle ) {
-			return name;
-		}
-	}
-}
-
-// Return a potentially-mapped jQuery.cssProps or vendor prefixed property
-function finalPropName( name ) {
-	var final = jQuery.cssProps[ name ] || vendorProps[ name ];
-
-	if ( final ) {
-		return final;
-	}
-	if ( name in emptyStyle ) {
-		return name;
-	}
-	return vendorProps[ name ] = vendorPropName( name ) || name;
-}
-
-
-var
-
-	// Swappable if display is none or starts with table
-	// except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rcustomProp = /^--/,
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	};
-
-function setPositiveNumber( _elem, value, subtract ) {
-
-	// Any relative (+/-) values have already been
-	// normalized at this point
-	var matches = rcssNum.exec( value );
-	return matches ?
-
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
-		value;
-}
-
-function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) {
-	var i = dimension === "width" ? 1 : 0,
-		extra = 0,
-		delta = 0;
-
-	// Adjustment may not be necessary
-	if ( box === ( isBorderBox ? "border" : "content" ) ) {
-		return 0;
-	}
-
-	for ( ; i < 4; i += 2 ) {
-
-		// Both box models exclude margin
-		if ( box === "margin" ) {
-			delta += jQuery.css( elem, box + cssExpand[ i ], true, styles );
-		}
-
-		// If we get here with a content-box, we're seeking "padding" or "border" or "margin"
-		if ( !isBorderBox ) {
-
-			// Add padding
-			delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// For "border" or "margin", add border
-			if ( box !== "padding" ) {
-				delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-
-			// But still keep track of it otherwise
-			} else {
-				extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-
-		// If we get here with a border-box (content + padding + border), we're seeking "content" or
-		// "padding" or "margin"
-		} else {
-
-			// For "content", subtract padding
-			if ( box === "content" ) {
-				delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// For "content" or "padding", subtract border
-			if ( box !== "margin" ) {
-				delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	// Account for positive content-box scroll gutter when requested by providing computedVal
-	if ( !isBorderBox && computedVal >= 0 ) {
-
-		// offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border
-		// Assuming integer scroll gutter, subtract the rest and round down
-		delta += Math.max( 0, Math.ceil(
-			elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
-			computedVal -
-			delta -
-			extra -
-			0.5
-
-		// If offsetWidth/offsetHeight is unknown, then we can't determine content-box scroll gutter
-		// Use an explicit zero to avoid NaN (gh-3964)
-		) ) || 0;
-	}
-
-	return delta;
-}
-
-function getWidthOrHeight( elem, dimension, extra ) {
-
-	// Start with computed style
-	var styles = getStyles( elem ),
-
-		// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-4322).
-		// Fake content-box until we know it's needed to know the true value.
-		boxSizingNeeded = !support.boxSizingReliable() || extra,
-		isBorderBox = boxSizingNeeded &&
-			jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-		valueIsBorderBox = isBorderBox,
-
-		val = curCSS( elem, dimension, styles ),
-		offsetProp = "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 );
-
-	// Support: Firefox <=54
-	// Return a confounding non-pixel value or feign ignorance, as appropriate.
-	if ( rnumnonpx.test( val ) ) {
-		if ( !extra ) {
-			return val;
-		}
-		val = "auto";
-	}
-
-
-	// Support: IE 9 - 11 only
-	// Use offsetWidth/offsetHeight for when box sizing is unreliable.
-	// In those cases, the computed value can be trusted to be border-box.
-	if ( ( !support.boxSizingReliable() && isBorderBox ||
-
-		// Support: IE 10 - 11+, Edge 15 - 18+
-		// IE/Edge misreport `getComputedStyle` of table rows with width/height
-		// set in CSS while `offset*` properties report correct values.
-		// Interestingly, in some cases IE 9 doesn't suffer from this issue.
-		!support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
-
-		// Fall back to offsetWidth/offsetHeight when value is "auto"
-		// This happens for inline elements with no explicit setting (gh-3571)
-		val === "auto" ||
-
-		// Support: Android <=4.1 - 4.3 only
-		// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
-		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) &&
-
-		// Make sure the element is visible & connected
-		elem.getClientRects().length ) {
-
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-		// Where available, offsetWidth/offsetHeight approximate border box dimensions.
-		// Where not available (e.g., SVG), assume unreliable box-sizing and interpret the
-		// retrieved value as a content box dimension.
-		valueIsBorderBox = offsetProp in elem;
-		if ( valueIsBorderBox ) {
-			val = elem[ offsetProp ];
-		}
-	}
-
-	// Normalize "" and auto
-	val = parseFloat( val ) || 0;
-
-	// Adjust for the element's box model
-	return ( val +
-		boxModelAdjustment(
-			elem,
-			dimension,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles,
-
-			// Provide the current computed size to request scroll gutter calculation (gh-3589)
-			val
-		)
-	) + "px";
-}
-
-jQuery.extend( {
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"animationIterationCount": true,
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"gridArea": true,
-		"gridColumn": true,
-		"gridColumnEnd": true,
-		"gridColumnStart": true,
-		"gridRow": true,
-		"gridRowEnd": true,
-		"gridRowStart": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = camelCase( name ),
-			isCustomProp = rcustomProp.test( name ),
-			style = elem.style;
-
-		// Make sure that we're working with the right name. We don't
-		// want to query the value if it is a CSS custom property
-		// since they are user-defined.
-		if ( !isCustomProp ) {
-			name = finalPropName( origName );
-		}
-
-		// Gets hook for the prefixed version, then unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
-				value = adjustCSS( elem, name, ret );
-
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set (#7116)
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number was passed in, add the unit (except for certain CSS properties)
-			// The isCustomProp check can be removed in jQuery 4.0 when we only auto-append
-			// "px" to a few hardcoded values.
-			if ( type === "number" && !isCustomProp ) {
-				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
-			}
-
-			// background-* props affect original clone's values
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !( "set" in hooks ) ||
-				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
-
-				if ( isCustomProp ) {
-					style.setProperty( name, value );
-				} else {
-					style[ name ] = value;
-				}
-			}
-
-		} else {
-
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks &&
-				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
-
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = camelCase( name ),
-			isCustomProp = rcustomProp.test( name );
-
-		// Make sure that we're working with the right name. We don't
-		// want to modify the value if it is a CSS custom property
-		// since they are user-defined.
-		if ( !isCustomProp ) {
-			name = finalPropName( origName );
-		}
-
-		// Try prefixed name followed by the unprefixed name
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		// Convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Make numeric if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || isFinite( num ) ? num || 0 : val;
-		}
-
-		return val;
-	}
-} );
-
-jQuery.each( [ "height", "width" ], function( _i, dimension ) {
-	jQuery.cssHooks[ dimension ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// Certain elements can have dimension info if we invisibly show them
-				// but it must have a current display style that would benefit
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
-
-					// Support: Safari 8+
-					// Table columns in Safari have non-zero offsetWidth & zero
-					// getBoundingClientRect().width unless display is changed.
-					// Support: IE <=11 only
-					// Running getBoundingClientRect on a disconnected node
-					// in IE throws an error.
-					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
-						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, dimension, extra );
-						} ) :
-						getWidthOrHeight( elem, dimension, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var matches,
-				styles = getStyles( elem ),
-
-				// Only read styles.position if the test has a chance to fail
-				// to avoid forcing a reflow.
-				scrollboxSizeBuggy = !support.scrollboxSize() &&
-					styles.position === "absolute",
-
-				// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-3991)
-				boxSizingNeeded = scrollboxSizeBuggy || extra,
-				isBorderBox = boxSizingNeeded &&
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-				subtract = extra ?
-					boxModelAdjustment(
-						elem,
-						dimension,
-						extra,
-						isBorderBox,
-						styles
-					) :
-					0;
-
-			// Account for unreliable border-box dimensions by comparing offset* to computed and
-			// faking a content-box to get border and padding (gh-3699)
-			if ( isBorderBox && scrollboxSizeBuggy ) {
-				subtract -= Math.ceil(
-					elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
-					parseFloat( styles[ dimension ] ) -
-					boxModelAdjustment( elem, dimension, "border", false, styles ) -
-					0.5
-				);
-			}
-
-			// Convert to pixels if value adjustment is needed
-			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
-				( matches[ 3 ] || "px" ) !== "px" ) {
-
-				elem.style[ dimension ] = value;
-				value = jQuery.css( elem, dimension );
-			}
-
-			return setPositiveNumber( elem, value, subtract );
-		}
-	};
-} );
-
-jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
-	function( elem, computed ) {
-		if ( computed ) {
-			return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
-				elem.getBoundingClientRect().left -
-					swap( elem, { marginLeft: 0 }, function() {
-						return elem.getBoundingClientRect().left;
-					} )
-				) + "px";
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each( {
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// Assumes a single number if not a string
-				parts = typeof value === "string" ? value.split( " " ) : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( prefix !== "margin" ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-} );
-
-jQuery.fn.extend( {
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( Array.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	}
-} );
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || jQuery.easing._default;
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			// Use a property on the element directly when it is not a DOM element,
-			// or when there is no matching style property that exists.
-			if ( tween.elem.nodeType !== 1 ||
-				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// Passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails.
-			// Simple values such as "10px" are parsed to Float;
-			// complex values such as "rotate(1rad)" are returned as-is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-
-			// Use step hook for back compat.
-			// Use cssHook if its there.
-			// Use .style if available and use plain properties where available.
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.nodeType === 1 && (
-					jQuery.cssHooks[ tween.prop ] ||
-					tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9 only
-// Panic based approach to setting things on disconnected nodes
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	},
-	_default: "swing"
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, inProgress,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rrun = /queueHooks$/;
-
-function schedule() {
-	if ( inProgress ) {
-		if ( document.hidden === false && window.requestAnimationFrame ) {
-			window.requestAnimationFrame( schedule );
-		} else {
-			window.setTimeout( schedule, jQuery.fx.interval );
-		}
-
-		jQuery.fx.tick();
-	}
-}
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	window.setTimeout( function() {
-		fxNow = undefined;
-	} );
-	return ( fxNow = Date.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		i = 0,
-		attrs = { height: type };
-
-	// If we include width, step value is 1 to do all cssExpand values,
-	// otherwise step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
-
-			// We're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
-		isBox = "width" in props || "height" in props,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHiddenWithinTree( elem ),
-		dataShow = dataPriv.get( elem, "fxshow" );
-
-	// Queue-skipping animations hijack the fx hooks
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always( function() {
-
-			// Ensure the complete handler is called before this completes
-			anim.always( function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			} );
-		} );
-	}
-
-	// Detect show/hide animations
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.test( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// Pretend to be hidden if this is a "show" and
-				// there is still data from a stopped show/hide
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-
-				// Ignore all other no-op show/hide data
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	// Bail out if this is a no-op like .hide().hide()
-	propTween = !jQuery.isEmptyObject( props );
-	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
-		return;
-	}
-
-	// Restrict "overflow" and "display" styles during box animations
-	if ( isBox && elem.nodeType === 1 ) {
-
-		// Support: IE <=9 - 11, Edge 12 - 15
-		// Record all 3 overflow attributes because IE does not infer the shorthand
-		// from identically-valued overflowX and overflowY and Edge just mirrors
-		// the overflowX value there.
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Identify a display type, preferring old show/hide data over the CSS cascade
-		restoreDisplay = dataShow && dataShow.display;
-		if ( restoreDisplay == null ) {
-			restoreDisplay = dataPriv.get( elem, "display" );
-		}
-		display = jQuery.css( elem, "display" );
-		if ( display === "none" ) {
-			if ( restoreDisplay ) {
-				display = restoreDisplay;
-			} else {
-
-				// Get nonempty value(s) by temporarily forcing visibility
-				showHide( [ elem ], true );
-				restoreDisplay = elem.style.display || restoreDisplay;
-				display = jQuery.css( elem, "display" );
-				showHide( [ elem ] );
-			}
-		}
-
-		// Animate inline elements as inline-block
-		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
-			if ( jQuery.css( elem, "float" ) === "none" ) {
-
-				// Restore the original display value at the end of pure show/hide animations
-				if ( !propTween ) {
-					anim.done( function() {
-						style.display = restoreDisplay;
-					} );
-					if ( restoreDisplay == null ) {
-						display = style.display;
-						restoreDisplay = display === "none" ? "" : display;
-					}
-				}
-				style.display = "inline-block";
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		anim.always( function() {
-			style.overflow = opts.overflow[ 0 ];
-			style.overflowX = opts.overflow[ 1 ];
-			style.overflowY = opts.overflow[ 2 ];
-		} );
-	}
-
-	// Implement show/hide animations
-	propTween = false;
-	for ( prop in orig ) {
-
-		// General show/hide setup for this element animation
-		if ( !propTween ) {
-			if ( dataShow ) {
-				if ( "hidden" in dataShow ) {
-					hidden = dataShow.hidden;
-				}
-			} else {
-				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
-			}
-
-			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
-			if ( toggle ) {
-				dataShow.hidden = !hidden;
-			}
-
-			// Show elements before animating them
-			if ( hidden ) {
-				showHide( [ elem ], true );
-			}
-
-			/* eslint-disable no-loop-func */
-
-			anim.done( function() {
-
-			/* eslint-enable no-loop-func */
-
-				// The final step of a "hide" animation is actually hiding the element
-				if ( !hidden ) {
-					showHide( [ elem ] );
-				}
-				dataPriv.remove( elem, "fxshow" );
-				for ( prop in orig ) {
-					jQuery.style( elem, prop, orig[ prop ] );
-				}
-			} );
-		}
-
-		// Per-property setup
-		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-		if ( !( prop in dataShow ) ) {
-			dataShow[ prop ] = propTween.start;
-			if ( hidden ) {
-				propTween.end = propTween.start;
-				propTween.start = 0;
-			}
-		}
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( Array.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// Not quite $.extend, this won't overwrite existing keys.
-			// Reusing 'index' because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = Animation.prefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-
-			// Don't match elem in the :animated selector
-			delete tick.elem;
-		} ),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-
-				// Support: Android 2.3 only
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ] );
-
-			// If there's more to do, yield
-			if ( percent < 1 && length ) {
-				return remaining;
-			}
-
-			// If this was an empty animation, synthesize a final progress notification
-			if ( !length ) {
-				deferred.notifyWith( elem, [ animation, 1, 0 ] );
-			}
-
-			// Resolve the animation and report its conclusion
-			deferred.resolveWith( elem, [ animation ] );
-			return false;
-		},
-		animation = deferred.promise( {
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, {
-				specialEasing: {},
-				easing: jQuery.easing._default
-			}, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-
-					// If we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// Resolve when we played the last frame; otherwise, reject
-				if ( gotoEnd ) {
-					deferred.notifyWith( elem, [ animation, 1, 0 ] );
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		} ),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length; index++ ) {
-		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			if ( isFunction( result.stop ) ) {
-				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
-					result.stop.bind( result );
-			}
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	// Attach callbacks from options
-	animation
-		.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		} )
-	);
-
-	return animation;
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweeners: {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value );
-			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
-			return tween;
-		} ]
-	},
-
-	tweener: function( props, callback ) {
-		if ( isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.match( rnothtmlwhite );
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length; index++ ) {
-			prop = props[ index ];
-			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
-			Animation.tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilters: [ defaultPrefilter ],
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			Animation.prefilters.unshift( callback );
-		} else {
-			Animation.prefilters.push( callback );
-		}
-	}
-} );
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !isFunction( easing ) && easing
-	};
-
-	// Go to the end state if fx are off
-	if ( jQuery.fx.off ) {
-		opt.duration = 0;
-
-	} else {
-		if ( typeof opt.duration !== "number" ) {
-			if ( opt.duration in jQuery.fx.speeds ) {
-				opt.duration = jQuery.fx.speeds[ opt.duration ];
-
-			} else {
-				opt.duration = jQuery.fx.speeds._default;
-			}
-		}
-	}
-
-	// Normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend( {
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
-
-			// Animate to the value specified
-			.end().animate( { opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || dataPriv.get( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each( function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = dataPriv.get( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this &&
-					( type == null || timers[ index ].queue === type ) ) {
-
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Start the next in the queue if the last step wasn't forced.
-			// Timers currently will call their complete callbacks, which
-			// will dequeue but only if they were gotoEnd.
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		} );
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each( function() {
-			var index,
-				data = dataPriv.get( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// Enable finishing flag on private data
-			data.finish = true;
-
-			// Empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// Look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// Turn off finishing flag
-			delete data.finish;
-		} );
-	}
-} );
-
-jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-} );
-
-// Generate shortcuts for custom animations
-jQuery.each( {
-	slideDown: genFx( "show" ),
-	slideUp: genFx( "hide" ),
-	slideToggle: genFx( "toggle" ),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-} );
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		i = 0,
-		timers = jQuery.timers;
-
-	fxNow = Date.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-
-		// Run the timer and safely remove it when done (allowing for external removal)
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	jQuery.fx.start();
-};
-
-jQuery.fx.interval = 13;
-jQuery.fx.start = function() {
-	if ( inProgress ) {
-		return;
-	}
-
-	inProgress = true;
-	schedule();
-};
-
-jQuery.fx.stop = function() {
-	inProgress = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = window.setTimeout( next, time );
-		hooks.stop = function() {
-			window.clearTimeout( timeout );
-		};
-	} );
-};
-
-
-( function() {
-	var input = document.createElement( "input" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	input.type = "checkbox";
-
-	// Support: Android <=4.3 only
-	// Default value for a checkbox should be "on"
-	support.checkOn = input.value !== "";
-
-	// Support: IE <=11 only
-	// Must access selectedIndex to make default options select
-	support.optSelected = opt.selected;
-
-	// Support: IE <=11 only
-	// An input loses its value after becoming a radio
-	input = document.createElement( "input" );
-	input.value = "t";
-	input.type = "radio";
-	support.radioValue = input.value === "t";
-} )();
-
-
-var boolHook,
-	attrHandle = jQuery.expr.attrHandle;
-
-jQuery.fn.extend( {
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each( function() {
-			jQuery.removeAttr( this, name );
-		} );
-	}
-} );
-
-jQuery.extend( {
-	attr: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set attributes on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// Attribute hooks are determined by the lowercase version
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
-		}
-
-		if ( value !== undefined ) {
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-			}
-
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			elem.setAttribute( name, value + "" );
-			return value;
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		ret = jQuery.find.attr( elem, name );
-
-		// Non-existent attributes return null, we normalize to undefined
-		return ret == null ? undefined : ret;
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					nodeName( elem, "input" ) ) {
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name,
-			i = 0,
-
-			// Attribute names can contain non-HTML whitespace characters
-			// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
-			attrNames = value && value.match( rnothtmlwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( ( name = attrNames[ i++ ] ) ) {
-				elem.removeAttribute( name );
-			}
-		}
-	}
-} );
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			elem.setAttribute( name, name );
-		}
-		return name;
-	}
-};
-
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle,
-			lowercaseName = name.toLowerCase();
-
-		if ( !isXML ) {
-
-			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ lowercaseName ];
-			attrHandle[ lowercaseName ] = ret;
-			ret = getter( elem, name, isXML ) != null ?
-				lowercaseName :
-				null;
-			attrHandle[ lowercaseName ] = handle;
-		}
-		return ret;
-	};
-} );
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button)$/i,
-	rclickable = /^(?:a|area)$/i;
-
-jQuery.fn.extend( {
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		return this.each( function() {
-			delete this[ jQuery.propFix[ name ] || name ];
-		} );
-	}
-} );
-
-jQuery.extend( {
-	prop: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set properties on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			return ( elem[ name ] = value );
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		return elem[ name ];
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-
-				// Support: IE <=9 - 11 only
-				// elem.tabIndex doesn't always return the
-				// correct value when it hasn't been explicitly set
-				// https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				if ( tabindex ) {
-					return parseInt( tabindex, 10 );
-				}
-
-				if (
-					rfocusable.test( elem.nodeName ) ||
-					rclickable.test( elem.nodeName ) &&
-					elem.href
-				) {
-					return 0;
-				}
-
-				return -1;
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	}
-} );
-
-// Support: IE <=11 only
-// Accessing the selectedIndex property
-// forces the browser to respect setting selected
-// on the option
-// The getter ensures a default option is selected
-// when in an optgroup
-// eslint rule "no-unused-expressions" is disabled for this code
-// since it considers such accessions noop
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-
-			/* eslint no-unused-expressions: "off" */
-
-			var parent = elem.parentNode;
-			if ( parent && parent.parentNode ) {
-				parent.parentNode.selectedIndex;
-			}
-			return null;
-		},
-		set: function( elem ) {
-
-			/* eslint no-unused-expressions: "off" */
-
-			var parent = elem.parentNode;
-			if ( parent ) {
-				parent.selectedIndex;
-
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-		}
-	};
-}
-
-jQuery.each( [
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-} );
-
-
-
-
-	// Strip and collapse whitespace according to HTML spec
-	// https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace
-	function stripAndCollapse( value ) {
-		var tokens = value.match( rnothtmlwhite ) || [];
-		return tokens.join( " " );
-	}
-
-
-function getClass( elem ) {
-	return elem.getAttribute && elem.getAttribute( "class" ) || "";
-}
-
-function classesToArray( value ) {
-	if ( Array.isArray( value ) ) {
-		return value;
-	}
-	if ( typeof value === "string" ) {
-		return value.match( rnothtmlwhite ) || [];
-	}
-	return [];
-}
-
-jQuery.fn.extend( {
-	addClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		classes = classesToArray( value );
-
-		if ( classes.length ) {
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = stripAndCollapse( cur );
-					if ( curValue !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( !arguments.length ) {
-			return this.attr( "class", "" );
-		}
-
-		classes = classesToArray( value );
-
-		if ( classes.length ) {
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = stripAndCollapse( cur );
-					if ( curValue !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isValidValue = type === "string" || Array.isArray( value );
-
-		if ( typeof stateVal === "boolean" && isValidValue ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( isFunction( value ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).toggleClass(
-					value.call( this, i, getClass( this ), stateVal ),
-					stateVal
-				);
-			} );
-		}
-
-		return this.each( function() {
-			var className, i, self, classNames;
-
-			if ( isValidValue ) {
-
-				// Toggle individual class names
-				i = 0;
-				self = jQuery( this );
-				classNames = classesToArray( value );
-
-				while ( ( className = classNames[ i++ ] ) ) {
-
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( value === undefined || type === "boolean" ) {
-				className = getClass( this );
-				if ( className ) {
-
-					// Store className if set
-					dataPriv.set( this, "__className__", className );
-				}
-
-				// If the element has a class name or if we're passed `false`,
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				if ( this.setAttribute ) {
-					this.setAttribute( "class",
-						className || value === false ?
-						"" :
-						dataPriv.get( this, "__className__" ) || ""
-					);
-				}
-			}
-		} );
-	},
-
-	hasClass: function( selector ) {
-		var className, elem,
-			i = 0;
-
-		className = " " + selector + " ";
-		while ( ( elem = this[ i++ ] ) ) {
-			if ( elem.nodeType === 1 &&
-				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
-					return true;
-			}
-		}
-
-		return false;
-	}
-} );
-
-
-
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend( {
-	val: function( value ) {
-		var hooks, ret, valueIsFunction,
-			elem = this[ 0 ];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] ||
-					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks &&
-					"get" in hooks &&
-					( ret = hooks.get( elem, "value" ) ) !== undefined
-				) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				// Handle most common string cases
-				if ( typeof ret === "string" ) {
-					return ret.replace( rreturn, "" );
-				}
-
-				// Handle cases where value is null/undef or number
-				return ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		valueIsFunction = isFunction( value );
-
-		return this.each( function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( valueIsFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-
-			} else if ( typeof val === "number" ) {
-				val += "";
-
-			} else if ( Array.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				} );
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		} );
-	}
-} );
-
-jQuery.extend( {
-	valHooks: {
-		option: {
-			get: function( elem ) {
-
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-
-					// Support: IE <=10 - 11 only
-					// option.text throws exceptions (#14686, #14858)
-					// Strip and collapse whitespace
-					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
-					stripAndCollapse( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option, i,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one",
-					values = one ? null : [],
-					max = one ? index + 1 : options.length;
-
-				if ( index < 0 ) {
-					i = max;
-
-				} else {
-					i = one ? index : 0;
-				}
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// Support: IE <=9 only
-					// IE8-9 doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-
-							// Don't return options that are disabled or in a disabled optgroup
-							!option.disabled &&
-							( !option.parentNode.disabled ||
-								!nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-
-					/* eslint-disable no-cond-assign */
-
-					if ( option.selected =
-						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
-					) {
-						optionSet = true;
-					}
-
-					/* eslint-enable no-cond-assign */
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	}
-} );
-
-// Radios and checkboxes getter/setter
-jQuery.each( [ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( Array.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
-		};
-	}
-} );
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-support.focusin = "onfocusin" in window;
-
-
-var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	stopPropagationCallback = function( e ) {
-		e.stopPropagation();
-	};
-
-jQuery.extend( jQuery.event, {
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special, lastElement,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
-
-		cur = lastElement = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "." ) > -1 ) {
-
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split( "." );
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf( ":" ) < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join( "." );
-		event.rnamespace = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === ( elem.ownerDocument || document ) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
-			lastElement = cur;
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = (
-					dataPriv.get( cur, "events" ) || Object.create( null )
-				)[ event.type ] &&
-				dataPriv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( ( !special._default ||
-				special._default.apply( eventPath.pop(), data ) === false ) &&
-				acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-
-					if ( event.isPropagationStopped() ) {
-						lastElement.addEventListener( type, stopPropagationCallback );
-					}
-
-					elem[ type ]();
-
-					if ( event.isPropagationStopped() ) {
-						lastElement.removeEventListener( type, stopPropagationCallback );
-					}
-
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	// Piggyback on a donor event to simulate a different one
-	// Used only for `focus(in | out)` events
-	simulate: function( type, elem, event ) {
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true
-			}
-		);
-
-		jQuery.event.trigger( e, null, elem );
-	}
-
-} );
-
-jQuery.fn.extend( {
-
-	trigger: function( type, data ) {
-		return this.each( function() {
-			jQuery.event.trigger( type, data, this );
-		} );
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[ 0 ];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-} );
-
-
-// Support: Firefox <=44
-// Firefox doesn't have focus(in | out) events
-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
-//
-// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
-// focus(in | out) events fire after focus & blur events,
-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
-if ( !support.focusin ) {
-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
-		};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-
-				// Handle: regular nodes (via `this.ownerDocument`), window
-				// (via `this.document`) & document (via `this`).
-				var doc = this.ownerDocument || this.document || this,
-					attaches = dataPriv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this.document || this,
-					attaches = dataPriv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					dataPriv.remove( doc, fix );
-
-				} else {
-					dataPriv.access( doc, fix, attaches );
-				}
-			}
-		};
-	} );
-}
-var location = window.location;
-
-var nonce = { guid: Date.now() };
-
-var rquery = ( /\?/ );
-
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE throws on parseFromString with invalid input.
-	try {
-		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
-
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( Array.isArray( obj ) ) {
-
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams(
-					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
-					v,
-					traditional,
-					add
-				);
-			}
-		} );
-
-	} else if ( !traditional && toType( obj ) === "object" ) {
-
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, valueOrFunction ) {
-
-			// If value is a function, invoke it and use its return value
-			var value = isFunction( valueOrFunction ) ?
-				valueOrFunction() :
-				valueOrFunction;
-
-			s[ s.length ] = encodeURIComponent( key ) + "=" +
-				encodeURIComponent( value == null ? "" : value );
-		};
-
-	if ( a == null ) {
-		return "";
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		} );
-
-	} else {
-
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" );
-};
-
-jQuery.fn.extend( {
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map( function() {
-
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( _i, elem ) {
-			var val = jQuery( this ).val();
-
-			if ( val == null ) {
-				return null;
-			}
-
-			if ( Array.isArray( val ) ) {
-				return jQuery.map( val, function( val ) {
-					return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-				} );
-			}
-
-			return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		} ).get();
-	}
-} );
-
-
-var
-	r20 = /%20/g,
-	rhash = /#.*$/,
-	rantiCache = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat( "*" ),
-
-	// Anchor tag for parsing the document origin
-	originAnchor = document.createElement( "a" );
-	originAnchor.href = location.href;
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || [];
-
-		if ( isFunction( func ) ) {
-
-			// For each dataType in the dataTypeExpression
-			while ( ( dataType = dataTypes[ i++ ] ) ) {
-
-				// Prepend if requested
-				if ( dataType[ 0 ] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
-
-				// Otherwise append
-				} else {
-					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" &&
-				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		} );
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s.throws ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return {
-								state: "parsererror",
-								error: conv ? e : "No conversion from " + prev + " to " + current
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend( {
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: location.href,
-		type: "GET",
-		isLocal: rlocalProtocol.test( location.protocol ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /\bxml\b/,
-			html: /\bhtml/,
-			json: /\bjson\b/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": JSON.parse,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var transport,
-
-			// URL without anti-cache param
-			cacheURL,
-
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-
-			// timeout handle
-			timeoutTimer,
-
-			// Url cleanup var
-			urlAnchor,
-
-			// Request state (becomes false upon send and true upon completion)
-			completed,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			// Loop variable
-			i,
-
-			// uncached part of the url
-			uncached,
-
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-
-			// Callbacks context
-			callbackContext = s.context || s,
-
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context &&
-				( callbackContext.nodeType || callbackContext.jquery ) ?
-					jQuery( callbackContext ) :
-					jQuery.event,
-
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-
-			// Default abort message
-			strAbort = "canceled",
-
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( completed ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[ 1 ].toLowerCase() + " " ] =
-									( responseHeaders[ match[ 1 ].toLowerCase() + " " ] || [] )
-										.concat( match[ 2 ] );
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() + " " ];
-					}
-					return match == null ? null : match.join( ", " );
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return completed ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( completed == null ) {
-						name = requestHeadersNames[ name.toLowerCase() ] =
-							requestHeadersNames[ name.toLowerCase() ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( completed == null ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( completed ) {
-
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						} else {
-
-							// Lazy-add the new callbacks in a way that preserves old ones
-							for ( code in map ) {
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-
-		// Add protocol if not provided (prefilters might expect it)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || location.href ) + "" )
-			.replace( rprotocol, location.protocol + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ];
-
-		// A cross-domain request is in order when the origin doesn't match the current origin.
-		if ( s.crossDomain == null ) {
-			urlAnchor = document.createElement( "a" );
-
-			// Support: IE <=8 - 11, Edge 12 - 15
-			// IE throws exception on accessing the href property if url is malformed,
-			// e.g. http://example.com:80x/
-			try {
-				urlAnchor.href = s.url;
-
-				// Support: IE <=8 - 11 only
-				// Anchor's host property isn't correctly set when s.url is relative
-				urlAnchor.href = urlAnchor.href;
-				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
-					urlAnchor.protocol + "//" + urlAnchor.host;
-			} catch ( e ) {
-
-				// If there is an error parsing the URL, assume it is crossDomain,
-				// it can be rejected by the transport if it is invalid
-				s.crossDomain = true;
-			}
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( completed ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		// Remove hash to simplify url manipulation
-		cacheURL = s.url.replace( rhash, "" );
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// Remember the hash so we can put it back
-			uncached = s.url.slice( cacheURL.length );
-
-			// If data is available and should be processed, append data to url
-			if ( s.data && ( s.processData || typeof s.data === "string" ) ) {
-				cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
-
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add or update anti-cache param if needed
-			if ( s.cache === false ) {
-				cacheURL = cacheURL.replace( rantiCache, "$1" );
-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
-					uncached;
-			}
-
-			// Put hash and anti-cache on the URL that will be requested (gh-1732)
-			s.url = cacheURL + uncached;
-
-		// Change '%20' to '+' if this is encoded form body content (gh-2658)
-		} else if ( s.data && s.processData &&
-			( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
-			s.data = s.data.replace( r20, "+" );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
-				s.accepts[ s.dataTypes[ 0 ] ] +
-					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend &&
-			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
-
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// Aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		completeDeferred.add( s.complete );
-		jqXHR.done( s.success );
-		jqXHR.fail( s.error );
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-
-			// If request was aborted inside ajaxSend, stop there
-			if ( completed ) {
-				return jqXHR;
-			}
-
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = window.setTimeout( function() {
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				completed = false;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-
-				// Rethrow post-completion exceptions
-				if ( completed ) {
-					throw e;
-				}
-
-				// Propagate others as results
-				done( -1, e );
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Ignore repeat invocations
-			if ( completed ) {
-				return;
-			}
-
-			completed = true;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				window.clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Use a noop converter for missing script
-			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
-				s.converters[ "text script" ] = function() {};
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader( "Last-Modified" );
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader( "etag" );
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-
-				// Extract error from statusText and normalize for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-} );
-
-jQuery.each( [ "get", "post" ], function( _i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-
-		// Shift arguments if data argument was omitted
-		if ( isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		// The url can be an options object (which then must have .url)
-		return jQuery.ajax( jQuery.extend( {
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		}, jQuery.isPlainObject( url ) && url ) );
-	};
-} );
-
-jQuery.ajaxPrefilter( function( s ) {
-	var i;
-	for ( i in s.headers ) {
-		if ( i.toLowerCase() === "content-type" ) {
-			s.contentType = s.headers[ i ] || "";
-		}
-	}
-} );
-
-
-jQuery._evalUrl = function( url, options, doc ) {
-	return jQuery.ajax( {
-		url: url,
-
-		// Make this explicit, since user can override this through ajaxSetup (#11264)
-		type: "GET",
-		dataType: "script",
-		cache: true,
-		async: false,
-		global: false,
-
-		// Only evaluate the response if it is successful (gh-4126)
-		// dataFilter is not invoked for failure responses, so using it instead
-		// of the default converter is kludgy but it works.
-		converters: {
-			"text script": function() {}
-		},
-		dataFilter: function( response ) {
-			jQuery.globalEval( response, options, doc );
-		}
-	} );
-};
-
-
-jQuery.fn.extend( {
-	wrapAll: function( html ) {
-		var wrap;
-
-		if ( this[ 0 ] ) {
-			if ( isFunction( html ) ) {
-				html = html.call( this[ 0 ] );
-			}
-
-			// The elements to wrap the target around
-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-			if ( this[ 0 ].parentNode ) {
-				wrap.insertBefore( this[ 0 ] );
-			}
-
-			wrap.map( function() {
-				var elem = this;
-
-				while ( elem.firstElementChild ) {
-					elem = elem.firstElementChild;
-				}
-
-				return elem;
-			} ).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( isFunction( html ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).wrapInner( html.call( this, i ) );
-			} );
-		}
-
-		return this.each( function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		} );
-	},
-
-	wrap: function( html ) {
-		var htmlIsFunction = isFunction( html );
-
-		return this.each( function( i ) {
-			jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html );
-		} );
-	},
-
-	unwrap: function( selector ) {
-		this.parent( selector ).not( "body" ).each( function() {
-			jQuery( this ).replaceWith( this.childNodes );
-		} );
-		return this;
-	}
-} );
-
-
-jQuery.expr.pseudos.hidden = function( elem ) {
-	return !jQuery.expr.pseudos.visible( elem );
-};
-jQuery.expr.pseudos.visible = function( elem ) {
-	return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
-};
-
-
-
-
-jQuery.ajaxSettings.xhr = function() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch ( e ) {}
-};
-
-var xhrSuccessStatus = {
-
-		// File protocol always yields status code 0, assume 200
-		0: 200,
-
-		// Support: IE <=9 only
-		// #1450: sometimes IE returns 1223 when it should be 204
-		1223: 204
-	},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-support.ajax = xhrSupported = !!xhrSupported;
-
-jQuery.ajaxTransport( function( options ) {
-	var callback, errorCallback;
-
-	// Cross domain only allowed if supported through XMLHttpRequest
-	if ( support.cors || xhrSupported && !options.crossDomain ) {
-		return {
-			send: function( headers, complete ) {
-				var i,
-					xhr = options.xhr();
-
-				xhr.open(
-					options.type,
-					options.url,
-					options.async,
-					options.username,
-					options.password
-				);
-
-				// Apply custom fields if provided
-				if ( options.xhrFields ) {
-					for ( i in options.xhrFields ) {
-						xhr[ i ] = options.xhrFields[ i ];
-					}
-				}
-
-				// Override mime type if needed
-				if ( options.mimeType && xhr.overrideMimeType ) {
-					xhr.overrideMimeType( options.mimeType );
-				}
-
-				// X-Requested-With header
-				// For cross-domain requests, seeing as conditions for a preflight are
-				// akin to a jigsaw puzzle, we simply never set it to be sure.
-				// (it can always be set on a per-request basis or even using ajaxSetup)
-				// For same-domain requests, won't change header if already provided.
-				if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
-					headers[ "X-Requested-With" ] = "XMLHttpRequest";
-				}
-
-				// Set headers
-				for ( i in headers ) {
-					xhr.setRequestHeader( i, headers[ i ] );
-				}
-
-				// Callback
-				callback = function( type ) {
-					return function() {
-						if ( callback ) {
-							callback = errorCallback = xhr.onload =
-								xhr.onerror = xhr.onabort = xhr.ontimeout =
-									xhr.onreadystatechange = null;
-
-							if ( type === "abort" ) {
-								xhr.abort();
-							} else if ( type === "error" ) {
-
-								// Support: IE <=9 only
-								// On a manual native abort, IE9 throws
-								// errors on any property access that is not readyState
-								if ( typeof xhr.status !== "number" ) {
-									complete( 0, "error" );
-								} else {
-									complete(
-
-										// File: protocol always yields status 0; see #8605, #14207
-										xhr.status,
-										xhr.statusText
-									);
-								}
-							} else {
-								complete(
-									xhrSuccessStatus[ xhr.status ] || xhr.status,
-									xhr.statusText,
-
-									// Support: IE <=9 only
-									// IE9 has no XHR2 but throws on binary (trac-11426)
-									// For XHR2 non-text, let the caller handle it (gh-2498)
-									( xhr.responseType || "text" ) !== "text"  ||
-									typeof xhr.responseText !== "string" ?
-										{ binary: xhr.response } :
-										{ text: xhr.responseText },
-									xhr.getAllResponseHeaders()
-								);
-							}
-						}
-					};
-				};
-
-				// Listen to events
-				xhr.onload = callback();
-				errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" );
-
-				// Support: IE 9 only
-				// Use onreadystatechange to replace onabort
-				// to handle uncaught aborts
-				if ( xhr.onabort !== undefined ) {
-					xhr.onabort = errorCallback;
-				} else {
-					xhr.onreadystatechange = function() {
-
-						// Check readyState before timeout as it changes
-						if ( xhr.readyState === 4 ) {
-
-							// Allow onerror to be called first,
-							// but that will not handle a native abort
-							// Also, save errorCallback to a variable
-							// as xhr.onerror cannot be accessed
-							window.setTimeout( function() {
-								if ( callback ) {
-									errorCallback();
-								}
-							} );
-						}
-					};
-				}
-
-				// Create the abort callback
-				callback = callback( "abort" );
-
-				try {
-
-					// Do send the request (this may raise an exception)
-					xhr.send( options.hasContent && options.data || null );
-				} catch ( e ) {
-
-					// #14683: Only rethrow if this hasn't been notified as an error yet
-					if ( callback ) {
-						throw e;
-					}
-				}
-			},
-
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-} );
-
-
-
-
-// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
-jQuery.ajaxPrefilter( function( s ) {
-	if ( s.crossDomain ) {
-		s.contents.script = false;
-	}
-} );
-
-// Install script dataType
-jQuery.ajaxSetup( {
-	accepts: {
-		script: "text/javascript, application/javascript, " +
-			"application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /\b(?:java|ecma)script\b/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-} );
-
-// Handle cache's special case and crossDomain
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-	}
-} );
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function( s ) {
-
-	// This transport only deals with cross domain or forced-by-attrs requests
-	if ( s.crossDomain || s.scriptAttrs ) {
-		var script, callback;
-		return {
-			send: function( _, complete ) {
-				script = jQuery( "<script>" )
-					.attr( s.scriptAttrs || {} )
-					.prop( { charset: s.scriptCharset, src: s.url } )
-					.on( "load error", callback = function( evt ) {
-						script.remove();
-						callback = null;
-						if ( evt ) {
-							complete( evt.type === "error" ? 404 : 200, evt.type );
-						}
-					} );
-
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				document.head.appendChild( script[ 0 ] );
-			},
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-} );
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup( {
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-} );
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" &&
-				( s.contentType || "" )
-					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
-				rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters[ "script json" ] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// Force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always( function() {
-
-			// If previous value didn't exist - remove it
-			if ( overwritten === undefined ) {
-				jQuery( window ).removeProp( callbackName );
-
-			// Otherwise restore preexisting value
-			} else {
-				window[ callbackName ] = overwritten;
-			}
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-
-				// Make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// Save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		} );
-
-		// Delegate to script
-		return "script";
-	}
-} );
-
-
-
-
-// Support: Safari 8 only
-// In Safari 8 documents created via document.implementation.createHTMLDocument
-// collapse sibling forms: the second one becomes a child of the first one.
-// Because of that, this security measure has to be disabled in Safari 8.
-// https://bugs.webkit.org/show_bug.cgi?id=137337
-support.createHTMLDocument = ( function() {
-	var body = document.implementation.createHTMLDocument( "" ).body;
-	body.innerHTML = "<form></form><form></form>";
-	return body.childNodes.length === 2;
-} )();
-
-
-// Argument "data" should be string of html
-// context (optional): If specified, the fragment will be created in this context,
-// defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( typeof data !== "string" ) {
-		return [];
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-
-	var base, parsed, scripts;
-
-	if ( !context ) {
-
-		// Stop scripts or inline event handlers from being executed immediately
-		// by using document.implementation
-		if ( support.createHTMLDocument ) {
-			context = document.implementation.createHTMLDocument( "" );
-
-			// Set the base href for the created document
-			// so any parsed elements with URLs
-			// are based on the document's URL (gh-2965)
-			base = context.createElement( "base" );
-			base.href = document.location.href;
-			context.head.appendChild( base );
-		} else {
-			context = document;
-		}
-	}
-
-	parsed = rsingleTag.exec( data );
-	scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[ 1 ] ) ];
-	}
-
-	parsed = buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	var selector, type, response,
-		self = this,
-		off = url.indexOf( " " );
-
-	if ( off > -1 ) {
-		selector = stripAndCollapse( url.slice( off ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax( {
-			url: url,
-
-			// If "type" variable is undefined, then "GET" method will be used.
-			// Make value of this field explicit since
-			// user can override it through ajaxSetup method
-			type: type || "GET",
-			dataType: "html",
-			data: params
-		} ).done( function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		// If the request succeeds, this function gets "data", "status", "jqXHR"
-		// but they are ignored because response was set above.
-		// If it fails, this function gets "jqXHR", "status", "error"
-		} ).always( callback && function( jqXHR, status ) {
-			self.each( function() {
-				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
-			} );
-		} );
-	}
-
-	return this;
-};
-
-
-
-
-jQuery.expr.pseudos.animated = function( elem ) {
-	return jQuery.grep( jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	} ).length;
-};
-
-
-
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// Set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
-
-		// Need to be able to calculate position if either
-		// top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( isFunction( options ) ) {
-
-			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
-			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-
-		} else {
-			if ( typeof props.top === "number" ) {
-				props.top += "px";
-			}
-			if ( typeof props.left === "number" ) {
-				props.left += "px";
-			}
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend( {
-
-	// offset() relates an element's border box to the document origin
-	offset: function( options ) {
-
-		// Preserve chaining for setter
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each( function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				} );
-		}
-
-		var rect, win,
-			elem = this[ 0 ];
-
-		if ( !elem ) {
-			return;
-		}
-
-		// Return zeros for disconnected and hidden (display: none) elements (gh-2310)
-		// Support: IE <=11 only
-		// Running getBoundingClientRect on a
-		// disconnected node in IE throws an error
-		if ( !elem.getClientRects().length ) {
-			return { top: 0, left: 0 };
-		}
-
-		// Get document-relative position by adding viewport scroll to viewport-relative gBCR
-		rect = elem.getBoundingClientRect();
-		win = elem.ownerDocument.defaultView;
-		return {
-			top: rect.top + win.pageYOffset,
-			left: rect.left + win.pageXOffset
-		};
-	},
-
-	// position() relates an element's margin box to its offset parent's padding box
-	// This corresponds to the behavior of CSS absolute positioning
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset, doc,
-			elem = this[ 0 ],
-			parentOffset = { top: 0, left: 0 };
-
-		// position:fixed elements are offset from the viewport, which itself always has zero offset
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-
-			// Assume position:fixed implies availability of getBoundingClientRect
-			offset = elem.getBoundingClientRect();
-
-		} else {
-			offset = this.offset();
-
-			// Account for the *real* offset parent, which can be the document or its root element
-			// when a statically positioned element is identified
-			doc = elem.ownerDocument;
-			offsetParent = elem.offsetParent || doc.documentElement;
-			while ( offsetParent &&
-				( offsetParent === doc.body || offsetParent === doc.documentElement ) &&
-				jQuery.css( offsetParent, "position" ) === "static" ) {
-
-				offsetParent = offsetParent.parentNode;
-			}
-			if ( offsetParent && offsetParent !== elem && offsetParent.nodeType === 1 ) {
-
-				// Incorporate borders into its offset, since they are outside its content origin
-				parentOffset = jQuery( offsetParent ).offset();
-				parentOffset.top += jQuery.css( offsetParent, "borderTopWidth", true );
-				parentOffset.left += jQuery.css( offsetParent, "borderLeftWidth", true );
-			}
-		}
-
-		// Subtract parent offsets and element margins
-		return {
-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-		};
-	},
-
-	// This method will return documentElement in the following cases:
-	// 1) For the element inside the iframe without offsetParent, this method will return
-	//    documentElement of the parent window
-	// 2) For the hidden or detached element
-	// 3) For body or html element, i.e. in case of the html node - it will return itself
-	//
-	// but those exceptions were never presented as a real life use-cases
-	// and might be considered as more preferable results.
-	//
-	// This logic, however, is not guaranteed and can change at any point in the future
-	offsetParent: function() {
-		return this.map( function() {
-			var offsetParent = this.offsetParent;
-
-			while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			return offsetParent || documentElement;
-		} );
-	}
-} );
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = "pageYOffset" === prop;
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-
-			// Coalesce documents and windows
-			var win;
-			if ( isWindow( elem ) ) {
-				win = elem;
-			} else if ( elem.nodeType === 9 ) {
-				win = elem.defaultView;
-			}
-
-			if ( val === undefined ) {
-				return win ? win[ prop ] : elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : win.pageXOffset,
-					top ? val : win.pageYOffset
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length );
-	};
-} );
-
-// Support: Safari <=7 - 9.1, Chrome <=37 - 49
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( _i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-
-				// If curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-} );
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
-		function( defaultExtra, funcName ) {
-
-		// Margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( isWindow( elem ) ) {
-
-					// $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
-					return funcName.indexOf( "outer" ) === 0 ?
-						elem[ "inner" + name ] :
-						elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-					// whichever is greatest
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable );
-		};
-	} );
-} );
-
-
-jQuery.each( [
-	"ajaxStart",
-	"ajaxStop",
-	"ajaxComplete",
-	"ajaxError",
-	"ajaxSuccess",
-	"ajaxSend"
-], function( _i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-} );
-
-
-
-
-jQuery.fn.extend( {
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ?
-			this.off( selector, "**" ) :
-			this.off( types, selector || "**", fn );
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
-	function( _i, name ) {
-
-		// Handle event binding
-		jQuery.fn[ name ] = function( data, fn ) {
-			return arguments.length > 0 ?
-				this.on( name, null, data, fn ) :
-				this.trigger( name );
-		};
-	} );
-
-
-
-
-// Support: Android <=4.0 only
-// Make sure we trim BOM and NBSP
-var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
-
-// Bind a function to a context, optionally partially applying any
-// arguments.
-// jQuery.proxy is deprecated to promote standards (specifically Function#bind)
-// However, it is not slated for removal any time soon
-jQuery.proxy = function( fn, context ) {
-	var tmp, args, proxy;
-
-	if ( typeof context === "string" ) {
-		tmp = fn[ context ];
-		context = fn;
-		fn = tmp;
-	}
-
-	// Quick check to determine if target is callable, in the spec
-	// this throws a TypeError, but we will just return undefined.
-	if ( !isFunction( fn ) ) {
-		return undefined;
-	}
-
-	// Simulated bind
-	args = slice.call( arguments, 2 );
-	proxy = function() {
-		return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-	};
-
-	// Set the guid of unique handler to the same of original handler, so it can be removed
-	proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-	return proxy;
-};
-
-jQuery.holdReady = function( hold ) {
-	if ( hold ) {
-		jQuery.readyWait++;
-	} else {
-		jQuery.ready( true );
-	}
-};
-jQuery.isArray = Array.isArray;
-jQuery.parseJSON = JSON.parse;
-jQuery.nodeName = nodeName;
-jQuery.isFunction = isFunction;
-jQuery.isWindow = isWindow;
-jQuery.camelCase = camelCase;
-jQuery.type = toType;
-
-jQuery.now = Date.now;
-
-jQuery.isNumeric = function( obj ) {
-
-	// As of jQuery 3.0, isNumeric is limited to
-	// strings and numbers (primitives or objects)
-	// that can be coerced to finite numbers (gh-2662)
-	var type = jQuery.type( obj );
-	return ( type === "number" || type === "string" ) &&
-
-		// parseFloat NaNs numeric-cast false positives ("")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		!isNaN( obj - parseFloat( obj ) );
-};
-
-jQuery.trim = function( text ) {
-	return text == null ?
-		"" :
-		( text + "" ).replace( rtrim, "" );
-};
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	} );
-}
-
-
-
-
-var
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( typeof noGlobal === "undefined" ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-
-
-
-return jQuery;
-} );
diff --git a/website/js/main.js b/website/js/main.js
deleted file mode 100644
index 97bb490d9f1..00000000000
--- a/website/js/main.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){n(1),n(2),n(3),t.exports=n(4)},function(t,e,n){"use strict";n.r(e),e.default=n.p+"./css//bootstrap.css"},function(t,e,n){"use strict";n.r(e),e.default=n.p+"./css//greenhouse.css"},function(t,e,n){"use strict";n.r(e),e.default=n.p+"./css//main.css"},function(t,e,n){"use strict";n.r(e);n(5),n(6),n(7)},function(t,e){function n(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var o=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.onOpen=this.onOpen.bind(this),this.onToggle=this.onToggle.bind(this),this.$el=e,this.$el.addEventListener("click",this.onOpen),this.$el.querySelector(".case-study-card-toggle").addEventListener("click",this.onToggle),this.open=!1}var e,o,r;return e=t,(o=[{key:"onOpen",value:function(){this.open=!0,this.$el.classList.toggle("is-open",this.open),this.$el.classList.toggle("is-closing",!this.open),this.closeOthers()}},{key:"onToggle",value:function(t){t.stopPropagation(),this.open=!this.$el.classList.contains("is-open"),this.$el.classList.toggle("is-open",this.open),this.$el.classList.toggle("is-closing",!this.open),this.closeOthers()}},{key:"closeOthers",value:function(){var t=this;this.open&&document.querySelectorAll(".case-study-card").forEach((function(e){e.isSameNode(t.$el)||(e.classList.toggle("is-closing",e.classList.contains("is-open")),e.classList.toggle("is-open",!1))}))}}])&&n(e.prototype,o),r&&n(e,r),t}();document.querySelectorAll(".case-study-card").forEach((function(t){return new o(t)}))},function(t,e){function n(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var o,r,i=[],s=!0,l=!1;try{for(n=n.call(t);!(s=(o=n.next()).done)&&(i.push(o.value),!e||i.length!==e);s=!0);}catch(t){l=!0,r=t}finally{try{s||null==n.return||n.return()}finally{if(l)throw r}}return i}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return o(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}var r=document.querySelectorAll("[equalize-heights]"),i={};function s(){Object.entries(i).forEach((function(t){var e=n(t,2),o=(e[0],e[1]);o.forEach((function(t){"none"===window.getComputedStyle(t).getPropertyValue("display")&&(t.style.display="block"),t.style.minHeight="auto"}));var r=o.reduce((function(t,e){return e.offsetHeight>t&&(t=e.offsetHeight),t}),0);o.forEach((function(t){t.style.display=null,t.style.minHeight="".concat(r,"px")}))}))}r.forEach((function(t){var e=t.getAttribute("equalize-heights");i[e]=i[e]||[],i[e].push(t)})),window.addEventListener("resize",s),window.addEventListener("orientationchange",s),s()},function(t,e){window.addEventListener("load",(function(){if(-1!==window.location.search.indexOf("gh_jid=")){var t=window.scrollY,e=document.querySelector("#jobs").getBoundingClientRect().top;window.scrollTo({left:0,top:t+e}),window.setTimeout((function(){window.scrollTo({left:0,top:t+e-40})}),50)}}))}]);
\ No newline at end of file
diff --git a/website/js/popper.js b/website/js/popper.js
deleted file mode 100644
index 7fa913deacc..00000000000
--- a/website/js/popper.js
+++ /dev/null
@@ -1,2624 +0,0 @@
-/**!
- * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.16.0
- * @license
- * Copyright (c) 2016 Federico Zivolo and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-(function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-	typeof define === 'function' && define.amd ? define(factory) :
-	(global.Popper = factory());
-}(this, (function () { 'use strict';
-
-var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && typeof navigator !== 'undefined';
-
-var timeoutDuration = function () {
-  var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];
-  for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) {
-    if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) {
-      return 1;
-    }
-  }
-  return 0;
-}();
-
-function microtaskDebounce(fn) {
-  var called = false;
-  return function () {
-    if (called) {
-      return;
-    }
-    called = true;
-    window.Promise.resolve().then(function () {
-      called = false;
-      fn();
-    });
-  };
-}
-
-function taskDebounce(fn) {
-  var scheduled = false;
-  return function () {
-    if (!scheduled) {
-      scheduled = true;
-      setTimeout(function () {
-        scheduled = false;
-        fn();
-      }, timeoutDuration);
-    }
-  };
-}
-
-var supportsMicroTasks = isBrowser && window.Promise;
-
-/**
-* Create a debounced version of a method, that's asynchronously deferred
-* but called in the minimum time possible.
-*
-* @method
-* @memberof Popper.Utils
-* @argument {Function} fn
-* @returns {Function}
-*/
-var debounce = supportsMicroTasks ? microtaskDebounce : taskDebounce;
-
-/**
- * Check if the given variable is a function
- * @method
- * @memberof Popper.Utils
- * @argument {Any} functionToCheck - variable to check
- * @returns {Boolean} answer to: is a function?
- */
-function isFunction(functionToCheck) {
-  var getType = {};
-  return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
-}
-
-/**
- * Get CSS computed property of the given element
- * @method
- * @memberof Popper.Utils
- * @argument {Eement} element
- * @argument {String} property
- */
-function getStyleComputedProperty(element, property) {
-  if (element.nodeType !== 1) {
-    return [];
-  }
-  // NOTE: 1 DOM access here
-  var window = element.ownerDocument.defaultView;
-  var css = window.getComputedStyle(element, null);
-  return property ? css[property] : css;
-}
-
-/**
- * Returns the parentNode or the host of the element
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} parent
- */
-function getParentNode(element) {
-  if (element.nodeName === 'HTML') {
-    return element;
-  }
-  return element.parentNode || element.host;
-}
-
-/**
- * Returns the scrolling parent of the given element
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} scroll parent
- */
-function getScrollParent(element) {
-  // Return body, `getScroll` will take care to get the correct `scrollTop` from it
-  if (!element) {
-    return document.body;
-  }
-
-  switch (element.nodeName) {
-    case 'HTML':
-    case 'BODY':
-      return element.ownerDocument.body;
-    case '#document':
-      return element.body;
-  }
-
-  // Firefox want us to check `-x` and `-y` variations as well
-
-  var _getStyleComputedProp = getStyleComputedProperty(element),
-      overflow = _getStyleComputedProp.overflow,
-      overflowX = _getStyleComputedProp.overflowX,
-      overflowY = _getStyleComputedProp.overflowY;
-
-  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
-    return element;
-  }
-
-  return getScrollParent(getParentNode(element));
-}
-
-/**
- * Returns the reference node of the reference object, or the reference object itself.
- * @method
- * @memberof Popper.Utils
- * @param {Element|Object} reference - the reference element (the popper will be relative to this)
- * @returns {Element} parent
- */
-function getReferenceNode(reference) {
-  return reference && reference.referenceNode ? reference.referenceNode : reference;
-}
-
-var isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);
-var isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);
-
-/**
- * Determines if the browser is Internet Explorer
- * @method
- * @memberof Popper.Utils
- * @param {Number} version to check
- * @returns {Boolean} isIE
- */
-function isIE(version) {
-  if (version === 11) {
-    return isIE11;
-  }
-  if (version === 10) {
-    return isIE10;
-  }
-  return isIE11 || isIE10;
-}
-
-/**
- * Returns the offset parent of the given element
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} offset parent
- */
-function getOffsetParent(element) {
-  if (!element) {
-    return document.documentElement;
-  }
-
-  var noOffsetParent = isIE(10) ? document.body : null;
-
-  // NOTE: 1 DOM access here
-  var offsetParent = element.offsetParent || null;
-  // Skip hidden elements which don't have an offsetParent
-  while (offsetParent === noOffsetParent && element.nextElementSibling) {
-    offsetParent = (element = element.nextElementSibling).offsetParent;
-  }
-
-  var nodeName = offsetParent && offsetParent.nodeName;
-
-  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
-    return element ? element.ownerDocument.documentElement : document.documentElement;
-  }
-
-  // .offsetParent will return the closest TH, TD or TABLE in case
-  // no offsetParent is present, I hate this job...
-  if (['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') {
-    return getOffsetParent(offsetParent);
-  }
-
-  return offsetParent;
-}
-
-function isOffsetContainer(element) {
-  var nodeName = element.nodeName;
-
-  if (nodeName === 'BODY') {
-    return false;
-  }
-  return nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element;
-}
-
-/**
- * Finds the root node (document, shadowDOM root) of the given element
- * @method
- * @memberof Popper.Utils
- * @argument {Element} node
- * @returns {Element} root node
- */
-function getRoot(node) {
-  if (node.parentNode !== null) {
-    return getRoot(node.parentNode);
-  }
-
-  return node;
-}
-
-/**
- * Finds the offset parent common to the two provided nodes
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element1
- * @argument {Element} element2
- * @returns {Element} common offset parent
- */
-function findCommonOffsetParent(element1, element2) {
-  // This check is needed to avoid errors in case one of the elements isn't defined for any reason
-  if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) {
-    return document.documentElement;
-  }
-
-  // Here we make sure to give as "start" the element that comes first in the DOM
-  var order = element1.compareDocumentPosition(element2) & Node.DOCUMENT_POSITION_FOLLOWING;
-  var start = order ? element1 : element2;
-  var end = order ? element2 : element1;
-
-  // Get common ancestor container
-  var range = document.createRange();
-  range.setStart(start, 0);
-  range.setEnd(end, 0);
-  var commonAncestorContainer = range.commonAncestorContainer;
-
-  // Both nodes are inside #document
-
-  if (element1 !== commonAncestorContainer && element2 !== commonAncestorContainer || start.contains(end)) {
-    if (isOffsetContainer(commonAncestorContainer)) {
-      return commonAncestorContainer;
-    }
-
-    return getOffsetParent(commonAncestorContainer);
-  }
-
-  // one of the nodes is inside shadowDOM, find which one
-  var element1root = getRoot(element1);
-  if (element1root.host) {
-    return findCommonOffsetParent(element1root.host, element2);
-  } else {
-    return findCommonOffsetParent(element1, getRoot(element2).host);
-  }
-}
-
-/**
- * Gets the scroll value of the given element in the given side (top and left)
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @argument {String} side `top` or `left`
- * @returns {number} amount of scrolled pixels
- */
-function getScroll(element) {
-  var side = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'top';
-
-  var upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft';
-  var nodeName = element.nodeName;
-
-  if (nodeName === 'BODY' || nodeName === 'HTML') {
-    var html = element.ownerDocument.documentElement;
-    var scrollingElement = element.ownerDocument.scrollingElement || html;
-    return scrollingElement[upperSide];
-  }
-
-  return element[upperSide];
-}
-
-/*
- * Sum or subtract the element scroll values (left and top) from a given rect object
- * @method
- * @memberof Popper.Utils
- * @param {Object} rect - Rect object you want to change
- * @param {HTMLElement} element - The element from the function reads the scroll values
- * @param {Boolean} subtract - set to true if you want to subtract the scroll values
- * @return {Object} rect - The modifier rect object
- */
-function includeScroll(rect, element) {
-  var subtract = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
-  var scrollTop = getScroll(element, 'top');
-  var scrollLeft = getScroll(element, 'left');
-  var modifier = subtract ? -1 : 1;
-  rect.top += scrollTop * modifier;
-  rect.bottom += scrollTop * modifier;
-  rect.left += scrollLeft * modifier;
-  rect.right += scrollLeft * modifier;
-  return rect;
-}
-
-/*
- * Helper to detect borders of a given element
- * @method
- * @memberof Popper.Utils
- * @param {CSSStyleDeclaration} styles
- * Result of `getStyleComputedProperty` on the given element
- * @param {String} axis - `x` or `y`
- * @return {number} borders - The borders size of the given axis
- */
-
-function getBordersSize(styles, axis) {
-  var sideA = axis === 'x' ? 'Left' : 'Top';
-  var sideB = sideA === 'Left' ? 'Right' : 'Bottom';
-
-  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
-}
-
-function getSize(axis, body, html, computedStyle) {
-  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? parseInt(html['offset' + axis]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')]) : 0);
-}
-
-function getWindowSizes(document) {
-  var body = document.body;
-  var html = document.documentElement;
-  var computedStyle = isIE(10) && getComputedStyle(html);
-
-  return {
-    height: getSize('Height', body, html, computedStyle),
-    width: getSize('Width', body, html, computedStyle)
-  };
-}
-
-var classCallCheck = function (instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-};
-
-var createClass = function () {
-  function defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
-    }
-  }
-
-  return function (Constructor, protoProps, staticProps) {
-    if (protoProps) defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) defineProperties(Constructor, staticProps);
-    return Constructor;
-  };
-}();
-
-
-
-
-
-var defineProperty = function (obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-};
-
-var _extends = Object.assign || function (target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i];
-
-    for (var key in source) {
-      if (Object.prototype.hasOwnProperty.call(source, key)) {
-        target[key] = source[key];
-      }
-    }
-  }
-
-  return target;
-};
-
-/**
- * Given element offsets, generate an output similar to getBoundingClientRect
- * @method
- * @memberof Popper.Utils
- * @argument {Object} offsets
- * @returns {Object} ClientRect like output
- */
-function getClientRect(offsets) {
-  return _extends({}, offsets, {
-    right: offsets.left + offsets.width,
-    bottom: offsets.top + offsets.height
-  });
-}
-
-/**
- * Get bounding client rect of given element
- * @method
- * @memberof Popper.Utils
- * @param {HTMLElement} element
- * @return {Object} client rect
- */
-function getBoundingClientRect(element) {
-  var rect = {};
-
-  // IE10 10 FIX: Please, don't ask, the element isn't
-  // considered in DOM in some circumstances...
-  // This isn't reproducible in IE10 compatibility mode of IE11
-  try {
-    if (isIE(10)) {
-      rect = element.getBoundingClientRect();
-      var scrollTop = getScroll(element, 'top');
-      var scrollLeft = getScroll(element, 'left');
-      rect.top += scrollTop;
-      rect.left += scrollLeft;
-      rect.bottom += scrollTop;
-      rect.right += scrollLeft;
-    } else {
-      rect = element.getBoundingClientRect();
-    }
-  } catch (e) {}
-
-  var result = {
-    left: rect.left,
-    top: rect.top,
-    width: rect.right - rect.left,
-    height: rect.bottom - rect.top
-  };
-
-  // subtract scrollbar size from sizes
-  var sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};
-  var width = sizes.width || element.clientWidth || result.width;
-  var height = sizes.height || element.clientHeight || result.height;
-
-  var horizScrollbar = element.offsetWidth - width;
-  var vertScrollbar = element.offsetHeight - height;
-
-  // if an hypothetical scrollbar is detected, we must be sure it's not a `border`
-  // we make this check conditional for performance reasons
-  if (horizScrollbar || vertScrollbar) {
-    var styles = getStyleComputedProperty(element);
-    horizScrollbar -= getBordersSize(styles, 'x');
-    vertScrollbar -= getBordersSize(styles, 'y');
-
-    result.width -= horizScrollbar;
-    result.height -= vertScrollbar;
-  }
-
-  return getClientRect(result);
-}
-
-function getOffsetRectRelativeToArbitraryNode(children, parent) {
-  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
-  var isIE10 = isIE(10);
-  var isHTML = parent.nodeName === 'HTML';
-  var childrenRect = getBoundingClientRect(children);
-  var parentRect = getBoundingClientRect(parent);
-  var scrollParent = getScrollParent(children);
-
-  var styles = getStyleComputedProperty(parent);
-  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
-  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);
-
-  // In cases where the parent is fixed, we must ignore negative scroll in offset calc
-  if (fixedPosition && isHTML) {
-    parentRect.top = Math.max(parentRect.top, 0);
-    parentRect.left = Math.max(parentRect.left, 0);
-  }
-  var offsets = getClientRect({
-    top: childrenRect.top - parentRect.top - borderTopWidth,
-    left: childrenRect.left - parentRect.left - borderLeftWidth,
-    width: childrenRect.width,
-    height: childrenRect.height
-  });
-  offsets.marginTop = 0;
-  offsets.marginLeft = 0;
-
-  // Subtract margins of documentElement in case it's being used as parent
-  // we do this only on HTML because it's the only element that behaves
-  // differently when margins are applied to it. The margins are included in
-  // the box of the documentElement, in the other cases not.
-  if (!isIE10 && isHTML) {
-    var marginTop = parseFloat(styles.marginTop, 10);
-    var marginLeft = parseFloat(styles.marginLeft, 10);
-
-    offsets.top -= borderTopWidth - marginTop;
-    offsets.bottom -= borderTopWidth - marginTop;
-    offsets.left -= borderLeftWidth - marginLeft;
-    offsets.right -= borderLeftWidth - marginLeft;
-
-    // Attach marginTop and marginLeft because in some circumstances we may need them
-    offsets.marginTop = marginTop;
-    offsets.marginLeft = marginLeft;
-  }
-
-  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
-    offsets = includeScroll(offsets, parent);
-  }
-
-  return offsets;
-}
-
-function getViewportOffsetRectRelativeToArtbitraryNode(element) {
-  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
-  var html = element.ownerDocument.documentElement;
-  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
-  var width = Math.max(html.clientWidth, window.innerWidth || 0);
-  var height = Math.max(html.clientHeight, window.innerHeight || 0);
-
-  var scrollTop = !excludeScroll ? getScroll(html) : 0;
-  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
-
-  var offset = {
-    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
-    left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft,
-    width: width,
-    height: height
-  };
-
-  return getClientRect(offset);
-}
-
-/**
- * Check if the given element is fixed or is inside a fixed parent
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @argument {Element} customContainer
- * @returns {Boolean} answer to "isFixed?"
- */
-function isFixed(element) {
-  var nodeName = element.nodeName;
-  if (nodeName === 'BODY' || nodeName === 'HTML') {
-    return false;
-  }
-  if (getStyleComputedProperty(element, 'position') === 'fixed') {
-    return true;
-  }
-  var parentNode = getParentNode(element);
-  if (!parentNode) {
-    return false;
-  }
-  return isFixed(parentNode);
-}
-
-/**
- * Finds the first parent of an element that has a transformed property defined
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} first transformed parent or documentElement
- */
-
-function getFixedPositionOffsetParent(element) {
-  // This check is needed to avoid errors in case one of the elements isn't defined for any reason
-  if (!element || !element.parentElement || isIE()) {
-    return document.documentElement;
-  }
-  var el = element.parentElement;
-  while (el && getStyleComputedProperty(el, 'transform') === 'none') {
-    el = el.parentElement;
-  }
-  return el || document.documentElement;
-}
-
-/**
- * Computed the boundaries limits and return them
- * @method
- * @memberof Popper.Utils
- * @param {HTMLElement} popper
- * @param {HTMLElement} reference
- * @param {number} padding
- * @param {HTMLElement} boundariesElement - Element used to define the boundaries
- * @param {Boolean} fixedPosition - Is in fixed position mode
- * @returns {Object} Coordinates of the boundaries
- */
-function getBoundaries(popper, reference, padding, boundariesElement) {
-  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-
-  // NOTE: 1 DOM access here
-
-  var boundaries = { top: 0, left: 0 };
-  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));
-
-  // Handle viewport case
-  if (boundariesElement === 'viewport') {
-    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
-  } else {
-    // Handle other cases based on DOM element used as boundaries
-    var boundariesNode = void 0;
-    if (boundariesElement === 'scrollParent') {
-      boundariesNode = getScrollParent(getParentNode(reference));
-      if (boundariesNode.nodeName === 'BODY') {
-        boundariesNode = popper.ownerDocument.documentElement;
-      }
-    } else if (boundariesElement === 'window') {
-      boundariesNode = popper.ownerDocument.documentElement;
-    } else {
-      boundariesNode = boundariesElement;
-    }
-
-    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
-
-    // In case of HTML, we need a different computation
-    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
-      var _getWindowSizes = getWindowSizes(popper.ownerDocument),
-          height = _getWindowSizes.height,
-          width = _getWindowSizes.width;
-
-      boundaries.top += offsets.top - offsets.marginTop;
-      boundaries.bottom = height + offsets.top;
-      boundaries.left += offsets.left - offsets.marginLeft;
-      boundaries.right = width + offsets.left;
-    } else {
-      // for all the other DOM elements, this one is good
-      boundaries = offsets;
-    }
-  }
-
-  // Add paddings
-  padding = padding || 0;
-  var isPaddingNumber = typeof padding === 'number';
-  boundaries.left += isPaddingNumber ? padding : padding.left || 0;
-  boundaries.top += isPaddingNumber ? padding : padding.top || 0;
-  boundaries.right -= isPaddingNumber ? padding : padding.right || 0;
-  boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0;
-
-  return boundaries;
-}
-
-function getArea(_ref) {
-  var width = _ref.width,
-      height = _ref.height;
-
-  return width * height;
-}
-
-/**
- * Utility used to transform the `auto` placement to the placement with more
- * available space.
- * @method
- * @memberof Popper.Utils
- * @argument {Object} data - The data object generated by update method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function computeAutoPlacement(placement, refRect, popper, reference, boundariesElement) {
-  var padding = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
-
-  if (placement.indexOf('auto') === -1) {
-    return placement;
-  }
-
-  var boundaries = getBoundaries(popper, reference, padding, boundariesElement);
-
-  var rects = {
-    top: {
-      width: boundaries.width,
-      height: refRect.top - boundaries.top
-    },
-    right: {
-      width: boundaries.right - refRect.right,
-      height: boundaries.height
-    },
-    bottom: {
-      width: boundaries.width,
-      height: boundaries.bottom - refRect.bottom
-    },
-    left: {
-      width: refRect.left - boundaries.left,
-      height: boundaries.height
-    }
-  };
-
-  var sortedAreas = Object.keys(rects).map(function (key) {
-    return _extends({
-      key: key
-    }, rects[key], {
-      area: getArea(rects[key])
-    });
-  }).sort(function (a, b) {
-    return b.area - a.area;
-  });
-
-  var filteredAreas = sortedAreas.filter(function (_ref2) {
-    var width = _ref2.width,
-        height = _ref2.height;
-    return width >= popper.clientWidth && height >= popper.clientHeight;
-  });
-
-  var computedPlacement = filteredAreas.length > 0 ? filteredAreas[0].key : sortedAreas[0].key;
-
-  var variation = placement.split('-')[1];
-
-  return computedPlacement + (variation ? '-' + variation : '');
-}
-
-/**
- * Get offsets to the reference element
- * @method
- * @memberof Popper.Utils
- * @param {Object} state
- * @param {Element} popper - the popper element
- * @param {Element} reference - the reference element (the popper will be relative to this)
- * @param {Element} fixedPosition - is in fixed position mode
- * @returns {Object} An object containing the offsets which will be applied to the popper
- */
-function getReferenceOffsets(state, popper, reference) {
-  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));
-  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
-}
-
-/**
- * Get the outer sizes of the given element (offset size + margins)
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Object} object containing width and height properties
- */
-function getOuterSizes(element) {
-  var window = element.ownerDocument.defaultView;
-  var styles = window.getComputedStyle(element);
-  var x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);
-  var y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);
-  var result = {
-    width: element.offsetWidth + y,
-    height: element.offsetHeight + x
-  };
-  return result;
-}
-
-/**
- * Get the opposite placement of the given one
- * @method
- * @memberof Popper.Utils
- * @argument {String} placement
- * @returns {String} flipped placement
- */
-function getOppositePlacement(placement) {
-  var hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };
-  return placement.replace(/left|right|bottom|top/g, function (matched) {
-    return hash[matched];
-  });
-}
-
-/**
- * Get offsets to the popper
- * @method
- * @memberof Popper.Utils
- * @param {Object} position - CSS position the Popper will get applied
- * @param {HTMLElement} popper - the popper element
- * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this)
- * @param {String} placement - one of the valid placement options
- * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper
- */
-function getPopperOffsets(popper, referenceOffsets, placement) {
-  placement = placement.split('-')[0];
-
-  // Get popper node sizes
-  var popperRect = getOuterSizes(popper);
-
-  // Add position, width and height to our offsets object
-  var popperOffsets = {
-    width: popperRect.width,
-    height: popperRect.height
-  };
-
-  // depending by the popper placement we have to compute its offsets slightly differently
-  var isHoriz = ['right', 'left'].indexOf(placement) !== -1;
-  var mainSide = isHoriz ? 'top' : 'left';
-  var secondarySide = isHoriz ? 'left' : 'top';
-  var measurement = isHoriz ? 'height' : 'width';
-  var secondaryMeasurement = !isHoriz ? 'height' : 'width';
-
-  popperOffsets[mainSide] = referenceOffsets[mainSide] + referenceOffsets[measurement] / 2 - popperRect[measurement] / 2;
-  if (placement === secondarySide) {
-    popperOffsets[secondarySide] = referenceOffsets[secondarySide] - popperRect[secondaryMeasurement];
-  } else {
-    popperOffsets[secondarySide] = referenceOffsets[getOppositePlacement(secondarySide)];
-  }
-
-  return popperOffsets;
-}
-
-/**
- * Mimics the `find` method of Array
- * @method
- * @memberof Popper.Utils
- * @argument {Array} arr
- * @argument prop
- * @argument value
- * @returns index or -1
- */
-function find(arr, check) {
-  // use native find if supported
-  if (Array.prototype.find) {
-    return arr.find(check);
-  }
-
-  // use `filter` to obtain the same behavior of `find`
-  return arr.filter(check)[0];
-}
-
-/**
- * Return the index of the matching object
- * @method
- * @memberof Popper.Utils
- * @argument {Array} arr
- * @argument prop
- * @argument value
- * @returns index or -1
- */
-function findIndex(arr, prop, value) {
-  // use native findIndex if supported
-  if (Array.prototype.findIndex) {
-    return arr.findIndex(function (cur) {
-      return cur[prop] === value;
-    });
-  }
-
-  // use `find` + `indexOf` if `findIndex` isn't supported
-  var match = find(arr, function (obj) {
-    return obj[prop] === value;
-  });
-  return arr.indexOf(match);
-}
-
-/**
- * Loop trough the list of modifiers and run them in order,
- * each of them will then edit the data object.
- * @method
- * @memberof Popper.Utils
- * @param {dataObject} data
- * @param {Array} modifiers
- * @param {String} ends - Optional modifier name used as stopper
- * @returns {dataObject}
- */
-function runModifiers(modifiers, data, ends) {
-  var modifiersToRun = ends === undefined ? modifiers : modifiers.slice(0, findIndex(modifiers, 'name', ends));
-
-  modifiersToRun.forEach(function (modifier) {
-    if (modifier['function']) {
-      // eslint-disable-line dot-notation
-      console.warn('`modifier.function` is deprecated, use `modifier.fn`!');
-    }
-    var fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation
-    if (modifier.enabled && isFunction(fn)) {
-      // Add properties to offsets to make them a complete clientRect object
-      // we do this before each modifier to make sure the previous one doesn't
-      // mess with these values
-      data.offsets.popper = getClientRect(data.offsets.popper);
-      data.offsets.reference = getClientRect(data.offsets.reference);
-
-      data = fn(data, modifier);
-    }
-  });
-
-  return data;
-}
-
-/**
- * Updates the position of the popper, computing the new offsets and applying
- * the new style.<br />
- * Prefer `scheduleUpdate` over `update` because of performance reasons.
- * @method
- * @memberof Popper
- */
-function update() {
-  // if popper is destroyed, don't perform any further update
-  if (this.state.isDestroyed) {
-    return;
-  }
-
-  var data = {
-    instance: this,
-    styles: {},
-    arrowStyles: {},
-    attributes: {},
-    flipped: false,
-    offsets: {}
-  };
-
-  // compute reference element offsets
-  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);
-
-  // compute auto placement, store placement inside the data object,
-  // modifiers will be able to edit `placement` if needed
-  // and refer to originalPlacement to know the original value
-  data.placement = computeAutoPlacement(this.options.placement, data.offsets.reference, this.popper, this.reference, this.options.modifiers.flip.boundariesElement, this.options.modifiers.flip.padding);
-
-  // store the computed placement inside `originalPlacement`
-  data.originalPlacement = data.placement;
-
-  data.positionFixed = this.options.positionFixed;
-
-  // compute the popper offsets
-  data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);
-
-  data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';
-
-  // run the modifiers
-  data = runModifiers(this.modifiers, data);
-
-  // the first `update` will call `onCreate` callback
-  // the other ones will call `onUpdate` callback
-  if (!this.state.isCreated) {
-    this.state.isCreated = true;
-    this.options.onCreate(data);
-  } else {
-    this.options.onUpdate(data);
-  }
-}
-
-/**
- * Helper used to know if the given modifier is enabled.
- * @method
- * @memberof Popper.Utils
- * @returns {Boolean}
- */
-function isModifierEnabled(modifiers, modifierName) {
-  return modifiers.some(function (_ref) {
-    var name = _ref.name,
-        enabled = _ref.enabled;
-    return enabled && name === modifierName;
-  });
-}
-
-/**
- * Get the prefixed supported property name
- * @method
- * @memberof Popper.Utils
- * @argument {String} property (camelCase)
- * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix)
- */
-function getSupportedPropertyName(property) {
-  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
-  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);
-
-  for (var i = 0; i < prefixes.length; i++) {
-    var prefix = prefixes[i];
-    var toCheck = prefix ? '' + prefix + upperProp : property;
-    if (typeof document.body.style[toCheck] !== 'undefined') {
-      return toCheck;
-    }
-  }
-  return null;
-}
-
-/**
- * Destroys the popper.
- * @method
- * @memberof Popper
- */
-function destroy() {
-  this.state.isDestroyed = true;
-
-  // touch DOM only if `applyStyle` modifier is enabled
-  if (isModifierEnabled(this.modifiers, 'applyStyle')) {
-    this.popper.removeAttribute('x-placement');
-    this.popper.style.position = '';
-    this.popper.style.top = '';
-    this.popper.style.left = '';
-    this.popper.style.right = '';
-    this.popper.style.bottom = '';
-    this.popper.style.willChange = '';
-    this.popper.style[getSupportedPropertyName('transform')] = '';
-  }
-
-  this.disableEventListeners();
-
-  // remove the popper if user explicitly asked for the deletion on destroy
-  // do not use `remove` because IE11 doesn't support it
-  if (this.options.removeOnDestroy) {
-    this.popper.parentNode.removeChild(this.popper);
-  }
-  return this;
-}
-
-/**
- * Get the window associated with the element
- * @argument {Element} element
- * @returns {Window}
- */
-function getWindow(element) {
-  var ownerDocument = element.ownerDocument;
-  return ownerDocument ? ownerDocument.defaultView : window;
-}
-
-function attachToScrollParents(scrollParent, event, callback, scrollParents) {
-  var isBody = scrollParent.nodeName === 'BODY';
-  var target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent;
-  target.addEventListener(event, callback, { passive: true });
-
-  if (!isBody) {
-    attachToScrollParents(getScrollParent(target.parentNode), event, callback, scrollParents);
-  }
-  scrollParents.push(target);
-}
-
-/**
- * Setup needed event listeners used to update the popper position
- * @method
- * @memberof Popper.Utils
- * @private
- */
-function setupEventListeners(reference, options, state, updateBound) {
-  // Resize event listener on window
-  state.updateBound = updateBound;
-  getWindow(reference).addEventListener('resize', state.updateBound, { passive: true });
-
-  // Scroll event listener on scroll parents
-  var scrollElement = getScrollParent(reference);
-  attachToScrollParents(scrollElement, 'scroll', state.updateBound, state.scrollParents);
-  state.scrollElement = scrollElement;
-  state.eventsEnabled = true;
-
-  return state;
-}
-
-/**
- * It will add resize/scroll events and start recalculating
- * position of the popper element when they are triggered.
- * @method
- * @memberof Popper
- */
-function enableEventListeners() {
-  if (!this.state.eventsEnabled) {
-    this.state = setupEventListeners(this.reference, this.options, this.state, this.scheduleUpdate);
-  }
-}
-
-/**
- * Remove event listeners used to update the popper position
- * @method
- * @memberof Popper.Utils
- * @private
- */
-function removeEventListeners(reference, state) {
-  // Remove resize event listener on window
-  getWindow(reference).removeEventListener('resize', state.updateBound);
-
-  // Remove scroll event listener on scroll parents
-  state.scrollParents.forEach(function (target) {
-    target.removeEventListener('scroll', state.updateBound);
-  });
-
-  // Reset state
-  state.updateBound = null;
-  state.scrollParents = [];
-  state.scrollElement = null;
-  state.eventsEnabled = false;
-  return state;
-}
-
-/**
- * It will remove resize/scroll events and won't recalculate popper position
- * when they are triggered. It also won't trigger `onUpdate` callback anymore,
- * unless you call `update` method manually.
- * @method
- * @memberof Popper
- */
-function disableEventListeners() {
-  if (this.state.eventsEnabled) {
-    cancelAnimationFrame(this.scheduleUpdate);
-    this.state = removeEventListeners(this.reference, this.state);
-  }
-}
-
-/**
- * Tells if a given input is a number
- * @method
- * @memberof Popper.Utils
- * @param {*} input to check
- * @return {Boolean}
- */
-function isNumeric(n) {
-  return n !== '' && !isNaN(parseFloat(n)) && isFinite(n);
-}
-
-/**
- * Set the style to the given popper
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element - Element to apply the style to
- * @argument {Object} styles
- * Object with a list of properties and values which will be applied to the element
- */
-function setStyles(element, styles) {
-  Object.keys(styles).forEach(function (prop) {
-    var unit = '';
-    // add unit if the value is numeric and is one of the following
-    if (['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !== -1 && isNumeric(styles[prop])) {
-      unit = 'px';
-    }
-    element.style[prop] = styles[prop] + unit;
-  });
-}
-
-/**
- * Set the attributes to the given popper
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element - Element to apply the attributes to
- * @argument {Object} styles
- * Object with a list of properties and values which will be applied to the element
- */
-function setAttributes(element, attributes) {
-  Object.keys(attributes).forEach(function (prop) {
-    var value = attributes[prop];
-    if (value !== false) {
-      element.setAttribute(prop, attributes[prop]);
-    } else {
-      element.removeAttribute(prop);
-    }
-  });
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @argument {Object} data.styles - List of style properties - values to apply to popper element
- * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The same data object
- */
-function applyStyle(data) {
-  // any property present in `data.styles` will be applied to the popper,
-  // in this way we can make the 3rd party modifiers add custom styles to it
-  // Be aware, modifiers could override the properties defined in the previous
-  // lines of this modifier!
-  setStyles(data.instance.popper, data.styles);
-
-  // any property present in `data.attributes` will be applied to the popper,
-  // they will be set as HTML attributes of the element
-  setAttributes(data.instance.popper, data.attributes);
-
-  // if arrowElement is defined and arrowStyles has some properties
-  if (data.arrowElement && Object.keys(data.arrowStyles).length) {
-    setStyles(data.arrowElement, data.arrowStyles);
-  }
-
-  return data;
-}
-
-/**
- * Set the x-placement attribute before everything else because it could be used
- * to add margins to the popper margins needs to be calculated to get the
- * correct popper offsets.
- * @method
- * @memberof Popper.modifiers
- * @param {HTMLElement} reference - The reference element used to position the popper
- * @param {HTMLElement} popper - The HTML element used as popper
- * @param {Object} options - Popper.js options
- */
-function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {
-  // compute reference element offsets
-  var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);
-
-  // compute auto placement, store placement inside the data object,
-  // modifiers will be able to edit `placement` if needed
-  // and refer to originalPlacement to know the original value
-  var placement = computeAutoPlacement(options.placement, referenceOffsets, popper, reference, options.modifiers.flip.boundariesElement, options.modifiers.flip.padding);
-
-  popper.setAttribute('x-placement', placement);
-
-  // Apply `position` to popper before anything else because
-  // without the position applied we can't guarantee correct computations
-  setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });
-
-  return options;
-}
-
-/**
- * @function
- * @memberof Popper.Utils
- * @argument {Object} data - The data object generated by `update` method
- * @argument {Boolean} shouldRound - If the offsets should be rounded at all
- * @returns {Object} The popper's position offsets rounded
- *
- * The tale of pixel-perfect positioning. It's still not 100% perfect, but as
- * good as it can be within reason.
- * Discussion here: https://github.com/FezVrasta/popper.js/pull/715
- *
- * Low DPI screens cause a popper to be blurry if not using full pixels (Safari
- * as well on High DPI screens).
- *
- * Firefox prefers no rounding for positioning and does not have blurriness on
- * high DPI screens.
- *
- * Only horizontal placement and left/right values need to be considered.
- */
-function getRoundedOffsets(data, shouldRound) {
-  var _data$offsets = data.offsets,
-      popper = _data$offsets.popper,
-      reference = _data$offsets.reference;
-  var round = Math.round,
-      floor = Math.floor;
-
-  var noRound = function noRound(v) {
-    return v;
-  };
-
-  var referenceWidth = round(reference.width);
-  var popperWidth = round(popper.width);
-
-  var isVertical = ['left', 'right'].indexOf(data.placement) !== -1;
-  var isVariation = data.placement.indexOf('-') !== -1;
-  var sameWidthParity = referenceWidth % 2 === popperWidth % 2;
-  var bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;
-
-  var horizontalToInteger = !shouldRound ? noRound : isVertical || isVariation || sameWidthParity ? round : floor;
-  var verticalToInteger = !shouldRound ? noRound : round;
-
-  return {
-    left: horizontalToInteger(bothOddWidth && !isVariation && shouldRound ? popper.left - 1 : popper.left),
-    top: verticalToInteger(popper.top),
-    bottom: verticalToInteger(popper.bottom),
-    right: horizontalToInteger(popper.right)
-  };
-}
-
-var isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function computeStyle(data, options) {
-  var x = options.x,
-      y = options.y;
-  var popper = data.offsets.popper;
-
-  // Remove this legacy support in Popper.js v2
-
-  var legacyGpuAccelerationOption = find(data.instance.modifiers, function (modifier) {
-    return modifier.name === 'applyStyle';
-  }).gpuAcceleration;
-  if (legacyGpuAccelerationOption !== undefined) {
-    console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');
-  }
-  var gpuAcceleration = legacyGpuAccelerationOption !== undefined ? legacyGpuAccelerationOption : options.gpuAcceleration;
-
-  var offsetParent = getOffsetParent(data.instance.popper);
-  var offsetParentRect = getBoundingClientRect(offsetParent);
-
-  // Styles
-  var styles = {
-    position: popper.position
-  };
-
-  var offsets = getRoundedOffsets(data, window.devicePixelRatio < 2 || !isFirefox);
-
-  var sideA = x === 'bottom' ? 'top' : 'bottom';
-  var sideB = y === 'right' ? 'left' : 'right';
-
-  // if gpuAcceleration is set to `true` and transform is supported,
-  //  we use `translate3d` to apply the position to the popper we
-  // automatically use the supported prefixed version if needed
-  var prefixedProperty = getSupportedPropertyName('transform');
-
-  // now, let's make a step back and look at this code closely (wtf?)
-  // If the content of the popper grows once it's been positioned, it
-  // may happen that the popper gets misplaced because of the new content
-  // overflowing its reference element
-  // To avoid this problem, we provide two options (x and y), which allow
-  // the consumer to define the offset origin.
-  // If we position a popper on top of a reference element, we can set
-  // `x` to `top` to make the popper grow towards its top instead of
-  // its bottom.
-  var left = void 0,
-      top = void 0;
-  if (sideA === 'bottom') {
-    // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)
-    // and not the bottom of the html element
-    if (offsetParent.nodeName === 'HTML') {
-      top = -offsetParent.clientHeight + offsets.bottom;
-    } else {
-      top = -offsetParentRect.height + offsets.bottom;
-    }
-  } else {
-    top = offsets.top;
-  }
-  if (sideB === 'right') {
-    if (offsetParent.nodeName === 'HTML') {
-      left = -offsetParent.clientWidth + offsets.right;
-    } else {
-      left = -offsetParentRect.width + offsets.right;
-    }
-  } else {
-    left = offsets.left;
-  }
-  if (gpuAcceleration && prefixedProperty) {
-    styles[prefixedProperty] = 'translate3d(' + left + 'px, ' + top + 'px, 0)';
-    styles[sideA] = 0;
-    styles[sideB] = 0;
-    styles.willChange = 'transform';
-  } else {
-    // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties
-    var invertTop = sideA === 'bottom' ? -1 : 1;
-    var invertLeft = sideB === 'right' ? -1 : 1;
-    styles[sideA] = top * invertTop;
-    styles[sideB] = left * invertLeft;
-    styles.willChange = sideA + ', ' + sideB;
-  }
-
-  // Attributes
-  var attributes = {
-    'x-placement': data.placement
-  };
-
-  // Update `data` attributes, styles and arrowStyles
-  data.attributes = _extends({}, attributes, data.attributes);
-  data.styles = _extends({}, styles, data.styles);
-  data.arrowStyles = _extends({}, data.offsets.arrow, data.arrowStyles);
-
-  return data;
-}
-
-/**
- * Helper used to know if the given modifier depends from another one.<br />
- * It checks if the needed modifier is listed and enabled.
- * @method
- * @memberof Popper.Utils
- * @param {Array} modifiers - list of modifiers
- * @param {String} requestingName - name of requesting modifier
- * @param {String} requestedName - name of requested modifier
- * @returns {Boolean}
- */
-function isModifierRequired(modifiers, requestingName, requestedName) {
-  var requesting = find(modifiers, function (_ref) {
-    var name = _ref.name;
-    return name === requestingName;
-  });
-
-  var isRequired = !!requesting && modifiers.some(function (modifier) {
-    return modifier.name === requestedName && modifier.enabled && modifier.order < requesting.order;
-  });
-
-  if (!isRequired) {
-    var _requesting = '`' + requestingName + '`';
-    var requested = '`' + requestedName + '`';
-    console.warn(requested + ' modifier is required by ' + _requesting + ' modifier in order to work, be sure to include it before ' + _requesting + '!');
-  }
-  return isRequired;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by update method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function arrow(data, options) {
-  var _data$offsets$arrow;
-
-  // arrow depends on keepTogether in order to work
-  if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) {
-    return data;
-  }
-
-  var arrowElement = options.element;
-
-  // if arrowElement is a string, suppose it's a CSS selector
-  if (typeof arrowElement === 'string') {
-    arrowElement = data.instance.popper.querySelector(arrowElement);
-
-    // if arrowElement is not found, don't run the modifier
-    if (!arrowElement) {
-      return data;
-    }
-  } else {
-    // if the arrowElement isn't a query selector we must check that the
-    // provided DOM node is child of its popper node
-    if (!data.instance.popper.contains(arrowElement)) {
-      console.warn('WARNING: `arrow.element` must be child of its popper element!');
-      return data;
-    }
-  }
-
-  var placement = data.placement.split('-')[0];
-  var _data$offsets = data.offsets,
-      popper = _data$offsets.popper,
-      reference = _data$offsets.reference;
-
-  var isVertical = ['left', 'right'].indexOf(placement) !== -1;
-
-  var len = isVertical ? 'height' : 'width';
-  var sideCapitalized = isVertical ? 'Top' : 'Left';
-  var side = sideCapitalized.toLowerCase();
-  var altSide = isVertical ? 'left' : 'top';
-  var opSide = isVertical ? 'bottom' : 'right';
-  var arrowElementSize = getOuterSizes(arrowElement)[len];
-
-  //
-  // extends keepTogether behavior making sure the popper and its
-  // reference have enough pixels in conjunction
-  //
-
-  // top/left side
-  if (reference[opSide] - arrowElementSize < popper[side]) {
-    data.offsets.popper[side] -= popper[side] - (reference[opSide] - arrowElementSize);
-  }
-  // bottom/right side
-  if (reference[side] + arrowElementSize > popper[opSide]) {
-    data.offsets.popper[side] += reference[side] + arrowElementSize - popper[opSide];
-  }
-  data.offsets.popper = getClientRect(data.offsets.popper);
-
-  // compute center of the popper
-  var center = reference[side] + reference[len] / 2 - arrowElementSize / 2;
-
-  // Compute the sideValue using the updated popper offsets
-  // take popper margin in account because we don't have this info available
-  var css = getStyleComputedProperty(data.instance.popper);
-  var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10);
-  var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10);
-  var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;
-
-  // prevent arrowElement from being placed not contiguously to its popper
-  sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0);
-
-  data.arrowElement = arrowElement;
-  data.offsets.arrow = (_data$offsets$arrow = {}, defineProperty(_data$offsets$arrow, side, Math.round(sideValue)), defineProperty(_data$offsets$arrow, altSide, ''), _data$offsets$arrow);
-
-  return data;
-}
-
-/**
- * Get the opposite placement variation of the given one
- * @method
- * @memberof Popper.Utils
- * @argument {String} placement variation
- * @returns {String} flipped placement variation
- */
-function getOppositeVariation(variation) {
-  if (variation === 'end') {
-    return 'start';
-  } else if (variation === 'start') {
-    return 'end';
-  }
-  return variation;
-}
-
-/**
- * List of accepted placements to use as values of the `placement` option.<br />
- * Valid placements are:
- * - `auto`
- * - `top`
- * - `right`
- * - `bottom`
- * - `left`
- *
- * Each placement can have a variation from this list:
- * - `-start`
- * - `-end`
- *
- * Variations are interpreted easily if you think of them as the left to right
- * written languages. Horizontally (`top` and `bottom`), `start` is left and `end`
- * is right.<br />
- * Vertically (`left` and `right`), `start` is top and `end` is bottom.
- *
- * Some valid examples are:
- * - `top-end` (on top of reference, right aligned)
- * - `right-start` (on right of reference, top aligned)
- * - `bottom` (on bottom, centered)
- * - `auto-end` (on the side with more space available, alignment depends by placement)
- *
- * @static
- * @type {Array}
- * @enum {String}
- * @readonly
- * @method placements
- * @memberof Popper
- */
-var placements = ['auto-start', 'auto', 'auto-end', 'top-start', 'top', 'top-end', 'right-start', 'right', 'right-end', 'bottom-end', 'bottom', 'bottom-start', 'left-end', 'left', 'left-start'];
-
-// Get rid of `auto` `auto-start` and `auto-end`
-var validPlacements = placements.slice(3);
-
-/**
- * Given an initial placement, returns all the subsequent placements
- * clockwise (or counter-clockwise).
- *
- * @method
- * @memberof Popper.Utils
- * @argument {String} placement - A valid placement (it accepts variations)
- * @argument {Boolean} counter - Set to true to walk the placements counterclockwise
- * @returns {Array} placements including their variations
- */
-function clockwise(placement) {
-  var counter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
-  var index = validPlacements.indexOf(placement);
-  var arr = validPlacements.slice(index + 1).concat(validPlacements.slice(0, index));
-  return counter ? arr.reverse() : arr;
-}
-
-var BEHAVIORS = {
-  FLIP: 'flip',
-  CLOCKWISE: 'clockwise',
-  COUNTERCLOCKWISE: 'counterclockwise'
-};
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by update method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function flip(data, options) {
-  // if `inner` modifier is enabled, we can't use the `flip` modifier
-  if (isModifierEnabled(data.instance.modifiers, 'inner')) {
-    return data;
-  }
-
-  if (data.flipped && data.placement === data.originalPlacement) {
-    // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides
-    return data;
-  }
-
-  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);
-
-  var placement = data.placement.split('-')[0];
-  var placementOpposite = getOppositePlacement(placement);
-  var variation = data.placement.split('-')[1] || '';
-
-  var flipOrder = [];
-
-  switch (options.behavior) {
-    case BEHAVIORS.FLIP:
-      flipOrder = [placement, placementOpposite];
-      break;
-    case BEHAVIORS.CLOCKWISE:
-      flipOrder = clockwise(placement);
-      break;
-    case BEHAVIORS.COUNTERCLOCKWISE:
-      flipOrder = clockwise(placement, true);
-      break;
-    default:
-      flipOrder = options.behavior;
-  }
-
-  flipOrder.forEach(function (step, index) {
-    if (placement !== step || flipOrder.length === index + 1) {
-      return data;
-    }
-
-    placement = data.placement.split('-')[0];
-    placementOpposite = getOppositePlacement(placement);
-
-    var popperOffsets = data.offsets.popper;
-    var refOffsets = data.offsets.reference;
-
-    // using floor because the reference offsets may contain decimals we are not going to consider here
-    var floor = Math.floor;
-    var overlapsRef = placement === 'left' && floor(popperOffsets.right) > floor(refOffsets.left) || placement === 'right' && floor(popperOffsets.left) < floor(refOffsets.right) || placement === 'top' && floor(popperOffsets.bottom) > floor(refOffsets.top) || placement === 'bottom' && floor(popperOffsets.top) < floor(refOffsets.bottom);
-
-    var overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left);
-    var overflowsRight = floor(popperOffsets.right) > floor(boundaries.right);
-    var overflowsTop = floor(popperOffsets.top) < floor(boundaries.top);
-    var overflowsBottom = floor(popperOffsets.bottom) > floor(boundaries.bottom);
-
-    var overflowsBoundaries = placement === 'left' && overflowsLeft || placement === 'right' && overflowsRight || placement === 'top' && overflowsTop || placement === 'bottom' && overflowsBottom;
-
-    // flip the variation if required
-    var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;
-
-    // flips variation if reference element overflows boundaries
-    var flippedVariationByRef = !!options.flipVariations && (isVertical && variation === 'start' && overflowsLeft || isVertical && variation === 'end' && overflowsRight || !isVertical && variation === 'start' && overflowsTop || !isVertical && variation === 'end' && overflowsBottom);
-
-    // flips variation if popper content overflows boundaries
-    var flippedVariationByContent = !!options.flipVariationsByContent && (isVertical && variation === 'start' && overflowsRight || isVertical && variation === 'end' && overflowsLeft || !isVertical && variation === 'start' && overflowsBottom || !isVertical && variation === 'end' && overflowsTop);
-
-    var flippedVariation = flippedVariationByRef || flippedVariationByContent;
-
-    if (overlapsRef || overflowsBoundaries || flippedVariation) {
-      // this boolean to detect any flip loop
-      data.flipped = true;
-
-      if (overlapsRef || overflowsBoundaries) {
-        placement = flipOrder[index + 1];
-      }
-
-      if (flippedVariation) {
-        variation = getOppositeVariation(variation);
-      }
-
-      data.placement = placement + (variation ? '-' + variation : '');
-
-      // this object contains `position`, we want to preserve it along with
-      // any additional property we may add in the future
-      data.offsets.popper = _extends({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement));
-
-      data = runModifiers(data.instance.modifiers, data, 'flip');
-    }
-  });
-  return data;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by update method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function keepTogether(data) {
-  var _data$offsets = data.offsets,
-      popper = _data$offsets.popper,
-      reference = _data$offsets.reference;
-
-  var placement = data.placement.split('-')[0];
-  var floor = Math.floor;
-  var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;
-  var side = isVertical ? 'right' : 'bottom';
-  var opSide = isVertical ? 'left' : 'top';
-  var measurement = isVertical ? 'width' : 'height';
-
-  if (popper[side] < floor(reference[opSide])) {
-    data.offsets.popper[opSide] = floor(reference[opSide]) - popper[measurement];
-  }
-  if (popper[opSide] > floor(reference[side])) {
-    data.offsets.popper[opSide] = floor(reference[side]);
-  }
-
-  return data;
-}
-
-/**
- * Converts a string containing value + unit into a px value number
- * @function
- * @memberof {modifiers~offset}
- * @private
- * @argument {String} str - Value + unit string
- * @argument {String} measurement - `height` or `width`
- * @argument {Object} popperOffsets
- * @argument {Object} referenceOffsets
- * @returns {Number|String}
- * Value in pixels, or original string if no values were extracted
- */
-function toValue(str, measurement, popperOffsets, referenceOffsets) {
-  // separate value from unit
-  var split = str.match(/((?:\-|\+)?\d*\.?\d*)(.*)/);
-  var value = +split[1];
-  var unit = split[2];
-
-  // If it's not a number it's an operator, I guess
-  if (!value) {
-    return str;
-  }
-
-  if (unit.indexOf('%') === 0) {
-    var element = void 0;
-    switch (unit) {
-      case '%p':
-        element = popperOffsets;
-        break;
-      case '%':
-      case '%r':
-      default:
-        element = referenceOffsets;
-    }
-
-    var rect = getClientRect(element);
-    return rect[measurement] / 100 * value;
-  } else if (unit === 'vh' || unit === 'vw') {
-    // if is a vh or vw, we calculate the size based on the viewport
-    var size = void 0;
-    if (unit === 'vh') {
-      size = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-    } else {
-      size = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-    }
-    return size / 100 * value;
-  } else {
-    // if is an explicit pixel unit, we get rid of the unit and keep the value
-    // if is an implicit unit, it's px, and we return just the value
-    return value;
-  }
-}
-
-/**
- * Parse an `offset` string to extrapolate `x` and `y` numeric offsets.
- * @function
- * @memberof {modifiers~offset}
- * @private
- * @argument {String} offset
- * @argument {Object} popperOffsets
- * @argument {Object} referenceOffsets
- * @argument {String} basePlacement
- * @returns {Array} a two cells array with x and y offsets in numbers
- */
-function parseOffset(offset, popperOffsets, referenceOffsets, basePlacement) {
-  var offsets = [0, 0];
-
-  // Use height if placement is left or right and index is 0 otherwise use width
-  // in this way the first offset will use an axis and the second one
-  // will use the other one
-  var useHeight = ['right', 'left'].indexOf(basePlacement) !== -1;
-
-  // Split the offset string to obtain a list of values and operands
-  // The regex addresses values with the plus or minus sign in front (+10, -20, etc)
-  var fragments = offset.split(/(\+|\-)/).map(function (frag) {
-    return frag.trim();
-  });
-
-  // Detect if the offset string contains a pair of values or a single one
-  // they could be separated by comma or space
-  var divider = fragments.indexOf(find(fragments, function (frag) {
-    return frag.search(/,|\s/) !== -1;
-  }));
-
-  if (fragments[divider] && fragments[divider].indexOf(',') === -1) {
-    console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');
-  }
-
-  // If divider is found, we divide the list of values and operands to divide
-  // them by ofset X and Y.
-  var splitRegex = /\s*,\s*|\s+/;
-  var ops = divider !== -1 ? [fragments.slice(0, divider).concat([fragments[divider].split(splitRegex)[0]]), [fragments[divider].split(splitRegex)[1]].concat(fragments.slice(divider + 1))] : [fragments];
-
-  // Convert the values with units to absolute pixels to allow our computations
-  ops = ops.map(function (op, index) {
-    // Most of the units rely on the orientation of the popper
-    var measurement = (index === 1 ? !useHeight : useHeight) ? 'height' : 'width';
-    var mergeWithPrevious = false;
-    return op
-    // This aggregates any `+` or `-` sign that aren't considered operators
-    // e.g.: 10 + +5 => [10, +, +5]
-    .reduce(function (a, b) {
-      if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) {
-        a[a.length - 1] = b;
-        mergeWithPrevious = true;
-        return a;
-      } else if (mergeWithPrevious) {
-        a[a.length - 1] += b;
-        mergeWithPrevious = false;
-        return a;
-      } else {
-        return a.concat(b);
-      }
-    }, [])
-    // Here we convert the string values into number values (in px)
-    .map(function (str) {
-      return toValue(str, measurement, popperOffsets, referenceOffsets);
-    });
-  });
-
-  // Loop trough the offsets arrays and execute the operations
-  ops.forEach(function (op, index) {
-    op.forEach(function (frag, index2) {
-      if (isNumeric(frag)) {
-        offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1);
-      }
-    });
-  });
-  return offsets;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by update method
- * @argument {Object} options - Modifiers configuration and options
- * @argument {Number|String} options.offset=0
- * The offset value as described in the modifier description
- * @returns {Object} The data object, properly modified
- */
-function offset(data, _ref) {
-  var offset = _ref.offset;
-  var placement = data.placement,
-      _data$offsets = data.offsets,
-      popper = _data$offsets.popper,
-      reference = _data$offsets.reference;
-
-  var basePlacement = placement.split('-')[0];
-
-  var offsets = void 0;
-  if (isNumeric(+offset)) {
-    offsets = [+offset, 0];
-  } else {
-    offsets = parseOffset(offset, popper, reference, basePlacement);
-  }
-
-  if (basePlacement === 'left') {
-    popper.top += offsets[0];
-    popper.left -= offsets[1];
-  } else if (basePlacement === 'right') {
-    popper.top += offsets[0];
-    popper.left += offsets[1];
-  } else if (basePlacement === 'top') {
-    popper.left += offsets[0];
-    popper.top -= offsets[1];
-  } else if (basePlacement === 'bottom') {
-    popper.left += offsets[0];
-    popper.top += offsets[1];
-  }
-
-  data.popper = popper;
-  return data;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function preventOverflow(data, options) {
-  var boundariesElement = options.boundariesElement || getOffsetParent(data.instance.popper);
-
-  // If offsetParent is the reference element, we really want to
-  // go one step up and use the next offsetParent as reference to
-  // avoid to make this modifier completely useless and look like broken
-  if (data.instance.reference === boundariesElement) {
-    boundariesElement = getOffsetParent(boundariesElement);
-  }
-
-  // NOTE: DOM access here
-  // resets the popper's position so that the document size can be calculated excluding
-  // the size of the popper element itself
-  var transformProp = getSupportedPropertyName('transform');
-  var popperStyles = data.instance.popper.style; // assignment to help minification
-  var top = popperStyles.top,
-      left = popperStyles.left,
-      transform = popperStyles[transformProp];
-
-  popperStyles.top = '';
-  popperStyles.left = '';
-  popperStyles[transformProp] = '';
-
-  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);
-
-  // NOTE: DOM access here
-  // restores the original style properties after the offsets have been computed
-  popperStyles.top = top;
-  popperStyles.left = left;
-  popperStyles[transformProp] = transform;
-
-  options.boundaries = boundaries;
-
-  var order = options.priority;
-  var popper = data.offsets.popper;
-
-  var check = {
-    primary: function primary(placement) {
-      var value = popper[placement];
-      if (popper[placement] < boundaries[placement] && !options.escapeWithReference) {
-        value = Math.max(popper[placement], boundaries[placement]);
-      }
-      return defineProperty({}, placement, value);
-    },
-    secondary: function secondary(placement) {
-      var mainSide = placement === 'right' ? 'left' : 'top';
-      var value = popper[mainSide];
-      if (popper[placement] > boundaries[placement] && !options.escapeWithReference) {
-        value = Math.min(popper[mainSide], boundaries[placement] - (placement === 'right' ? popper.width : popper.height));
-      }
-      return defineProperty({}, mainSide, value);
-    }
-  };
-
-  order.forEach(function (placement) {
-    var side = ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary';
-    popper = _extends({}, popper, check[side](placement));
-  });
-
-  data.offsets.popper = popper;
-
-  return data;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function shift(data) {
-  var placement = data.placement;
-  var basePlacement = placement.split('-')[0];
-  var shiftvariation = placement.split('-')[1];
-
-  // if shift shiftvariation is specified, run the modifier
-  if (shiftvariation) {
-    var _data$offsets = data.offsets,
-        reference = _data$offsets.reference,
-        popper = _data$offsets.popper;
-
-    var isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1;
-    var side = isVertical ? 'left' : 'top';
-    var measurement = isVertical ? 'width' : 'height';
-
-    var shiftOffsets = {
-      start: defineProperty({}, side, reference[side]),
-      end: defineProperty({}, side, reference[side] + reference[measurement] - popper[measurement])
-    };
-
-    data.offsets.popper = _extends({}, popper, shiftOffsets[shiftvariation]);
-  }
-
-  return data;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by update method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function hide(data) {
-  if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) {
-    return data;
-  }
-
-  var refRect = data.offsets.reference;
-  var bound = find(data.instance.modifiers, function (modifier) {
-    return modifier.name === 'preventOverflow';
-  }).boundaries;
-
-  if (refRect.bottom < bound.top || refRect.left > bound.right || refRect.top > bound.bottom || refRect.right < bound.left) {
-    // Avoid unnecessary DOM access if visibility hasn't changed
-    if (data.hide === true) {
-      return data;
-    }
-
-    data.hide = true;
-    data.attributes['x-out-of-boundaries'] = '';
-  } else {
-    // Avoid unnecessary DOM access if visibility hasn't changed
-    if (data.hide === false) {
-      return data;
-    }
-
-    data.hide = false;
-    data.attributes['x-out-of-boundaries'] = false;
-  }
-
-  return data;
-}
-
-/**
- * @function
- * @memberof Modifiers
- * @argument {Object} data - The data object generated by `update` method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {Object} The data object, properly modified
- */
-function inner(data) {
-  var placement = data.placement;
-  var basePlacement = placement.split('-')[0];
-  var _data$offsets = data.offsets,
-      popper = _data$offsets.popper,
-      reference = _data$offsets.reference;
-
-  var isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1;
-
-  var subtractLength = ['top', 'left'].indexOf(basePlacement) === -1;
-
-  popper[isHoriz ? 'left' : 'top'] = reference[basePlacement] - (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0);
-
-  data.placement = getOppositePlacement(placement);
-  data.offsets.popper = getClientRect(popper);
-
-  return data;
-}
-
-/**
- * Modifier function, each modifier can have a function of this type assigned
- * to its `fn` property.<br />
- * These functions will be called on each update, this means that you must
- * make sure they are performant enough to avoid performance bottlenecks.
- *
- * @function ModifierFn
- * @argument {dataObject} data - The data object generated by `update` method
- * @argument {Object} options - Modifiers configuration and options
- * @returns {dataObject} The data object, properly modified
- */
-
-/**
- * Modifiers are plugins used to alter the behavior of your poppers.<br />
- * Popper.js uses a set of 9 modifiers to provide all the basic functionalities
- * needed by the library.
- *
- * Usually you don't want to override the `order`, `fn` and `onLoad` props.
- * All the other properties are configurations that could be tweaked.
- * @namespace modifiers
- */
-var modifiers = {
-  /**
-   * Modifier used to shift the popper on the start or end of its reference
-   * element.<br />
-   * It will read the variation of the `placement` property.<br />
-   * It can be one either `-end` or `-start`.
-   * @memberof modifiers
-   * @inner
-   */
-  shift: {
-    /** @prop {number} order=100 - Index used to define the order of execution */
-    order: 100,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: shift
-  },
-
-  /**
-   * The `offset` modifier can shift your popper on both its axis.
-   *
-   * It accepts the following units:
-   * - `px` or unit-less, interpreted as pixels
-   * - `%` or `%r`, percentage relative to the length of the reference element
-   * - `%p`, percentage relative to the length of the popper element
-   * - `vw`, CSS viewport width unit
-   * - `vh`, CSS viewport height unit
-   *
-   * For length is intended the main axis relative to the placement of the popper.<br />
-   * This means that if the placement is `top` or `bottom`, the length will be the
-   * `width`. In case of `left` or `right`, it will be the `height`.
-   *
-   * You can provide a single value (as `Number` or `String`), or a pair of values
-   * as `String` divided by a comma or one (or more) white spaces.<br />
-   * The latter is a deprecated method because it leads to confusion and will be
-   * removed in v2.<br />
-   * Additionally, it accepts additions and subtractions between different units.
-   * Note that multiplications and divisions aren't supported.
-   *
-   * Valid examples are:
-   * ```
-   * 10
-   * '10%'
-   * '10, 10'
-   * '10%, 10'
-   * '10 + 10%'
-   * '10 - 5vh + 3%'
-   * '-10px + 5vh, 5px - 6%'
-   * ```
-   * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap
-   * > with their reference element, unfortunately, you will have to disable the `flip` modifier.
-   * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).
-   *
-   * @memberof modifiers
-   * @inner
-   */
-  offset: {
-    /** @prop {number} order=200 - Index used to define the order of execution */
-    order: 200,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: offset,
-    /** @prop {Number|String} offset=0
-     * The offset value as described in the modifier description
-     */
-    offset: 0
-  },
-
-  /**
-   * Modifier used to prevent the popper from being positioned outside the boundary.
-   *
-   * A scenario exists where the reference itself is not within the boundaries.<br />
-   * We can say it has "escaped the boundaries" — or just "escaped".<br />
-   * In this case we need to decide whether the popper should either:
-   *
-   * - detach from the reference and remain "trapped" in the boundaries, or
-   * - if it should ignore the boundary and "escape with its reference"
-   *
-   * When `escapeWithReference` is set to`true` and reference is completely
-   * outside its boundaries, the popper will overflow (or completely leave)
-   * the boundaries in order to remain attached to the edge of the reference.
-   *
-   * @memberof modifiers
-   * @inner
-   */
-  preventOverflow: {
-    /** @prop {number} order=300 - Index used to define the order of execution */
-    order: 300,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: preventOverflow,
-    /**
-     * @prop {Array} [priority=['left','right','top','bottom']]
-     * Popper will try to prevent overflow following these priorities by default,
-     * then, it could overflow on the left and on top of the `boundariesElement`
-     */
-    priority: ['left', 'right', 'top', 'bottom'],
-    /**
-     * @prop {number} padding=5
-     * Amount of pixel used to define a minimum distance between the boundaries
-     * and the popper. This makes sure the popper always has a little padding
-     * between the edges of its container
-     */
-    padding: 5,
-    /**
-     * @prop {String|HTMLElement} boundariesElement='scrollParent'
-     * Boundaries used by the modifier. Can be `scrollParent`, `window`,
-     * `viewport` or any DOM element.
-     */
-    boundariesElement: 'scrollParent'
-  },
-
-  /**
-   * Modifier used to make sure the reference and its popper stay near each other
-   * without leaving any gap between the two. Especially useful when the arrow is
-   * enabled and you want to ensure that it points to its reference element.
-   * It cares only about the first axis. You can still have poppers with margin
-   * between the popper and its reference element.
-   * @memberof modifiers
-   * @inner
-   */
-  keepTogether: {
-    /** @prop {number} order=400 - Index used to define the order of execution */
-    order: 400,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: keepTogether
-  },
-
-  /**
-   * This modifier is used to move the `arrowElement` of the popper to make
-   * sure it is positioned between the reference element and its popper element.
-   * It will read the outer size of the `arrowElement` node to detect how many
-   * pixels of conjunction are needed.
-   *
-   * It has no effect if no `arrowElement` is provided.
-   * @memberof modifiers
-   * @inner
-   */
-  arrow: {
-    /** @prop {number} order=500 - Index used to define the order of execution */
-    order: 500,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: arrow,
-    /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */
-    element: '[x-arrow]'
-  },
-
-  /**
-   * Modifier used to flip the popper's placement when it starts to overlap its
-   * reference element.
-   *
-   * Requires the `preventOverflow` modifier before it in order to work.
-   *
-   * **NOTE:** this modifier will interrupt the current update cycle and will
-   * restart it if it detects the need to flip the placement.
-   * @memberof modifiers
-   * @inner
-   */
-  flip: {
-    /** @prop {number} order=600 - Index used to define the order of execution */
-    order: 600,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: flip,
-    /**
-     * @prop {String|Array} behavior='flip'
-     * The behavior used to change the popper's placement. It can be one of
-     * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid
-     * placements (with optional variations)
-     */
-    behavior: 'flip',
-    /**
-     * @prop {number} padding=5
-     * The popper will flip if it hits the edges of the `boundariesElement`
-     */
-    padding: 5,
-    /**
-     * @prop {String|HTMLElement} boundariesElement='viewport'
-     * The element which will define the boundaries of the popper position.
-     * The popper will never be placed outside of the defined boundaries
-     * (except if `keepTogether` is enabled)
-     */
-    boundariesElement: 'viewport',
-    /**
-     * @prop {Boolean} flipVariations=false
-     * The popper will switch placement variation between `-start` and `-end` when
-     * the reference element overlaps its boundaries.
-     *
-     * The original placement should have a set variation.
-     */
-    flipVariations: false,
-    /**
-     * @prop {Boolean} flipVariationsByContent=false
-     * The popper will switch placement variation between `-start` and `-end` when
-     * the popper element overlaps its reference boundaries.
-     *
-     * The original placement should have a set variation.
-     */
-    flipVariationsByContent: false
-  },
-
-  /**
-   * Modifier used to make the popper flow toward the inner of the reference element.
-   * By default, when this modifier is disabled, the popper will be placed outside
-   * the reference element.
-   * @memberof modifiers
-   * @inner
-   */
-  inner: {
-    /** @prop {number} order=700 - Index used to define the order of execution */
-    order: 700,
-    /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */
-    enabled: false,
-    /** @prop {ModifierFn} */
-    fn: inner
-  },
-
-  /**
-   * Modifier used to hide the popper when its reference element is outside of the
-   * popper boundaries. It will set a `x-out-of-boundaries` attribute which can
-   * be used to hide with a CSS selector the popper when its reference is
-   * out of boundaries.
-   *
-   * Requires the `preventOverflow` modifier before it in order to work.
-   * @memberof modifiers
-   * @inner
-   */
-  hide: {
-    /** @prop {number} order=800 - Index used to define the order of execution */
-    order: 800,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: hide
-  },
-
-  /**
-   * Computes the style that will be applied to the popper element to gets
-   * properly positioned.
-   *
-   * Note that this modifier will not touch the DOM, it just prepares the styles
-   * so that `applyStyle` modifier can apply it. This separation is useful
-   * in case you need to replace `applyStyle` with a custom implementation.
-   *
-   * This modifier has `850` as `order` value to maintain backward compatibility
-   * with previous versions of Popper.js. Expect the modifiers ordering method
-   * to change in future major versions of the library.
-   *
-   * @memberof modifiers
-   * @inner
-   */
-  computeStyle: {
-    /** @prop {number} order=850 - Index used to define the order of execution */
-    order: 850,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: computeStyle,
-    /**
-     * @prop {Boolean} gpuAcceleration=true
-     * If true, it uses the CSS 3D transformation to position the popper.
-     * Otherwise, it will use the `top` and `left` properties
-     */
-    gpuAcceleration: true,
-    /**
-     * @prop {string} [x='bottom']
-     * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin.
-     * Change this if your popper should grow in a direction different from `bottom`
-     */
-    x: 'bottom',
-    /**
-     * @prop {string} [x='left']
-     * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin.
-     * Change this if your popper should grow in a direction different from `right`
-     */
-    y: 'right'
-  },
-
-  /**
-   * Applies the computed styles to the popper element.
-   *
-   * All the DOM manipulations are limited to this modifier. This is useful in case
-   * you want to integrate Popper.js inside a framework or view library and you
-   * want to delegate all the DOM manipulations to it.
-   *
-   * Note that if you disable this modifier, you must make sure the popper element
-   * has its position set to `absolute` before Popper.js can do its work!
-   *
-   * Just disable this modifier and define your own to achieve the desired effect.
-   *
-   * @memberof modifiers
-   * @inner
-   */
-  applyStyle: {
-    /** @prop {number} order=900 - Index used to define the order of execution */
-    order: 900,
-    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
-    enabled: true,
-    /** @prop {ModifierFn} */
-    fn: applyStyle,
-    /** @prop {Function} */
-    onLoad: applyStyleOnLoad,
-    /**
-     * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier
-     * @prop {Boolean} gpuAcceleration=true
-     * If true, it uses the CSS 3D transformation to position the popper.
-     * Otherwise, it will use the `top` and `left` properties
-     */
-    gpuAcceleration: undefined
-  }
-};
-
-/**
- * The `dataObject` is an object containing all the information used by Popper.js.
- * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.
- * @name dataObject
- * @property {Object} data.instance The Popper.js instance
- * @property {String} data.placement Placement applied to popper
- * @property {String} data.originalPlacement Placement originally defined on init
- * @property {Boolean} data.flipped True if popper has been flipped by flip modifier
- * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper
- * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier
- * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)
- * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)
- * @property {Object} data.boundaries Offsets of the popper boundaries
- * @property {Object} data.offsets The measurements of popper, reference and arrow elements
- * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values
- * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values
- * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0
- */
-
-/**
- * Default options provided to Popper.js constructor.<br />
- * These can be overridden using the `options` argument of Popper.js.<br />
- * To override an option, simply pass an object with the same
- * structure of the `options` object, as the 3rd argument. For example:
- * ```
- * new Popper(ref, pop, {
- *   modifiers: {
- *     preventOverflow: { enabled: false }
- *   }
- * })
- * ```
- * @type {Object}
- * @static
- * @memberof Popper
- */
-var Defaults = {
-  /**
-   * Popper's placement.
-   * @prop {Popper.placements} placement='bottom'
-   */
-  placement: 'bottom',
-
-  /**
-   * Set this to true if you want popper to position it self in 'fixed' mode
-   * @prop {Boolean} positionFixed=false
-   */
-  positionFixed: false,
-
-  /**
-   * Whether events (resize, scroll) are initially enabled.
-   * @prop {Boolean} eventsEnabled=true
-   */
-  eventsEnabled: true,
-
-  /**
-   * Set to true if you want to automatically remove the popper when
-   * you call the `destroy` method.
-   * @prop {Boolean} removeOnDestroy=false
-   */
-  removeOnDestroy: false,
-
-  /**
-   * Callback called when the popper is created.<br />
-   * By default, it is set to no-op.<br />
-   * Access Popper.js instance with `data.instance`.
-   * @prop {onCreate}
-   */
-  onCreate: function onCreate() {},
-
-  /**
-   * Callback called when the popper is updated. This callback is not called
-   * on the initialization/creation of the popper, but only on subsequent
-   * updates.<br />
-   * By default, it is set to no-op.<br />
-   * Access Popper.js instance with `data.instance`.
-   * @prop {onUpdate}
-   */
-  onUpdate: function onUpdate() {},
-
-  /**
-   * List of modifiers used to modify the offsets before they are applied to the popper.
-   * They provide most of the functionalities of Popper.js.
-   * @prop {modifiers}
-   */
-  modifiers: modifiers
-};
-
-/**
- * @callback onCreate
- * @param {dataObject} data
- */
-
-/**
- * @callback onUpdate
- * @param {dataObject} data
- */
-
-// Utils
-// Methods
-var Popper = function () {
-  /**
-   * Creates a new Popper.js instance.
-   * @class Popper
-   * @param {Element|referenceObject} reference - The reference element used to position the popper
-   * @param {Element} popper - The HTML / XML element used as the popper
-   * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)
-   * @return {Object} instance - The generated Popper.js instance
-   */
-  function Popper(reference, popper) {
-    var _this = this;
-
-    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    classCallCheck(this, Popper);
-
-    this.scheduleUpdate = function () {
-      return requestAnimationFrame(_this.update);
-    };
-
-    // make update() debounced, so that it only runs at most once-per-tick
-    this.update = debounce(this.update.bind(this));
-
-    // with {} we create a new object with the options inside it
-    this.options = _extends({}, Popper.Defaults, options);
-
-    // init state
-    this.state = {
-      isDestroyed: false,
-      isCreated: false,
-      scrollParents: []
-    };
-
-    // get reference and popper elements (allow jQuery wrappers)
-    this.reference = reference && reference.jquery ? reference[0] : reference;
-    this.popper = popper && popper.jquery ? popper[0] : popper;
-
-    // Deep merge modifiers options
-    this.options.modifiers = {};
-    Object.keys(_extends({}, Popper.Defaults.modifiers, options.modifiers)).forEach(function (name) {
-      _this.options.modifiers[name] = _extends({}, Popper.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {});
-    });
-
-    // Refactoring modifiers' list (Object => Array)
-    this.modifiers = Object.keys(this.options.modifiers).map(function (name) {
-      return _extends({
-        name: name
-      }, _this.options.modifiers[name]);
-    })
-    // sort the modifiers by order
-    .sort(function (a, b) {
-      return a.order - b.order;
-    });
-
-    // modifiers have the ability to execute arbitrary code when Popper.js get inited
-    // such code is executed in the same order of its modifier
-    // they could add new properties to their options configuration
-    // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`!
-    this.modifiers.forEach(function (modifierOptions) {
-      if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) {
-        modifierOptions.onLoad(_this.reference, _this.popper, _this.options, modifierOptions, _this.state);
-      }
-    });
-
-    // fire the first update to position the popper in the right place
-    this.update();
-
-    var eventsEnabled = this.options.eventsEnabled;
-    if (eventsEnabled) {
-      // setup event listeners, they will take care of update the position in specific situations
-      this.enableEventListeners();
-    }
-
-    this.state.eventsEnabled = eventsEnabled;
-  }
-
-  // We can't use class properties because they don't get listed in the
-  // class prototype and break stuff like Sinon stubs
-
-
-  createClass(Popper, [{
-    key: 'update',
-    value: function update$$1() {
-      return update.call(this);
-    }
-  }, {
-    key: 'destroy',
-    value: function destroy$$1() {
-      return destroy.call(this);
-    }
-  }, {
-    key: 'enableEventListeners',
-    value: function enableEventListeners$$1() {
-      return enableEventListeners.call(this);
-    }
-  }, {
-    key: 'disableEventListeners',
-    value: function disableEventListeners$$1() {
-      return disableEventListeners.call(this);
-    }
-
-    /**
-     * Schedules an update. It will run on the next UI update available.
-     * @method scheduleUpdate
-     * @memberof Popper
-     */
-
-
-    /**
-     * Collection of utilities useful when writing custom modifiers.
-     * Starting from version 1.7, this method is available only if you
-     * include `popper-utils.js` before `popper.js`.
-     *
-     * **DEPRECATION**: This way to access PopperUtils is deprecated
-     * and will be removed in v2! Use the PopperUtils module directly instead.
-     * Due to the high instability of the methods contained in Utils, we can't
-     * guarantee them to follow semver. Use them at your own risk!
-     * @static
-     * @private
-     * @type {Object}
-     * @deprecated since version 1.8
-     * @member Utils
-     * @memberof Popper
-     */
-
-  }]);
-  return Popper;
-}();
-
-/**
- * The `referenceObject` is an object that provides an interface compatible with Popper.js
- * and lets you use it as replacement of a real DOM node.<br />
- * You can use this method to position a popper relatively to a set of coordinates
- * in case you don't have a DOM node to use as reference.
- *
- * ```
- * new Popper(referenceObject, popperNode);
- * ```
- *
- * NB: This feature isn't supported in Internet Explorer 10.
- * @name referenceObject
- * @property {Function} data.getBoundingClientRect
- * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.
- * @property {number} data.clientWidth
- * An ES6 getter that will return the width of the virtual reference element.
- * @property {number} data.clientHeight
- * An ES6 getter that will return the height of the virtual reference element.
- */
-
-
-Popper.Utils = (typeof window !== 'undefined' ? window : global).PopperUtils;
-Popper.placements = placements;
-Popper.Defaults = Defaults;
-
-return Popper;
-
-})));
-//# sourceMappingURL=popper.js.map
diff --git a/website/js/sentry.js b/website/js/sentry.js
deleted file mode 100644
index 7d171824be7..00000000000
--- a/website/js/sentry.js
+++ /dev/null
@@ -1,5699 +0,0 @@
-/*! @sentry/browser 5.15.5 (2accf045) | https://github.com/getsentry/sentry-javascript */
-var Sentry = (function (exports) {
-    /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-    /* global Reflect, Promise */
-
-    var extendStatics = function(d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-
-    function __extends(d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    }
-
-    var __assign = function() {
-        __assign = Object.assign || function __assign(t) {
-            for (var s, i = 1, n = arguments.length; i < n; i++) {
-                s = arguments[i];
-                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-            }
-            return t;
-        };
-        return __assign.apply(this, arguments);
-    };
-
-    function __rest(s, e) {
-        var t = {};
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-            t[p] = s[p];
-        if (s != null && typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
-                t[p[i]] = s[p[i]];
-        return t;
-    }
-
-    function __decorate(decorators, target, key, desc) {
-        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-        return c > 3 && r && Object.defineProperty(target, key, r), r;
-    }
-
-    function __param(paramIndex, decorator) {
-        return function (target, key) { decorator(target, key, paramIndex); }
-    }
-
-    function __metadata(metadataKey, metadataValue) {
-        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-    }
-
-    function __awaiter(thisArg, _arguments, P, generator) {
-        return new (P || (P = Promise))(function (resolve, reject) {
-            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-            step((generator = generator.apply(thisArg, _arguments || [])).next());
-        });
-    }
-
-    function __generator(thisArg, body) {
-        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-        function verb(n) { return function (v) { return step([n, v]); }; }
-        function step(op) {
-            if (f) throw new TypeError("Generator is already executing.");
-            while (_) try {
-                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-                if (y = 0, t) op = [op[0] & 2, t.value];
-                switch (op[0]) {
-                    case 0: case 1: t = op; break;
-                    case 4: _.label++; return { value: op[1], done: false };
-                    case 5: _.label++; y = op[1]; op = [0]; continue;
-                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                    default:
-                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                        if (t[2]) _.ops.pop();
-                        _.trys.pop(); continue;
-                }
-                op = body.call(thisArg, _);
-            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-        }
-    }
-
-    function __exportStar(m, exports) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-    }
-
-    function __values(o) {
-        var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-        if (m) return m.call(o);
-        return {
-            next: function () {
-                if (o && i >= o.length) o = void 0;
-                return { value: o && o[i++], done: !o };
-            }
-        };
-    }
-
-    function __read(o, n) {
-        var m = typeof Symbol === "function" && o[Symbol.iterator];
-        if (!m) return o;
-        var i = m.call(o), r, ar = [], e;
-        try {
-            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-        }
-        catch (error) { e = { error: error }; }
-        finally {
-            try {
-                if (r && !r.done && (m = i["return"])) m.call(i);
-            }
-            finally { if (e) throw e.error; }
-        }
-        return ar;
-    }
-
-    function __spread() {
-        for (var ar = [], i = 0; i < arguments.length; i++)
-            ar = ar.concat(__read(arguments[i]));
-        return ar;
-    }
-
-    function __await(v) {
-        return this instanceof __await ? (this.v = v, this) : new __await(v);
-    }
-
-    function __asyncGenerator(thisArg, _arguments, generator) {
-        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-        var g = generator.apply(thisArg, _arguments || []), i, q = [];
-        return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-        function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-        function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-        function fulfill(value) { resume("next", value); }
-        function reject(value) { resume("throw", value); }
-        function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-    }
-
-    function __asyncDelegator(o) {
-        var i, p;
-        return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
-    }
-
-    function __asyncValues(o) {
-        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-        var m = o[Symbol.asyncIterator], i;
-        return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-        function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-        function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-    }
-
-    function __makeTemplateObject(cooked, raw) {
-        if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-        return cooked;
-    }
-    function __importStar(mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-        result.default = mod;
-        return result;
-    }
-
-    function __importDefault(mod) {
-        return (mod && mod.__esModule) ? mod : { default: mod };
-    }
-
-    var tslib_1 = /*#__PURE__*/Object.freeze({
-        __extends: __extends,
-        get __assign () { return __assign; },
-        __rest: __rest,
-        __decorate: __decorate,
-        __param: __param,
-        __metadata: __metadata,
-        __awaiter: __awaiter,
-        __generator: __generator,
-        __exportStar: __exportStar,
-        __values: __values,
-        __read: __read,
-        __spread: __spread,
-        __await: __await,
-        __asyncGenerator: __asyncGenerator,
-        __asyncDelegator: __asyncDelegator,
-        __asyncValues: __asyncValues,
-        __makeTemplateObject: __makeTemplateObject,
-        __importStar: __importStar,
-        __importDefault: __importDefault
-    });
-
-    /** Console logging verbosity for the SDK. */
-    var LogLevel;
-    (function (LogLevel) {
-        /** No logs will be generated. */
-        LogLevel[LogLevel["None"] = 0] = "None";
-        /** Only SDK internal errors will be logged. */
-        LogLevel[LogLevel["Error"] = 1] = "Error";
-        /** Information useful for debugging the SDK will be logged. */
-        LogLevel[LogLevel["Debug"] = 2] = "Debug";
-        /** All SDK actions will be logged. */
-        LogLevel[LogLevel["Verbose"] = 3] = "Verbose";
-    })(LogLevel || (LogLevel = {}));
-
-    /** JSDoc */
-    (function (Severity) {
-        /** JSDoc */
-        Severity["Fatal"] = "fatal";
-        /** JSDoc */
-        Severity["Error"] = "error";
-        /** JSDoc */
-        Severity["Warning"] = "warning";
-        /** JSDoc */
-        Severity["Log"] = "log";
-        /** JSDoc */
-        Severity["Info"] = "info";
-        /** JSDoc */
-        Severity["Debug"] = "debug";
-        /** JSDoc */
-        Severity["Critical"] = "critical";
-    })(exports.Severity || (exports.Severity = {}));
-    // tslint:disable:completed-docs
-    // tslint:disable:no-unnecessary-qualifier no-namespace
-    (function (Severity) {
-        /**
-         * Converts a string-based level into a {@link Severity}.
-         *
-         * @param level string representation of Severity
-         * @returns Severity
-         */
-        function fromString(level) {
-            switch (level) {
-                case 'debug':
-                    return Severity.Debug;
-                case 'info':
-                    return Severity.Info;
-                case 'warn':
-                case 'warning':
-                    return Severity.Warning;
-                case 'error':
-                    return Severity.Error;
-                case 'fatal':
-                    return Severity.Fatal;
-                case 'critical':
-                    return Severity.Critical;
-                case 'log':
-                default:
-                    return Severity.Log;
-            }
-        }
-        Severity.fromString = fromString;
-    })(exports.Severity || (exports.Severity = {}));
-
-    /** The status of an Span. */
-    var SpanStatus;
-    (function (SpanStatus) {
-        /** The operation completed successfully. */
-        SpanStatus["Ok"] = "ok";
-        /** Deadline expired before operation could complete. */
-        SpanStatus["DeadlineExceeded"] = "deadline_exceeded";
-        /** 401 Unauthorized (actually does mean unauthenticated according to RFC 7235) */
-        SpanStatus["Unauthenticated"] = "unauthenticated";
-        /** 403 Forbidden */
-        SpanStatus["PermissionDenied"] = "permission_denied";
-        /** 404 Not Found. Some requested entity (file or directory) was not found. */
-        SpanStatus["NotFound"] = "not_found";
-        /** 429 Too Many Requests */
-        SpanStatus["ResourceExhausted"] = "resource_exhausted";
-        /** Client specified an invalid argument. 4xx. */
-        SpanStatus["InvalidArgument"] = "invalid_argument";
-        /** 501 Not Implemented */
-        SpanStatus["Unimplemented"] = "unimplemented";
-        /** 503 Service Unavailable */
-        SpanStatus["Unavailable"] = "unavailable";
-        /** Other/generic 5xx. */
-        SpanStatus["InternalError"] = "internal_error";
-        /** Unknown. Any non-standard HTTP status code. */
-        SpanStatus["UnknownError"] = "unknown_error";
-        /** The operation was cancelled (typically by the user). */
-        SpanStatus["Cancelled"] = "cancelled";
-        /** Already exists (409) */
-        SpanStatus["AlreadyExists"] = "already_exists";
-        /** Operation was rejected because the system is not in a state required for the operation's */
-        SpanStatus["FailedPrecondition"] = "failed_precondition";
-        /** The operation was aborted, typically due to a concurrency issue. */
-        SpanStatus["Aborted"] = "aborted";
-        /** Operation was attempted past the valid range. */
-        SpanStatus["OutOfRange"] = "out_of_range";
-        /** Unrecoverable data loss or corruption */
-        SpanStatus["DataLoss"] = "data_loss";
-    })(SpanStatus || (SpanStatus = {}));
-    // tslint:disable:no-unnecessary-qualifier no-namespace
-    (function (SpanStatus) {
-        /**
-         * Converts a HTTP status code into a {@link SpanStatus}.
-         *
-         * @param httpStatus The HTTP response status code.
-         * @returns The span status or {@link SpanStatus.UnknownError}.
-         */
-        // tslint:disable-next-line:completed-docs
-        function fromHttpCode(httpStatus) {
-            if (httpStatus < 400) {
-                return SpanStatus.Ok;
-            }
-            if (httpStatus >= 400 && httpStatus < 500) {
-                switch (httpStatus) {
-                    case 401:
-                        return SpanStatus.Unauthenticated;
-                    case 403:
-                        return SpanStatus.PermissionDenied;
-                    case 404:
-                        return SpanStatus.NotFound;
-                    case 409:
-                        return SpanStatus.AlreadyExists;
-                    case 413:
-                        return SpanStatus.FailedPrecondition;
-                    case 429:
-                        return SpanStatus.ResourceExhausted;
-                    default:
-                        return SpanStatus.InvalidArgument;
-                }
-            }
-            if (httpStatus >= 500 && httpStatus < 600) {
-                switch (httpStatus) {
-                    case 501:
-                        return SpanStatus.Unimplemented;
-                    case 503:
-                        return SpanStatus.Unavailable;
-                    case 504:
-                        return SpanStatus.DeadlineExceeded;
-                    default:
-                        return SpanStatus.InternalError;
-                }
-            }
-            return SpanStatus.UnknownError;
-        }
-        SpanStatus.fromHttpCode = fromHttpCode;
-    })(SpanStatus || (SpanStatus = {}));
-
-    /** The status of an event. */
-    (function (Status) {
-        /** The status could not be determined. */
-        Status["Unknown"] = "unknown";
-        /** The event was skipped due to configuration or callbacks. */
-        Status["Skipped"] = "skipped";
-        /** The event was sent to Sentry successfully. */
-        Status["Success"] = "success";
-        /** The client is currently rate limited and will try again later. */
-        Status["RateLimit"] = "rate_limit";
-        /** The event could not be processed. */
-        Status["Invalid"] = "invalid";
-        /** A server-side error ocurred during submission. */
-        Status["Failed"] = "failed";
-    })(exports.Status || (exports.Status = {}));
-    // tslint:disable:completed-docs
-    // tslint:disable:no-unnecessary-qualifier no-namespace
-    (function (Status) {
-        /**
-         * Converts a HTTP status code into a {@link Status}.
-         *
-         * @param code The HTTP response status code.
-         * @returns The send status or {@link Status.Unknown}.
-         */
-        function fromHttpCode(code) {
-            if (code >= 200 && code < 300) {
-                return Status.Success;
-            }
-            if (code === 429) {
-                return Status.RateLimit;
-            }
-            if (code >= 400 && code < 500) {
-                return Status.Invalid;
-            }
-            if (code >= 500) {
-                return Status.Failed;
-            }
-            return Status.Unknown;
-        }
-        Status.fromHttpCode = fromHttpCode;
-    })(exports.Status || (exports.Status = {}));
-
-    /**
-     * Consumes the promise and logs the error when it rejects.
-     * @param promise A promise to forget.
-     */
-
-    var setPrototypeOf = Object.setPrototypeOf || ({ __proto__: [] } instanceof Array ? setProtoOf : mixinProperties); // tslint:disable-line:no-unbound-method
-    /**
-     * setPrototypeOf polyfill using __proto__
-     */
-    function setProtoOf(obj, proto) {
-        // @ts-ignore
-        obj.__proto__ = proto;
-        return obj;
-    }
-    /**
-     * setPrototypeOf polyfill using mixin
-     */
-    function mixinProperties(obj, proto) {
-        for (var prop in proto) {
-            if (!obj.hasOwnProperty(prop)) {
-                // @ts-ignore
-                obj[prop] = proto[prop];
-            }
-        }
-        return obj;
-    }
-
-    /** An error emitted by Sentry SDKs and related utilities. */
-    var SentryError = /** @class */ (function (_super) {
-        __extends(SentryError, _super);
-        function SentryError(message) {
-            var _newTarget = this.constructor;
-            var _this = _super.call(this, message) || this;
-            _this.message = message;
-            // tslint:disable:no-unsafe-any
-            _this.name = _newTarget.prototype.constructor.name;
-            setPrototypeOf(_this, _newTarget.prototype);
-            return _this;
-        }
-        return SentryError;
-    }(Error));
-
-    /**
-     * Checks whether given value's type is one of a few Error or Error-like
-     * {@link isError}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isError(wat) {
-        switch (Object.prototype.toString.call(wat)) {
-            case '[object Error]':
-                return true;
-            case '[object Exception]':
-                return true;
-            case '[object DOMException]':
-                return true;
-            default:
-                return isInstanceOf(wat, Error);
-        }
-    }
-    /**
-     * Checks whether given value's type is ErrorEvent
-     * {@link isErrorEvent}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isErrorEvent(wat) {
-        return Object.prototype.toString.call(wat) === '[object ErrorEvent]';
-    }
-    /**
-     * Checks whether given value's type is DOMError
-     * {@link isDOMError}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isDOMError(wat) {
-        return Object.prototype.toString.call(wat) === '[object DOMError]';
-    }
-    /**
-     * Checks whether given value's type is DOMException
-     * {@link isDOMException}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isDOMException(wat) {
-        return Object.prototype.toString.call(wat) === '[object DOMException]';
-    }
-    /**
-     * Checks whether given value's type is a string
-     * {@link isString}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isString(wat) {
-        return Object.prototype.toString.call(wat) === '[object String]';
-    }
-    /**
-     * Checks whether given value's is a primitive (undefined, null, number, boolean, string)
-     * {@link isPrimitive}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isPrimitive(wat) {
-        return wat === null || (typeof wat !== 'object' && typeof wat !== 'function');
-    }
-    /**
-     * Checks whether given value's type is an object literal
-     * {@link isPlainObject}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isPlainObject(wat) {
-        return Object.prototype.toString.call(wat) === '[object Object]';
-    }
-    /**
-     * Checks whether given value's type is an Event instance
-     * {@link isEvent}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isEvent(wat) {
-        // tslint:disable-next-line:strict-type-predicates
-        return typeof Event !== 'undefined' && isInstanceOf(wat, Event);
-    }
-    /**
-     * Checks whether given value's type is an Element instance
-     * {@link isElement}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isElement(wat) {
-        // tslint:disable-next-line:strict-type-predicates
-        return typeof Element !== 'undefined' && isInstanceOf(wat, Element);
-    }
-    /**
-     * Checks whether given value's type is an regexp
-     * {@link isRegExp}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isRegExp(wat) {
-        return Object.prototype.toString.call(wat) === '[object RegExp]';
-    }
-    /**
-     * Checks whether given value has a then function.
-     * @param wat A value to be checked.
-     */
-    function isThenable(wat) {
-        // tslint:disable:no-unsafe-any
-        return Boolean(wat && wat.then && typeof wat.then === 'function');
-        // tslint:enable:no-unsafe-any
-    }
-    /**
-     * Checks whether given value's type is a SyntheticEvent
-     * {@link isSyntheticEvent}.
-     *
-     * @param wat A value to be checked.
-     * @returns A boolean representing the result.
-     */
-    function isSyntheticEvent(wat) {
-        // tslint:disable-next-line:no-unsafe-any
-        return isPlainObject(wat) && 'nativeEvent' in wat && 'preventDefault' in wat && 'stopPropagation' in wat;
-    }
-    /**
-     * Checks whether given value's type is an instance of provided constructor.
-     * {@link isInstanceOf}.
-     *
-     * @param wat A value to be checked.
-     * @param base A constructor to be used in a check.
-     * @returns A boolean representing the result.
-     */
-    function isInstanceOf(wat, base) {
-        try {
-            // tslint:disable-next-line:no-unsafe-any
-            return wat instanceof base;
-        }
-        catch (_e) {
-            return false;
-        }
-    }
-
-    /**
-     * Truncates given string to the maximum characters count
-     *
-     * @param str An object that contains serializable values
-     * @param max Maximum number of characters in truncated string
-     * @returns string Encoded
-     */
-    function truncate(str, max) {
-        if (max === void 0) { max = 0; }
-        // tslint:disable-next-line:strict-type-predicates
-        if (typeof str !== 'string' || max === 0) {
-            return str;
-        }
-        return str.length <= max ? str : str.substr(0, max) + "...";
-    }
-    /**
-     * Join values in array
-     * @param input array of values to be joined together
-     * @param delimiter string to be placed in-between values
-     * @returns Joined values
-     */
-    function safeJoin(input, delimiter) {
-        if (!Array.isArray(input)) {
-            return '';
-        }
-        var output = [];
-        // tslint:disable-next-line:prefer-for-of
-        for (var i = 0; i < input.length; i++) {
-            var value = input[i];
-            try {
-                output.push(String(value));
-            }
-            catch (e) {
-                output.push('[value cannot be serialized]');
-            }
-        }
-        return output.join(delimiter);
-    }
-    /**
-     * Checks if the value matches a regex or includes the string
-     * @param value The string value to be checked against
-     * @param pattern Either a regex or a string that must be contained in value
-     */
-    function isMatchingPattern(value, pattern) {
-        if (!isString(value)) {
-            return false;
-        }
-        if (isRegExp(pattern)) {
-            return pattern.test(value);
-        }
-        if (typeof pattern === 'string') {
-            return value.indexOf(pattern) !== -1;
-        }
-        return false;
-    }
-
-    /**
-     * Requires a module which is protected against bundler minification.
-     *
-     * @param request The module path to resolve
-     */
-    function dynamicRequire(mod, request) {
-        // tslint:disable-next-line: no-unsafe-any
-        return mod.require(request);
-    }
-    /**
-     * Checks whether we're in the Node.js or Browser environment
-     *
-     * @returns Answer to given question
-     */
-    function isNodeEnv() {
-        // tslint:disable:strict-type-predicates
-        return Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
-    }
-    var fallbackGlobalObject = {};
-    /**
-     * Safely get global scope object
-     *
-     * @returns Global scope object
-     */
-    function getGlobalObject() {
-        return (isNodeEnv()
-            ? global
-            : typeof window !== 'undefined'
-                ? window
-                : typeof self !== 'undefined'
-                    ? self
-                    : fallbackGlobalObject);
-    }
-    /**
-     * UUID4 generator
-     *
-     * @returns string Generated UUID4.
-     */
-    function uuid4() {
-        var global = getGlobalObject();
-        var crypto = global.crypto || global.msCrypto;
-        if (!(crypto === void 0) && crypto.getRandomValues) {
-            // Use window.crypto API if available
-            var arr = new Uint16Array(8);
-            crypto.getRandomValues(arr);
-            // set 4 in byte 7
-            // tslint:disable-next-line:no-bitwise
-            arr[3] = (arr[3] & 0xfff) | 0x4000;
-            // set 2 most significant bits of byte 9 to '10'
-            // tslint:disable-next-line:no-bitwise
-            arr[4] = (arr[4] & 0x3fff) | 0x8000;
-            var pad = function (num) {
-                var v = num.toString(16);
-                while (v.length < 4) {
-                    v = "0" + v;
-                }
-                return v;
-            };
-            return (pad(arr[0]) + pad(arr[1]) + pad(arr[2]) + pad(arr[3]) + pad(arr[4]) + pad(arr[5]) + pad(arr[6]) + pad(arr[7]));
-        }
-        // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript/2117523#2117523
-        return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-            // tslint:disable-next-line:no-bitwise
-            var r = (Math.random() * 16) | 0;
-            // tslint:disable-next-line:no-bitwise
-            var v = c === 'x' ? r : (r & 0x3) | 0x8;
-            return v.toString(16);
-        });
-    }
-    /**
-     * Parses string form of URL into an object
-     * // borrowed from https://tools.ietf.org/html/rfc3986#appendix-B
-     * // intentionally using regex and not <a/> href parsing trick because React Native and other
-     * // environments where DOM might not be available
-     * @returns parsed URL object
-     */
-    function parseUrl(url) {
-        if (!url) {
-            return {};
-        }
-        var match = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/);
-        if (!match) {
-            return {};
-        }
-        // coerce to undefined values to empty string so we don't get 'undefined'
-        var query = match[6] || '';
-        var fragment = match[8] || '';
-        return {
-            host: match[4],
-            path: match[5],
-            protocol: match[2],
-            relative: match[5] + query + fragment,
-        };
-    }
-    /**
-     * Extracts either message or type+value from an event that can be used for user-facing logs
-     * @returns event's description
-     */
-    function getEventDescription(event) {
-        if (event.message) {
-            return event.message;
-        }
-        if (event.exception && event.exception.values && event.exception.values[0]) {
-            var exception = event.exception.values[0];
-            if (exception.type && exception.value) {
-                return exception.type + ": " + exception.value;
-            }
-            return exception.type || exception.value || event.event_id || '<unknown>';
-        }
-        return event.event_id || '<unknown>';
-    }
-    /** JSDoc */
-    function consoleSandbox(callback) {
-        var global = getGlobalObject();
-        var levels = ['debug', 'info', 'warn', 'error', 'log', 'assert'];
-        if (!('console' in global)) {
-            return callback();
-        }
-        var originalConsole = global.console;
-        var wrappedLevels = {};
-        // Restore all wrapped console methods
-        levels.forEach(function (level) {
-            if (level in global.console && originalConsole[level].__sentry_original__) {
-                wrappedLevels[level] = originalConsole[level];
-                originalConsole[level] = originalConsole[level].__sentry_original__;
-            }
-        });
-        // Perform callback manipulations
-        var result = callback();
-        // Revert restoration to wrapped state
-        Object.keys(wrappedLevels).forEach(function (level) {
-            originalConsole[level] = wrappedLevels[level];
-        });
-        return result;
-    }
-    /**
-     * Adds exception values, type and value to an synthetic Exception.
-     * @param event The event to modify.
-     * @param value Value of the exception.
-     * @param type Type of the exception.
-     * @hidden
-     */
-    function addExceptionTypeValue(event, value, type) {
-        event.exception = event.exception || {};
-        event.exception.values = event.exception.values || [];
-        event.exception.values[0] = event.exception.values[0] || {};
-        event.exception.values[0].value = event.exception.values[0].value || value || '';
-        event.exception.values[0].type = event.exception.values[0].type || type || 'Error';
-    }
-    /**
-     * Adds exception mechanism to a given event.
-     * @param event The event to modify.
-     * @param mechanism Mechanism of the mechanism.
-     * @hidden
-     */
-    function addExceptionMechanism(event, mechanism) {
-        if (mechanism === void 0) { mechanism = {}; }
-        // TODO: Use real type with `keyof Mechanism` thingy and maybe make it better?
-        try {
-            // @ts-ignore
-            // tslint:disable:no-non-null-assertion
-            event.exception.values[0].mechanism = event.exception.values[0].mechanism || {};
-            Object.keys(mechanism).forEach(function (key) {
-                // @ts-ignore
-                event.exception.values[0].mechanism[key] = mechanism[key];
-            });
-        }
-        catch (_oO) {
-            // no-empty
-        }
-    }
-    /**
-     * A safe form of location.href
-     */
-    function getLocationHref() {
-        try {
-            return document.location.href;
-        }
-        catch (oO) {
-            return '';
-        }
-    }
-    /**
-     * Given a child DOM element, returns a query-selector statement describing that
-     * and its ancestors
-     * e.g. [HTMLElement] => body > div > input#foo.btn[name=baz]
-     * @returns generated DOM path
-     */
-    function htmlTreeAsString(elem) {
-        // try/catch both:
-        // - accessing event.target (see getsentry/raven-js#838, #768)
-        // - `htmlTreeAsString` because it's complex, and just accessing the DOM incorrectly
-        // - can throw an exception in some circumstances.
-        try {
-            var currentElem = elem;
-            var MAX_TRAVERSE_HEIGHT = 5;
-            var MAX_OUTPUT_LEN = 80;
-            var out = [];
-            var height = 0;
-            var len = 0;
-            var separator = ' > ';
-            var sepLength = separator.length;
-            var nextStr = void 0;
-            while (currentElem && height++ < MAX_TRAVERSE_HEIGHT) {
-                nextStr = _htmlElementAsString(currentElem);
-                // bail out if
-                // - nextStr is the 'html' element
-                // - the length of the string that would be created exceeds MAX_OUTPUT_LEN
-                //   (ignore this limit if we are on the first iteration)
-                if (nextStr === 'html' || (height > 1 && len + out.length * sepLength + nextStr.length >= MAX_OUTPUT_LEN)) {
-                    break;
-                }
-                out.push(nextStr);
-                len += nextStr.length;
-                currentElem = currentElem.parentNode;
-            }
-            return out.reverse().join(separator);
-        }
-        catch (_oO) {
-            return '<unknown>';
-        }
-    }
-    /**
-     * Returns a simple, query-selector representation of a DOM element
-     * e.g. [HTMLElement] => input#foo.btn[name=baz]
-     * @returns generated DOM path
-     */
-    function _htmlElementAsString(el) {
-        var elem = el;
-        var out = [];
-        var className;
-        var classes;
-        var key;
-        var attr;
-        var i;
-        if (!elem || !elem.tagName) {
-            return '';
-        }
-        out.push(elem.tagName.toLowerCase());
-        if (elem.id) {
-            out.push("#" + elem.id);
-        }
-        className = elem.className;
-        if (className && isString(className)) {
-            classes = className.split(/\s+/);
-            for (i = 0; i < classes.length; i++) {
-                out.push("." + classes[i]);
-            }
-        }
-        var attrWhitelist = ['type', 'name', 'title', 'alt'];
-        for (i = 0; i < attrWhitelist.length; i++) {
-            key = attrWhitelist[i];
-            attr = elem.getAttribute(key);
-            if (attr) {
-                out.push("[" + key + "=\"" + attr + "\"]");
-            }
-        }
-        return out.join('');
-    }
-    var INITIAL_TIME = Date.now();
-    var prevNow = 0;
-    var performanceFallback = {
-        now: function () {
-            var now = Date.now() - INITIAL_TIME;
-            if (now < prevNow) {
-                now = prevNow;
-            }
-            prevNow = now;
-            return now;
-        },
-        timeOrigin: INITIAL_TIME,
-    };
-    var crossPlatformPerformance = (function () {
-        if (isNodeEnv()) {
-            try {
-                var perfHooks = dynamicRequire(module, 'perf_hooks');
-                return perfHooks.performance;
-            }
-            catch (_) {
-                return performanceFallback;
-            }
-        }
-        if (getGlobalObject().performance) {
-            // Polyfill for performance.timeOrigin.
-            //
-            // While performance.timing.navigationStart is deprecated in favor of performance.timeOrigin, performance.timeOrigin
-            // is not as widely supported. Namely, performance.timeOrigin is undefined in Safari as of writing.
-            // tslint:disable-next-line:strict-type-predicates
-            if (performance.timeOrigin === undefined) {
-                // As of writing, performance.timing is not available in Web Workers in mainstream browsers, so it is not always a
-                // valid fallback. In the absence of a initial time provided by the browser, fallback to INITIAL_TIME.
-                // @ts-ignore
-                // tslint:disable-next-line:deprecation
-                performance.timeOrigin = (performance.timing && performance.timing.navigationStart) || INITIAL_TIME;
-            }
-        }
-        return getGlobalObject().performance || performanceFallback;
-    })();
-    /**
-     * Returns a timestamp in seconds with milliseconds precision since the UNIX epoch calculated with the monotonic clock.
-     */
-    function timestampWithMs() {
-        return (crossPlatformPerformance.timeOrigin + crossPlatformPerformance.now()) / 1000;
-    }
-    var defaultRetryAfter = 60 * 1000; // 60 seconds
-    /**
-     * Extracts Retry-After value from the request header or returns default value
-     * @param now current unix timestamp
-     * @param header string representation of 'Retry-After' header
-     */
-    function parseRetryAfterHeader(now, header) {
-        if (!header) {
-            return defaultRetryAfter;
-        }
-        var headerDelay = parseInt("" + header, 10);
-        if (!isNaN(headerDelay)) {
-            return headerDelay * 1000;
-        }
-        var headerDate = Date.parse("" + header);
-        if (!isNaN(headerDate)) {
-            return headerDate - now;
-        }
-        return defaultRetryAfter;
-    }
-    var defaultFunctionName = '<anonymous>';
-    /**
-     * Safely extract function name from itself
-     */
-    function getFunctionName(fn) {
-        try {
-            if (!fn || typeof fn !== 'function') {
-                return defaultFunctionName;
-            }
-            return fn.name || defaultFunctionName;
-        }
-        catch (e) {
-            // Just accessing custom props in some Selenium environments
-            // can cause a "Permission denied" exception (see raven-js#495).
-            return defaultFunctionName;
-        }
-    }
-
-    // TODO: Implement different loggers for different environments
-    var global$1 = getGlobalObject();
-    /** Prefix for logging strings */
-    var PREFIX = 'Sentry Logger ';
-    /** JSDoc */
-    var Logger = /** @class */ (function () {
-        /** JSDoc */
-        function Logger() {
-            this._enabled = false;
-        }
-        /** JSDoc */
-        Logger.prototype.disable = function () {
-            this._enabled = false;
-        };
-        /** JSDoc */
-        Logger.prototype.enable = function () {
-            this._enabled = true;
-        };
-        /** JSDoc */
-        Logger.prototype.log = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            if (!this._enabled) {
-                return;
-            }
-            consoleSandbox(function () {
-                global$1.console.log(PREFIX + "[Log]: " + args.join(' ')); // tslint:disable-line:no-console
-            });
-        };
-        /** JSDoc */
-        Logger.prototype.warn = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            if (!this._enabled) {
-                return;
-            }
-            consoleSandbox(function () {
-                global$1.console.warn(PREFIX + "[Warn]: " + args.join(' ')); // tslint:disable-line:no-console
-            });
-        };
-        /** JSDoc */
-        Logger.prototype.error = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            if (!this._enabled) {
-                return;
-            }
-            consoleSandbox(function () {
-                global$1.console.error(PREFIX + "[Error]: " + args.join(' ')); // tslint:disable-line:no-console
-            });
-        };
-        return Logger;
-    }());
-    // Ensure we only have a single logger instance, even if multiple versions of @sentry/utils are being used
-    global$1.__SENTRY__ = global$1.__SENTRY__ || {};
-    var logger = global$1.__SENTRY__.logger || (global$1.__SENTRY__.logger = new Logger());
-
-    // tslint:disable:no-unsafe-any
-    /**
-     * Memo class used for decycle json objects. Uses WeakSet if available otherwise array.
-     */
-    var Memo = /** @class */ (function () {
-        function Memo() {
-            // tslint:disable-next-line
-            this._hasWeakSet = typeof WeakSet === 'function';
-            this._inner = this._hasWeakSet ? new WeakSet() : [];
-        }
-        /**
-         * Sets obj to remember.
-         * @param obj Object to remember
-         */
-        Memo.prototype.memoize = function (obj) {
-            if (this._hasWeakSet) {
-                if (this._inner.has(obj)) {
-                    return true;
-                }
-                this._inner.add(obj);
-                return false;
-            }
-            // tslint:disable-next-line:prefer-for-of
-            for (var i = 0; i < this._inner.length; i++) {
-                var value = this._inner[i];
-                if (value === obj) {
-                    return true;
-                }
-            }
-            this._inner.push(obj);
-            return false;
-        };
-        /**
-         * Removes object from internal storage.
-         * @param obj Object to forget
-         */
-        Memo.prototype.unmemoize = function (obj) {
-            if (this._hasWeakSet) {
-                this._inner.delete(obj);
-            }
-            else {
-                for (var i = 0; i < this._inner.length; i++) {
-                    if (this._inner[i] === obj) {
-                        this._inner.splice(i, 1);
-                        break;
-                    }
-                }
-            }
-        };
-        return Memo;
-    }());
-
-    /**
-     * Wrap a given object method with a higher-order function
-     *
-     * @param source An object that contains a method to be wrapped.
-     * @param name A name of method to be wrapped.
-     * @param replacement A function that should be used to wrap a given method.
-     * @returns void
-     */
-    function fill(source, name, replacement) {
-        if (!(name in source)) {
-            return;
-        }
-        var original = source[name];
-        var wrapped = replacement(original);
-        // Make sure it's a function first, as we need to attach an empty prototype for `defineProperties` to work
-        // otherwise it'll throw "TypeError: Object.defineProperties called on non-object"
-        // tslint:disable-next-line:strict-type-predicates
-        if (typeof wrapped === 'function') {
-            try {
-                wrapped.prototype = wrapped.prototype || {};
-                Object.defineProperties(wrapped, {
-                    __sentry_original__: {
-                        enumerable: false,
-                        value: original,
-                    },
-                });
-            }
-            catch (_Oo) {
-                // This can throw if multiple fill happens on a global object like XMLHttpRequest
-                // Fixes https://github.com/getsentry/sentry-javascript/issues/2043
-            }
-        }
-        source[name] = wrapped;
-    }
-    /**
-     * Encodes given object into url-friendly format
-     *
-     * @param object An object that contains serializable values
-     * @returns string Encoded
-     */
-    function urlEncode(object) {
-        return Object.keys(object)
-            .map(
-        // tslint:disable-next-line:no-unsafe-any
-        function (key) { return encodeURIComponent(key) + "=" + encodeURIComponent(object[key]); })
-            .join('&');
-    }
-    /**
-     * Transforms any object into an object literal with all it's attributes
-     * attached to it.
-     *
-     * @param value Initial source that we have to transform in order to be usable by the serializer
-     */
-    function getWalkSource(value) {
-        if (isError(value)) {
-            var error = value;
-            var err = {
-                message: error.message,
-                name: error.name,
-                stack: error.stack,
-            };
-            for (var i in error) {
-                if (Object.prototype.hasOwnProperty.call(error, i)) {
-                    err[i] = error[i];
-                }
-            }
-            return err;
-        }
-        if (isEvent(value)) {
-            var event_1 = value;
-            var source = {};
-            source.type = event_1.type;
-            // Accessing event.target can throw (see getsentry/raven-js#838, #768)
-            try {
-                source.target = isElement(event_1.target)
-                    ? htmlTreeAsString(event_1.target)
-                    : Object.prototype.toString.call(event_1.target);
-            }
-            catch (_oO) {
-                source.target = '<unknown>';
-            }
-            try {
-                source.currentTarget = isElement(event_1.currentTarget)
-                    ? htmlTreeAsString(event_1.currentTarget)
-                    : Object.prototype.toString.call(event_1.currentTarget);
-            }
-            catch (_oO) {
-                source.currentTarget = '<unknown>';
-            }
-            // tslint:disable-next-line:strict-type-predicates
-            if (typeof CustomEvent !== 'undefined' && isInstanceOf(value, CustomEvent)) {
-                source.detail = event_1.detail;
-            }
-            for (var i in event_1) {
-                if (Object.prototype.hasOwnProperty.call(event_1, i)) {
-                    source[i] = event_1;
-                }
-            }
-            return source;
-        }
-        return value;
-    }
-    /** Calculates bytes size of input string */
-    function utf8Length(value) {
-        // tslint:disable-next-line:no-bitwise
-        return ~-encodeURI(value).split(/%..|./).length;
-    }
-    /** Calculates bytes size of input object */
-    function jsonSize(value) {
-        return utf8Length(JSON.stringify(value));
-    }
-    /** JSDoc */
-    function normalizeToSize(object, 
-    // Default Node.js REPL depth
-    depth, 
-    // 100kB, as 200kB is max payload size, so half sounds reasonable
-    maxSize) {
-        if (depth === void 0) { depth = 3; }
-        if (maxSize === void 0) { maxSize = 100 * 1024; }
-        var serialized = normalize(object, depth);
-        if (jsonSize(serialized) > maxSize) {
-            return normalizeToSize(object, depth - 1, maxSize);
-        }
-        return serialized;
-    }
-    /** Transforms any input value into a string form, either primitive value or a type of the input */
-    function serializeValue(value) {
-        var type = Object.prototype.toString.call(value);
-        // Node.js REPL notation
-        if (typeof value === 'string') {
-            return value;
-        }
-        if (type === '[object Object]') {
-            return '[Object]';
-        }
-        if (type === '[object Array]') {
-            return '[Array]';
-        }
-        var normalized = normalizeValue(value);
-        return isPrimitive(normalized) ? normalized : type;
-    }
-    /**
-     * normalizeValue()
-     *
-     * Takes unserializable input and make it serializable friendly
-     *
-     * - translates undefined/NaN values to "[undefined]"/"[NaN]" respectively,
-     * - serializes Error objects
-     * - filter global objects
-     */
-    // tslint:disable-next-line:cyclomatic-complexity
-    function normalizeValue(value, key) {
-        if (key === 'domain' && value && typeof value === 'object' && value._events) {
-            return '[Domain]';
-        }
-        if (key === 'domainEmitter') {
-            return '[DomainEmitter]';
-        }
-        if (typeof global !== 'undefined' && value === global) {
-            return '[Global]';
-        }
-        if (typeof window !== 'undefined' && value === window) {
-            return '[Window]';
-        }
-        if (typeof document !== 'undefined' && value === document) {
-            return '[Document]';
-        }
-        // React's SyntheticEvent thingy
-        if (isSyntheticEvent(value)) {
-            return '[SyntheticEvent]';
-        }
-        // tslint:disable-next-line:no-tautology-expression
-        if (typeof value === 'number' && value !== value) {
-            return '[NaN]';
-        }
-        if (value === void 0) {
-            return '[undefined]';
-        }
-        if (typeof value === 'function') {
-            return "[Function: " + getFunctionName(value) + "]";
-        }
-        return value;
-    }
-    /**
-     * Walks an object to perform a normalization on it
-     *
-     * @param key of object that's walked in current iteration
-     * @param value object to be walked
-     * @param depth Optional number indicating how deep should walking be performed
-     * @param memo Optional Memo class handling decycling
-     */
-    function walk(key, value, depth, memo) {
-        if (depth === void 0) { depth = +Infinity; }
-        if (memo === void 0) { memo = new Memo(); }
-        // If we reach the maximum depth, serialize whatever has left
-        if (depth === 0) {
-            return serializeValue(value);
-        }
-        // If value implements `toJSON` method, call it and return early
-        // tslint:disable:no-unsafe-any
-        if (value !== null && value !== undefined && typeof value.toJSON === 'function') {
-            return value.toJSON();
-        }
-        // tslint:enable:no-unsafe-any
-        // If normalized value is a primitive, there are no branches left to walk, so we can just bail out, as theres no point in going down that branch any further
-        var normalized = normalizeValue(value, key);
-        if (isPrimitive(normalized)) {
-            return normalized;
-        }
-        // Create source that we will use for next itterations, either objectified error object (Error type with extracted keys:value pairs) or the input itself
-        var source = getWalkSource(value);
-        // Create an accumulator that will act as a parent for all future itterations of that branch
-        var acc = Array.isArray(value) ? [] : {};
-        // If we already walked that branch, bail out, as it's circular reference
-        if (memo.memoize(value)) {
-            return '[Circular ~]';
-        }
-        // Walk all keys of the source
-        for (var innerKey in source) {
-            // Avoid iterating over fields in the prototype if they've somehow been exposed to enumeration.
-            if (!Object.prototype.hasOwnProperty.call(source, innerKey)) {
-                continue;
-            }
-            // Recursively walk through all the child nodes
-            acc[innerKey] = walk(innerKey, source[innerKey], depth - 1, memo);
-        }
-        // Once walked through all the branches, remove the parent from memo storage
-        memo.unmemoize(value);
-        // Return accumulated values
-        return acc;
-    }
-    /**
-     * normalize()
-     *
-     * - Creates a copy to prevent original input mutation
-     * - Skip non-enumerablers
-     * - Calls `toJSON` if implemented
-     * - Removes circular references
-     * - Translates non-serializeable values (undefined/NaN/Functions) to serializable format
-     * - Translates known global objects/Classes to a string representations
-     * - Takes care of Error objects serialization
-     * - Optionally limit depth of final output
-     */
-    function normalize(input, depth) {
-        try {
-            // tslint:disable-next-line:no-unsafe-any
-            return JSON.parse(JSON.stringify(input, function (key, value) { return walk(key, value, depth); }));
-        }
-        catch (_oO) {
-            return '**non-serializable**';
-        }
-    }
-    /**
-     * Given any captured exception, extract its keys and create a sorted
-     * and truncated list that will be used inside the event message.
-     * eg. `Non-error exception captured with keys: foo, bar, baz`
-     */
-    function extractExceptionKeysForMessage(exception, maxLength) {
-        if (maxLength === void 0) { maxLength = 40; }
-        // tslint:disable:strict-type-predicates
-        var keys = Object.keys(getWalkSource(exception));
-        keys.sort();
-        if (!keys.length) {
-            return '[object has no keys]';
-        }
-        if (keys[0].length >= maxLength) {
-            return truncate(keys[0], maxLength);
-        }
-        for (var includedKeys = keys.length; includedKeys > 0; includedKeys--) {
-            var serialized = keys.slice(0, includedKeys).join(', ');
-            if (serialized.length > maxLength) {
-                continue;
-            }
-            if (includedKeys === keys.length) {
-                return serialized;
-            }
-            return truncate(serialized, maxLength);
-        }
-        return '';
-    }
-
-    // Slightly modified (no IE8 support, ES6) and transcribed to TypeScript
-
-    /** SyncPromise internal states */
-    var States;
-    (function (States) {
-        /** Pending */
-        States["PENDING"] = "PENDING";
-        /** Resolved / OK */
-        States["RESOLVED"] = "RESOLVED";
-        /** Rejected / Error */
-        States["REJECTED"] = "REJECTED";
-    })(States || (States = {}));
-    /**
-     * Thenable class that behaves like a Promise and follows it's interface
-     * but is not async internally
-     */
-    var SyncPromise = /** @class */ (function () {
-        function SyncPromise(executor) {
-            var _this = this;
-            this._state = States.PENDING;
-            this._handlers = [];
-            /** JSDoc */
-            this._resolve = function (value) {
-                _this._setResult(States.RESOLVED, value);
-            };
-            /** JSDoc */
-            this._reject = function (reason) {
-                _this._setResult(States.REJECTED, reason);
-            };
-            /** JSDoc */
-            this._setResult = function (state, value) {
-                if (_this._state !== States.PENDING) {
-                    return;
-                }
-                if (isThenable(value)) {
-                    value.then(_this._resolve, _this._reject);
-                    return;
-                }
-                _this._state = state;
-                _this._value = value;
-                _this._executeHandlers();
-            };
-            // TODO: FIXME
-            /** JSDoc */
-            this._attachHandler = function (handler) {
-                _this._handlers = _this._handlers.concat(handler);
-                _this._executeHandlers();
-            };
-            /** JSDoc */
-            this._executeHandlers = function () {
-                if (_this._state === States.PENDING) {
-                    return;
-                }
-                var cachedHandlers = _this._handlers.slice();
-                _this._handlers = [];
-                cachedHandlers.forEach(function (handler) {
-                    if (handler.done) {
-                        return;
-                    }
-                    if (_this._state === States.RESOLVED) {
-                        if (handler.onfulfilled) {
-                            handler.onfulfilled(_this._value);
-                        }
-                    }
-                    if (_this._state === States.REJECTED) {
-                        if (handler.onrejected) {
-                            handler.onrejected(_this._value);
-                        }
-                    }
-                    handler.done = true;
-                });
-            };
-            try {
-                executor(this._resolve, this._reject);
-            }
-            catch (e) {
-                this._reject(e);
-            }
-        }
-        /** JSDoc */
-        SyncPromise.prototype.toString = function () {
-            return '[object SyncPromise]';
-        };
-        /** JSDoc */
-        SyncPromise.resolve = function (value) {
-            return new SyncPromise(function (resolve) {
-                resolve(value);
-            });
-        };
-        /** JSDoc */
-        SyncPromise.reject = function (reason) {
-            return new SyncPromise(function (_, reject) {
-                reject(reason);
-            });
-        };
-        /** JSDoc */
-        SyncPromise.all = function (collection) {
-            return new SyncPromise(function (resolve, reject) {
-                if (!Array.isArray(collection)) {
-                    reject(new TypeError("Promise.all requires an array as input."));
-                    return;
-                }
-                if (collection.length === 0) {
-                    resolve([]);
-                    return;
-                }
-                var counter = collection.length;
-                var resolvedCollection = [];
-                collection.forEach(function (item, index) {
-                    SyncPromise.resolve(item)
-                        .then(function (value) {
-                        resolvedCollection[index] = value;
-                        counter -= 1;
-                        if (counter !== 0) {
-                            return;
-                        }
-                        resolve(resolvedCollection);
-                    })
-                        .then(null, reject);
-                });
-            });
-        };
-        /** JSDoc */
-        SyncPromise.prototype.then = function (onfulfilled, onrejected) {
-            var _this = this;
-            return new SyncPromise(function (resolve, reject) {
-                _this._attachHandler({
-                    done: false,
-                    onfulfilled: function (result) {
-                        if (!onfulfilled) {
-                            // TODO: ¯\_(ツ)_/¯
-                            // TODO: FIXME
-                            resolve(result);
-                            return;
-                        }
-                        try {
-                            resolve(onfulfilled(result));
-                            return;
-                        }
-                        catch (e) {
-                            reject(e);
-                            return;
-                        }
-                    },
-                    onrejected: function (reason) {
-                        if (!onrejected) {
-                            reject(reason);
-                            return;
-                        }
-                        try {
-                            resolve(onrejected(reason));
-                            return;
-                        }
-                        catch (e) {
-                            reject(e);
-                            return;
-                        }
-                    },
-                });
-            });
-        };
-        /** JSDoc */
-        SyncPromise.prototype.catch = function (onrejected) {
-            return this.then(function (val) { return val; }, onrejected);
-        };
-        /** JSDoc */
-        SyncPromise.prototype.finally = function (onfinally) {
-            var _this = this;
-            return new SyncPromise(function (resolve, reject) {
-                var val;
-                var isRejected;
-                return _this.then(function (value) {
-                    isRejected = false;
-                    val = value;
-                    if (onfinally) {
-                        onfinally();
-                    }
-                }, function (reason) {
-                    isRejected = true;
-                    val = reason;
-                    if (onfinally) {
-                        onfinally();
-                    }
-                }).then(function () {
-                    if (isRejected) {
-                        reject(val);
-                        return;
-                    }
-                    resolve(val);
-                });
-            });
-        };
-        return SyncPromise;
-    }());
-
-    /** A simple queue that holds promises. */
-    var PromiseBuffer = /** @class */ (function () {
-        function PromiseBuffer(_limit) {
-            this._limit = _limit;
-            /** Internal set of queued Promises */
-            this._buffer = [];
-        }
-        /**
-         * Says if the buffer is ready to take more requests
-         */
-        PromiseBuffer.prototype.isReady = function () {
-            return this._limit === undefined || this.length() < this._limit;
-        };
-        /**
-         * Add a promise to the queue.
-         *
-         * @param task Can be any PromiseLike<T>
-         * @returns The original promise.
-         */
-        PromiseBuffer.prototype.add = function (task) {
-            var _this = this;
-            if (!this.isReady()) {
-                return SyncPromise.reject(new SentryError('Not adding Promise due to buffer limit reached.'));
-            }
-            if (this._buffer.indexOf(task) === -1) {
-                this._buffer.push(task);
-            }
-            task
-                .then(function () { return _this.remove(task); })
-                .then(null, function () {
-                return _this.remove(task).then(null, function () {
-                    // We have to add this catch here otherwise we have an unhandledPromiseRejection
-                    // because it's a new Promise chain.
-                });
-            });
-            return task;
-        };
-        /**
-         * Remove a promise to the queue.
-         *
-         * @param task Can be any PromiseLike<T>
-         * @returns Removed promise.
-         */
-        PromiseBuffer.prototype.remove = function (task) {
-            var removedTask = this._buffer.splice(this._buffer.indexOf(task), 1)[0];
-            return removedTask;
-        };
-        /**
-         * This function returns the number of unresolved promises in the queue.
-         */
-        PromiseBuffer.prototype.length = function () {
-            return this._buffer.length;
-        };
-        /**
-         * This will drain the whole queue, returns true if queue is empty or drained.
-         * If timeout is provided and the queue takes longer to drain, the promise still resolves but with false.
-         *
-         * @param timeout Number in ms to wait until it resolves with false.
-         */
-        PromiseBuffer.prototype.drain = function (timeout) {
-            var _this = this;
-            return new SyncPromise(function (resolve) {
-                var capturedSetTimeout = setTimeout(function () {
-                    if (timeout && timeout > 0) {
-                        resolve(false);
-                    }
-                }, timeout);
-                SyncPromise.all(_this._buffer)
-                    .then(function () {
-                    clearTimeout(capturedSetTimeout);
-                    resolve(true);
-                })
-                    .then(null, function () {
-                    resolve(true);
-                });
-            });
-        };
-        return PromiseBuffer;
-    }());
-
-    /**
-     * Tells whether current environment supports Fetch API
-     * {@link supportsFetch}.
-     *
-     * @returns Answer to the given question.
-     */
-    function supportsFetch() {
-        if (!('fetch' in getGlobalObject())) {
-            return false;
-        }
-        try {
-            // tslint:disable-next-line:no-unused-expression
-            new Headers();
-            // tslint:disable-next-line:no-unused-expression
-            new Request('');
-            // tslint:disable-next-line:no-unused-expression
-            new Response();
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    /**
-     * isNativeFetch checks if the given function is a native implementation of fetch()
-     */
-    function isNativeFetch(func) {
-        return func && /^function fetch\(\)\s+\{\s+\[native code\]\s+\}$/.test(func.toString());
-    }
-    /**
-     * Tells whether current environment supports Fetch API natively
-     * {@link supportsNativeFetch}.
-     *
-     * @returns true if `window.fetch` is natively implemented, false otherwise
-     */
-    function supportsNativeFetch() {
-        if (!supportsFetch()) {
-            return false;
-        }
-        var global = getGlobalObject();
-        // Fast path to avoid DOM I/O
-        // tslint:disable-next-line:no-unbound-method
-        if (isNativeFetch(global.fetch)) {
-            return true;
-        }
-        // window.fetch is implemented, but is polyfilled or already wrapped (e.g: by a chrome extension)
-        // so create a "pure" iframe to see if that has native fetch
-        var result = false;
-        var doc = global.document;
-        // tslint:disable-next-line:no-unbound-method deprecation
-        if (doc && typeof doc.createElement === "function") {
-            try {
-                var sandbox = doc.createElement('iframe');
-                sandbox.hidden = true;
-                doc.head.appendChild(sandbox);
-                if (sandbox.contentWindow && sandbox.contentWindow.fetch) {
-                    // tslint:disable-next-line:no-unbound-method
-                    result = isNativeFetch(sandbox.contentWindow.fetch);
-                }
-                doc.head.removeChild(sandbox);
-            }
-            catch (err) {
-                logger.warn('Could not create sandbox iframe for pure fetch check, bailing to window.fetch: ', err);
-            }
-        }
-        return result;
-    }
-    /**
-     * Tells whether current environment supports Referrer Policy API
-     * {@link supportsReferrerPolicy}.
-     *
-     * @returns Answer to the given question.
-     */
-    function supportsReferrerPolicy() {
-        // Despite all stars in the sky saying that Edge supports old draft syntax, aka 'never', 'always', 'origin' and 'default
-        // https://caniuse.com/#feat=referrer-policy
-        // It doesn't. And it throw exception instead of ignoring this parameter...
-        // REF: https://github.com/getsentry/raven-js/issues/1233
-        if (!supportsFetch()) {
-            return false;
-        }
-        try {
-            // tslint:disable:no-unused-expression
-            new Request('_', {
-                referrerPolicy: 'origin',
-            });
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    /**
-     * Tells whether current environment supports History API
-     * {@link supportsHistory}.
-     *
-     * @returns Answer to the given question.
-     */
-    function supportsHistory() {
-        // NOTE: in Chrome App environment, touching history.pushState, *even inside
-        //       a try/catch block*, will cause Chrome to output an error to console.error
-        // borrowed from: https://github.com/angular/angular.js/pull/13945/files
-        var global = getGlobalObject();
-        var chrome = global.chrome;
-        // tslint:disable-next-line:no-unsafe-any
-        var isChromePackagedApp = chrome && chrome.app && chrome.app.runtime;
-        var hasHistoryApi = 'history' in global && !!global.history.pushState && !!global.history.replaceState;
-        return !isChromePackagedApp && hasHistoryApi;
-    }
-
-    /* tslint:disable:only-arrow-functions no-unsafe-any */
-    var global$2 = getGlobalObject();
-    /**
-     * Instrument native APIs to call handlers that can be used to create breadcrumbs, APM spans etc.
-     *  - Console API
-     *  - Fetch API
-     *  - XHR API
-     *  - History API
-     *  - DOM API (click/typing)
-     *  - Error API
-     *  - UnhandledRejection API
-     */
-    var handlers = {};
-    var instrumented = {};
-    /** Instruments given API */
-    function instrument(type) {
-        if (instrumented[type]) {
-            return;
-        }
-        instrumented[type] = true;
-        switch (type) {
-            case 'console':
-                instrumentConsole();
-                break;
-            case 'dom':
-                instrumentDOM();
-                break;
-            case 'xhr':
-                instrumentXHR();
-                break;
-            case 'fetch':
-                instrumentFetch();
-                break;
-            case 'history':
-                instrumentHistory();
-                break;
-            case 'error':
-                instrumentError();
-                break;
-            case 'unhandledrejection':
-                instrumentUnhandledRejection();
-                break;
-            default:
-                logger.warn('unknown instrumentation type:', type);
-        }
-    }
-    /**
-     * Add handler that will be called when given type of instrumentation triggers.
-     * Use at your own risk, this might break without changelog notice, only used internally.
-     * @hidden
-     */
-    function addInstrumentationHandler(handler) {
-        // tslint:disable-next-line:strict-type-predicates
-        if (!handler || typeof handler.type !== 'string' || typeof handler.callback !== 'function') {
-            return;
-        }
-        handlers[handler.type] = handlers[handler.type] || [];
-        handlers[handler.type].push(handler.callback);
-        instrument(handler.type);
-    }
-    /** JSDoc */
-    function triggerHandlers(type, data) {
-        var e_1, _a;
-        if (!type || !handlers[type]) {
-            return;
-        }
-        try {
-            for (var _b = __values(handlers[type] || []), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var handler = _c.value;
-                try {
-                    handler(data);
-                }
-                catch (e) {
-                    logger.error("Error while triggering instrumentation handler.\nType: " + type + "\nName: " + getFunctionName(handler) + "\nError: " + e);
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-    }
-    /** JSDoc */
-    function instrumentConsole() {
-        if (!('console' in global$2)) {
-            return;
-        }
-        ['debug', 'info', 'warn', 'error', 'log', 'assert'].forEach(function (level) {
-            if (!(level in global$2.console)) {
-                return;
-            }
-            fill(global$2.console, level, function (originalConsoleLevel) {
-                return function () {
-                    var args = [];
-                    for (var _i = 0; _i < arguments.length; _i++) {
-                        args[_i] = arguments[_i];
-                    }
-                    triggerHandlers('console', { args: args, level: level });
-                    // this fails for some browsers. :(
-                    if (originalConsoleLevel) {
-                        Function.prototype.apply.call(originalConsoleLevel, global$2.console, args);
-                    }
-                };
-            });
-        });
-    }
-    /** JSDoc */
-    function instrumentFetch() {
-        if (!supportsNativeFetch()) {
-            return;
-        }
-        fill(global$2, 'fetch', function (originalFetch) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var commonHandlerData = {
-                    args: args,
-                    fetchData: {
-                        method: getFetchMethod(args),
-                        url: getFetchUrl(args),
-                    },
-                    startTimestamp: Date.now(),
-                };
-                triggerHandlers('fetch', __assign({}, commonHandlerData));
-                return originalFetch.apply(global$2, args).then(function (response) {
-                    triggerHandlers('fetch', __assign({}, commonHandlerData, { endTimestamp: Date.now(), response: response }));
-                    return response;
-                }, function (error) {
-                    triggerHandlers('fetch', __assign({}, commonHandlerData, { endTimestamp: Date.now(), error: error }));
-                    throw error;
-                });
-            };
-        });
-    }
-    /** Extract `method` from fetch call arguments */
-    function getFetchMethod(fetchArgs) {
-        if (fetchArgs === void 0) { fetchArgs = []; }
-        if ('Request' in global$2 && isInstanceOf(fetchArgs[0], Request) && fetchArgs[0].method) {
-            return String(fetchArgs[0].method).toUpperCase();
-        }
-        if (fetchArgs[1] && fetchArgs[1].method) {
-            return String(fetchArgs[1].method).toUpperCase();
-        }
-        return 'GET';
-    }
-    /** Extract `url` from fetch call arguments */
-    function getFetchUrl(fetchArgs) {
-        if (fetchArgs === void 0) { fetchArgs = []; }
-        if (typeof fetchArgs[0] === 'string') {
-            return fetchArgs[0];
-        }
-        if ('Request' in global$2 && isInstanceOf(fetchArgs[0], Request)) {
-            return fetchArgs[0].url;
-        }
-        return String(fetchArgs[0]);
-    }
-    /** JSDoc */
-    function instrumentXHR() {
-        if (!('XMLHttpRequest' in global$2)) {
-            return;
-        }
-        var xhrproto = XMLHttpRequest.prototype;
-        fill(xhrproto, 'open', function (originalOpen) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var url = args[1];
-                this.__sentry_xhr__ = {
-                    method: isString(args[0]) ? args[0].toUpperCase() : args[0],
-                    url: args[1],
-                };
-                // if Sentry key appears in URL, don't capture it as a request
-                if (isString(url) && this.__sentry_xhr__.method === 'POST' && url.match(/sentry_key/)) {
-                    this.__sentry_own_request__ = true;
-                }
-                return originalOpen.apply(this, args);
-            };
-        });
-        fill(xhrproto, 'send', function (originalSend) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var xhr = this; // tslint:disable-line:no-this-assignment
-                var commonHandlerData = {
-                    args: args,
-                    startTimestamp: Date.now(),
-                    xhr: xhr,
-                };
-                triggerHandlers('xhr', __assign({}, commonHandlerData));
-                xhr.addEventListener('readystatechange', function () {
-                    if (xhr.readyState === 4) {
-                        try {
-                            // touching statusCode in some platforms throws
-                            // an exception
-                            if (xhr.__sentry_xhr__) {
-                                xhr.__sentry_xhr__.status_code = xhr.status;
-                            }
-                        }
-                        catch (e) {
-                            /* do nothing */
-                        }
-                        triggerHandlers('xhr', __assign({}, commonHandlerData, { endTimestamp: Date.now() }));
-                    }
-                });
-                return originalSend.apply(this, args);
-            };
-        });
-    }
-    var lastHref;
-    /** JSDoc */
-    function instrumentHistory() {
-        if (!supportsHistory()) {
-            return;
-        }
-        var oldOnPopState = global$2.onpopstate;
-        global$2.onpopstate = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            var to = global$2.location.href;
-            // keep track of the current URL state, as we always receive only the updated state
-            var from = lastHref;
-            lastHref = to;
-            triggerHandlers('history', {
-                from: from,
-                to: to,
-            });
-            if (oldOnPopState) {
-                return oldOnPopState.apply(this, args);
-            }
-        };
-        /** @hidden */
-        function historyReplacementFunction(originalHistoryFunction) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var url = args.length > 2 ? args[2] : undefined;
-                if (url) {
-                    // coerce to string (this is what pushState does)
-                    var from = lastHref;
-                    var to = String(url);
-                    // keep track of the current URL state, as we always receive only the updated state
-                    lastHref = to;
-                    triggerHandlers('history', {
-                        from: from,
-                        to: to,
-                    });
-                }
-                return originalHistoryFunction.apply(this, args);
-            };
-        }
-        fill(global$2.history, 'pushState', historyReplacementFunction);
-        fill(global$2.history, 'replaceState', historyReplacementFunction);
-    }
-    /** JSDoc */
-    function instrumentDOM() {
-        if (!('document' in global$2)) {
-            return;
-        }
-        // Capture breadcrumbs from any click that is unhandled / bubbled up all the way
-        // to the document. Do this before we instrument addEventListener.
-        global$2.document.addEventListener('click', domEventHandler('click', triggerHandlers.bind(null, 'dom')), false);
-        global$2.document.addEventListener('keypress', keypressEventHandler(triggerHandlers.bind(null, 'dom')), false);
-        // After hooking into document bubbled up click and keypresses events, we also hook into user handled click & keypresses.
-        ['EventTarget', 'Node'].forEach(function (target) {
-            var proto = global$2[target] && global$2[target].prototype;
-            if (!proto || !proto.hasOwnProperty || !proto.hasOwnProperty('addEventListener')) {
-                return;
-            }
-            fill(proto, 'addEventListener', function (original) {
-                return function (eventName, fn, options) {
-                    if (fn && fn.handleEvent) {
-                        if (eventName === 'click') {
-                            fill(fn, 'handleEvent', function (innerOriginal) {
-                                return function (event) {
-                                    domEventHandler('click', triggerHandlers.bind(null, 'dom'))(event);
-                                    return innerOriginal.call(this, event);
-                                };
-                            });
-                        }
-                        if (eventName === 'keypress') {
-                            fill(fn, 'handleEvent', function (innerOriginal) {
-                                return function (event) {
-                                    keypressEventHandler(triggerHandlers.bind(null, 'dom'))(event);
-                                    return innerOriginal.call(this, event);
-                                };
-                            });
-                        }
-                    }
-                    else {
-                        if (eventName === 'click') {
-                            domEventHandler('click', triggerHandlers.bind(null, 'dom'), true)(this);
-                        }
-                        if (eventName === 'keypress') {
-                            keypressEventHandler(triggerHandlers.bind(null, 'dom'))(this);
-                        }
-                    }
-                    return original.call(this, eventName, fn, options);
-                };
-            });
-            fill(proto, 'removeEventListener', function (original) {
-                return function (eventName, fn, options) {
-                    var callback = fn;
-                    try {
-                        callback = callback && (callback.__sentry_wrapped__ || callback);
-                    }
-                    catch (e) {
-                        // ignore, accessing __sentry_wrapped__ will throw in some Selenium environments
-                    }
-                    return original.call(this, eventName, callback, options);
-                };
-            });
-        });
-    }
-    var debounceDuration = 1000;
-    var debounceTimer = 0;
-    var keypressTimeout;
-    var lastCapturedEvent;
-    /**
-     * Wraps addEventListener to capture UI breadcrumbs
-     * @param name the event name (e.g. "click")
-     * @param handler function that will be triggered
-     * @param debounce decides whether it should wait till another event loop
-     * @returns wrapped breadcrumb events handler
-     * @hidden
-     */
-    function domEventHandler(name, handler, debounce) {
-        if (debounce === void 0) { debounce = false; }
-        return function (event) {
-            // reset keypress timeout; e.g. triggering a 'click' after
-            // a 'keypress' will reset the keypress debounce so that a new
-            // set of keypresses can be recorded
-            keypressTimeout = undefined;
-            // It's possible this handler might trigger multiple times for the same
-            // event (e.g. event propagation through node ancestors). Ignore if we've
-            // already captured the event.
-            if (!event || lastCapturedEvent === event) {
-                return;
-            }
-            lastCapturedEvent = event;
-            if (debounceTimer) {
-                clearTimeout(debounceTimer);
-            }
-            if (debounce) {
-                debounceTimer = setTimeout(function () {
-                    handler({ event: event, name: name });
-                });
-            }
-            else {
-                handler({ event: event, name: name });
-            }
-        };
-    }
-    /**
-     * Wraps addEventListener to capture keypress UI events
-     * @param handler function that will be triggered
-     * @returns wrapped keypress events handler
-     * @hidden
-     */
-    function keypressEventHandler(handler) {
-        // TODO: if somehow user switches keypress target before
-        //       debounce timeout is triggered, we will only capture
-        //       a single breadcrumb from the FIRST target (acceptable?)
-        return function (event) {
-            var target;
-            try {
-                target = event.target;
-            }
-            catch (e) {
-                // just accessing event properties can throw an exception in some rare circumstances
-                // see: https://github.com/getsentry/raven-js/issues/838
-                return;
-            }
-            var tagName = target && target.tagName;
-            // only consider keypress events on actual input elements
-            // this will disregard keypresses targeting body (e.g. tabbing
-            // through elements, hotkeys, etc)
-            if (!tagName || (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && !target.isContentEditable)) {
-                return;
-            }
-            // record first keypress in a series, but ignore subsequent
-            // keypresses until debounce clears
-            if (!keypressTimeout) {
-                domEventHandler('input', handler)(event);
-            }
-            clearTimeout(keypressTimeout);
-            keypressTimeout = setTimeout(function () {
-                keypressTimeout = undefined;
-            }, debounceDuration);
-        };
-    }
-    var _oldOnErrorHandler = null;
-    /** JSDoc */
-    function instrumentError() {
-        _oldOnErrorHandler = global$2.onerror;
-        global$2.onerror = function (msg, url, line, column, error) {
-            triggerHandlers('error', {
-                column: column,
-                error: error,
-                line: line,
-                msg: msg,
-                url: url,
-            });
-            if (_oldOnErrorHandler) {
-                return _oldOnErrorHandler.apply(this, arguments);
-            }
-            return false;
-        };
-    }
-    var _oldOnUnhandledRejectionHandler = null;
-    /** JSDoc */
-    function instrumentUnhandledRejection() {
-        _oldOnUnhandledRejectionHandler = global$2.onunhandledrejection;
-        global$2.onunhandledrejection = function (e) {
-            triggerHandlers('unhandledrejection', e);
-            if (_oldOnUnhandledRejectionHandler) {
-                return _oldOnUnhandledRejectionHandler.apply(this, arguments);
-            }
-            return true;
-        };
-    }
-
-    /** Regular expression used to parse a Dsn. */
-    var DSN_REGEX = /^(?:(\w+):)\/\/(?:(\w+)(?::(\w+))?@)([\w\.-]+)(?::(\d+))?\/(.+)/;
-    /** Error message */
-    var ERROR_MESSAGE = 'Invalid Dsn';
-    /** The Sentry Dsn, identifying a Sentry instance and project. */
-    var Dsn = /** @class */ (function () {
-        /** Creates a new Dsn component */
-        function Dsn(from) {
-            if (typeof from === 'string') {
-                this._fromString(from);
-            }
-            else {
-                this._fromComponents(from);
-            }
-            this._validate();
-        }
-        /**
-         * Renders the string representation of this Dsn.
-         *
-         * By default, this will render the public representation without the password
-         * component. To get the deprecated private representation, set `withPassword`
-         * to true.
-         *
-         * @param withPassword When set to true, the password will be included.
-         */
-        Dsn.prototype.toString = function (withPassword) {
-            if (withPassword === void 0) { withPassword = false; }
-            // tslint:disable-next-line:no-this-assignment
-            var _a = this, host = _a.host, path = _a.path, pass = _a.pass, port = _a.port, projectId = _a.projectId, protocol = _a.protocol, user = _a.user;
-            return (protocol + "://" + user + (withPassword && pass ? ":" + pass : '') +
-                ("@" + host + (port ? ":" + port : '') + "/" + (path ? path + "/" : path) + projectId));
-        };
-        /** Parses a string into this Dsn. */
-        Dsn.prototype._fromString = function (str) {
-            var match = DSN_REGEX.exec(str);
-            if (!match) {
-                throw new SentryError(ERROR_MESSAGE);
-            }
-            var _a = __read(match.slice(1), 6), protocol = _a[0], user = _a[1], _b = _a[2], pass = _b === void 0 ? '' : _b, host = _a[3], _c = _a[4], port = _c === void 0 ? '' : _c, lastPath = _a[5];
-            var path = '';
-            var projectId = lastPath;
-            var split = projectId.split('/');
-            if (split.length > 1) {
-                path = split.slice(0, -1).join('/');
-                projectId = split.pop();
-            }
-            this._fromComponents({ host: host, pass: pass, path: path, projectId: projectId, port: port, protocol: protocol, user: user });
-        };
-        /** Maps Dsn components into this instance. */
-        Dsn.prototype._fromComponents = function (components) {
-            this.protocol = components.protocol;
-            this.user = components.user;
-            this.pass = components.pass || '';
-            this.host = components.host;
-            this.port = components.port || '';
-            this.path = components.path || '';
-            this.projectId = components.projectId;
-        };
-        /** Validates this Dsn and throws on error. */
-        Dsn.prototype._validate = function () {
-            var _this = this;
-            ['protocol', 'user', 'host', 'projectId'].forEach(function (component) {
-                if (!_this[component]) {
-                    throw new SentryError(ERROR_MESSAGE);
-                }
-            });
-            if (this.protocol !== 'http' && this.protocol !== 'https') {
-                throw new SentryError(ERROR_MESSAGE);
-            }
-            if (this.port && isNaN(parseInt(this.port, 10))) {
-                throw new SentryError(ERROR_MESSAGE);
-            }
-        };
-        return Dsn;
-    }());
-
-    /**
-     * Holds additional event information. {@link Scope.applyToEvent} will be
-     * called by the client before an event will be sent.
-     */
-    var Scope = /** @class */ (function () {
-        function Scope() {
-            /** Flag if notifiying is happening. */
-            this._notifyingListeners = false;
-            /** Callback for client to receive scope changes. */
-            this._scopeListeners = [];
-            /** Callback list that will be called after {@link applyToEvent}. */
-            this._eventProcessors = [];
-            /** Array of breadcrumbs. */
-            this._breadcrumbs = [];
-            /** User */
-            this._user = {};
-            /** Tags */
-            this._tags = {};
-            /** Extra */
-            this._extra = {};
-            /** Contexts */
-            this._context = {};
-        }
-        /**
-         * Add internal on change listener. Used for sub SDKs that need to store the scope.
-         * @hidden
-         */
-        Scope.prototype.addScopeListener = function (callback) {
-            this._scopeListeners.push(callback);
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.addEventProcessor = function (callback) {
-            this._eventProcessors.push(callback);
-            return this;
-        };
-        /**
-         * This will be called on every set call.
-         */
-        Scope.prototype._notifyScopeListeners = function () {
-            var _this = this;
-            if (!this._notifyingListeners) {
-                this._notifyingListeners = true;
-                setTimeout(function () {
-                    _this._scopeListeners.forEach(function (callback) {
-                        callback(_this);
-                    });
-                    _this._notifyingListeners = false;
-                });
-            }
-        };
-        /**
-         * This will be called after {@link applyToEvent} is finished.
-         */
-        Scope.prototype._notifyEventProcessors = function (processors, event, hint, index) {
-            var _this = this;
-            if (index === void 0) { index = 0; }
-            return new SyncPromise(function (resolve, reject) {
-                var processor = processors[index];
-                // tslint:disable-next-line:strict-type-predicates
-                if (event === null || typeof processor !== 'function') {
-                    resolve(event);
-                }
-                else {
-                    var result = processor(__assign({}, event), hint);
-                    if (isThenable(result)) {
-                        result
-                            .then(function (final) { return _this._notifyEventProcessors(processors, final, hint, index + 1).then(resolve); })
-                            .then(null, reject);
-                    }
-                    else {
-                        _this._notifyEventProcessors(processors, result, hint, index + 1)
-                            .then(resolve)
-                            .then(null, reject);
-                    }
-                }
-            });
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setUser = function (user) {
-            this._user = user || {};
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setTags = function (tags) {
-            this._tags = __assign({}, this._tags, tags);
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setTag = function (key, value) {
-            var _a;
-            this._tags = __assign({}, this._tags, (_a = {}, _a[key] = value, _a));
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setExtras = function (extras) {
-            this._extra = __assign({}, this._extra, extras);
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setExtra = function (key, extra) {
-            var _a;
-            this._extra = __assign({}, this._extra, (_a = {}, _a[key] = extra, _a));
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setFingerprint = function (fingerprint) {
-            this._fingerprint = fingerprint;
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setLevel = function (level) {
-            this._level = level;
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setTransaction = function (transaction) {
-            this._transaction = transaction;
-            if (this._span) {
-                this._span.transaction = transaction;
-            }
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setContext = function (key, context) {
-            var _a;
-            this._context = __assign({}, this._context, (_a = {}, _a[key] = context, _a));
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.setSpan = function (span) {
-            this._span = span;
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * Internal getter for Span, used in Hub.
-         * @hidden
-         */
-        Scope.prototype.getSpan = function () {
-            return this._span;
-        };
-        /**
-         * Inherit values from the parent scope.
-         * @param scope to clone.
-         */
-        Scope.clone = function (scope) {
-            var newScope = new Scope();
-            if (scope) {
-                newScope._breadcrumbs = __spread(scope._breadcrumbs);
-                newScope._tags = __assign({}, scope._tags);
-                newScope._extra = __assign({}, scope._extra);
-                newScope._context = __assign({}, scope._context);
-                newScope._user = scope._user;
-                newScope._level = scope._level;
-                newScope._span = scope._span;
-                newScope._transaction = scope._transaction;
-                newScope._fingerprint = scope._fingerprint;
-                newScope._eventProcessors = __spread(scope._eventProcessors);
-            }
-            return newScope;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.clear = function () {
-            this._breadcrumbs = [];
-            this._tags = {};
-            this._extra = {};
-            this._user = {};
-            this._context = {};
-            this._level = undefined;
-            this._transaction = undefined;
-            this._fingerprint = undefined;
-            this._span = undefined;
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.addBreadcrumb = function (breadcrumb, maxBreadcrumbs) {
-            var mergedBreadcrumb = __assign({ timestamp: timestampWithMs() }, breadcrumb);
-            this._breadcrumbs =
-                maxBreadcrumbs !== undefined && maxBreadcrumbs >= 0
-                    ? __spread(this._breadcrumbs, [mergedBreadcrumb]).slice(-maxBreadcrumbs)
-                    : __spread(this._breadcrumbs, [mergedBreadcrumb]);
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * @inheritDoc
-         */
-        Scope.prototype.clearBreadcrumbs = function () {
-            this._breadcrumbs = [];
-            this._notifyScopeListeners();
-            return this;
-        };
-        /**
-         * Applies fingerprint from the scope to the event if there's one,
-         * uses message if there's one instead or get rid of empty fingerprint
-         */
-        Scope.prototype._applyFingerprint = function (event) {
-            // Make sure it's an array first and we actually have something in place
-            event.fingerprint = event.fingerprint
-                ? Array.isArray(event.fingerprint)
-                    ? event.fingerprint
-                    : [event.fingerprint]
-                : [];
-            // If we have something on the scope, then merge it with event
-            if (this._fingerprint) {
-                event.fingerprint = event.fingerprint.concat(this._fingerprint);
-            }
-            // If we have no data at all, remove empty array default
-            if (event.fingerprint && !event.fingerprint.length) {
-                delete event.fingerprint;
-            }
-        };
-        /**
-         * Applies the current context and fingerprint to the event.
-         * Note that breadcrumbs will be added by the client.
-         * Also if the event has already breadcrumbs on it, we do not merge them.
-         * @param event Event
-         * @param hint May contain additional informartion about the original exception.
-         * @hidden
-         */
-        Scope.prototype.applyToEvent = function (event, hint) {
-            if (this._extra && Object.keys(this._extra).length) {
-                event.extra = __assign({}, this._extra, event.extra);
-            }
-            if (this._tags && Object.keys(this._tags).length) {
-                event.tags = __assign({}, this._tags, event.tags);
-            }
-            if (this._user && Object.keys(this._user).length) {
-                event.user = __assign({}, this._user, event.user);
-            }
-            if (this._context && Object.keys(this._context).length) {
-                event.contexts = __assign({}, this._context, event.contexts);
-            }
-            if (this._level) {
-                event.level = this._level;
-            }
-            if (this._transaction) {
-                event.transaction = this._transaction;
-            }
-            if (this._span) {
-                event.contexts = __assign({ trace: this._span.getTraceContext() }, event.contexts);
-            }
-            this._applyFingerprint(event);
-            event.breadcrumbs = __spread((event.breadcrumbs || []), this._breadcrumbs);
-            event.breadcrumbs = event.breadcrumbs.length > 0 ? event.breadcrumbs : undefined;
-            return this._notifyEventProcessors(__spread(getGlobalEventProcessors(), this._eventProcessors), event, hint);
-        };
-        return Scope;
-    }());
-    /**
-     * Retruns the global event processors.
-     */
-    function getGlobalEventProcessors() {
-        var global = getGlobalObject();
-        global.__SENTRY__ = global.__SENTRY__ || {};
-        global.__SENTRY__.globalEventProcessors = global.__SENTRY__.globalEventProcessors || [];
-        return global.__SENTRY__.globalEventProcessors;
-    }
-    /**
-     * Add a EventProcessor to be kept globally.
-     * @param callback EventProcessor to add
-     */
-    function addGlobalEventProcessor(callback) {
-        getGlobalEventProcessors().push(callback);
-    }
-
-    /**
-     * API compatibility version of this hub.
-     *
-     * WARNING: This number should only be incresed when the global interface
-     * changes a and new methods are introduced.
-     *
-     * @hidden
-     */
-    var API_VERSION = 3;
-    /**
-     * Default maximum number of breadcrumbs added to an event. Can be overwritten
-     * with {@link Options.maxBreadcrumbs}.
-     */
-    var DEFAULT_BREADCRUMBS = 100;
-    /**
-     * Absolute maximum number of breadcrumbs added to an event. The
-     * `maxBreadcrumbs` option cannot be higher than this value.
-     */
-    var MAX_BREADCRUMBS = 100;
-    /**
-     * @inheritDoc
-     */
-    var Hub = /** @class */ (function () {
-        /**
-         * Creates a new instance of the hub, will push one {@link Layer} into the
-         * internal stack on creation.
-         *
-         * @param client bound to the hub.
-         * @param scope bound to the hub.
-         * @param version number, higher number means higher priority.
-         */
-        function Hub(client, scope, _version) {
-            if (scope === void 0) { scope = new Scope(); }
-            if (_version === void 0) { _version = API_VERSION; }
-            this._version = _version;
-            /** Is a {@link Layer}[] containing the client and scope */
-            this._stack = [];
-            this._stack.push({ client: client, scope: scope });
-        }
-        /**
-         * Internal helper function to call a method on the top client if it exists.
-         *
-         * @param method The method to call on the client.
-         * @param args Arguments to pass to the client function.
-         */
-        Hub.prototype._invokeClient = function (method) {
-            var _a;
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            var top = this.getStackTop();
-            if (top && top.client && top.client[method]) {
-                (_a = top.client)[method].apply(_a, __spread(args, [top.scope]));
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.isOlderThan = function (version) {
-            return this._version < version;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.bindClient = function (client) {
-            var top = this.getStackTop();
-            top.client = client;
-            if (client && client.setupIntegrations) {
-                client.setupIntegrations();
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.pushScope = function () {
-            // We want to clone the content of prev scope
-            var stack = this.getStack();
-            var parentScope = stack.length > 0 ? stack[stack.length - 1].scope : undefined;
-            var scope = Scope.clone(parentScope);
-            this.getStack().push({
-                client: this.getClient(),
-                scope: scope,
-            });
-            return scope;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.popScope = function () {
-            return this.getStack().pop() !== undefined;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.withScope = function (callback) {
-            var scope = this.pushScope();
-            try {
-                callback(scope);
-            }
-            finally {
-                this.popScope();
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.getClient = function () {
-            return this.getStackTop().client;
-        };
-        /** Returns the scope of the top stack. */
-        Hub.prototype.getScope = function () {
-            return this.getStackTop().scope;
-        };
-        /** Returns the scope stack for domains or the process. */
-        Hub.prototype.getStack = function () {
-            return this._stack;
-        };
-        /** Returns the topmost scope layer in the order domain > local > process. */
-        Hub.prototype.getStackTop = function () {
-            return this._stack[this._stack.length - 1];
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.captureException = function (exception, hint) {
-            var eventId = (this._lastEventId = uuid4());
-            var finalHint = hint;
-            // If there's no explicit hint provided, mimick the same thing that would happen
-            // in the minimal itself to create a consistent behavior.
-            // We don't do this in the client, as it's the lowest level API, and doing this,
-            // would prevent user from having full control over direct calls.
-            if (!hint) {
-                var syntheticException = void 0;
-                try {
-                    throw new Error('Sentry syntheticException');
-                }
-                catch (exception) {
-                    syntheticException = exception;
-                }
-                finalHint = {
-                    originalException: exception,
-                    syntheticException: syntheticException,
-                };
-            }
-            this._invokeClient('captureException', exception, __assign({}, finalHint, { event_id: eventId }));
-            return eventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.captureMessage = function (message, level, hint) {
-            var eventId = (this._lastEventId = uuid4());
-            var finalHint = hint;
-            // If there's no explicit hint provided, mimick the same thing that would happen
-            // in the minimal itself to create a consistent behavior.
-            // We don't do this in the client, as it's the lowest level API, and doing this,
-            // would prevent user from having full control over direct calls.
-            if (!hint) {
-                var syntheticException = void 0;
-                try {
-                    throw new Error(message);
-                }
-                catch (exception) {
-                    syntheticException = exception;
-                }
-                finalHint = {
-                    originalException: message,
-                    syntheticException: syntheticException,
-                };
-            }
-            this._invokeClient('captureMessage', message, level, __assign({}, finalHint, { event_id: eventId }));
-            return eventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.captureEvent = function (event, hint) {
-            var eventId = (this._lastEventId = uuid4());
-            this._invokeClient('captureEvent', event, __assign({}, hint, { event_id: eventId }));
-            return eventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.lastEventId = function () {
-            return this._lastEventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.addBreadcrumb = function (breadcrumb, hint) {
-            var top = this.getStackTop();
-            if (!top.scope || !top.client) {
-                return;
-            }
-            var _a = (top.client.getOptions && top.client.getOptions()) || {}, _b = _a.beforeBreadcrumb, beforeBreadcrumb = _b === void 0 ? null : _b, _c = _a.maxBreadcrumbs, maxBreadcrumbs = _c === void 0 ? DEFAULT_BREADCRUMBS : _c;
-            if (maxBreadcrumbs <= 0) {
-                return;
-            }
-            var timestamp = timestampWithMs();
-            var mergedBreadcrumb = __assign({ timestamp: timestamp }, breadcrumb);
-            var finalBreadcrumb = beforeBreadcrumb
-                ? consoleSandbox(function () { return beforeBreadcrumb(mergedBreadcrumb, hint); })
-                : mergedBreadcrumb;
-            if (finalBreadcrumb === null) {
-                return;
-            }
-            top.scope.addBreadcrumb(finalBreadcrumb, Math.min(maxBreadcrumbs, MAX_BREADCRUMBS));
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.setUser = function (user) {
-            var top = this.getStackTop();
-            if (!top.scope) {
-                return;
-            }
-            top.scope.setUser(user);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.setTags = function (tags) {
-            var top = this.getStackTop();
-            if (!top.scope) {
-                return;
-            }
-            top.scope.setTags(tags);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.setExtras = function (extras) {
-            var top = this.getStackTop();
-            if (!top.scope) {
-                return;
-            }
-            top.scope.setExtras(extras);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.setTag = function (key, value) {
-            var top = this.getStackTop();
-            if (!top.scope) {
-                return;
-            }
-            top.scope.setTag(key, value);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.setExtra = function (key, extra) {
-            var top = this.getStackTop();
-            if (!top.scope) {
-                return;
-            }
-            top.scope.setExtra(key, extra);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.setContext = function (name, context) {
-            var top = this.getStackTop();
-            if (!top.scope) {
-                return;
-            }
-            top.scope.setContext(name, context);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.configureScope = function (callback) {
-            var top = this.getStackTop();
-            if (top.scope && top.client) {
-                callback(top.scope);
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.run = function (callback) {
-            var oldHub = makeMain(this);
-            try {
-                callback(this);
-            }
-            finally {
-                makeMain(oldHub);
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.getIntegration = function (integration) {
-            var client = this.getClient();
-            if (!client) {
-                return null;
-            }
-            try {
-                return client.getIntegration(integration);
-            }
-            catch (_oO) {
-                logger.warn("Cannot retrieve integration " + integration.id + " from the current Hub");
-                return null;
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.startSpan = function (spanOrSpanContext, forceNoChild) {
-            if (forceNoChild === void 0) { forceNoChild = false; }
-            return this._callExtensionMethod('startSpan', spanOrSpanContext, forceNoChild);
-        };
-        /**
-         * @inheritDoc
-         */
-        Hub.prototype.traceHeaders = function () {
-            return this._callExtensionMethod('traceHeaders');
-        };
-        /**
-         * Calls global extension method and binding current instance to the function call
-         */
-        // @ts-ignore
-        Hub.prototype._callExtensionMethod = function (method) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            var carrier = getMainCarrier();
-            var sentry = carrier.__SENTRY__;
-            // tslint:disable-next-line: strict-type-predicates
-            if (sentry && sentry.extensions && typeof sentry.extensions[method] === 'function') {
-                return sentry.extensions[method].apply(this, args);
-            }
-            logger.warn("Extension method " + method + " couldn't be found, doing nothing.");
-        };
-        return Hub;
-    }());
-    /** Returns the global shim registry. */
-    function getMainCarrier() {
-        var carrier = getGlobalObject();
-        carrier.__SENTRY__ = carrier.__SENTRY__ || {
-            extensions: {},
-            hub: undefined,
-        };
-        return carrier;
-    }
-    /**
-     * Replaces the current main hub with the passed one on the global object
-     *
-     * @returns The old replaced hub
-     */
-    function makeMain(hub) {
-        var registry = getMainCarrier();
-        var oldHub = getHubFromCarrier(registry);
-        setHubOnCarrier(registry, hub);
-        return oldHub;
-    }
-    /**
-     * Returns the default hub instance.
-     *
-     * If a hub is already registered in the global carrier but this module
-     * contains a more recent version, it replaces the registered version.
-     * Otherwise, the currently registered hub will be returned.
-     */
-    function getCurrentHub() {
-        // Get main carrier (global for every environment)
-        var registry = getMainCarrier();
-        // If there's no hub, or its an old API, assign a new one
-        if (!hasHubOnCarrier(registry) || getHubFromCarrier(registry).isOlderThan(API_VERSION)) {
-            setHubOnCarrier(registry, new Hub());
-        }
-        // Prefer domains over global if they are there (applicable only to Node environment)
-        if (isNodeEnv()) {
-            return getHubFromActiveDomain(registry);
-        }
-        // Return hub that lives on a global object
-        return getHubFromCarrier(registry);
-    }
-    /**
-     * Try to read the hub from an active domain, fallback to the registry if one doesnt exist
-     * @returns discovered hub
-     */
-    function getHubFromActiveDomain(registry) {
-        try {
-            var property = 'domain';
-            var carrier = getMainCarrier();
-            var sentry = carrier.__SENTRY__;
-            // tslint:disable-next-line: strict-type-predicates
-            if (!sentry || !sentry.extensions || !sentry.extensions[property]) {
-                return getHubFromCarrier(registry);
-            }
-            var domain = sentry.extensions[property];
-            var activeDomain = domain.active;
-            // If there no active domain, just return global hub
-            if (!activeDomain) {
-                return getHubFromCarrier(registry);
-            }
-            // If there's no hub on current domain, or its an old API, assign a new one
-            if (!hasHubOnCarrier(activeDomain) || getHubFromCarrier(activeDomain).isOlderThan(API_VERSION)) {
-                var registryHubTopStack = getHubFromCarrier(registry).getStackTop();
-                setHubOnCarrier(activeDomain, new Hub(registryHubTopStack.client, Scope.clone(registryHubTopStack.scope)));
-            }
-            // Return hub that lives on a domain
-            return getHubFromCarrier(activeDomain);
-        }
-        catch (_Oo) {
-            // Return hub that lives on a global object
-            return getHubFromCarrier(registry);
-        }
-    }
-    /**
-     * This will tell whether a carrier has a hub on it or not
-     * @param carrier object
-     */
-    function hasHubOnCarrier(carrier) {
-        if (carrier && carrier.__SENTRY__ && carrier.__SENTRY__.hub) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * This will create a new {@link Hub} and add to the passed object on
-     * __SENTRY__.hub.
-     * @param carrier object
-     * @hidden
-     */
-    function getHubFromCarrier(carrier) {
-        if (carrier && carrier.__SENTRY__ && carrier.__SENTRY__.hub) {
-            return carrier.__SENTRY__.hub;
-        }
-        carrier.__SENTRY__ = carrier.__SENTRY__ || {};
-        carrier.__SENTRY__.hub = new Hub();
-        return carrier.__SENTRY__.hub;
-    }
-    /**
-     * This will set passed {@link Hub} on the passed object's __SENTRY__.hub attribute
-     * @param carrier object
-     * @param hub Hub
-     */
-    function setHubOnCarrier(carrier, hub) {
-        if (!carrier) {
-            return false;
-        }
-        carrier.__SENTRY__ = carrier.__SENTRY__ || {};
-        carrier.__SENTRY__.hub = hub;
-        return true;
-    }
-
-    /**
-     * This calls a function on the current hub.
-     * @param method function to call on hub.
-     * @param args to pass to function.
-     */
-    function callOnHub(method) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        var hub = getCurrentHub();
-        if (hub && hub[method]) {
-            // tslint:disable-next-line:no-unsafe-any
-            return hub[method].apply(hub, __spread(args));
-        }
-        throw new Error("No hub defined or " + method + " was not found on the hub, please open a bug report.");
-    }
-    /**
-     * Captures an exception event and sends it to Sentry.
-     *
-     * @param exception An exception-like object.
-     * @returns The generated eventId.
-     */
-    function captureException(exception) {
-        var syntheticException;
-        try {
-            throw new Error('Sentry syntheticException');
-        }
-        catch (exception) {
-            syntheticException = exception;
-        }
-        return callOnHub('captureException', exception, {
-            originalException: exception,
-            syntheticException: syntheticException,
-        });
-    }
-    /**
-     * Captures a message event and sends it to Sentry.
-     *
-     * @param message The message to send to Sentry.
-     * @param level Define the level of the message.
-     * @returns The generated eventId.
-     */
-    function captureMessage(message, level) {
-        var syntheticException;
-        try {
-            throw new Error(message);
-        }
-        catch (exception) {
-            syntheticException = exception;
-        }
-        return callOnHub('captureMessage', message, level, {
-            originalException: message,
-            syntheticException: syntheticException,
-        });
-    }
-    /**
-     * Captures a manually created event and sends it to Sentry.
-     *
-     * @param event The event to send to Sentry.
-     * @returns The generated eventId.
-     */
-    function captureEvent(event) {
-        return callOnHub('captureEvent', event);
-    }
-    /**
-     * Callback to set context information onto the scope.
-     * @param callback Callback function that receives Scope.
-     */
-    function configureScope(callback) {
-        callOnHub('configureScope', callback);
-    }
-    /**
-     * Records a new breadcrumb which will be attached to future events.
-     *
-     * Breadcrumbs will be added to subsequent events to provide more context on
-     * user's actions prior to an error or crash.
-     *
-     * @param breadcrumb The breadcrumb to record.
-     */
-    function addBreadcrumb(breadcrumb) {
-        callOnHub('addBreadcrumb', breadcrumb);
-    }
-    /**
-     * Sets context data with the given name.
-     * @param name of the context
-     * @param context Any kind of data. This data will be normailzed.
-     */
-    function setContext(name, context) {
-        callOnHub('setContext', name, context);
-    }
-    /**
-     * Set an object that will be merged sent as extra data with the event.
-     * @param extras Extras object to merge into current context.
-     */
-    function setExtras(extras) {
-        callOnHub('setExtras', extras);
-    }
-    /**
-     * Set an object that will be merged sent as tags data with the event.
-     * @param tags Tags context object to merge into current context.
-     */
-    function setTags(tags) {
-        callOnHub('setTags', tags);
-    }
-    /**
-     * Set key:value that will be sent as extra data with the event.
-     * @param key String of extra
-     * @param extra Any kind of data. This data will be normailzed.
-     */
-    function setExtra(key, extra) {
-        callOnHub('setExtra', key, extra);
-    }
-    /**
-     * Set key:value that will be sent as tags data with the event.
-     * @param key String key of tag
-     * @param value String value of tag
-     */
-    function setTag(key, value) {
-        callOnHub('setTag', key, value);
-    }
-    /**
-     * Updates user context information for future events.
-     *
-     * @param user User context object to be set in the current context. Pass `null` to unset the user.
-     */
-    function setUser(user) {
-        callOnHub('setUser', user);
-    }
-    /**
-     * Creates a new scope with and executes the given operation within.
-     * The scope is automatically removed once the operation
-     * finishes or throws.
-     *
-     * This is essentially a convenience function for:
-     *
-     *     pushScope();
-     *     callback();
-     *     popScope();
-     *
-     * @param callback that will be enclosed into push/popScope.
-     */
-    function withScope(callback) {
-        callOnHub('withScope', callback);
-    }
-
-    var SENTRY_API_VERSION = '7';
-    /** Helper class to provide urls to different Sentry endpoints. */
-    var API = /** @class */ (function () {
-        /** Create a new instance of API */
-        function API(dsn) {
-            this.dsn = dsn;
-            this._dsnObject = new Dsn(dsn);
-        }
-        /** Returns the Dsn object. */
-        API.prototype.getDsn = function () {
-            return this._dsnObject;
-        };
-        /** Returns a string with auth headers in the url to the store endpoint. */
-        API.prototype.getStoreEndpoint = function () {
-            return "" + this._getBaseUrl() + this.getStoreEndpointPath();
-        };
-        /** Returns the store endpoint with auth added in url encoded. */
-        API.prototype.getStoreEndpointWithUrlEncodedAuth = function () {
-            var dsn = this._dsnObject;
-            var auth = {
-                sentry_key: dsn.user,
-                sentry_version: SENTRY_API_VERSION,
-            };
-            // Auth is intentionally sent as part of query string (NOT as custom HTTP header)
-            // to avoid preflight CORS requests
-            return this.getStoreEndpoint() + "?" + urlEncode(auth);
-        };
-        /** Returns the base path of the url including the port. */
-        API.prototype._getBaseUrl = function () {
-            var dsn = this._dsnObject;
-            var protocol = dsn.protocol ? dsn.protocol + ":" : '';
-            var port = dsn.port ? ":" + dsn.port : '';
-            return protocol + "//" + dsn.host + port;
-        };
-        /** Returns only the path component for the store endpoint. */
-        API.prototype.getStoreEndpointPath = function () {
-            var dsn = this._dsnObject;
-            return (dsn.path ? "/" + dsn.path : '') + "/api/" + dsn.projectId + "/store/";
-        };
-        /** Returns an object that can be used in request headers. */
-        API.prototype.getRequestHeaders = function (clientName, clientVersion) {
-            var dsn = this._dsnObject;
-            var header = ["Sentry sentry_version=" + SENTRY_API_VERSION];
-            header.push("sentry_client=" + clientName + "/" + clientVersion);
-            header.push("sentry_key=" + dsn.user);
-            if (dsn.pass) {
-                header.push("sentry_secret=" + dsn.pass);
-            }
-            return {
-                'Content-Type': 'application/json',
-                'X-Sentry-Auth': header.join(', '),
-            };
-        };
-        /** Returns the url to the report dialog endpoint. */
-        API.prototype.getReportDialogEndpoint = function (dialogOptions) {
-            if (dialogOptions === void 0) { dialogOptions = {}; }
-            var dsn = this._dsnObject;
-            var endpoint = "" + this._getBaseUrl() + (dsn.path ? "/" + dsn.path : '') + "/api/embed/error-page/";
-            var encodedOptions = [];
-            encodedOptions.push("dsn=" + dsn.toString());
-            for (var key in dialogOptions) {
-                if (key === 'user') {
-                    if (!dialogOptions.user) {
-                        continue;
-                    }
-                    if (dialogOptions.user.name) {
-                        encodedOptions.push("name=" + encodeURIComponent(dialogOptions.user.name));
-                    }
-                    if (dialogOptions.user.email) {
-                        encodedOptions.push("email=" + encodeURIComponent(dialogOptions.user.email));
-                    }
-                }
-                else {
-                    encodedOptions.push(encodeURIComponent(key) + "=" + encodeURIComponent(dialogOptions[key]));
-                }
-            }
-            if (encodedOptions.length) {
-                return endpoint + "?" + encodedOptions.join('&');
-            }
-            return endpoint;
-        };
-        return API;
-    }());
-
-    var installedIntegrations = [];
-    /** Gets integration to install */
-    function getIntegrationsToSetup(options) {
-        var defaultIntegrations = (options.defaultIntegrations && __spread(options.defaultIntegrations)) || [];
-        var userIntegrations = options.integrations;
-        var integrations = [];
-        if (Array.isArray(userIntegrations)) {
-            var userIntegrationsNames_1 = userIntegrations.map(function (i) { return i.name; });
-            var pickedIntegrationsNames_1 = [];
-            // Leave only unique default integrations, that were not overridden with provided user integrations
-            defaultIntegrations.forEach(function (defaultIntegration) {
-                if (userIntegrationsNames_1.indexOf(defaultIntegration.name) === -1 &&
-                    pickedIntegrationsNames_1.indexOf(defaultIntegration.name) === -1) {
-                    integrations.push(defaultIntegration);
-                    pickedIntegrationsNames_1.push(defaultIntegration.name);
-                }
-            });
-            // Don't add same user integration twice
-            userIntegrations.forEach(function (userIntegration) {
-                if (pickedIntegrationsNames_1.indexOf(userIntegration.name) === -1) {
-                    integrations.push(userIntegration);
-                    pickedIntegrationsNames_1.push(userIntegration.name);
-                }
-            });
-        }
-        else if (typeof userIntegrations === 'function') {
-            integrations = userIntegrations(defaultIntegrations);
-            integrations = Array.isArray(integrations) ? integrations : [integrations];
-        }
-        else {
-            integrations = __spread(defaultIntegrations);
-        }
-        // Make sure that if present, `Debug` integration will always run last
-        var integrationsNames = integrations.map(function (i) { return i.name; });
-        var alwaysLastToRun = 'Debug';
-        if (integrationsNames.indexOf(alwaysLastToRun) !== -1) {
-            integrations.push.apply(integrations, __spread(integrations.splice(integrationsNames.indexOf(alwaysLastToRun), 1)));
-        }
-        return integrations;
-    }
-    /** Setup given integration */
-    function setupIntegration(integration) {
-        if (installedIntegrations.indexOf(integration.name) !== -1) {
-            return;
-        }
-        integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-        installedIntegrations.push(integration.name);
-        logger.log("Integration installed: " + integration.name);
-    }
-    /**
-     * Given a list of integration instances this installs them all. When `withDefaults` is set to `true` then all default
-     * integrations are added unless they were already provided before.
-     * @param integrations array of integration instances
-     * @param withDefault should enable default integrations
-     */
-    function setupIntegrations(options) {
-        var integrations = {};
-        getIntegrationsToSetup(options).forEach(function (integration) {
-            integrations[integration.name] = integration;
-            setupIntegration(integration);
-        });
-        return integrations;
-    }
-
-    /**
-     * Base implementation for all JavaScript SDK clients.
-     *
-     * Call the constructor with the corresponding backend constructor and options
-     * specific to the client subclass. To access these options later, use
-     * {@link Client.getOptions}. Also, the Backend instance is available via
-     * {@link Client.getBackend}.
-     *
-     * If a Dsn is specified in the options, it will be parsed and stored. Use
-     * {@link Client.getDsn} to retrieve the Dsn at any moment. In case the Dsn is
-     * invalid, the constructor will throw a {@link SentryException}. Note that
-     * without a valid Dsn, the SDK will not send any events to Sentry.
-     *
-     * Before sending an event via the backend, it is passed through
-     * {@link BaseClient.prepareEvent} to add SDK information and scope data
-     * (breadcrumbs and context). To add more custom information, override this
-     * method and extend the resulting prepared event.
-     *
-     * To issue automatically created events (e.g. via instrumentation), use
-     * {@link Client.captureEvent}. It will prepare the event and pass it through
-     * the callback lifecycle. To issue auto-breadcrumbs, use
-     * {@link Client.addBreadcrumb}.
-     *
-     * @example
-     * class NodeClient extends BaseClient<NodeBackend, NodeOptions> {
-     *   public constructor(options: NodeOptions) {
-     *     super(NodeBackend, options);
-     *   }
-     *
-     *   // ...
-     * }
-     */
-    var BaseClient = /** @class */ (function () {
-        /**
-         * Initializes this client instance.
-         *
-         * @param backendClass A constructor function to create the backend.
-         * @param options Options for the client.
-         */
-        function BaseClient(backendClass, options) {
-            /** Array of used integrations. */
-            this._integrations = {};
-            /** Is the client still processing a call? */
-            this._processing = false;
-            this._backend = new backendClass(options);
-            this._options = options;
-            if (options.dsn) {
-                this._dsn = new Dsn(options.dsn);
-            }
-        }
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.captureException = function (exception, hint, scope) {
-            var _this = this;
-            var eventId = hint && hint.event_id;
-            this._processing = true;
-            this._getBackend()
-                .eventFromException(exception, hint)
-                .then(function (event) { return _this._processEvent(event, hint, scope); })
-                .then(function (finalEvent) {
-                // We need to check for finalEvent in case beforeSend returned null
-                eventId = finalEvent && finalEvent.event_id;
-                _this._processing = false;
-            })
-                .then(null, function (reason) {
-                logger.error(reason);
-                _this._processing = false;
-            });
-            return eventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.captureMessage = function (message, level, hint, scope) {
-            var _this = this;
-            var eventId = hint && hint.event_id;
-            this._processing = true;
-            var promisedEvent = isPrimitive(message)
-                ? this._getBackend().eventFromMessage("" + message, level, hint)
-                : this._getBackend().eventFromException(message, hint);
-            promisedEvent
-                .then(function (event) { return _this._processEvent(event, hint, scope); })
-                .then(function (finalEvent) {
-                // We need to check for finalEvent in case beforeSend returned null
-                eventId = finalEvent && finalEvent.event_id;
-                _this._processing = false;
-            })
-                .then(null, function (reason) {
-                logger.error(reason);
-                _this._processing = false;
-            });
-            return eventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.captureEvent = function (event, hint, scope) {
-            var _this = this;
-            var eventId = hint && hint.event_id;
-            this._processing = true;
-            this._processEvent(event, hint, scope)
-                .then(function (finalEvent) {
-                // We need to check for finalEvent in case beforeSend returned null
-                eventId = finalEvent && finalEvent.event_id;
-                _this._processing = false;
-            })
-                .then(null, function (reason) {
-                logger.error(reason);
-                _this._processing = false;
-            });
-            return eventId;
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.getDsn = function () {
-            return this._dsn;
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.getOptions = function () {
-            return this._options;
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.flush = function (timeout) {
-            var _this = this;
-            return this._isClientProcessing(timeout).then(function (status) {
-                clearInterval(status.interval);
-                return _this._getBackend()
-                    .getTransport()
-                    .close(timeout)
-                    .then(function (transportFlushed) { return status.ready && transportFlushed; });
-            });
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.close = function (timeout) {
-            var _this = this;
-            return this.flush(timeout).then(function (result) {
-                _this.getOptions().enabled = false;
-                return result;
-            });
-        };
-        /**
-         * Sets up the integrations
-         */
-        BaseClient.prototype.setupIntegrations = function () {
-            if (this._isEnabled()) {
-                this._integrations = setupIntegrations(this._options);
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseClient.prototype.getIntegration = function (integration) {
-            try {
-                return this._integrations[integration.id] || null;
-            }
-            catch (_oO) {
-                logger.warn("Cannot retrieve integration " + integration.id + " from the current Client");
-                return null;
-            }
-        };
-        /** Waits for the client to be done with processing. */
-        BaseClient.prototype._isClientProcessing = function (timeout) {
-            var _this = this;
-            return new SyncPromise(function (resolve) {
-                var ticked = 0;
-                var tick = 1;
-                var interval = 0;
-                clearInterval(interval);
-                interval = setInterval(function () {
-                    if (!_this._processing) {
-                        resolve({
-                            interval: interval,
-                            ready: true,
-                        });
-                    }
-                    else {
-                        ticked += tick;
-                        if (timeout && ticked >= timeout) {
-                            resolve({
-                                interval: interval,
-                                ready: false,
-                            });
-                        }
-                    }
-                }, tick);
-            });
-        };
-        /** Returns the current backend. */
-        BaseClient.prototype._getBackend = function () {
-            return this._backend;
-        };
-        /** Determines whether this SDK is enabled and a valid Dsn is present. */
-        BaseClient.prototype._isEnabled = function () {
-            return this.getOptions().enabled !== false && this._dsn !== undefined;
-        };
-        /**
-         * Adds common information to events.
-         *
-         * The information includes release and environment from `options`,
-         * breadcrumbs and context (extra, tags and user) from the scope.
-         *
-         * Information that is already present in the event is never overwritten. For
-         * nested objects, such as the context, keys are merged.
-         *
-         * @param event The original event.
-         * @param hint May contain additional informartion about the original exception.
-         * @param scope A scope containing event metadata.
-         * @returns A new event with more information.
-         */
-        BaseClient.prototype._prepareEvent = function (event, scope, hint) {
-            var _this = this;
-            var _a = this.getOptions(), environment = _a.environment, release = _a.release, dist = _a.dist, _b = _a.maxValueLength, maxValueLength = _b === void 0 ? 250 : _b, _c = _a.normalizeDepth, normalizeDepth = _c === void 0 ? 3 : _c;
-            var prepared = __assign({}, event);
-            if (prepared.environment === undefined && environment !== undefined) {
-                prepared.environment = environment;
-            }
-            if (prepared.release === undefined && release !== undefined) {
-                prepared.release = release;
-            }
-            if (prepared.dist === undefined && dist !== undefined) {
-                prepared.dist = dist;
-            }
-            if (prepared.message) {
-                prepared.message = truncate(prepared.message, maxValueLength);
-            }
-            var exception = prepared.exception && prepared.exception.values && prepared.exception.values[0];
-            if (exception && exception.value) {
-                exception.value = truncate(exception.value, maxValueLength);
-            }
-            var request = prepared.request;
-            if (request && request.url) {
-                request.url = truncate(request.url, maxValueLength);
-            }
-            if (prepared.event_id === undefined) {
-                prepared.event_id = hint && hint.event_id ? hint.event_id : uuid4();
-            }
-            this._addIntegrations(prepared.sdk);
-            // We prepare the result here with a resolved Event.
-            var result = SyncPromise.resolve(prepared);
-            // This should be the last thing called, since we want that
-            // {@link Hub.addEventProcessor} gets the finished prepared event.
-            if (scope) {
-                // In case we have a hub we reassign it.
-                result = scope.applyToEvent(prepared, hint);
-            }
-            return result.then(function (evt) {
-                // tslint:disable-next-line:strict-type-predicates
-                if (typeof normalizeDepth === 'number' && normalizeDepth > 0) {
-                    return _this._normalizeEvent(evt, normalizeDepth);
-                }
-                return evt;
-            });
-        };
-        /**
-         * Applies `normalize` function on necessary `Event` attributes to make them safe for serialization.
-         * Normalized keys:
-         * - `breadcrumbs.data`
-         * - `user`
-         * - `contexts`
-         * - `extra`
-         * @param event Event
-         * @returns Normalized event
-         */
-        BaseClient.prototype._normalizeEvent = function (event, depth) {
-            if (!event) {
-                return null;
-            }
-            // tslint:disable:no-unsafe-any
-            return __assign({}, event, (event.breadcrumbs && {
-                breadcrumbs: event.breadcrumbs.map(function (b) { return (__assign({}, b, (b.data && {
-                    data: normalize(b.data, depth),
-                }))); }),
-            }), (event.user && {
-                user: normalize(event.user, depth),
-            }), (event.contexts && {
-                contexts: normalize(event.contexts, depth),
-            }), (event.extra && {
-                extra: normalize(event.extra, depth),
-            }));
-        };
-        /**
-         * This function adds all used integrations to the SDK info in the event.
-         * @param sdkInfo The sdkInfo of the event that will be filled with all integrations.
-         */
-        BaseClient.prototype._addIntegrations = function (sdkInfo) {
-            var integrationsArray = Object.keys(this._integrations);
-            if (sdkInfo && integrationsArray.length > 0) {
-                sdkInfo.integrations = integrationsArray;
-            }
-        };
-        /**
-         * Processes an event (either error or message) and sends it to Sentry.
-         *
-         * This also adds breadcrumbs and context information to the event. However,
-         * platform specific meta data (such as the User's IP address) must be added
-         * by the SDK implementor.
-         *
-         *
-         * @param event The event to send to Sentry.
-         * @param hint May contain additional informartion about the original exception.
-         * @param scope A scope containing event metadata.
-         * @returns A SyncPromise that resolves with the event or rejects in case event was/will not be send.
-         */
-        BaseClient.prototype._processEvent = function (event, hint, scope) {
-            var _this = this;
-            var _a = this.getOptions(), beforeSend = _a.beforeSend, sampleRate = _a.sampleRate;
-            if (!this._isEnabled()) {
-                return SyncPromise.reject('SDK not enabled, will not send event.');
-            }
-            // 1.0 === 100% events are sent
-            // 0.0 === 0% events are sent
-            if (typeof sampleRate === 'number' && Math.random() > sampleRate) {
-                return SyncPromise.reject('This event has been sampled, will not send event.');
-            }
-            return new SyncPromise(function (resolve, reject) {
-                _this._prepareEvent(event, scope, hint)
-                    .then(function (prepared) {
-                    if (prepared === null) {
-                        reject('An event processor returned null, will not send event.');
-                        return;
-                    }
-                    var finalEvent = prepared;
-                    var isInternalException = hint && hint.data && hint.data.__sentry__ === true;
-                    if (isInternalException || !beforeSend) {
-                        _this._getBackend().sendEvent(finalEvent);
-                        resolve(finalEvent);
-                        return;
-                    }
-                    var beforeSendResult = beforeSend(prepared, hint);
-                    // tslint:disable-next-line:strict-type-predicates
-                    if (typeof beforeSendResult === 'undefined') {
-                        logger.error('`beforeSend` method has to return `null` or a valid event.');
-                    }
-                    else if (isThenable(beforeSendResult)) {
-                        _this._handleAsyncBeforeSend(beforeSendResult, resolve, reject);
-                    }
-                    else {
-                        finalEvent = beforeSendResult;
-                        if (finalEvent === null) {
-                            logger.log('`beforeSend` returned `null`, will not send event.');
-                            resolve(null);
-                            return;
-                        }
-                        // From here on we are really async
-                        _this._getBackend().sendEvent(finalEvent);
-                        resolve(finalEvent);
-                    }
-                })
-                    .then(null, function (reason) {
-                    _this.captureException(reason, {
-                        data: {
-                            __sentry__: true,
-                        },
-                        originalException: reason,
-                    });
-                    reject("Event processing pipeline threw an error, original event will not be sent. Details have been sent as a new event.\nReason: " + reason);
-                });
-            });
-        };
-        /**
-         * Resolves before send Promise and calls resolve/reject on parent SyncPromise.
-         */
-        BaseClient.prototype._handleAsyncBeforeSend = function (beforeSend, resolve, reject) {
-            var _this = this;
-            beforeSend
-                .then(function (processedEvent) {
-                if (processedEvent === null) {
-                    reject('`beforeSend` returned `null`, will not send event.');
-                    return;
-                }
-                // From here on we are really async
-                _this._getBackend().sendEvent(processedEvent);
-                resolve(processedEvent);
-            })
-                .then(null, function (e) {
-                reject("beforeSend rejected with " + e);
-            });
-        };
-        return BaseClient;
-    }());
-
-    /** Noop transport */
-    var NoopTransport = /** @class */ (function () {
-        function NoopTransport() {
-        }
-        /**
-         * @inheritDoc
-         */
-        NoopTransport.prototype.sendEvent = function (_) {
-            return SyncPromise.resolve({
-                reason: "NoopTransport: Event has been skipped because no Dsn is configured.",
-                status: exports.Status.Skipped,
-            });
-        };
-        /**
-         * @inheritDoc
-         */
-        NoopTransport.prototype.close = function (_) {
-            return SyncPromise.resolve(true);
-        };
-        return NoopTransport;
-    }());
-
-    /**
-     * This is the base implemention of a Backend.
-     * @hidden
-     */
-    var BaseBackend = /** @class */ (function () {
-        /** Creates a new backend instance. */
-        function BaseBackend(options) {
-            this._options = options;
-            if (!this._options.dsn) {
-                logger.warn('No DSN provided, backend will not do anything.');
-            }
-            this._transport = this._setupTransport();
-        }
-        /**
-         * Sets up the transport so it can be used later to send requests.
-         */
-        BaseBackend.prototype._setupTransport = function () {
-            return new NoopTransport();
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseBackend.prototype.eventFromException = function (_exception, _hint) {
-            throw new SentryError('Backend has to implement `eventFromException` method');
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseBackend.prototype.eventFromMessage = function (_message, _level, _hint) {
-            throw new SentryError('Backend has to implement `eventFromMessage` method');
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseBackend.prototype.sendEvent = function (event) {
-            this._transport.sendEvent(event).then(null, function (reason) {
-                logger.error("Error while sending event: " + reason);
-            });
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseBackend.prototype.getTransport = function () {
-            return this._transport;
-        };
-        return BaseBackend;
-    }());
-
-    /**
-     * Internal function to create a new SDK client instance. The client is
-     * installed and then bound to the current scope.
-     *
-     * @param clientClass The client class to instanciate.
-     * @param options Options to pass to the client.
-     */
-    function initAndBind(clientClass, options) {
-        if (options.debug === true) {
-            logger.enable();
-        }
-        var hub = getCurrentHub();
-        var client = new clientClass(options);
-        hub.bindClient(client);
-    }
-
-    var originalFunctionToString;
-    /** Patch toString calls to return proper name for wrapped functions */
-    var FunctionToString = /** @class */ (function () {
-        function FunctionToString() {
-            /**
-             * @inheritDoc
-             */
-            this.name = FunctionToString.id;
-        }
-        /**
-         * @inheritDoc
-         */
-        FunctionToString.prototype.setupOnce = function () {
-            originalFunctionToString = Function.prototype.toString;
-            Function.prototype.toString = function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var context = this.__sentry_original__ || this;
-                // tslint:disable-next-line:no-unsafe-any
-                return originalFunctionToString.apply(context, args);
-            };
-        };
-        /**
-         * @inheritDoc
-         */
-        FunctionToString.id = 'FunctionToString';
-        return FunctionToString;
-    }());
-
-    // "Script error." is hard coded into browsers for errors that it can't read.
-    // this is the result of a script being pulled in from an external domain and CORS.
-    var DEFAULT_IGNORE_ERRORS = [/^Script error\.?$/, /^Javascript error: Script error\.? on line 0$/];
-    /** Inbound filters configurable by the user */
-    var InboundFilters = /** @class */ (function () {
-        function InboundFilters(_options) {
-            if (_options === void 0) { _options = {}; }
-            this._options = _options;
-            /**
-             * @inheritDoc
-             */
-            this.name = InboundFilters.id;
-        }
-        /**
-         * @inheritDoc
-         */
-        InboundFilters.prototype.setupOnce = function () {
-            addGlobalEventProcessor(function (event) {
-                var hub = getCurrentHub();
-                if (!hub) {
-                    return event;
-                }
-                var self = hub.getIntegration(InboundFilters);
-                if (self) {
-                    var client = hub.getClient();
-                    var clientOptions = client ? client.getOptions() : {};
-                    var options = self._mergeOptions(clientOptions);
-                    if (self._shouldDropEvent(event, options)) {
-                        return null;
-                    }
-                }
-                return event;
-            });
-        };
-        /** JSDoc */
-        InboundFilters.prototype._shouldDropEvent = function (event, options) {
-            if (this._isSentryError(event, options)) {
-                logger.warn("Event dropped due to being internal Sentry Error.\nEvent: " + getEventDescription(event));
-                return true;
-            }
-            if (this._isIgnoredError(event, options)) {
-                logger.warn("Event dropped due to being matched by `ignoreErrors` option.\nEvent: " + getEventDescription(event));
-                return true;
-            }
-            if (this._isBlacklistedUrl(event, options)) {
-                logger.warn("Event dropped due to being matched by `blacklistUrls` option.\nEvent: " + getEventDescription(event) + ".\nUrl: " + this._getEventFilterUrl(event));
-                return true;
-            }
-            if (!this._isWhitelistedUrl(event, options)) {
-                logger.warn("Event dropped due to not being matched by `whitelistUrls` option.\nEvent: " + getEventDescription(event) + ".\nUrl: " + this._getEventFilterUrl(event));
-                return true;
-            }
-            return false;
-        };
-        /** JSDoc */
-        InboundFilters.prototype._isSentryError = function (event, options) {
-            if (options === void 0) { options = {}; }
-            if (!options.ignoreInternal) {
-                return false;
-            }
-            try {
-                return ((event &&
-                    event.exception &&
-                    event.exception.values &&
-                    event.exception.values[0] &&
-                    event.exception.values[0].type === 'SentryError') ||
-                    false);
-            }
-            catch (_oO) {
-                return false;
-            }
-        };
-        /** JSDoc */
-        InboundFilters.prototype._isIgnoredError = function (event, options) {
-            if (options === void 0) { options = {}; }
-            if (!options.ignoreErrors || !options.ignoreErrors.length) {
-                return false;
-            }
-            return this._getPossibleEventMessages(event).some(function (message) {
-                // Not sure why TypeScript complains here...
-                return options.ignoreErrors.some(function (pattern) { return isMatchingPattern(message, pattern); });
-            });
-        };
-        /** JSDoc */
-        InboundFilters.prototype._isBlacklistedUrl = function (event, options) {
-            if (options === void 0) { options = {}; }
-            // TODO: Use Glob instead?
-            if (!options.blacklistUrls || !options.blacklistUrls.length) {
-                return false;
-            }
-            var url = this._getEventFilterUrl(event);
-            return !url ? false : options.blacklistUrls.some(function (pattern) { return isMatchingPattern(url, pattern); });
-        };
-        /** JSDoc */
-        InboundFilters.prototype._isWhitelistedUrl = function (event, options) {
-            if (options === void 0) { options = {}; }
-            // TODO: Use Glob instead?
-            if (!options.whitelistUrls || !options.whitelistUrls.length) {
-                return true;
-            }
-            var url = this._getEventFilterUrl(event);
-            return !url ? true : options.whitelistUrls.some(function (pattern) { return isMatchingPattern(url, pattern); });
-        };
-        /** JSDoc */
-        InboundFilters.prototype._mergeOptions = function (clientOptions) {
-            if (clientOptions === void 0) { clientOptions = {}; }
-            return {
-                blacklistUrls: __spread((this._options.blacklistUrls || []), (clientOptions.blacklistUrls || [])),
-                ignoreErrors: __spread((this._options.ignoreErrors || []), (clientOptions.ignoreErrors || []), DEFAULT_IGNORE_ERRORS),
-                ignoreInternal: typeof this._options.ignoreInternal !== 'undefined' ? this._options.ignoreInternal : true,
-                whitelistUrls: __spread((this._options.whitelistUrls || []), (clientOptions.whitelistUrls || [])),
-            };
-        };
-        /** JSDoc */
-        InboundFilters.prototype._getPossibleEventMessages = function (event) {
-            if (event.message) {
-                return [event.message];
-            }
-            if (event.exception) {
-                try {
-                    var _a = (event.exception.values && event.exception.values[0]) || {}, _b = _a.type, type = _b === void 0 ? '' : _b, _c = _a.value, value = _c === void 0 ? '' : _c;
-                    return ["" + value, type + ": " + value];
-                }
-                catch (oO) {
-                    logger.error("Cannot extract message for event " + getEventDescription(event));
-                    return [];
-                }
-            }
-            return [];
-        };
-        /** JSDoc */
-        InboundFilters.prototype._getEventFilterUrl = function (event) {
-            try {
-                if (event.stacktrace) {
-                    var frames_1 = event.stacktrace.frames;
-                    return (frames_1 && frames_1[frames_1.length - 1].filename) || null;
-                }
-                if (event.exception) {
-                    var frames_2 = event.exception.values && event.exception.values[0].stacktrace && event.exception.values[0].stacktrace.frames;
-                    return (frames_2 && frames_2[frames_2.length - 1].filename) || null;
-                }
-                return null;
-            }
-            catch (oO) {
-                logger.error("Cannot extract url for event " + getEventDescription(event));
-                return null;
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        InboundFilters.id = 'InboundFilters';
-        return InboundFilters;
-    }());
-
-
-
-    var CoreIntegrations = /*#__PURE__*/Object.freeze({
-        FunctionToString: FunctionToString,
-        InboundFilters: InboundFilters
-    });
-
-    // tslint:disable:object-literal-sort-keys
-    // global reference to slice
-    var UNKNOWN_FUNCTION = '?';
-    // Chromium based browsers: Chrome, Brave, new Opera, new Edge
-    var chrome = /^\s*at (?:(.*?) ?\()?((?:file|https?|blob|chrome-extension|address|native|eval|webpack|<anonymous>|[-a-z]+:|.*bundle|\/).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i;
-    // gecko regex: `(?:bundle|\d+\.js)`: `bundle` is for react native, `\d+\.js` also but specifically for ram bundles because it
-    // generates filenames without a prefix like `file://` the filenames in the stacktrace are just 42.js
-    // We need this specific case for now because we want no other regex to match.
-    var gecko = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i;
-    var winjs = /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i;
-    var geckoEval = /(\S+) line (\d+)(?: > eval line \d+)* > eval/i;
-    var chromeEval = /\((\S*)(?::(\d+))(?::(\d+))\)/;
-    /** JSDoc */
-    function computeStackTrace(ex) {
-        // tslint:disable:no-unsafe-any
-        var stack = null;
-        var popSize = ex && ex.framesToPop;
-        try {
-            // This must be tried first because Opera 10 *destroys*
-            // its stacktrace property if you try to access the stack
-            // property first!!
-            stack = computeStackTraceFromStacktraceProp(ex);
-            if (stack) {
-                return popFrames(stack, popSize);
-            }
-        }
-        catch (e) {
-            // no-empty
-        }
-        try {
-            stack = computeStackTraceFromStackProp(ex);
-            if (stack) {
-                return popFrames(stack, popSize);
-            }
-        }
-        catch (e) {
-            // no-empty
-        }
-        return {
-            message: extractMessage(ex),
-            name: ex && ex.name,
-            stack: [],
-            failed: true,
-        };
-    }
-    /** JSDoc */
-    // tslint:disable-next-line:cyclomatic-complexity
-    function computeStackTraceFromStackProp(ex) {
-        // tslint:disable:no-conditional-assignment
-        if (!ex || !ex.stack) {
-            return null;
-        }
-        var stack = [];
-        var lines = ex.stack.split('\n');
-        var isEval;
-        var submatch;
-        var parts;
-        var element;
-        for (var i = 0; i < lines.length; ++i) {
-            if ((parts = chrome.exec(lines[i]))) {
-                var isNative = parts[2] && parts[2].indexOf('native') === 0; // start of line
-                isEval = parts[2] && parts[2].indexOf('eval') === 0; // start of line
-                if (isEval && (submatch = chromeEval.exec(parts[2]))) {
-                    // throw out eval line/column and use top-most line/column number
-                    parts[2] = submatch[1]; // url
-                    parts[3] = submatch[2]; // line
-                    parts[4] = submatch[3]; // column
-                }
-                element = {
-                    // working with the regexp above is super painful. it is quite a hack, but just stripping the `address at `
-                    // prefix here seems like the quickest solution for now.
-                    url: parts[2] && parts[2].indexOf('address at ') === 0 ? parts[2].substr('address at '.length) : parts[2],
-                    func: parts[1] || UNKNOWN_FUNCTION,
-                    args: isNative ? [parts[2]] : [],
-                    line: parts[3] ? +parts[3] : null,
-                    column: parts[4] ? +parts[4] : null,
-                };
-            }
-            else if ((parts = winjs.exec(lines[i]))) {
-                element = {
-                    url: parts[2],
-                    func: parts[1] || UNKNOWN_FUNCTION,
-                    args: [],
-                    line: +parts[3],
-                    column: parts[4] ? +parts[4] : null,
-                };
-            }
-            else if ((parts = gecko.exec(lines[i]))) {
-                isEval = parts[3] && parts[3].indexOf(' > eval') > -1;
-                if (isEval && (submatch = geckoEval.exec(parts[3]))) {
-                    // throw out eval line/column and use top-most line number
-                    parts[1] = parts[1] || "eval";
-                    parts[3] = submatch[1];
-                    parts[4] = submatch[2];
-                    parts[5] = ''; // no column when eval
-                }
-                else if (i === 0 && !parts[5] && ex.columnNumber !== void 0) {
-                    // FireFox uses this awesome columnNumber property for its top frame
-                    // Also note, Firefox's column number is 0-based and everything else expects 1-based,
-                    // so adding 1
-                    // NOTE: this hack doesn't work if top-most frame is eval
-                    stack[0].column = ex.columnNumber + 1;
-                }
-                element = {
-                    url: parts[3],
-                    func: parts[1] || UNKNOWN_FUNCTION,
-                    args: parts[2] ? parts[2].split(',') : [],
-                    line: parts[4] ? +parts[4] : null,
-                    column: parts[5] ? +parts[5] : null,
-                };
-            }
-            else {
-                continue;
-            }
-            if (!element.func && element.line) {
-                element.func = UNKNOWN_FUNCTION;
-            }
-            stack.push(element);
-        }
-        if (!stack.length) {
-            return null;
-        }
-        return {
-            message: extractMessage(ex),
-            name: ex.name,
-            stack: stack,
-        };
-    }
-    /** JSDoc */
-    function computeStackTraceFromStacktraceProp(ex) {
-        if (!ex || !ex.stacktrace) {
-            return null;
-        }
-        // Access and store the stacktrace property before doing ANYTHING
-        // else to it because Opera is not very good at providing it
-        // reliably in other circumstances.
-        var stacktrace = ex.stacktrace;
-        var opera10Regex = / line (\d+).*script (?:in )?(\S+)(?:: in function (\S+))?$/i;
-        var opera11Regex = / line (\d+), column (\d+)\s*(?:in (?:<anonymous function: ([^>]+)>|([^\)]+))\((.*)\))? in (.*):\s*$/i;
-        var lines = stacktrace.split('\n');
-        var stack = [];
-        var parts;
-        for (var line = 0; line < lines.length; line += 2) {
-            // tslint:disable:no-conditional-assignment
-            var element = null;
-            if ((parts = opera10Regex.exec(lines[line]))) {
-                element = {
-                    url: parts[2],
-                    func: parts[3],
-                    args: [],
-                    line: +parts[1],
-                    column: null,
-                };
-            }
-            else if ((parts = opera11Regex.exec(lines[line]))) {
-                element = {
-                    url: parts[6],
-                    func: parts[3] || parts[4],
-                    args: parts[5] ? parts[5].split(',') : [],
-                    line: +parts[1],
-                    column: +parts[2],
-                };
-            }
-            if (element) {
-                if (!element.func && element.line) {
-                    element.func = UNKNOWN_FUNCTION;
-                }
-                stack.push(element);
-            }
-        }
-        if (!stack.length) {
-            return null;
-        }
-        return {
-            message: extractMessage(ex),
-            name: ex.name,
-            stack: stack,
-        };
-    }
-    /** Remove N number of frames from the stack */
-    function popFrames(stacktrace, popSize) {
-        try {
-            return __assign({}, stacktrace, { stack: stacktrace.stack.slice(popSize) });
-        }
-        catch (e) {
-            return stacktrace;
-        }
-    }
-    /**
-     * There are cases where stacktrace.message is an Event object
-     * https://github.com/getsentry/sentry-javascript/issues/1949
-     * In this specific case we try to extract stacktrace.message.error.message
-     */
-    function extractMessage(ex) {
-        var message = ex && ex.message;
-        if (!message) {
-            return 'No error message';
-        }
-        if (message.error && typeof message.error.message === 'string') {
-            return message.error.message;
-        }
-        return message;
-    }
-
-    var STACKTRACE_LIMIT = 50;
-    /**
-     * This function creates an exception from an TraceKitStackTrace
-     * @param stacktrace TraceKitStackTrace that will be converted to an exception
-     * @hidden
-     */
-    function exceptionFromStacktrace(stacktrace) {
-        var frames = prepareFramesForEvent(stacktrace.stack);
-        var exception = {
-            type: stacktrace.name,
-            value: stacktrace.message,
-        };
-        if (frames && frames.length) {
-            exception.stacktrace = { frames: frames };
-        }
-        // tslint:disable-next-line:strict-type-predicates
-        if (exception.type === undefined && exception.value === '') {
-            exception.value = 'Unrecoverable error caught';
-        }
-        return exception;
-    }
-    /**
-     * @hidden
-     */
-    function eventFromPlainObject(exception, syntheticException, rejection) {
-        var event = {
-            exception: {
-                values: [
-                    {
-                        type: isEvent(exception) ? exception.constructor.name : rejection ? 'UnhandledRejection' : 'Error',
-                        value: "Non-Error " + (rejection ? 'promise rejection' : 'exception') + " captured with keys: " + extractExceptionKeysForMessage(exception),
-                    },
-                ],
-            },
-            extra: {
-                __serialized__: normalizeToSize(exception),
-            },
-        };
-        if (syntheticException) {
-            var stacktrace = computeStackTrace(syntheticException);
-            var frames_1 = prepareFramesForEvent(stacktrace.stack);
-            event.stacktrace = {
-                frames: frames_1,
-            };
-        }
-        return event;
-    }
-    /**
-     * @hidden
-     */
-    function eventFromStacktrace(stacktrace) {
-        var exception = exceptionFromStacktrace(stacktrace);
-        return {
-            exception: {
-                values: [exception],
-            },
-        };
-    }
-    /**
-     * @hidden
-     */
-    function prepareFramesForEvent(stack) {
-        if (!stack || !stack.length) {
-            return [];
-        }
-        var localStack = stack;
-        var firstFrameFunction = localStack[0].func || '';
-        var lastFrameFunction = localStack[localStack.length - 1].func || '';
-        // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
-        if (firstFrameFunction.indexOf('captureMessage') !== -1 || firstFrameFunction.indexOf('captureException') !== -1) {
-            localStack = localStack.slice(1);
-        }
-        // If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)
-        if (lastFrameFunction.indexOf('sentryWrapped') !== -1) {
-            localStack = localStack.slice(0, -1);
-        }
-        // The frame where the crash happened, should be the last entry in the array
-        return localStack
-            .map(function (frame) { return ({
-            colno: frame.column === null ? undefined : frame.column,
-            filename: frame.url || localStack[0].url,
-            function: frame.func || '?',
-            in_app: true,
-            lineno: frame.line === null ? undefined : frame.line,
-        }); })
-            .slice(0, STACKTRACE_LIMIT)
-            .reverse();
-    }
-
-    /** JSDoc */
-    function eventFromUnknownInput(exception, syntheticException, options) {
-        if (options === void 0) { options = {}; }
-        var event;
-        if (isErrorEvent(exception) && exception.error) {
-            // If it is an ErrorEvent with `error` property, extract it to get actual Error
-            var errorEvent = exception;
-            exception = errorEvent.error; // tslint:disable-line:no-parameter-reassignment
-            event = eventFromStacktrace(computeStackTrace(exception));
-            return event;
-        }
-        if (isDOMError(exception) || isDOMException(exception)) {
-            // If it is a DOMError or DOMException (which are legacy APIs, but still supported in some browsers)
-            // then we just extract the name and message, as they don't provide anything else
-            // https://developer.mozilla.org/en-US/docs/Web/API/DOMError
-            // https://developer.mozilla.org/en-US/docs/Web/API/DOMException
-            var domException = exception;
-            var name_1 = domException.name || (isDOMError(domException) ? 'DOMError' : 'DOMException');
-            var message = domException.message ? name_1 + ": " + domException.message : name_1;
-            event = eventFromString(message, syntheticException, options);
-            addExceptionTypeValue(event, message);
-            return event;
-        }
-        if (isError(exception)) {
-            // we have a real Error object, do nothing
-            event = eventFromStacktrace(computeStackTrace(exception));
-            return event;
-        }
-        if (isPlainObject(exception) || isEvent(exception)) {
-            // If it is plain Object or Event, serialize it manually and extract options
-            // This will allow us to group events based on top-level keys
-            // which is much better than creating new group when any key/value change
-            var objectException = exception;
-            event = eventFromPlainObject(objectException, syntheticException, options.rejection);
-            addExceptionMechanism(event, {
-                synthetic: true,
-            });
-            return event;
-        }
-        // If none of previous checks were valid, then it means that it's not:
-        // - an instance of DOMError
-        // - an instance of DOMException
-        // - an instance of Event
-        // - an instance of Error
-        // - a valid ErrorEvent (one with an error property)
-        // - a plain Object
-        //
-        // So bail out and capture it as a simple message:
-        event = eventFromString(exception, syntheticException, options);
-        addExceptionTypeValue(event, "" + exception, undefined);
-        addExceptionMechanism(event, {
-            synthetic: true,
-        });
-        return event;
-    }
-    // this._options.attachStacktrace
-    /** JSDoc */
-    function eventFromString(input, syntheticException, options) {
-        if (options === void 0) { options = {}; }
-        var event = {
-            message: input,
-        };
-        if (options.attachStacktrace && syntheticException) {
-            var stacktrace = computeStackTrace(syntheticException);
-            var frames_1 = prepareFramesForEvent(stacktrace.stack);
-            event.stacktrace = {
-                frames: frames_1,
-            };
-        }
-        return event;
-    }
-
-    /** Base Transport class implementation */
-    var BaseTransport = /** @class */ (function () {
-        function BaseTransport(options) {
-            this.options = options;
-            /** A simple buffer holding all requests. */
-            this._buffer = new PromiseBuffer(30);
-            this.url = new API(this.options.dsn).getStoreEndpointWithUrlEncodedAuth();
-        }
-        /**
-         * @inheritDoc
-         */
-        BaseTransport.prototype.sendEvent = function (_) {
-            throw new SentryError('Transport Class has to implement `sendEvent` method');
-        };
-        /**
-         * @inheritDoc
-         */
-        BaseTransport.prototype.close = function (timeout) {
-            return this._buffer.drain(timeout);
-        };
-        return BaseTransport;
-    }());
-
-    var global$3 = getGlobalObject();
-    /** `fetch` based transport */
-    var FetchTransport = /** @class */ (function (_super) {
-        __extends(FetchTransport, _super);
-        function FetchTransport() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            /** Locks transport after receiving 429 response */
-            _this._disabledUntil = new Date(Date.now());
-            return _this;
-        }
-        /**
-         * @inheritDoc
-         */
-        FetchTransport.prototype.sendEvent = function (event) {
-            var _this = this;
-            if (new Date(Date.now()) < this._disabledUntil) {
-                return Promise.reject({
-                    event: event,
-                    reason: "Transport locked till " + this._disabledUntil + " due to too many requests.",
-                    status: 429,
-                });
-            }
-            var defaultOptions = {
-                body: JSON.stringify(event),
-                method: 'POST',
-                // Despite all stars in the sky saying that Edge supports old draft syntax, aka 'never', 'always', 'origin' and 'default
-                // https://caniuse.com/#feat=referrer-policy
-                // It doesn't. And it throw exception instead of ignoring this parameter...
-                // REF: https://github.com/getsentry/raven-js/issues/1233
-                referrerPolicy: (supportsReferrerPolicy() ? 'origin' : ''),
-            };
-            if (this.options.headers !== undefined) {
-                defaultOptions.headers = this.options.headers;
-            }
-            return this._buffer.add(new SyncPromise(function (resolve, reject) {
-                global$3
-                    .fetch(_this.url, defaultOptions)
-                    .then(function (response) {
-                    var status = exports.Status.fromHttpCode(response.status);
-                    if (status === exports.Status.Success) {
-                        resolve({ status: status });
-                        return;
-                    }
-                    if (status === exports.Status.RateLimit) {
-                        var now = Date.now();
-                        _this._disabledUntil = new Date(now + parseRetryAfterHeader(now, response.headers.get('Retry-After')));
-                        logger.warn("Too many requests, backing off till: " + _this._disabledUntil);
-                    }
-                    reject(response);
-                })
-                    .catch(reject);
-            }));
-        };
-        return FetchTransport;
-    }(BaseTransport));
-
-    /** `XHR` based transport */
-    var XHRTransport = /** @class */ (function (_super) {
-        __extends(XHRTransport, _super);
-        function XHRTransport() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            /** Locks transport after receiving 429 response */
-            _this._disabledUntil = new Date(Date.now());
-            return _this;
-        }
-        /**
-         * @inheritDoc
-         */
-        XHRTransport.prototype.sendEvent = function (event) {
-            var _this = this;
-            if (new Date(Date.now()) < this._disabledUntil) {
-                return Promise.reject({
-                    event: event,
-                    reason: "Transport locked till " + this._disabledUntil + " due to too many requests.",
-                    status: 429,
-                });
-            }
-            return this._buffer.add(new SyncPromise(function (resolve, reject) {
-                var request = new XMLHttpRequest();
-                request.onreadystatechange = function () {
-                    if (request.readyState !== 4) {
-                        return;
-                    }
-                    var status = exports.Status.fromHttpCode(request.status);
-                    if (status === exports.Status.Success) {
-                        resolve({ status: status });
-                        return;
-                    }
-                    if (status === exports.Status.RateLimit) {
-                        var now = Date.now();
-                        _this._disabledUntil = new Date(now + parseRetryAfterHeader(now, request.getResponseHeader('Retry-After')));
-                        logger.warn("Too many requests, backing off till: " + _this._disabledUntil);
-                    }
-                    reject(request);
-                };
-                request.open('POST', _this.url);
-                for (var header in _this.options.headers) {
-                    if (_this.options.headers.hasOwnProperty(header)) {
-                        request.setRequestHeader(header, _this.options.headers[header]);
-                    }
-                }
-                request.send(JSON.stringify(event));
-            }));
-        };
-        return XHRTransport;
-    }(BaseTransport));
-
-
-
-    var index = /*#__PURE__*/Object.freeze({
-        BaseTransport: BaseTransport,
-        FetchTransport: FetchTransport,
-        XHRTransport: XHRTransport
-    });
-
-    /**
-     * The Sentry Browser SDK Backend.
-     * @hidden
-     */
-    var BrowserBackend = /** @class */ (function (_super) {
-        __extends(BrowserBackend, _super);
-        function BrowserBackend() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * @inheritDoc
-         */
-        BrowserBackend.prototype._setupTransport = function () {
-            if (!this._options.dsn) {
-                // We return the noop transport here in case there is no Dsn.
-                return _super.prototype._setupTransport.call(this);
-            }
-            var transportOptions = __assign({}, this._options.transportOptions, { dsn: this._options.dsn });
-            if (this._options.transport) {
-                return new this._options.transport(transportOptions);
-            }
-            if (supportsFetch()) {
-                return new FetchTransport(transportOptions);
-            }
-            return new XHRTransport(transportOptions);
-        };
-        /**
-         * @inheritDoc
-         */
-        BrowserBackend.prototype.eventFromException = function (exception, hint) {
-            var syntheticException = (hint && hint.syntheticException) || undefined;
-            var event = eventFromUnknownInput(exception, syntheticException, {
-                attachStacktrace: this._options.attachStacktrace,
-            });
-            addExceptionMechanism(event, {
-                handled: true,
-                type: 'generic',
-            });
-            event.level = exports.Severity.Error;
-            if (hint && hint.event_id) {
-                event.event_id = hint.event_id;
-            }
-            return SyncPromise.resolve(event);
-        };
-        /**
-         * @inheritDoc
-         */
-        BrowserBackend.prototype.eventFromMessage = function (message, level, hint) {
-            if (level === void 0) { level = exports.Severity.Info; }
-            var syntheticException = (hint && hint.syntheticException) || undefined;
-            var event = eventFromString(message, syntheticException, {
-                attachStacktrace: this._options.attachStacktrace,
-            });
-            event.level = level;
-            if (hint && hint.event_id) {
-                event.event_id = hint.event_id;
-            }
-            return SyncPromise.resolve(event);
-        };
-        return BrowserBackend;
-    }(BaseBackend));
-
-    var SDK_NAME = 'sentry.javascript.browser';
-    var SDK_VERSION = '5.15.5';
-
-    /**
-     * The Sentry Browser SDK Client.
-     *
-     * @see BrowserOptions for documentation on configuration options.
-     * @see SentryClient for usage documentation.
-     */
-    var BrowserClient = /** @class */ (function (_super) {
-        __extends(BrowserClient, _super);
-        /**
-         * Creates a new Browser SDK instance.
-         *
-         * @param options Configuration options for this SDK.
-         */
-        function BrowserClient(options) {
-            if (options === void 0) { options = {}; }
-            return _super.call(this, BrowserBackend, options) || this;
-        }
-        /**
-         * @inheritDoc
-         */
-        BrowserClient.prototype._prepareEvent = function (event, scope, hint) {
-            event.platform = event.platform || 'javascript';
-            event.sdk = __assign({}, event.sdk, { name: SDK_NAME, packages: __spread(((event.sdk && event.sdk.packages) || []), [
-                    {
-                        name: 'npm:@sentry/browser',
-                        version: SDK_VERSION,
-                    },
-                ]), version: SDK_VERSION });
-            return _super.prototype._prepareEvent.call(this, event, scope, hint);
-        };
-        /**
-         * Show a report dialog to the user to send feedback to a specific event.
-         *
-         * @param options Set individual options for the dialog
-         */
-        BrowserClient.prototype.showReportDialog = function (options) {
-            if (options === void 0) { options = {}; }
-            // doesn't work without a document (React Native)
-            var document = getGlobalObject().document;
-            if (!document) {
-                return;
-            }
-            if (!this._isEnabled()) {
-                logger.error('Trying to call showReportDialog with Sentry Client is disabled');
-                return;
-            }
-            var dsn = options.dsn || this.getDsn();
-            if (!options.eventId) {
-                logger.error('Missing `eventId` option in showReportDialog call');
-                return;
-            }
-            if (!dsn) {
-                logger.error('Missing `Dsn` option in showReportDialog call');
-                return;
-            }
-            var script = document.createElement('script');
-            script.async = true;
-            script.src = new API(dsn).getReportDialogEndpoint(options);
-            if (options.onLoad) {
-                script.onload = options.onLoad;
-            }
-            (document.head || document.body).appendChild(script);
-        };
-        return BrowserClient;
-    }(BaseClient));
-
-    var ignoreOnError = 0;
-    /**
-     * @hidden
-     */
-    function shouldIgnoreOnError() {
-        return ignoreOnError > 0;
-    }
-    /**
-     * @hidden
-     */
-    function ignoreNextOnError() {
-        // onerror should trigger before setTimeout
-        ignoreOnError += 1;
-        setTimeout(function () {
-            ignoreOnError -= 1;
-        });
-    }
-    /**
-     * Instruments the given function and sends an event to Sentry every time the
-     * function throws an exception.
-     *
-     * @param fn A function to wrap.
-     * @returns The wrapped function.
-     * @hidden
-     */
-    function wrap(fn, options, before) {
-        if (options === void 0) { options = {}; }
-        // tslint:disable-next-line:strict-type-predicates
-        if (typeof fn !== 'function') {
-            return fn;
-        }
-        try {
-            // We don't wanna wrap it twice
-            if (fn.__sentry__) {
-                return fn;
-            }
-            // If this has already been wrapped in the past, return that wrapped function
-            if (fn.__sentry_wrapped__) {
-                return fn.__sentry_wrapped__;
-            }
-        }
-        catch (e) {
-            // Just accessing custom props in some Selenium environments
-            // can cause a "Permission denied" exception (see raven-js#495).
-            // Bail on wrapping and return the function as-is (defers to window.onerror).
-            return fn;
-        }
-        var sentryWrapped = function () {
-            var args = Array.prototype.slice.call(arguments);
-            // tslint:disable:no-unsafe-any
-            try {
-                // tslint:disable-next-line:strict-type-predicates
-                if (before && typeof before === 'function') {
-                    before.apply(this, arguments);
-                }
-                var wrappedArguments = args.map(function (arg) { return wrap(arg, options); });
-                if (fn.handleEvent) {
-                    // Attempt to invoke user-land function
-                    // NOTE: If you are a Sentry user, and you are seeing this stack frame, it
-                    //       means the sentry.javascript SDK caught an error invoking your application code. This
-                    //       is expected behavior and NOT indicative of a bug with sentry.javascript.
-                    return fn.handleEvent.apply(this, wrappedArguments);
-                }
-                // Attempt to invoke user-land function
-                // NOTE: If you are a Sentry user, and you are seeing this stack frame, it
-                //       means the sentry.javascript SDK caught an error invoking your application code. This
-                //       is expected behavior and NOT indicative of a bug with sentry.javascript.
-                return fn.apply(this, wrappedArguments);
-                // tslint:enable:no-unsafe-any
-            }
-            catch (ex) {
-                ignoreNextOnError();
-                withScope(function (scope) {
-                    scope.addEventProcessor(function (event) {
-                        var processedEvent = __assign({}, event);
-                        if (options.mechanism) {
-                            addExceptionTypeValue(processedEvent, undefined, undefined);
-                            addExceptionMechanism(processedEvent, options.mechanism);
-                        }
-                        processedEvent.extra = __assign({}, processedEvent.extra, { arguments: args });
-                        return processedEvent;
-                    });
-                    captureException(ex);
-                });
-                throw ex;
-            }
-        };
-        // Accessing some objects may throw
-        // ref: https://github.com/getsentry/sentry-javascript/issues/1168
-        try {
-            for (var property in fn) {
-                if (Object.prototype.hasOwnProperty.call(fn, property)) {
-                    sentryWrapped[property] = fn[property];
-                }
-            }
-        }
-        catch (_oO) { } // tslint:disable-line:no-empty
-        fn.prototype = fn.prototype || {};
-        sentryWrapped.prototype = fn.prototype;
-        Object.defineProperty(fn, '__sentry_wrapped__', {
-            enumerable: false,
-            value: sentryWrapped,
-        });
-        // Signal that this function has been wrapped/filled already
-        // for both debugging and to prevent it to being wrapped/filled twice
-        Object.defineProperties(sentryWrapped, {
-            __sentry__: {
-                enumerable: false,
-                value: true,
-            },
-            __sentry_original__: {
-                enumerable: false,
-                value: fn,
-            },
-        });
-        // Restore original function name (not all browsers allow that)
-        try {
-            var descriptor = Object.getOwnPropertyDescriptor(sentryWrapped, 'name');
-            if (descriptor.configurable) {
-                Object.defineProperty(sentryWrapped, 'name', {
-                    get: function () {
-                        return fn.name;
-                    },
-                });
-            }
-        }
-        catch (_oO) {
-            /*no-empty*/
-        }
-        return sentryWrapped;
-    }
-
-    /** Global handlers */
-    var GlobalHandlers = /** @class */ (function () {
-        /** JSDoc */
-        function GlobalHandlers(options) {
-            /**
-             * @inheritDoc
-             */
-            this.name = GlobalHandlers.id;
-            /** JSDoc */
-            this._onErrorHandlerInstalled = false;
-            /** JSDoc */
-            this._onUnhandledRejectionHandlerInstalled = false;
-            this._options = __assign({ onerror: true, onunhandledrejection: true }, options);
-        }
-        /**
-         * @inheritDoc
-         */
-        GlobalHandlers.prototype.setupOnce = function () {
-            Error.stackTraceLimit = 50;
-            if (this._options.onerror) {
-                logger.log('Global Handler attached: onerror');
-                this._installGlobalOnErrorHandler();
-            }
-            if (this._options.onunhandledrejection) {
-                logger.log('Global Handler attached: onunhandledrejection');
-                this._installGlobalOnUnhandledRejectionHandler();
-            }
-        };
-        /** JSDoc */
-        GlobalHandlers.prototype._installGlobalOnErrorHandler = function () {
-            var _this = this;
-            if (this._onErrorHandlerInstalled) {
-                return;
-            }
-            addInstrumentationHandler({
-                callback: function (data) {
-                    var error = data.error;
-                    var currentHub = getCurrentHub();
-                    var hasIntegration = currentHub.getIntegration(GlobalHandlers);
-                    var isFailedOwnDelivery = error && error.__sentry_own_request__ === true;
-                    if (!hasIntegration || shouldIgnoreOnError() || isFailedOwnDelivery) {
-                        return;
-                    }
-                    var client = currentHub.getClient();
-                    var event = isPrimitive(error)
-                        ? _this._eventFromIncompleteOnError(data.msg, data.url, data.line, data.column)
-                        : _this._enhanceEventWithInitialFrame(eventFromUnknownInput(error, undefined, {
-                            attachStacktrace: client && client.getOptions().attachStacktrace,
-                            rejection: false,
-                        }), data.url, data.line, data.column);
-                    addExceptionMechanism(event, {
-                        handled: false,
-                        type: 'onerror',
-                    });
-                    currentHub.captureEvent(event, {
-                        originalException: error,
-                    });
-                },
-                type: 'error',
-            });
-            this._onErrorHandlerInstalled = true;
-        };
-        /** JSDoc */
-        GlobalHandlers.prototype._installGlobalOnUnhandledRejectionHandler = function () {
-            var _this = this;
-            if (this._onUnhandledRejectionHandlerInstalled) {
-                return;
-            }
-            addInstrumentationHandler({
-                callback: function (e) {
-                    var error = e;
-                    // dig the object of the rejection out of known event types
-                    try {
-                        // PromiseRejectionEvents store the object of the rejection under 'reason'
-                        // see https://developer.mozilla.org/en-US/docs/Web/API/PromiseRejectionEvent
-                        if ('reason' in e) {
-                            error = e.reason;
-                        }
-                        // something, somewhere, (likely a browser extension) effectively casts PromiseRejectionEvents
-                        // to CustomEvents, moving the `promise` and `reason` attributes of the PRE into
-                        // the CustomEvent's `detail` attribute, since they're not part of CustomEvent's spec
-                        // see https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent and
-                        // https://github.com/getsentry/sentry-javascript/issues/2380
-                        else if ('detail' in e && 'reason' in e.detail) {
-                            error = e.detail.reason;
-                        }
-                    }
-                    catch (_oO) {
-                        // no-empty
-                    }
-                    var currentHub = getCurrentHub();
-                    var hasIntegration = currentHub.getIntegration(GlobalHandlers);
-                    var isFailedOwnDelivery = error && error.__sentry_own_request__ === true;
-                    if (!hasIntegration || shouldIgnoreOnError() || isFailedOwnDelivery) {
-                        return true;
-                    }
-                    var client = currentHub.getClient();
-                    var event = isPrimitive(error)
-                        ? _this._eventFromIncompleteRejection(error)
-                        : eventFromUnknownInput(error, undefined, {
-                            attachStacktrace: client && client.getOptions().attachStacktrace,
-                            rejection: true,
-                        });
-                    event.level = exports.Severity.Error;
-                    addExceptionMechanism(event, {
-                        handled: false,
-                        type: 'onunhandledrejection',
-                    });
-                    currentHub.captureEvent(event, {
-                        originalException: error,
-                    });
-                    return;
-                },
-                type: 'unhandledrejection',
-            });
-            this._onUnhandledRejectionHandlerInstalled = true;
-        };
-        /**
-         * This function creates a stack from an old, error-less onerror handler.
-         */
-        GlobalHandlers.prototype._eventFromIncompleteOnError = function (msg, url, line, column) {
-            var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/i;
-            // If 'message' is ErrorEvent, get real message from inside
-            var message = isErrorEvent(msg) ? msg.message : msg;
-            var name;
-            if (isString(message)) {
-                var groups = message.match(ERROR_TYPES_RE);
-                if (groups) {
-                    name = groups[1];
-                    message = groups[2];
-                }
-            }
-            var event = {
-                exception: {
-                    values: [
-                        {
-                            type: name || 'Error',
-                            value: message,
-                        },
-                    ],
-                },
-            };
-            return this._enhanceEventWithInitialFrame(event, url, line, column);
-        };
-        /**
-         * This function creates an Event from an TraceKitStackTrace that has part of it missing.
-         */
-        GlobalHandlers.prototype._eventFromIncompleteRejection = function (error) {
-            return {
-                exception: {
-                    values: [
-                        {
-                            type: 'UnhandledRejection',
-                            value: "Non-Error promise rejection captured with value: " + error,
-                        },
-                    ],
-                },
-            };
-        };
-        /** JSDoc */
-        GlobalHandlers.prototype._enhanceEventWithInitialFrame = function (event, url, line, column) {
-            event.exception = event.exception || {};
-            event.exception.values = event.exception.values || [];
-            event.exception.values[0] = event.exception.values[0] || {};
-            event.exception.values[0].stacktrace = event.exception.values[0].stacktrace || {};
-            event.exception.values[0].stacktrace.frames = event.exception.values[0].stacktrace.frames || [];
-            var colno = isNaN(parseInt(column, 10)) ? undefined : column;
-            var lineno = isNaN(parseInt(line, 10)) ? undefined : line;
-            var filename = isString(url) && url.length > 0 ? url : getLocationHref();
-            if (event.exception.values[0].stacktrace.frames.length === 0) {
-                event.exception.values[0].stacktrace.frames.push({
-                    colno: colno,
-                    filename: filename,
-                    function: '?',
-                    in_app: true,
-                    lineno: lineno,
-                });
-            }
-            return event;
-        };
-        /**
-         * @inheritDoc
-         */
-        GlobalHandlers.id = 'GlobalHandlers';
-        return GlobalHandlers;
-    }());
-
-    /** Wrap timer functions and event targets to catch errors and provide better meta data */
-    var TryCatch = /** @class */ (function () {
-        function TryCatch() {
-            /** JSDoc */
-            this._ignoreOnError = 0;
-            /**
-             * @inheritDoc
-             */
-            this.name = TryCatch.id;
-        }
-        /** JSDoc */
-        TryCatch.prototype._wrapTimeFunction = function (original) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var originalCallback = args[0];
-                args[0] = wrap(originalCallback, {
-                    mechanism: {
-                        data: { function: getFunctionName(original) },
-                        handled: true,
-                        type: 'instrument',
-                    },
-                });
-                return original.apply(this, args);
-            };
-        };
-        /** JSDoc */
-        TryCatch.prototype._wrapRAF = function (original) {
-            return function (callback) {
-                return original(wrap(callback, {
-                    mechanism: {
-                        data: {
-                            function: 'requestAnimationFrame',
-                            handler: getFunctionName(original),
-                        },
-                        handled: true,
-                        type: 'instrument',
-                    },
-                }));
-            };
-        };
-        /** JSDoc */
-        TryCatch.prototype._wrapEventTarget = function (target) {
-            var global = getGlobalObject();
-            var proto = global[target] && global[target].prototype;
-            if (!proto || !proto.hasOwnProperty || !proto.hasOwnProperty('addEventListener')) {
-                return;
-            }
-            fill(proto, 'addEventListener', function (original) {
-                return function (eventName, fn, options) {
-                    try {
-                        // tslint:disable-next-line:no-unbound-method strict-type-predicates
-                        if (typeof fn.handleEvent === 'function') {
-                            fn.handleEvent = wrap(fn.handleEvent.bind(fn), {
-                                mechanism: {
-                                    data: {
-                                        function: 'handleEvent',
-                                        handler: getFunctionName(fn),
-                                        target: target,
-                                    },
-                                    handled: true,
-                                    type: 'instrument',
-                                },
-                            });
-                        }
-                    }
-                    catch (err) {
-                        // can sometimes get 'Permission denied to access property "handle Event'
-                    }
-                    return original.call(this, eventName, wrap(fn, {
-                        mechanism: {
-                            data: {
-                                function: 'addEventListener',
-                                handler: getFunctionName(fn),
-                                target: target,
-                            },
-                            handled: true,
-                            type: 'instrument',
-                        },
-                    }), options);
-                };
-            });
-            fill(proto, 'removeEventListener', function (original) {
-                return function (eventName, fn, options) {
-                    var callback = fn;
-                    try {
-                        callback = callback && (callback.__sentry_wrapped__ || callback);
-                    }
-                    catch (e) {
-                        // ignore, accessing __sentry_wrapped__ will throw in some Selenium environments
-                    }
-                    return original.call(this, eventName, callback, options);
-                };
-            });
-        };
-        /** JSDoc */
-        TryCatch.prototype._wrapXHR = function (originalSend) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                var xhr = this; // tslint:disable-line:no-this-assignment
-                var xmlHttpRequestProps = ['onload', 'onerror', 'onprogress', 'onreadystatechange'];
-                xmlHttpRequestProps.forEach(function (prop) {
-                    if (prop in xhr && typeof xhr[prop] === 'function') {
-                        fill(xhr, prop, function (original) {
-                            var wrapOptions = {
-                                mechanism: {
-                                    data: {
-                                        function: prop,
-                                        handler: getFunctionName(original),
-                                    },
-                                    handled: true,
-                                    type: 'instrument',
-                                },
-                            };
-                            // If Instrument integration has been called before TryCatch, get the name of original function
-                            if (original.__sentry_original__) {
-                                wrapOptions.mechanism.data.handler = getFunctionName(original.__sentry_original__);
-                            }
-                            // Otherwise wrap directly
-                            return wrap(original, wrapOptions);
-                        });
-                    }
-                });
-                return originalSend.apply(this, args);
-            };
-        };
-        /**
-         * Wrap timer functions and event targets to catch errors
-         * and provide better metadata.
-         */
-        TryCatch.prototype.setupOnce = function () {
-            this._ignoreOnError = this._ignoreOnError;
-            var global = getGlobalObject();
-            fill(global, 'setTimeout', this._wrapTimeFunction.bind(this));
-            fill(global, 'setInterval', this._wrapTimeFunction.bind(this));
-            fill(global, 'requestAnimationFrame', this._wrapRAF.bind(this));
-            if ('XMLHttpRequest' in global) {
-                fill(XMLHttpRequest.prototype, 'send', this._wrapXHR.bind(this));
-            }
-            [
-                'EventTarget',
-                'Window',
-                'Node',
-                'ApplicationCache',
-                'AudioTrackList',
-                'ChannelMergerNode',
-                'CryptoOperation',
-                'EventSource',
-                'FileReader',
-                'HTMLUnknownElement',
-                'IDBDatabase',
-                'IDBRequest',
-                'IDBTransaction',
-                'KeyOperation',
-                'MediaController',
-                'MessagePort',
-                'ModalWindow',
-                'Notification',
-                'SVGElementInstance',
-                'Screen',
-                'TextTrack',
-                'TextTrackCue',
-                'TextTrackList',
-                'WebSocket',
-                'WebSocketWorker',
-                'Worker',
-                'XMLHttpRequest',
-                'XMLHttpRequestEventTarget',
-                'XMLHttpRequestUpload',
-            ].forEach(this._wrapEventTarget.bind(this));
-        };
-        /**
-         * @inheritDoc
-         */
-        TryCatch.id = 'TryCatch';
-        return TryCatch;
-    }());
-
-    /**
-     * Default Breadcrumbs instrumentations
-     * TODO: Deprecated - with v6, this will be renamed to `Instrument`
-     */
-    var Breadcrumbs = /** @class */ (function () {
-        /**
-         * @inheritDoc
-         */
-        function Breadcrumbs(options) {
-            /**
-             * @inheritDoc
-             */
-            this.name = Breadcrumbs.id;
-            this._options = __assign({ console: true, dom: true, fetch: true, history: true, sentry: true, xhr: true }, options);
-        }
-        /**
-         * Creates breadcrumbs from console API calls
-         */
-        Breadcrumbs.prototype._consoleBreadcrumb = function (handlerData) {
-            var breadcrumb = {
-                category: 'console',
-                data: {
-                    arguments: handlerData.args,
-                    logger: 'console',
-                },
-                level: exports.Severity.fromString(handlerData.level),
-                message: safeJoin(handlerData.args, ' '),
-            };
-            if (handlerData.level === 'assert') {
-                if (handlerData.args[0] === false) {
-                    breadcrumb.message = "Assertion failed: " + (safeJoin(handlerData.args.slice(1), ' ') || 'console.assert');
-                    breadcrumb.data.arguments = handlerData.args.slice(1);
-                }
-                else {
-                    // Don't capture a breadcrumb for passed assertions
-                    return;
-                }
-            }
-            getCurrentHub().addBreadcrumb(breadcrumb, {
-                input: handlerData.args,
-                level: handlerData.level,
-            });
-        };
-        /**
-         * Creates breadcrumbs from DOM API calls
-         */
-        Breadcrumbs.prototype._domBreadcrumb = function (handlerData) {
-            var target;
-            // Accessing event.target can throw (see getsentry/raven-js#838, #768)
-            try {
-                target = handlerData.event.target
-                    ? htmlTreeAsString(handlerData.event.target)
-                    : htmlTreeAsString(handlerData.event);
-            }
-            catch (e) {
-                target = '<unknown>';
-            }
-            if (target.length === 0) {
-                return;
-            }
-            getCurrentHub().addBreadcrumb({
-                category: "ui." + handlerData.name,
-                message: target,
-            }, {
-                event: handlerData.event,
-                name: handlerData.name,
-            });
-        };
-        /**
-         * Creates breadcrumbs from XHR API calls
-         */
-        Breadcrumbs.prototype._xhrBreadcrumb = function (handlerData) {
-            if (handlerData.endTimestamp) {
-                // We only capture complete, non-sentry requests
-                if (handlerData.xhr.__sentry_own_request__) {
-                    return;
-                }
-                getCurrentHub().addBreadcrumb({
-                    category: 'xhr',
-                    data: handlerData.xhr.__sentry_xhr__,
-                    type: 'http',
-                }, {
-                    xhr: handlerData.xhr,
-                });
-                return;
-            }
-            // We only capture issued sentry requests
-            if (this._options.sentry && handlerData.xhr.__sentry_own_request__) {
-                addSentryBreadcrumb(handlerData.args[0]);
-            }
-        };
-        /**
-         * Creates breadcrumbs from fetch API calls
-         */
-        Breadcrumbs.prototype._fetchBreadcrumb = function (handlerData) {
-            // We only capture complete fetch requests
-            if (!handlerData.endTimestamp) {
-                return;
-            }
-            var client = getCurrentHub().getClient();
-            var dsn = client && client.getDsn();
-            if (this._options.sentry && dsn) {
-                var filterUrl = new API(dsn).getStoreEndpoint();
-                // if Sentry key appears in URL, don't capture it as a request
-                // but rather as our own 'sentry' type breadcrumb
-                if (filterUrl &&
-                    handlerData.fetchData.url.indexOf(filterUrl) !== -1 &&
-                    handlerData.fetchData.method === 'POST' &&
-                    handlerData.args[1] &&
-                    handlerData.args[1].body) {
-                    addSentryBreadcrumb(handlerData.args[1].body);
-                    return;
-                }
-            }
-            if (handlerData.error) {
-                getCurrentHub().addBreadcrumb({
-                    category: 'fetch',
-                    data: __assign({}, handlerData.fetchData, { status_code: handlerData.response.status }),
-                    level: exports.Severity.Error,
-                    type: 'http',
-                }, {
-                    data: handlerData.error,
-                    input: handlerData.args,
-                });
-            }
-            else {
-                getCurrentHub().addBreadcrumb({
-                    category: 'fetch',
-                    data: __assign({}, handlerData.fetchData, { status_code: handlerData.response.status }),
-                    type: 'http',
-                }, {
-                    input: handlerData.args,
-                    response: handlerData.response,
-                });
-            }
-        };
-        /**
-         * Creates breadcrumbs from history API calls
-         */
-        Breadcrumbs.prototype._historyBreadcrumb = function (handlerData) {
-            var global = getGlobalObject();
-            var from = handlerData.from;
-            var to = handlerData.to;
-            var parsedLoc = parseUrl(global.location.href);
-            var parsedFrom = parseUrl(from);
-            var parsedTo = parseUrl(to);
-            // Initial pushState doesn't provide `from` information
-            if (!parsedFrom.path) {
-                parsedFrom = parsedLoc;
-            }
-            // Use only the path component of the URL if the URL matches the current
-            // document (almost all the time when using pushState)
-            if (parsedLoc.protocol === parsedTo.protocol && parsedLoc.host === parsedTo.host) {
-                // tslint:disable-next-line:no-parameter-reassignment
-                to = parsedTo.relative;
-            }
-            if (parsedLoc.protocol === parsedFrom.protocol && parsedLoc.host === parsedFrom.host) {
-                // tslint:disable-next-line:no-parameter-reassignment
-                from = parsedFrom.relative;
-            }
-            getCurrentHub().addBreadcrumb({
-                category: 'navigation',
-                data: {
-                    from: from,
-                    to: to,
-                },
-            });
-        };
-        /**
-         * Instrument browser built-ins w/ breadcrumb capturing
-         *  - Console API
-         *  - DOM API (click/typing)
-         *  - XMLHttpRequest API
-         *  - Fetch API
-         *  - History API
-         */
-        Breadcrumbs.prototype.setupOnce = function () {
-            var _this = this;
-            if (this._options.console) {
-                addInstrumentationHandler({
-                    callback: function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        _this._consoleBreadcrumb.apply(_this, __spread(args));
-                    },
-                    type: 'console',
-                });
-            }
-            if (this._options.dom) {
-                addInstrumentationHandler({
-                    callback: function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        _this._domBreadcrumb.apply(_this, __spread(args));
-                    },
-                    type: 'dom',
-                });
-            }
-            if (this._options.xhr) {
-                addInstrumentationHandler({
-                    callback: function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        _this._xhrBreadcrumb.apply(_this, __spread(args));
-                    },
-                    type: 'xhr',
-                });
-            }
-            if (this._options.fetch) {
-                addInstrumentationHandler({
-                    callback: function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        _this._fetchBreadcrumb.apply(_this, __spread(args));
-                    },
-                    type: 'fetch',
-                });
-            }
-            if (this._options.history) {
-                addInstrumentationHandler({
-                    callback: function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        _this._historyBreadcrumb.apply(_this, __spread(args));
-                    },
-                    type: 'history',
-                });
-            }
-        };
-        /**
-         * @inheritDoc
-         */
-        Breadcrumbs.id = 'Breadcrumbs';
-        return Breadcrumbs;
-    }());
-    /**
-     * Create a breadcrumb of `sentry` from the events themselves
-     */
-    function addSentryBreadcrumb(serializedData) {
-        // There's always something that can go wrong with deserialization...
-        try {
-            var event_1 = JSON.parse(serializedData);
-            getCurrentHub().addBreadcrumb({
-                category: "sentry." + (event_1.type === 'transaction' ? 'transaction' : 'event'),
-                event_id: event_1.event_id,
-                level: event_1.level || exports.Severity.fromString('error'),
-                message: getEventDescription(event_1),
-            }, {
-                event: event_1,
-            });
-        }
-        catch (_oO) {
-            logger.error('Error while adding sentry type breadcrumb');
-        }
-    }
-
-    var DEFAULT_KEY = 'cause';
-    var DEFAULT_LIMIT = 5;
-    /** Adds SDK info to an event. */
-    var LinkedErrors = /** @class */ (function () {
-        /**
-         * @inheritDoc
-         */
-        function LinkedErrors(options) {
-            if (options === void 0) { options = {}; }
-            /**
-             * @inheritDoc
-             */
-            this.name = LinkedErrors.id;
-            this._key = options.key || DEFAULT_KEY;
-            this._limit = options.limit || DEFAULT_LIMIT;
-        }
-        /**
-         * @inheritDoc
-         */
-        LinkedErrors.prototype.setupOnce = function () {
-            addGlobalEventProcessor(function (event, hint) {
-                var self = getCurrentHub().getIntegration(LinkedErrors);
-                if (self) {
-                    return self._handler(event, hint);
-                }
-                return event;
-            });
-        };
-        /**
-         * @inheritDoc
-         */
-        LinkedErrors.prototype._handler = function (event, hint) {
-            if (!event.exception || !event.exception.values || !hint || !isInstanceOf(hint.originalException, Error)) {
-                return event;
-            }
-            var linkedErrors = this._walkErrorTree(hint.originalException, this._key);
-            event.exception.values = __spread(linkedErrors, event.exception.values);
-            return event;
-        };
-        /**
-         * @inheritDoc
-         */
-        LinkedErrors.prototype._walkErrorTree = function (error, key, stack) {
-            if (stack === void 0) { stack = []; }
-            if (!isInstanceOf(error[key], Error) || stack.length + 1 >= this._limit) {
-                return stack;
-            }
-            var stacktrace = computeStackTrace(error[key]);
-            var exception = exceptionFromStacktrace(stacktrace);
-            return this._walkErrorTree(error[key], key, __spread([exception], stack));
-        };
-        /**
-         * @inheritDoc
-         */
-        LinkedErrors.id = 'LinkedErrors';
-        return LinkedErrors;
-    }());
-
-    var global$4 = getGlobalObject();
-    /** UserAgent */
-    var UserAgent = /** @class */ (function () {
-        function UserAgent() {
-            /**
-             * @inheritDoc
-             */
-            this.name = UserAgent.id;
-        }
-        /**
-         * @inheritDoc
-         */
-        UserAgent.prototype.setupOnce = function () {
-            addGlobalEventProcessor(function (event) {
-                if (getCurrentHub().getIntegration(UserAgent)) {
-                    if (!global$4.navigator || !global$4.location) {
-                        return event;
-                    }
-                    // Request Interface: https://docs.sentry.io/development/sdk-dev/event-payloads/request/
-                    var request = event.request || {};
-                    request.url = request.url || global$4.location.href;
-                    request.headers = request.headers || {};
-                    request.headers['User-Agent'] = global$4.navigator.userAgent;
-                    return __assign({}, event, { request: request });
-                }
-                return event;
-            });
-        };
-        /**
-         * @inheritDoc
-         */
-        UserAgent.id = 'UserAgent';
-        return UserAgent;
-    }());
-
-
-
-    var BrowserIntegrations = /*#__PURE__*/Object.freeze({
-        GlobalHandlers: GlobalHandlers,
-        TryCatch: TryCatch,
-        Breadcrumbs: Breadcrumbs,
-        LinkedErrors: LinkedErrors,
-        UserAgent: UserAgent
-    });
-
-    var defaultIntegrations = [
-        new InboundFilters(),
-        new FunctionToString(),
-        new TryCatch(),
-        new Breadcrumbs(),
-        new GlobalHandlers(),
-        new LinkedErrors(),
-        new UserAgent(),
-    ];
-    /**
-     * The Sentry Browser SDK Client.
-     *
-     * To use this SDK, call the {@link init} function as early as possible when
-     * loading the web page. To set context information or send manual events, use
-     * the provided methods.
-     *
-     * @example
-     *
-     * ```
-     *
-     * import { init } from '@sentry/browser';
-     *
-     * init({
-     *   dsn: '__DSN__',
-     *   // ...
-     * });
-     * ```
-     *
-     * @example
-     * ```
-     *
-     * import { configureScope } from '@sentry/browser';
-     * configureScope((scope: Scope) => {
-     *   scope.setExtra({ battery: 0.7 });
-     *   scope.setTag({ user_mode: 'admin' });
-     *   scope.setUser({ id: '4711' });
-     * });
-     * ```
-     *
-     * @example
-     * ```
-     *
-     * import { addBreadcrumb } from '@sentry/browser';
-     * addBreadcrumb({
-     *   message: 'My Breadcrumb',
-     *   // ...
-     * });
-     * ```
-     *
-     * @example
-     *
-     * ```
-     *
-     * import * as Sentry from '@sentry/browser';
-     * Sentry.captureMessage('Hello, world!');
-     * Sentry.captureException(new Error('Good bye'));
-     * Sentry.captureEvent({
-     *   message: 'Manual',
-     *   stacktrace: [
-     *     // ...
-     *   ],
-     * });
-     * ```
-     *
-     * @see {@link BrowserOptions} for documentation on configuration options.
-     */
-    function init(options) {
-        if (options === void 0) { options = {}; }
-        if (options.defaultIntegrations === undefined) {
-            options.defaultIntegrations = defaultIntegrations;
-        }
-        if (options.release === undefined) {
-            var window_1 = getGlobalObject();
-            // This supports the variable that sentry-webpack-plugin injects
-            if (window_1.SENTRY_RELEASE && window_1.SENTRY_RELEASE.id) {
-                options.release = window_1.SENTRY_RELEASE.id;
-            }
-        }
-        initAndBind(BrowserClient, options);
-    }
-    /**
-     * Present the user with a report dialog.
-     *
-     * @param options Everything is optional, we try to fetch all info need from the global scope.
-     */
-    function showReportDialog(options) {
-        if (options === void 0) { options = {}; }
-        if (!options.eventId) {
-            options.eventId = getCurrentHub().lastEventId();
-        }
-        var client = getCurrentHub().getClient();
-        if (client) {
-            client.showReportDialog(options);
-        }
-    }
-    /**
-     * This is the getter for lastEventId.
-     *
-     * @returns The last event id of a captured event.
-     */
-    function lastEventId() {
-        return getCurrentHub().lastEventId();
-    }
-    /**
-     * This function is here to be API compatible with the loader.
-     * @hidden
-     */
-    function forceLoad() {
-        // Noop
-    }
-    /**
-     * This function is here to be API compatible with the loader.
-     * @hidden
-     */
-    function onLoad(callback) {
-        callback();
-    }
-    /**
-     * A promise that resolves when all current events have been sent.
-     * If you provide a timeout and the queue takes longer to drain the promise returns false.
-     *
-     * @param timeout Maximum time in ms the client should wait.
-     */
-    function flush(timeout) {
-        var client = getCurrentHub().getClient();
-        if (client) {
-            return client.flush(timeout);
-        }
-        return SyncPromise.reject(false);
-    }
-    /**
-     * A promise that resolves when all current events have been sent.
-     * If you provide a timeout and the queue takes longer to drain the promise returns false.
-     *
-     * @param timeout Maximum time in ms the client should wait.
-     */
-    function close(timeout) {
-        var client = getCurrentHub().getClient();
-        if (client) {
-            return client.close(timeout);
-        }
-        return SyncPromise.reject(false);
-    }
-    /**
-     * Wrap code within a try/catch block so the SDK is able to capture errors.
-     *
-     * @param fn A function to wrap.
-     *
-     * @returns The result of wrapped function call.
-     */
-    function wrap$1(fn) {
-        return wrap(fn)(); // tslint:disable-line:no-unsafe-any
-    }
-
-    var windowIntegrations = {};
-    // This block is needed to add compatibility with the integrations packages when used with a CDN
-    // tslint:disable: no-unsafe-any
-    var _window = getGlobalObject();
-    if (_window.Sentry && _window.Sentry.Integrations) {
-        windowIntegrations = _window.Sentry.Integrations;
-    }
-    // tslint:enable: no-unsafe-any
-    var INTEGRATIONS = __assign({}, windowIntegrations, CoreIntegrations, BrowserIntegrations);
-
-    exports.BrowserClient = BrowserClient;
-    exports.Hub = Hub;
-    exports.Integrations = INTEGRATIONS;
-    exports.SDK_NAME = SDK_NAME;
-    exports.SDK_VERSION = SDK_VERSION;
-    exports.Scope = Scope;
-    exports.Transports = index;
-    exports.addBreadcrumb = addBreadcrumb;
-    exports.addGlobalEventProcessor = addGlobalEventProcessor;
-    exports.captureEvent = captureEvent;
-    exports.captureException = captureException;
-    exports.captureMessage = captureMessage;
-    exports.close = close;
-    exports.configureScope = configureScope;
-    exports.defaultIntegrations = defaultIntegrations;
-    exports.flush = flush;
-    exports.forceLoad = forceLoad;
-    exports.getCurrentHub = getCurrentHub;
-    exports.getHubFromCarrier = getHubFromCarrier;
-    exports.init = init;
-    exports.lastEventId = lastEventId;
-    exports.onLoad = onLoad;
-    exports.setContext = setContext;
-    exports.setExtra = setExtra;
-    exports.setExtras = setExtras;
-    exports.setTag = setTag;
-    exports.setTags = setTags;
-    exports.setUser = setUser;
-    exports.showReportDialog = showReportDialog;
-    exports.withScope = withScope;
-    exports.wrap = wrap$1;
-
-    return exports;
-
-}({}));
-//# sourceMappingURL=bundle.js.map
diff --git a/website/main.html b/website/main.html
deleted file mode 100644
index 768dec3cb57..00000000000
--- a/website/main.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{# This file is an entrypoint for mkdocs theme, not an actual website page #}
-
-{% set language = config.theme.language %}
-{% set direction = config.theme.direction %}
-{% set is_amp = config.extra.is_amp %}
-{% set is_blog = config.extra.is_blog %}
-{% set single_page = config.extra.single_page %}
-{% set no_footer = True %}
-{% set og_type = 'article' %}
-
-{% if page and page.abs_url %}
-    {% set url = 'https://clickhouse.com' + page.abs_url %}
-{% endif %}
-
-{% if page and page.canonical_url %}
-    {% set canonical_url = page.canonical_url %}
-{% endif %}
-
-{% if page and page.meta and page.meta.title %}
-    {% set title = page.meta.title %}
-{% elif page and page.title and not page.is_homepage and (not page.title.startswith('hidden-')) %}
-    {% set title = page.title + ' | ' + config.site_name %}
-{% elif page and page.title and not page.is_homepage and (not page.title.startswith('hidden-')) and page.ancestors %}
-    {% set title = (page.ancestors | first).title + ' | ' + config.site_name %}
-{% else %}
-    {% set title = config.site_name %}
-{% endif %}
-{% set title = title.strip() %}
-{% if page and page.content and not single_page %}
-    {% set description = page.content|striptags %}
-    {% set description = description.replace('¶','')[0:120] %}
-{% endif %}
-
-{% set data_version = 'master' %}
-{% set data_single_page = 'true' if config.extra.single_page else 'false' %}
-
-{% if is_amp %}
-    {% include "templates/docs/amp.html" %}
-{% else %}
-    {% if not is_blog %}
-        {% set extra_html_attrs = 'data-version="' + data_version + '" data-single-page="' + data_single_page + '"' %}
-        {% set extra_body_attrs = 'data-spy="scroll" data-target="#toc" data-offset="80"' %}
-    {% else %}
-        {% set extra_body_attrs = 'class="blog"' %}
-    {% endif %}
-    {% extends "templates/base.html" %}
-
-    {% block content %}
-    {% if not is_blog %}
-        {% include "templates/docs/nav.html" %}
-        <div class="docs container-fluid mt-3{% if direction == 'rtl' %} text-right{% endif %}">
-            <div class="row justify-content-end{% if not single_page %} justify-content-xl-center{% endif %}">
-                {% include "templates/docs/sidebar.html" %}
-                {% include "templates/docs/content.html" %}
-                {% if not config.extra.single_page %}
-                    {% include "templates/docs/toc.html" %}
-                {% endif %}
-            </div>
-        </div>
-    {% else %}
-        {% include "templates/blog/nav.html" %}
-        <div class="container">
-            <div class="row">
-                {% include "templates/blog/content.html" %}
-            </div>
-        </div>
-        {% if page and page.meta.is_index %}
-            {% include "templates/index/community.html" %}
-        {% endif %}
-        {% include "templates/blog/footer.html" %}
-    {% endif %}
-
-    {% endblock %}
-{% endif %}
diff --git a/website/opensearch.xml b/website/opensearch.xml
deleted file mode 100644
index f6ab0434bc1..00000000000
--- a/website/opensearch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns:moz="http://www.mozilla.org/2006/browser/search/" 
-      xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>ClickHouse</ShortName>
-  <Description>Search ClickHouse</Description>
-  <InputEncoding>UTF-8</InputEncoding>
-  <Image width="16" height="16" type="image/x-icon">https://clickhouse.com/favicon.ico</Image>
-  <Url type="text/html" method="GET"
-      template="https://www.google.com/search?q={searchTerms}+site%3Aclickhouse.com"/>
-  <Url type="application/x-suggestions+json" method="GET"
-       template="https://suggestqueries.google.com/complete/search?output=chrome&amp;q={searchTerms}"/>
-</OpenSearchDescription>
diff --git a/website/robots.txt b/website/robots.txt
deleted file mode 100644
index f7d6bd76a33..00000000000
--- a/website/robots.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-User-agent: *
-Disallow: /cdn-cgi/
-Allow: /
-Host: https://clickhouse.com
-Sitemap: https://clickhouse.com/sitemap-index.xml
diff --git a/website/sitemap-index.xml b/website/sitemap-index.xml
deleted file mode 100644
index bcaf6a3fe19..00000000000
--- a/website/sitemap-index.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-   <sitemap>
-      <loc>https://clickhouse.com/docs/en/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.com/docs/zh/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.com/docs/ru/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.com/docs/ja/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.com/blog/en/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.com/blog/ru/sitemap.xml</loc>
-   </sitemap>
-   <sitemap>
-      <loc>https://clickhouse.com/sitemap-static.xml</loc>
-   </sitemap>
-</sitemapindex>
diff --git a/website/sitemap-static.xml b/website/sitemap-static.xml
deleted file mode 100644
index 88888e31b3b..00000000000
--- a/website/sitemap-static.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url>
-  <loc>https://clickhouse.com/</loc>
-  <changefreq>daily</changefreq>
-</url>
-  <url>
-  <loc>https://clickhouse.com/company/</loc>
-  <changefreq>weekly</changefreq>
-</url>
-<url>
-  <loc>https://clickhouse.com/benchmark/dbms/</loc>
-  <changefreq>weekly</changefreq>
-</url>
-<url>
-  <loc>https://clickhouse.com/benchmark/hardware/</loc>
-  <changefreq>weekly</changefreq>
-</url>
-<url>
-  <loc>https://clickhouse.com/codebrowser/ClickHouse/index.html</loc>
-  <changefreq>daily</changefreq>
-</url>
-</urlset>
diff --git a/website/src/js/components/case-study-card.js b/website/src/js/components/case-study-card.js
deleted file mode 100644
index cb20b9d6ac7..00000000000
--- a/website/src/js/components/case-study-card.js
+++ /dev/null
@@ -1,40 +0,0 @@
-class CaseStudyCard {
-	
-	constructor($el) {
-		this.onOpen = this.onOpen.bind(this)
-		this.onToggle = this.onToggle.bind(this)
-		this.$el = $el
-		this.$el.addEventListener('click', this.onOpen)
-		this.$el.querySelector('.case-study-card-toggle').addEventListener('click', this.onToggle)
-		this.open = false
-	}
-
-	onOpen() {
-		this.open = true
-		this.$el.classList.toggle('is-open', this.open)
-		this.$el.classList.toggle('is-closing', !this.open)
-		this.closeOthers()
-	}
-
-	onToggle(event) {
-		event.stopPropagation()
-		this.open = !this.$el.classList.contains('is-open')
-		this.$el.classList.toggle('is-open', this.open)
-		this.$el.classList.toggle('is-closing', !this.open)
-		this.closeOthers()
-	}
-
-	closeOthers() {
-		if (this.open) {
-			document.querySelectorAll('.case-study-card').forEach(($el) => {
-				if (!$el.isSameNode(this.$el)) {
-					$el.classList.toggle('is-closing', $el.classList.contains('is-open'))
-					$el.classList.toggle('is-open', false)
-				}
-			})
-		}
-	}
-
-}
-
-document.querySelectorAll('.case-study-card').forEach(($el) => new CaseStudyCard($el))
diff --git a/website/src/js/main.js b/website/src/js/main.js
deleted file mode 100644
index 460cbcc4602..00000000000
--- a/website/src/js/main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import './components/case-study-card'
-import './utilities/equalize-heights'
-import './utilities/greenhouse'
diff --git a/website/src/js/utilities/equalize-heights.js b/website/src/js/utilities/equalize-heights.js
deleted file mode 100644
index 9d3dc6c604a..00000000000
--- a/website/src/js/utilities/equalize-heights.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const $allElements = document.querySelectorAll('[equalize-heights]')
-const groupedElements = {}
-
-$allElements.forEach(($el) => {
-	const group = $el.getAttribute('equalize-heights')
-	groupedElements[group] = groupedElements[group] || []
-	groupedElements[group].push($el)
-})
-
-function resizeElements() {
-	Object.entries(groupedElements).forEach(([group, $elements]) => {
-		$elements.forEach(($el) => {
-			const styles = window.getComputedStyle($el)
-			if ('none' === styles.getPropertyValue('display')) {
-				$el.style.display = 'block'
-			}
-			$el.style.minHeight = 'auto'
-		})
-		const minHeight = $elements.reduce((max, $el) => {
-			if ($el.offsetHeight > max) {
-				max = $el.offsetHeight
-			}
-			return max
-		}, 0)
-		$elements.forEach(($el) => {
-			$el.style.display = null
-			$el.style.minHeight = `${minHeight}px`
-		})
-	})
-}
-	
-window.addEventListener('resize', resizeElements)
-window.addEventListener('orientationchange', resizeElements)
-
-resizeElements()
diff --git a/website/src/js/utilities/greenhouse.js b/website/src/js/utilities/greenhouse.js
deleted file mode 100644
index 0b87d1a937b..00000000000
--- a/website/src/js/utilities/greenhouse.js
+++ /dev/null
@@ -1,16 +0,0 @@
-window.addEventListener('load', () => {
-	if (-1 !== window.location.search.indexOf('gh_jid=')) {
-		const scrollY = window.scrollY
-		const offsetTop = document.querySelector('#jobs').getBoundingClientRect().top
-		window.scrollTo({
-			left: 0,
-			top: scrollY + offsetTop,
-		})
-		window.setTimeout(() => {
-			window.scrollTo({
-				left: 0,
-				top: scrollY + offsetTop - 40,
-			})
-		}, 50)
-	}
-})
diff --git a/website/src/scss/_variables.scss b/website/src/scss/_variables.scss
deleted file mode 100644
index 55b06ac8409..00000000000
--- a/website/src/scss/_variables.scss
+++ /dev/null
@@ -1,316 +0,0 @@
-// Colors
-
-$white: #fff;
-$black: #212529;
-
-$gray-100: #f1f6f9;
-$gray-500: #d6dbdf;
-$gray-700: #6c757d;
-$gray-900: #495057;
-
-$color-brand-primary: #ffcc00;
-$color-brand-secondary: #ff3939;
-
-$color-primary-accent-yellow: #ffcc00;
-$color-primary-accent-light-yellow: #fffaf0;
-$color-primary-accent-blue: #257af4;
-$color-primary-accent-light-blue: #e3f1fe;
-
-$color-secondary-accent-orange: #ff8c00;
-$color-secondary-accent-light-orange: #ffe4b5;
-$color-secondary-accent-red: #ff3939;
-$color-secondary-accent-light-red: #ffe4e1;
-
-$grays: (
-    "100": $gray-100,
-    "500": $gray-500,
-	"700": $gray-700,
-    "900": $gray-900
-);
-
-$colors: (
-	"brand-primary": $color-brand-primary,
-	"brand-secondary": $color-brand-secondary,
-
-	"primary-accent-yellow": $color-brand-primary,
-	"primary-accent-light-yellow": $color-primary-accent-light-yellow,
-	"primary-accent-blue": $color-primary-accent-blue,
-	"primary-accent-light-blue": $color-primary-accent-light-blue,
-
-	"secondary-accent-orange": $color-secondary-accent-orange,
-	"secondary-accent-light-orange": $color-secondary-accent-light-orange,
-	"secondary-accent-red": $color-brand-secondary,
-	"secondary-accent-light-red": $color-secondary-accent-light-red,
-);
-
-$theme-colors: (
-	"primary": $color-brand-primary,
-	"primary-light": $color-primary-accent-light-yellow,
-	"secondary": $black,
-	"secondary-light": $white,
-	"tertiary": $color-primary-accent-blue,
-	"tertiary-light": $color-primary-accent-light-blue,
-
-	"white": $white,
-	"black": $black,
-
-	"blue": $color-primary-accent-blue,
-	"light-blue": $color-primary-accent-light-blue,
-	"yellow": $color-primary-accent-yellow,
-	"light-yellow": $color-primary-accent-light-yellow,
-	"orange": $color-secondary-accent-orange,
-	"light-orange": $color-secondary-accent-light-orange,
-	"red": $color-secondary-accent-red,
-	"light-red": $color-secondary-accent-light-red,
-
-	"light": $gray-100,
-	"medium": $gray-500,
-	"dark": $gray-900
-);
-
-$link-color: $color-secondary-accent-orange;
-$link-hover-color: $color-secondary-accent-orange;
-
-
-// Options
-//
-// Quickly modify global styling by enabling or disabling optional features.
-
-$enable-caret:                                true;
-$enable-rounded:                              true;
-$enable-shadows:                              false;
-$enable-gradients:                            false;
-$enable-transitions:                          true;
-$enable-grid-classes:                         true;
-$enable-responsive-font-sizes:                true;
-
-
-// Spacing
-//
-// Control the default styling of most Bootstrap elements by modifying these
-// variables. Mostly focused on spacing.
-// You can add more entries to the $spacers map, should you need more variation.
-
-$spacer: 8px;
-$spacers: (
-	0: 0,
-	1: $spacer,
-	2: ($spacer * 2),
-	3: ($spacer * 3),
-	4: ($spacer * 4),
-	5: ($spacer * 5),
-	6: ($spacer * 6),
-	7: ($spacer * 7),
-	8: ($spacer * 8),
-	9: ($spacer * 9),
-	10: ($spacer * 10),
-	12: ($spacer * 12),
-	15: ($spacer * 15)
-);
-
-
-// Body
-//
-// Settings for the `<body>` element.
-
-$body-bg:                   $white;
-$body-color:                $black;
-
-
-// Grid breakpoints
-//
-// Define the minimum dimensions at which your layout will change,
-// adapting to different screen sizes, for use in media queries.
-
-$grid-breakpoints: (
-  xxs: 0,
-  xs: 400px,
-  sm: 616px,
-  md: 768px,
-  lg: 980px,
-  xl: 1240px
-);
-
-
-// Grid containers
-//
-// Define the maximum width of `.container` for different screen sizes.
-
-$container-max-widths: (
-  xs: 576px,
-  sm: 576px,
-  md: 958px,
-  lg: 1008px,
-  xl: 1118px
-);
-
-// Grid columns
-//
-// Set the number of columns and specify the width of the gutters.
-
-$grid-columns:                12;
-$grid-gutter-width:           40px;
-$grid-row-columns:            6;
-
-
-// Components
-//
-// Define common padding and border radius sizes and more.
-
-$line-height-lg:              1.5;
-$line-height-sm:              1.5;
-
-$border-width:                1px;
-$border-color:                $gray-500;
-
-$border-radius:               8px;
-$border-radius-lg:            8px;
-$border-radius-sm:            4px;
-
-$box-shadow-sm:               0 2px 14px rgba($gray-700, .2);
-$box-shadow:                  0 8px 20px rgba($gray-700, .2);
-$box-shadow-lg:               0 12px 32px rgba($gray-700, .2);
-
-
-// Typography
-//
-// Font, line-height, and color for body text, headings, and more.
-
-$font-family-sans-serif:      "Noto Sans", sans-serif;
-
-$font-size-base:              1rem; // Assumes the browser default, typically `16px`
-$font-size-xl:                $font-size-base * 1.25; // 20px
-$font-size-lg:                $font-size-base * 1.125; // 18px
-$font-size-sm:                $font-size-base * .875; // 14px
-$font-size-xs:                $font-size-base * .625; // 10px
-
-$font-weight-light:           300;
-$font-weight-normal:          400;
-$font-weight-medium:          500;
-$font-weight-semibold:        600;
-$font-weight-bold:            700;
-
-$font-weight-base:            $font-weight-normal;
-$line-height-base:            1.5;
-
-$h1-font-size:                40px;
-$h2-font-size:                32px;
-$h3-font-size:                28px;
-$h4-font-size:                24px;
-$h5-font-size:                18px;
-$h6-font-size:                14px;
-
-$headings-margin-bottom:      $spacer * 2;
-$headings-font-family:        "Hind Siliguri", sans-serif;
-$headings-font-weight:        500;
-$headings-line-height:        1.125;
-$headings-color:              null;
-
-$display1-size:               64px;
-$display2-size:               40px;
-$display3-size:               32px;
-$display4-size:               28px;
-$display5-size:               20px;
-$display6-size:               14px;
-
-$display1-weight:             600;
-$display2-weight:             600;
-$display3-weight:             500;
-$display4-weight:             500;
-$display5-weight:             500;
-$display6-weight:             700;
-$display-line-height:         $headings-line-height;
-
-$lead-font-size:              22px;
-$lead-font-weight:            400;
-
-$text-muted:                  $gray-700;
-
-
-// Buttons
-//
-// For each of Bootstrap's buttons, define text, background, and border color.
-
-$btn-padding-y:               12px;
-$btn-padding-x:               32px;
-$btn-font-family:             inherit;
-$btn-font-size:               14px;
-$btn-line-height:             20px;
-$btn-white-space:             null; // Set to `nowrap` to prevent text wrapping
-
-$btn-padding-y-sm:            6px;
-$btn-padding-x-sm:            12px;
-$btn-font-size-sm:            12px;
-$btn-line-height-sm:          16px;
-
-$btn-padding-y-lg:            16px;
-$btn-padding-x-lg:            32px;
-$btn-font-size-lg:            18px;
-$btn-line-height-lg:          26px;
-
-$btn-border-width:            1px;
-
-$btn-font-weight:             $font-weight-bold;
-$btn-box-shadow:              none;
-$btn-focus-width:             0;
-$btn-focus-box-shadow:        none;
-$btn-disabled-opacity:        .65;
-$btn-active-box-shadow:       none;
-
-$btn-link-disabled-color:     $gray-500;
-
-$btn-block-spacing-y:         24px;
-
-// Allows for customizing button radius independently from global border radius
-$btn-border-radius:           $border-radius;
-$btn-border-radius-lg:        $border-radius-lg;
-$btn-border-radius-sm:        $border-radius-sm;
-
-$btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
-
-
-// Navs
-
-$nav-link-padding-y:                0;
-$nav-link-padding-x:                0;
-$nav-link-disabled-color:           $gray-500;
-
-$nav-tabs-border-color:             $gray-700;
-$nav-tabs-border-width:             $border-width;
-$nav-tabs-border-radius:            $border-radius;
-$nav-tabs-link-hover-border-color:  transparent;
-$nav-tabs-link-active-color:        $color-primary-accent-blue;
-$nav-tabs-link-active-bg:           $white;
-$nav-tabs-link-active-border-color: $gray-700;
-
-
-// Navbar
-
-$navbar-padding-y:            24px;
-$navbar-padding-x:            0;
-
-$navbar-nav-height:           46px;
-$navbar-height-xl:            80px;
-
-// Cards
-
-$card-spacer-y:                     24px;
-$card-spacer-x:                     24px;
-$card-border-width:                 $border-width;
-$card-border-radius:                $border-radius;
-$card-border-color:                 $border-color;
-$card-inner-border-radius:          subtract($card-border-radius, $card-border-width);
-$card-cap-bg:                       $gray-100;
-$card-cap-color:                    null;
-$card-height:                       null;
-$card-color:                        null;
-$card-bg:                           $white;
-
-$card-img-overlay-padding:          24px;
-
-$card-group-margin:                 $grid-gutter-width / 2;
-$card-deck-margin:                  $card-group-margin;
-
-$card-columns-count:                3;
-$card-columns-gap:                  $grid-gutter-width;
-$card-columns-margin:               $grid-gutter-width;
diff --git a/website/src/scss/bootstrap.scss b/website/src/scss/bootstrap.scss
deleted file mode 100644
index 0f2559f260f..00000000000
--- a/website/src/scss/bootstrap.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import 'variables';
-@import '~bootstrap';
diff --git a/website/src/scss/components/_btn.scss b/website/src/scss/components/_btn.scss
deleted file mode 100644
index fd3a45c4cd5..00000000000
--- a/website/src/scss/components/_btn.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-.btn {
-	@media screen and (max-width: 978.98px) {
-		padding: 8px 16px;
-	}
-}
-
-.btn-lg {
-	@media screen and (max-width: 978.98px) {
-		padding: 12px 24px;
-	}
-}
-
-.btn-primary {
-	color: $black;
-
-	&:active,
-	&:hover {
-		color: $black;
-	}
-}
-
-.btn-outline-primary {
-	background: map-get($theme-colors, "primary-light");
-	border-color: map-get($theme-colors, "primary");
-	color: $black;
-
-	&:active,
-	&:hover {
-		background: map-get($theme-colors, "primary");
-		border-color: map-get($theme-colors, "primary");
-		color: $black;
-	}
-}
-
-.btn-secondary {
-	border-color: map-get($theme-colors, "secondary");
-	color: map-get($theme-colors, "secondary-light");
-
-	&:active,
-	&:hover {
-		background: map-get($theme-colors, "secondary-light");
-		border-color: map-get($theme-colors, "secondary");
-		color: map-get($theme-colors, "secondary");
-	}
-}
-
-.btn-outline-secondary {
-	background: map-get($theme-colors, "secondary-light");
-	border-color: map-get($theme-colors, "secondary");
-	color: map-get($theme-colors, "secondary");
-
-	&:active,
-	&:hover {
-		background: map-get($theme-colors, "secondary");
-		border-color: map-get($theme-colors, "secondary");
-		color: map-get($theme-colors, "secondary-light");
-	}
-}
-
-.btn-tertiary {
-	border-color: map-get($theme-colors, "tertiary");
-	color: $white;
-
-	&:active,
-	&:hover {
-		background: map-get($theme-colors, "tertiary");
-		border-color: map-get($theme-colors, "tertiary");
-		color: $white;
-	}
-}
-
-.btn-outline-tertiary {
-	background: map-get($theme-colors, "tertiary-light");
-	color: map-get($theme-colors, "tertiary");
-
-	&:active,
-	&:hover {
-		background: map-get($theme-colors, "tertiary");
-		color: $white;
-	}
-}
diff --git a/website/src/scss/components/_btns.scss b/website/src/scss/components/_btns.scss
deleted file mode 100644
index bed4e794023..00000000000
--- a/website/src/scss/components/_btns.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-.btns {
-	align-items: center;
-	display: grid;
-	column-gap: $spacer * 3;
-	row-gap: $spacer * 2;
-	grid-auto-flow: column;
-	justify-content: center;
-
-	@media screen and (max-width: 767.98px) {
-		grid-auto-flow: row;
-	}
-}
-
-.btns.btns-lg {
-	column-gap: $spacer * 5;
-}
-
-.btns.is-2 {
-	grid-template-columns: 1fr 1fr;
-
-	@media screen and (max-width: 767.98px) {
-		grid-template-columns: 1fr;
-	}
-}
-
-.btns.is-3 {
-	grid-template-columns: 1fr 1fr 1fr;
-
-	@media screen and (max-width: 767.98px) {
-		grid-template-columns: 1fr;
-	}
-}
diff --git a/website/src/scss/components/_card.scss b/website/src/scss/components/_card.scss
deleted file mode 100644
index 8691234872b..00000000000
--- a/website/src/scss/components/_card.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-.card {
-	box-shadow: $box-shadow;
-	overflow: hidden;
-	position: relative;
-	transition: box-shadow 0.2s, transform 0.2s;
-	width: 100%;
-
-	&-body {
-		position: relative;
-		z-index: 10;
-	}
-}
-
-.card.is-large .card-body {
-	padding: 40px;
-}
-
-.card.bg-primary-light {
-	border-color: $color-brand-primary;
-}
-
-.card.has-dark-border {
-	border-color: $gray-700;
-}
-
-.card.has-pattern:before,
-.card.has-pattern:after {
-	background-repeat: no-repeat;
-	background-size: auto 100%;
-	bottom: 0;
-	content: '';
-	display: block;
-	position: absolute;
-	top: 0;
-	width: 72px;
-}
-
-.card.has-pattern:before {
-	background-image: url(#{'../images/backgrounds/bg-card-pattern-blue-1.png'});
-	background-position: left top;
-	left: 0;
-}
-
-.card.has-pattern:after {
-	background-image: url(#{'../images/backgrounds/bg-card-pattern-blue-2.png'});
-	background-position: right top;
-	right: 0;
-}
-
-a.card:active,
-a.card:hover,
-.card.has-hover:active,
-.card.has-hover:hover {
-	box-shadow: $box-shadow-lg;
-	transform: translateY(-8px);
-}
-
-a.card:after,
-.card.has-hover:after,
-.card.has-highlight:after {
-	content: '';
-	display: block;
-	height: 8px;
-	margin-top: auto;
-	transition: background 0.2s;
-	width: 100%;
-}
-
-a.card:active:after,
-a.card:hover:after,
-.card.has-hover:active:after,
-.card.has-hover:hover:after,
-.card.has-highlight:after {
-	background: $color-primary-accent-light-blue;
-}
diff --git a/website/src/scss/components/_case-study-card.scss b/website/src/scss/components/_case-study-card.scss
deleted file mode 100644
index d809e770215..00000000000
--- a/website/src/scss/components/_case-study-card.scss
+++ /dev/null
@@ -1,206 +0,0 @@
-.case-study-cards {
-	column-gap: $grid-gutter-width;
-	display: grid;
-	grid-template-columns: 1fr;
-	row-gap: 40px;
-	padding-bottom: 40px;
-	position: relative;
-
-	> div {
-		align-items: stretch;
-		display: flex;
-	}
-
-	&:before {
-		background: $gray-500;
-		bottom: 0;
-		content: '';
-		display: block;
-		left: 20px;
-		position: absolute;
-		top: 40px;
-		width: 100vw;
-	}
-
-	@media screen and (min-width: 980px) {
-		grid-template-columns: repeat(2, minmax(0, 1fr));
-		row-gap: 80px;
-		padding-bottom: 120px;
-
-		&:before {
-			left: -40px;
-			top: 120px;
-		}
-	}
-}
-
-.case-study-card {
-	align-items: stretch;
-	flex-direction: row;
-	flex-shrink: 0;
-	left: 0;
-	transition: 0.2s box-shadow, 0.4s left, 0.4s width, 0s z-index;
-	transition-delay: 0s, 0.6s, 0.6s, 0s;
-	width: 100%;
-	z-index: 2;
-
-	@media screen and (max-width: 979.98px) {
-		.row {
-			min-height: 0 !important;
-		}
-	}
-
-	@media screen and (min-width: 980px) {
-
-		&:active,
-		&:hover {
-			box-shadow: $box-shadow-lg;
-		}
-	
-		&:not(.is-open) {
-			cursor: pointer;
-		}
-	
-		&.is-open {
-			transform: none !important;
-			transition-delay: 0s, 0s, 0s, 0s;
-			width: calc(200% + #{$grid-gutter-width});
-			z-index: 10;
-		}
-	
-		&.is-closing {
-			z-index: 10;
-		}
-	
-		&.open-left.is-open {
-			left: calc(-100% - #{$grid-gutter-width});
-		}
-		
-		&:before {
-			background: no-repeat url(#{'../images/backgrounds/bg-card-pattern-red.png'});
-			background-position: right center;
-			background-size: contain;
-			content: '';
-			display: block;
-			height: calc(100% - 80px);
-			max-height: 224px;
-			max-width: 234px;
-			position: absolute;
-			right: 0;
-			top: 40px;
-			transform: translateX(30%);
-			transition: 0.4s transform;
-			transition-delay: 0.6s;
-			width: 100%;
-			z-index: 1;
-
-			@media screen and (min-width: 1240px) {
-				transform: translateX(50%);
-			}
-		}
-	
-		&.is-open:before {
-			transform: translateX(70%);
-			transition-delay: 0s;
-		}
-	
-		&-wrap {
-			align-items: stretch;
-			display: flex;
-			flex-shrink: 0;
-			min-height: 304px;
-			position: relative;
-			transition: 0.4s width;
-			transition-delay: 0.6s;
-			width: calc(200% + #{2px + $grid-gutter-width});
-			z-index: 2;
-		}
-	
-		&.is-open &-wrap {
-			transition-delay: 0s;
-			width: 100%;
-		}
-	
-		&-body {
-			display: flex;
-			flex-direction: column;
-			padding-right: 80px !important;
-	
-			> .row {
-				align-self: stretch;
-			}
-		}
-	
-		&-toggle {
-			background: $white;
-			box-shadow: $box-shadow;
-			border-radius: 100%;
-			cursor: pointer;
-			height: 56px;
-			position: relative;
-			width: 56px;
-	
-			&:before,
-			&:after {
-				background: $color-primary-accent-blue;
-				content: '';
-				display: block;
-				height: 4px;
-				left: calc(50% - 15px);
-				position: absolute;
-				top: calc(50% - 2px);
-				transition: opacity 0.2s, transform 0.2s;
-				width: 30px;
-			}
-	
-			&:after {
-				transform: rotate(90deg);
-			}
-		}
-	
-		&.is-open &-toggle:before {
-			opacity: 0;
-			transform: rotate(-90deg);
-		}
-	
-		&.is-open &-toggle:after {
-			transform: rotate(0);
-		}
-	
-		.col-lg-3 {
-			left: -60%;
-			position: relative;
-			transition: 0.4s left;
-			transition-delay: 0.6s;
-
-			@media screen and (min-width: 980px) {
-				flex: 0 0 250px;
-				max-width: 250px;
-				width: 250px;
-			}
-		}
-	
-		&.is-open .col-lg-3 {
-			left: 0;
-			transition-delay: 0s;
-		}
-	
-		.col-lg-auto {
-			opacity: 0;
-			transform: translateX(24px);
-			transition: 0.4s opacity, 0.4s transform;
-			transition-delay: 0.2s;
-
-			@media screen and (min-width: 980px) {
-				max-width: 605px;
-				width: calc(100% - 319px);
-			}
-		}
-	
-		&.is-open .col-lg-auto {
-			opacity: 1;
-			transform: none;
-			transition-delay: 0.2s;
-		}
-	}
-}
diff --git a/website/src/scss/components/_footer.scss b/website/src/scss/components/_footer.scss
deleted file mode 100644
index eae332bcec3..00000000000
--- a/website/src/scss/components/_footer.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.footer {
-	&-copy,
-	&-links {
-		white-space: nowrap;
-	}
-}
diff --git a/website/src/scss/components/_form.scss b/website/src/scss/components/_form.scss
deleted file mode 100644
index 1f4aa09c32b..00000000000
--- a/website/src/scss/components/_form.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-form {
-	.form-group {
-		position: relative;
-	}
-
-	.form-group.is-select:before {
-		border-left: 6px solid transparent;
-		border-right: 6px solid transparent;
-		border-top: 8px solid $gray-700;
-		content: '';
-		display: block;
-		position: absolute;
-		right: 33px;
-		top: calc(50% - 4px);
-		z-index: 10;
-	}
-
-	.form-control {
-		border: 1px solid $gray-700;
-		border-radius: 6px;
-		box-shadow: $box-shadow;
-		color: $black;
-		height: auto;
-		line-height: 20px;
-		min-height: 44px;
-		padding: 12px 16px;
-		width: 100%;
-
-		&:focus {
-			border-color: $black;
-			box-shadow: $box-shadow;
-			color: $black;
-		}
-
-		&::placeholder {
-			color: $gray-700;
-		}
-	}
-
-	select.form-control {
-		appearance: none;
-		padding-right: 24px;
-		white-space: pre-wrap;
-	}
-
-	select.form-control:not([data-chosen]) {
-		color: $gray-700;
-	}
-
-	.btn-secondary:active,
-	.btn-secondary:hover {
-		color: $black;
-		background: $color-brand-primary;
-		border-color: $color-brand-primary;
-	}
-}
diff --git a/website/src/scss/components/_hero.scss b/website/src/scss/components/_hero.scss
deleted file mode 100644
index 61b22b3e32b..00000000000
--- a/website/src/scss/components/_hero.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-.hero {
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: cover;
-	overflow: visible;
-	position: relative;
-
-	&-bg {
-		background-repeat: no-repeat;
-		background-position: center;
-		background-size: cover;
-		display: block;
-		height: 100%;
-		left: 50%;
-		position: absolute;
-		top: 0;
-		transform: translateX(-50%);
-		z-index: 1;
-	}
-
-	> .container {
-		position: relative;
-		z-index: 2;
-	}
-}
-
-.hero.has-offset {
-	margin-bottom: -160px;
-	padding-bottom: 160px;
-}
-
-.base-hero {
-	height:22.5vw;
-	max-height:324px;
-	min-height:280px;
-}
-.index-hero {
-  background-image:url('/images/backgrounds/bg-hero-home.svg');
-  height:68vw;
-  max-height:980px;
-  max-width:2448px;
-  width:170vw;
-}
-.other-hero {
-  background-image: url('/images/backgrounds/bg-hero.svg');
-  max-width: 2448px;
-  width: 170vw;
-}
-.bg-footer-cta {
-  background-image:url('/images/backgrounds/bg-footer-cta.svg');
-  width:2448px;
-}
-.quickstart-bg {
-  background-image:url('/images/backgrounds/bg-quick-start.svg');
-  height:40vw;
-  top:220px;
-  width:170vw;
-}
diff --git a/website/src/scss/components/_hr.scss b/website/src/scss/components/_hr.scss
deleted file mode 100644
index 81ed120367a..00000000000
--- a/website/src/scss/components/_hr.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-hr {
-	background: $gray-100;
-	border: 0;
-	display: block;
-	height: 4px;
-	margin: 0;
-	width: 100%;
-}
-
-hr.is-small {
-	height: 2px;
-}
-
-hr.is-large {
-	height: 8px;
-}
-
-hr.is-medium {
-	background: $gray-500;
-}
-
-hr.is-dark {
-	background: $gray-900;
-}
-
-hr.is-yellow {
-	background: linear-gradient(90deg, $color-secondary-accent-orange 0, $color-secondary-accent-orange 8px, $color-primary-accent-yellow 16px, rgba($color-primary-accent-yellow, 0) 100%);
-	clip-path: polygon(
-		8px 100%,
-		0 100%,
-		0 0,
-		8px 0,
-		8px 100%,
-		16px 100%,
-		16px 0,
-		100% 0,
-		100% 100%
-	);
-	height: 8px;
-}
diff --git a/website/src/scss/components/_icon.scss b/website/src/scss/components/_icon.scss
deleted file mode 100644
index 090720b049a..00000000000
--- a/website/src/scss/components/_icon.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.icon {
-	display: block;
-	height: 48px;
-	margin-bottom: $spacer * 3;
-	object-fit: contain;
-	object-position: center;
-
-	@media screen and (min-width: 576px) {
-		height: 64px;
-	}
-
-	@media screen and (min-width: 980px) {
-		height: 80px;
-	}
-}
diff --git a/website/src/scss/components/_img.scss b/website/src/scss/components/_img.scss
deleted file mode 100644
index f65a4b5ef42..00000000000
--- a/website/src/scss/components/_img.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-img {
-	max-width: 100%;
-}
diff --git a/website/src/scss/components/_kicker.scss b/website/src/scss/components/_kicker.scss
deleted file mode 100644
index bac94510157..00000000000
--- a/website/src/scss/components/_kicker.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.kicker {
-	color: $gray-700;
-	font-family: $headings-font-family;
-	font-size: $font-size-sm;
-	font-weight: $font-weight-semibold;	
-	letter-spacing: 1px;
-	margin: 0;
-}
diff --git a/website/src/scss/components/_lead.scss b/website/src/scss/components/_lead.scss
deleted file mode 100644
index 0d028bca549..00000000000
--- a/website/src/scss/components/_lead.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.lead {
-	@media screen and (max-width: 978.98px) {
-		font-size: $font-size-lg;
-	}
-}
diff --git a/website/src/scss/components/_logo.scss b/website/src/scss/components/_logo.scss
deleted file mode 100644
index bbc91f87284..00000000000
--- a/website/src/scss/components/_logo.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.logo {
-	display: block;
-	height: 36px;
-	max-width: 220px;
-	object-fit: contain;
-	object-position: center;
-	width: 100%;
-}
diff --git a/website/src/scss/components/_navbar.scss b/website/src/scss/components/_navbar.scss
deleted file mode 100644
index ca6bc52630b..00000000000
--- a/website/src/scss/components/_navbar.scss
+++ /dev/null
@@ -1,165 +0,0 @@
-.navbar-clickhouse {
-    border-bottom: 4px solid $gray-100;
-	height: 142px;
-
-	> .container {
-		flex-wrap: wrap;
-	}
-}
-
-.navbar {
-	&-super {
-		flex-shrink: 0;
-		width: 100%;
-
-		ul {
-			list-style: none;
-		}
-
-		li:not(:last-child) {
-			margin-bottom: 0;
-			margin-right: 24px;
-		}
-
-		a {
-			align-items: center;
-			color: $black;
-			display: flex;
-			font-size: $font-size-sm;
-
-			&:active,
-			&:hover {
-				color: $color-primary-accent-blue;
-				text-decoration: none;
-			}
-		}
-
-		img {
-			flex-shrink: 0;
-			margin-right: $spacer * 0.5;
-		}
-	}
-
-	&-brand-clickhouse {
-		background: no-repeat url(#{"../images/logo-clickhouse.svg"});
-		background-size: contain;
-		flex-shrink: 0;
-		height: 28px;
-		margin-right: 48px;
-		padding: 0;
-		width: 180px;
-	}
-
-	&-nav {
-		align-items: center;
-		height: $navbar-nav-height;
-	}
-
-	.nav-item:not(:last-child) {
-		margin-bottom: 0;
-		margin-right: 24px;
-	}
-	
-	.nav-link {
-		color: $black;
-	
-		&:active,
-		&:hover {
-			color: $color-primary-accent-blue;
-		}
-	}
-
-	.navbar-nav {
-		flex-direction: row;
-	}
-
-	@media screen and (max-width: 978.98px) {
-		> .container {
-			padding-left: 20px;
-			padding-right: 20px;
-		}
-
-		.navbar-toggler {
-			height: 24px;
-			padding: 0;
-			width: 24px;
-
-			&:focus {
-				outline: none;
-			}
-		}
-
-		.navbar-toggler-icon {
-			background: no-repeat url(#{"../images/icons/icon-menu.svg"});
-			background-position: center;
-			background-size: contain;
-			height: 24px;
-			width: 24px;
-		}
-		
-		.navbar-collapse {
-			background: $white;
-			border-bottom: 4px solid $gray-100;
-			height: 56px;
-			left: 0;
-			padding: 0 20px 16px;
-			position: absolute;
-			right: 0;
-			top: 100%;
-		}
-
-		.nav-link {
-			font-size: $font-size-sm;
-			white-space: nowrap;
-		}
-	}
-
-	@media screen and (max-width: 615.98px) {
-		.navbar-collapse {
-			height: auto;
-		}
-
-		.navbar-nav {
-			flex-direction: column;
-			height: auto;
-		}
-
-		.nav-item:not(:last-child) {
-			margin-bottom: 16px;
-			margin-right: 0;
-		}
-	}
-
-	@media screen and (max-width: 399.98px) {
-		height: $navbar-height-xl;
-	}
-}
-
-
-.navbar {
-	@for $i from 1 through 8 {
-		&.py-#{$i} {
-			+ div {
-				.anchor-fixer {
-					:target {
-						@media screen and (min-width: 616px) {
-							scroll-margin-top: $navbar-nav-height + $spacer * $i * 2;
-						}
-					}
-				}
-			}
-		}
-	}
-	+ div {
-		.anchor-fixer {
-			:target {
-				@media screen and (max-width: 615.98px) {
-					scroll-margin-top: 73px;
-				}
-				@media screen and (max-width: 399.98px) {
-					scroll-margin-top: $navbar-height-xl;
-				}
-			}
-		}
-	}
-}
diff --git a/website/src/scss/components/_page.scss b/website/src/scss/components/_page.scss
deleted file mode 100644
index a411ff7a15c..00000000000
--- a/website/src/scss/components/_page.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.page {
-	overflow: hidden;
-	width: 100%;
-}
diff --git a/website/src/scss/components/_photo-frame.scss b/website/src/scss/components/_photo-frame.scss
deleted file mode 100644
index 6f8407fe6c3..00000000000
--- a/website/src/scss/components/_photo-frame.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-.photo-frame {
-	background: rgba($white, 0.6);
-	//border: 6px solid $color-primary-accent-blue;
-	border-radius: 100%;
-	box-shadow: $box-shadow;
-	display: block;
-	margin-bottom: $spacer * 3;
-	max-width: 160px;
-	overflow: hidden;
-	position: relative;
-	width: 100%;
-
-	&:before {
-		content: '';
-		display: block;
-		padding-bottom: 100%;
-		width: 100%;
-	}
-
-	img {
-		display: block;
-		height: 100%;
-		left: 0;
-		object-fit: contain;
-		object-position: center;
-		position: absolute;
-		top: 0;
-		width: 100%;
-	}
-}
diff --git a/website/src/scss/components/_pullquote.scss b/website/src/scss/components/_pullquote.scss
deleted file mode 100644
index 7ce2771c6f8..00000000000
--- a/website/src/scss/components/_pullquote.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@use 'sass:math';
-
-.pullquote {
-	position: relative;
-	width: 70%;
-
-	&:before {
-		background: no-repeat url(#{'../images/backgrounds/bg-quotes.svg'});
-		background-position: center;
-		background-size: 100%;
-		bottom: 0;
-		content: '';
-		display: block;
-		mix-blend-mode: multiply;
-		position: absolute;
-		right: $spacer * 7;
-		top: 0;
-		width: calc(100% - #{$spacer * 2});
-		z-index: 2;
-	}
-
-	&-bg {
-		bottom: 0;
-		display: block;
-		position: absolute;
-		right: 0;
-		top: 0;
-		width: calc(50vw + #{100% * math.div(20, 70)});
-		z-index: 1;
-	}
-
-	&-body {
-		padding: ($spacer * 8) ($spacer * 5) ($spacer * 8) 0;
-		position: relative;
-		z-index: 3;
-	}
-
-	&-quote {
-		font-family: $headings-font-family;
-		font-size: 32px;
-		font-weight: $font-weight-bold;
-	}
-
-	&-citation {
-		font-size: $font-size-lg;
-	}
-}
diff --git a/website/src/scss/components/_section.scss b/website/src/scss/components/_section.scss
deleted file mode 100644
index 6243a9326cc..00000000000
--- a/website/src/scss/components/_section.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-.section {
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: cover;
-	overflow: visible;
-	position: relative;
-
-	&-bg {
-		background-repeat: no-repeat;
-		background-position: center;
-		background-size: cover;
-		display: block;
-		height: 100%;
-		left: 50%;
-		position: absolute;
-		top: 0;
-		transform: translateX(-50%);
-		z-index: 1;
-	}
-
-	> .container {
-		position: relative;
-		z-index: 2;
-	}
-}
diff --git a/website/src/scss/components/_severity-table.scss b/website/src/scss/components/_severity-table.scss
deleted file mode 100644
index 2c748a66083..00000000000
--- a/website/src/scss/components/_severity-table.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.severity-table {
-	th {
-		background: $gray-100;
-		font-size: $font-size-sm;
-		padding: 8px 16px;
-	}
-
-	td {
-		border-top: 1px solid $gray-500;
-		padding: 16px 16px;
-	}
-}
diff --git a/website/src/scss/components/_social-icons.scss b/website/src/scss/components/_social-icons.scss
deleted file mode 100644
index 9b55d5d1469..00000000000
--- a/website/src/scss/components/_social-icons.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-.social-icons {
-	align-items: center;
-	display: flex;
-
-	> a {
-		aspect-ratio: 24 / 24; 
-		background: $gray-700;
-		display: block;
-		height: 24px; 
-		width: 24px; 
-		mask-position: center; 
-		mask-repeat: no-repeat;
-		mask-size: contain;
-		transition: 0.2s background;
-
-		&:active,
-		&:hover {
-			background: $black;
-		}
-	}
-
-	> a + a {
-		margin-left: $spacer * 4;
-	}
-
-	&-facebook {
-		mask-image: url('/images/icons/icon-facebook-gray.svg');
-	}
-
-	&-twitter {
-		mask-image: url('/images/icons/icon-twitter-gray.svg');
-		width: 31px;
-	}
-
-	&-linkedin {
-		mask-image: url('/images/icons/icon-linkedin-gray.svg');
-	}
-
-	&-linkedin-alt {
-		mask-image: url('/images/icons/icon-linkedin-alt-gray.svg');
-	}
-}
-
-.social-icons.size-small {
-	> a {
-		height: 20px; 
-		width: 20px;
-
-		&:active,
-		&:hover {
-			background: $black;
-		}
-	}
-
-	> a + a {
-		margin-left: $spacer * 2;
-	}
-}
diff --git a/website/src/scss/components/_tabs.scss b/website/src/scss/components/_tabs.scss
deleted file mode 100644
index 620b86e7d00..00000000000
--- a/website/src/scss/components/_tabs.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-.tabs {
-	position: relative;
-
-	&:before {
-		background: $white;
-		border-radius: ($border-radius - $border-width) ($border-radius - $border-width) 0 0;
-		content: '';
-		display: block;
-		height: $border-radius;
-		left: 1px;
-		position: absolute;
-		right: 1px;
-		top: 68px;
-		z-index: 10;
-		
-		@media screen and (min-width: 1240px) {
-			top: 76px;
-		}
-	}
-
-	&-body {
-		background: $white;
-		border-color: $gray-700;
-		border-radius: $border-radius;
-		border-style: solid;
-		border-width: $border-width;
-		box-shadow: $box-shadow;
-		padding: $spacer * 3;
-
-		@media screen and (min-width: 980px) {
-			padding: $spacer * 4;
-		}
-		
-		@media screen and (min-width: 1240px) {
-			padding: $spacer * 5;
-		}
-	}
-
-	.nav-tabs {
-		border-bottom: 0;
-		flex-wrap: nowrap;
-		height: 68px + $border-radius;
-		margin: -20px -20px #{-($border-radius + $border-width)};
-		mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%);
-		overflow: scroll;
-		overflow-x: scroll;
-		overflow-y: visible;
-		padding: 20px 20px 0;
-		position: relative;
-
-		@media screen and (min-width: 940px) {
-			overflow: visible;
-		}
-		
-		@media screen and (min-width: 1240px) {
-			height: 76px + $border-radius;
-		}
-	}
-
-	.nav-link {
-		align-items: center;
-		border-bottom: 0;
-		color: $gray-700;
-		display: flex;
-		font-size: $font-size-sm;
-		flex-shrink: 0;
-		height: 48px + $border-radius;
-		justify-content: center;
-		padding: 0 12px $border-radius;
-		text-align: center;
-		white-space: nowrap;
-		
-		@media screen and (min-width: 1240px) {
-			height: 56px + $border-radius;
-			padding: 0 16px $border-radius;
-		}
-	}
-
-	.nav-link.active {
-		background: $white;
-		box-shadow: 0 -4px 8px rgba($gray-700, .1);
-		font-weight: $font-weight-bold;
-		padding: 0 16px $border-radius;
-		
-		@media screen and (min-width: 980px) {
-			padding: 0 24px $border-radius;
-		}
-		
-		@media screen and (min-width: 1240px) {
-			padding: 0 32px $border-radius;
-		}
-	}
-}
-
-.tab-pane {
-	pre {
-		background: $black;
-		border-radius: 16px;
-		color: $white;
-		padding: ($spacer * 3) ($spacer * 2);
-		
-		@media screen and (min-width: 1240px) {
-			padding: ($spacer * 4) ($spacer * 3);
-		}
-	}
-}
diff --git a/website/src/scss/components/_trailing-link.scss b/website/src/scss/components/_trailing-link.scss
deleted file mode 100644
index a2c08ff2543..00000000000
--- a/website/src/scss/components/_trailing-link.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-.trailing-link {
-	align-items: center;
-	color: $black;
-	display: flex;
-	font-size: $font-size-sm;
-	font-weight: $font-weight-bold;
-
-	&:after {
-		background: no-repeat url(#{'../images/icons/icon-arrow.svg'});
-		background-position: right center;
-		background-size: contain;
-		content: '';
-		display: block;
-		height: 12px;
-		transition: 0.2s transform;
-		width: 20px;
-	}
-
-	&:active,
-	&:hover {
-		color: $black;
-		text-decoration: none;
-
-		&:after {
-			transform: translateX(8px);
-		}
-	}
-
-	&.span-full:after {
-		margin-left: auto;
-	}
-}
diff --git a/website/src/scss/components/_ul.scss b/website/src/scss/components/_ul.scss
deleted file mode 100644
index 2dc92a0d211..00000000000
--- a/website/src/scss/components/_ul.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-ul {
-	list-style-type: square;
-	padding-left: 1.25em;
-
-	li:not(:last-child) {
-		margin-bottom: ($spacer * 2);
-	}
-
-	li::marker {
-		color: $color-brand-secondary;
-	}
-}
-
-ul.has-separators {
-	list-style: none;
-	padding: 0;
-
-	li:not(:last-child) {
-		border-bottom: 4px solid $gray-100;
-		margin-bottom: $spacer * 3;
-		padding-bottom: $spacer * 3;
-	}
-}
diff --git a/website/src/scss/main.scss b/website/src/scss/main.scss
deleted file mode 100644
index b77347ee412..00000000000
--- a/website/src/scss/main.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import 'variables';
-@import 'components/**/*';
-@import 'utilities/**/*';
diff --git a/website/src/scss/utilities/_bg.scss b/website/src/scss/utilities/_bg.scss
deleted file mode 100644
index 0b8f63e298f..00000000000
--- a/website/src/scss/utilities/_bg.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-.bg-gradient-secondary {
-	background-image: linear-gradient(58deg, #FF6443 3%, #FE561D 24%, #E32F0D 93%);
-}
-
-.bg-gradient-light-orange {
-	background-image: linear-gradient(90deg, rgba(#FFCB80, 0) 0%, #FFCB80 100%);
-}
-
-.bg-offset-right {
-	bottom: 0;
-	left: -24px;
-	position: absolute;
-	top: 0;
-	width: calc(100vw + 24px);
-	z-index: -1;
-
-	@media screen and (min-width: 1240px) {
-		left: -96px;
-		width: calc(100vw + 96px);
-	}
-}
-
-.bg-inset-right {
-	bottom: 0;
-	left: 40px;
-	position: absolute;
-	top: 0;
-	width: calc(100vw - 40px);
-	z-index: -1;
-
-	@media screen and (min-width: 980px) {
-		left: 96px;
-		width: calc(100vw - 96px);
-	}
-}
diff --git a/website/src/scss/utilities/_border.scss b/website/src/scss/utilities/_border.scss
deleted file mode 100644
index 7cade2776c3..00000000000
--- a/website/src/scss/utilities/_border.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.has-border-left {
-	border-left: 8px solid $gray-100;
-	padding-left: $spacer * 2;
-}
diff --git a/website/src/scss/utilities/_font.scss b/website/src/scss/utilities/_font.scss
deleted file mode 100644
index 44c19e46284..00000000000
--- a/website/src/scss/utilities/_font.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.font-xl {
-	font-size: $font-size-xl;
-}
-
-.font-lg {
-	font-size: $font-size-lg;
-}
-
-.font-sm {
-	font-size: $font-size-sm;
-}
-
-.font-xs {
-	font-size: $font-size-xs;
-}
-
-.font-weight-semibold {
-	font-weight: $font-weight-semibold;
-}
-
-.display-5 {
-	color: $black;
-	font-size: $display5-size;
-	font-weight: $display5-weight;
-}
-
-.display-6 {
-	color: $black;
-	font-size: $display6-size;
-	font-weight: $display6-weight;
-}
diff --git a/website/src/scss/utilities/_overflow.scss b/website/src/scss/utilities/_overflow.scss
deleted file mode 100644
index d4c8444371a..00000000000
--- a/website/src/scss/utilities/_overflow.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.overflow-auto {
-	overflow: auto;
-}
diff --git a/website/src/scss/utilities/_text.scss b/website/src/scss/utilities/_text.scss
deleted file mode 100644
index bca5f3bef7c..00000000000
--- a/website/src/scss/utilities/_text.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.text-decoration-underline {
-	text-decoration: underline;
-}
-
-.text-upper {
-	text-transform: uppercase;
-}
diff --git a/website/templates/base.html b/website/templates/base.html
deleted file mode 100644
index 0d153d95c88..00000000000
--- a/website/templates/base.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ language or 'en'}}" {{ extra_html_attrs }}>
-<head>
-    {% include "templates/common_meta.html" %}
-    {% block extra_meta %}{% endblock %}
-    {% include "templates/common_css.html" %}
-</head>
-<body dir="{{ direction or 'ltr' }}" {{ extra_body_attrs }}>
-    {% block banner %}
-    {% endblock %}
-    {% block nav %}{% endblock %}
-    <div class="page">
-        {% block content %}{% endblock %}
-        {% include "templates/footer.html" %}
-        {% include "templates/common_js.html" %}
-    </div>
-</body>
-</html>
diff --git a/website/templates/blog/content.html b/website/templates/blog/content.html
deleted file mode 100644
index 37c284a9721..00000000000
--- a/website/templates/blog/content.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div id="content-wrapper" class="col">
-    {% if not page.meta.is_index %}
-    <div id="content">
-        <header class="text-center">
-            {% if page.meta.image %}
-                <img class="img-fluid mb-3" src="{{ page.meta.image }}" alt="{{ title }}" title="{{ title }}" />
-            {% endif %}
-            <h1 class="display-2 mt-3 mb-5">{{ title }}</h1>
-        </header>
-
-        <div class="row">
-            <article class="col-md-10 offset-1">
-                {{ page.content|adjust_markdown_html }}
-            </article>
-            <section class="d-none d-md-block col-md-1 mh-100">
-                <div class="sticky-top pt-2">
-                    <a class="d-block mb-2" href="https://twitter.com/intent/tweet?url={{ title|urlencode }}+{{ url|urlencode }}"
-                       rel="external nofollow noreferrer" target="_blank">
-                        <img src="/images/index/twitter.svg"
-                             alt="{{ _('Share on') }} Twitter" title="{{ _('Share on') }} Twitter" class="social-icon rounded-circle img-fluid w-100 p-1" />
-                    </a>
-                    <a class="d-block mb-2" href="https://news.ycombinator.com/submitlink?t={{ title|urlencode }}&u={{ url|urlencode }}"
-                       rel="external nofollow noreferrer" target="_blank">
-                        <img src="/images/index/hackernews.svg"
-                             alt="{{ _('Share on') }} HackerNews" title="{{ _('Share on') }} Hacker News" class="rounded-circle img-fluid w-100 p-1" />
-                    </a>
-                    <a class="d-block mb-2" href="http://www.reddit.com/submit?title={{ title|urlencode }}&url={{ url|urlencode }}"
-                       rel="external nofollow noreferrer" target="_blank">
-                        <img src="/images/index/reddit.svg"
-                             alt="{{ _('Share on') }} Reddit" title="{{ _('Share on') }} Reddit" class="invert-dark rounded-circle img-fluid w-100 p-1" />
-                    </a>
-                </div>
-            </section>
-        </div>
-
-        {% if page.meta.author %}
-        <section class="col-md-10 offset-md-1 my-5">Author: <em>{{ page.meta.author|adjust_markdown_html }}</em></section>
-        {% endif %}
-
-        <section class="col-md-10 offset-md-1 my-5">
-            <span title="{{ _('Published date') }}" class="d-inline-block bg-dark text-white p-2 mr-2">{{ page.meta.date }}</span>
-            {% if page.meta.tags %}
-                {% for tag in page.meta.tags %}
-                    <div class="tag d-inline-block bg-light p-2 mr-2">
-                        {{ tag }}
-                    </div>
-                {% endfor %}
-            {% endif %}
-        </section>
-
-
-    </div>
-    {% else %}
-        {% for post in config.extra.post_meta.values() %}
-        <a href="{{ post['url'] }}" class="d-block text-reset text-decoration-none mt-3 mb-5">
-            {% set post_image = post.get('image') or '/images/index/intro.svg' %}
-            <div class="row">
-                <div class="col-12 col-md-6">
-                    <img class="img-fluid" data-src="{{ post_image }}" alt="{{ post['title'] }}" title="{{ post['title'] }}" />
-                </div>
-                <div class="col-12 col-md-6">
-                    <h2>{{ post['title'] }}</h2>
-                    <span class="text-muted">{{ post['date'] }}</span>
-                </div>
-            </div>
-        </a>
-        {% endfor %}
-    {% endif %}
-</div>
diff --git a/website/templates/blog/footer.html b/website/templates/blog/footer.html
deleted file mode 100644
index 3e94ecce51f..00000000000
--- a/website/templates/blog/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="container">
-    <div class="row">
-        <div class="col">
-            <div id="content-footer" class="text-muted pt-3 mb-5">
-                <div class="float-md-right">{{ config.copyright }}</div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/blog/nav.html b/website/templates/blog/nav.html
deleted file mode 100644
index 2916ea305eb..00000000000
--- a/website/templates/blog/nav.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<nav id="top-nav" class="navbar navbar-expand-md mb-3">
-    <div class="container justify-content-between">
-        <a class="d-block navbar-brand mr-3 text-reset" href="/">
-            <img id="docs-logo-icon" src="/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"/>
-        </a>
-        <div class="w-100 navbar-text text-left d-none d-md-block">
-            <h2 class="display-4 text-reset m-0 p-0 d-inline">
-                <a href="/blog/{{ language }}/" class="text-reset text-decoration-none">
-                    {{ config.site_name }}
-                </a>
-            </h2>
-        </div>
-
-        <div class="d-none d-md-block">
-            <ul class="navbar-nav ml-auto mt-2 mt-lg-0 justify-content-end">
-                <li class="nav-item">
-                     <a class="nav-link text-reset"
-                        href="https://github.com/ClickHouse/ClickHouse/tree/master/website/blog"
-                        rel="external nofollow noreferral" target="_blank">
-                        {{ _('New&nbsp;post') }}
-                     </a>
-                </li>
-                <li class="nav-item">
-                     <a class="nav-link text-reset" href="/docs/{{ language }}/">
-                        {{ _('Documentation') }}
-                     </a>
-                </li>
-                <li class="nav-item">
-                     <a class="nav-link text-reset"
-                        href="https://github.com/ClickHouse/ClickHouse"
-                        rel="external nofollow noreferrer" target="_blank">
-                        GitHub
-                     </a>
-                </li>
-                <li id="languages-wrapper" class="nav-item dropdown mr-3">
-                    <div id="languages-dropdown">
-                        <a class="nav-link dropdown-toggle d-inline-block text-reset" href="#" id="lang-dropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="60" class="d-inline-block" />
-                        </a>
-                        <div class="dropdown-menu" aria-labelledby="lang-dropdown">
-                            {% for code, name in config.extra.languages.items() %}
-                            <a class="dropdown-item text-reset {% if language == code %}disabled{% endif %}"
-                               href="/blog/{{ code }}/">
-                                <img src="/images/flags/{{ code }}.svg" alt="" title="" width="32" class="d-inline-block mr-2" />
-                                {{ name }}
-                            </a>
-                            {% endfor %}
-                        </div>
-                    </div>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>
diff --git a/website/templates/blog/rss.xml b/website/templates/blog/rss.xml
deleted file mode 100644
index 1f584b522aa..00000000000
--- a/website/templates/blog/rss.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?><rss version="2.0"
-     xmlns:atom="http://www.w3.org/2005/Atom"
-     xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <channel>
-    <title>{{ config.site_name }}</title>
-    <link>{{ config.site_url }}</link>
-    <atom:link href="{{ config.site_url }}rss.xml" rel="self" type="application/rss+xml" />
-    <description></description>
-    <pubDate>{{ config.extra.today|to_rfc882 }}</pubDate>
-
-    {% for post in config.extra.post_meta.values() %}
-        {% set url = config.extra.website_url + post['url'] %}
-        <item>
-           <title>{{ post['title'] }}</title>
-           <description><![CDATA[<img src="{{ post['image'] }}" />]]></description>
-           <pubDate>{{ post['date']|to_rfc882 }}</pubDate>
-           <guid isPermaLink="true">{{ url }}</guid>
-           <link>{{ url }}</link>
-           {# TODO: <dc:creator><![CDATA[{{ post['author'] }}]]></dc:creator> #}
-        </item>
-    {% endfor %}
-  </channel>
-</rss>
diff --git a/website/templates/careers/greenhouse.html b/website/templates/careers/greenhouse.html
deleted file mode 100644
index 52132f5ef51..00000000000
--- a/website/templates/careers/greenhouse.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="jobs" class="section bg-white pt-10 pt-lg-15">
-    <div class="container">
-		
-		<div id="grnhse_app"></div>
-		<script src="https://boards.greenhouse.io/embed/job_board/js?for=clickhouse"></script>
-
-    </div>
-</div>
diff --git a/website/templates/careers/hero.html b/website/templates/careers/hero.html
deleted file mode 100644
index dd4e59aeb3a..00000000000
--- a/website/templates/careers/hero.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-0">
-            {{ _('Careers') }}
-        </h1>
-
-    </div>
-</div>
diff --git a/website/templates/careers/overview.html b/website/templates/careers/overview.html
deleted file mode 100644
index 1601bf4f4b3..00000000000
--- a/website/templates/careers/overview.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="section bg-white pt-10">
-    <div class="container">
-        
-        <p class="lead text-dark mb-6">
-			ClickHouse is searching  for individuals who are not just knowledgeable about what they do, but want to learn more. Our ideal candidates are thinkers and doers who are not afraid to take on various roles and responsibilities as they grow with the company. If you are looking for a place to build something new, be an agent of change, and have an opportunity to have a significant impact on the company’s success, this is the place for you.
-        </p>
-
-        <hr class="is-yellow">
-
-    </div>
-</div>
diff --git a/website/templates/common_css.html b/website/templates/common_css.html
deleted file mode 100644
index b26b2bf973e..00000000000
--- a/website/templates/common_css.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<link href="/docs/css/base.css?css_digest" media="all" rel="stylesheet" />
-
-{% for src in extra_css %}
-<link href="{{ src }}" media="all" rel="stylesheet" />
-{% endfor %}
diff --git a/website/templates/common_fonts.html b/website/templates/common_fonts.html
deleted file mode 100644
index eb61aa2c9b5..00000000000
--- a/website/templates/common_fonts.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Hind+Siliguri:wght@300;500;600;700&family=Noto+Sans:wght@400;700&display=swap" rel="stylesheet">
diff --git a/website/templates/common_js.html b/website/templates/common_js.html
deleted file mode 100644
index 93e35d37918..00000000000
--- a/website/templates/common_js.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script{% if not extra_js %} async{% endif %} type="text/javascript" src="/docs/js/base.js?js_digest"></script>
-
-{% for src in extra_js %}
-<script type="text/javascript" src="{{ src }}"></script>
-{% endfor %}
-
-<noscript>
-    <div><img src="https://mc.yandex.ru/watch/18343495" alt="Yandex"/></div>
-</noscript>
diff --git a/website/templates/common_meta.html b/website/templates/common_meta.html
deleted file mode 100644
index 07aa05d28b1..00000000000
--- a/website/templates/common_meta.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% set description = description or _('ClickHouse is a fast open-source column-oriented database management system that allows generating analytical data reports in real-time using SQL queries') %}
-<meta charset="utf-8" />
-<META http-equiv="Content-type" content="text/html; charset=UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta name="viewport" content="width=device-width,initial-scale=1" />
-
-<title>{% if title %}{{ title }}{% else %}{{ _('ClickHouse - fast open-source OLAP DBMS') }}{% endif %}</title>
-
-<link rel="shortcut icon" href="/favicon.ico" />
-<link rel="apple-touch-icon" sizes="180x180" href="/docs/images/logo-180x180.png" />
-
-<meta property="og:title" content="{% if title %}{{ title }}{% else %}{{ _('ClickHouse DBMS') }}{% endif %}"/>
-<meta property="og:description" content="{{ description }}" />
-<meta property="og:type" content="{{ og_type or 'website' }}" />
-{% if page and page.meta.image %}
-<meta property="og:image" content="{{ page.meta.image}}" />
-{% else %}
-<meta property="og:image" content="https://clickhouse.com/docs/images/logo.png" />
-{% endif %}
-<meta property="og:url" content="{{ url or 'https://clickhouse.com/' }}"/>
-<link rel="canonical" href="{{ canonical_url or 'https://clickhouse.com/' }}" />
-{% if page and not single_page and not is_blog %}
-<link rel="amphtml" href="{{ url or 'https://clickhouse.com/' }}amp/" />
-{% endif %}
-<link rel="search" href="/opensearch.xml" title="ClickHouse" type="application/opensearchdescription+xml" />
-{% include "templates/docs/ld_json.html" %}
-
-<meta name="description" content="{{ description }}" />
-{% if page and page.meta.tags %}
-<meta name="keywords"
-      content="{% for tag in page.meta.tags %}{{tag}}{{ ', ' if not loop.last }}{% endfor %}" />
-{% else %}
-<meta name="keywords"
-      content="ClickHouse, DBMS, OLAP, SQL, {{ _('open-source') }}, {{ _('relational') }}, {{ _('analytics') }}, {{ _('analytical') }}, {{ _('Big Data') }}, {{ _('web-analytics') }}" />
-{% endif %}
-{% if config and config.extra.single_page %}
-<meta name="robots" content="noindex,follow" />
-{% endif %}
-
-{% if config and page and not is_blog %}
-    {% for code, name in config.extra.languages.items() %}
-    <link rel="alternate" hreflang="{{ code }}" href="{{ config.extra.website_url }}/docs/{{ code }}/{{ page.url }}" />
-    {% endfor %}
-    <link rel="alternate" hreflang="x-default" href="{{ config.extra.website_url }}/docs/en/{{ page.url }}" />
-{% endif %}
-
-{% for prefetch_item in prefetch_items %}
-<link rel="prefetch" href="{{ prefetch_item.0 }}" as="{{ prefetch_item.1 }}" />
-{% endfor %}
-
-{% if is_blog %}
-<link rel="alternate" type="application/rss+xml" href="{{ config.site_url }}rss.xml" />
-{% endif %}
diff --git a/website/templates/company/contact.html b/website/templates/company/contact.html
deleted file mode 100644
index 2538b184fda..00000000000
--- a/website/templates/company/contact.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div id="contact" class="section bg-light-orange pb-8 pb-lg-10 pt-8 pt-lg-10 mb-medium-5 mb-lg-10">
-    <div class="container">
-        
-        <h2 class="display-2 text-center mb-3 mb-lg-5">
-            {{ _('Contact Us') }}
-        </h2>
-
-        <div class="pb-5 pt-5 mb-5 position-relative">
-            <div class="bg-gradient-light-orange bg-offset-right"></div>
-
-            <form action="https://webto.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8" method="POST">
-
-                <input type=hidden name="oid" value="00D5f000000JueF">
-                <input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
-
-                <div class="mb-5 mx-auto" style="max-width:860px;">
-                    <div class="row">
-                        <div class="form-group col-md-6 mb-3">
-                            <input class="form-control" id="first_name" placeholder="First Name*" maxlength="40" name="first_name" size="20" type="text" required>
-                        </div>
-                        <div class="form-group col-md-6 mb-3">
-                            <input class="form-control" id="last_name" placeholder="Last Name*" maxlength="80" name="last_name" size="20" type="text" required>
-                        </div>
-                        <div class="form-group col-md-6 mb-3">
-                            <input class="form-control" id="email" placeholder="Email*" maxlength="80" name="email" size="20" type="text" required>
-                        </div>
-                        <div class="form-group col-md-6 mb-3">
-                            <input class="form-control" id="company" placeholder="Company" maxlength="40" name="company" size="20" type="text">
-                        </div>
-                        <div class="form-group col-md-6 mb-3 mb-md-0">
-                            <input class="form-control" id="00N5f000006YIf5" name="00N5f000006YIf5" placeholder="Country" maxlength="80" size="20" type="text">
-                        </div>
-                        <div class="form-group col-md-6">
-                            <textarea class="form-control" id="00N5f000000lOdD" placeholder="Tell us about your use case, other example..." name="00N5f000000lOdD" rows="1" type="text" wrap="soft" required></textarea>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="d-flex justify-content-center">
-                    <input type="submit" name="submit" value="Submit" class="btn btn-lg btn-secondary">
-                </div>
-                
-            </form>
-
-        </div>
-        
-        <p class="text-center text-muted mx-auto w-75">
-            {{ _('If you have any more thoughts or questions, feel free to contact the ClickHouse team directly at') }}
-            <a class="text-blue text-decoration-underline" href="mailto:feedback@clickhouse.com">feedback@clickhouse.com</a>
-        </p>
-
-    </div>
-</div>
diff --git a/website/templates/company/founders.html b/website/templates/company/founders.html
deleted file mode 100644
index 2f6100e28f7..00000000000
--- a/website/templates/company/founders.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="section bg-white pb-10 pt-10 pt-lg-15">
-    <div class="container">
-
-        <h2 class="display-2 text-center mb-5 mb-md-8 mb-lg-10">
-            {{ _('Meet the Team') }}
-        </h2>
-
-        <h3 class="display-3 text-center mb-3 mb-md-5 mb-lg-8">
-            {{ _('ClickHouse Co-Founders') }}
-        </h3>
-
-        <div class="row">
-            <div class="col-lg-4 mb-3 mb-lg-0 text-center">
-
-                <a href="https://www.linkedin.com/in/yuryizrailevsky/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/yury-izrailevsky.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Yury Izrailevsky') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Co-Founder & President, Product and Engineering') }}
-                </p>
-
-            </div>
-            <div class="col-lg-4 mb-3 mb-lg-0 text-center">
-
-                <a href=" https://www.linkedin.com/in/aaron-katz-5762094/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/aaron-katz.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Aaron Katz') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Co-Founder & CEO') }}
-                </p>
-
-            </div>
-            <div class="col-lg-4 text-center">
-
-                <a href="https://github.com/alexey-milovidov" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/alexey-milovidov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Alexey Milovidov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Co-Founder & CTO') }}
-                </p>
-
-            </div>
-        </div>
-
-    </div>
-</div>
diff --git a/website/templates/company/hero.html b/website/templates/company/hero.html
deleted file mode 100644
index f7d3fbdb529..00000000000
--- a/website/templates/company/hero.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-0">
-            {{ _('About Us') }}
-        </h1>
-
-    </div>
-</div>
diff --git a/website/templates/company/investors.html b/website/templates/company/investors.html
deleted file mode 100644
index fbe15ccd8e9..00000000000
--- a/website/templates/company/investors.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<h2 class="display-2 text-center mb-3 mb-md-5 mb-lg-8">
-    {{ _('ClickHouse Investors') }}
-</h2>
-
-<div class="row mb-10 mb-lg-15">
-    <div class="col-lg-3 col-md-6 mb-3 mb-lg-0 text-center d-flex flex-column">   
-	<a href="https://www.linkedin.com/in/mavolpi/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-            <img src="/images/photos/mike-volpi.jpg">
-        </a>
-        <h3 class="display-4">
-            {{ _('Mike Volpi') }}
-        </h3>
-        <p class="font-lg text-muted mb-3 mx-auto w-75">
-            {{ _('Board Member') }}
-        </p>
-        <img src="/images/logos/logo-index-ventures.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 286px;">
-	    
-
-    </div>
-    <div class="col-lg-3 col-md-6 mb-3 mb-lg-0 text-center d-flex flex-column">
-        <a href="https://www.linkedin.com/in/peter-fenton-0b117/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-            <img src="/images/photos/peter-fenton.jpg">
-        </a>
-        <h3 class="display-4">
-            {{ _('Peter Fenton') }}
-        </h3>
-        <p class="font-lg text-muted mb-3 mx-auto w-75">
-            {{ _('Board Member') }}
-        </p>
-        <img src="/images/logos/logo-benchmark-capital.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 174px;">
-
-    </div>
-    <div class="col-lg-3 col-md-6 mb-3 mb-md-0 text-center d-flex flex-column">
-
-        <a href="https://www.linkedin.com/in/caryn-marooney/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-            <img src="/images/photos/caryn-marooney.jpg">
-        </a>
-        <h3 class="display-4">
-            {{ _('Caryn Marooney') }}
-        </h3>
-        <img src="/images/logos/logo-coatue.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 160px;">
-
-    </div>
-	<div class="col-lg-3 col-md-6 text-center d-flex flex-column">
-
-        <a href="https://www.linkedin.com/in/kevinjwang/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-            <img src="/images/photos/kevin-wang.jpg">
-        </a>
-        <h3 class="display-4">
-            {{ _('Kevin Wang') }}
-        </h3>
-        <img src="/images/logos/logo-altimeter-capital.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 129px;">
-
-    </div>
-</div>
-
-<div class="d-flex flex-wrap align-items-center justify-content-center mb-n5">
-	<img src="/images/logos/logo-yandex.png" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 132px;">
-	<img src="/images/logos/logo-lightspeed.png" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 178px;">
-	<img src="/images/logos/logo-redpoint.png" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 207px;">
-	<img src="/images/logos/logo-almaz-capital.svg" height="48" width="220" class="logo mb-5 mx-3" style="height: 48px; max-width: 273px;">
-	<img src="/images/logos/logo-firstmark.svg" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 264px;">
-	<img src="/images/logos/logo-leadedge-capital.png" height="48" width="220" class="logo mb-5 mx-3" style="height: 48px; max-width: 192px;">
-</div>
diff --git a/website/templates/company/overview.html b/website/templates/company/overview.html
deleted file mode 100644
index 2d95a57ddd8..00000000000
--- a/website/templates/company/overview.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="section bg-white pt-10">
-    <div class="container">
-   
-        <p class="lead text-dark mb-3">
-            ClickHouse is an open-source column-oriented DBMS (columnar database management system) for online analytical processing (OLAP) that allows users to generate analytical reports using SQL queries in real-time.
-        </p>
-        <p class="lead text-dark mb-3">
-            Its technology works 100-1000x faster than traditional database management systems and processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second. With a widespread user base around the globe, the technology has received praise for its reliability, ease of use, and fault tolerance.
-        </p>
-        <p class="lead text-dark mb-3">
-            In September of 2021 in San Fransisco, CA, ClickHouse incorporated to house the open source technology with an initial $50 million investment from Index Ventures and Benchmark Capital. On October 28, 2021 the company received Series B funding totaling $250 million at an evaluation of $2 billion from Coatue Management, Altimeter Capital, and other investors. The company continues to build the open source project and engineering the cloud technology.
-        </p>
-        
-        <hr class="is-yellow">
-
-    </div>
-</div>
diff --git a/website/templates/company/press.html b/website/templates/company/press.html
deleted file mode 100644
index ddb2cf584ac..00000000000
--- a/website/templates/company/press.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<div id="press" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
-    <div class="container">
-        
-        <div class="row">
-            <div class="col-lg-2">
-                    
-                <h2 class="display-2">
-                    {{ _('Press') }}
-                </h2>
-
-            </div>
-
-            <div class="col-lg-10">
-                <div class="mb-5">
-                    <p class="kicker mb-1">
-                        {{ _('10/28/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://www.businesswire.com/news/home/20211028005287/en" rel="external nofollow noreferrer">{{ _('ClickHouse Raises $250M Series B To Scale Groundbreaking OLAP Database Management System Globally') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('The investment was led by Coatue and Altimeter, with participation from Index Ventures, Benchmark, Lightspeed, Redpoint, Almaz, Yandex N.V., FirstMark and Lead Edge.') }}
-                    </p>
-                    <a class="trailing-link" href="https://www.businesswire.com/news/home/20211028005287/en" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-                
-                <div class="mb-5">
-                    
-                    <p class="kicker mb-1">
-                        {{ _('10/28/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://www.bloomberg.com/news/articles/2021-10-28/clickhouse-valued-at-2-billion-in-round-after-yandex-spinout" rel="external nofollow noreferrer">{{ _('Bloomberg Exclusive') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('ClickHouse Valued at $2 Billion in Round After Yandex Spinout.') }}
-                    </p>
-                    <a class="trailing-link" href="https://www.bloomberg.com/news/articles/2021-10-28/clickhouse-valued-at-2-billion-in-round-after-yandex-spinout" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-                
-                <div class="mb-5">
-                    
-                    <p class="kicker mb-1">
-                        {{ _('10/28/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://medium.com/lightspeed-venture-partners/why-lightspeed-invested-in-clickhouse-a-database-built-for-speed-b67ec2d5f041" rel="external nofollow noreferrer">{{ _('Lightspeed Perspective') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('Why Lightspeed invested in ClickHouse: a database built for speed.') }}
-                    </p>
-                    <a class="trailing-link" href="https://medium.com/lightspeed-venture-partners/why-lightspeed-invested-in-clickhouse-a-database-built-for-speed-b67ec2d5f041" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-                
-                <div class="mb-5">
-                    
-                    <p class="kicker mb-1">
-                        {{ _('9/20/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://www.businesswire.com/news/home/20210920005219/en/ClickHouse-Inc.-Announces-Incorporation-Along-With-50M-In-Series-A-Funding" rel="external nofollow noreferrer">{{ _('ClickHouse, Inc. Announces Incorporation, Along With $50M In Series A Funding') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('New financing will allow the open source success to build a world-class, commercial-grade cloud solution that’s secure, compliant, and convenient for any customer to use.') }}
-                    </p>
-                    <a class="trailing-link" href="https://www.businesswire.com/news/home/20210920005219/en/ClickHouse-Inc.-Announces-Incorporation-Along-With-50M-In-Series-A-Funding" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-                <div class="mb-5">
-                    <p class="kicker mb-1">
-                        {{ _('9/20/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://www.businessinsider.com/clickhouse-creators-raise-50-million-for-new-company-2021-9" rel="external nofollow noreferrer">{{ _('Business Insider Exclusive') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('The creators of the popular ClickHouse project just raised $50 million from Index and Benchmark to form a company that will take on Splunk and Druid in the white-hot data space.') }}
-                    </p>
-                    <a class="trailing-link" href="https://www.businessinsider.com/clickhouse-creators-raise-50-million-for-new-company-2021-9" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-                <div class="mb-5">
-                    <p class="kicker mb-1">
-                        {{ _('9/20/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://www.indexventures.com/perspectives/clickhouse-from-russia-with-love/" rel="external nofollow noreferrer">{{ _('Index Ventures Perspective') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('Our road to ClickHouse started like a good spy novel, with a complex series of introductions over Telegram, clandestine text conversations spanning months before we finally managed to meet the team “face-to-face” (aka over Zoom).') }}
-                    </p>
-                    <a class="trailing-link" href="https://www.indexventures.com/perspectives/clickhouse-from-russia-with-love/" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-
-                <div class="mb-5">
-                    <p class="kicker mb-1">
-                        {{ _('9/20/21') }}
-                    </p>
-                    <h3 class="display-3 mb-3 w-75">
-                        <a class="text-reset" href="https://yandex.com/company/press_center/press_releases/2021/2021-09-20/" rel="external nofollow noreferrer">{{ _('Yandex Perspective') }}</a>
-                    </h3>
-                    <p class="font-lg text-muted mb-3">
-                        {{ _('Yandex announces the spin off of ClickHouse, Inc., a pioneering company focused on open-source column-oriented database management systems (DBMS) for analytical processing. ') }}
-                    </p>
-                    <a class="trailing-link" href="https://yandex.com/company/press_center/press_releases/2021/2021-09-20" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
diff --git a/website/templates/company/team.html b/website/templates/company/team.html
deleted file mode 100644
index 01341fb4a5f..00000000000
--- a/website/templates/company/team.html
+++ /dev/null
@@ -1,776 +0,0 @@
-<div class="section">
-    <div class="container pb-10 pb-lg-15 pt-10">
-        <div class="bg-offset-right bg-light"></div>
-
-        <h2 class="display-3 text-center mb-3 mb-md-5 mb-lg-8">
-            {{ _('ClickHouse Team') }}
-        </h2>
-
-        <div class="row mb-8">
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/manas-alekar-42b6a62a/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/manas-alekar.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Manas Alekar') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Cloud SWE') }}
-                </p>
-
-            </div>
-			<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/vitlibar" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/vitaly-baranov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Vitaly Baranov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Principal Sofware Engineer') }}
-                </p>
-
-            </div>
-			<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/marcelbirkner/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/marcel-birkner.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Marcel Birkner') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('
-					Cloud SWE') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/ivanblinkov/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/ivan-blinkov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Ivan Blinkov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('VP, Technical Program Management') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/tbragin/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/tanya-bragin.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Tanya Bragin') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('VP, Product') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/anne-carlhoff/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/anne-carlhoff.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Anne Carlhoff') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('
-					Sr Recruiter') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/jasonbchan/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/jason-chan.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Jason Chan') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Adviser, Security, Privacy &amp; Compliance') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/vdimir" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/vladimir-cherkasov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Vladimir Cherkasov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Software Engineer') }}
-                </p>
-
-            </div>
-			<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/martincholuj/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/martin-choluj.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Martin Choluj') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Vice President, Security') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/ryadh/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/ryadh-dahimene.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Ryadh Dahimene') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Consulting Architect') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/nikolay-degterinsky/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/nikolay-degterinsky.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Nikolay Degterinsky') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Core SWE') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/mieldonkers/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/miel-donkers.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Miel Donkers') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Cloud Software Engineer') }}
-                </p>
-
-            </div>
-			<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/artur-filatenkov-5a51a8217/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/artur-filatenkov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Artur Filatenkov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Associate Core Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/kristinamfrost/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/kristina-frost.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Kristina Frost') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Director, Business Technology') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <div class="photo-frame mx-auto">
-                    <img src="/images/photos/mikhail-fursov.jpg">
-				</div>
-                <h3 class="display-4">
-                    {{ _('Mikhail Fursov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Principal UX/UI Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/wh-baird-garrett-89338812/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/baird-garrett.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Baird Garrett') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('General Counsel') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/geoff-genz-a8a6275/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/geoffrey-genz.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Geoffrey Genz') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Principal Support Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/mihir-g-3a8010b8/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/mihir-gokhale.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Mihir Gokhale') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Associate, Business Strategy & Ops') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/tylerhannan/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/tyler-hannan.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Tyler Hannan') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Director, Developer Advocacy') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/mike-hayes-54990310/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/mike-hayes.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Mike Hayes') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('VP, Sales') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/nhosgur/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/nihat-hosgur.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Nihat Hosgur') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Principal Cloud SWE') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/brianjohnhunter/" target="_blank" class="photo-frame mx-auto">
-                    <img src="/images/photos/brian-hunter.jpg">
-				</a>
-                <h3 class="display-4">
-                    {{ _('Brian Hunter') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Account Executive, AMER') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/andy-james-48032a5/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/andy-james.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Andy James') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Business Technology Full Stack Lead') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/yossi-kahlon-a7a5693/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/yossi-kahlon.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Yossi Kahlon') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Director, Engineering - Control Plane') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/kitaisreal/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/maksim-kita.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Maksim Kita') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/KochetovNicolai/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/nikolai-kochetov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Nikolai Kochetov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Engineering Team Lead') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/anne-krechmer-3790162b/" target="_blank" class="photo-frame mx-auto">
-                    <img src="/images/photos/anne-krechmer.jpg">
-				</a>
-                <h3 class="display-4">
-                    {{ _('Anne Krechmer') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Recruiter') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/Avogar" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/pavel-kruglov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Pavel Kruglov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/michael-lex-a84a9b1b8/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/michael-lex.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Michael Lex') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Cloud SWE') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/niek-lok-46498685/" target="_blank" class="photo-frame mx-auto">
-                    <img src="/images/photos/niek-lok.jpg">
-				</a>
-                <h3 class="display-4">
-                    {{ _('Niek Lok') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Account Executive') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/claire-g-lucas/" target="_blank" class="photo-frame mx-auto">
-                    <img src="/images/photos/claire-lucas.jpg">
-				</a>
-                <h3 class="display-4">
-                    {{ _('Claire Lucas') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Director, Business Strategy &amp; Ops') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/shavoyne-mccowan-668674221/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/shavoyne-mccowan.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Shavoyne McCowan') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Executive Assistant') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/dalemcdiarmid/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/dale-mcdiarmid.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Dale McDiarmid') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Consulting Architect') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/nikitamikhaylov" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/nikita-mikhailov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Nikita Mikhailov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/novikd" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/dmitry-novik.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Dmitry Novik') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/4thom/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/thom-oconnor.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Thom O’Connor') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('VP, Support &amp; Services') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/melvyn-peignon-a56b2890/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/melvyn-peignon.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Melvyn Peignon') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Manager, Support Services – EMEA') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/nir-peled-b2b15120/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/nir-peled.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Nir Peled') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Principal UX/UI Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/CurtizJ" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/anton-popov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Anton Popov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/richraposa/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/rich-raposa.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Rich Raposa') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Director, Global Learning') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/rodriguezmarcelo/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/marcelo-rodriguez.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Marcelo Rodriguez') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Sr Support Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/Alesapin" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/alexander-sapin.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Alexander Sapin') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Engineering Team Lead') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/schreibertom1/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/tom-schreiber.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Tom Schreiber') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Consulting Architect – EMEA') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/felixoid/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/mikhail-shiryaev.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Mikhail Shiryaev') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Site Reliability Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/bastian-spanneberg/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/bastian-spanneberg.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Bastian Spanneberg') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Site Reliability Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/kssenii" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/kseniia-sumarokova.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Kseniia Sumarokova') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/dorota-szeremeta-a849b7/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/dorota-szeremeta.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Dorota Szeremeta') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('VP, Operations') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/salesforcemaster/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/yuko-takagi.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Yuko Takagi') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Director, Go To Market Technology') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/roopa-tangirala-02b9603/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/roopa-tangirala.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Roopa Tangirala') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Director, Engineering') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://github.com/tavplubix" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/alexander-tokmakov.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Alexander Tokmakov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Software Engineer') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <div class="photo-frame mx-auto">
-                    <img src="/images/photos/sergei-trifonov.jpg">
-				</div>
-                <h3 class="display-4">
-                    {{ _('Sergei Trifonov') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Principal Core SWE') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/pascalvdnieuwendijk/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/pascal-van-den-nieuwendijk.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Pascal Van den Nieuwendijk') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Account Executive') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/arnovandriel" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/arno-van-driel.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Arno Van Driel') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('VP, EMEA') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/elissaweve/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/elissa-weve.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Elissa Weve') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Customer / Partner Alliance Manager') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/cwurm/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/christoph-wurm.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Christoph Wurm') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Solutions Architect') }}
-                </p>
-
-            </div>
-            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/%D1%8F%D1%86%D0%B8%D1%88%D0%B8%D0%BD-%D0%B8%D0%BB%D1%8C%D1%8F-9495b535/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/ilya-yatsishin.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Ilya Yatsishin') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Technical Project Manager') }}
-                </p>
-
-            </div>
-			<div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
-
-                <a href="https://www.linkedin.com/in/markzitnik/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
-                    <img src="/images/photos/mark-zitnik.jpg">
-                </a>
-                <h3 class="display-4">
-                    {{ _('Mark Zitnik') }}
-                </h3>
-                <p class="font-lg text-muted mb-0 mx-auto w-75">
-                    {{ _('Senior Cloud Software Engineer') }}
-                </p>
-
-            </div>
-        </div>
-
-        <div class="card mx-auto mb-8 mb-md-10 mb-lg-15 is-large has-dark-border has-pattern w-50">
-            <div class="card-body">
-
-                <h3 class="display-3 text-center">
-                    {{ _('Join the Team') }}
-                </h3>
-
-                <div class="btns">
-                    <a href="/careers/" class="btn btn-outline-secondary" role="button">
-                        {{ _('Apply Now') }}
-                    </a>
-                </div>
-
-            </div>
-        </div>
-
-        <hr class="is-medium is-large mb-8">
-
-        {% include "templates/company/investors.html" %}
-
-    </div>
-</div>
diff --git a/website/templates/contact-thank-you/hero.html b/website/templates/contact-thank-you/hero.html
deleted file mode 100644
index a1841eb433f..00000000000
--- a/website/templates/contact-thank-you/hero.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-3">
-            {{ _('Thank You') }}
-        </h1>
-        
-        <p class="lead text-dark mb-0">
-            {{ _('Someone will be in contact with you shortly.') }}
-        </p>
-
-    </div>
-</div>
diff --git a/website/templates/contact-thank-you/overview.html b/website/templates/contact-thank-you/overview.html
deleted file mode 100644
index 67728414adc..00000000000
--- a/website/templates/contact-thank-you/overview.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="section bg-white pt-10">
-    <div class="container">
-        <div class="card bg-dark">
-            <img src="/images/welcome-home.png" height="682" width="2048" class="mx-auto img-fluid">
-        </div>
-
-    </div>
-</div>
diff --git a/website/templates/docs/amp.html b/website/templates/docs/amp.html
deleted file mode 100644
index dc7dd7acb49..00000000000
--- a/website/templates/docs/amp.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!doctype html>
-<html ⚡ lang="{{ language or 'en'}}">
-  <head>
-    <meta charset="utf-8">
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <title>{{ title }}</title>
-    <link rel="canonical" href="{{ canonical_url or 'https://clickhouse.com/' }}" />
-    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-    {% include "templates/docs/ld_json.html" %}
-    {% if config.extra.single_page %}
-      <meta name="robots" content="noindex,follow" />
-    {% endif %}
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <style amp-custom>CUSTOM_CSS_PLACEHOLDER</style>
-    <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
-    <script async custom-element="amp-iframe" src="https://cdn.ampproject.org/v0/amp-iframe-0.1.js"></script>
-  </head>
-  <body class="amp" dir="{{ direction or 'ltr' }}">
-    <div class="container-fluid container-lg pb-5">
-      <div class="row pt-3 mb-3">
-        <div class="col">
-          <a href="/" class="text-decoration-none">
-            <amp-img class="d-inline-block mr-3" layout="fixed" width="40" height="36" src="/docs/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"></amp-img><amp-img class="invert-dark d-inline-block" layout="fixed" width="238" height="36" src="/docs/images/clickhouse-black.svg" alt="ClickHouse" title="ClickHouse"></amp-img>
-          </a>
-        </div>
-      </div>
-      <div class="row">
-        <div id="content" class="col">
-          {% include "templates/docs/machine-translated.html" %}
-          {{ page.content|adjust_markdown_html|html_to_amp }}
-        </div>
-      </div>
-      <div class="row">
-        <div class="col">
-          {% include "templates/docs/footer.html" %}
-        </div>
-      </div>
-      <div id="to-full-website" class="row fixed-bottom text-center bg-white py-3">
-        <div class="col">
-          <a class="btn btn-lg btn-outline-orange" href="{{ url }}">To full website</a>
-        </div>
-      </div>
-    </div>
-    <amp-analytics type="metrika">
-      <script type="application/json">{
-"vars": {
-  "counterId": "18343495",
-  "triggers": {
-    "notBounce": {
-      "on": "timer",
-      "timerSpec": {
-        "immediate": false,
-        "interval": 15,
-        "maxTimerLength": 16
-      },
-      "request": "notBounce"
-    }
-  }
-}
-}</script>
-  </amp-analytics>
-  </body>
-</html>
diff --git a/website/templates/docs/content.html b/website/templates/docs/content.html
deleted file mode 100644
index c2835dd1f39..00000000000
--- a/website/templates/docs/content.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div id="content-wrapper" class="anchor-fixer {% if single_page %}col-md-10{% else %}col-md-8{% endif %} mt-5 p-2 p-md-4">
-    <div id="content">
-        {% if not single_page %}
-            {% set ancestors = page.ancestors|reverse|list %}
-            {% if page.is_index %}
-                {% set ancestors = ancestors[:-1] %}
-            {% endif %}
-            {% if ancestors %}
-                {% set ancestor_ns = namespace(level=ancestors|length) %}
-                <nav class="text-muted" aria-label="breadcrumb">
-                    <ol class="breadcrumb bg-transparent p-0">
-                        {% for ancestor in ancestors %}
-                        {% set ancestor_title = ancestor.title.strip() %}
-                        {% if ancestor_title.endswith('|hidden-folder') %}
-                            {% set ancestor_title = ancestor_title[:-14] %}
-                        {% endif %}
-                        <li class="breadcrumb-item"><a href="{{ '../' * ancestor_ns.level }}" class="text-reset">{{ ancestor_title }}</a>
-                            {% set ancestor_ns.level = ancestor_ns.level - 1 %}
-                        </li>
-                       {% endfor %}
-                    </ol>
-                </nav>
-            {% endif %}
-
-            {% include "templates/docs/machine-translated.html" %}
-            {{ page.content|adjust_markdown_html }}
-        {% endif %}
-
-        {% if single_page and page.content %}
-        <script type="text/javascript" src="content.js?{{ config.extra.rev_short }}"></script>
-        {% endif %}
-    </div>
-
-    {% include "templates/docs/footer.html" %}
-</div>
-{% if single_page and page.content %}
-<!-- BREAK -->
-(function() {
-    {% for chunk in page.content|adjust_markdown_html|chunks %}
-    document.write({{ chunk|tojson|safe }});
-    {% endfor %}
-})();
-<!-- BREAK -->
-{% endif %}
diff --git a/website/templates/docs/footer.html b/website/templates/docs/footer.html
deleted file mode 100644
index a99a723c036..00000000000
--- a/website/templates/docs/footer.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% if not single_page %}
-<div class="alert alert-light my-3">
-  <p class="float-right mb-0">{{ _('Rating') }}: RATING_VALUE - RATING_COUNT {{ _('votes') }}</p>
-  <span class="alert-heading display-6">{% if is_amp %}{{ _('Article Rating') }}{% else %}{{ _('Was this content helpful?') }}{% endif %}</span>
-  <div id="rating-stars" class="display-6 mb-0"
-     {% if not is_amp %}
-     data-titles="['{{ _('Unusable') }}', '{{ _('Poor') }}', 'OK', '{{ _('Good') }}', '{{ _('Excellent') }}']"
-     data-documentation="{{ _('documentation') }}"
-     {% endif %}
-  >RATING_STARS</div>
-</div>
-
-<div id="content-footer" class="text-muted pt-3 mb-5">
-    <div class="float-md-right">{{ config.copyright }}</div>
-    <div>{{ _('Built from') }} <a href="{{ config.extra.rev_url }}" rel="external nofollow noreferrer" target="_blank" class="text-reset">{{ config.extra.rev_short }}</a>{% if page and page.meta %}{% if page.meta.published_date %}, {{ _('published on') }} <span title="{{ page.meta.published_date.isoformat() }}">{{ page.meta.published_date.date().isoformat() }}</span>{% endif %}{% if page.meta.modified_date %}, {{ _('modified on') }} <span title="{{ page.meta.modified_date.isoformat() }}">{{ page.meta.modified_date.date().isoformat() }}</span>{% endif %}
-    {% endif %}
-    </div>
-</div>
-{% endif %}
diff --git a/website/templates/docs/ld_json.html b/website/templates/docs/ld_json.html
deleted file mode 100644
index 4dea9fa6cbb..00000000000
--- a/website/templates/docs/ld_json.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% if page and page.meta %}
-<script type="application/ld+json">[{
-"@context": "http://schema.org",
-"@type": "{% if is_blog %}BlogPosting{% else %}TechArticle{% endif %}",
-"headline": "{{ title }}",
-"mainEntityOfPage": "{{ url or 'https://clickhouse.com/' }}",
-{% if page.meta.date %}
-"datePublished": "{{ page.meta.date }}",
-"dateModified": "{{ page.meta.date }}",
-{% else %}
-{% if page.meta.published_date %}"datePublished": "{{ page.meta.published_date.isoformat() }}",{% endif %}
-{% if page.meta.modified_date %}"dateModified": "{{ page.meta.modified_date.isoformat() }}",{% endif %}
-{% endif %}
-"image": "{{ page.meta.image or 'https://clickhouse.com/images/clickhouse-209x60.png' }}",
-"author": {
-  "@type": "Project",
-  "name": "ClickHouse"
-},
-"publisher": {
-  "@type": "Organization",
-  "name": "ClickHouse, Inc.",
-  "logo": {
-    "@type": "ImageObject",
-    "url": "https://clickhouse.com/images/logo-400x240.png",
-    "width": 400,
-    "height": 240
-  }
-}}{% if not is_blog %}, {
-"@context": "http://schema.org",
-"@type": "Episode",
-"name": "{{ title }}",
-"aggregateRating": {
-  "@type": "AggregateRating",
-  "ratingValue": RATING_VALUE,
-  "ratingCount": RATING_COUNT
-}
-}{% endif %}]</script>
-{% endif %}
diff --git a/website/templates/docs/machine-translated.html b/website/templates/docs/machine-translated.html
deleted file mode 100644
index c46d9ebad70..00000000000
--- a/website/templates/docs/machine-translated.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if page.meta.machine_translated %}
-    <div class="alert alert-primary" role="alert">
-      <p class="display-5 mb-2">{{ _('Help wanted!') }}</p>
-      <p class="lead">{{ _('The following content of this documentation page has been machine-translated. But unlike other websites, it is not done on the fly. This translated text lives on GitHub repository alongside main ClickHouse codebase and waits for fellow native speakers to make it more human-readable.') }} <a href="{{ page.abs_url.replace('/' + language + '/', '/en/') }}" class="alert-link">{{ _('You can also use the original English version as a reference.') }}</a></p>
-      <p class="lead">
-          <a class="btn btn-lg btn-primary text-white" href="{{ page.edit_url }}" target="_blank" rel="external nofollow noreferrer">
-              {{ _('Help ClickHouse documentation by editing this page') }}
-          </a>
-      </p>
-    </div>
-{% endif %}
diff --git a/website/templates/docs/nav.html b/website/templates/docs/nav.html
deleted file mode 100644
index afac39c2fab..00000000000
--- a/website/templates/docs/nav.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav id="top-nav" class="navbar py-1 navbar-dark navbar-expand-md bg-dark-alt text-white fixed-top">
-    <div class="container-fluid justify-content-between">
-        <a class="d-block navbar-brand mr-3" href="/">
-            <img id="docs-logo-icon" src="/docs/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"/>
-        </a>
-        <div class="w-100 navbar-text text-left d-none d-md-block">
-            <h1 class="h3 m-0 p-0 d-inline">
-                <a href="#" class="text-white text-decoration-none">
-                    {% if not page.title.startswith('hidden') %}
-                        {{ page.title or config.site_name }}
-                    {% else %}
-                        {{ page.meta.toc_folder_title or config.site_name }}
-                    {% endif %}
-                </a>
-            </h1>
-        </div>
-
-        <div class="d-none d-md-block">
-            <ul class="navbar-nav ml-auto mt-2 mt-lg-0 justify-content-end">
-                {% if config.extra.single_page %}
-                    {% set edit_url = config.repo_url + 'tree/master/docs' %}
-                {% else %}
-                    {% set edit_url = page.edit_url %}
-                {% endif %}
-                {% if edit_url %}
-                <li id="edit-wrapper" class="nav-item">
-                    <a id="edit-link" href="{{ edit_url }}" title="Edit this article" class="nav-link" rel="external nofollow noreferrer" target="_blank"><img src="/docs/images/mkdocs/edit.svg" alt="Edit this article" height="60" /></a>
-                </li>
-                {% endif %}
-                <li class="nav-item">
-                     <a class="nav-link" href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer">
-                        <img src="/docs/images/index/github.svg" alt="GitHub repository" title="Go to GitHub" height="72" />
-                    </a>
-                </li>
-                <li id="languages-wrapper" class="nav-item dropdown mr-3">
-                    <div id="languages-dropdown">
-                        <a class="nav-link dropdown-toggle d-inline-block mt-1 text-muted" href="#" id="lang-dropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="/docs/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="60" class="d-inline-block mt-n1" />
-                        </a>
-                        <div class="dropdown-menu bg-dark" aria-labelledby="lang-dropdown">
-                            {% for code, name in config.extra.languages.items() %}
-                            <a class="dropdown-item{% if language == code %} disabled{% endif %}"
-                               href="/docs/{{ code }}/{{ page.url }}">
-                                <img src="/docs/images/flags/{{ code }}.svg" alt="" title="" width="32" class="d-inline-block mr-2" />{{ name }}
-                            </a>
-                            {% endfor %}
-                        </div>
-                    </div>
-                </li>
-            </ul>
-        </div>
-
-        <form id="search-form" class="form-inline m-0">
-            <div class="input-group">
-                <div class="input-group-prepend w-100">
-                    <span class="input-group-text bg-secondary-alt text-muted border-0 mr-n1" id="search-icon">
-                        <img src="/docs/images/mkdocs/search.svg" />
-                    </span>
-                    <input id="docsearch-input" class="form-control bg-secondary-alt text-muted border-0 pl-1" type="search" placeholder="Search" aria-label="Search">
-                </div>
-            </div>
-        </form>
-
-        <button id="navbar-toggler" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#sidebar" aria-controls="sidebar" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    </div>
-</nav>
diff --git a/website/templates/docs/sidebar-item.html b/website/templates/docs/sidebar-item.html
deleted file mode 100644
index ca4b8f9a60e..00000000000
--- a/website/templates/docs/sidebar-item.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% set collapsed_threshold = 1 %}
-{% if not nav_item.title.startswith("hidden-") %}
-{% if nav_item.title.endswith('|hidden-folder') %}
-<a href="{{ base_url }}/{{ nav_item.children[0].url }}" title="{{ nav_item.title[:-14] }}" class="nav-link{% if nav_item.active%} text-white active{% else %} text-light{% endif %} text-wrap d-inline-block w-100 px-0">{{ nav_item.title[:-14] }}</a>
-{% elif nav_item.children %}
-<a href="#sidebar-{{ path }}" data-toggle="collapse" aria-expanded="{% if level < collapsed_threshold %}true{% else %}false{% endif %}" aria-controls="sidebar-{{ path }}" title="{{ nav_item.title }}" class="nav-link text-light dropdown-toggle px-0">{{ nav_item.title }}</a>
-<div id="sidebar-{{ path }}" class="nav flex-column collapse{% if level < collapsed_threshold %} show{% endif %}" style="transition-duration: unset;">
-    <nav class="nav flex-column pl-2">
-    {% set base = path %}
-    {% for nav_item in nav_item.children %}
-        {% set path = base + "-" + loop.index | string %}
-        {% set level = level + 1 %}
-        {% include "templates/docs/sidebar-item.html"  %}
-    {% endfor %}
-    </nav>
-</div>
-{% else %}
-<a href="{{ base_url }}/{{ nav_item.url }}" title="{{ nav_item.title }}" class="nav-link{% if nav_item.active%} text-white active{% else %} text-light{% endif %} text-wrap d-inline-block w-100 px-0">{{ nav_item.title }}</a>
-{% endif %}
-{% endif %}
diff --git a/website/templates/docs/sidebar.html b/website/templates/docs/sidebar.html
deleted file mode 100644
index 709a2551d9c..00000000000
--- a/website/templates/docs/sidebar.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="sidebar" class="col-xl-2 col-md-4 bg-secondary-alt p-3 d-print-none min-vh-100 overflow-auto">
-    <div class="overflow-auto">
-        <div id="single-page-switch" class="btn-group mb-2 float-right" role="group" aria-label="{{ _('Multi-page or single-page') }}">
-            <a href="{{ base_url }}" role="button" class="btn btn-dark{% if config.extra.single_page %}-alt{% endif %} active" aria-pressed="{% if not config.extra.single_page %}true{% else %}false{% endif %}">
-                <img src="/docs/images/mkdocs/multi.svg" alt="{{ _('Multi-page version') }}" title="{{ _('Multi-page version') }}" />
-            </a>
-            <a href="{{ base_url }}/single/" role="button" class="btn btn-dark{% if not config.extra.single_page %}-alt{% endif %} active" aria-pressed="{% if not config.extra.single_page %}true{% else %}false{% endif %}">
-                <img src="/docs/images/mkdocs/single.svg" alt="{{ _('Single-page version') }}" title="{{ _('Single-page version') }}" />
-            </a>
-        </div>
-        {% if not single_page %}
-        <nav id="sidebar-nav" class="nav flex-column mb-5">
-            {% for nav_item in nav %}
-                {% set path = "sidebar-" + loop.index | string %}
-                {% set level = 1 %}
-                {% include "templates/docs/sidebar-item.html" %}
-            {% endfor %}
-        </nav>
-        {% else %}
-            {% include "templates/docs/toc.html" %}
-        {% endif %}
-    </div>
-</div>
diff --git a/website/templates/docs/toc-item.html b/website/templates/docs/toc-item.html
deleted file mode 100644
index fedc0527a69..00000000000
--- a/website/templates/docs/toc-item.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<a href="{{ toc_item.url }}" title="{{ toc_item.title }}" class="nav-link text-wrap d-inline-block w-100">
-    {{ toc_item.title }}
-</a>
-{% if toc_item.children %}
-<nav id="toc-{{ path }}" class="nav flex-column pl-2">
-    {% set base = path %}
-    {% for toc_item in toc_item.children %}
-        {% set path = base + "-" + loop.index | string %}
-        {% set level = level + 1 %}
-        {% include "templates/docs/toc-item.html"  %}
-    {% endfor %}
-</nav>
-{% endif %}
diff --git a/website/templates/docs/toc.html b/website/templates/docs/toc.html
deleted file mode 100644
index 7fbbe2fef3b..00000000000
--- a/website/templates/docs/toc.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="toc" class="{% if single_page %}toc-left{% else %}col-xl-2 d-none d-xl-block d-print-none p-3 overflow-auto toc-right{% endif %} mb-5">
-    {% set toc_ = page.toc %}
-    {% if toc_ | first is defined and "\x3ch1 id=" in page.content %}
-        {% set toc_ = (toc_ | first).children %}
-    {% endif %}
-    <nav class="nav flex-column text-wrap">
-    {% if toc_ | first is defined %}
-        <label for="toc">{{ _('Table of Contents') }}</label>
-    {% endif %}
-    {% for toc_item in toc_ %}
-        {% set path = "toc-" + loop.index | string %}
-        {% set level = 1 %}
-        {% include "templates/docs/toc-item.html" %}
-    {% endfor %}
-    </nav>
-</div>
diff --git a/website/templates/footer.html b/website/templates/footer.html
deleted file mode 100644
index efb6b1a0299..00000000000
--- a/website/templates/footer.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% if not no_footer %}
-<div class="footer font-xs {{ footer_class or 'bg-light text-muted' }}">
-    <div class="container d-flex align-items-center {{ footer_container_class or 'py-2' }}">
-
-        <div class="footer-copy font-weight-bold">
-            &copy; 2016–2022 {{ _('ClickHouse, Inc.') }}
-        </div>
-
-        <div class="footer-license ml-4">
-            {{ _('ClickHouse source code is published under the Apache 2.0 License.') }}</a> {{ _('Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.') }}
-        </div>
-
-        <div class="footer-links ml-4">
-            <a href="/legal/trademark-policy/" class="text-muted">Trademark Policy</a>
-        </div>
-
-    </div>
-</div>
-{% endif %}
diff --git a/website/templates/global/banner.html b/website/templates/global/banner.html
deleted file mode 100644
index ffb1abf7330..00000000000
--- a/website/templates/global/banner.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="banner bg-light">
-    <div class="container">
-        <p class="text-center text-dark mb-0 mx-auto pt-1 pb-1">{{ _('ClickHouse v22.3 is coming soon! Add the Mar 17 Release Webinar to your calendar') }} <a
-                href="http://www.google.com/calendar/event?action=TEMPLATE&dates=20220317T160000Z/20220317T170000Z&text=ClickHouse+v22.3+Release+Webinar&location=https%3A%2F%2Fzoom.us%2Fj%2F91955953263%3Fpwd%3DSXBKWW5ETkNMc1dmVWUxTUJKNm5hUT09&details=Please+click+the+link+below+to+join+the+webinar%3A%0D%0Ahttps%3A%2F%2Fzoom.us%2Fj%2F91955953263%3Fpwd%3DSXBKWW5ETkNMc1dmVWUxTUJKNm5hUT09%0D%0A%0D%0APasscode%3A+139285%0D%0A%0D%0AOr+One+tap+mobile+%3A+%0D%0A++++US%3A+%2B12532158782%2C%2C91955953263%23%2C%2C%2C%2C%2A139285%23++or+%2B13462487799%2C%2C91955953263%23%2C%2C%2C%2C%2A139285%23+%0D%0A%0D%0AOr+Telephone%3A%0D%0A++++Dial%28for+higher+quality%2C+dial+a+number+based+on+your+current+location%29%3A%0D%0A++++++++US%3A+%2B1+253+215+8782++or+%2B1+346+248+7799++or+%2B1+669+900+9128++or+%2B1+301+715+8592++or+%2B1+312+626+6799++or+%2B1+646+558+8656+%0D%0A%0D%0AWebinar+ID%3A+919+5595+3263%0D%0APasscode%3A+139285%0D%0A++++International+numbers+available%3A+https%3A%2F%2Fzoom.us%2Fu%2FasrDyM28Q" target="_blank">here</a></p>
-    </div>
-</div>
diff --git a/website/templates/global/github_stars.html b/website/templates/global/github_stars.html
deleted file mode 100644
index 668938fcf58..00000000000
--- a/website/templates/global/github_stars.html
+++ /dev/null
@@ -1 +0,0 @@
-<script async defer src="https://buttons.github.io/buttons.js"></script>
diff --git a/website/templates/global/nav.html b/website/templates/global/nav.html
deleted file mode 100644
index d775c88e4a5..00000000000
--- a/website/templates/global/nav.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<nav id="top-nav" class="navbar navbar-clickhouse navbar-expand-lg sticky-top bg-white">
-    <div class="container">
-
-        <nav class="navbar-super mb-2 d-none d-xs-block">
-            <ul class="d-flex align-items-center justify-content-end mb-0">
-                <li class="height-20">
-                    <a class="github-button" href="https://github.com/ClickHouse/ClickHouse" data-show-count="true" aria-label="Star ClickHouse/ClickHouse on GitHub" rel="external nofollow">Star</a>
-                </li>
-                <li>
-                    <a href="/blog/en/">
-                        <img src="/images/icons/icon-blog-black.svg">
-                        Blog
-                    </a>
-                </li>
-                <li>
-                    <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg" target="_blank" rel="external nofollow">
-                        <img src="/images/icons/icon-slack-black.svg">
-                        Slack
-                    </a>
-                </li>
-                <li>
-                    <a href="https://www.youtube.com/c/ClickHouseDB" target="_blank" rel="external nofollow">
-                        <img src="/images/icons/icon-youtube-black.svg">
-                        YouTube
-                </a>
-                </li>
-            </ul>
-        </nav>
-
-        <a class="navbar-brand navbar-brand-clickhouse" href="/" title="ClickHouse"></a>
-
-        <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-toggle" aria-controls="navbar-toggle" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon text-dark"></span>
-        </button>
-
-        <div id="navbar-toggle" class="collapse navbar-collapse">
-            <ul class="navbar-nav ml-auto justify-content-center justify-content-lg-end">
-                <li class="nav-item">
-                    <a class="nav-link" href="/#quick-start">Quick Start</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/docs/en/">Documentation</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/learn/">Learn</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/company/">Company</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="/careers/">Careers</a>
-                </li>
-                <li class="nav-item">
-                    <a class="btn btn-outline-tertiary" href="/company/#contact">Contact Us</a>
-                </li>
-            </ul>
-        </div>
-
-    </div>
-</nav>
diff --git a/website/templates/global/newsletter.html b/website/templates/global/newsletter.html
deleted file mode 100644
index ef0809760e6..00000000000
--- a/website/templates/global/newsletter.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="section bg-white pt-10 pb-10 pb-lg-12">
-    <div class="section-bg bg-footer-cta"></div>
-    <div class="container">
-
-        <h2 class="display-2 mb-7 mx-auto text-center w-75">
-            {{ _('Stay informed on feature releases, product roadmap, and future support and cloud offerings! ') }}
-        </h2>
-    
-        <div class="card bg-primary-light is-large">
-            <div class="card-body d-flex flex-column flex-lg-row align-items-center">
-
-                <h2 class="display-3 mb-3 mb-lg-0">
-                    {{ _('Sign up for our newsletter') }}
-                </h2>
-
-                <div class="mx-auto mr-lg-0 pl-0 pl-lg-3" style="flex-grow: 1; max-width: 544px; position: relative;">
-
-                    <form action="https://webto.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8" method="POST">
-
-                        <input type=hidden name="oid" value="00D5f000000JueF">
-                        <input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
-        
-                        <div class="d-flex" style="max-width: 520px;">
-                            <div style="flex-basis: 400px;">
-                                <input class="form-control" id="email" placeholder="Email*" maxlength="80" name="email" size="20" type="text" required style="border-radius:6px 0 0 6px;">
-                            </div>
-                            <div style="flex-basis: 120px;">
-                                <input type="submit" name="submit" value="Sign Up" class="btn btn-secondary" style="border-radius: 0 6px 6px 0;">
-                            </div>
-                        </div>
-                        
-                    </form>
-                    
-                </div>
-
-            </div>
-        </div>
-
-    </div>
-</div>
diff --git a/website/templates/index/community.html b/website/templates/index/community.html
deleted file mode 100644
index 08ccf0c7580..00000000000
--- a/website/templates/index/community.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<div id="community"></div>
-<div class="section pb-lg-10 pt-10 pt-lg-15">
-    <div class="container">
-
-        <div class="row">
-            <div class="col-lg-4 mb-5 mb-lg-0">
-
-                <h2 class="display-2 mb-3 mb-lg-5" style="max-width: 400px;">
-                    {{ _('Join our growing ClickHouse community') }}
-                </h2>
-
-                <div>
-                    <a href="/blog/en/" class="btn btn-outline-secondary" role="button" rel="nofollow">
-                        {{ _('See Our Blog') }}
-                    </a>
-                </div>
-
-            </div>
-            <div class="col-lg-8">
-
-                <div class="bg-inset-right bg-light" style="bottom:40px;top:40px;"></div>
-
-                <div class="row mx-n2">
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-github.svg" alt="ClickHouse GitHub" title="ClickHouse GitHub" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-slack.svg" alt="ClickHouse Slack Workspace" title="ClickHouse Slack Workspace" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://stackoverflow.com/questions/tagged/clickhouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-stack-overflow.svg" alt="ClickHouse at Stack Overflow" title="ClickHouse at Stack Overflow" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://groups.google.com/group/clickhouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-google.svg" alt="ClickHouse at Google Groups" title="ClickHouse at Google Groups" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://www.youtube.com/c/ClickHouseDB" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-youtube.svg" alt="ClickHouse YouTube Channel" title="ClickHouse YouTube Channel" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://telegram.me/clickhouse_en" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-telegram.svg" alt="ClickHouse at Telegram" title="ClickHouse at Telegram" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 mb-sm-0 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://www.facebook.com/ClickHouseInc/" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-facebook.svg" alt="ClickHouse at Facebook" title="ClickHouse at Facebook" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 mb-sm-0 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://twitter.com/ClickhouseDB" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-twitter.svg" alt="ClickHouse at Twitter" title="ClickHouse at Twitter" class="icon mx-auto mb-0">
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 px-2 d-flex align-items-stretch">
-
-                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
-                            <div class="embed-responsive-item d-flex align-items-stretch">
-                                <a href="https://www.linkedin.com/company/ClickHouseInc/" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
-                                    <div class="card-body d-flex align-items-center justify-content-center">
-
-                                        <img data-src="/images/icons/icon-linkedin.png" alt="ClickHouse at LinkedIn" title="ClickHouse at LinkedIn" class="icon mx-auto mb-0">
-
-
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
diff --git a/website/templates/index/hero.html b/website/templates/index/hero.html
deleted file mode 100644
index da6ee77700b..00000000000
--- a/website/templates/index/hero.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="hero bg-white">
-    <div class="hero-bg index-hero"></div>
-    <div class="container pt-5 pt-lg-7 pt-xl-15 pb-5 pb-lg-7">
-
-        <h1 class="display-1 mb-2 mb-xl-3 mx-auto text-center">
-            ClickHouse <span class="text-orange">v22.2 Released</span>
-        </h1>
-
-        <p class="lead mb-3 mb-lg-5 mb-xl-7 mx-auto text-muted text-center" style="max-width:780px;">
-            {{ _('ClickHouse® is an open-source, high performance columnar OLAP database management system for real-time analytics using SQL.') }}
-        </p>
-
-        <p class="d-flex justify-content-center mb-0">
-            <a href="https://www.youtube.com/watch?v=6EG1gwhSTPg" target="_blank" class="btn btn-primary trailing-link">Watch the Release Webinar on YouTube</a>
-        </p>
-
-    </div>
-</div>
-
-<div class="section">
-    <div class="container">
-
-        <div class="card is-large has-highlight">
-            <div class="card-body">
-
-                <h4 class="text-blue text-center">ClickHouse Announces $250 Million in Funding</h4>
-
-                <p class="font-lg text-center mb-6 mx-auto">Raising the Company’s Valuation to $2B</p>
-
-                <div class="btns is-3 mx-auto" role="group" style="max-width:740px;">
-                    <a href="/blog/en/2021/clickhouse-raises-250m-series-b/" class="btn btn-secondary" role="button">Read the Blog Post</a>
-                    <a href="https://www.bloomberg.com/news/articles/2021-10-28/clickhouse-valued-at-2-billion-in-round-after-yandex-spinout" class="btn btn-outline-secondary" role="button" rel="external nofollow" target="_blank">Read the News</a>
-                    <a href="https://www.businesswire.com/news/home/20211028005287/en" class="btn btn-outline-secondary" role="button" rel="external nofollow" target="_blank">Read the Press Release</a>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
diff --git a/website/templates/index/performance.html b/website/templates/index/performance.html
deleted file mode 100644
index 1be0e4dafe2..00000000000
--- a/website/templates/index/performance.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div id="blazing-fast" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
-     <div class="container">
-
-         <div class="row">
-             <div class="col-lg-6 mb-5 mb-lg-0">
-                 
-                <h2 id="performance" class="display-2 mb-3 mb-lg-5">
-                    ClickHouse works <span class="text-orange">100-1000x</span> faster than traditional approaches
-                </h2>
-
-                <p class="lead text-muted mb-3">
-                    ClickHouse's performance <a href="/benchmark/dbms/">exceeds</a> comparable column-oriented database management systems that are available on the market. It processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second.
-                </p>
-
-                <a href="/benchmark/dbms/" class="btn btn-outline-secondary" role="button" rel="nofollow">
-                    {{ _('Detailed comparison') }}
-                </a>
-
-             </div>
-             <div class="col-lg-6">
-                
-                <h2 id="independent-benchmarks" class="display-3 mb-4">Independent benchmarks</h2>
-                
-                <ul class="has-separators">
-                    <li>
-                        <div class="kicker">GitLab</div>
-                        <a href="https://www.youtube.com/watch?v=cMdQsxolcqc" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
-                            ClickHouse vs TimescaleDB
-                        </a>
-                    </li>
-                    <li>
-                        <div class="kicker">Mark Litwintschik</div>
-                        <a href="https://tech.marksblogg.com/billion-nyc-taxi-rides-clickhouse-cluster.html" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
-                            1.1 Billion Taxi Rides: 108-core ClickHouse Cluster
-                        </a>
-                    </li>
-                    <li>
-                        <div class="kicker">Brandon Harris</div>
-                        <a href="http://brandonharris.io/redshift-clickhouse-time-series/" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
-                            ClickHouse, Redshift and 2.5 Billion Rows of Time Series Data
-                        </a>
-                    </li>
-                    <li>
-                        <div class="kicker">Percona</div>
-                        <a href="https://www.percona.com/blog/2020/07/27/clickhouse-and-columnstore-in-the-star-schema-benchmark/" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
-                            ClickHouse vs MariaDB ColumnStore
-                        </a>
-                    </li>
-
-                </ul>
-                    
-             </div>
-         </div>
-         
-     </div>
-</div>
diff --git a/website/templates/index/pullquote.html b/website/templates/index/pullquote.html
deleted file mode 100644
index db6e2c89e0e..00000000000
--- a/website/templates/index/pullquote.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="section mt-n15">
-    <div class="container">
-
-        <div class="pullquote text-white">
-            <div class="pullquote-bg bg-gradient-secondary"></div>
-            <div class="pullquote-body">
-                <p class="pullquote-quote">
-                    {{ _('"ClickHouse leading the way in real time for Engineering organizations"') }}
-                </p>
-                <p class="pullquote-citation">
-                    <span class="font-weight-bold">{{ _('Author Name') }}</span>,
-                    {{ _('Company Name') }}
-                </p>
-            </div>
-        </div>
-        
-    </div>
-</div>
diff --git a/website/templates/index/quickstart.html b/website/templates/index/quickstart.html
deleted file mode 100644
index 100261ab548..00000000000
--- a/website/templates/index/quickstart.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<div class="section bg-white pb-0 pb-lg-10" style="overflow: hidden;">
-    <div class="section-bg quickstart-bg"></div>
-    <div class="container">
-
-        <h2 id="quick-start" class="display-2 mb-5 mb-md-8 mb-lg-10 text-center">Quick Start</h2>
-
-        <div class="tabs">
-
-            <ul class="nav nav-tabs" id="install-tab" role="tablist">
-                <li class="nav-item">
-                    <a class="nav-link active" id="deb-tab" data-toggle="tab" href="#deb" role="tab" aria-controls="deb" aria-selected="true" title="deb packages">Ubuntu or Debian</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" id="rpm-tab" data-toggle="tab" href="#rpm" role="tab" aria-controls="rpm" aria-selected="false" title="rpm packages">CentOS or RedHat</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" id="tgz-tab" data-toggle="tab" href="#tgz" role="tab" aria-controls="tgz" aria-selected="false" title="tgz packages">Other Linux (x86)</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" id="arm-tab" data-toggle="tab" href="#arm" role="tab" aria-controls="arm" aria-selected="false" title="ARM packages">Linux (ARM)</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" id="mac-x86-tab" data-toggle="tab" href="#mac-x86" role="tab" aria-controls="mac-x86" aria-selected="false" title="macOS x86_64 packages">macOS (Intel)</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" id="mac-arm-tab" data-toggle="tab" href="#mac-arm" role="tab" aria-controls="mac-arm" aria-selected="false" title="macOS arm64 packages">macOS (Apple silicon)</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" id="freebsd-tab" data-toggle="tab" href="#freebsd" role="tab" aria-controls="freebsd" aria-selected="false" title="FreeBSD packages">FreeBSD (x86_64)</a>
-                </li>
-            </ul>
-
-            <div class="tabs-body">
-
-                <div class="tab-content mb-5" id="install-tab-content">
-                    <div class="tab-pane show active syntax" id="deb" role="tabpanel" aria-labelledby="deb-tab">
-                        <pre>{% include "install/deb.sh" %}</pre>
-                    </div>
-                    <div class="tab-pane syntax" id="rpm" role="tabpanel" aria-labelledby="rpm-tab">
-                        <pre>{% include "install/rpm.sh" %}</pre>
-                    </div>
-                    <div class="tab-pane syntax" id="tgz" role="tabpanel" aria-labelledby="tgz-tab">
-                        <pre>{% include "install/tgz.sh" %}</pre>
-                    </div>
-                    <div class="tab-pane syntax" id="arm" role="tabpanel" aria-labelledby="arm-tab">
-                        <pre>{% include "install/arm.sh" %}</pre>
-                    </div>
-                    <div class="tab-pane syntax" id="mac-x86" role="tabpanel" aria-labelledby="mac-x86-tab">
-                        <pre>{% include "install/mac-x86.sh" %}</pre>
-                    </div>
-                    <div class="tab-pane syntax" id="mac-arm" role="tabpanel" aria-labelledby="mac-arm-tab">
-                        <pre>{% include "install/mac-arm.sh" %}</pre>
-                    </div>
-                    <div class="tab-pane syntax" id="freebsd" role="tabpanel" aria-labelledby="freebsd-tab">
-                        <pre>{% include "install/freebsd.sh" %}</pre>
-                    </div>
-                </div>
-
-                <p class="font-lg text-dark">
-                    There's a number of <a href="/docs/en/getting-started/">alternative options</a> to get started, most notably the
-                    <a href="https://hub.docker.com/r/clickhouse/clickhouse-server/" rel="external nofollow noreferrer" target="_blank">official Docker images of ClickHouse</a>. To learn more about our future cloud offerings, <a href="/company/#contact">contact us</a>.
-                </p>
-
-                <p class="font-lg text-dark mb-5">After you got connected to your ClickHouse server, you can proceed to:</p>
-
-                <div class="btns justify-content-start">
-                    <a href="/docs/en/getting-started/tutorial/" class="btn btn-secondary" role="button">Tutorial</a>
-                    <a href="/docs/en/" class="btn btn-outline-secondary" role="button">Documentation</a>
-                </div>
-
-            </div>
-
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/success.html b/website/templates/index/success.html
deleted file mode 100644
index 7d70f4367b2..00000000000
--- a/website/templates/index/success.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<div class="section bg-white pt-10 pt-lg-15">
-    <div class="container">
-
-        <h2 class="display-2 mb-5 mb-md-8 mb-lg-10 text-center text-lg-left">
-            ClickHouse Users
-        </h2>
-        
-        <div class="case-study-cards">
-            <div>
-
-                <div class="card case-study-card is-large open-right">
-                    <div class="case-study-card-wrap">
-
-                        <div class="card-body case-study-card-body case-study-card-body">
-
-                            <img class="d-block mb-3" src="/images/logos/logo-yandex.png" height="53" width="220" title="Yandex" style="aspect-ratio: 220 / 53;height: auto;object-fit:contain;object-position:left center;max-width: 140px;">
-
-                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
-                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
-                                    
-                                    <div class="case-study-card-toggle mt-auto"></div>
-                                    
-                                </div>
-                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
-
-                                    <p class="mb-3 text-dark">{{ _('ClickHouse was born and in production inside Yandex over a decade ago and now stores 10’s of trillions of rows of data serving a query throughput of 2TB per second for Yandex Metrica. It has also become the de facto standard inside Yandex for advertising systems, monitoring and observability data, business intelligence, recommendations platforms, OLAP, and even cars telemetry.') }}</p>
-                                    
-                                    <a class="trailing-link" href="/docs/en/introduction/history/">{{ _('Read the Case Study') }}</a>
-                                    
-                                </div>
-                                <div class="col-lg-3 px-2">
-
-                                    <ul>
-                                        <li class="font-weight-bold">Stores 10’s of trillions of rows of data</li>
-                                        <li class="font-weight-bold">Query throughput of 2TB per second</li>
-                                        <li class="font-weight-bold">Became de facto standard inside Yandex</li>
-                                    </ul>
-                                    
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                
-            </div>
-            <div>
-
-                <div class="card case-study-card is-large open-left">
-                    <div class="case-study-card-wrap">
-                            
-                        <div class="card-body case-study-card-body">
-
-                            <img class="d-block mb-3" src="/images/logos/logo-uber.png" height="40" width="114" title="Uber" style="aspect-ratio: 114 / 40;height: auto;object-fit:contain;object-position:left center;">
-
-                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
-                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
-                                    
-                                    <div class="case-study-card-toggle mt-auto"></div>
-                                    
-                                </div>
-                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
-
-                                    <p class="mb-3 text-dark">{{ _('Uber moved its logging platform to ClickHouse increasing developer productivity and overall reliability of the platform while seeing 3x data compression, 10x performance increase, and ½ the reduction in hardware cost.') }}</p>
-        
-                                    <a class="trailing-link" href="https://eng.uber.com/logging/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
-                                    
-                                </div>
-                                <div class="col-lg-3 px-2">
-
-                                    <ul>
-                                        <li class="font-weight-bold">3x data compression</li>
-                                        <li class="font-weight-bold">10x performance increase</li>
-                                        <li class="font-weight-bold">½ the reduction in hardware cost</li>
-                                    </ul>
-                                    
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                
-            </div>
-            <div>
-
-                <div class="card case-study-card is-large open-right">
-                    <div class="case-study-card-wrap">
-                            
-                        <div class="card-body case-study-card-body">
-
-                            <img class="d-block mb-3" src="/images/logos/logo-ebay.png" height="40" width="100" title="eBay" style="aspect-ratio: 100 / 40;height: auto;object-fit:contain;object-position:left center;">
-
-                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
-                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
-
-                                    <div class="case-study-card-toggle mt-auto"></div>
-                                    
-                                </div>
-                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
-
-                                    <p class="mb-3 text-dark">{{ _('eBay adopted ClickHouse for their real time OLAP events (Logs + Metrics) infrastructure. The simplified architecture with ClickHouse allowed them to reduce their DevOps activity and troubleshooting, reduced the overall infrastructure by 90%%, and they saw a stronger integration with Grafana and ClickHouse for visualization and alerting.') }}</p>
-        
-                                    <a class="trailing-link" href="https://tech.ebayinc.com/engineering/ou-online-analytical-processing/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
-                                    
-                                </div>
-                                <div class="col-lg-3 px-2">
-
-                                    <ul>
-                                        <li class="font-weight-bold">Reduced DevOps activity and troubleshooting</li>
-                                        <li class="font-weight-bold">10 times less hardware</li>
-                                        <li class="font-weight-bold">Stronger integration with Grafana</li>
-                                    </ul>
-                                    
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                
-            </div>
-            <div>
-
-                <div class="card case-study-card is-large open-left">
-                    <div class="case-study-card-wrap">
-                            
-                        <div class="card-body case-study-card-body">
-
-                            <img class="d-block mb-3" src="/images/logos/logo-cloudflare.svg" height="40" width="246" title="Cloudflare" style="aspect-ratio: 246 / 40;height: auto;object-fit:contain;object-position:left center;">
-
-                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
-                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
-                            
-                                    <div class="case-study-card-toggle mt-auto"></div>
-                                    
-                                </div>
-                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
-
-                                    <p class="mb-3 text-dark">{{ _('Cloudflare was having challenges scaling their CitusDB-based system which had a high TCO and maintenance costs due to the complex architecture. By moving their HTTP analytics data to ClickHouse they were able to scale to 8M requests per second, deleted 10’s of thousands of lines of code, reduced their MTTR, and saw a 7x improvement on customer queries per second they could serve.') }}</p>
-        
-                                    <a class="trailing-link" href="https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
-                                    
-                                </div>
-                                <div class="col-lg-3 px-2">
-
-                                    <ul>
-                                        <li class="font-weight-bold">Scaled to 8M requests per second</li>
-                                        <li class="font-weight-bold">Reduced their MTTR</li>
-                                        <li class="font-weight-bold">7x improvement on query throughput</li>
-                                    </ul>
-                                    
-                                </div>
-                            </div>
-
-                        </div>
-                    
-                    </div>
-                </div>
-                
-            </div>
-            <div>
-
-                <div class="card case-study-card is-large open-right">
-                    <div class="case-study-card-wrap">
-
-                        <div class="card-body case-study-card-body">
-
-                            <img class="d-block mb-3" src="/images/logos/logo-spotify.png" height="40" width="134" title="Spotify" style="aspect-ratio: 134 / 40;height: auto;object-fit:contain;object-position:left center;">
-
-                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
-                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
-                                    
-                                    <div class="case-study-card-toggle mt-auto"></div>
-                                    
-                                </div>
-                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
-
-                                    <p class="mb-3 text-dark">{{ _('Spotify\'s A/B Experimentation platform is serving thousands of sub-second queries per second on petabyte-scale datasets with Clickhouse. They reduced the amount of low-variance work by an order of magnitude and enabled feature teams to self-serve insights by introducing a unified SQL interface for Data Platform and tools for automatic decision making for Experimentation.') }}</p>
-        
-                                    <a class="trailing-link" href="https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
-                                    
-                                </div>
-                                <div class="col-lg-3 px-2">
-
-                                    <ul>
-                                        <li class="font-weight-bold">Reduced the amount of low-variance work</li>
-                                        <li class="font-weight-bold">Enabled feature teams to self-serve insights</li>
-                                        <li class="font-weight-bold">Tools for automatic decision making</li>
-                                    </ul>
-                                    
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                
-            </div>
-            <div>
-
-                <div class="card case-study-card is-large open-left">
-                    <div class="case-study-card-wrap">
-
-                        <div class="card-body case-study-card-body">
-
-                            <img class="d-block mb-3" src="/images/logos/logo-deutsche-bank.png" height="40" width="204" title="Deutsche Bank" style="aspect-ratio: 204 / 40;height: auto;object-fit:contain;object-position:left center;">
-
-                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
-                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
-                            
-                                    <div class="case-study-card-toggle mt-auto"></div>
-                                    
-                                </div>
-                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
-
-                                    <p class="mb-3 text-dark">{{ _('ClickHouse helps serve the Client Analytics platform for reporting, deep data analysis as well as advanced data science to provide Deutsche Bank’s front office a clear view on their client\'s activity and profitability.') }}</p>
-        
-                                    <a class="trailing-link" href="https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
-                                    
-                                </div>
-                                <div class="col-lg-3 px-2">
-
-                                    <ul>
-                                        <li class="font-weight-bold">Platform for reporting and deep data analysis</li>
-                                        <li class="font-weight-bold">Advanced data science</li>
-                                        <li class="font-weight-bold">Provide clear view of client's activity and profitability</li>
-                                    </ul>
-                                    
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                
-            </div>
-        </div>
-        
-    </div>
-</div>
diff --git a/website/templates/index/why.html b/website/templates/index/why.html
deleted file mode 100644
index 58bb42ffd31..00000000000
--- a/website/templates/index/why.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="section pt-10 pt-lg-15">
-    <div class="container">
-
-        <h2 class="display-2 text-center mb-3">
-            Why ClickHouse
-        </h2>
-
-        <p class="lead text-muted text-center mb-5 mb-md-8 mb-lg-10 mx-auto" style="max-width:740px;">
-            {{ _('Our feature rich and hardware efficient OLAP data management system is the right choice for your organization.') }}
-        </p>
-
-        <div class="row mb-5 mb-md-8 mb-lg-10">
-            <div class="col-lg-6 mb-5 mb-md-8 mb-lg-0 mx-auto mx-lg-0 d-flex flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
-                <img class="icon" src="/images/icons/icon-performance.svg">
-                <h3 class="display-3">Performance</h3>
-                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse supports best in the industry query performance, while significantly reducing storage requirements through our innovative use of columnar storage and compression.</p>
-                <hr class="is-yellow mt-auto">
-            </div>
-            <div class="col-lg-6 d-flex mx-auto mx-lg-0 flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
-                <img class="icon" src="/images/icons/icon-scalability.svg">
-                <h3 class="display-3">Scalability</h3>
-                <p class="font-lg text-muted mb-3" style="max-width: 440px;">Battle tested in production, with linear horizontal scalability from single-server deployments to clusters with many thousands of nodes.</p>
-                <hr class="is-yellow mt-auto">
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-6 mb-5 mb-md-8 mb-lg-0 mx-auto mx-lg-0 d-flex flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
-                <img class="icon" src="/images/icons/icon-reliability.svg">
-                <h3 class="display-3">Reliability</h3>
-                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse deployments feature best in class availability. There are no single points of failure, with the architecture supporting multi-master replication, performing effectively in multi-region configurations.</p>
-                <hr class="is-yellow mt-auto">
-            </div>
-            <div class="col-lg-6 d-flex mx-auto mx-lg-0 flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
-                <img class="icon" src="/images/icons/icon-security.svg">
-                <h3 class="display-3">Security</h3>
-                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse comes with enterprise grade security features and fail-safe mechanisms protecting against data corruption from application bugs and human errors.</p>
-                <hr class="is-yellow mt-auto">
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/support/agreement-content.html b/website/templates/support/agreement-content.html
deleted file mode 100644
index 4ca64e69599..00000000000
--- a/website/templates/support/agreement-content.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<div id="contact" class="section pt-5">
-    <div class="container">
-    		
-    		<p>This ClickHouse Subscription Agreement, including all referenced URLs, which are incorporated herein by reference (collectively, this “Agreement”), is entered into as of the date on which an applicable Order Form is fully executed (“Effective Date”), by and between the ClickHouse entity ("ClickHouse") set forth on such Order Form, and the entity identified thereon as the “Customer” (“Customer”).</p>
-
-    		<p><strong>1. DEFINITIONS</strong><br /> Capitalized terms used herein have the meaning ascribed below, or where such terms are first used, as applicable.</p>
-
-    		<p>1.1 <strong>"Affiliate"</strong> means, with respect to a party, any entity that controls, is controlled by, or which is under common control with, such party, where "control" means ownership of at least fifty percent (50%) of the outstanding voting shares of the entity, or the contractual right to establish policy for, and manage the operations of, the entity.</p>
-
-    		<p>1.2 <strong>"Order Form"</strong> means an ordering document provided by ClickHouse pursuant to which Customer purchases Subscriptions under this Agreement.</p>
-
-    		<p>1.3 <strong>"Qualifying PO"</strong> means a purchase order issued by customer for the purpose of purchasing a Subscription, which (i) references the number of an applicable Order Form provided to Customer by ClickHouse and (ii) clearly states the purchase order is subject to the terms and conditions of this Agreement.</p>
-
-    		<p>1.4 <strong>"Software"</strong> means the ClickHouse software of the same name that is licensed for use under the Apache 2.0 license.</p>
-
-    		<p>1.5 <strong>"Subscription"</strong> means Customer's right, for a fixed period of time, to receive Support Services, as set forth in the applicable Order Form.</p>
-
-    		<p>1.6 <strong>"Subscription Term"</strong> means the period of time for which a Subscription is valid, as further described in Section 7.1 of this Agreement.</p>
-
-    		<p>1.7 <strong>"Support Services"</strong> means maintenance and support services for the Software, as more fully described in the Support Services Policy.</p>
-
-    		<p>1.8 "Support Services Policy" means ClickHouse's support services policy as further described at  <a href="https://clickhouse.com/support/policy/">https://clickhouse.com/support/policy/</a>. ClickHouse reserves the right to reasonably modify the Support Services Policy during a Subscription Term, provided however, ClickHouse shall not materially diminish the level of Support Services during a Subscription Term. The effective date of each version of the Support Services Policy will be stated thereon, and ClickHouse agrees to archive copies of each version, and make the same available to Customer upon written request (e-mail sufficient). The parties agree that the Support Services Policy is hereby incorporated into these terms and conditions by this reference.</p>
-
-    		<p><strong>2. AGREEMENT SCOPE AND PERFORMANCE OF SUPPORT SERVICES</strong></p>
-
-    		<p>2.1 <u>Agreement Scope.</u> This Agreement includes terms and conditions applicable to Subscriptions for Support Services purchased under each Order Form entered into by the parties under Section 2.2 below, which Support Services may be used by Customer solely for Internal use and in connection with the use case(s) set forth on the applicable Order Form.</p>
-
-    		<p>2.2 <u>Order for Support Services Subscriptions.</u> Orders for Subscriptions may be placed by Customer through (1) the execution of Order Forms with ClickHouse or (2) issuance by Customer of a Qualifying PO, which will be deemed to constitute, for the purposes of this Agreement, the execution by Customer of the referenced Order Form.</p>
-
-    		<p>2.3 <u>Affiliates.</u> The parties agree that their respective Affiliates may also conduct business under this Agreement by entering into Order Forms, which in some cases may be subject to such additional and/or alternative terms and conditions to those contained in this Agreement as may be mutually agreed in the Order Form or an attachment thereto, as applicable. Accordingly, where Affiliates of the parties conduct business hereunder, references to Customer herein shall include any applicable Customer Affiliate, and references to ClickHouse herein shall include any applicable ClickHouse Affiliate. The parties agree that where either of them or one of their Affiliates enters into an Order Form with an Affiliate of the other party, that such Affiliate shall be solely responsible for performing all of its obligations under this Agreement in connection with such Order Form.</p>
-
-    		<p>2.4 <u>Performance of Support Services.</u> Subject to Customer’s payment of all fees (as set forth in an applicable Order Form), ClickHouse will provide Customer with Support Services for the Software during an applicable Subscription Term in accordance with this Agreement and the Support Services Policy. Customer will reasonably cooperate with ClickHouse in connection with the Support Services, including, without limitation, by providing ClickHouse reasonable remote access to its installations, server cloud (or hosting provider), Software and equipment in connection therewith. Further, Customer will designate appropriately skilled personnel to serve as ClickHouse’s central contacts in connection with the use, operation and support of the Software. Customer understands that ClickHouse’s performance of Support Services is dependent in part on Customer’s cooperation, actions, and performance. ClickHouse shall not be responsible for any delays or interruptions in its performance of Support Services, or any claims arising therefrom, due to Customer’s lack of cooperation or acts or omissions. ClickHouse may use its Affiliates or subcontractors to provide Support Services to Customer, provided that ClickHouse remains responsible to Customer for performance.</p>
-
-    		<p><strong>3. PAYMENT AND TAXES </strong></p>
-
-    		<p>3.1 <u>Payment.</u> ClickHouse will invoice Customer for the fees due under each Order Form or otherwise under this Agreement, and Customer will pay such fees within thirty (30) days after receipt of an applicable invoice. All invoices will be paid in the currency set forth on the applicable Order Form. Payments will be made without right of set-off or chargeback. Except as otherwise expressly provided in this Agreement, any and all payments made by Customer pursuant to this Agreement or any Order Form are non-refundable, and all commitments to make any payments hereunder or under any Order Form are non-cancellable.</p>
-
-    		<p>3.2 <u>Taxes.</u> All fees stated on an Order Form are exclusive of any applicable sales, use, value added and excise taxes levied upon the delivery or use of the taxable components, if any, of any Subscription purchased by Customer under this Agreement (collectively, “Taxes”). Taxes do not include any taxes on the net income of ClickHouse or any of its Affiliates. Unless Customer provides ClickHouse a valid state sales/use/excise tax exemption certificate or Direct Pay Permit, and provided that ClickHouse separately states any such taxes in the applicable invoice, Customer will pay and be solely responsible for all Taxes. If Customer is required by any foreign governmental authority to deduct or withhold any portion of the amount invoiced for the delivery or use of Support Services under this Agreement, Customer shall increase the sum paid to ClickHouse by an amount necessary for the total payment to ClickHouse equal to the amount originally invoiced.</p>
-
-    		<p><strong>4. CONFIDENTIAL INFORMATION </strong></p>
-
-    		<p>4.1 <u>Confidential Information.</u> Both parties acknowledge that, in the course of performing this Agreement, they may obtain information relating to products (such as goods, services, and software) of the other party, or relating to the parties themselves, which is of a confidential and proprietary nature ("Confidential Information"). Confidential Information includes materials and all communications concerning ClickHouse's or Customer's business and marketing strategies, including but not limited to employee and customer lists, customer profiles, project plans, design documents, product strategies and pricing data, research, advertising plans, leads and sources of supply, development activities, design and coding, interfaces with the Products, anything provided by either party to the other in connection with the Products and/or Support Services provided under this Agreement, including, without limitation, computer programs, technical drawings, algorithms, know-how, formulas, processes, ideas, inventions (whether patentable or not), schematics and other technical plans and other information of the parties which by its nature can be reasonably expected to be proprietary and confidential, whether it is presented in oral, printed, written, graphic or photographic or other tangible form (including information received, stored or transmitted electronically) even though specific designation as Confidential Information has not been made. Confidential Information also includes any notes, summaries, analyses of the foregoing that are prepared by the receiving party.</p>
-
-    		<p>4.2 <u>Non-use and Non-disclosure.</u> The parties shall at all times, both during the Term and thereafter keep in trust and confidence all Confidential Information of the other party using commercially reasonable care (but in no event less than the same degree of care that the receiving party uses to protect its own Confidential Information) and shall not use such Confidential Information other than as necessary to carry out its duties under this Agreement, nor shall either party disclose any such Confidential Information to third parties other than to Affiliates or as necessary to carry out its duties under this Agreement without the other party's prior written consent, provided that each party shall be allowed to disclose Confidential Information of the other party to the extent that such disclosure is approved in writing by such other party, or necessary to enforce its rights under this Agreement.</p>
-
-    		<p>4.3 <u>Non-Applicability.</u> The obligations of confidentiality shall not apply to information which (i) has entered the public domain or is otherwise publicly available, except where such entry or availability is the result of a party's breach of this Agreement; (ii) prior to disclosure hereunder was already in the receiving party's possession without restriction as evidenced by appropriate documentation; (iii) subsequent to disclosure hereunder is obtained by the receiving party on a non-confidential basis from a third party who has the right to disclose such information; or (iv) was developed by the receiving party without any use of any of the Confidential Information as evidenced by appropriate documentation.</p>
-
-			<p>4.4 <u>Terms of this Agreement.</u> Except as required by law or governmental regulation, neither party shall disclose, advertise, or publish the terms and conditions of this Agreement without the prior written consent of the other party, except that either party may disclose the terms of this Agreement to potential acquirers, referral partners involved in an applicable transaction, accountants, attorneys and Affiliates pursuant to the terms of a non-disclosure or confidentiality agreement. If Customer is using a third party provider to host a Product, then such provider may also receive, subject to a confidentiality obligation, information related to the terms of this Agreement or Customer’s usage of the applicable Product.</p>
-
-			<p>4.5 <u>Disclosure Required by Law.</u> Notwithstanding anything to the contrary herein, each party may disclose the other party's Confidential Information in order to comply with applicable law and/or an order from a court or other governmental body of competent jurisdiction, and, in connection with compliance with such an order only, if such party: (i) unless prohibited by law, gives the other party prior written notice to such disclosure if the time between that order and such disclosure reasonably permits or, if time does not permit, gives the other party written notice of such disclosure promptly after complying with that order and (ii) fully cooperates with the other party, at the other party's cost and expense, in seeking a protective order, or confidential treatment, or taking other measures to oppose or limit such disclosure. Each party must not release any more of the other party's Confidential Information than is, in the opinion of its counsel, reasonably necessary to comply with an applicable order.</p>
-
-			<p><strong>5. WARRANTIES AND DISCLAIMER OF WARRANTIES</strong></p>
-
-			<p>5.1 <u>Limited Support Services Performance Warranty.</u> ClickHouse warrants that it will perform the Support Services in a professional, workmanlike manner, consistent with generally accepted industry practice, and in accordance with the Support Services Policy. In the event of a breach of the foregoing warranty, ClickHouse’s sole obligation, and Customer’s exclusive remedy, shall be for ClickHouse to re-perform the applicable Support Services.</p>
-
-			<p>5.2 <u>Warranty Disclaimer.</u> EXCEPT AS SET FORTH IN SECTION 5.1 ABOVE, THE SUPPORT SERVICES ARE PROVIDED “AS IS” WITHOUT WARRANTY OF ANY KIND AND CLICKHOUSE MAKES NO ADDITIONAL WARRANTIES, WHETHER EXPRESSED, IMPLIED OR STATUTORY, REGARDING OR RELATING TO THE SUPPORT SERVICES OR ANY MATERIALS FURNISHED OR PROVIDED TO CUSTOMER UNDER THIS AGREEMENT. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAW, CLICKHOUSE SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO THE SUPPORT SERVICES AND ANY MATERIALS FURNISHED OR PROVIDED TO CUSTOMER UNDER THIS AGREEMENT. CUSTOMER UNDERSTANDS AND AGREES THAT THE SUPPORT SERVICES AND ANY MATERIALS FURNISHED OR PROVIDED TO CUSTOMER UNDER THIS AGREEMENT ARE NOT DESIGNED OR INTENDED FOR USE IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT, WEAPONS SYSTEMS, OR LIFE SUPPORT SYSTEMS.</p>
-
-			<p><strong>6. LIMITATION OF LIABILITY</strong></p>
-
-			<p>6.1 <u>Excluded Damages.</u> IN NO EVENT SHALL CUSTOMER OR CLICKHOUSE, OR THEIR RESPECTIVE AFFILIATES, BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, COST OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY PUNITIVE, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH OR ARISING OUT OF THE PERFORMANCE OF OR FAILURE TO PERFORM THIS AGREEMENT, WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, EVEN IF A PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-			<p>6.2 <u>Damages Cap.</u> EXCEPT WITH RESPECT TO (I) A PARTY’S BREACH OF ITS OBLIGATIONS UNDER SECTION 4, (II) AMOUNTS PAYABLE BY CUSTOMER UNDER SECTION 3 OF THIS AGREEMENT AND EACH ORDER FORM, AND (III) CUSTOMER'S VIOLATIONS OF THE USE RESTRICTIONS SET FORTH IN THIS AGREEMENT, IN NO EVENT SHALL CLICKHOUSE'S OR CUSTOMER’S TOTAL, CUMULATIVE LIABILITY UNDER ANY ORDER FORM EXCEED THE AMOUNT PAID OR PAYABLE BY CUSTOMER TO CLICKHOUSE UNDER THIS AGREEMENT FOR THE AFFECTED SUPPORT SERVICES DELIVERED AND/OR MADE AVAILABLE TO CUSTOMER UNDER SUCH ORDER FORM FOR THE TWELVE (12) MONTH PERIOD IMMEDIATELY PRIOR TO THE FIRST EVENT GIVING RISE TO LIABILITY.</p>
-
-			<p>6.3 <u>Basis of the Bargain.</u> THE ALLOCATIONS OF LIABILITY IN THIS SECTION 6 REPRESENT THE AGREED AND BARGAINED FOR UNDERSTANDING OF THE PARTIES, AND THE COMPENSATION OF CLICKHOUSE FOR THE SUPPORT SERVICES PROVIDED HEREUNDER REFLECTS SUCH ALLOCATIONS. THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY FAILS IN ITS ESSENTIAL PURPOSE.</p>
-
-			<p><strong>7. TERM AND TERMINATION</strong></p>
-
-			<p>7.1 <u>Subscription Term.</u> The initial Subscription Term for each Subscription will commence and expire in accordance with the start date and end date set forth on the applicable Order Form, unless earlier terminated in in accordance with Section 7.3 below. Thereafter, each Subscription may be renewed for additional one (1) year periods upon the mutual written agreement of the parties. The initial Subscription Term, plus any subsequent renewal Subscription Term shall be the <strong>"Subscription Term"</strong>.</p>
-
-			<p>7.2 <u>Agreement Term.</u> This Agreement will commence on the Effective Date and, unless earlier terminated in accordance with Section 7.3(b) below, continue in force and effect for a period of two (2) years. Thereafter, the term of this Agreement shall automatically renew for additional one (1) year periods unless either party gives written notice to the other of its intention not to renew the Agreement at least thirty (30) days prior to the expiration of the then-current term. The initial term of this Agreement, plus any subsequent renewal term, shall be the <strong>"Term"</strong> of this Agreement. Notwithstanding any expiration of this Agreement, its terms will continue to apply to any Subscription that has not been terminated or for which the Subscription Term has not expired.</p>
-
-			<p>7.3 <u>Termination.</u></p>
-			<ol class="default" style="list-style-type: lower-alpha;">
-				<li><strong>Subscriptions.</strong> Each party may terminate a Subscription upon giving notice in writing to the other party if the non-terminating party commits a material breach of this Agreement with respect to such Subscription, and has failed to cure such breach within thirty (30) days following a request in writing from the notifying party to do so. Upon the termination or expiration of a Subscription, the rights and obligations of the parties with respect thereto will, subject to Section 7.4 below, cease, provided that termination of a Subscription under this subsection (a) will not result in termination of any other Subscriptions.</li>
-				<li><strong>Agreement.</strong> Either party may terminate this Agreement upon giving notice in writing to the other party if the non-terminating party commits a material breach of this Agreement with respect to any active Subscriptions hereunder, and has failed to cure such breach within thirty (30) days following a request in writing from the notifying party to do so. For the avoidance of doubt, termination of this Agreement under this subsection (b) will result in the termination of all Subscriptions and Order Forms.</li>
-			</ol>
-
-			<p>7.4 <u>Survival.</u> Upon the expiration or termination of an Order Form or this Agreement, (i) Customer shall have no further rights under any affected Subscription(s); and (ii) any payment obligations accrued under Section 3, as well as the provisions of Sections 1, 4, 5, 6, 7, 7.4 and 9 of this Agreement will survive such expiration or termination.</p>
-
-			<p><strong>8. GENERAL</strong></p>
-
-			<p>8.1 <u>Anti-Corruption.</u> Each party acknowledges that it is aware of, understands and has complied and will comply with, all applicable U.S. and foreign anti-corruption laws, including without limitation, the U.S. Foreign Corrupt Practices Act of 1977 and the U.K. Bribery Act of 2010, and similarly applicable anti-corruption and anti-bribery laws (<strong>"Anti-Corruption Laws"</strong>). Each party agrees that no one acting on its behalf will give, offer, agree or promise to give, or authorize the giving directly or indirectly, of any money or other thing of value, including travel, entertainment, or gifts, to anyone as an unlawful inducement or reward for favorable action or forbearance from action or the exercise of unlawful influence (a) to any governmental official or employee (including employees of government-owned and government-controlled corporations or agencies or public international organizations), (b) to any political party, official of a political party, or candidate, (c) to an intermediary for payment to any of the foregoing, or (d) to any other person or entity in a corrupt or improper effort to obtain or retain business or any commercial advantage, such as receiving a permit or license, or directing business to any person. Improper payments, provisions, bribes, kickbacks, influence payments, or other unlawful provisions to any person are prohibited under this Agreement.</p>
-
-			<p>8.2 <u>Assignment.</u> Neither party may assign this Agreement, in whole or in part, without the prior written consent of the other party, provided that no such consent will be required to assign this Agreement in its entirety to (i) an Affiliate that is able to satisfy the obligations of the assigning party under this Agreement or (ii) a successor in interest in connection with a merger, acquisition or sale of all or substantially all of the assigning party's assets. Any assignment in violation of this Section shall be void, ab initio, and of no effect. Subject to the foregoing, this Agreement is binding upon, inures to the benefit of and is enforceable by, the parties and their respective permitted successors and assigns.</p>
-
-			<p>8.3 <u>Attorneys' Fees.</u> If any action or proceeding, whether regulatory, administrative, at law or in equity is commenced or instituted to enforce or interpret any of the terms or provisions of this Agreement, the prevailing party in any such action or proceeding shall be entitled to recover its reasonable attorneys' fees, expert witness fees, costs of suit and expenses, in addition to any other relief to which such prevailing party may be entitled. As used herein, "prevailing party" includes without limitation, a party who dismisses an action for recovery hereunder in exchange for payment of the sums allegedly due, performance of covenants allegedly breached, or consideration substantially equal to the relief sought in the action.</p>
-
-			<p>8.4 <u>California Consumer Privacy Act (CCPA).</u> ClickHouse is a “Service Provider” as such term is defined under §1798.140(v) of the CCPA. As such ClickHouse shall not retain, use or disclose any personal information (as defined in the CCPA) received from Customer during the Term of this Agreement for any purpose other than the specific purpose of providing the Support Services specified in this Agreement or for such other business purpose as is specified in this Agreement.</p>
-
-			<p>8.5 Customer Identification. ClickHouse may identify Customer as a user of the Support Services, on its website, through a press release issued by ClickHouse and in other promotional materials.</p>
-
-			<p>8.6 <u>Feedback.</u> Customer, Customer’s Affiliates, and their respective agents, may volunteer feedback to ClickHouse, and/or its Affiliates, about the Support Services (<strong>“Feedback”</strong>). ClickHouse and its Affiliates shall be irrevocably entitled to use that Feedback, for any purpose and without any duty to account. provided that, in doing so, they may not breach their obligations of confidentiality under Section 4 of this Agreement. </p>
-
-			<p>8.7 <u>Force Majeure.</u> Except with respect to payment obligations, neither party will be liable for, or be considered to be in breach of, or in default under, this Agreement, as a result of any cause or condition beyond such party's reasonable control.</p>
-
-			<p>8.8 <u>Governing Law, Jurisdiction and Venue.</u></p>
-
-			<ol class="default" style="list-style-type: lower-alpha;">
-				<li><strong>Customers in California.</strong> If Customer is located in California (as determined by the Customer address on the applicable Order Form), this Agreement will be governed by the laws of the State of California, without regard to its conflict of laws principles, and all suits hereunder will be brought solely in Federal Court for the Northern District of California, or if that court lacks subject matter jurisdiction, in any California State Court located in Santa Clara County.</li>
-				<li><strong>Customers Outside of California.</strong> If Customer is located anywhere other than California (as determined by the Customer address on the applicable Order Form), this Agreement will be governed by the laws of the State of Delaware, without regard to its conflict of laws principles, and all suits hereunder will be brought solely in Federal Court for the District of Delaware, or if that court lacks subject matter jurisdiction, in any Delaware State Court located in Wilmington, Delaware.</li>
-
-				<li><strong>All Customers.</strong> This Agreement shall not be governed by the 1980 UN Convention on Contracts for the International Sale of Goods. The parties hereby irrevocably waive any and all claims and defenses either might otherwise have in any action or proceeding in any of the applicable courts set forth in (a) or (b) above, based upon any alleged lack of personal jurisdiction, improper venue, forum non conveniens, or any similar claim or defense.</li>
-
-				<li><strong>Equitable Relief.</strong> A breach or threatened breach, by either party of Section 4 may cause irreparable harm for which damages at law may not provide adequate relief, and therefore the non-breaching party shall be entitled to seek injunctive relief without being required to post a bond.</li>
-				
-			</ol>
-
-			<p>8.9 <u>Non-waiver.</u> Any failure of either party to insist upon or enforce performance by the other party of any of the provisions of this Agreement or to exercise any rights or remedies under this Agreement will not be interpreted or construed as a waiver or relinquishment of such party's right to assert or rely upon such provision, right or remedy in that or any other instance.</p>
-
-			<p>8.10 <u>Notices.</u> Any notice or other communication under this Agreement given by either party to the other will be deemed to be properly given if given in writing and delivered in person or by e-mail, if acknowledged received by return e-mail or followed within one day by a delivered or mailed copy of such notice, or if mailed, properly addressed and stamped with the required postage, to the intended recipient at its address specified on an Order Form. Notices to ClickHouse may also be sent to <a href="mailto:legal@ClickHouse.com">legal@ClickHouse.com</a>. Either party may from time to time change its address for notices under this Section by giving the other party notice of the change in accordance with this Section.</p>
-
-			<p>8.11 <u>Relationship of the Parties.</u> The relationship of the parties hereunder shall be that of independent contractors, and nothing herein shall be deemed or construed to create any employment, agency or fiduciary relationship between the parties. Each party shall be solely responsible for the supervision, direction, control and payment of its personnel, including, without limitation, for taxes, deductions and withholdings, compensation and benefits, and nothing herein will be deemed to result in either party having an employer-employee relationship with the personnel of the other party.</p>
-
-			<p>8.12 <u>Severability.</u> If any provision of this Agreement is held to be invalid or unenforceable, the remaining portions will remain in full force and effect and such provision will be enforced to the maximum extent possible so as to give effect the intent of the parties and will be reformed to the extent necessary to make such provision valid and enforceable.</p>
-
-			<p>8.13 <u>Entire Agreement; Amendment.</u> This Agreement, together with any Order Forms executed by the parties, and the Support Services Policy, each of which is hereby incorporated herein by this reference, constitutes the entire agreement between the parties concerning the subject matter hereof, and it supersedes, and its terms govern, all prior proposals, agreements, or other communications between the parties, oral or written, regarding such subject matter. This Agreement may be executed in any number of counterparts, each of which when so executed and delivered shall be deemed an original, and all of which together shall constitute one and the same agreement. Execution of a scanned copy will have the same force and effect as execution of an original, and a scanned signature will be deemed an original and valid signature. In the event of any conflict between the terms and conditions of any of the foregoing documents, the conflict shall be resolved based on the following order of precedence: (i) an applicable Order Form (but only for the transaction thereunder), (ii) an applicable Addendum (including any exhibits, attachments and addenda thereto), (iii) this Agreement, and (iv) the Support Services Policy. For the avoidance of doubt, the parties hereby expressly acknowledge and agree that if Customer issues any purchase orders or similar documents in connection with its purchase of a Subscription, it shall do so only for the purpose of Section 2.2(2) or for its own internal, administrative purposes and not with the intent to provide any contractual terms. By entering into this Agreement, whether prior to or following receipt of Customer's purchase order or any similar document, the parties are hereby expressly showing their intention not to be contractually bound by the contents of any such purchase order or similar document, which are hereby deemed rejected and extraneous to this Agreement, and ClickHouse's performance of this Agreement shall not amount to: (i) an acceptance by conduct of any terms set out or referred to in the purchase order or similar document; (ii) an amendment of this Agreement, nor (iii) an agreement to amend this Agreement. This Agreement shall not be modified except by a subsequently dated, written amendment that expressly amends this Agreement and which is signed on behalf of ClickHouse and Customer by their duly authorized representatives. The parties agree that the terms and conditions of this Agreement are a result of mutual negotiations. Therefore, the rule of construction that any ambiguity shall apply against the drafter is not applicable and will not apply to this Agreement. Any ambiguity shall be reasonably construed as to its fair meaning and not strictly for or against one party regardless of who authored the ambiguous language.</p>
-
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/website/templates/support/agreement-hero.html b/website/templates/support/agreement-hero.html
deleted file mode 100644
index ea97fb7729a..00000000000
--- a/website/templates/support/agreement-hero.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-0">
-            {{ _('Clickhouse, Inc.<br /> Subscription Agreement') }}
-        </h1>
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/website/templates/support/form.html b/website/templates/support/form.html
deleted file mode 100644
index b4ba3a68cdf..00000000000
--- a/website/templates/support/form.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div id="contact" class="section pt-5">
-    <div class="container">
-	
-		<form action="https://webto.salesforce.com/servlet/servlet.WebToCase?encoding=UTF-8" method="POST">
-
-			<input type=hidden name="orgid" value="00D5f000000JueF">
-			<input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
-
-			<div class="mb-3" style="max-width:720px;">
-				<div class="row">
-					<div class="form-group col-md-6 mb-3">
-						<input class="form-control" id="name" placeholder="Contact Name*" maxlength="80" name="name" size="20" type="text" required>
-					</div>
-					<div class="form-group col-md-6 mb-3">
-						<input class="form-control" id="email" placeholder="Your Work Email*" maxlength="80" name="email" size="20" type="text" required>
-					</div>
-					<div class="form-group col-12 mb-3">
-						<textarea class="form-control" id="00N5f00000MFsS2" name="00N5f00000MFsS2" wrap="soft" rows="4" placeholder="Enter any additional emails (1 per line)..."></textarea>
-					</div>
-					<div class="form-group col-md-12 mb-3 is-select">
-						<select class="form-control" id="priority" name="priority">
-							<option disabled selected>Severity Classification</option>
-							<option value="Sev-1">Severity 1 Critical Business Impact</option>
-							<option value="Sev-2">Severity 2 Major Business Impact</option>
-							<option value="Sev-3">Severity 3 Minor Business Impact or General Questions</option>
-						</select>
-					</div>
-					<div class="form-group col-md-12 mb-3">
-						<input class="form-control" id="subject" maxlength="80" name="subject" size="20" type="text" placeholder="Case Subject" />
-					</div>
-					<div class="form-group col-md-12 mb-3">
-						<textarea class="form-control" name="description" wrap="soft" rows="4" placeholder="Enter your case details..."></textarea>
-					</div>
-					<div class="form-group col-md-12 mb-0">
-						<input class="form-control" id="00N5f00000QbcrO" placeholder="Customer Reference Number" maxlength="25" name="00N5f00000QbcrO" size="20" type="text" />
-					</div>
-
-				</div>
-			</div>
-
-			<div class="d-flex justify-content-start">
-				<input type="submit" name="submit" value="Submit" class="btn btn-lg btn-secondary">
-			</div>
-			
-		</form>
-
-		<h2 class="h3 mt-10">Severity Classification Level Definitions</h2>
-
-		<table class="severity-table">
-			<thead>
-				<tr>
-					<th style="width:15%;">Severity Classification Level</th>
-					<th style="width:25%;">Organizational Impact</th>
-					<th style="width:60%;">Definition</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td>Severity 1</td>
-					<td>Critical Business Impact</td>
-					<td>ClickHouse DBMS LTS or stable software release in production use is not functioning or is stopped or severely impacted so that Customer cannot reasonably continue use of DBMS and no Workaround is available</td>
-				</tr>
-				<tr>
-					<td>Severity 2</td>
-					<td>Major Business Impact</td>
-					<td>ClickHouse DBMS LTS or stable software release is functioning inconsistently causing significantly impaired Customer usage and productivity, such as periodic work stoppages and feature crashes</td>
-				</tr>
-				<tr>
-					<td>Severity 3</td>
-					<td>Minor Business Impact or General Questions</td>
-					<td>ClickHouse DBMS LTS or stable software release is functioning inconsistently causing slightly impaired Customer usage and productivity but Customer can work around such inconsistency or impairment, or Customer has a question or enhancement for the DBMS or ClickHouse not determined an Error</td>
-				</tr>
-			</tbody>
-		</table>
-        
-        <hr class="is-yellow mt-10">
-
-    </div>
-</div>
diff --git a/website/templates/support/hero.html b/website/templates/support/hero.html
deleted file mode 100644
index 22b69256471..00000000000
--- a/website/templates/support/hero.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-0">
-            {{ _('Support Services') }}
-        </h1>
-
-    </div>
-</div>
diff --git a/website/templates/support/overview.html b/website/templates/support/overview.html
deleted file mode 100644
index 429b8d23c5b..00000000000
--- a/website/templates/support/overview.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="section bg-white pt-10">
-    <div class="container">
-
-		<h2>
-			Enter Your Support Case Details
-		</h2>
-   
-        <p class="lead text-dark mb-3" style="max-width: 780px;">
-            Describe the problem you're having. Once you hit submit, we'll log a case for you and kick off an email thread to collaborate on your issue. If you have an attachment (e.g. log files) to share, respond to the case email thread and include as an attachment.
-        </p>
-
-    </div>
-</div>
diff --git a/website/templates/support/policy-content.html b/website/templates/support/policy-content.html
deleted file mode 100644
index d6efae2fb67..00000000000
--- a/website/templates/support/policy-content.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div id="contact" class="section pt-5">
-    <div class="container">
-    		<p><strong>Effective Date: January 28, 2022</strong></p>
-    		
-    		<p>This ClickHouse Support Services Policy sets forth ClickHouse’s policy for the provision of Support Services to its Subscription customers (each a “Customer”). Capitalized terms used but not defined herein, have the definition set forth in the applicable Subscription Agreement between ClickHouse and Customer (the “Agreement”).</p>
-
-    		<ol class="default">
-    			<li><strong>Defined Terms</strong>
-    				<ol class="default" style="list-style-type:lower-alpha">
-    					<li>"<u>Business Day</u>" means Monday through Friday other than a day designated from time to time as a national holiday in the place from which Support Services may be provided.</li>
-    					<li>“<u>Long-Term Supported Release</u>” means the official release for the Software which has been designated as a release for long term support. ClickHouse designates its  as Long-Term Supported Releases by including the letters“lts” in the release number, which are typically March and August releases.</li>
-    					<li>“<u>Regular Stable Sequential Release</u>” means the official software release for the Software which has not been designated as a Long Term Supported Release.</li>
-    					<li>“<u>Support</u>” means technical support by telephone, chat, or email provided by ClickHouse to a Support Contact concerning a Support Incident.</li>
-    					<li>“<u>Support Contact</u>” means a single named individual who is authorized to contact ClickHouse to use the Support Services.</li>
-    					<li>"<u>Support Incident</u>" means a single issue or error with the Software that is raised with ClickHouse by a Support Contact. Each Support Incident will be assigned a unique ID by ClickHouse. In the situation where multiple similar or equivalent cases are opened for a single Support Incident, ClickHouse may choose to consolidate these into a single support case, in which case it shall promptly notify Customer.</li>
-    				</ol>
-    			</li>
-    			<li><strong>Scope and Performance of Support Services.</strong>
-    				<p class="mt-2">The scope of the Support Services provided to Customer includes general assistance and support regarding the installation of the Software and basic technical configuration of the Software, as well as operational or development assistance on how to use the Software. ClickHouse shall use commercially reasonable efforts to meet the applicable target response times set forth in Section 3 below. Customer acknowledges that the time required for resolution of issues may vary depending on the specific circumstances of each problem, including, without limitation, the nature of the incident/problem, the extent and accuracy of information available about the incident/problem, and the level of Customer's cooperation and responsiveness in providing materials, information, access and support reasonably required by ClickHouse to achieve problem resolution.</p>
-    				<ul>
-    					<li><strong>Normal Business Hours:</strong>
-    						<ul>
-    							<li>24x7x365 for Severity 1 Issues</li>
-    							<li>Monday 08:00 CEST through Friday 17:00 US Pacific time for Severity 2 and Severity 3 issues</li>
-    						</ul>
-    					</li>
-    					<li><strong>Number of Support Contacts: unlimited</strong> </li>
-    					<li><strong>Emergency Patches: yes</strong></li>
-    					<li><strong>Annual Support Incidents: unlimited</strong></li>
-    				</ul>
-    			</li>
-    			<li class="mt-2"><strong>Severity Levels and ClickHouse Efforts.</strong>
-    				<p class="mt-2"><strong>Severity Level 1</strong></p>
-    				<p>A Severity Level 1 issue is a major production error within the software that severely impacts the Customer's use of the software for production purposes, such as the loss of production data or where production systems are not functioning and no work-around exists. ClickHouse will use continuous efforts during applicable Normal Business Hours to provide a resolution for any Level 1 issues as soon as is commercially reasonable.</p>
-    				<p><strong>Severity Level 2</strong></p>
-    				<p>A Severity Level 2 issue is an error within the software where the customer's system is functioning for production purposes but in a reduced capacity, such as a problem that is causing significant impact to portions of the customer's business operations and productivity, or where the software is exposed to potential loss or interruption of service. ClickHouse will use continuous efforts during the Normal Business Hours to provide a resolution for any Severity Level 2 issues.</p>
-    				<p><strong>Severity Level 3</strong></p>
-    				<p>A Severity Level 3 issue is a medium-to-low impact error that involves partial and/or non-critical loss of functionality for production purposes or development purposes, such as a problem that impairs some operations but allows the customer's operations to continue to function. Errors for which there is limited or no loss or functionality or impact to the customer's operation and for which there is an easy work-around qualify as Severity Level 3. General questions are also Severity Level issues.  ClickHouse will use reasonable efforts to provide a resolution for any Severity Level 3 issues in time for an upcoming release of the software. All inbound production email cases shall have an initial status of Severity Level 3.</p>
-    			</li>
-    			<li><strong>Customer Obligations.</strong>
-    				<p class="mt-2">Customer agrees to provide ClickHouse with reasonable: (i) detail of the nature of and circumstances surrounding the issue, (ii) access to Customer's environment as necessary to enable ClickHouse to provide Support Services; and (iii) cooperation in the diagnosis and resolution of any issues.</p>
-    			</li>
-    			<li><strong>Supported Versions.</strong>
-    				<p class="mt-2">Notwithstanding anything else, ClickHouse will support the current Regular Stable Release in conjunction with the two (2) prior Regular Stable Releases of the Software or a minimum period of three (3) months from the date of the current Regular Stable Release. ClickHouse will support the current Long-Term Supported Release in conjunction with the one (1) prior Long-Term Supported Release of the Software or a minimum period of one (1) year from the date of the current Long-Term Supported Release. </p>
-
-    			</li>
-    			<li><strong>Support Service Exclusions.</strong>
-    				<p class="mt-2">ClickHouse will have no obligation to provide Support Services to Customer in the event that (i) the Software has been changed, modified or damaged by Customer or anyone other than ClickHouse, (ii) the problem is caused by Customer's negligence, misconduct, or misuse of the Software, a hardware malfunction, or other causes beyond the reasonable control of ClickHouse, (iii) the problem is due to third party software, (iv) the Software is being hosted by a third party that is offering the Software as a service (v) Customer has not installed or implemented any Software releases made generally available or is not running a then supported version of the Software as provided by ClickHouse or (vi) information requested by Customer could reasonably be expected to assist in the development, deployment, enablement and/or maintenance of any non-ClickHouse software that competes with ClickHouse's commercial software products. The Support Services do not cover the support of any third party software which integrates with the Software or the investigation into a potential or actual security incident in a Customer environment, including but not limited to the analysis and response to security events and signals. In addition, the Support Services do not include the following: (a) use of any version of a Software that is not designated as a production release (such as a milestone or release candidate or code contained in the sandbox or any other repository that is not packaged into a production release distribution); (b) Customer's failure to comply with operating instructions contained in the documentation for the Software; (c) installation, configuration, management and operation of Customer's applications; (d) APIs, interfaces or data formats other than those included with the Software; or (e) any training. </p>
-    			</li>
-    			<!-- <li><strong>Supported Platforms</strong>
-    				<p class="mt-2">A list of supported platforms are set forth <a href="/support/platforms/">here.</a></p>
-    			</li> -->
-    		</ol>
-    </div>
-</div>
\ No newline at end of file
diff --git a/website/templates/support/policy-hero.html b/website/templates/support/policy-hero.html
deleted file mode 100644
index dc551dc434c..00000000000
--- a/website/templates/support/policy-hero.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-0">
-            {{ _('ClickHouse Support Services Policy') }}
-        </h1>
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/website/templates/trademark-policy/content.html b/website/templates/trademark-policy/content.html
deleted file mode 100644
index 5039d06cea3..00000000000
--- a/website/templates/trademark-policy/content.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<div class="section bg-white pt-10">
-    <div class="container">
-   
-        <p>
-			Version 1.0 dated January 17, 2022
-		</p>
-
-		<p>
-			This trademark policy was prepared to help you understand how to use the trademarks, service marks and logos of ClickHouse, Inc., with ClickHouse, Inc.'s open-source, high performance columnar OLAP database management system for real-time analytics using SQL.  
-		</p>
-
-		<p>
-			While some of our software is available under a free and open source software license, that copyright license does not include a license to use our trademark and logo ("marks"), and this policy is intended to explain how to use our marks consistent with background law and community expectation.
-		</p>
-
-		<p>
-			Trademark rights protect everyone, not just the company that owns them. They help us make sure that potential customers and users understand who is providing software and services, and who is responsible for their quality control.
-		</p>
-
-		<p>
-			<strong>This Policy covers:</strong>
-		</p>
-
-		<ol>
-			<li>Our <strong>word</strong> trademark and service mark: ClickHouse</li>
-			<li>Our <strong>logo</strong>:</li>
-		</ol>
-
-		<p>
-			<img src="/images/clickhouse-logomark.png" height="120">
-		</p>
-
-		<p>
-			This policy covers all of ClickHouse, Inc.'s marks, whether they are registered or not.
-		</p>
-
-		<p class="mt-8">
-			<strong>1. GENERAL GUIDELINES</strong>
-		</p>
-
-		<p>
-			Whenever you use one of our marks, you must always do so in a way that does not mislead anyone about what they are getting and from whom. For example, you cannot say you are distributing the ClickHouse software when you're distributing a modified version of it, because recipients may not understand the differences between your modified version and our own. 
-		</p>
-
-		<p>
-			You also cannot use our logo on your website in a way that suggests that your website is an official website or that we endorse your website.
-		</p>
-
-		<p>
-			You can, though, say you like the ClickHouse software, that you participate in the ClickHouse community, that you are providing an unmodified version of the ClickHouse software.
-		</p>
-
-		<p>
-			You may not use or register our marks, or variations of them as part of your own trademark, service mark, domain name, corporate name, trade name, product name or service name.
-		</p>
-
-		<p>
-			Trademark law does not allow your use of names or trademarks that are too similar to ours. You therefore may not use an obvious variation of any of our marks or any phonetic equivalent, foreign language equivalent, takeoff, or abbreviation for a similar or compatible product or service. We would consider the following too similar to one of our marks:
-		</p>
-
-		<ul>
-			<li>MyClickHouse</li>
-			<li>ClickHouseConnector</li>
-			<li>ClickHouse Cloud</li>
-			<li>Managed ClickHouse</li>
-			<li>Hosted ClickHouse</li>
-		</ul>
-
-		<p class="mt-8">
-			<strong>2. ACCEPTABLE USES</strong>
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">Unmodified Code</strong>
-		</p>
-		
-		<p>
-			When you redistribute an unmodified copy of our software -- the exact form in which we make it available -- you must <strong>retain</strong> the marks we have placed on the software to identify your redistribution. 
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">Modified Code</strong>
-		</p>
-		
-		<p>
-			If you distribute a modified version of our software, you must <strong>remove</strong> all of our logos from it, including from our source trees. You may use our word marks, but not our logos, to truthfully describe the origin of the software that you are providing.  For example, if the code you are distributing is a modification of our software, you may say, "This software is derived from the source code for ClickHouse software." 
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">Statements About Compatibility</strong>
-		</p>
-		
-		<p>
-			You may use the word mark, but not the logo, to truthfully describe the relationship between your software and ours. Any other use may imply that we have certified or approved your software.  If you wish to use our logo, please contact us at the email address below to discuss license terms.
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">Naming Compatible Products</strong>
-		</p>
-		
-		<p>
-			If you wish to describe your product or service with reference to the ClickHouse software, here are the conditions under which you may do so. You may call your software <strong>XYZ (where XYZ is your product name) for ClickHouse</strong> only if:
-		</p>
-		
-		<ul>
-			<li>All versions of the ClickHouse software you deliver with your product are the exact binaries provided by us.</li>
-			<li>Your product is fully compatible with the then-current APIs for the ClickHouse software.</li>
-			<li>You use the following legend in marketing materials or product descriptions: "ClickHouse is a trademark of ClickHouse, Inc. https://clickhouse.com"</li>
-		</ul>
-
-		<p>
-			<strong style="text-decoration:underline;">Managed Services</strong>
-		</p>
-		
-		<p>
-			We consider managed services provided by others to be a separate product from our own. That's because the quality of managed services depends on a lot more than software. So, you may refer to your own managed service providing ClickHouse software as long as your use is consistent with all relevant licenses from ClickHouse, Inc. and:
-		</p>
-		
-		<ul>
-			<li>You do not use the logo on your managed service.</li>
-			<li>Your product is fully compatible with the then current APIs for the ClickHouse software.</li>
-			<li>You make it clear that ClickHouse, Inc. is not the source of the service.</li>
-			<li>You do not imply that ClickHouse, Inc. sponsors or approves your service.</li>
-		</ul>
-
-		<p>
-			Therefore, you might say, "XYZ is a fully managed cloud offering based on ClickHouse software", if you use the following legend in marketing materials or product descriptions: "ClickHouse is a registered trademark of ClickHouse, Inc. https://clickhouse.com"
-		</p>
-
-		<p>
-			<strong style="text-decoration:underline;">Professional Services</strong>
-		</p>
-		
-		<p>
-			If you provide maintenance, consulting, training or support for ClickHouse software, you must make it clear that the services are not provided by ClickHouse. For example, you can offer "Support for ClickHouse software" but not "ClickHouse Support."
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">User Groups</strong>
-		</p>
-		
-		<p>
-			You can use the word mark as part of your user group name provided that:
-		</p>
-		
-		<ul>
-			<li>The main focus of the group is our software</li>
-			<li>The group does not make a profit</li>
-			<li>Any charge to attend meetings are to cover the cost of the venue, food and drink only</li>
-		</ul>
-
-		<p>
-			You are not authorized to conduct a conference using our marks.
-		</p>
-
-		<p>
-			<strong style="text-decoration:underline;">No Domain Names</strong>
-		</p>
-
-		<p>
-			You must not register any domain that includes our word mark or any variant or combination of it. If you want to register a domain name for a user group that meets the above criteria, please contact us at the email address below.
-		</p>
-
-		<p class="mt-8">
-			<strong>3. HOW TO DISPLAY OUR MARKS</strong>
-		</p>
-
-		<p>
-			When you have the right to use our marks, here is how to display them. 
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">Trademark Marking and Legends</strong>
-		</p>
-		
-		<p>
-			The first or most prominent mention of a mark on a webpage, document, or documentation should be accompanied by a symbol indicating whether the mark is a registered trademark ("®") or an unregistered trademark ("™"). If you don't know which applies, contact us.
-		</p>
-		
-		<p>
-			Place the following notice at the foot of the page where you have used the mark: "ClickHouse is a registered trademark of ClickHouse, Inc. https://clickhouse.com"
-		</p>
-		
-		<p>
-			<strong style="text-decoration:underline;">Use of Trademarks in Text</strong>
-		</p>
-		
-		<p>
-			<strong>Always use trademarks in their exact form with the correct spelling, neither abbreviated, hyphenated, or combined with any other word or words.</strong>
-		</p>
-		
-		<p>
-			Unacceptable: ClickHouse-DB
-		</p>
-		
-		<p>
-			<strong>Don't pluralize a trademark.</strong>
-		</p>
-		
-		<p>
-			Unacceptable: I have seventeen ClickHouses running in my system.
-		</p>
-		
-		<p>
-			<strong>Always use a trademark as an adjective modifying a noun.</strong>
-		</p>
-		
-		<p>
-			Unacceptable: This is a ClickHouse.<br>
-			Acceptable: This is a ClickHouse software application.
-		</p>
-			
-		<p>
-			<strong style="text-decoration:underline;">Use of Logo</strong>
-		</p>
-		
-		<p>
-			You may not change our logo except to scale it. This means you may not add decorative elements, change the colors, change the proportions, distort it, add elements, or combine it with other logos.
-		</p>
-		
-		<p>
-			However, when the context requires the use of black-and-white graphics and the logo is color, you may reproduce the logo in a manner that produces a black-and-white image.
-		</p>
-		
-		<p class="mt-8">
-			<strong>4. QUESTIONS</strong>
-		</p>
-		
-		<p>
-			If you have questions about this policy, wish to discuss a license to use our trademarks that is not consistent with this policy, or want to discuss a violation of this policy, please contact us at trademarks@clickhouse.com.
-		</p>
-		
-		<p>
-			These guidelines are based on the Model Trademark Guidelines, available at <a href="http://www.modeltrademarkguidelines.org" target="_blank">http://www.modeltrademarkguidelines.org</a>., used under a Creative Commons Attribution 3.0 Unported license: <a href="https://creativecommons.org/licenses/by/3.0/deed.en_US" target="_blank">https://creativecommons.org/licenses/by/3.0/deed.en_US</a>.
-		</p>
-
-    </div>
-</div>
diff --git a/website/templates/trademark-policy/hero.html b/website/templates/trademark-policy/hero.html
deleted file mode 100644
index 16bacfd213e..00000000000
--- a/website/templates/trademark-policy/hero.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="hero bg-primary-light d-flex align-items-center base-hero">
-    <div class="hero-bg other-hero"></div>
-    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
-        
-        <h1 class="display-1 mb-0">
-            {{ _('ClickHouse') }}<br>
-			{{ _('Trademark Policy') }}
-        </h1>
-
-    </div>
-</div>
diff --git a/website/yandex_75d07a6cd96f49df.html b/website/yandex_75d07a6cd96f49df.html
deleted file mode 100644
index 8febd2e3759..00000000000
--- a/website/yandex_75d07a6cd96f49df.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>Verification: 75d07a6cd96f49df</body>
-</html>
diff --git a/website/yandex_fffaa30ee00426bb.html b/website/yandex_fffaa30ee00426bb.html
deleted file mode 100644
index fdecc0ad8aa..00000000000
--- a/website/yandex_fffaa30ee00426bb.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>Verification: fffaa30ee00426bb</body>
-</html>
\ No newline at end of file